@panneau/core 4.0.74 → 4.0.78

package/dist/utils.d.ts

@@ -38,14 +38,15 @@ declare function formatDuration(timeInSeconds: number | string): string;
 /**
  * Internationalization message definition
  */
-interface Message extends MessageDescriptor {
-    id: string;
-    defaultMessage?: string;
-}
+type Message = MessageDescriptor;
 /**
  * Label can be either a message object or any React node
  */
 type Label = Message | ReactNode;
+/**
+ * Form control size
+ */
+type ControlSize = 'lg' | 'sm' | null;
 /**
  * Generic item (base interface for data items)
  */
@@ -53,6 +54,23 @@ interface Item {
     id: string;
     [key: string]: unknown;
 }
+/**
+ * Generic definition
+ */
+interface Definition {
+    id: string;
+    component?: string | ElementType;
+    [key: string]: unknown;
+}
+interface RouteDefinition {
+    path?: string;
+    route?: string;
+    component: string | ElementType;
+    [key: string]: unknown;
+}
+interface PageDefinition {
+    component: string | ElementType;
+}
 
 /**
  * Form Types
@@ -72,15 +90,23 @@ type SelectOption = string | number | {
 interface Field {
     name?: string;
     type?: string;
-    component?: string | ElementType;
-    label?: ReactNode;
+    label?: Label;
+    component?: string;
+    size?: ControlSize;
+    [key: string]: unknown;
 }
 /**
  * Form definition
  */
 interface Form {
-    title: ReactNode;
+    title?: ReactNode;
     fields?: Field[];
+    method?: string | null;
+    action?: string | null;
+    submitButtonLabel?: Label | null;
+    [key: string]: unknown;
+}
+interface FormDefinition extends Form, Definition {
 }
 
 /**
@@ -138,15 +164,33 @@ interface ResourceIndex {
     fields?: Field[];
     [key: string]: unknown;
 }
+interface ResourcePages {
+    index?: PageDefinition;
+    show?: PageDefinition;
+    create?: PageDefinition;
+    edit?: PageDefinition;
+    delete?: PageDefinition;
+    duplicate?: PageDefinition;
+    [key: string]: PageDefinition | undefined;
+}
+interface ResourceForms {
+    default: FormDefinition | null;
+    create: FormDefinition | null;
+    edit: FormDefinition | null;
+    delete: FormDefinition | null;
+    modal: FormDefinition | null;
+    [key: string]: FormDefinition | null;
+}
 interface Resource {
     id: string;
     name: string;
     intl?: ResourceIntl;
     fields?: Field[];
     index?: ResourceIndex;
-    forms?: Record<string, Form>;
-    shows_in_navbar?: boolean;
+    forms?: ResourceForms;
     settings?: Record<string, unknown>;
+    extraRoutes?: RouteDefinition[];
+    pages?: ResourcePages;
 }
 /**
  * Filter definition
@@ -157,19 +201,6 @@ interface Filter {
     [key: string]: unknown;
 }
 
-/**
- * Panneau Definition Types
- * TypeScript interfaces for main Panneau configuration and definitions
- */
-
-/**
- * Generic definition
- */
-interface Definition {
-    name?: string;
-    [key: string]: unknown;
-}
-
 declare function getColumnsWithFields(resource: Resource, columns: TableColumn[] | null): Column[];
 
 interface ComponentResult {
@@ -181,7 +212,7 @@ declare function getComponent(component: string | {
     [key: string]: unknown;
 }): ComponentResult;
 
-declare function getComponentFromName(name?: string | ElementType | null, components?: Record<string, ElementType> | null, defaultComponent?: ElementType | null): ElementType | null;
+declare function getComponentFromName(name?: string | ElementType | null, components?: Record<string, ElementType> | null, defaultComponent?: ElementType | string | null): ElementType | null;
 
 declare function getDefinitionFromId<T extends Definition = Definition>(id?: string | null, items?: T[] | null, defaultObject?: T | null): T | null;
 

package/dist/utils.js

@@ -229,13 +229,14 @@ function getColumnsWithFields(resource, columns) {
 
 function getComponentFromName(name = null, components = {}, defaultComponent = null) {
   if (components === null || name === null) {
-    return defaultComponent;
+    return !isString(defaultComponent) ? defaultComponent : null;
   }
   if (isObject(name) || isFunction(name)) {
     return name;
   }
   const pascalName = pascalCase(name);
-  const component = components[pascalName] || components[name] || defaultComponent;
+  const pascalDefaultName = isString(defaultComponent) ? pascalCase(defaultComponent) : null;
+  const component = components[pascalName] || components[name] || (isString(pascalDefaultName) ? components[pascalDefaultName] : null) || (isString(defaultComponent) ? components[defaultComponent] : null) || defaultComponent;
   if (!component) {
     console.warn('Could not find component from name', name, pascalName, components);
   }
@@ -341,7 +342,7 @@ function getSelectOptions(options) {
 }
 
 function isMessage(message) {
-  return isObject(message) && typeof message.defaultMessage !== 'undefined';
+  return isObject(message) && (typeof message.defaultMessage !== 'undefined' || typeof message.id !== 'undefined');
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "4.0.74",
+    "version": "4.0.78",
     "description": "",
     "keywords": [
         "javascript"
@@ -96,5 +96,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "122cadcf8ea5faacc035e7fe911fbdfb9fb87d26"
+    "gitHead": "669f20a39ca9545acbe0f2279c6d1af23e43ae6e"
 }