@solidstarters/solid-core-ui 1.1.22 → 1.1.24

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>

package/src/helpers/registry.ts

@@ -1,3 +1,4 @@
+import { CustomHtml } from "@/components/core/form/widgets/CustomHtml";
 import React from "react";
 
 type ExtensionRegistry = {
@@ -11,12 +12,12 @@ const extensionRegistry: ExtensionRegistry = {
 };
 
 export const registerExtensionComponent = (name: string, component: React.ComponentType<any>) => {
-    console.log(`registerExtensionComponent invoked... ${name}`);
+    // console.log(`registerExtensionComponent invoked... ${name}`);
     extensionRegistry.components[name] = component;
 };
 
 export const registerExtensionFunction = (name: string, fn: (...args: any[]) => any) => {
-    console.log(`registerExtensionFunction invoked... ${name}`);
+    // console.log(`registerExtensionFunction invoked... ${name}`);
     extensionRegistry.functions[name] = fn;
 };
 
@@ -47,6 +48,17 @@ export const getExtensionComponent = (name: string): React.ComponentType<any> |
 };
 
 export const getExtensionFunction = (name: string) => {
-    console.log(`Registry state: `, extensionRegistry);
+    // console.log(`Registry state: `, extensionRegistry);
     return extensionRegistry.functions[name];
-};
+};
+
+
+// Register all the dynamic widget & functions from inside solid-core-ui
+// Common
+registerExtensionComponent("CustomHtml", CustomHtml);
+
+
+// ModuleMetadata
+
+
+// ModelMetadata

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';
@@ -616,7 +617,21 @@ 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, SolidUiEvent } from '@/types';
+export type {
+    LayoutConfig,
+    CommonEntity,
+    ModelMetadata,
+    ModuleMetadata,
+    FieldMetadata,
+    FieldsMetadata,
+    SolidView,
+    LayoutAttribute,
+    LayoutNode,
+    LayoutNodeType,
+    SolidUiEvents,
+    SolidUiEvent,
+    SolidFormWidgetProps
+} from '@/types';
 export { GeneralSettings } from '@/components/common/GeneralSettings';
 
 export { default as authProviders } from '@/nextAuth/authProviders'

package/src/types/index.d.ts

@@ -15,7 +15,18 @@ import {
 } from './layout';
 
 import {
-    SolidUiEvent
+    CommonEntity,
+    ModelMetadata,
+    ModuleMetadata,
+    FieldMetadata,
+    FieldsMetadata,
+    SolidView,
+    LayoutAttribute,
+    LayoutNode,
+    LayoutNodeType,
+    SolidUiEvents,
+    SolidUiEvent,
+    SolidFormWidgetProps
 } from './solid-core';
 
 type ChildContainerProps = {
@@ -34,5 +45,16 @@ export type {
     ChildContainerProps,
     AppConfigProps,
     MenuContextProps,
-    SolidUiEvent
+    CommonEntity,
+    ModelMetadata,
+    ModuleMetadata,
+    FieldMetadata,
+    FieldsMetadata,
+    SolidView,
+    LayoutAttribute,
+    LayoutNode,
+    LayoutNodeType,
+    SolidUiEvents,
+    SolidUiEvent,
+    SolidFormWidgetProps
 };

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

@@ -70,7 +70,7 @@ export type LayoutAttribute = {
 };
 
 // Generic representation of any node in our layout 
-export type LayoutNodeType = "form" | "sheet" | "notebook" | "page" | "row" | "column" | "field";
+export type LayoutNodeType = "form" | "sheet" | "notebook" | "page" | "row" | "column" | "field" | "div" | "p" | "span" | "h1" | "h2" | "h3";
 export type LayoutNode = {
     type: LayoutNodeType;
     attrs: LayoutAttribute;
@@ -78,10 +78,19 @@ export type LayoutNode = {
 };
 
 // Event type
-export type SolidUiEvents = "onFieldUpdate"
+export type SolidUiEvents = "onFieldChange" | "onFieldBlur" | "onCustomWidgetRender";
 export type SolidUiEvent = {
     type: SolidUiEvents;
-    modifiedField: string;
+    modifiedField?: string;
+    modifiedFieldValue?: any;
+    // This comes from Formik...
+    formData: Record<string, any>;
+    viewMetadata: SolidView;
+    fieldsMetadata: FieldsMetadata;
+};
+
+export type SolidFormWidgetProps = {
+    field: any;
     // This comes from Formik...
     formData: Record<string, any>;
     viewMetadata: SolidView;