Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f52e06af65 | |||
| 697a467780 | |||
| 9499422c9a | |||
| 148659b453 | |||
| 98454e2c80 | |||
| 8a96b10e4b | |||
| d17ca4f988 | |||
| 4f99dacf76 |
+1
-1
@@ -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 Signatory</h2>
|
||||
{/* end::Modal title */}
|
||||
|
||||
{/* begin::Close */}
|
||||
|
||||
+2
-2
@@ -38,7 +38,7 @@ const editUserSchema = Yup.object().shape({
|
||||
|
||||
const ModalForm: FC<Props> = ({ user, isUserLoading }) => {
|
||||
|
||||
const {closeCustomModal} = useCustomModal()
|
||||
const {closeCustomModal, showCustomModal} = useCustomModal()
|
||||
|
||||
const { setItemIdForUpdate } = useListView();
|
||||
const { refetch, isLoading } = useQueryResponse();
|
||||
@@ -72,7 +72,7 @@ const ModalForm: FC<Props> = ({ user, isUserLoading }) => {
|
||||
if (isNotEmpty(values.id)) {
|
||||
await updateUser(values);
|
||||
} else {
|
||||
await createSignatory(values);
|
||||
await createSignatory({employer_uid:showCustomModal?.data?.id, ...values});
|
||||
}
|
||||
} catch (ex) {
|
||||
console.error(ex);
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ const UserActionsCell: FC<Props> = ({id}) => {
|
||||
|
||||
{/* begin::Menu item */}
|
||||
<div className='menu-item px-3'>
|
||||
<a className='menu-link px-3' onClick={()=>{openCustomModal(MODALNAMES.addSignatory, {})}}>
|
||||
<a className='menu-link px-3' onClick={()=>{openCustomModal(MODALNAMES.addSignatory, {id})}}>
|
||||
Add Signatory
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import axios, { AxiosResponse } from "axios";
|
||||
import { ID, Response } from "../../../../_digifi/helpers"
|
||||
import { User, UsersQueryResponse } from "./_models";
|
||||
import { postAuxEnd } from "../../auth/core/AxiosCallHelper";
|
||||
|
||||
const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
|
||||
const USER_URL = `${API_URL}/user`;
|
||||
@@ -43,6 +44,10 @@ const getApprovedUsers = (query: string): Promise<UsersQueryResponse> => { // FU
|
||||
.then((d: AxiosResponse<UsersQueryResponse>) => d.data);
|
||||
};
|
||||
|
||||
const employersVerify = (uid: ID): Promise<UsersQueryResponse> => { // FUNCTION FOR EMPLOYERS VERIFICATION
|
||||
return postAuxEnd('/employers/verify', {application_uid:uid})
|
||||
};
|
||||
|
||||
const getUserById = (id: ID): Promise<User | undefined> => {
|
||||
return axios
|
||||
.get(`${USER_URL}/${id}`)
|
||||
@@ -79,6 +84,7 @@ export {
|
||||
getPendingUsers,
|
||||
getReadyUsers,
|
||||
getApprovedUsers,
|
||||
employersVerify,
|
||||
deleteUser,
|
||||
deleteSelectedUsers,
|
||||
getUserById,
|
||||
|
||||
@@ -79,7 +79,8 @@ const UserEditModalForm: FC<Props> = ({ user, isUserLoading }) => {
|
||||
>
|
||||
{/* begin::Scroll */}
|
||||
<div
|
||||
className="d-flex flex-column scroll-y me-n7 pe-7"
|
||||
// className="d-flex flex-column scroll-y me-n7 pe-7"
|
||||
className="d-none flex-column scroll-y me-n7 pe-7"
|
||||
id="kt_modal_add_user_scroll"
|
||||
data-kt-scroll="true"
|
||||
data-kt-scroll-activate="{default: false, lg: true}"
|
||||
@@ -396,11 +397,11 @@ const UserEditModalForm: FC<Props> = ({ user, isUserLoading }) => {
|
||||
<button
|
||||
type="reset"
|
||||
onClick={() => cancel()}
|
||||
className="btn btn-light me-3"
|
||||
className="btn btn-danger me-3"
|
||||
data-kt-users-modal-action="cancel"
|
||||
disabled={formik.isSubmitting || isUserLoading}
|
||||
>
|
||||
Discard
|
||||
Cancel
|
||||
</button>
|
||||
|
||||
<button
|
||||
|
||||
@@ -2,7 +2,7 @@ import { useQuery } from "react-query";
|
||||
import { UserEditModalForm } from "./UserEditModalForm";
|
||||
import { isNotEmpty, QUERIES } from "../../../../../_digifi/helpers";
|
||||
import { useListView } from "../core/ListViewProvider";
|
||||
import { getUserById } from "../../core/_requests";
|
||||
import { getUserById, getApprovedUsers } from "../../core/_requests";
|
||||
|
||||
const UserEditModalFormWrapper = () => {
|
||||
const { itemIdForUpdate, setItemIdForUpdate } = useListView();
|
||||
@@ -14,7 +14,8 @@ const UserEditModalFormWrapper = () => {
|
||||
} = useQuery(
|
||||
`${QUERIES.READY_LIST}-user-${itemIdForUpdate}`,
|
||||
() => {
|
||||
return getUserById(itemIdForUpdate);
|
||||
// return getUserById(itemIdForUpdate);
|
||||
return getApprovedUsers('');
|
||||
},
|
||||
{
|
||||
cacheTime: 0,
|
||||
@@ -33,7 +34,10 @@ const UserEditModalFormWrapper = () => {
|
||||
}
|
||||
|
||||
if (!isLoading && !error && user) {
|
||||
return <UserEditModalForm isUserLoading={isLoading} user={user} />;
|
||||
// return <UserEditModalForm isUserLoading={isLoading} user={user} />;
|
||||
// REMOVE LATER AND ALLOW UP ALONE
|
||||
let newUser:any = user?.records
|
||||
return <UserEditModalForm isUserLoading={isLoading} user={newUser} />;
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -4,7 +4,8 @@ import { MenuComponent } from "../../../../../../_digifi/assets/ts/components";
|
||||
import { ID, KTIcon, QUERIES } from "../../../../../../_digifi/helpers";
|
||||
import { useListView } from "../../core/ListViewProvider";
|
||||
import { useQueryResponse } from "../../core/QueryResponseProvider";
|
||||
import { deleteUser } from "../../../core/_requests";
|
||||
import { employersVerify } from "../../../core/_requests";
|
||||
import { User } from "../../../core/_models";
|
||||
|
||||
type Props = {
|
||||
id: ID;
|
||||
@@ -15,6 +16,8 @@ const UserActionsCell: FC<Props> = ({ id }) => {
|
||||
const { query } = useQueryResponse();
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
// let selectedUser = data?.filter((item:User) => item.uid == id)[0]
|
||||
|
||||
useEffect(() => {
|
||||
MenuComponent.reinitialization();
|
||||
}, []);
|
||||
@@ -23,14 +26,21 @@ const UserActionsCell: FC<Props> = ({ id }) => {
|
||||
setItemIdForUpdate(id);
|
||||
};
|
||||
|
||||
const deleteItem = useMutation(() => deleteUser(id), {
|
||||
const empsVerify = useMutation(() => employersVerify(id), {
|
||||
// 💡 response of the mutation is passed to onSuccess
|
||||
onSuccess: () => {
|
||||
// ✅ update detail view directly
|
||||
queryClient.invalidateQueries([`${QUERIES.USERS_LIST}-${query}`]);
|
||||
queryClient.invalidateQueries([`${QUERIES.READY_LIST}-${query}`]);
|
||||
},
|
||||
});
|
||||
|
||||
const resendVerification = async () => { // FUNCTION TO RESEND VERIFICATION
|
||||
let cont = confirm('Are you sure, you want to send resend verification?')
|
||||
if(cont){
|
||||
await empsVerify.mutateAsync()
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<a
|
||||
@@ -60,7 +70,7 @@ const UserActionsCell: FC<Props> = ({ id }) => {
|
||||
<a
|
||||
className="menu-link px-3"
|
||||
data-kt-users-table-filter="delete_row"
|
||||
onClick={async () => await deleteItem.mutateAsync()}
|
||||
onClick={async () => resendVerification()}
|
||||
>
|
||||
Resend Verification
|
||||
</a>
|
||||
|
||||
@@ -11,12 +11,12 @@ type ContextProps = {
|
||||
type ShowModalProps = {
|
||||
name?: string
|
||||
data?: {
|
||||
[index: string]: string | number | undefined;
|
||||
[index: string]: undefined | null | number | string;
|
||||
}
|
||||
}
|
||||
|
||||
type DataProps = {
|
||||
[index: string]: string | number | undefined;
|
||||
[index: string]: undefined | null | number | string;
|
||||
}
|
||||
|
||||
type ModalNames = {
|
||||
|
||||
Reference in New Issue
Block a user