Skip to content

Feat/secure org block nx2 migration#590

Open
hannessolo wants to merge 7 commits into
mainfrom
feat/secure-org-block-nx2-migration
Open

Feat/secure org block nx2 migration#590
hannessolo wants to merge 7 commits into
mainfrom
feat/secure-org-block-nx2-migration

Conversation

@hannessolo

@hannessolo hannessolo commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

hannessolo and others added 2 commits July 9, 2026 16:14
Add 'secure-org' to NX_BLOCKS and update imports in secure-org.js and
utils.js to nx2 equivalents. Block stays in nx/ per migration
convention. nx2's daFetch takes destructured args, so fetchConfig's
call site is updated. Icon URLs built from import.meta.url since
they live only in nx1's public/icons/.

CSS variables in secure-org.css get nx2 names with nx1 fallback.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@aem-code-sync

aem-code-sync Bot commented Jul 9, 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

Comment thread nx/blocks/secure-org/secure-org.js Outdated
Comment on lines +11 to +13
new URL('../../public/icons/S2_Icon_InfoCircle_20_N.svg', import.meta.url).href,
new URL('../../public/icons/S2_Icon_AlertDiamond_20_N.svg', import.meta.url).href,
new URL('../../public/icons/S2_Icon_CheckmarkCircle_20_N.svg', import.meta.url).href,

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.

Should we change to new icon format?

…c load

Address PR review from @mhaack. Same treatment as PR #588:

- Drop the loadIcons import, the ICONS array, and the module-top-level
  fetch. Also drop the shadow-root prepend in connectedCallback.
- renderAlert now references the CDN icon directly:
    <svg viewBox="0 0 20 20" aria-hidden="true">
      <use href="/img/icons/s2-icon-${name}-20-n.svg#icon"/>
    </svg>
- type2icon values change from CamelCase sprite IDs to lowercase-kebab
  filenames: 'infocircle', 'alertdiamond', 'checkmarkcircle'.
- Drop the now-dead ':host > svg { display: none; }' rule that was
  hiding the previously-prepended sprites.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@aem-code-sync aem-code-sync Bot temporarily deployed to feat/secure-org-block-nx2-migration July 10, 2026 11:05 Inactive
@hannessolo hannessolo requested a review from mhaack July 10, 2026 11:07
mhaack
mhaack previously approved these changes Jul 10, 2026
claude and others added 2 commits July 13, 2026 20:47
Matches nx1 (nexter.css) and da-live browse — both force color-scheme: light regardless of system preference or profile toggle.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@aem-code-sync aem-code-sync Bot temporarily deployed to feat/secure-org-block-nx2-migration July 13, 2026 18:47 Inactive
Add permissions and snapshot-admin to NX_BLOCKS alongside secure-org.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@aem-code-sync aem-code-sync Bot temporarily deployed to feat/secure-org-block-nx2-migration July 13, 2026 18:51 Inactive
Reverts style(nx2): pin color scheme to light mode (9e74af2).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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] secure org

3 participants