@flowselections/admin-installatietechniek 1.0.9 → 1.0.11

package/dist-lib/lib/admin.functions.js

@@ -26,6 +26,7 @@ const setUserPermissionInput = z.object({
 });
 const userPermissionsInput = z.object({
     userId: z.string().uuid(),
+    modules: syncModulesInput.shape.modules.optional(),
 });
 const roleIdInput = z.object({ roleId: z.string().uuid() });
 const assignRoleInput = z.object({
@@ -249,7 +250,8 @@ export const removeRole = createServerFn({ method: "POST" })
 /** Alle rollen met hun rechten, plus de geregistreerde modules en onderdelen. */
 export const getRoles = createServerFn({ method: "POST" })
     .middleware([normalizeServerErrors, requireSupabaseAuth])
-    .handler(async ({ context }) => {
+    .inputValidator((data) => shellModulesInput.parse(data))
+    .handler(async ({ context, data }) => {
     await requireUserAdmin(context);
     const [{ data: roles, error: rolesError }, { data: perms, error: permsError }, { data: registry, error: registryError }, { data: featureRows, error: featuresError },] = await Promise.all([
         context.supabase.from("roles").select("id, key, name, is_protected").order("name", { ascending: true }),
@@ -281,16 +283,7 @@ export const getRoles = createServerFn({ method: "POST" })
             isProtected: r.is_protected,
             unmapped: unmappedKeys.has(r.key),
         })),
-        modules: safeRegistry
-            .filter((m) => m.is_active)
-            .map((m) => ({
-            id: m.module_id,
-            name: m.name,
-            enforce: Boolean(m.enforce),
-            features: safeFeatures
-                .filter((f) => f.is_active && f.module_id === m.module_id)
-                .map((f) => ({ id: f.feature_id, name: f.name })),
-        })),
+        modules: mergeShellModules(data?.modules, safeRegistry, safeFeatures),
         permissions: safePerms.map((p) => ({
             roleId: p.role_id,
             moduleId: p.module_id,
@@ -416,7 +409,8 @@ export const deleteRole = createServerFn({ method: "POST" })
 });
 /**
  * Registreert de modules (en hun onderdelen) die de shell heeft geladen.
- * Wat niet meer voorkomt blijft bestaan maar wordt op inactief gezet.
+ * Alleen toevoegen of bijwerken (naam, shell_id = "laatst gezien door").
+ * Nooit deactiveren of verwijderen: een ontbrekende module blijft staan.
  */
 export const syncModuleRegistry = createServerFn({ method: "POST" })
     .middleware([normalizeServerErrors, requireSupabaseAuth])
@@ -437,31 +431,18 @@ export const syncModuleRegistry = createServerFn({ method: "POST" })
     const { error } = await context.supabase.from("module_registry").upsert(modules.map((m) => ({
         module_id: m.id,
         name: m.name,
-        shell_id: data.shellId ?? null,
-        is_active: true,
+        ...(data.shellId ? { shell_id: data.shellId } : {}),
         last_seen_at: now,
-        // Nieuwe modules komen standaard met afdwingen aan binnen; bestaande
-        // modules behouden hun eigen instelling.
-        ...(knownIds.has(m.id) ? {} : { enforce: true }),
+        // Nieuwe rijen: actief en afdwingen aan. Bestaande rijen behouden
+        // hun eigen is_active en enforce.
+        ...(knownIds.has(m.id) ? {} : { is_active: true, enforce: true }),
     })), { onConflict: "module_id" });
     if (error)
         throw error;
-    if (data.shellId) {
-        const ids = modules.map((m) => m.id);
-        const { error: deactivateError } = await context.supabase
-            .from("module_registry")
-            .update({ is_active: false })
-            .eq("shell_id", data.shellId)
-            .not("module_id", "in", `(${ids.map((i) => `"${i}"`).join(",")})`);
-        if (deactivateError)
-            throw deactivateError;
-    }
-    // Onderdelen (subpagina's) synchroniseren.
     const featureRows = modules.flatMap((m) => (m.features ?? []).map((f) => ({
         module_id: m.id,
         feature_id: f.id,
         name: f.name,
-        is_active: true,
         last_seen_at: now,
     })));
     if (featureRows.length > 0) {
@@ -471,21 +452,54 @@ export const syncModuleRegistry = createServerFn({ method: "POST" })
         if (featError)
             throw featError;
     }
-    for (const m of modules) {
-        const ids = (m.features ?? []).map((f) => f.id);
-        let query = context.supabase
-            .from("module_features")
-            .update({ is_active: false })
-            .eq("module_id", m.id);
-        if (ids.length > 0) {
-            query = query.not("feature_id", "in", `(${ids.map((i) => `"${i}"`).join(",")})`);
-        }
-        const { error: deactivateFeatError } = await query;
-        if (deactivateFeatError)
-            throw deactivateFeatError;
-    }
     return { ok: true, count: modules.length };
 });
+const shellModulesInput = z
+    .object({
+    modules: z
+        .array(z.object({
+        id: z.string().trim().min(1).max(100),
+        name: z.string().trim().min(1).max(120),
+        features: z.array(featureSchema).max(200).optional(),
+    }))
+        .max(200)
+        .optional(),
+})
+    .optional();
+/**
+ * Combineert de modules van de huidige shell met wat in module_registry en
+ * module_features staat. Zonder shell-lijst: alle registry-rijen. Geen
+ * filter op is_active. Een module zonder registry-rij is standaard
+ * toegestaan (enforce=false).
+ */
+function mergeShellModules(shellModules, registry, features) {
+    const regById = new Map(registry.map((r) => [r.module_id, r]));
+    const featsFor = (moduleId, extra = []) => {
+        const map = new Map();
+        for (const f of features)
+            if (f.module_id === moduleId)
+                map.set(f.feature_id, f.name);
+        for (const f of extra)
+            map.set(f.id, f.name);
+        return Array.from(map, ([id, name]) => ({ id, name })).sort((a, b) => a.name.localeCompare(b.name, "nl"));
+    };
+    const source = Array.isArray(shellModules) && shellModules.length > 0
+        ? shellModules
+        : registry.map((r) => ({ id: r.module_id, name: r.name }));
+    const seen = new Set();
+    return source
+        .filter((m) => m?.id && !seen.has(m.id) && seen.add(m.id))
+        .map((m) => {
+        const reg = regById.get(m.id);
+        return {
+            id: m.id,
+            name: m.name || reg?.name || m.id,
+            enforce: reg ? Boolean(reg.enforce) : false,
+            features: featsFor(m.id, m.features ?? []),
+        };
+    })
+        .sort((a, b) => a.name.localeCompare(b.name, "nl"));
+}
 const setModuleEnforceInput = z.object({
     moduleId: z.string().trim().min(1).max(100),
     enforce: z.boolean(),
@@ -526,15 +540,7 @@ export const getUserModulePermissions = createServerFn({ method: "POST" })
     const safeRegistry = Array.isArray(registry) ? registry : [];
     const safeFeatures = Array.isArray(featureRows) ? featureRows : [];
     return {
-        modules: safeRegistry
-            .filter((row) => row.is_active)
-            .map((row) => ({
-            id: row.module_id,
-            name: row.name,
-            features: safeFeatures
-                .filter((f) => f.is_active && f.module_id === row.module_id)
-                .map((f) => ({ id: f.feature_id, name: f.name })),
-        })),
+        modules: mergeShellModules(data.modules, safeRegistry, safeFeatures),
         overrides: safeOverrides.map((row) => ({
             moduleId: row.module_id,
             featureId: row.feature_id ?? "",

package/dist-lib/lib/admin.server.d.ts

@@ -31,9 +31,9 @@ export declare function requireUserAdmin(context: {
     isAdmin: boolean;
 }>;
 /**
- * Basis-URL van deze omgeving, uitsluitend uit de omgeving gelezen.
- * Fail closed: zonder geldige waarde wordt er geen mail met een kapotte
- * link verstuurd.
+ * Basis-URL van deze omgeving. Volgorde: APP_BASE_URL, PUBLIC_BASE_URL,
+ * origin van het verzoek. Fail closed: zonder geldige waarde (of als het
+ * naar localhost wijst) wordt er geen mail met een kapotte link verstuurd.
  */
 export declare function resolveAppBaseUrl(): string;
 /**

package/dist-lib/lib/admin.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.server.d.ts","sourceRoot":"","sources":["../../src/lib/admin.server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE9D,KAAK,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC;AAEvD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,EAAE,CAoB5C;AAgBD,mEAAmE;AACnE,eAAO,MAAM,oBAAoB,kCAAmC,CAAC;AAErE,sEAAsE;AACtE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAE1E;AAsBD;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5F;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAK/B;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAuB1C;AAID;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkD9E"}
+{"version":3,"file":"admin.server.d.ts","sourceRoot":"","sources":["../../src/lib/admin.server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE9D,KAAK,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC;AAEvD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,EAAE,CAoB5C;AAgBD,mEAAmE;AACnE,eAAO,MAAM,oBAAoB,kCAAmC,CAAC;AAErE,sEAAsE;AACtE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAE1E;AAsBD;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5F;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAK/B;AAgBD;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CA2B1C;AAID;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkD9E"}

package/dist-lib/lib/admin.server.js

@@ -88,15 +88,33 @@ export async function requireUserAdmin(context) {
         return { isAdmin: false };
     throw new Error("Adminrechten vereist");
 }
+/** Origin van het binnenkomende verzoek (Origin-header, anders forwarded host). */
+function requestOrigin() {
+    try {
+        const origin = getRequestHeader("origin");
+        if (origin && origin !== "null")
+            return origin;
+        const host = getRequestHeader("x-forwarded-host") ?? getRequestHeader("host");
+        if (!host)
+            return "";
+        const proto = getRequestHeader("x-forwarded-proto") ?? "https";
+        return `${proto.split(",")[0].trim()}://${host.split(",")[0].trim()}`;
+    }
+    catch {
+        return "";
+    }
+}
 /**
- * Basis-URL van deze omgeving, uitsluitend uit de omgeving gelezen.
- * Fail closed: zonder geldige waarde wordt er geen mail met een kapotte
- * link verstuurd.
+ * Basis-URL van deze omgeving. Volgorde: APP_BASE_URL, PUBLIC_BASE_URL,
+ * origin van het verzoek. Fail closed: zonder geldige waarde (of als het
+ * naar localhost wijst) wordt er geen mail met een kapotte link verstuurd.
  */
 export function resolveAppBaseUrl() {
-    const raw = (process.env["APP_BASE_URL"] ?? "").trim().replace(/\/+$/, "");
+    const raw = (process.env["APP_BASE_URL"]?.trim() ||
+        process.env["PUBLIC_BASE_URL"]?.trim() ||
+        requestOrigin()).replace(/\/+$/, "");
     if (!raw) {
-        throw new Error("Het webadres van deze omgeving is niet ingesteld (APP_BASE_URL). Zonder dat adres kan er geen werkende uitnodiging worden verstuurd.");
+        throw new Error("Het webadres van deze omgeving is onbekend: APP_BASE_URL/PUBLIC_BASE_URL ontbreken en het verzoek bevat geen herkomstadres. Er is geen uitnodiging verstuurd.");
     }
     let url;
     try {

package/package.json

@@ -1,87 +1,87 @@
-{
-  "name": "@flowselections/admin-installatietechniek",
-  "version": "1.0.9",
-  "flowselections": {
-    "moduleId": "admin-installatietechniek",
-    "pages": [
-      {
-        "export": "AdminForInstallatieTechniek",
-        "route": "admin-installatietechniek",
-        "title": "Rollen & machtigingen"
-      }
-    ]
-  },
-  "private": false,
-  "sideEffects": false,
-  "type": "module",
-  "main": "./dist-lib/index.js",
-  "types": "./dist-lib/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist-lib/index.d.ts",
-      "default": "./dist-lib/index.js"
-    },
-    "./styles": "./dist-lib/styles.css"
-  },
-  "files": [
-    "dist-lib",
-    "public"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "dev": "vite dev",
-    "build": "vite build",
-    "build:lib": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && node -e \"require('fs').writeFileSync('dist-lib/styles.css', '@source \\\"./\\\";\\n')\"",
-    "build:lib:watch": "tsc -p tsconfig.build.json --watch",
-    "build:dev": "vite build --mode development",
-    "preview": "vite preview",
-    "lint": "eslint ."
-  },
-  "peerDependencies": {
-    "@flowselections/core": "1.0.22",
-    "@tanstack/react-query": "^5.0.0",
-    "@tanstack/react-router": "^1.0.0",
-    "@tanstack/react-start": "^1.0.0",
-    "lucide-react": "^0.400.0",
-    "react": "^18 || ^19",
-    "react-dom": "^18 || ^19",
-    "sonner": "^2.0.0"
-  },
-  "dependencies": {
-    "@supabase/supabase-js": "^2.110.7"
-  },
-  "devDependencies": {
-    "@cloudflare/vite-plugin": "^1.25.5",
-    "@eslint/js": "^9.32.0",
-    "@flowselections/core": "1.0.22",
-    "@lovable.dev/vite-tanstack-config": "2.23.1",
-    "@rsbuild/core": "^1.0.0",
-    "@tailwindcss/vite": "^4.2.1",
-    "@tanstack/react-query": "^5.83.0",
-    "@tanstack/react-router": "^1.168.0",
-    "@tanstack/react-start": "^1.167.14",
-    "@tanstack/router-plugin": "^1.167.10",
-    "@types/node": "^22.16.5",
-    "@types/react": "^19.2.0",
-    "@types/react-dom": "^19.2.0",
-    "@vitejs/plugin-react": "^5.0.4",
-    "eslint": "^9.32.0",
-    "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.20",
-    "globals": "^15.15.0",
-    "lucide-react": "^0.575.0",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "sonner": "^2.0.7",
-    "tailwindcss": "^4.2.1",
-    "tw-animate-css": "^1.3.4",
-    "typescript": "^5.8.3",
-    "tsc-alias": "^1.8.10",
-    "typescript-eslint": "^8.56.1",
-    "vite": "^7.3.1",
-    "vite-tsconfig-paths": "^6.0.2",
-    "nitro": "3.0.260603-beta"
-  }
-}
+{
+  "name": "@flowselections/admin-installatietechniek",
+  "version": "1.0.11",
+  "flowselections": {
+    "moduleId": "admin-installatietechniek",
+    "pages": [
+      {
+        "export": "AdminForInstallatieTechniek",
+        "route": "admin-installatietechniek",
+        "title": "Rollen & machtigingen"
+      }
+    ]
+  },
+  "private": false,
+  "sideEffects": false,
+  "type": "module",
+  "main": "./dist-lib/index.js",
+  "types": "./dist-lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist-lib/index.d.ts",
+      "default": "./dist-lib/index.js"
+    },
+    "./styles": "./dist-lib/styles.css"
+  },
+  "files": [
+    "dist-lib",
+    "public"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "dev": "vite dev",
+    "build": "vite build",
+    "build:lib": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && node -e \"require('fs').writeFileSync('dist-lib/styles.css', '@source \\\"./\\\";\\n')\"",
+    "build:lib:watch": "tsc -p tsconfig.build.json --watch",
+    "build:dev": "vite build --mode development",
+    "preview": "vite preview",
+    "lint": "eslint ."
+  },
+  "peerDependencies": {
+    "@flowselections/core": ">=1.0.26",
+    "@tanstack/react-query": "^5.0.0",
+    "@tanstack/react-router": "^1.0.0",
+    "@tanstack/react-start": "^1.0.0",
+    "lucide-react": "^0.400.0",
+    "react": "^18 || ^19",
+    "react-dom": "^18 || ^19",
+    "sonner": "^2.0.0"
+  },
+  "dependencies": {
+    "@supabase/supabase-js": "^2.110.7"
+  },
+  "devDependencies": {
+    "@cloudflare/vite-plugin": "^1.25.5",
+    "@eslint/js": "^9.32.0",
+    "@flowselections/core": "1.0.26",
+    "@lovable.dev/vite-tanstack-config": "2.23.1",
+    "@rsbuild/core": "^1.0.0",
+    "@tailwindcss/vite": "^4.2.1",
+    "@tanstack/react-query": "^5.83.0",
+    "@tanstack/react-router": "^1.168.0",
+    "@tanstack/react-start": "^1.167.14",
+    "@tanstack/router-plugin": "^1.167.10",
+    "@types/node": "^22.16.5",
+    "@types/react": "^19.2.0",
+    "@types/react-dom": "^19.2.0",
+    "@vitejs/plugin-react": "^5.0.4",
+    "eslint": "^9.32.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-refresh": "^0.4.20",
+    "globals": "^15.15.0",
+    "lucide-react": "^0.575.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
+    "sonner": "^2.0.7",
+    "tailwindcss": "^4.2.1",
+    "tw-animate-css": "^1.3.4",
+    "typescript": "^5.8.3",
+    "tsc-alias": "^1.8.10",
+    "typescript-eslint": "^8.56.1",
+    "vite": "^7.3.1",
+    "vite-tsconfig-paths": "^6.0.2",
+    "nitro": "3.0.260603-beta"
+  }
+}