@flowselections/admin-installatietechniek 1.0.3 → 1.0.4

package/dist-lib/lib/moduleDiscovery.d.ts

@@ -1,10 +1,15 @@
+export interface DiscoveredFeature {
+    id: string;
+    name: string;
+}
 export interface DiscoveredModule {
     id: string;
     name: string;
+    features?: DiscoveredFeature[];
 }
 /**
- * Leidt de modulelijst af uit de routeboom van de draaiende shell.
- * Geen hardcoded modules: elke shell levert automatisch zijn eigen set.
+ * Leidt de modulelijst (inclusief onderdelen/subpagina's) af uit de routeboom
+ * van de draaiende shell. Geen hardcoded modules of onderdelen.
  */
 export declare function useDiscoveredModules(): DiscoveredModule[];
 //# sourceMappingURL=moduleDiscovery.d.ts.map

package/dist-lib/lib/moduleDiscovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moduleDiscovery.d.ts","sourceRoot":"","sources":["../../src/lib/moduleDiscovery.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,gBAAgB,EAAE,CAqCzD"}
+{"version":3,"file":"moduleDiscovery.d.ts","sourceRoot":"","sources":["../../src/lib/moduleDiscovery.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAChC;AAiBD;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,gBAAgB,EAAE,CAqDzD"}

package/dist-lib/lib/moduleDiscovery.js

@@ -15,17 +15,17 @@ function prettify(segment) {
     return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
 }
 /**
- * Leidt de modulelijst af uit de routeboom van de draaiende shell.
- * Geen hardcoded modules: elke shell levert automatisch zijn eigen set.
+ * Leidt de modulelijst (inclusief onderdelen/subpagina's) af uit de routeboom
+ * van de draaiende shell. Geen hardcoded modules of onderdelen.
  */
 export function useDiscoveredModules() {
     const router = useRouter();
     const routesById = (router?.routesById ?? {});
     const ids = Object.keys(routesById).sort().join("|");
     return useMemo(() => {
-        const found = new Map();
+        const names = new Map();
+        const features = new Map();
         for (const routeId of Object.keys(routesById)) {
-            // Alleen routes binnen de beveiligde shell-omgeving.
             if (!routeId.startsWith("/_authenticated/"))
                 continue;
             const path = routeId.slice("/_authenticated/".length);
@@ -39,16 +39,31 @@ export function useDiscoveredModules() {
                 continue;
             const route = routesById[routeId];
             const title = route?.options?.staticData?.title;
-            const isTopLevel = segments.length === 1 || (segments.length === 2 && segments[1] === "index");
-            const existing = found.get(first);
-            // Titel van de bovenliggende route wint van die van detailroutes.
+            const rest = segments.slice(1).filter((s) => s !== "index");
+            const isTopLevel = rest.length === 0;
+            const existing = names.get(first);
             if (!existing || (isTopLevel && typeof title === "string" && title.trim())) {
-                found.set(first, (isTopLevel && title?.trim()) || existing || prettify(first));
+                names.set(first, (isTopLevel && title?.trim()) || existing || prettify(first));
+            }
+            if (!isTopLevel) {
+                // Dynamische segmenten ($id) zijn detailpagina's, geen los onderdeel.
+                if (rest.some((s) => s.startsWith("$")))
+                    continue;
+                const featureId = rest.join("/");
+                const map = features.get(first) ?? new Map();
+                map.set(featureId, title?.trim() || rest.map(prettify).join(" › "));
+                features.set(first, map);
             }
         }
-        // Geen alfabetische sortering: de volgorde van de routeboom is de
-        // standaardvolgorde van de shell.
-        return Array.from(found.entries()).map(([id, name]) => ({ id, name }));
+        return Array.from(names.entries())
+            .map(([id, name]) => ({
+            id,
+            name,
+            features: Array.from(features.get(id)?.entries() ?? [])
+                .map(([fid, fname]) => ({ id: fid, name: fname }))
+                .sort((a, b) => a.name.localeCompare(b.name, "nl")),
+        }))
+            .sort((a, b) => a.name.localeCompare(b.name, "nl"));
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [ids]);
 }

package/package.json

@@ -1,87 +1,87 @@
-{
-  "name": "@flowselections/admin-installatietechniek",
-  "version": "1.0.3",
-  "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": "*",
-    "@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.16",
-    "@lovable.dev/vite-tanstack-config": "2.13.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.4",
+  "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": "*",
+    "@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.16",
+    "@lovable.dev/vite-tanstack-config": "2.13.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"
+  }
+}

package/dist-lib/hooks/useModuleOrder.d.ts

@@ -1,30 +0,0 @@
-export interface ModuleOrderEntry {
-    id: string;
-    name: string;
-    sortOrder: number | null;
-}
-interface OrderableModule {
-    id: string;
-    name?: string;
-}
-/** Laat elke actieve `useModuleOrder()` de volgorde direct opnieuw ophalen. */
-export declare function notifyModuleOrderChanged(): void;
-/**
- * Sorteert een modulelijst volgens de opgeslagen volgorde.
- * Modules zonder opgeslagen positie behouden hun oorspronkelijke plek
- * (de bronvolgorde van de shell) — geen alfabetische herschikking.
- */
-export declare function sortModulesByOrder<T extends OrderableModule>(modules: T[], order: ModuleOrderEntry[]): T[];
-/**
- * Haalt de opgeslagen zijbalk-volgorde op en levert een sorteerfunctie
- * die shells op hun modulelijst kunnen toepassen. Werkt realtime bij
- * zodra de adminpagina een nieuwe volgorde opslaat.
- */
-export declare function useModuleOrder(): {
-    order: ModuleOrderEntry[];
-    loading: boolean;
-    sortModules: <T extends OrderableModule>(modules: T[]) => T[];
-    reload: () => Promise<void>;
-};
-export {};
-//# sourceMappingURL=useModuleOrder.d.ts.map

package/dist-lib/hooks/useModuleOrder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useModuleOrder.d.ts","sourceRoot":"","sources":["../../src/hooks/useModuleOrder.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,UAAU,eAAe;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAID,+EAA+E;AAC/E,wBAAgB,wBAAwB,SAGvC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,eAAe,EAC1D,OAAO,EAAE,CAAC,EAAE,EACZ,KAAK,EAAE,gBAAgB,EAAE,GACxB,CAAC,EAAE,CAyBL;AAED;;;;GAIG;AACH,wBAAgB,cAAc;;;kBA6CzB,CAAC,SAAS,eAAe,WAAW,CAAC,EAAE;;EAK3C"}

package/dist-lib/hooks/useModuleOrder.js

@@ -1,99 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-import { getModuleOrder } from "../lib/admin.functions";
-const MODULE_ORDER_EVENT = "flowselections:module-order-changed";
-/** Laat elke actieve `useModuleOrder()` de volgorde direct opnieuw ophalen. */
-export function notifyModuleOrderChanged() {
-    if (typeof window === "undefined")
-        return;
-    window.dispatchEvent(new CustomEvent(MODULE_ORDER_EVENT));
-}
-/**
- * Sorteert een modulelijst volgens de opgeslagen volgorde.
- * Modules zonder opgeslagen positie behouden hun oorspronkelijke plek
- * (de bronvolgorde van de shell) — geen alfabetische herschikking.
- */
-export function sortModulesByOrder(modules, order) {
-    const safeModules = Array.isArray(modules) ? modules : [];
-    const safeOrder = Array.isArray(order) ? order : [];
-    if (safeOrder.length === 0)
-        return safeModules;
-    const positions = new Map();
-    safeOrder.forEach((entry) => {
-        if (entry?.id && typeof entry.sortOrder === "number") {
-            positions.set(entry.id, entry.sortOrder);
-        }
-    });
-    if (positions.size === 0)
-        return safeModules;
-    return safeModules
-        .map((mod, index) => ({ mod, index }))
-        .sort((a, b) => {
-        const ao = positions.get(a.mod.id);
-        const bo = positions.get(b.mod.id);
-        if (ao !== undefined && bo !== undefined)
-            return ao - bo;
-        // Zonder positie: originele volgorde behouden, ná gepositioneerde modules.
-        if (ao !== undefined)
-            return -1;
-        if (bo !== undefined)
-            return 1;
-        return a.index - b.index;
-    })
-        .map((entry) => entry.mod);
-}
-/**
- * Haalt de opgeslagen zijbalk-volgorde op en levert een sorteerfunctie
- * die shells op hun modulelijst kunnen toepassen. Werkt realtime bij
- * zodra de adminpagina een nieuwe volgorde opslaat.
- */
-export function useModuleOrder() {
-    const [order, setOrder] = useState([]);
-    const [loading, setLoading] = useState(true);
-    const reload = useCallback(async () => {
-        try {
-            const result = await getModuleOrder();
-            setOrder(Array.isArray(result?.modules) ? result.modules : []);
-        }
-        catch {
-            setOrder([]);
-        }
-        finally {
-            setLoading(false);
-        }
-    }, []);
-    useEffect(() => {
-        let cancelled = false;
-        const load = async () => {
-            try {
-                const result = await getModuleOrder();
-                if (cancelled)
-                    return;
-                setOrder(Array.isArray(result?.modules) ? result.modules : []);
-            }
-            catch {
-                if (!cancelled)
-                    setOrder([]);
-            }
-            finally {
-                if (!cancelled)
-                    setLoading(false);
-            }
-        };
-        load();
-        const onChanged = () => {
-            if (!cancelled)
-                load();
-        };
-        if (typeof window !== "undefined") {
-            window.addEventListener(MODULE_ORDER_EVENT, onChanged);
-        }
-        return () => {
-            cancelled = true;
-            if (typeof window !== "undefined") {
-                window.removeEventListener(MODULE_ORDER_EVENT, onChanged);
-            }
-        };
-    }, []);
-    const sortModules = useCallback((modules) => sortModulesByOrder(modules, order), [order]);
-    return { order, loading, sortModules, reload };
-}