diff --git a/src/_digifi/helpers/crud-helper/consts.ts b/src/_digifi/helpers/crud-helper/consts.ts index cc492b7..2d0f35f 100644 --- a/src/_digifi/helpers/crud-helper/consts.ts +++ b/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', } diff --git a/src/app/modules/process/core/_models.ts b/src/app/modules/process/core/_models.ts index 8b9a607..15033f6 100644 --- a/src/app/modules/process/core/_models.ts +++ b/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> diff --git a/src/app/modules/process/user-approved/core/QueryResponseProvider.tsx b/src/app/modules/process/user-approved/core/QueryResponseProvider.tsx index d07d67f..35b756d 100644 --- a/src/app/modules/process/user-approved/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-approved/core/QueryResponseProvider.tsx @@ -32,7 +32,7 @@ const QueryResponseProvider: FC = ({ children }) => { refetch, data: response, } = useQuery( - `${QUERIES.USERS_LIST}-${query}`, + `${QUERIES.APPROVED_LIST}-${query}`, () => { return getApprovedUsers(query); }, diff --git a/src/app/modules/process/user-pending/core/QueryResponseProvider.tsx b/src/app/modules/process/user-pending/core/QueryResponseProvider.tsx index ee07a21..15dba83 100644 --- a/src/app/modules/process/user-pending/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-pending/core/QueryResponseProvider.tsx @@ -32,7 +32,7 @@ const QueryResponseProvider: FC = ({ children }) => { refetch, data: response, } = useQuery( - `${QUERIES.USERS_LIST}-${query}`, + `${QUERIES.PENDING_LIST}-${query}`, () => { return getPendingUsers(query); }, diff --git a/src/app/modules/process/user-ready/UsersList.tsx b/src/app/modules/process/user-ready/UsersList.tsx index 10546aa..11dd4e9 100644 --- a/src/app/modules/process/user-ready/UsersList.tsx +++ b/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 = () => { - {itemIdForUpdate !== undefined && } + {itemIdForUpdate !== undefined && } ); }; diff --git a/src/app/modules/process/user-ready/core/QueryResponseProvider.tsx b/src/app/modules/process/user-ready/core/QueryResponseProvider.tsx index efc16f4..d8f621c 100644 --- a/src/app/modules/process/user-ready/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-ready/core/QueryResponseProvider.tsx @@ -32,7 +32,7 @@ const QueryResponseProvider: FC = ({ children }) => { refetch, data: response, } = useQuery( - `${QUERIES.USERS_LIST}-${query}`, + `${QUERIES.READY_LIST}-${query}`, () => { return getReadyUsers(query); }, diff --git a/src/app/modules/process/user-ready/user-edit-modal/UserEditModal.tsx b/src/app/modules/process/user-ready/edit-loan-modal/EditLoanModal.tsx similarity index 95% rename from src/app/modules/process/user-ready/user-edit-modal/UserEditModal.tsx rename to src/app/modules/process/user-ready/edit-loan-modal/EditLoanModal.tsx index 9bf605f..386c111 100644 --- a/src/app/modules/process/user-ready/user-edit-modal/UserEditModal.tsx +++ b/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} diff --git a/src/app/modules/process/user-ready/user-edit-modal/UserEditModalForm.tsx b/src/app/modules/process/user-ready/edit-loan-modal/UserEditModalForm.tsx similarity index 100% rename from src/app/modules/process/user-ready/user-edit-modal/UserEditModalForm.tsx rename to src/app/modules/process/user-ready/edit-loan-modal/UserEditModalForm.tsx diff --git a/src/app/modules/process/user-ready/user-edit-modal/UserEditModalFormWrapper.tsx b/src/app/modules/process/user-ready/edit-loan-modal/UserEditModalFormWrapper.tsx similarity index 95% rename from src/app/modules/process/user-ready/user-edit-modal/UserEditModalFormWrapper.tsx rename to src/app/modules/process/user-ready/edit-loan-modal/UserEditModalFormWrapper.tsx index c4f25bd..929cc94 100644 --- a/src/app/modules/process/user-ready/user-edit-modal/UserEditModalFormWrapper.tsx +++ b/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); }, diff --git a/src/app/modules/process/user-ready/user-edit-modal/UserEditModalHeader.tsx b/src/app/modules/process/user-ready/edit-loan-modal/UserEditModalHeader.tsx similarity index 93% rename from src/app/modules/process/user-ready/user-edit-modal/UserEditModalHeader.tsx rename to src/app/modules/process/user-ready/edit-loan-modal/UserEditModalHeader.tsx index 7fc6d55..171b0f1 100644 --- a/src/app/modules/process/user-ready/user-edit-modal/UserEditModalHeader.tsx +++ b/src/app/modules/process/user-ready/edit-loan-modal/UserEditModalHeader.tsx @@ -7,7 +7,7 @@ const UserEditModalHeader = () => { return (
{/* begin::Modal title */} -

Add User

+

Edit Loan

{/* end::Modal title */} {/* begin::Close */} diff --git a/src/app/modules/process/user-ready/table/columns/EmployerCell.tsx b/src/app/modules/process/user-ready/table/columns/EmployerCell.tsx new file mode 100644 index 0000000..38ac0f8 --- /dev/null +++ b/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 = ({employer_name}) => ( +
{employer_name}
+) + +export {EmployerCell} diff --git a/src/app/modules/process/user-ready/table/columns/UserActionsCell.tsx b/src/app/modules/process/user-ready/table/columns/UserActionsCell.tsx index 108da7b..ca1d2cf 100644 --- a/src/app/modules/process/user-ready/table/columns/UserActionsCell.tsx +++ b/src/app/modules/process/user-ready/table/columns/UserActionsCell.tsx @@ -44,7 +44,7 @@ const UserActionsCell: FC = ({ id }) => { {/* begin::Menu */}
{/* begin::Menu item */} @@ -62,7 +62,7 @@ const UserActionsCell: FC = ({ id }) => { data-kt-users-table-filter="delete_row" onClick={async () => await deleteItem.mutateAsync()} > - Delete + Resend Verification
{/* end::Menu item */} diff --git a/src/app/modules/process/user-ready/table/columns/_columns.tsx b/src/app/modules/process/user-ready/table/columns/_columns.tsx index a742770..dc90993 100644 --- a/src/app/modules/process/user-ready/table/columns/_columns.tsx +++ b/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> = [ { @@ -20,6 +21,13 @@ const usersColumns: ReadonlyArray> = [ id: 'firstname', Cell: ({...props}) => , }, + { + Header: (props) => ( + + ), + id: 'employer_name', + Cell: ({...props}) => , + }, { Header: (props) => , accessor: 'loan_amount', diff --git a/src/app/modules/process/user-rejected/core/QueryResponseProvider.tsx b/src/app/modules/process/user-rejected/core/QueryResponseProvider.tsx index cbc9b76..b49a872 100644 --- a/src/app/modules/process/user-rejected/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-rejected/core/QueryResponseProvider.tsx @@ -32,7 +32,7 @@ const QueryResponseProvider: FC = ({children}) => { refetch, data: response, } = useQuery( - `${QUERIES.USERS_LIST}-${query}`, + `${QUERIES.REJECTED_LIST}-${query}`, () => { return getRejectedUsers(query) }, diff --git a/src/app/modules/process/user-started/core/QueryResponseProvider.tsx b/src/app/modules/process/user-started/core/QueryResponseProvider.tsx index 61554c5..6d2d4f1 100644 --- a/src/app/modules/process/user-started/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-started/core/QueryResponseProvider.tsx @@ -32,7 +32,7 @@ const QueryResponseProvider: FC = ({ children }) => { refetch, data: response, } = useQuery( - `${QUERIES.USERS_LIST}-${query}`, + `${QUERIES.STARTED_LIST}-${query}`, () => { return getStartedUsers(query); },