@solidstarters/solid-core-ui 1.1.67 → 1.1.69

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

@@ -394,16 +394,26 @@ const createValidationSchema = (currentFields: any, selectedType: any, allFields
         "Relation Model Singular Name is required"
       ),
     }),
-    // ...(currentFields.includes("relationCoModelFieldName") && {
-    //   relationCoModelFieldName: Yup.string()
-    //   // .required(
-    //   //   "Relation Model Field Name is required"
-    //   // ),
-    // }),
-
+    ...(currentFields.includes("relationCoModelFieldName") && {
+      relationCoModelFieldName: Yup.string()
+      // .required(
+      //   "Relation Model Field Name is required"
+      // ),
+    }),
     ...(currentFields.includes("relationCreateInverse") && {
       relationCreateInverse: Yup.boolean(),
     }),
+    ...(currentFields.includes("relationCoModelFieldName") && {
+      relationCoModelFieldName: Yup.string().when("relationCreateInverse", (relationCreateInverse: any, schema) => {
+        console.log("relationCreateInverse", relationCreateInverse);
+        if (relationCreateInverse.length > 0 && relationCreateInverse[0] == true) {
+          return schema.required("Relation Co Model Field Name is required")
+        } else {
+          return schema.notRequired();
+        }
+      }),
+    }),
+
     // ...(currentFields.includes("relationCascade") && {
     //   relationCascade: Yup.string().required(
     //     "Relation Cascade Value is required"
@@ -425,6 +435,11 @@ const createValidationSchema = (currentFields: any, selectedType: any, allFields
         "Relation Model Module Name Value is required"
       ),
     }),
+
+    ...(currentFields.includes("relationFieldFixedFilter") && {
+      relationFieldFixedFilter: Yup.string().nullable(),
+    }),
+
     ...(currentFields.includes("selectionDynamicProvider") && {
       selectionDynamicProvider: Yup.string().required(
         "Selection Dynamic Provider Value is required"
@@ -898,6 +913,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
     relationCreateInverse: fieldMetaData ? fieldMetaData?.relationCreateInverse : false,
     relationCascade: fieldMetaData ? fieldMetaData?.relationCascade : 'cascade',
     relationModelModuleName: fieldMetaData ? fieldMetaData?.relationModelModuleName : modelMetaData?.module.name,
+    relationFieldFixedFilter: fieldMetaData ? fieldMetaData?.relationFieldFixedFilter : "",
     selectionDynamicProvider: fieldMetaData ? fieldMetaData?.selectionDynamicProvider : null,
     selectionDynamicProviderCtxt: fieldMetaData ? fieldMetaData?.selectionDynamicProviderCtxt : "",
     selectionStaticValues: fieldMetaData ? fieldMetaData?.selectionStaticValues : [""],
@@ -1705,8 +1721,12 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                               <SelectButton
                                 value={formik.values.relationType}
                                 options={fieldDefaultMetaData.data.relationTypes}
-                                onChange={(e) =>
-                                  formik.setFieldValue("relationType", e.value)
+                                onChange={(e) => {
+                                  formik.setFieldValue("relationType", e.value);
+                                  if (e.value === "one-to-many") {
+                                    formik.setFieldValue("relationCreateInverse", true);
+                                  }
+                                }
                                 }
                                 className={classNames("", {
                                   "p-invalid": isFormFieldValid(formik, "relationType"),
@@ -1869,6 +1889,56 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                               </div>
                             )}
 
+                          {currentFields.includes(
+                            "relationFieldFixedFilter"
+                          ) && (
+                              <div className="field col-6 flex-flex-column gap-2 mt-3">
+                                <label
+                                  htmlFor="relationFieldFixedFilter"
+                                  className="form-field-label"
+                                >
+                                  Relation Field Fixed Filter
+                                </label>
+
+                                <InputTextarea
+                                  aria-describedby="Fixed Filter"
+                                  id="relationFieldFixedFilter"
+                                  name="relationFieldFixedFilter"
+                                  onChange={formik.handleChange}
+                                  value={formik.values.relationFieldFixedFilter}
+                                  rows={5}
+                                  cols={30}
+                                  className={classNames("", {
+                                    "p-invalid": isFormFieldValid(
+                                      formik,
+                                      "relationFieldFixedFilter"
+                                    ),
+                                  })}
+                                />
+                                {/* 
+                                <InputText
+                                  type="text"
+                                  id="relationFieldFixedFilter"
+                                  name="relationFieldFixedFilter"
+                                  onChange={formik.handleChange}
+                                  disabled={fieldMetaData?.id}
+                                  value={formik.values.relationFieldFixedFilter}
+                                  className={classNames("", {
+                                    "p-invalid": isFormFieldValid(
+                                      formik,
+                                      "relationFieldFixedFilter"
+                                    ),
+                                  })}
+                                /> */}
+                                {isFormFieldValid(formik, "relationFieldFixedFilter") && (
+                                  <Message
+                                    severity="error"
+                                    text={formik?.errors?.relationFieldFixedFilter?.toString()}
+                                  />
+                                )}
+
+                              </div>
+                            )}
                           {isUserKeyFields && (
                             <div className="field col-6 flex-flex-column gap-2 mt-3">
                               <label
@@ -1902,7 +1972,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                             </div>
                           )}
 
-                          {currentFields.includes("relationCreateInverse") && (formik.values.relationType === "many-to-many" || formik.values.relationType === "many-to-one") && (
+                          {currentFields.includes("relationCreateInverse") && (
                             <div className="field col-6 flex flex-column gap-2 mt-3">
                               <label htmlFor="relationCreateInverse" className="form-field-label">
                                 Relation Create Inverse
@@ -1912,6 +1982,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                                   inputId="relationCreateInverse"
                                   name="relationCreateInverse"
                                   checked={formik.values.relationCreateInverse}
+                                  disabled={formik.values.relationType === "one-to-many" ? true : false}
                                   onChange={(e) => formik.setFieldValue("relationCreateInverse", e.checked)}
                                 />
                                 <label htmlFor="relationCreateInverse" className="ml-2">Create Inverse</label>
@@ -1935,6 +2006,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                                 id="relationCoModelFieldName"
                                 name="relationCoModelFieldName"
                                 onChange={formik.handleChange}
+                                disabled={fieldMetaData?.id}
                                 value={formik.values.relationCoModelFieldName}
                                 className={classNames("", {
                                   "p-invalid": isFormFieldValid(
@@ -1997,6 +2069,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                                 id="relationCoModelColumnName"
                                 name="relationCoModelColumnName"
                                 onChange={formik.handleChange}
+                                disabled={fieldMetaData?.id}
                                 value={formik.values.relationCoModelColumnName}
                                 className={classNames("", {
                                   "p-invalid": isFormFieldValid(
@@ -2028,6 +2101,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                                 id="relationJoinTableName"
                                 name="relationJoinTableName"
                                 onChange={formik.handleChange}
+                                disabled={fieldMetaData?.id}
                                 value={formik.values.relationJoinTableName}
                                 className={classNames("", {
                                   "p-invalid": isFormFieldValid(
@@ -2927,10 +3001,10 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                   </TabView>
                   <div className="flex gap-3">
                     <div>
-                      <Button label="Finish" size="small" onClick={() => showError()} type="submit"  />
+                      <Button label="Finish" size="small" onClick={() => showError()} type="submit" />
                     </div>
                     <div>
-                      <Button label="Cancel" size="small" severity="secondary" type="reset" onClick={() => setVisiblePopup(false)} outlined  />
+                      <Button label="Cancel" size="small" severity="secondary" type="reset" onClick={() => setVisiblePopup(false)} outlined />
                     </div>
                   </div>
                 </div>

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

@@ -56,7 +56,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
     enableSoftDelete: modelMetaData ? modelMetaData?.enableSoftDelete : "",
     enableAuditTracking: modelMetaData ? modelMetaData?.enableAuditTracking : "",
     internationalisation: modelMetaData ? modelMetaData?.internationalisation : "",
-    isChild: modelMetaData ? modelMetaData?.isChild : false,
+    isChild: modelMetaData ? modelMetaData?.isChild : "",
     parentModelId: modelMetaData ? modelMetaData?.parentModel?.id : "",
     parentModel: modelMetaData ? modelMetaData?.parentModel : "",
 
@@ -104,8 +104,22 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
     enableAuditTracking: Yup.boolean(),
     internationalisation: Yup.boolean(),
     isChild: Yup.boolean(),
-    parentModelId: Yup.number(),
-    parentModel: Yup.object()
+    parentModelId: Yup.number().when("isChild", (isChild: any, schema) => {
+      console.log("relationCreateInverse", isChild);
+      if (isChild.length > 0 && isChild[0] == true) {
+        return schema.required("Parent Model Id is required")
+      } else {
+        return schema.notRequired().nullable();
+      }
+    }),
+    parentModel: Yup.object().when("isChild", (isChild: any, schema) => {
+      console.log("relationCreateInverse", isChild);
+      if (isChild.length > 0 && isChild[0] == true) {
+        return schema.required("Parent Model is required")
+      } else {
+        return schema.notRequired().nullable();
+      }
+    }),
 
   });
 
@@ -138,7 +152,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
           enableSoftDelete: values.enableSoftDelete === true ? true : '',
           enableAuditTracking: values.enableAuditTracking === true ? true : '',
           internationalisation: values.internationalisation === true ? true : '',
-          isChild: values.isChild ? values.isChild === true : '',
+          isChild: values.isChild === true ? true : '',
           ...(values.isChild == true && {
             parentModelId: values.parentModelId,
             parentModel: values.parentModel,
@@ -455,14 +469,27 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                   />
                 )}
 
-                <div className="mt-4">
-                  <div className="flex align-items-center gap-2">
-                    <Checkbox onChange={e => { setShowParentModel(e.checked) }} checked={showParentModel} disabled={params.id !== 'new'}></Checkbox>
-                    <label htmlFor="ingredient1" className="form-field-label">
-                      isChild
-                    </label>
-                  </div>
+                <div className="flex align-items-center gap-2 mt-3">
+                  <Checkbox
+                    name="isChild"
+                    onChange={(e) => {
+                      formik.setFieldValue("isChild", e.checked);
+                    }}
+                    disabled={params.id !== 'new'}
+                    checked={formik.values.isChild}
+                  ></Checkbox>
+                  <label htmlFor="isChild" className="form-field-label">
+                    Is Child
+                  </label>
                 </div>
+                {params.id !== 'new' && <p className="form-field-label mt-1 text-sm">Is Current Model child of another Model</p>}
+                {(isFormFieldValid(formik, "isChild") || (formErrors["isChild"])) && (
+                  <Message
+                    severity="error"
+                    text={formik?.errors?.isChild?.toString()}
+                    className="mt-2"
+                  />
+                )}
                 {showParentModel &&
                   <div className="flex flex-column gap-2 mt-3">
                     <label htmlFor="type" className="form-field-label">

package/src/helpers/registry.ts

@@ -9,7 +9,7 @@ import { SolidBooleanFieldCheckboxWidget } from "@/components/core/form/fields/w
 import { SolidBooleanFieldSelectWidget } from "@/components/core/form/fields/widgets/SolidBooleanSelectFieldWidget";
 import { SolidSelectionStaticAutocompleteWidget } from "@/components/core/form/fields/widgets/SolidSelectionStaticAutocompleteFieldWidget";
 import { SolidSelectionStaticRadioWidget } from "@/components/core/form/fields/widgets/SolidSelectionStaticRadioFieldWidget";
-import { SolidShortTextFieldTextRenderModeWidget } from "@/components/core/list/widgets/SolidShortTextFieldTextRenderModeWidget copy";
+import { SolidShortTextFieldTextRenderModeWidget } from "@/components/core/list/widgets/SolidShortTextFieldTextRenderModeWidget";
 import { SolidShortTextFieldImageRenderModeWidget } from "@/components/core/list/widgets/SolidShortTextFieldImageRenderModeWidget";
 import { SolidFormFieldViewModeWidget } from "@/components/core/form/fields/widgets/SolidFormFieldViewModeWidget";
 import { SolidFormFieldJsonViewModeWidget } from "@/components/core/form/fields/widgets/SolidFormFieldJsonViewModeWidget";
@@ -19,6 +19,9 @@ import { SolidFormFieldMediaViewModeWidget } from "@/components/core/form/fields
 import { SolidFormFieldRelationViewModeWidget } from "@/components/core/form/fields/widgets/SolidFormFieldRelationViewModeWidget";
 import { SolidFormFieldViewMediaSingleWidget } from "@/components/core/form/fields/widgets/SolidFormFieldViewMediaSingleWidget";
 import { SolidFormFieldViewMediaMultipleWidget } from "@/components/core/form/fields/widgets/SolidFormFieldViewMediaMultipleWidget";
+import { SolidUserNameAvatarWidget } from "@/components/core/list/widgets/SolidUserNameAvatarWidget";
+import GenerateModelCodeRowAction from "@/components/core/extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction";
+import GenerateModuleCodeRowAction from "@/components/core/extension/solid-core/moduleMetadata/list/GenerateModuleCodeRowAction";
 
 type ExtensionRegistry = {
     components: Record<string, React.ComponentType<any>>;
@@ -79,6 +82,11 @@ export const getExtensionFunction = (name: string) => {
 // Register all the dynamic widget & functions from inside solid-core-ui
 // Common
 registerExtensionComponent("CustomHtml", CustomHtml, []);
+
+
+
+registerExtensionComponent("GenerateModelCodeRowAction", GenerateModelCodeRowAction, []);
+registerExtensionComponent("GenerateModuleCodeRowAction", GenerateModuleCodeRowAction, []);
 registerExtensionComponent("SolidRelationManyToManyCheckboxWidget", SolidRelationManyToManyCheckboxWidget, ["checkbox"]);
 registerExtensionComponent("SolidRelationManyToManyAutocompleteWidget", SolidRelationManyToManyAutocompleteWidget, ["autocomplete"]);
 registerExtensionComponent("SolidBooleanFieldCheckboxWidget", SolidBooleanFieldCheckboxWidget, ["field-checkbox"]);
@@ -95,6 +103,8 @@ registerExtensionComponent("SolidFormFieldMediaViewModeWidget", SolidFormFieldMe
 registerExtensionComponent("SolidFormFieldRelationViewModeWidget", SolidFormFieldRelationViewModeWidget, []);
 registerExtensionComponent("SolidFormFieldViewMediaSingleWidget", SolidFormFieldViewMediaSingleWidget, []);
 registerExtensionComponent("SolidFormFieldViewMediaMultipleWidget", SolidFormFieldViewMediaMultipleWidget, []);
+registerExtensionComponent("SolidFormFieldViewMediaMultipleWidget", SolidFormFieldViewMediaMultipleWidget, []);
+registerExtensionComponent("SolidUserNameAvatarWidget", SolidUserNameAvatarWidget, []);
 
 
 // ModuleMetadata

package/src/redux/api/modelApi.ts

@@ -20,7 +20,7 @@ export const modelsApi = createApi({
             }
         }),
         getmodelById: builder.query({
-            query: (id) => `/model-metadata/${id}?populate[0]=fields&populate[1]=module&populate[2]=fields.mediaStorageProvider`,
+            query: (id) => `/model-metadata/${id}?populate[0]=fields&populate[1]=module&&populate[2]=fields.mediaStorageProvider&populate[3]=parentModel`,
         }),
         createmodel: builder.mutation({
             query: (model) => ({

package/src/resources/globals.css

@@ -2938,6 +2938,11 @@ li.header-li-px {
   max-width: calc(20% - 20px);
 }
 
+.solid-kanban-action {
+  position: absolute;
+  right: 5px;
+}
+
 .solid-kanban-card {
   box-shadow: none;
   border-radius: 0.5rem;

package/src/resources/themes/solid-light-purple/theme.css

@@ -6205,6 +6205,10 @@
     background-color: #EFF1F4;
   }
 
+  .solid-kanban-board-wrapper {
+    border-top: 1px solid var(--primary-light-color);
+  }
+
   .solid-kanban-card,
   .solid-media-card {
     border: 1px solid var(--solid-kanban-wrapper);