@panneau/core 4.0.66 → 4.0.73

package/dist/contexts.d.ts

@@ -156,6 +156,13 @@ interface Field {
     component?: string | ElementType;
     label?: ReactNode;
 }
+/**
+ * Form definition
+ */
+interface Form {
+    title: ReactNode;
+    fields?: Field[];
+}
 
 /**
  * Resource Types
@@ -218,7 +225,7 @@ interface Resource {
     intl?: ResourceIntl;
     fields?: Field[];
     index?: ResourceIndex;
-    forms?: Record<string, unknown>;
+    forms?: Record<string, Form>;
     shows_in_navbar?: boolean;
     settings?: Record<string, unknown>;
 }

package/dist/hooks.d.ts

@@ -34,6 +34,13 @@ interface Field$1 {
     component?: string | ElementType;
     label?: ReactNode;
 }
+/**
+ * Form definition
+ */
+interface Form {
+    title: ReactNode;
+    fields?: Field$1[];
+}
 
 /**
  * Resource Types
@@ -96,7 +103,7 @@ interface Resource {
     intl?: ResourceIntl;
     fields?: Field$1[];
     index?: ResourceIndex;
-    forms?: Record<string, unknown>;
+    forms?: Record<string, Form>;
     shows_in_navbar?: boolean;
     settings?: Record<string, unknown>;
 }
@@ -351,8 +358,8 @@ interface ResourceWithTypes extends Resource {
 }
 declare function useResourceTypeName(resource: ResourceWithTypes | null, type?: string | null): string | null;
 
-type ResourceUrlGenerator = (routeResourceId: string | Resource, routeName?: string | Record<string, unknown> | null, params?: Record<string, unknown> | null) => string | null;
-declare function useResourceUrlGenerator(resourceId?: string | Resource | null): ResourceUrlGenerator;
+declare function useResourceUrlGenerator(): (routeResourceId: string | Resource, routeName?: string, params?: Record<string, unknown> | null) => string | null;
+declare function useResourceUrlGenerator(resourceId: string | Resource): (routeName?: string, params?: Record<string, unknown> | null) => string | null;
 
 interface QueryParams {
     page?: number;

package/dist/hooks.js

@@ -7,7 +7,8 @@ import get from 'lodash-es/get';
 import isArray from 'lodash-es/isArray';
 import isObject from 'lodash-es/isObject';
 import isString from 'lodash-es/isString';
-import { useFieldsManager, usePanneauResources, useResource, useUrlGenerator } from '@panneau/core/contexts';
+import { useFieldsManager, usePanneauResources, useResource, useUrlGenerator, useRoutes } from '@panneau/core/contexts';
+import { isString as isString$1 } from 'lodash';
 import dayjs from 'dayjs';
 import { useIntl } from 'react-intl';
 import { match } from 'css-mediaquery';
@@ -1274,33 +1275,38 @@ function useResourceUrlGenerator(t0) {
   }
   const resource = t1;
   const route = useUrlGenerator();
+  const routes = useRoutes();
   let t2;
-  if ($[4] !== resource || $[5] !== resourceId || $[6] !== resources || $[7] !== route) {
+  if ($[4] !== resource || $[5] !== resources || $[6] !== route || $[7] !== routes) {
     t2 = (routeResourceId, t3, t4) => {
       const routeName = t3 === undefined ? null : t3;
       const params = t4 === undefined ? null : t4;
-      const finalRouteName = resourceId !== null ? routeResourceId : routeName;
-      const finalParams = resourceId !== null ? routeName : params;
-      const finalResource = getResource(resources, routeResourceId) || resource;
+      const hasResourceId = isString$1(routeName);
+      const finalRouteName = hasResourceId ? routeName : routeResourceId;
+      const finalParams = hasResourceId ? params : routeName;
+      const finalResource = hasResourceId ? getResource(resources, routeResourceId) : resource;
       const {
         id: t5
       } = finalResource || {};
       const id = t5 === undefined ? null : t5;
-      const finalRoute = id !== null ? route(`resources.${finalRouteName}`, {
+      const specificRouteName = `resources.${id}.${finalRouteName}`;
+      const hasSpecificRoute = typeof routes[specificRouteName] !== "undefined";
+      const finalRoute = id !== null ? route(hasSpecificRoute ? specificRouteName : `resources.${finalRouteName}`, hasSpecificRoute ? finalParams : {
         ...finalParams,
         resource: id
       }) : null;
       return finalRoute;
     };
     $[4] = resource;
-    $[5] = resourceId;
-    $[6] = resources;
-    $[7] = route;
+    $[5] = resources;
+    $[6] = route;
+    $[7] = routes;
     $[8] = t2;
   } else {
     t2 = $[8];
   }
-  return t2;
+  const generateUrl = t2;
+  return generateUrl;
 }
 
 function useQuery(t0, t1) {

package/dist/index.d.ts

@@ -430,7 +430,7 @@ interface Resource {
     intl?: ResourceIntl;
     fields?: Field[];
     index?: ResourceIndex;
-    forms?: Record<string, unknown>;
+    forms?: Record<string, Form>;
     shows_in_navbar?: boolean;
     settings?: Record<string, unknown>;
 }

package/dist/utils.d.ts

@@ -75,6 +75,13 @@ interface Field {
     component?: string | ElementType;
     label?: ReactNode;
 }
+/**
+ * Form definition
+ */
+interface Form {
+    title: ReactNode;
+    fields?: Field[];
+}
 
 /**
  * Resource Types
@@ -137,7 +144,7 @@ interface Resource {
     intl?: ResourceIntl;
     fields?: Field[];
     index?: ResourceIndex;
-    forms?: Record<string, unknown>;
+    forms?: Record<string, Form>;
     shows_in_navbar?: boolean;
     settings?: Record<string, unknown>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "4.0.66",
+    "version": "4.0.73",
     "description": "",
     "keywords": [
         "javascript"
@@ -61,7 +61,7 @@
         "@babel/runtime": "^7.28.6",
         "@folklore/fetch": "^0.1.21",
         "@folklore/forms": "~0.0.30",
-        "@folklore/routes": "^0.2.44",
+        "@folklore/routes": "^0.4.11",
         "@folklore/services": "^0.1.44",
         "@folklore/tracking": "~0.0.34",
         "@fortawesome/fontawesome-svg-core": "^6.5.1",
@@ -96,5 +96,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "9f89301a517c628efb03ed6f27632c66a03dd146"
+    "gitHead": "59fe06241775f60d387d99b22c16bb474964e6d0"
 }