@solidstarters/solid-core-ui 1.1.3 → 1.1.5

package/src/components/core/list/columns/SolidExternalIdColumn.tsx

@@ -35,9 +35,9 @@ const SolidExternalIdColumn = ({ solidListViewMetaData, fieldMetadata, column }:
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
-            filter={filterable}
+            // filter={filterable}
             dataType={columnDataType}
             showFilterOperator={showFilterOperator}
             filterMatchModeOptions={filterMatchModeOptions}

package/src/components/core/list/columns/SolidIdColumn.tsx

@@ -35,9 +35,9 @@ const SolidIdColumn = ({ solidListViewMetaData, fieldMetadata, column }: SolidLi
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.sortable}
-            filter={filterable}
+            // filter={filterable}
             dataType={columnDataType}
             showFilterOperator={showFilterOperator}
             filterMatchModeOptions={filterMatchModeOptions}

package/src/components/core/list/columns/SolidIntColumn.tsx

@@ -43,9 +43,9 @@ const SolidIntColumn = ({ solidListViewMetaData, fieldMetadata, column }: SolidL
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
-            filter={filterable}
+            // filter={filterable}
             dataType={columnDataType}
             showFilterOperator={showFilterOperator}
             filterMatchModeOptions={filterMatchModeOptions}

package/src/components/core/list/columns/SolidMediaMultipleColumn.tsx

@@ -15,9 +15,9 @@ const SolidMediaMultipleColumn = ({ solidListViewMetaData, fieldMetadata, column
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
-            filter={filterable}
+            // filter={filterable}
             dataType={columnDataType}
             showFilterOperator={showFilterOperator}
             filterPlaceholder={`Search by ${fieldMetadata.displayName}`}

package/src/components/core/list/columns/SolidMediaSingleColumn.tsx

@@ -18,9 +18,9 @@ const SolidMediaSingleColumn = ({ solidListViewMetaData, fieldMetadata, column }
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
-            filter={filterable}
+            // filter={filterable}
             dataType={columnDataType}
             showFilterOperator={showFilterOperator}
             filterPlaceholder={`Search by ${fieldMetadata.displayName}`}

package/src/components/core/list/columns/SolidSelectionDynamicColumn.tsx

@@ -35,9 +35,9 @@ const SolidSelectionDynamicColumn = ({ solidListViewMetaData, fieldMetadata, col
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
-            filter={filterable}
+            // filter={filterable}
             dataType={columnDataType}
             showFilterOperator={showFilterOperator}
             filterMatchModeOptions={filterMatchModeOptions}

package/src/components/core/list/columns/SolidSelectionStaticColumn.tsx

@@ -37,7 +37,7 @@ const SolidSelectionStaticColumn = ({ solidListViewMetaData, fieldMetadata, colu
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
             // filter={filterable}
             dataType={columnDataType}

package/src/components/core/list/columns/SolidShortTextColumn.tsx

@@ -53,11 +53,9 @@ const SolidShortTextColumn = ({ solidListViewMetaData, fieldMetadata, column }:
             filterPlaceholder={`Search by ${fieldMetadata.displayName}`}
             style={{ minWidth: "12rem" }}
             headerClassName="table-header-fs"
-            // body={(data)=>{
-            //     console.log("DAta", data);
-                
-            //     return <div className="solid-table-row">{data.name}</div>
-            // }}
+            body={(rowData) => {
+                return <div className="solid-table-row">{rowData[fieldMetadata.name]}</div>;
+            }}
         ></Column>
     );
 

package/src/components/core/list/columns/SolidTimeColumn.tsx

@@ -34,7 +34,7 @@ const SolidTimeColumn = ({ solidListViewMetaData, fieldMetadata, column }: Solid
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
             // filter={filterable}
             dataType={columnDataType}

package/src/components/core/list/columns/relations/SolidRelationManyToOneColumn.tsx

@@ -52,9 +52,9 @@ const SolidRelationManyToOneColumn = ({ solidListViewMetaData, fieldMetadata, co
             key={fieldMetadata.name}
             field={fieldMetadata.name}
             header={header}
-            className="text-sm"
+            // className="text-sm"
             sortable={column.attrs.sortable}
-            filter={filterable}
+            // filter={filterable}
             dataType={columnDataType}
             showFilterOperator={showFilterOperator}
             filterMatchModeOptions={filterMatchModeOptions}

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

@@ -195,6 +195,7 @@ function fetchCurrentFields(solidFieldType: any, fieldDefaultMetaData: any) {
     "index",
     "private",
     "encrypt",
+    "isUserKey"
   ];
 
 }
@@ -900,7 +901,8 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
     // externalIdProvider: fieldMetaData ? fieldMetaData?.externalIdProvider : null,
     // externalIdProviderCtxt: fieldMetaData ? fieldMetaData?.externalIdProviderCtxt : "",
     isSystem: fieldMetaData ? fieldMetaData?.isSystem : false,
-    columnName: fieldMetaData ? fieldMetaData?.columnName : null
+    columnName: fieldMetaData ? fieldMetaData?.columnName : null,
+    isUserKey: fieldMetaData ? fieldMetaData?.isUserKey : false
   };
 
 
@@ -966,7 +968,6 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
   };
 
 
-
   const handleTypeSelect = (e: any) => {
 
 
@@ -2736,7 +2737,32 @@ const FieldMetaDataForm = ({ modelMetaData, fieldMetaData, setFieldMetaData, all
                             </div>
                           </div>
                         )}
+                        {currentFields.includes("isUserKey") && (
+                          <div className="md:col-6 sm:col-12">
+                            <div className="field">
+                              <div className="flex align-items-center">
+                                <Checkbox
+                                  name="isUserKey"
+                                  onChange={(e) => {
+                                    formik.setFieldValue("isUserKey", e.checked);
+                                  }}
+                                  checked={formik.values.isUserKey}
+                                ></Checkbox>
+                                <label htmlFor="ingredient1" className="form-label form-field-label ml-2">
+                                  Is Userkey
+                                </label>
+                              </div>
+                              <p className="fieldSubTitle">If userkey already then it will be replaced with this key</p>
 
+                              {isFormFieldValid(formik, "isUserKey") && (
+                                <Message
+                                  severity="error"
+                                  text={formik?.errors?.isUserKey?.toString()}
+                                />
+                              )}
+                            </div>
+                          </div>
+                        )}
                       </div>
 
 

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

@@ -46,21 +46,16 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
     description: modelMetaData ? modelMetaData?.description : "",
     dataSource: modelMetaData ? modelMetaData?.dataSource : "",
     dataSourceType: modelMetaData ? modelMetaData?.dataSourceType : "",
-    tableName: modelMetaData ? modelMetaData?.tableName : "",
+    tableName: modelMetaData ? modelMetaData?.tableName : null,
     moduleId: modelMetaData ? modelMetaData?.module?.id : "",
     module: modelMetaData ? modelMetaData?.module : "",
     isSystem: modelMetaData ? modelMetaData?.isSystem : false,
     enableSoftDelete: modelMetaData ? modelMetaData?.enableSoftDelete : "",
     enableAuditTracking: modelMetaData ? modelMetaData?.enableAuditTracking : "",
     internationalisation: modelMetaData ? modelMetaData?.internationalisation : "",
-    isExportable: modelMetaData ? modelMetaData?.isExportable : "",
-    hasUserKey: modelMetaData ? modelMetaData?.hasUserKey : "",
-    userKeyFieldId: modelMetaData ? modelMetaData.userKeyFieldId : "",
   };
 
   const [showTableName, setShowTableName] = useState<any>(false);
-  const [showUserKeyField, setShowUserKeyField] = useState<any>(modelMetaData?.hasUserKey == true ? true : false);
-
 
   useEffect(() => {
     if (modelMetaData && modelMetaData.tableName) {
@@ -97,7 +92,6 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
     enableSoftDelete: Yup.boolean(),
     enableAuditTracking: Yup.boolean(),
     internationalisation: Yup.boolean(),
-    isExportable: Yup.boolean(),
   });
 
 
@@ -128,9 +122,6 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
           enableSoftDelete: values.enableSoftDelete === true ? true : '',
           enableAuditTracking: values.enableAuditTracking === true ? true : '',
           internationalisation: values.internationalisation === true ? true : '',
-          isExportable: values.isExportable === true ? true : '',
-          hasUserKey: values.hasUserKey === true ? true : '',
-          // userKeyFieldId :"",
         };
 
         setModelMetaData(modelData);
@@ -337,7 +328,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                             existingData={formik.values.dataSource}
                             additionalAction={(e: any) => formik.setFieldValue("dataSourceType", e.target.value.type)}
                           />
-
+                          {formik.values.dataSourceType && <Message severity="info" text={`Your datasource will connect to a ${formik.values.dataSourceType} database`} />}
 
                           {isFormFieldValid(formik, "dataSource") && (
                             <Message severity="error" text={formik?.errors?.dataSource?.toString()} />
@@ -346,12 +337,12 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                       </div>
 
 
-                      <div className="field mt-3">
+                      {/* <div className="field mt-3">
                         <label htmlFor="dataSourceType" className="form-label form-field-label">
                           Data Source Type
                         </label>
                         <div>
-                          {/* <SingleSelectAutoCompleteField
+                          <SingleSelectAutoCompleteField
                             key="dataSourceType"
                             formik={formik}
                             isFormFieldValid={isFormFieldValid}
@@ -362,7 +353,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                             valueKey="value"
                             searchData={serachDataSourceType}
                             existingData={formik.values.dataSourceType}
-                          /> */}
+                          />
                           <InputText
                             disabled
                             type="text"
@@ -380,13 +371,13 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                             <Message severity="error" text={formik?.errors?.dataSourceType?.toString()} />
                           )}
                         </div>
-                      </div>
+                      </div> */}
                     </div>
                     <div className="form-wrapper mt-4">
                       <p className="form-wrapper-heading">Configurations</p>
 
                       <div className="grid formgrid">
-                        {params.id === 'new' &&
+                        {/* {params.id === 'new' &&
 
                           <div className="md:col-6 sm:col-12">
                             <div className="field">
@@ -410,7 +401,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                                 />
                               )}
                             </div>
-                          </div>}
+                          </div>} */}
                         <div className="md:col-6 sm:col-12">
                           <div className="field">
                             <div className="flex align-items-center">
@@ -419,12 +410,14 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                                 onChange={(e) => {
                                   formik.setFieldValue("enableSoftDelete", e.checked);
                                 }}
+                                disabled={params.id !== 'new'}
                                 checked={formik.values.enableSoftDelete}
                               ></Checkbox>
                               <label htmlFor="enableSoftDelete" className="form-field-label ml-2">
                                 Enable Soft Delete
                               </label>
                             </div>
+                            {params.id !== 'new' && <p className="fieldSubTitle">Soft Delete is disabled in edit mode</p>}
                             {isFormFieldValid(formik, "enableSoftDelete") && (
                               <Message
                                 severity="error"
@@ -433,7 +426,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                             )}
                           </div>
                         </div>
-                        <div className="md:col-6 sm:col-12">
+                        {/* <div className="md:col-6 sm:col-12">
                           <div className="field">
                             <div className="flex align-items-center">
                               <Checkbox
@@ -454,8 +447,8 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                               />
                             )}
                           </div>
-                        </div>
-                        <div className="md:col-6 sm:col-12">
+                        </div> */}
+                        {/* <div className="md:col-6 sm:col-12">
                           <div className="field">
                             <div className="flex align-items-center">
                               <Checkbox
@@ -476,69 +469,7 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
                               />
                             )}
                           </div>
-                        </div>
-
-                        <div className="md:col-6 sm:col-12">
-                          <div className="field">
-                            <div className="flex align-items-center">
-                              <Checkbox
-                                name="isExportable"
-                                onChange={(e) => {
-                                  formik.setFieldValue("isExportable", e.checked);
-                                }}
-                                checked={formik.values.isExportable}
-                              ></Checkbox>
-                              <label htmlFor="isExportable" className="form-field-label ml-2">
-                                Is Exportable
-                              </label>
-                            </div>
-                            {isFormFieldValid(formik, "isExportable") && (
-                              <Message
-                                severity="error"
-                                text={formik?.errors?.isExportable?.toString()}
-                              />
-                            )}
-                          </div>
-                        </div>
-                        <div className="md:col-6 sm:col-12">
-                          <div className="field">
-                            <div className="flex align-items-center">
-
-                              <div className="flex align-items-bottom">
-                                <Checkbox onChange={e => {
-                                  setShowUserKeyField(e.checked);
-                                  formik.setFieldValue("hasUserKey", e.checked);
-                                }} checked={showUserKeyField}></Checkbox>
-                                <label htmlFor="ingredient1" className="form-field-label ml-2">
-                                  Has User Key
-                                </label>
-                              </div>
-                            </div>
-                          </div>
-                          {showUserKeyField &&
-                            <div className="field mt-3">
-                              <label htmlFor="userKeyFieldId" className="form-label form-field-label">
-                                User Key Field
-                              </label>
-                              <InputText
-                                type="text"
-                                id="userKeyFieldId"
-                                name="userKeyFieldId"
-                                onChange={formik.handleChange}
-                                value={formik.values.userKeyFieldId}
-                                className={classNames("p-inputtext-sm w-full small-input", {
-                                  "p-invalid": isFormFieldValid(formik, "userKeyFieldId"),
-                                })}
-                              />
-                              {isFormFieldValid(formik, "userKeyFieldId") && (
-                                <Message
-                                  severity="error"
-                                  text={formik?.errors?.userKeyFieldId?.toString()}
-                                />
-                              )}
-                            </div>
-                          }
-                        </div>
+                        </div> */}
 
                       </div>
 

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

@@ -170,7 +170,7 @@ const CreateModule = ({ data }: any) => {
   });
 
   useEffect(() => {
-    if (data) {
+    if (data && data?.menuIconUrl) {
       setmenuIconPreview(`${process.env.API_URL}/${data.menuIconUrl}`);
     }
   }, [data])

package/src/components/layout/AppSidebar.tsx

@@ -1,16 +1,12 @@
+import { ToastContainer } from "@/helpers/ToastContainer";
+import { useGetSolidMenuBasedOnRoleQuery } from "@/redux/api/solidMenuApi";
+import { showNavbar, toggleNavbar } from "@/redux/features/navbarSlice";
 import { setIsAuthenticated, setUser } from "@/redux/features/userSlice";
-import { getSession, signOut, useSession } from "next-auth/react";
-import React, { useEffect, useRef, useState } from "react";
+import { signOut, useSession } from "next-auth/react";
+import { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
 import NavbarTwoMenu from "./navbar-two-menu";
 import UserProfileMenu from "./user-profile-menu";
-import { useDispatch, useSelector } from "react-redux";
-import { showNavbar, toggleNavbar } from "@/redux/features/navbarSlice";
-import { InputText } from "primereact/inputtext";
-import { Button } from "primereact/button";
-import { IconField } from "primereact/iconfield";
-import { InputIcon } from "primereact/inputicon";
-import { useGetSolidMenuBasedOnRoleQuery } from "@/redux/api/solidMenuApi";
-import { ToastContainer } from "@/helpers/ToastContainer";
 // import menu from "@/helpers/menu";
 
 const AppSidebar = () => {
@@ -92,10 +88,10 @@ const AppSidebar = () => {
 
             {/* commented this as this is not working properly @Jenendar to figure this out... */}
             {(visibleNavbar || currentMainMenu) && (
-                <Button
+                <div
                     className={`sidebar-toggle-button ${!visibleNavbar ? "s-collapsed" : ""}`}
                     onClick={handleToggle}
-                    severity="secondary"
+                    // severity="secondary"
                 >
                     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
                         <rect x="0.3" y="0.3" width="23.4" height="23.4" rx="2.1" fill="white" />
@@ -103,7 +99,7 @@ const AppSidebar = () => {
                         <path d="M5.09735 16V14.6667H13.5929V16H5.09735ZM5.09735 12.6667V11.3333H11.6324V12.6667H5.09735ZM5.09735 9.33333V8H13.5929V9.33333H5.09735Z" fill="#8D9199" />
                         <path d="M16.2621 12L18.9026 14.3L18.099 15L14.6549 12L18.099 9L18.9026 9.7L16.2621 12Z" fill="#8D9199" />
                     </svg>
-                </Button>
+                </div>
             )}
 
             <div className="sidebar-left">
@@ -116,7 +112,7 @@ const AppSidebar = () => {
                             <a onClick={() => handleMenu(m)}>
                                 {m.icon ?
                                     <img
-                                        style={{ cursor: "pointer", width: '30px' }}
+                                        style={{ cursor: "pointer", width: '30px' , mixBlendMode: "multiply"}}
                                         // src={currentMainMenu === m.title ? `/images/${m.title.toLocaleLowerCase()}-active.svg` : `/images/${m.title.toLocaleLowerCase()}.svg`}
                                         // src={`/images/menu/${m.title}.svg`}
                                         src={(m.icon && m.icon.startsWith("/")) ? m.icon : `${process.env.API_URL}/${m.icon}`}

package/src/index.ts

@@ -580,6 +580,7 @@ export { default as SolidLogin } from '@/components/auth/SolidLogin';
 export { default as SolidOTPVerify } from '@/components/auth/SolidOTPVerify';
 export { default as SolidRegister } from '@/components/auth/SolidRegister';
 export { default as SolidResetPassword } from '@/components/auth/SolidResetPassword';
+export { default as SolidChangeForcePassword } from '@/components/auth/SolidChangeForcePassword';
 
 //redux
 export { default as authenticationReducer } from '@/redux/features/authSlice';

package/src/redux/api/authApi.ts

@@ -48,6 +48,33 @@ export const authApi = createApi({
         };
       },
     }),
+    initiateChangePassword: builder.mutation({
+      query(body) {
+        return {
+          url: '/iam/initiate/forgot-password',
+          method: "POST",
+          body,
+        }
+      }
+    }),
+    confirmForgotPassword: builder.mutation({
+      query(body) {
+        return {
+          url: '/iam/confirm/forgot-password',
+          method: "POST",
+          body
+        }
+      }
+    }),
+    changePassword: builder.mutation({
+      query(body) {
+          return {
+              url: `/iam/change-password`,
+              method: "POST",
+              body,
+          };
+      },
+  }),
   }),
 });
 
@@ -57,4 +84,7 @@ export const {
   useUpdateUserMutation,
   useForgotPasswordMutation,
   useResetPasswordMutation,
+  useInitiateChangePasswordMutation,
+  useConfirmForgotPasswordMutation,
+  useChangePasswordMutation
 } = authApi;