Skip to content

Locnx2#583

Open
ravuthu wants to merge 11 commits into
mainfrom
locnx2
Open

Locnx2#583
ravuthu wants to merge 11 commits into
mainfrom
locnx2

Conversation

@ravuthu

@ravuthu ravuthu commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

Please always provide the GitHub issue(s) your PR is for, as well as test URLs where your change can be observed (before and after):

Fix #532

Test URLs:

@ravuthu ravuthu requested a review from auniverseaway July 8, 2026 15:24
@aem-code-sync

aem-code-sync Bot commented Jul 8, 2026

Copy link
Copy Markdown

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch.
In case there are problems, just click the checkbox below to rerun the respective action.

  • Re-sync branch
Commits

@ravuthu ravuthu mentioned this pull request Jul 8, 2026

@hannessolo hannessolo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you added icons to the code in this PR, I think it would be a good opportunity to switch the icon loading methods - load them directly from da.live/img/icons/... instead.

Comment thread .husky/pre-commit
@@ -1,2 +1 @@
npx lint-staged
npm test

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems unintentional?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it was unintentional. Added it back. @auniverseaway, hope you are good with that.

Comment thread nx/blocks/loc/project/views/sync.js Outdated
const ICONS = [
`${nxBase}/blocks/loc/img/Smock_Checkmark_18_N.svg`,
`${nxBase}/blocks/loc/img/Smock_ChevronRight_18_N.svg`,
`${nx}/public/icons/Smock_Checkmark_18_N.svg`,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional: could update this to the new way of loading icons ( directly from da.live)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated


const ICONS = [
`${nxBase}/blocks/loc/img/Smock_ChevronRight_18_N.svg`,
`${nx}/public/icons/Smock_ChevronRight_18_N.svg`,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

return { org, repo, pathname };
};

function replaceHtml(text, fromOrg, fromRepo, options = {}) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double-check whether we already have a similar function in nx2, and if yes move to a shared utils location?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't find it in nx2. I believe that the project/ folder was used for legacy Rollout and Sync. So, it didn't make sense to move it to common utils. Let me know if you still want to move it.

@@ -0,0 +1,11 @@
button,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we potentially use the styles from nx2/styles/form.css instead?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it makes sense to import all of the form styles just to reset the buttons. What do you think?

Comment thread nx/blocks/loc/views/options/options.js Outdated
const ICONS = [
`${nx}/blocks/loc/img/Smock_Close_18_N.svg`,
`${nx}/blocks/loc/img/Smock_Add_18_N.svg`,
`${nx}/public/icons/Smock_Close_18_N.svg`,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments about icons

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

Comment thread nx2/scripts/nx.js
return strings.get(key) ?? key;
};

export const loadStyle = (() => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this move intentional?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@auniverseaway, not sure if this was intentional on your part.

Comment thread nx2/utils/nxToggle.js
@@ -0,0 +1,14 @@
const config = await (async () => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this do? Is it just for testing or do we need it? The goal is for evertyhing to be nx2 only.

@ravuthu ravuthu Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@auniverseaway , not sure if we need this at all. I updated the utils.js (f980af1#diff-e3c0e4a8446171228c63c5f2441f0fdb889f13af246617ff25d6c3e4cd8bbd85R216) to load from a relative path instead of using nx variable. The only other place this was used is nx/blocks/loc/project/views/translate.js which is the legacy implementation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[nx2] loc

4 participants