Locnx2

.husky/pre-commit

@@ -1,2 +1 @@
 npx lint-staged
-npm test

nx/blocks/loc/connectors/glaas/api.js

@@ -1,4 +1,4 @@
-import makeBatches from '../../../../public/utils/batch.js';
+import makeBatches from '../../../../../nx2/public/utils/batch.js';
 
 export async function throttle(ms = 500) {
   return new Promise((resolve) => {

nx/blocks/loc/connectors/glaas/index.js

@@ -1,4 +1,4 @@
-import { Queue } from '../../../../public/utils/tree.js';
+import { Queue } from '../../../../../nx2/public/utils/tree.js';
 import {
   checkSession, createTask, addAssets, updateStatus, getTask, downloadAsset,
   prepareTargetPreview, getGlaasFilename,

nx/blocks/loc/connectors/glaas/multimodalApi.js

@@ -1,6 +1,6 @@
-import { DA_ORIGIN } from '../../../../public/utils/constants.js';
-import { Queue } from '../../../../public/utils/tree.js';
-import { daFetch } from '../../../../utils/daFetch.js';
+import { DA_ADMIN } from '../../../../../nx2/utils/utils.js';
+import { Queue } from '../../../../../nx2/public/utils/tree.js';
+import { daFetch } from '../../../../../nx2/utils/api.js';
 import {
   buildGlaasCreateMetadata, getOpts, glaasSourcePreviewUrl, throttle,
 } from './api.js';
@@ -430,7 +430,7 @@
 
 /** Map delivery URL to DA Admin source (same path after /source/). */
 export function contentDaLiveToDaSourceUrl(imageUrl) {
-  return imageUrl.replace(CONTENT_DA_LIVE_ORIGIN, `${DA_ORIGIN}/source`);
+  return imageUrl.replace(CONTENT_DA_LIVE_ORIGIN, `${DA_ADMIN}/source`);
 }
 
 export function contentDaLivePathKey(href) {
@@ -650,7 +650,7 @@
   logRequest?.('fetch-image', { imageIndex, contentDaLiveUrl: imageUrl, daSourceUrl: imageSourceUrl });
   let imageResp;
   try {
-    imageResp = await daFetch(imageSourceUrl);
+    imageResp = await daFetch({ url: imageSourceUrl });
   } catch {
     return { error: 'Error fetching content.da.live image.', step: `fetch-image-${imageIndex}` };
   }
@@ -867,12 +867,12 @@
   };
   logRequest?.('media-image-size', detail);
   if (!logRequest) {
     console.info('[GLaaS multimodal] Media image upload size:', detail);
   }
   if (exceedsUploadLimit) {
     console.warn('[GLaaS multimodal] Image exceeds observed Media Bus upload limit:', detail);
   } else if (exceedsDocumentedLimit) {
     console.warn('[GLaaS multimodal] Image exceeds documented Media Bus limit:', detail);
   }
   return detail;
 }
@@ -913,7 +913,7 @@
   const body = new FormData();
   body.append('data', data, mediaPath.split('/').pop());
   try {
-    const resp = await daFetch(`${DA_ORIGIN}/media/${org}/${site}${mediaPath}`, { method: 'POST', body });
+    const resp = await daFetch({ url: `${DA_ADMIN}/media/${org}/${site}${mediaPath}`, opts: { method: 'POST', body } });
     if (!resp.ok) {
       if (resp.status === 413) {
         return skippedOversizedMediaUpload({ glaasName, sizeCheck });
@@ -960,7 +960,7 @@
       maxFormatted: uploaded.maxFormatted,
     };
     logRequest?.('media-image-skip', detail);
     console.warn('[GLaaS multimodal] Skipping oversized image (keeping source URL):', detail);
     return {
       skipped: true,
       glaasName: image.glaasName,

nx/blocks/loc/connectors/glaas/translationMetadata.js

@@ -1,5 +1,5 @@
-import { DA_ORIGIN } from '../../../../public/utils/constants.js';
-import { daFetch } from '../../../../utils/daFetch.js';
+import { DA_ADMIN } from '../../../../../nx2/utils/utils.js';
+import { daFetch } from '../../../../../nx2/utils/api.js';
 
 const BLOCK_SCHEMA_PATH = '/.da/block-schema.json';
 const SEO_GLOSSARY_PATH = '/.da/seo/glossary.json';
@@ -80,9 +80,9 @@ export function parseBlockSchema(schemaData) {
 }
 
 async function fetchJson(org, site, relativePath) {
-  const url = `${DA_ORIGIN}/source/${org}/${site}${relativePath}`;
+  const url = `${DA_ADMIN}/source/${org}/${site}${relativePath}`;
   try {
-    const resp = await daFetch(url);
+    const resp = await daFetch({ url });
     if (!resp.ok) return null;
     return resp.json();
   } catch (error) {
@@ -112,17 +112,17 @@ export async function fetchKeywordsFile(org, site, pagePath) {
   const cleanPath = pagePath.replace(/\.html$/, '');
   const keywordsPath = `${cleanPath}-keywords.json`;
   // Try primary path
-  let url = `${DA_ORIGIN}/source/${org}/${site}${keywordsPath}`;
+  let url = `${DA_ADMIN}/source/${org}/${site}${keywordsPath}`;
   try {
-    const resp = await daFetch(url);
+    const resp = await daFetch({ url });
     if (resp.ok) {
       return resp.json();
     }
     // If 404 and path contains /langstore/, try fallback
     if (resp.status === 404 && keywordsPath.includes('/langstore/')) {
       const fallbackPath = keywordsPath.replace(/\/langstore\/[^/]+\//, '/');
-      url = `${DA_ORIGIN}/source/${org}/${site}${fallbackPath}`;
-      const fallbackResp = await daFetch(url);
+      url = `${DA_ADMIN}/source/${org}/${site}${fallbackPath}`;
+      const fallbackResp = await daFetch({ url });
       if (fallbackResp.ok) {
         return fallbackResp.json();
       }

nx/blocks/loc/connectors/google/index.js

@@ -1,5 +1,5 @@
 import { addDnt, removeDnt } from '../../dnt/dnt.js';
-import { Queue } from '../../../../public/utils/tree.js';
+import { Queue } from '../../../../../nx2/public/utils/tree.js';
 import { convertPath } from '../../utils/utils.js';
 
 const MAX_LENGTH = 5000;

nx/blocks/loc/connectors/smartling/index.js

@@ -1,4 +1,4 @@
-import { Queue } from '../../../../public/utils/tree.js';
+import { Queue } from '../../../../../nx2/public/utils/tree.js';
 import { addDnt, removeDnt } from '../../dnt/dnt.js';
 
 export const dnt = { addDnt };

nx/blocks/loc/connectors/trados/auth.js

@@ -1,4 +1,4 @@
-import { daFetch } from '../../../../utils/daFetch.js';
+import { daFetch } from '../../../../../nx2/utils/api.js';
 
 const LOGIN_ORIGIN = 'https://da-etc.adobeaem.workers.dev';
 const TOKEN_BUFFER = 300000; // 5 min buffer before expiry
@@ -32,7 +32,7 @@ export async function getAccessToken(service) {
 
   const opts = { method: 'POST' };
 
-  const resp = await daFetch(`${LOGIN_ORIGIN}/${org}/sites/${site}/integrations/trados/login`, opts);
+  const resp = await daFetch({ url: `${LOGIN_ORIGIN}/${org}/sites/${site}/integrations/trados/login`, opts });
   if (!resp.ok) return null;
 
   const { access_token: accessToken, expires_in: expiresIn } = await resp.json();

nx/blocks/loc/connectors/trados/index.js

@@ -1,4 +1,4 @@
-import { Queue } from '../../../../public/utils/tree.js';
+import { Queue } from '../../../../../nx2/public/utils/tree.js';
 import { addDnt, removeDnt } from '../../dnt/dnt.js';
 import authReady, { getAccessToken } from './auth.js';
 import { corsFetch } from './utils.js';

nx/blocks/loc/loc.css

@@ -1,11 +1,11 @@
 :host {
   display: block;
   color: var(--s2-gray-900);
-  font-size: var(--type-body-s-size);
+  font-size: var(--s2-body-size-s);
 }
 
 .nx-loc-step {
   display: block;
-  max-width: var(--grid-container-width);
-  margin: 0 auto var(--spacing-500) auto;
+  max-width: var(--se-grid-container-width);
+  margin: 0 auto var(--s2-spacing-500) auto;
 }

nx/blocks/loc/loc.js

@@ -1,9 +1,6 @@
 import { LitElement, html, nothing } from 'da-lit';
-import { getConfig } from '../../scripts/nexter.js';
-import getStyle from '../../utils/styles.js';
 import { getHashDetails, loadProject, updateProject } from './utils/utils.js';
-
-import '../../public/sl/components.js';
+import { loadStyle } from '../../../nx2/scripts/nx.js';
 
 import './views/header/header.js';
 import './views/steps/steps.js';
@@ -18,11 +15,11 @@ import './views/rollout/rollout.js';
 import './views/complete/complete.js';
 import './views/url-details/url-details.js';
 
+import '../../../nx2/public/sl/components.js';
+
 const EL_NAME = 'nx-loc';
 
-const { nxBase: nx } = getConfig();
-const sl = await getStyle(`${nx}/public/sl/styles.css`);
-const styles = await getStyle(import.meta.url);
+const styles = await loadStyle(import.meta.url);
 
 class NxLoc extends LitElement {
   static properties = {
@@ -36,7 +33,7 @@ class NxLoc extends LitElement {
 
   connectedCallback() {
     super.connectedCallback();
-    this.shadowRoot.adoptedStyleSheets = [sl, styles];
+    this.shadowRoot.adoptedStyleSheets = [styles];
   }
 
   update(props) {
@@ -178,7 +175,7 @@ function handleHashCallback() {
 }
 
 export default function init(el) {
-  el.innerHTML = '';
+  el.replaceChildren();
   handleHashCallback();
   setup(el);
   window.addEventListener('hashchange', () => { setup(el); });

nx/blocks/loc/project/index.js

@@ -1,8 +1,8 @@
-import getElementMetadata from '../../../utils/getElementMetadata.js';
+import getElementMetadata from '../../../../nx2/utils/getElementMetadata.js';
 import { regionalDiff, removeLocTags } from '../regional-diff/regional-diff.js';
-import { daFetch, saveToDa } from '../../../utils/daFetch.js';
-import { DA_ORIGIN } from '../../../public/utils/constants.js';
-import { Queue } from '../../../public/utils/tree.js';
+import { daFetch, source as daSource } from '../../../../nx2/utils/api.js';
+import { DA_ADMIN } from '../../../../nx2/utils/utils.js';
+import { Queue } from '../../../../nx2/public/utils/tree.js';
 
 // Max concurrent /source/ reads from da-admin. Prevents flooding da-admin
 // with OPTIONS+GET bursts during content scans (translate, rollout, validate).
@@ -28,7 +28,7 @@ let projPath;
 let projJson;
 
 async function fetchData(path) {
-  const resp = await daFetch(path);
+  const resp = await daFetch({ url: path });
   if (!resp.ok) return null;
   return resp.json();
 }
@@ -88,7 +88,7 @@ export async function detectService(config, env = 'stage') {
 
 export async function getDetails() {
   projPath = window.location.hash.replace('#', '');
-  const data = await fetchData(`${DA_ORIGIN}/source${projPath}.json`);
+  const data = await fetchData(`${DA_ADMIN}/source${projPath}.json`);
   return data;
 }
 
@@ -110,7 +110,7 @@ export async function saveStatus(json) {
   const file = new Blob([JSON.stringify(proj)], { type: 'application/json' });
   body.append('data', file);
   const opts = { body, method: 'POST' };
-  const resp = await daFetch(`${DA_ORIGIN}/source${projPath}.json`, opts);
+  const resp = await daFetch({ url: `${DA_ADMIN}/source${projPath}.json`, opts });
   if (!resp.ok) return { error: 'Could not update project' };
   return json;
 }
@@ -125,7 +125,7 @@ async function saveVersion(path, label) {
   try {
     const opts = { method: 'POST' };
     if (label) opts.body = JSON.stringify({ label });
-    await daFetch(`${DA_ORIGIN}/versionsource${path}`, opts);
+    await daFetch({ url: `${DA_ADMIN}/versionsource${path}`, opts });
   } finally {
     versionSaving.delete(path);
   }
@@ -146,7 +146,7 @@ function collapseInnerTextSpaces(html) {
 
 const getHtml = async (path, html) => {
   const fetchHtml = async () => {
-    const res = await daFetch(`${DA_ORIGIN}/source${path}`);
+    const res = await daFetch({ url: `${DA_ADMIN}/source${path}` });
     if (!res.ok) return null;
     const str = await res.text();
     return str;
@@ -163,6 +163,43 @@ const getDaUrl = (url) => {
   return { org, repo, pathname };
 };
 
+function replaceHtml(text, fromOrg, fromRepo, options = {}) {
+  const { daMetadata = {}, replaceRelative = true } = options;
+  let inner = text;
+
+  if (fromOrg && fromRepo && replaceRelative) {
+    const fromOrigin = `https://main--${fromRepo}--${fromOrg}.aem.live`;
+    inner = text
+      .replaceAll('./media', `${fromOrigin}/media`)
+      .replaceAll('href="/', `href="${fromOrigin}/`);
+  }
+
+  let metadataHTML = '';
+  if (Object.keys(daMetadata).length > 0) {
+    const daRows = Object.entries(daMetadata)
+      .map(([key, value]) => {
+        const textContent = value?.text ?? value ?? '';
+        return `<div><div>${key}</div><div>${textContent}</div></div>`;
+      })
+      .join('');
+    metadataHTML = `\n  <div class="da-metadata">${daRows}</div>\n`;
+  }
+
+  return `
+    <body>
+      <header></header>
+      <main>${inner}</main>
+      ${metadataHTML}<footer></footer>
+    </body>
+  `;
+}
+
+function saveHtml(url, content, { daMetadata = {}, replaceRelative = false } = {}) {
+  const { org, repo, pathname } = getDaUrl(url);
+  const body = replaceHtml(content, org, repo, { daMetadata, replaceRelative });
+  return daSource.save({ org, site: repo, path: `${pathname}.html`, body });
+}
+
 export async function overwriteCopy(url, title) {
   let resp;
   if (url.sourceContent) {
@@ -173,19 +210,15 @@ export async function overwriteCopy(url, title) {
       body: new FormData(),
     };
     opts.body.append('data', blob);
-    resp = await daFetch(`${DA_ORIGIN}/source${url.destination}`, opts);
+    resp = await daFetch({ url: `${DA_ADMIN}/source${url.destination}`, opts });
   } else {
     const srcHtml = await getHtml(url.source);
     if (srcHtml) {
       removeLocTags(srcHtml);
       const daMetadata = getElementMetadata(srcHtml.querySelector(DA_METADATA_SELECTOR));
       delete daMetadata?.acceptedhashes;
       delete daMetadata?.rejectedhashes;
-      resp = await saveToDa(
-        srcHtml.querySelector('main').innerHTML,
-        getDaUrl(url),
-        { daMetadata, replaceRelative: false },
-      );
+      resp = await saveHtml(url, srcHtml.querySelector('main').innerHTML, { daMetadata });
     }
   }
 
@@ -245,15 +278,14 @@ export async function rolloutCopy(
     if (labelUpstream) daMetadata['diff-label-upstream'] = labelUpstream;
 
     return new Promise((resolve) => {
-      const daUrl = getDaUrl(url);
-      const savePromise = saveToDa(diffed.innerHTML, daUrl, { daMetadata, replaceRelative: false });
+      const savePromise = saveHtml(url, diffed.innerHTML, { daMetadata });
 
       const timedout = setTimeout(() => {
         url.status = 'timeout';
         resolve('timeout');
       }, DEFAULT_TIMEOUT);
 
-      savePromise.then(({ daResp }) => {
+      savePromise.then((daResp) => {
         clearTimeout(timedout);
         url.status = daResp.ok ? 'success' : 'error';
         if (daResp.ok) {
@@ -307,12 +339,7 @@ export async function mergeCopy(
     if (labelLocal) daMetadata['diff-label-local'] = labelLocal;
     if (labelUpstream) daMetadata['diff-label-upstream'] = labelUpstream;
 
-    const daUrl = getDaUrl(url);
-    const { daResp } = await saveToDa(
-      diffed.innerHTML,
-      daUrl,
-      { daMetadata, replaceRelative: false },
-    );
+    const daResp = await saveHtml(url, diffed.innerHTML, { daMetadata });
     if (daResp.ok) {
       url.status = 'success';
       saveVersion(url.destination, `${projectTitle} - Rolled Out`);
@@ -338,8 +365,14 @@ export async function saveLangItems(sitePath, items, lang, removeDnt) {
     const body = new FormData();
     body.append('data', blob);
     const opts = { body, method: 'POST' };
-    const resp = await daFetch(`${DA_ORIGIN}/source${path}`, opts);
-    results[idx] = { success: resp.status };
+    try {
+      const resp = await daFetch({ url: `${DA_ADMIN}/source${path}`, opts });
+      results[idx] = resp.ok
+        ? { success: resp.status }
+        : { error: 'Could not save item.', status: resp.status };
+    } catch (e) {
+      results[idx] = { error: e.message };
+    }
   }, MAX_CONCURRENT_WRITES);
 
   await Promise.all(items.map((item, idx) => queue.push({ item, idx })));

nx/blocks/loc/project/project.css

@@ -1,6 +1,6 @@
 :host {
   display: block;
-  max-width: var(--grid-container-width);
+  max-width: var(--se-grid-container-width);
   margin: var(--spacing-800) auto;
 }
 

nx/blocks/loc/project/project.js

@@ -1,8 +1,8 @@
-import { LitElement, html, nothing } from '../../../deps/lit/dist/index.js';
-import getStyle from '../../../utils/styles.js';
+import { LitElement, html, nothing } from 'da-lit';
+import { loadStyle } from '../../../../nx2/utils/utils.js';
 import { getDetails } from './index.js';
 
-const style = await getStyle(import.meta.url);
+const style = await loadStyle(import.meta.url);
 
 class NxLocProject extends LitElement {
   static properties = {