@solidstarters/solid-core-ui 1.1.2 → 1.1.4

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/module/CreateModule.tsx

@@ -239,7 +239,7 @@ const CreateModule = ({ data }: any) => {
 
   useEffect(() => {
     if (isSuccess == true || isDeleteModuleSuceess == true || isModuleUpdateSuccess == true) {
-      router.push(`/admin/app-builder/module/all`);
+      router.push(`/admin/core/solid-core/module-metadata/list`);
     }
   }, [isSuccess, isDeleteModuleSuceess, isModuleUpdateSuccess])
 
@@ -334,7 +334,7 @@ const CreateModule = ({ data }: any) => {
 
                             formik.handleChange(e);
                             const { toKebabCase, toSnakeCase, toPluralCamelCase } = getSingularAndPlural(e.target.value);
-                            if (pathname.includes('create')) {
+                            if (pathname.includes('new')) {
                               formik.setFieldValue("name", toKebabCase);
                             }
 

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">
@@ -114,14 +110,24 @@ const AppSidebar = () => {
                             className={`menu-item ${currentMainMenu === m.title ? "active-menu-image" : ""}`}
                         >
                             <a onClick={() => handleMenu(m)}>
-                                <img
-                                    style={{ cursor: "pointer", width: '30px' }}
-                                    // src={currentMainMenu === m.title ? `/images/${m.title.toLocaleLowerCase()}-active.svg` : `/images/${m.title.toLocaleLowerCase()}.svg`}
-                                    // src={`/images/menu/${m.title}.svg`}
-                                    src={m.icon.startsWith("/") ? m.icon : `${process.env.API_URL}/${m.icon}`}
-                                    // src={`/images/menu/app-builder.svg`}
-                                    alt="Solid"
-                                />
+                                {m.icon ?
+                                    <img
+                                        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}`}
+                                        // src={`/images/menu/app-builder.svg`}
+                                        alt="Solid"
+                                    />
+                                    :
+                                    <img
+                                        style={{ cursor: "pointer", width: '30px' }}
+                                        // src={currentMainMenu === m.title ? `/images/${m.title.toLocaleLowerCase()}-active.svg` : `/images/${m.title.toLocaleLowerCase()}.svg`}
+                                        // src={`/images/menu/${m.title}.svg`}
+                                        src={`/images/menu/app-builder.svg`}
+                                        alt="Solid"
+                                    />
+                                }
                             </a>
                         </div>
                     ))}

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;