@solidstarters/solid-core-ui 1.1.21 → 1.1.23

package/src/components/core/model/ModelMetaData.tsx

@@ -256,11 +256,11 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
 
   }, [formik.values])
 
-  useEffect(() => {
-    if (formik.dirty) {
-      setIsDirty(true);
-    }
-  }, [formik.dirty]);
+  // useEffect(() => {
+  //   if (formik.dirty) {
+  //     setIsDirty(true);
+  //   }
+  // }, [formik.dirty]);
 
   return (
 

package/src/components/core/module/CreateModule.tsx

@@ -375,11 +375,6 @@ const CreateModule = ({ data }: any) => {
     )
   }
 
-  const breadcrumbData = [
-    { label: 'Module', link: '/admin/core/solid-core/model-metadata/list' },
-    { label: pathname.includes('new') ? 'Create Module' : 'Edit Module' },
-  ];
-
   return (
     <div className="solid-form-wrapper">
       <Toast ref={toast} />
@@ -418,7 +413,7 @@ const CreateModule = ({ data }: any) => {
             </>
           }
         </div>
-        <SolidBreadcrumb breadcrumbItems={breadcrumbData} />
+        <SolidBreadcrumb />
         {/* <div className="solid-form-stepper">
           <SolidFormStepper />
         </div> */}

package/src/components/core/users/CreateUser.tsx

@@ -231,11 +231,6 @@ const CreateUser = ({ data, params }: any) => {
     }
   }, [isSuccess, isDeleteUserSuceess, isUpdateuserSuceess])
 
-  const breadcrumbData = [
-    { label: 'User', link: '/admin/core/solid-core/model-metadata/list' },
-    { label: params.id === "new" ? 'Create User' : 'Edit User' },
-  ];
-
   return (
     <div className="solid-form-wrapper">
       <Toast ref={toast} />
@@ -274,7 +269,7 @@ const CreateUser = ({ data, params }: any) => {
             </>
           )}
         </div>
-        <SolidBreadcrumb breadcrumbItems={breadcrumbData} />
+        <SolidBreadcrumb />
         {/* <div className="solid-form-stepper">
           <SolidFormStepper />
         </div> */}

package/src/components/layout/AppSidebar.tsx

@@ -10,6 +10,7 @@ import UserProfileMenu from "./user-profile-menu";
 import Image from "next/image";
 import AppBuilderSvg from '../../resources/images/menu/app-builder.svg'
 import SettingImage from '../../resources/images/Navigation/settings.png'
+import { Avatar } from "primereact/avatar";
 
 // import menu from "@/helpers/menu";
 
@@ -169,26 +170,7 @@ const AppSidebar = () => {
                                         //     src={`/images/menu/app-builder.svg`}
                                         //     alt={m.title}
                                         // />
-                                        ((
-                                            <div
-                                                style={{
-                                                    width: "40px",
-                                                    height: "40px",
-                                                    display: "flex",
-                                                    alignItems: "center",
-                                                    justifyContent: "center",
-                                                    backgroundColor: "#722ED1",
-                                                    color: "white",
-                                                    fontWeight: "bold",
-                                                    borderRadius: "50%",
-                                                    fontSize: "18px",
-                                                    textTransform: "uppercase",
-                                                    cursor: "pointer",
-                                                }}
-                                            >
-                                                {m.title.charAt(0)}
-                                            </div>
-                                        ))
+                                        <Avatar label={m.title.charAt(0)}shape="circle" style={{backgroundColor:'var(--primary-color)'}}/>
                                     }
                                 </a>
                             </div>
@@ -196,7 +178,7 @@ const AppSidebar = () => {
                     })}
                 </div>
 
-                <UserProfileMenu></UserProfileMenu>
+                {/* <UserProfileMenu></UserProfileMenu> */}
             </div>
             {currentMenu && (
                 <div className={`sidebar-right ${visibleNavbar ? "open" : ""}`}>

package/src/helpers/AppTitle.tsx

@@ -1,5 +1,3 @@
-import React from 'react'
-
 export const AppTitle = ({ title }: { title: any }) => {
     const appTitle = title ? title?.data?.appTitle : "Solid Starters";
     return (

package/src/helpers/registry.ts

@@ -0,0 +1,52 @@
+import React from "react";
+
+type ExtensionRegistry = {
+    components: Record<string, React.ComponentType<any>>;
+    functions: Record<string, (...args: any[]) => any>;
+};
+
+const extensionRegistry: ExtensionRegistry = {
+    components: {},
+    functions: {},
+};
+
+export const registerExtensionComponent = (name: string, component: React.ComponentType<any>) => {
+    // console.log(`registerExtensionComponent invoked... ${name}`);
+    extensionRegistry.components[name] = component;
+};
+
+export const registerExtensionFunction = (name: string, fn: (...args: any[]) => any) => {
+    // console.log(`registerExtensionFunction invoked... ${name}`);
+    extensionRegistry.functions[name] = fn;
+};
+
+export const getExtensionComponent = (name: string): React.ComponentType<any> | null => {
+    if (extensionRegistry.components[name]) {
+        return extensionRegistry.components[name];
+    }
+
+    return null;
+
+    // const extensionsPath = process.env.NEXT_PUBLIC_SOLID_EXTENSIONS_PATH || "";
+
+    // // Ensure the environment variable is set
+    // if (!extensionsPath) {
+    //     console.warn(`No overrides path found. Using default components.`);
+    //     return () => React.createElement("div", { className: "error-message" }, "Loading dynamic component failed (extensions path not found)");
+    // }
+
+    // try {
+    //     // return dynamic(() => import(`@solid-extensions/${name}`).then((mod) => mod.default));
+    //     return dynamic(() => import(`${extensionsPath}/${name}`).then((mod) => mod.default));
+    // } catch (error) {
+    //     console.warn(`Component ${name} not found, returning fallback.`);
+    // }
+
+    // // Return an empty component
+    // return () => React.createElement("div", { className: "error-message" }, "Loading dynamic component failed (component not found)");
+};
+
+export const getExtensionFunction = (name: string) => {
+    // console.log(`Registry state: `, extensionRegistry);
+    return extensionRegistry.functions[name];
+};

package/src/index.ts

@@ -219,6 +219,7 @@ export { NotFound } from '@/components/common/NotFound'
 import Error from '@/components/common/error';
 export { Error };
 export { SolidFormStepper } from '@/components/common/SolidFormStepper'
+export { SolidViewLayoutManager } from '@/components/core/common/SolidViewLayoutManager';
 
 // export { SolidListViewOptions } from '@/components/core/common/SolidListViewOptions';
 export { SolidConfigureLayoutElement } from '@/components/core/common/SolidConfigureLayoutElement';
@@ -375,6 +376,7 @@ export { addCommasToAmount, calculateDaysOfStay, getSingularAndPlural } from '@/
 // export * from '@/helpers/menu';
 export { createPermission, deletePermission, updatePermission } from '@/helpers/permissions';
 export { revalidateTag } from '@/helpers/revalidate';
+export { registerExtensionComponent, registerExtensionFunction } from '@/helpers/registry';
 
 // redux
 // ├── api
@@ -615,7 +617,20 @@ export { default as userReducer } from '@/redux/features/userSlice';
 export { default as GenerateModelCodeRowAction } from '@/components/core/extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction'
 
 // types
-export type { LayoutConfig } from '@/types';
+export type {
+    LayoutConfig,
+    CommonEntity,
+    ModelMetadata,
+    ModuleMetadata,
+    FieldMetadata,
+    FieldsMetadata,
+    SolidView,
+    LayoutAttribute,
+    LayoutNode,
+    LayoutNodeType,
+    SolidUiEvents,
+    SolidUiEvent
+} from '@/types';
 export { GeneralSettings } from '@/components/common/GeneralSettings';
 
 export { default as authProviders } from '@/nextAuth/authProviders'

package/src/types/index.d.ts

@@ -14,6 +14,20 @@ import {
     AppConfigProps
 } from './layout';
 
+import {
+    CommonEntity,
+    ModelMetadata,
+    ModuleMetadata,
+    FieldMetadata,
+    FieldsMetadata,
+    SolidView,
+    LayoutAttribute,
+    LayoutNode,
+    LayoutNodeType,
+    SolidUiEvents,
+    SolidUiEvent
+} from './solid-core';
+
 type ChildContainerProps = {
     children: ReactNode;
 };
@@ -29,5 +43,16 @@ export type {
     LayoutContextProps,
     ChildContainerProps,
     AppConfigProps,
-    MenuContextProps
+    MenuContextProps,
+    CommonEntity,
+    ModelMetadata,
+    ModuleMetadata,
+    FieldMetadata,
+    FieldsMetadata,
+    SolidView,
+    LayoutAttribute,
+    LayoutNode,
+    LayoutNodeType,
+    SolidUiEvents,
+    SolidUiEvent
 };

package/src/types/solid-core.d.ts

@@ -0,0 +1,90 @@
+// Base type of all Solid entities
+export type CommonEntity = {
+    id: number;
+    createdAt: string;
+    updatedAt: string;
+    deletedAt: string | null;
+    deletedTracker: string;
+};
+
+// Model
+export type ModelMetadata = CommonEntity & {
+    singularName: string;
+    tableName: string;
+    pluralName: string;
+    displayName: string;
+    description: string;
+    dataSource: string;
+    dataSourceType: string;
+    enableSoftDelete: boolean;
+    enableAuditTracking: boolean;
+    internationalisation: boolean;
+    isSystem: boolean;
+    userKeyField: string | null;
+};
+
+// Module 
+export type ModuleMetadata = CommonEntity & {
+    displayName: string;
+    name: string;
+    description: string;
+    menuIconUrl: string | null;
+    menuSequenceNumber: number;
+    defaultDataSource: string;
+    isSystem: boolean;
+};
+
+// Define a general Field type with id and name as required properties
+export type FieldMetadata = CommonEntity & {
+    id: number;
+    name: string;
+    displayName: string;
+
+    // For now we have kept it flexible allowing any number of other key / value pairs...
+    [key: string]: any;
+};
+
+// Represents a collection of fields.
+export type FieldsMetadata = {
+    [key: string]: Field;
+};
+
+// Solid View
+export type SolidView = CommonEntity & {
+    name: string;
+    displayName: string;
+    type: string;
+    // TODO: maybe change this in the future to set this to a json object...
+    context: string;
+    layout: LayoutNode;
+    model: Model;
+    module: Module;
+};
+
+// Layout Types
+export type LayoutAttribute = {
+    name: string;
+    label?: string;
+    className?: string;
+    inlineCreate?: string;
+};
+
+// Generic representation of any node in our layout 
+export type LayoutNodeType = "form" | "sheet" | "notebook" | "page" | "row" | "column" | "field";
+export type LayoutNode = {
+    type: LayoutNodeType;
+    attrs: LayoutAttribute;
+    children?: LayoutNode[];
+};
+
+// Event type
+export type SolidUiEvents = "onFieldChange" | "onFieldBlur";
+export type SolidUiEvent = {
+    type: SolidUiEvents;
+    modifiedField: string;
+    modifiedFieldValue: any;
+    // This comes from Formik...
+    formData: Record<string, any>;
+    viewMetadata: SolidView;
+    fieldsMetadata: FieldsMetadata;
+};