@betterportal/config-manager 10.1.53 → 10.1.55

package/lib/.bsb/clients/service-betterportal-config-manager.d.ts

@@ -1,7 +1,7 @@
 /**
  * Auto-generated BSB virtual client for service-betterportal-config-manager
  * DO NOT EDIT - Regenerated on every build
- * @version 10.1.53
+ * @version 10.1.55
  */
 import { ServiceClient, BSBService } from "@bsb/base";
 import type { Observable, BSBServiceClientDefinition, EventInputType } from "@bsb/base";

package/lib/.bsb/clients/service-betterportal-config-manager.js

@@ -1,7 +1,7 @@
 /**
  * Auto-generated BSB virtual client for service-betterportal-config-manager
  * DO NOT EDIT - Regenerated on every build
- * @version 10.1.53
+ * @version 10.1.55
  */
 import { ServiceClient, bsb, createBroadcastEvent, createEventSchemas } from "@bsb/base";
 const _platformConfigChangedSchema = bsb.object({

package/lib/bp-contracts/org.betterportal.config-manager.json

@@ -4,7 +4,7 @@
     "pluginId": "org.betterportal.config-manager",
     "title": "BetterPortal Config Manager",
     "description": "Admin-facing BetterPortal service for discovering and managing service config surfaces.",
-    "version": "10.1.53",
+    "version": "10.1.55",
     "category": "service",
     "deploymentModes": [
       "self-hosted"
@@ -29,6 +29,7 @@
         "title": "Permission Manager",
         "description": "Define role -> permission grants per app. Services advertise per-view permission requirements via their manifest.",
         "path": "/auth",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -404,6 +405,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [],
@@ -420,6 +425,7 @@
         "title": "Config Manager",
         "description": "Admin service that discovers BetterPortal service config surfaces.",
         "path": "/config",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -603,6 +609,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [
@@ -637,6 +647,7 @@
         "title": "Fragments",
         "description": "Manage topbar/footer fragments per app.",
         "path": "/fragments",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -750,6 +761,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [
@@ -777,6 +792,7 @@
         "title": "Menu Designer",
         "description": "Design app navigation menu.",
         "path": "/menu",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -968,6 +984,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [
@@ -997,6 +1017,7 @@
         "title": "Component Preview",
         "description": "Browse and preview service views, components, and fragments.",
         "path": "/preview",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -1151,6 +1172,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [
@@ -1176,6 +1201,7 @@
         "title": "Route Designer",
         "description": "Design navigation routes for apps.",
         "path": "/routes",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -1260,6 +1286,19 @@
                         "kind": "string"
                       }
                     },
+                    "servicePathVariant": {
+                      "kind": "optional",
+                      "inner": {
+                        "kind": "string"
+                      }
+                    },
+                    "fixedParams": {
+                      "kind": "record",
+                      "valueSchema": {
+                        "kind": "string"
+                      },
+                      "default": {}
+                    },
                     "methods": {
                       "kind": "array",
                       "items": {
@@ -1293,6 +1332,7 @@
                     "path",
                     "serviceId",
                     "viewId",
+                    "fixedParams",
                     "methods",
                     "renderable",
                     "enabled"
@@ -1341,6 +1381,22 @@
                           "path": {
                             "kind": "string"
                           },
+                          "pathVariants": {
+                            "kind": "array",
+                            "items": {
+                              "kind": "string"
+                            },
+                            "default": []
+                          },
+                          "paramsSchema": {
+                            "kind": "optional",
+                            "inner": {
+                              "kind": "record",
+                              "valueSchema": {
+                                "kind": "any"
+                              }
+                            }
+                          },
                           "methods": {
                             "kind": "array",
                             "items": {
@@ -1364,6 +1420,7 @@
                           "viewId",
                           "title",
                           "path",
+                          "pathVariants",
                           "methods",
                           "renderable",
                           "dependencies"
@@ -1450,6 +1507,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [
@@ -1479,6 +1540,7 @@
         "title": "Service Registry",
         "description": "Manage registered service instances.",
         "path": "/services",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -2126,6 +2188,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [
@@ -2158,6 +2224,7 @@
         "title": "App Settings",
         "description": "Manage the current BetterPortal app through the user management API.",
         "path": "/settings",
+        "pathVariants": [],
         "methods": [
           "GET"
         ],
@@ -2416,6 +2483,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [
           "services.index",
           "routes.index",
@@ -2472,6 +2543,7 @@
         "title": "Tenants & Apps",
         "description": "Manage tenants and applications.",
         "path": "/tenants",
+        "pathVariants": [],
         "methods": [
           "DELETE",
           "GET",
@@ -2644,6 +2716,48 @@
                         "unknownKeys": "strip"
                       }
                     },
+                    "seo": {
+                      "kind": "object",
+                      "properties": {
+                        "visibility": {
+                          "kind": "enum",
+                          "values": [
+                            "auto",
+                            "public",
+                            "private"
+                          ]
+                        },
+                        "serviceFailure": {
+                          "kind": "enum",
+                          "values": [
+                            "known-routes",
+                            "omit-service",
+                            "error"
+                          ]
+                        },
+                        "serviceCache": {
+                          "kind": "enum",
+                          "values": [
+                            "none",
+                            "1h",
+                            "24h",
+                            "7d"
+                          ]
+                        },
+                        "canonicalOrigin": {
+                          "kind": "optional",
+                          "inner": {
+                            "kind": "string"
+                          }
+                        }
+                      },
+                      "required": [
+                        "visibility",
+                        "serviceFailure",
+                        "serviceCache"
+                      ],
+                      "unknownKeys": "strip"
+                    },
                     "pageViews": {
                       "kind": "array",
                       "items": {
@@ -2692,6 +2806,7 @@
                     "slug",
                     "title",
                     "hostnames",
+                    "seo",
                     "pageViews",
                     "routeCount"
                   ],
@@ -2888,6 +3003,10 @@
             }
           ]
         },
+        "sitemap": {
+          "kind": "default"
+        },
+        "robots": [],
         "dependencies": [],
         "apiContracts": [],
         "demoScenarios": [
@@ -2929,6 +3048,7 @@
     {
       "viewId": "auth.index",
       "path": "/auth",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -2943,6 +3063,7 @@
     {
       "viewId": "config.index",
       "path": "/config",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -2958,6 +3079,7 @@
     {
       "viewId": "fragments.index",
       "path": "/fragments",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -2972,6 +3094,7 @@
     {
       "viewId": "menu.index",
       "path": "/menu",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -2986,6 +3109,7 @@
     {
       "viewId": "preview.index",
       "path": "/preview",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -3000,6 +3124,7 @@
     {
       "viewId": "routes.index",
       "path": "/routes",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -3014,6 +3139,7 @@
     {
       "viewId": "services.index",
       "path": "/services",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -3028,6 +3154,7 @@
     {
       "viewId": "settings.index",
       "path": "/settings",
+      "pathVariants": [],
       "methods": [
         "GET"
       ],
@@ -3042,6 +3169,7 @@
     {
       "viewId": "tenants.index",
       "path": "/tenants",
+      "pathVariants": [],
       "methods": [
         "DELETE",
         "GET",

package/lib/plugins/service-betterportal-config-manager/adminApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adminApi.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/adminApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAEjB,mBAAmB,EACnB,SAAS,EACV,MAAM,yBAAyB,CAAC;AAYjC,OAAO,KAAK,EAAuE,kBAAkB,EAAE,eAAe,EAA0C,MAAM,yBAAyB,CAAC;AAChM,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AA0LzD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiEpF;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA2CpG;AA8SD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG;IACvG,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAwEA;AAiPD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,gBAAgB,GACxB,IAAI,CAm9CN;AA8VD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClD,GAAG,MAAM,CA0aT"}
+{"version":3,"file":"adminApi.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/adminApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAEjB,mBAAmB,EACnB,SAAS,EACV,MAAM,yBAAyB,CAAC;AAYjC,OAAO,KAAK,EAAuE,kBAAkB,EAAE,eAAe,EAA0C,MAAM,yBAAyB,CAAC;AAChM,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAoQzD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiEpF;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA2CpG;AA0TD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG;IACvG,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAwEA;AAiPD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,gBAAgB,GACxB,IAAI,CA2+CN;AA8VD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClD,GAAG,MAAM,CA0aT"}

package/lib/plugins/service-betterportal-config-manager/adminApi.js

@@ -90,6 +90,76 @@ function requiredRouteString(body, key, label) {
         return { error: `${label} is required.` };
     return { value };
 }
+function routeParamNames(path) {
+    return [...new Set(path.split("/").flatMap((segment) => {
+            const match = segment.match(/^:([A-Za-z_][A-Za-z0-9_]*)$/);
+            return match ? [match[1]] : [];
+        }))];
+}
+function validateCanonicalRoutePath(path, label) {
+    if (!path.startsWith("/"))
+        return `${label} must start with /.`;
+    if (/\{[^}]+\}/.test(path))
+        return `${label} must use :param syntax; {param} is no longer supported.`;
+    for (const segment of path.split("/")) {
+        if (segment.startsWith(":") && !/^:[A-Za-z_][A-Za-z0-9_]*$/.test(segment)) {
+            return `${label} contains an invalid parameter segment: ${segment}.`;
+        }
+    }
+    return undefined;
+}
+function fixedParamsFromBody(body) {
+    const fixed = {};
+    for (const [key, value] of Object.entries(body)) {
+        if (!key.startsWith("fixedParam."))
+            continue;
+        const name = key.slice("fixedParam.".length);
+        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name) || typeof value !== "string")
+            continue;
+        const normalized = value.trim();
+        if (normalized)
+            fixed[name] = normalized;
+    }
+    return fixed;
+}
+function validateFixedParamValue(name, value, paramsSchema) {
+    const properties = paramsSchema?.properties;
+    const schema = properties && typeof properties === "object" && !Array.isArray(properties)
+        ? properties[name]
+        : undefined;
+    const rule = schema && typeof schema === "object" && !Array.isArray(schema)
+        ? schema
+        : {};
+    const minLength = typeof rule.minLength === "number" ? rule.minLength : 1;
+    const maxLength = Math.min(typeof rule.maxLength === "number" ? rule.maxLength : 100, 100);
+    if (value.length < minLength || value.length > maxLength) {
+        return `${name} must be between ${minLength} and ${maxLength} characters.`;
+    }
+    if (typeof rule.pattern === "string") {
+        try {
+            if (!new RegExp(rule.pattern).test(value))
+                return `${name} does not match its service validation pattern.`;
+        }
+        catch {
+            return `${name} has an invalid validation pattern in the service manifest.`;
+        }
+    }
+    return undefined;
+}
+function validateRouteParamMapping(appPath, servicePath, fixedParams, paramsSchema) {
+    const appParams = new Set(routeParamNames(appPath));
+    for (const name of routeParamNames(servicePath)) {
+        if (appParams.has(name))
+            continue;
+        const value = fixedParams[name];
+        if (!value)
+            return `Service parameter :${name} must appear in the app path or have a fixed value.`;
+        const valueError = validateFixedParamValue(name, value, paramsSchema);
+        if (valueError)
+            return valueError;
+    }
+    return undefined;
+}
 function routeMethodsFromManifest(methods) {
     const normalized = (methods ?? []).filter((method) => method === "GET" || method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE" || method === "OPTIONS");
     return normalized.length ? normalized : ["GET"];
@@ -266,12 +336,24 @@ function parseRouteCreateBody(body) {
     const manifestView = getManifestCache().get(serviceId.value)?.viewIndex[viewId.value];
     const renderable = manifestView?.renderable !== false;
     const manifest = getManifestCache().get(serviceId.value);
-    const serviceRoutePath = manifestView?.path ?? `/${viewId.value}`;
+    const servicePathVariant = trimmedString(body, "servicePathVariant") ?? manifestView?.path ?? `/${viewId.value}`;
+    if (manifestView && ![manifestView.path, ...manifestView.pathVariants].includes(servicePathVariant)) {
+        return { error: "Selected service path is not available for this view." };
+    }
+    const serviceRoutePath = servicePathVariant;
     const path = renderable ? requiredRouteString(body, "path", "Mount path") : { value: apiRoutePath(manifest?.serviceId ?? serviceId.value, serviceRoutePath) };
     if (path.error)
         return { error: path.error };
-    if (!path.value.startsWith("/"))
-        return { error: "Mount path must start with /." };
+    const pathError = validateCanonicalRoutePath(path.value, "Mount path");
+    if (pathError)
+        return { error: pathError };
+    const servicePathError = validateCanonicalRoutePath(serviceRoutePath, "Service path");
+    if (servicePathError)
+        return { error: servicePathError };
+    const fixedParams = fixedParamsFromBody(body);
+    const mappingError = validateRouteParamMapping(path.value, serviceRoutePath, fixedParams, manifestView?.paramsSchema);
+    if (mappingError)
+        return { error: mappingError };
     const title = renderable ? requiredRouteString(body, "title", "Display title") : { value: manifestView?.viewId ?? viewId.value };
     if (title.error)
         return { error: title.error };
@@ -280,12 +362,14 @@ function parseRouteCreateBody(body) {
         path: path.value,
         serviceId: serviceId.value,
         viewId: viewId.value,
+        ...(manifestView && servicePathVariant !== manifestView.path ? { servicePathVariant } : {}),
+        ...(Object.keys(fixedParams).length > 0 ? { fixedParams } : {}),
         title: title.value,
         enabled: true,
         methods: routeMethodsFromManifest(manifestView?.methods)
     };
     if (manifestView?.path)
-        route.targetPath = manifestView.path;
+        route.targetPath = serviceRoutePath;
     const query = trimmedString(body, "query");
     if (query && renderable)
         route.query = query.replace(/^\?+/, "");
@@ -1845,8 +1929,9 @@ export function registerAdminApiRoutes(app, store, cpState) {
             const path = trimmedString(body, "path");
             if (!path)
                 return validationError(event, "Mount path is required.");
-            if (!path.startsWith("/"))
-                return validationError(event, "Mount path must start with /.");
+            const pathError = validateCanonicalRoutePath(path, "Mount path");
+            if (pathError)
+                return validationError(event, pathError);
             if (appDef.routes.some((candidate) => candidate.id !== route.id && appRoutePatternKey(candidate.path) === appRoutePatternKey(path))) {
                 return validationError(event, `A route already exists at ${path}.`);
             }
@@ -1870,11 +1955,38 @@ export function registerAdminApiRoutes(app, store, cpState) {
         const manifest = getManifestCache().get(route.serviceId);
         const manifestView = manifest?.viewIndex[route.viewId];
         if (manifestView) {
+            const routeIdentityChanged = body.serviceId !== undefined || body.viewId !== undefined;
+            const requestedServicePath = trimmedString(body, "servicePathVariant")
+                ?? (routeIdentityChanged ? undefined : route.servicePathVariant)
+                ?? manifestView.path;
+            if (![manifestView.path, ...manifestView.pathVariants].includes(requestedServicePath)) {
+                return validationError(event, "Selected service path is not available for this view.");
+            }
+            const servicePathError = validateCanonicalRoutePath(requestedServicePath, "Service path");
+            if (servicePathError)
+                return validationError(event, servicePathError);
+            const submittedFixed = fixedParamsFromBody(body);
+            const mappedAppPath = manifestView.renderable === false
+                ? apiRoutePath(manifest?.serviceId ?? route.serviceId, requestedServicePath)
+                : route.path;
+            const appParams = new Set(routeParamNames(mappedAppPath));
+            const fixedParams = Object.fromEntries(Object.entries(submittedFixed).filter(([name]) => routeParamNames(requestedServicePath).includes(name) && !appParams.has(name)));
+            const mappingError = validateRouteParamMapping(mappedAppPath, requestedServicePath, fixedParams, manifestView.paramsSchema);
+            if (mappingError)
+                return validationError(event, mappingError);
+            if (requestedServicePath === manifestView.path)
+                delete route.servicePathVariant;
+            else
+                route.servicePathVariant = requestedServicePath;
+            if (Object.keys(fixedParams).length > 0)
+                route.fixedParams = fixedParams;
+            else
+                delete route.fixedParams;
             route.methods = routeMethodsFromManifest(manifestView.methods);
-            route.targetPath = manifestView.path;
+            route.targetPath = requestedServicePath;
             if (manifestView.renderable === false) {
                 route.kind = "api";
-                route.path = apiRoutePath(manifest?.serviceId ?? route.serviceId, manifestView.path);
+                route.path = apiRoutePath(manifest?.serviceId ?? route.serviceId, requestedServicePath);
                 route.title = manifestView.viewId;
                 delete route.query;
             }