@solidstarters/solid-core-ui 1.1.28 → 1.1.30

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

@@ -1032,7 +1032,7 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
   useEffect(() => {
     const fetchFields = async () => {
       const queryData: any = {
-        limit: 10,
+        limit: 100,
         offset: 0,
         filters: {
           singularName: {
@@ -1044,14 +1044,15 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
       const queryString = qs.stringify(queryData, {
         encodeValuesOnly: true,
       });
-
       const result = await triggerGetModels(queryString).unwrap();
 
       if (result && result.records) {
         if (!result?.records[0]?.userKeyField) {
           setUserKeyFields(true);
-          const fieldsWithUnique = result?.records[0]?.fields?.filter((field: any) => field?.unique === true);
-          setUserKeyData(fieldsWithUnique)
+          const validUserKeyFields = result?.records[0]?.fields?.filter(
+            (field: any) => field?.unique === true && field?.type === 'shortText'
+          );
+          setUserKeyData(validUserKeyFields)
         } else {
           setUserKeyFields(false);
           setUserKeyData([]);
@@ -1151,10 +1152,9 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                   }
                   {fieldMetaData ?
 
-                    <div className="form-wrapper-title text-base">{capitalize(modelMetaData?.displayName)} &gt; {capitalize(fieldMetaData?.displayName)}</div>
-
+                    <div className="form-wrapper-title text-base">Edit {capitalize(fieldMetaData?.displayName)}</div>
                     :
-                    <div className="form-wrapper-title text-base">Add New Field to {capitalize(modelMetaData?.displayName)}</div>
+                    <div className="form-wrapper-title text-base">Add New {selectedType?.label && !showTypeFilter && capitalize(selectedType.label)} Field to {capitalize(modelMetaData?.displayName)}</div>
                   }
                 </div>
                 <div className="flex align-items-center gap-3 close-popup">
@@ -1171,15 +1171,13 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
               modelMetaData={modelMetaData}
             ></FieldSelector>
             :
-            <div className="field-popup-form" >
+            <div className="p-4" style={{ maxHeight: '80vh', overflowY: 'auto', overflowX: 'hidden' }}>
               <div className="p-d-flex p-jc-center creat-field-for form-dem">
                 <div className="p-fluid" style={{ position: 'relative' }}>
-                  <div className="mb-3">
+                  {/* <div className="mb-3">
                     <div className="form-wrapper-title">{fieldMetaData ? `Edit ${capitalize(selectedType.label)} Field` : `Add a new ${capitalize(selectedType.label)} Field`}</div>
-                  </div>
-
-
-                  <TabView>
+                  </div> */}
+                  <TabView panelContainerClassName="px-0">
                     <TabPanel
                       header="Basic Info"
                       className={(formik.touched.hasOwnProperty("name") && formik.errors.hasOwnProperty("name")) || (formik.touched.hasOwnProperty("displayName") && formik.errors.hasOwnProperty("displayName")) || (formik.touched.hasOwnProperty("displayName") && formik.errors.hasOwnProperty("ormType")) ? "tab-error-heading" : ""}
@@ -2924,12 +2922,12 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
                       )}
                     </TabPanel>
                   </TabView>
-                  <div className="flex gap-3 justify-content-between">
-                    <div className="flex align-items-center gap-3 mt-3">
-                      <Button label="Cancel" size="small" severity="secondary" type="reset" onClick={() => setVisiblePopup(false)} outlined className="small-button" />
+                  <div className="flex gap-3">
+                    <div>
+                      <Button label="Finish" size="small" onClick={() => showError()} type="submit"  />
                     </div>
-                    <div className="flex align-items-center gap-3 mt-3">
-                      <Button label="Finish" size="small" onClick={() => showError()} type="submit" className="small-button" />
+                    <div>
+                      <Button label="Cancel" size="small" severity="secondary" type="reset" onClick={() => setVisiblePopup(false)} outlined  />
                     </div>
                   </div>
                 </div>
@@ -2952,13 +2950,13 @@ const FieldMetaDataForm = ({ setIsDirty, modelMetaData, fieldMetaData, setFieldM
         headerClassName="text-center"
         modal
         footer={() => (
-          <div className="flex justify-content-center">
-            <Button label="Yes" icon="pi pi-check" className='small-button' type="reset" severity="danger" autoFocus onClick={() => {
+          <div className="flex gap-3">
+            <Button label="Yes" icon="pi pi-check" size="small" type="reset" severity="danger" autoFocus onClick={() => {
               formik.resetForm()
               setIsBackPopupVisible(false);
               setShowTypeFilter(true);
             }} />
-            <Button label="No" icon="pi pi-times" className='small-button' onClick={() => setIsBackPopupVisible(false)} />
+            <Button label="No" icon="pi pi-times" size="small" onClick={() => setIsBackPopupVisible(false)} />
           </div>
         )}
         onHide={() => setIsBackPopupVisible(false)}

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

@@ -37,7 +37,7 @@ const FieldSelector = ({ handleTypeSelect, modelMetaData }: any) => {
     };
 
     return (
-        <div className='p-4'>
+        <div className='p-4' style={{ height: '80vh', overflowY: 'scroll' }}>
             <p className="form-wrapper-heading text-base m-0">Select Field Type</p>
             <div className='formgrid grid'>
                 {solidFieldOptions.map((field, index) => (

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

@@ -11,6 +11,7 @@ import { Divider } from "primereact/divider";
 import { InputText } from "primereact/inputtext";
 import { InputTextarea } from "primereact/inputtextarea";
 import { Message } from "primereact/message";
+import { Panel } from "primereact/panel";
 import { Toast } from "primereact/toast";
 import { classNames } from "primereact/utils";
 import qs from "qs";
@@ -270,10 +271,10 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
         {/* <div className="form-wrapper-subtitle">Name</div> */}
         <div className="">
           <div className="grid formgrid">
-            <div className="field col-6">
-              <p className="form-wrapper-heading text-base">Basic Info</p>
-              <div className="grid formgrid">
-                <div className="field col-12 flex flex-column gap-2">
+            <div className="field col-6 pr-3">
+              {/* <p className="form-wrapper-heading text-base">Basic Info</p> */}
+              <Panel header={"Basic Info"} className="solid-column-panel">
+                <div className="flex flex-column gap-2 mt-3">
                   <label htmlFor="type" className="form-field-label">
                     Module
                   </label>
@@ -296,7 +297,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                   )}
                 </div>
 
-                <div className="field col-12 flex flex-column gap-1 mt-4">
+                <div className="flex flex-column gap-2 mt-4">
                   <label htmlFor="dataSource" className="form-field-label">
                     Data Source
                   </label>
@@ -315,7 +316,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                     additionalAction={(e: any) => formik.setFieldValue("dataSourceType", e.target.value.type)}
                     formErrors={formErrors}
                   />
-                  {formik.values.dataSourceType && <p className="form-field-label">Your datasource will connect to a {formik.values.dataSourceType} database</p>}
+                  {formik.values.dataSourceType && <p className="form-field-label text-sm">Your datasource will connect to a {formik.values.dataSourceType} database</p>}
                   {(isFormFieldValid(formik, "dataSource") || (formErrors["dataSource"])) && (
                     <Message severity="error" text={formik?.errors?.dataSource?.toString()} />
                   )}
@@ -355,10 +356,10 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                     <Message severity="error" text={formik?.errors?.dataSourceType?.toString()} />
                   )}
                 </div>*/}
-              </div>
-              <Divider />
-              <p className="form-wrapper-heading text-base">Configurations</p>
-              <div className="grid formgrid">
+              </Panel>
+              {/* <Divider /> */}
+              {/* <p className="form-wrapper-heading text-base">Configurations</p> */}
+              <Panel header={"Configurations"} className="solid-column-panel mt-5">
                 {/* {params.id === 'new' &&
 
                   <div className="field col-6">
@@ -382,28 +383,27 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                       />
                     )}
                   </div>} */}
-                <div className="field col-6">
-                  <div className="flex align-items-center gap-2">
-                    <Checkbox
-                      name="enableSoftDelete"
-                      onChange={(e) => {
-                        formik.setFieldValue("enableSoftDelete", e.checked);
-                      }}
-                      disabled={params.id !== 'new'}
-                      checked={formik.values.enableSoftDelete}
-                    ></Checkbox>
-                    <label htmlFor="enableSoftDelete" className="form-field-label">
-                      Enable Soft Delete
-                    </label>
-                  </div>
-                  {params.id !== 'new' && <p className="form-field-label">Soft-delete can only be set during initial creation to maintain data integrity</p>}
-                  {(isFormFieldValid(formik, "enableSoftDelete") || (formErrors["enableSoftDelete"])) && (
-                    <Message
-                      severity="error"
-                      text={formik?.errors?.enableSoftDelete?.toString()}
-                    />
-                  )}
+                <div className="flex align-items-center gap-2 mt-3">
+                  <Checkbox
+                    name="enableSoftDelete"
+                    onChange={(e) => {
+                      formik.setFieldValue("enableSoftDelete", e.checked);
+                    }}
+                    disabled={params.id !== 'new'}
+                    checked={formik.values.enableSoftDelete}
+                  ></Checkbox>
+                  <label htmlFor="enableSoftDelete" className="form-field-label">
+                    Enable Soft Delete
+                  </label>
                 </div>
+                {params.id !== 'new' && <p className="form-field-label mt-1 text-sm">Soft-delete can only be set during initial creation to maintain data integrity</p>}
+                {(isFormFieldValid(formik, "enableSoftDelete") || (formErrors["enableSoftDelete"])) && (
+                  <Message
+                    severity="error"
+                    text={formik?.errors?.enableSoftDelete?.toString()}
+                    className="mt-2"
+                  />
+                )}
                 {/* <div className="field col-6">
                   <div className="flex align-items-center gap-2 mt-3">
                     <Checkbox
@@ -503,139 +503,139 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                   }
                 </div>*/}
 
-              </div>
+              </Panel>
 
             </div>
-            <div className="field col-6">
+            <div className="field col-6 pl-3">
 
-              <p className="form-wrapper-heading text-base">Basic Settings</p>
-              <div className="grid formgrid">
-                <div className="field col-12 flex flex-column gap-2">
-                  <label htmlFor="displayName" className="form-field-label">
-                    Display Name
-                  </label>
-                  <InputText
-                    type="text"
-                    id="displayName"
-                    name="displayName"
-                    onChange={(e) => {
+              {/* <p className="form-wrapper-heading text-base">Basic Settings</p> */}
+              <Panel header={"Basic Settings"} className="solid-column-panel">
+                  <div className="flex flex-column gap-2 mt-3">
+                    <label htmlFor="displayName" className="form-field-label">
+                      Display Name
+                    </label>
+                    <InputText
+                      type="text"
+                      id="displayName"
+                      name="displayName"
+                      onChange={(e) => {
 
-                      formik.handleChange(e);
-                      const { toCamelCase, toSnakeCase, toPluralCamelCase } = getSingularAndPlural(e.target.value);
-                      if (params.id === 'new') {
-                        formik.setFieldValue("singularName", toCamelCase);
-                        formik.setFieldValue("pluralName", toPluralCamelCase);
-                      }
-                      if (showTableName == true) {
+                        formik.handleChange(e);
+                        const { toCamelCase, toSnakeCase, toPluralCamelCase } = getSingularAndPlural(e.target.value);
                         if (params.id === 'new') {
-                          formik.setFieldValue("tableName", toSnakeCase);
+                          formik.setFieldValue("singularName", toCamelCase);
+                          formik.setFieldValue("pluralName", toPluralCamelCase);
+                        }
+                        if (showTableName == true) {
+                          if (params.id === 'new') {
+                            formik.setFieldValue("tableName", toSnakeCase);
+                          }
                         }
-                      }
 
 
-                    }}
-                    value={formik.values.displayName}
-                    className={classNames("", {
-                      "p-invalid": isFormFieldValid(formik, "displayName") || formErrors["displayName"],
-                    })}
-
-                  />
+                      }}
+                      value={formik.values.displayName}
+                      className={classNames("", {
+                        "p-invalid": isFormFieldValid(formik, "displayName") || formErrors["displayName"],
+                      })}
 
-                  {(isFormFieldValid(formik, "displayName") || (formErrors["displayName"])) && (
-                    <Message
-                      severity="error"
-                      text={formik?.errors?.displayName?.toString()}
                     />
-                  )}
-                </div>
-                <div className="field col-12 flex flex-column gap-1 mt-4">
-                  <label htmlFor="singularName" className="form-field-label">
-                    Singular Name
-                  </label>
-                  <InputText
-                    disabled={true}
-                    type="text"
-                    id="singularName"
-                    name="singularName"
-                    onChange={formik.handleChange}
-                    value={formik.values.singularName}
-                    className={classNames("", {
-                      "p-invalid": isFormFieldValid(formik, "singularName") || formErrors["singularName"],
-                    })}
-                  />
-                  {(isFormFieldValid(formik, "singularName") || (formErrors["singularName"])) && (
-                    <Message
-                      severity="error"
-                      text={formik?.errors?.singularName?.toString()}
-                    />
-                  )}
-                </div>
-                <div className="field col-12 flex flex-column gap-1 mt-4">
-                  <label htmlFor="pluralName" className="form-field-label">
-                    Plural Name
-                  </label>
-                  <InputText
-                    disabled={true}
-                    type="text"
-                    id="pluralName"
-                    name="pluralName"
-                    onChange={formik.handleChange}
-                    value={formik.values.pluralName}
-                    className={classNames("", {
-                      "p-invalid": isFormFieldValid(formik, "pluralName") || formErrors["pluralName"],
-                    })}
-                  />
-                  {(isFormFieldValid(formik, "pluralName") || (formErrors["pluralName"])) && (
-                    <Message severity="error" text={formik?.errors?.pluralName?.toString()} />
-                  )}
-                </div>
 
-                <div className="field col-12 mt-4">
-                  <div className="flex align-items-center gap-2">
-                    <Checkbox onChange={e => {
-                      setShowTableName(e.checked);
-                      if (e.checked === true) {
-                        const { toCamelCase, toSnakeCase, toPluralCamelCase } = getSingularAndPlural(formik.values.displayName);
-                        if (params.id === 'new') {
-                          formik.setFieldValue("tableName", toSnakeCase);
-                        }
-                      }
-
-                    }} checked={showTableName} disabled={params.id !== 'new'}></Checkbox>
-                    <label htmlFor="ingredient1" className="form-field-label">
-                      Set table name
-                    </label>
+                    {(isFormFieldValid(formik, "displayName") || (formErrors["displayName"])) && (
+                      <Message
+                        severity="error"
+                        text={formik?.errors?.displayName?.toString()}
+                      />
+                    )}
                   </div>
-                </div>
-                {showTableName &&
-                  <div className="field col-12 flex flex-column gap-1 mt-4">
-                    <label htmlFor="tableName" className="form-field-label">
-                      Table Name
+                  <div className="flex flex-column gap-1 mt-4">
+                    <label htmlFor="singularName" className="form-field-label">
+                      Singular Name
                     </label>
                     <InputText
-                      disabled={params.id !== 'new'}
+                      disabled={true}
                       type="text"
-                      id="tableName"
-                      name="tableName"
+                      id="singularName"
+                      name="singularName"
                       onChange={formik.handleChange}
-                      value={formik.values.tableName}
+                      value={formik.values.singularName}
                       className={classNames("", {
-                        "p-invalid": isFormFieldValid(formik, "tableName") || formErrors["tableName"],
+                        "p-invalid": isFormFieldValid(formik, "singularName") || formErrors["singularName"],
                       })}
                     />
-                    {(isFormFieldValid(formik, "tableName") || (formErrors["tableName"])) && (
+                    {(isFormFieldValid(formik, "singularName") || (formErrors["singularName"])) && (
                       <Message
                         severity="error"
-                        text={formik?.errors?.tableName?.toString()}
+                        text={formik?.errors?.singularName?.toString()}
                       />
                     )}
                   </div>
-                }
-                <div className="field col-12 flex flex-column gap-1 mt-4">
-                  <label htmlFor="description" className="form-field-label">
-                    Description
-                  </label>
-                  {/* <InputText
+                  <div className="flex flex-column gap-1 mt-4">
+                    <label htmlFor="pluralName" className="form-field-label">
+                      Plural Name
+                    </label>
+                    <InputText
+                      disabled={true}
+                      type="text"
+                      id="pluralName"
+                      name="pluralName"
+                      onChange={formik.handleChange}
+                      value={formik.values.pluralName}
+                      className={classNames("", {
+                        "p-invalid": isFormFieldValid(formik, "pluralName") || formErrors["pluralName"],
+                      })}
+                    />
+                    {(isFormFieldValid(formik, "pluralName") || (formErrors["pluralName"])) && (
+                      <Message severity="error" text={formik?.errors?.pluralName?.toString()} />
+                    )}
+                  </div>
+
+                  <div className="mt-4">
+                    <div className="flex align-items-center gap-2">
+                      <Checkbox onChange={e => {
+                        setShowTableName(e.checked);
+                        if (e.checked === true) {
+                          const { toCamelCase, toSnakeCase, toPluralCamelCase } = getSingularAndPlural(formik.values.displayName);
+                          if (params.id === 'new') {
+                            formik.setFieldValue("tableName", toSnakeCase);
+                          }
+                        }
+
+                      }} checked={showTableName} disabled={params.id !== 'new'}></Checkbox>
+                      <label htmlFor="ingredient1" className="form-field-label">
+                        Set table name
+                      </label>
+                    </div>
+                  </div>
+                  {showTableName &&
+                    <div className="flex flex-column gap-1 mt-4">
+                      <label htmlFor="tableName" className="form-field-label">
+                        Table Name
+                      </label>
+                      <InputText
+                        disabled={params.id !== 'new'}
+                        type="text"
+                        id="tableName"
+                        name="tableName"
+                        onChange={formik.handleChange}
+                        value={formik.values.tableName}
+                        className={classNames("", {
+                          "p-invalid": isFormFieldValid(formik, "tableName") || formErrors["tableName"],
+                        })}
+                      />
+                      {(isFormFieldValid(formik, "tableName") || (formErrors["tableName"])) && (
+                        <Message
+                          severity="error"
+                          text={formik?.errors?.tableName?.toString()}
+                        />
+                      )}
+                    </div>
+                  }
+                  <div className="flex flex-column gap-1 mt-4">
+                    <label htmlFor="description" className="form-field-label">
+                      Description
+                    </label>
+                    {/* <InputText
                       type="text"
                       id="description"
                       name="description"
@@ -645,25 +645,25 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                         "p-invalid": isFormFieldValid(formik, "description"),
                       })}
                     /> */}
-                  <InputTextarea
-                    id="description"
-                    name="description"
-                    onChange={formik.handleChange}
-                    value={formik.values.description}
-                    className={classNames("", {
-                      "p-invalid": isFormFieldValid(formik, "description") || formErrors["description"],
-                    })}
-                    rows={5}
-                    cols={30}
-                  />
-                  {(isFormFieldValid(formik, "description") || (formErrors["description"])) && (
-                    <Message
-                      severity="error"
-                      text={formik?.errors?.description?.toString()}
+                    <InputTextarea
+                      id="description"
+                      name="description"
+                      onChange={formik.handleChange}
+                      value={formik.values.description}
+                      className={classNames("", {
+                        "p-invalid": isFormFieldValid(formik, "description") || formErrors["description"],
+                      })}
+                      rows={5}
+                      cols={30}
                     />
-                  )}
-                </div>
-              </div>
+                    {(isFormFieldValid(formik, "description") || (formErrors["description"])) && (
+                      <Message
+                        severity="error"
+                        text={formik?.errors?.description?.toString()}
+                      />
+                    )}
+                  </div>
+              </Panel>
             </div>
 
             {/* <div className="md:col-6 sm:col-12">