@adobe/helix-config 5.4.7 → 5.4.9

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.4.9](https://github.com/adobe/helix-config/compare/v5.4.8...v5.4.9) (2025-07-02)
+
+
+### Bug Fixes
+
+* filter empty group entries ([#298](https://github.com/adobe/helix-config/issues/298)) ([1510199](https://github.com/adobe/helix-config/commit/1510199d2a6054ad815c25f743cb16e75fc79510))
+
+## [5.4.8](https://github.com/adobe/helix-config/compare/v5.4.7...v5.4.8) (2025-06-30)
+
+
+### Bug Fixes
+
+* load user group sheets dynamically ([#295](https://github.com/adobe/helix-config/issues/295)) ([3327e02](https://github.com/adobe/helix-config/commit/3327e0249d7329146982b315ed1c79cdcc102994)), closes [#292](https://github.com/adobe/helix-config/issues/292)
+
 ## [5.4.7](https://github.com/adobe/helix-config/compare/v5.4.6...v5.4.7) (2025-06-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "5.4.7",
+  "version": "5.4.9",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -35,21 +35,21 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.3",
-    "@eslint/config-helpers": "0.2.2",
+    "@adobe/eslint-config-helix": "3.0.6",
+    "@eslint/config-helpers": "0.3.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "12.0.1",
+    "@semantic-release/npm": "12.0.2",
     "c8": "10.1.3",
     "eslint": "9.4.0",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "16.1.0",
-    "mocha": "11.6.0",
+    "lint-staged": "16.1.2",
+    "mocha": "11.7.1",
     "mocha-multi-reporters": "1.5.1",
-    "mocha-suppress-logs": "0.5.1",
+    "mocha-suppress-logs": "0.6.0",
     "nock": "13.5.6",
-    "semantic-release": "24.2.5"
+    "semantic-release": "24.2.6"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/config-view.js

@@ -394,13 +394,37 @@ function resolveGroup(groups, name) {
   return users.map((user) => user.email);
 }
 
+async function loadGroup(ctx, siteConfig, path) {
+  const { contentBusId } = siteConfig.data.content;
+  const key = `${contentBusId}/preview/${path}`;
+  const res = await ctx.loader.getObject(HELIX_CONTENT_BUS, key);
+  if (!res.body) {
+    ctx.log.info('referenced user sheet does not exist: %s', key);
+    return [];
+  }
+  siteConfig.updateLastModified(res.headers);
+
+  // return users
+  const users = JSON.parse(res.body);
+  if (!users.default?.data?.length) {
+    ctx.log.info('referenced user sheet is empty: %s', key);
+    return [];
+  }
+  ctx.log.info('loaded user sheet from %s. %d users', key, users.default.data.length);
+  return users.default.data
+    .map((row) => ModifiersConfig.toLowerKeys(row).user)
+    .filter((entry) => !!entry);
+}
+
 /**
  * Compute the access.admin.role arrays for the admin config. Resolves site and org groups.
+ * @param ctx
+ * @param siteConfig
  * @param admin
  * @param orgConfig
  * @param configGroups
  */
-function computeSiteAdminRoles(admin, orgConfig, configGroups = {}) {
+async function computeSiteAdminRoles(ctx, siteConfig, admin, orgConfig, configGroups = {}) {
   const {
     users: orgUsers = [],
     groups: orgGroups = {},
@@ -412,15 +436,20 @@ function computeSiteAdminRoles(admin, orgConfig, configGroups = {}) {
       if (entry.indexOf('@') > 0) {
         users.add(entry);
       } else if (entry.startsWith('groups/')) {
-        // keep entry in list so that admin can auto-migrate updates to the groups json
-        // TODO: remove after v4 EOL
-        users.add(entry);
         const reference = entry.endsWith('.json')
           ? entry.substring(7, entry.length - 5)
           : entry.substring(7);
         for (const email of resolveGroup(configGroups, reference)) {
           users.add(email);
         }
+        // load users dynamically as well
+        // eslint-disable-next-line no-await-in-loop
+        const group = await loadGroup(ctx, siteConfig, `.helix/${reference}.json`);
+        for (const email of group) {
+          users.add(email);
+        }
+        // add entry in list so that admin can purge the config when modified
+        users.add(`/.helix/${reference}.json`);
       } else if (entry.startsWith('/groups/')) {
         const reference = entry.endsWith('.json')
           ? entry.substring(8, entry.length - 5)
@@ -428,6 +457,17 @@ function computeSiteAdminRoles(admin, orgConfig, configGroups = {}) {
         for (const email of resolveGroup(orgGroups, reference)) {
           users.add(email);
         }
+      } else if (entry.startsWith('/')) {
+        const reference = entry.endsWith('.json')
+          ? entry.substring(1)
+          : `${entry.substring(1)}.json`;
+        // eslint-disable-next-line no-await-in-loop
+        const group = await loadGroup(ctx, siteConfig, reference);
+        for (const email of group) {
+          users.add(email);
+        }
+        // add entry in list so that admin can purge the config when modified
+        users.add(`/${reference}`);
       }
     }
     roles[roleName] = Array.from(users);
@@ -507,7 +547,7 @@ export async function getConfigResponse(ctx, opts) {
   };
   if (opts.scope === SCOPE_ADMIN || opts.scope === SCOPE_RAW) {
     // eslint-disable-next-line max-len
-    config.access.admin = computeSiteAdminRoles(admin, orgConfig, config.groups);
+    config.access.admin = await computeSiteAdminRoles(ctx, siteConfig, admin, orgConfig, config.groups);
   }
   prune(config.access);
   if (!Object.keys(config.access).length) {