src/_digifi/helpers/crud-helper/consts.ts

@@ -1,5 +1,10 @@
 const QUERIES = {
   USERS_LIST: 'users-list',
+  STARTED_LIST: 'started-list',
+  READY_LIST: 'ready-list',
+  PENDING_LIST: 'pending-list',
+  APPROVED_LIST: 'approved-list',
+  REJECTED_LIST: 'rejected-list',
   EMPLOYERS_LIST: 'employers-list',
   SIGNATORY_LIST: 'signatory-list',
 }

src/app/modules/process/core/_models.ts

@@ -30,6 +30,7 @@ export type User = {
   status?: string
   added?: string
   updated?: string
+  employer_name?: string
 }
 
 export type UsersQueryResponse = Response<Array<User>>

src/app/modules/process/user-approved/core/QueryResponseProvider.tsx

@@ -32,7 +32,7 @@ const QueryResponseProvider: FC<WithChildren> = ({ children }) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.APPROVED_LIST}-${query}`,
     () => {
       return getApprovedUsers(query);
     },

src/app/modules/process/user-pending/core/QueryResponseProvider.tsx

@@ -32,7 +32,7 @@ const QueryResponseProvider: FC<WithChildren> = ({ children }) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.PENDING_LIST}-${query}`,
     () => {
       return getPendingUsers(query);
     },

src/app/modules/process/user-ready/UsersList.tsx

@@ -3,7 +3,7 @@ import { QueryRequestProvider } from "./core/QueryRequestProvider";
 import { QueryResponseProvider } from "./core/QueryResponseProvider";
 import { UsersListHeader } from "./components/header/UsersListHeader";
 import { UsersTable } from "./table/UsersTable";
-import { UserEditModal } from "./user-edit-modal/UserEditModal";
+import { EditLoanModal } from "./edit-loan-modal/EditLoanModal";
 import { KTCard } from "../../../../_digifi/helpers";
 import { ToolbarWrapper } from "../../../../_digifi/layout/components/toolbar";
 import { Content } from "../../../../_digifi/layout/components/content";
@@ -16,7 +16,7 @@ const UsersList = () => {
         <UsersListHeader />
         <UsersTable />
       </KTCard>
-      {itemIdForUpdate !== undefined && <UserEditModal />}
+      {itemIdForUpdate !== undefined && <EditLoanModal />}
     </>
   );
 };

src/app/modules/process/user-ready/core/QueryResponseProvider.tsx

@@ -32,7 +32,7 @@ const QueryResponseProvider: FC<WithChildren> = ({ children }) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.READY_LIST}-${query}`,
     () => {
       return getReadyUsers(query);
     },

src/app/modules/process/user-ready/edit-loan-modal/EditLoanModal.tsx

@@ -2,7 +2,7 @@ import {useEffect} from 'react'
 import {UserEditModalHeader} from './UserEditModalHeader'
 import {UserEditModalFormWrapper} from './UserEditModalFormWrapper'
 
-const UserEditModal = () => {
+const EditLoanModal = () => {
   useEffect(() => {
     document.body.classList.add('modal-open')
     return () => {
@@ -41,4 +41,4 @@ const UserEditModal = () => {
   )
 }
 
-export {UserEditModal}
+export {EditLoanModal}

src/app/modules/process/user-ready/edit-loan-modal/UserEditModalFormWrapper.tsx

@@ -12,7 +12,7 @@ const UserEditModalFormWrapper = () => {
     data: user,
     error,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-user-${itemIdForUpdate}`,
+    `${QUERIES.READY_LIST}-user-${itemIdForUpdate}`,
     () => {
       return getUserById(itemIdForUpdate);
     },

src/app/modules/process/user-ready/edit-loan-modal/UserEditModalHeader.tsx

@@ -7,7 +7,7 @@ const UserEditModalHeader = () => {
   return (
     <div className="modal-header">
       {/* begin::Modal title */}
-      <h2 className="fw-bolder">Add User</h2>
+      <h2 className="fw-bolder">Edit Loan</h2>
       {/* end::Modal title */}
 
       {/* begin::Close */}

src/app/modules/process/user-ready/table/columns/EmployerCell.tsx

@@ -0,0 +1,11 @@
+import {FC} from 'react'
+
+type Props = {
+    employer_name?: string
+}
+
+const EmployerCell: FC<Props> = ({employer_name}) => (
+  <div className='badge badge-light fw-bolder'>{employer_name}</div>
+)
+
+export {EmployerCell}

src/app/modules/process/user-ready/table/columns/UserActionsCell.tsx

@@ -44,7 +44,7 @@ const UserActionsCell: FC<Props> = ({ id }) => {
       </a>
       {/* begin::Menu */}
       <div
-        className="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-600 menu-state-bg-light-primary fw-bold fs-7 w-125px py-4"
+        className="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-600 menu-state-bg-light-primary fw-bold fs-7 w-175px py-4"
         data-kt-menu="true"
       >
         {/* begin::Menu item */}
@@ -62,7 +62,7 @@ const UserActionsCell: FC<Props> = ({ id }) => {
             data-kt-users-table-filter="delete_row"
             onClick={async () => await deleteItem.mutateAsync()}
           >
-            Delete
+            Resend Verification
           </a>
         </div>
         {/* end::Menu item */}

src/app/modules/process/user-ready/table/columns/_columns.tsx

@@ -8,6 +8,7 @@ import {UserCustomHeader} from './UserCustomHeader'
 import {UserSelectionHeader} from './UserSelectionHeader'
 import {User} from '../../../core/_models'
 import { AddedCell } from './AddedCell'
+import { EmployerCell } from './EmployerCell'
 
 const usersColumns: ReadonlyArray<Column<User>> = [
   {
@@ -20,6 +21,13 @@ const usersColumns: ReadonlyArray<Column<User>> = [
     id: 'firstname',
     Cell: ({...props}) => <UserInfoCell user={props.data[props.row.index]} />,
   },
+  {
+    Header: (props) => (
+      <UserCustomHeader tableProps={props} title='Employer' className='min-w-125px' />
+    ),
+    id: 'employer_name',
+    Cell: ({...props}) => <EmployerCell employer_name={props.data[props.row.index].employer_name} />,
+  },
   {
     Header: (props) => <UserCustomHeader tableProps={props} title='Amount' className='min-w-125px' />,
     accessor: 'loan_amount',

src/app/modules/process/user-rejected/core/QueryResponseProvider.tsx

@@ -32,7 +32,7 @@ const QueryResponseProvider: FC<WithChildren> = ({children}) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.REJECTED_LIST}-${query}`,
     () => {
       return getRejectedUsers(query)
     },

src/app/modules/process/user-started/core/QueryResponseProvider.tsx

@@ -32,7 +32,7 @@ const QueryResponseProvider: FC<WithChildren> = ({ children }) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.STARTED_LIST}-${query}`,
     () => {
       return getStartedUsers(query);
     },