@betterportal/config-manager 10.1.62 → 10.1.63

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.62
+ * @version 10.1.63
  */
 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.62
+ * @version 10.1.63
  */
 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.62",
+    "version": "10.1.63",
     "category": "service",
     "deploymentModes": [
       "self-hosted"
@@ -1402,7 +1402,8 @@
                                 "inner": {
                                   "kind": "record",
                                   "valueSchema": {
-                                    "kind": "any"
+                                    "kind": "ref",
+                                    "ref": "#/definitions/BetterPortalJsonValue"
                                   }
                                 }
                               },
@@ -1468,7 +1469,39 @@
                 ],
                 "unknownKeys": "strip"
               },
-              "definitions": {},
+              "definitions": {
+                "BetterPortalJsonValue": {
+                  "kind": "union",
+                  "variants": [
+                    {
+                      "kind": "null"
+                    },
+                    {
+                      "kind": "bool"
+                    },
+                    {
+                      "kind": "string"
+                    },
+                    {
+                      "kind": "number"
+                    },
+                    {
+                      "kind": "array",
+                      "items": {
+                        "kind": "ref",
+                        "ref": "#/definitions/BetterPortalJsonValue"
+                      }
+                    },
+                    {
+                      "kind": "record",
+                      "valueSchema": {
+                        "kind": "ref",
+                        "ref": "#/definitions/BetterPortalJsonValue"
+                      }
+                    }
+                  ]
+                }
+              },
               "extensions": {}
             },
             "metadataResponseSchema": {},

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

@@ -28,7 +28,7 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
                 title: string;
                 description: string;
                 scope: "tenant" | "app";
-                visibility: "secret" | "public" | "protected";
+                visibility: "public" | "protected" | "secret";
                 ownership: "bp" | "plugin" | "mixed";
                 sourceOfTruth: "bp" | "plugin" | "external";
                 required: boolean;
@@ -36,7 +36,7 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
                 order?: number | undefined;
                 defaultValue?: JsonValue | undefined;
                 ui?: {
-                    control?: "number" | "email" | "text" | "url" | "date" | "checkbox" | "password" | "textarea" | "select" | "multiselect" | "color" | "time" | "datetime-local" | undefined;
+                    control?: "number" | "email" | "text" | "url" | "date" | "textarea" | "password" | "checkbox" | "select" | "multiselect" | "color" | "time" | "datetime-local" | undefined;
                     placeholder?: string | undefined;
                     options?: {
                         value: string;
@@ -63,8 +63,29 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
             payloadSchema: import("@betterportal/framework").JsonObject;
             description?: string | undefined;
         }[];
-        apiContracts: JsonValue[];
-        m2mRequests: JsonValue[];
+        apiContracts: {
+            id: string;
+            title: string;
+            version: string;
+            viewId: string;
+            methods: ("GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS")[];
+            capabilities: string[];
+            permissions: string[];
+            modes: ("service" | "delegated")[];
+            description?: string | undefined;
+        }[];
+        m2mRequests: {
+            id: string;
+            title: string;
+            contractId: string;
+            requiredCapabilities: string[];
+            methods: ("GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS")[];
+            permissions: string[];
+            mode: "service" | "delegated";
+            optional: boolean;
+            description?: string | undefined;
+            version?: string | undefined;
+        }[];
         developerResources: {
             url: string;
             id: string;
@@ -97,8 +118,29 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
             dependencies: string[];
             schemas: Record<string, JsonValue> | undefined;
             raw: boolean;
-            apiContracts: JsonValue[];
-            demoScenarios: JsonValue[];
+            apiContracts: {
+                id: string;
+                title: string;
+                version: string;
+                viewId: string;
+                methods: ("GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS")[];
+                capabilities: string[];
+                permissions: string[];
+                modes: ("service" | "delegated")[];
+                description?: string | undefined;
+            }[];
+            demoScenarios: {
+                id: string;
+                title: string;
+                response: JsonValue;
+                description?: string | undefined;
+                match?: {
+                    query?: import("@betterportal/framework").JsonObject | undefined;
+                    params?: import("@betterportal/framework").JsonObject | undefined;
+                    headers?: Record<string, string> | undefined;
+                    request?: import("@betterportal/framework").JsonObject | undefined;
+                } | undefined;
+            }[];
         }[];
         id: string;
         serviceId: string;
@@ -119,7 +161,7 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
                 title: string;
                 description: string;
                 scope: "tenant" | "app";
-                visibility: "secret" | "public" | "protected";
+                visibility: "public" | "protected" | "secret";
                 ownership: "bp" | "plugin" | "mixed";
                 sourceOfTruth: "bp" | "plugin" | "external";
                 required: boolean;
@@ -127,7 +169,7 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
                 order?: number | undefined;
                 defaultValue?: JsonValue | undefined;
                 ui?: {
-                    control?: "number" | "email" | "text" | "url" | "date" | "checkbox" | "password" | "textarea" | "select" | "multiselect" | "color" | "time" | "datetime-local" | undefined;
+                    control?: "number" | "email" | "text" | "url" | "date" | "textarea" | "password" | "checkbox" | "select" | "multiselect" | "color" | "time" | "datetime-local" | undefined;
                     placeholder?: string | undefined;
                     options?: {
                         value: string;
@@ -154,8 +196,29 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
             payloadSchema: import("@betterportal/framework").JsonObject;
             description?: string | undefined;
         }[];
-        apiContracts: JsonValue[];
-        m2mRequests: JsonValue[];
+        apiContracts: {
+            id: string;
+            title: string;
+            version: string;
+            viewId: string;
+            methods: ("GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS")[];
+            capabilities: string[];
+            permissions: string[];
+            modes: ("service" | "delegated")[];
+            description?: string | undefined;
+        }[];
+        m2mRequests: {
+            id: string;
+            title: string;
+            contractId: string;
+            requiredCapabilities: string[];
+            methods: ("GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS")[];
+            permissions: string[];
+            mode: "service" | "delegated";
+            optional: boolean;
+            description?: string | undefined;
+            version?: string | undefined;
+        }[];
         developerResources: {
             url: string;
             id: string;
@@ -188,8 +251,29 @@ declare function automationServiceCatalog(config: BetterPortalConfig, appDef: Be
             dependencies: string[];
             schemas: Record<string, JsonValue> | undefined;
             raw: boolean;
-            apiContracts: JsonValue[];
-            demoScenarios: JsonValue[];
+            apiContracts: {
+                id: string;
+                title: string;
+                version: string;
+                viewId: string;
+                methods: ("GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS")[];
+                capabilities: string[];
+                permissions: string[];
+                modes: ("service" | "delegated")[];
+                description?: string | undefined;
+            }[];
+            demoScenarios: {
+                id: string;
+                title: string;
+                response: JsonValue;
+                description?: string | undefined;
+                match?: {
+                    query?: import("@betterportal/framework").JsonObject | undefined;
+                    params?: import("@betterportal/framework").JsonObject | undefined;
+                    headers?: Record<string, string> | undefined;
+                    request?: import("@betterportal/framework").JsonObject | undefined;
+                } | undefined;
+            }[];
         }[];
         id: string;
         serviceId: string;

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;AAqQzD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkEpF;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA4CpG;AAwVD,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,CAyhDN;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;AAajC,OAAO,KAAK,EAAuE,kBAAkB,EAAE,eAAe,EAAgE,MAAM,yBAAyB,CAAC;AACtN,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmRzD,iBAAS,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkEpF;AAGD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GAAG,MAAM,CA4CpG;AAwVD,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,CAghDN;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

@@ -1,5 +1,5 @@
 import * as av from "anyvali";
-import { AppAuthRoleSchema, eventHeaders, htmlResponse, jsonResponse, resolveEmbeddedRequestContext, signServiceConfigTicket, uuidv7, BetterPortalThemeConfigSchema } from "@betterportal/framework";
+import { AppAuthRoleSchema, eventHeaders, htmlResponse, jsonResponse, resolveEmbeddedRequestContext, signServiceConfigTicket, uuidv7, BetterPortalMenuItemSchema, BetterPortalThemeConfigSchema } from "@betterportal/framework";
 import { generateApiKey, hashApiKey } from "./storage/index.js";
 import { getManifestCache } from "./syncApi.js";
 import { apiRoutePath, appRoutePatternKey, isApiRoute, pageRoutePath } from "./routeMounts.js";
@@ -90,6 +90,19 @@ function requiredRouteString(body, key, label) {
         return { error: `${label} is required.` };
     return { value };
 }
+function normalizeMenuItem(raw) {
+    const item = raw && typeof raw === "object" ? raw : {};
+    return BetterPortalMenuItemSchema.parse({
+        id: typeof item.id === "string" ? item.id : uuidv7(),
+        type: item.type === "group" ? "group" : "link",
+        title: typeof item.title === "string" ? item.title : undefined,
+        icon: typeof item.icon === "string" ? item.icon : undefined,
+        routeId: typeof item.routeId === "string" ? item.routeId : undefined,
+        href: typeof item.href === "string" ? item.href : undefined,
+        enabled: item.enabled !== false,
+        children: Array.isArray(item.children) ? item.children.map(normalizeMenuItem) : []
+    });
+}
 function routesReloadPath(appId, apiServiceId) {
     return `/routes?appId=${encodeURIComponent(appId)}${apiServiceId ? `&apiServiceId=${encodeURIComponent(apiServiceId)}` : ""}`;
 }
@@ -1536,16 +1549,16 @@ export function registerAdminApiRoutes(app, store, cpState) {
             type: av.literal("auth"),
             mutation: av.object({
                 roles: av.array(AppAuthRoleSchema)
-            }, { unknownKeys: "strip" })
-        }, { unknownKeys: "strip" }),
+            })
+        }),
         av.object({
             tenantId: av.string().minLength(1),
             appId: av.string().minLength(1),
             type: av.literal("theme"),
             mutation: av.object({
                 themeConfig: BetterPortalThemeConfigSchema
-            }, { unknownKeys: "strip" })
-        }, { unknownKeys: "strip" })
+            })
+        })
     ]);
     const getAppOr404 = async (appId) => {
         const config = await store.loadConfig();
@@ -2131,19 +2144,7 @@ export function registerAdminApiRoutes(app, store, cpState) {
         const appDef = config.apps.find((a) => a.id === appId);
         if (!appDef)
             return jsonResponse({ error: "App not found" }, 404);
-        appDef.menu = items.map((raw) => {
-            const item = raw && typeof raw === "object" ? raw : {};
-            return {
-                id: typeof item.id === "string" ? item.id : uuidv7(),
-                type: item.type === "group" ? "group" : "link",
-                title: typeof item.title === "string" ? item.title : undefined,
-                icon: typeof item.icon === "string" ? item.icon : undefined,
-                routeId: typeof item.routeId === "string" ? item.routeId : undefined,
-                href: typeof item.href === "string" ? item.href : undefined,
-                enabled: item.enabled !== false,
-                children: Array.isArray(item.children) ? item.children : []
-            };
-        });
+        appDef.menu = items.map(normalizeMenuItem);
         await store.saveConfig(config);
         return jsonResponse({ ok: true });
     });
@@ -2294,20 +2295,23 @@ export function registerAdminApiRoutes(app, store, cpState) {
                             type: "link",
                             title: routeTitle,
                             routeId,
-                            enabled: true
+                            enabled: true,
+                            serviceStatus: "show",
+                            authStatus: "show",
+                            children: []
                         });
                     }
                 }
                 if (groupChildren.length > 0) {
-                    const menu = (appDef.menu ?? []);
-                    menu.push({
+                    appDef.menu.push({
                         id: groupId,
                         type: "group",
                         title,
                         enabled: true,
+                        serviceStatus: "show",
+                        authStatus: "show",
                         children: groupChildren
                     });
-                    appDef.menu = menu;
                 }
             }
         }