From 85be7c891e9dba19f1ff3d099f3796251f36e09f Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:17:18 +0530 Subject: [PATCH] update bugs --- .env.example | 3 +- src/Pages/ChangePassword.jsx | 1 + .../ViewIO/HeaderModal/UpdateIOStatus.jsx | 14 +++---- .../IO_Management/ViewIO/ViewIOTable.jsx | 12 +++--- .../IO_Management/ViewIO/ViewIOdataHeader.jsx | 26 ++++++------- src/Pages/SubAdmin/SubAdminUpdateCreate.jsx | 19 ++++++---- src/Services/subadmin.service.js | 37 +++---------------- 7 files changed, 45 insertions(+), 67 deletions(-) diff --git a/.env.example b/.env.example index c28689a..336cca1 100644 --- a/.env.example +++ b/.env.example @@ -24,4 +24,5 @@ VITE_STATUS_PROCESSING="Processing" VITE_STATUS_OPEN="Open" VITE_STATUS_CLOSED="Closed" VITE_STATUS_EXITED="Exited" -VITE_STATUS_CANCELLED="Cancelled" \ No newline at end of file +VITE_STATUS_CANCELLED="Cancelled" +VITE_STATUS_DEACTIVATE="DeActivate" \ No newline at end of file diff --git a/src/Pages/ChangePassword.jsx b/src/Pages/ChangePassword.jsx index 9c6b730..82d7b62 100644 --- a/src/Pages/ChangePassword.jsx +++ b/src/Pages/ChangePassword.jsx @@ -89,6 +89,7 @@ const ChangePassword = ({ ), }); + setAlert(false); } } catch (error) { console.error(error); diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx index f810159..6327f52 100644 --- a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx +++ b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx @@ -58,7 +58,7 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { let res; // If selectedItem is 'Cancelled', make the updateCancelStatus API call - if (selectedItem === "Cancelled") { + if (selectedItem === import.meta.env.VITE_STATUS_CANCELLED) { res = await updateCancleStatus({ id }); @@ -119,17 +119,17 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { mb={1.5} textTransform={"none"} colorScheme={ - selectedItem === "Draft" + selectedItem === import.meta.env.VITE_STATUS_DRAFT ? "gray" - : selectedItem === "Processing" + : selectedItem === import.meta.env.VITE_STATUS_PROCESSING ? "yellow" - : selectedItem === "Open" + : selectedItem === import.meta.env.VITE_STATUS_OPEN ? "blue" - : selectedItem === "Closed" + : selectedItem === import.meta.env.VITE_STATUS_CLOSED ? "green" - : selectedItem === "Exited" + : selectedItem === import.meta.env.VITE_STATUS_EXITED ? "red" - : selectedItem === "Cancelled" + : selectedItem === import.meta.env.VITE_STATUS_CANCELLED ? "orange" : "purple" } diff --git a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx index 7aefcc9..0e65e64 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx @@ -241,17 +241,17 @@ const ViewIOTable = () => { textTransform={"none"} // variant={"solid"} colorScheme={ - item?.ioStatus?.statusAdmin === "Draft" + item?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_DRAFT ? "gray" - : item?.ioStatus?.statusAdmin === "Processing" + : item?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_PROCESSING ? "yellow" - : item?.ioStatus?.statusAdmin === "Open" + : item?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_OPEN ? "blue" - : item?.ioStatus?.statusAdmin === "Closed" + : item?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_CLOSED ? "green" - : item?.ioStatus?.statusAdmin === "Exited" + : item?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_EXITED ? "red" - : item?.ioStatus?.statusAdmin === "Canclled" + : item?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_CANCELLED ? "orange" : "purple" } diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx index 8228d31..d7bf9f7 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx @@ -247,19 +247,19 @@ const ViewIOdataHeader = ({ data, isLoading }) => { justifyContent={"space-between"} gap={8} bg={ - IODetails?.ioStatus?.statusAdmin === "Draft" + IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_DRAFT ? "#EDF2F7" - : IODetails?.ioStatus?.statusAdmin === "Processing" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_PROCESSING ? "#FEFBBF" - : IODetails?.ioStatus?.statusAdmin === "Open" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_OPEN ? "#BEE2F8" - : IODetails?.ioStatus?.statusAdmin === "Closed" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_CLOSED ? "#C6F6D5" - : IODetails?.ioStatus?.statusAdmin === "Exited" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_EXITED ? "#FED7D7" - : IODetails?.ioStatus?.statusAdmin === "Cancelled" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_CANCELLED ? "#E9D8FD" - : IODetails?.ioStatus?.statusAdmin === "DeActivate" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_DEACTIVATE ? "#E9D8FD" : null } @@ -432,17 +432,17 @@ const ViewIOdataHeader = ({ data, isLoading }) => { textTransform={"none"} // variant={"solid"} colorScheme={ - IODetails?.ioStatus?.statusAdmin === "Draft" + IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_DRAFT ? "gray" - : IODetails?.ioStatus?.statusAdmin === "Processing" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_PROCESSING ? "yellow" - : IODetails?.ioStatus?.statusAdmin === "Open" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_OPEN ? "blue" - : IODetails?.ioStatus?.statusAdmin === "Closed" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_CLOSED ? "green" - : IODetails?.ioStatus?.statusAdmin === "Exited" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_EXITED ? "red" - : IODetails?.ioStatus?.statusAdmin === "Cancelled" + : IODetails?.ioStatus?.statusAdmin === import.meta.env.VITE_STATUS_CANCELLED ? "purple" : "purple" } diff --git a/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx b/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx index 506e7e7..fdb4d1a 100644 --- a/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx +++ b/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx @@ -23,12 +23,15 @@ import { const addSubAdminSchema = yup.object().shape({ firstName: yup .string() - .required("First Name is required dcdcdcd") + .required("First Name is required") .min(3, "First Name must be at least 3 characters long") .max(35, "First Name cannot exceed 35 characters") .matches(/^[^\d]+$/, "First Name cannot contain numbers"), - lastName: yup.string().required("Last Name is required"), + lastName: yup.string().required("Last Name is required") + .min(3, "Last Name must be at least 3 characters long") + .max(35, "Last Name cannot exceed 35 characters") + .matches(/^[^\d]+$/, "Last Name cannot contain numbers"), emailAddress:yup. string() .required("Email address is required") @@ -186,8 +189,8 @@ const SubAdminUpdateCreate = () => { type: "text", isRequired: true, section: "", - maxLength: 34, - helperText: `Maximum length should be 34 characters. You have entered ${ + maxLength: 35, + helperText: `Maximum length should be 35 characters. You have entered ${ watch()?.firstName?.length || 0 } characters.`, }, @@ -198,8 +201,8 @@ const SubAdminUpdateCreate = () => { type: "text", isRequired: true, section: "", - maxLength: 34, - helperText: `Maximum length should be 34 characters. You have entered ${ + maxLength: 35, + helperText: `Maximum length should be 35 characters. You have entered ${ watch()?.lastName?.length || 0 } characters.`, }, @@ -223,7 +226,7 @@ const SubAdminUpdateCreate = () => { type: "text", isRequired: true, section: "", - maxLength: 34, + maxLength: 35, helperText: `Maximum length should be 35 characters. You have entered ${ watch()?.firstName?.length || 0 } characters.`, @@ -235,7 +238,7 @@ const SubAdminUpdateCreate = () => { type: "text", isRequired: true, section: "", - maxLength: 34, + maxLength: 35, helperText: `Maximum length should be 35 characters. You have entered ${ watch()?.lastName?.length || 0 } characters.`, diff --git a/src/Services/subadmin.service.js b/src/Services/subadmin.service.js index d050d6d..e23eb05 100644 --- a/src/Services/subadmin.service.js +++ b/src/Services/subadmin.service.js @@ -9,7 +9,7 @@ import { baseQuery } from "./token.serivce"; export const sabAdminMaster = createApi({ reducerPath: "sabAdminMaster", baseQuery: baseQuery, - tagTypes: ["getSubAdmin", "prePopulate"], + tagTypes: ["getSubAdmin", "prePopulate","getSubAdminById"], endpoints: (builder) => ({ @@ -40,12 +40,12 @@ export const sabAdminMaster = createApi({ method: "PATCH", body: data, }), - invalidatesTags: ["getSubAdmin", "prePopulate"], + invalidatesTags: ["getSubAdmin","getSubAdminById"], }), getSubAdminById: builder.query({ query: (id) => `/subadmin/admin/${id}`, - invalidatesTags: ["getSubAdmin", "prePopulate"], + providesTags: ["getSubAdminById"], }), // // ========[Toggle Status]======== @@ -56,7 +56,7 @@ export const sabAdminMaster = createApi({ method: "PATCH", body: data, }), - invalidatesTags: ["getSubAdmin", "prePopulate"], + invalidatesTags: ["getSubAdmin"], }), @@ -68,34 +68,7 @@ export const sabAdminMaster = createApi({ }), invalidatesTags: ["getSubAdmin"], }), - - - // // ========[Get Active]======== - - // getActiveSponserMaster: builder.query({ - // query: () => `/sponsor/admin/active`, - // }), - - // getSponserMasterActive: builder.query({ - // query: () => "/sponsor/admin/active", - // }), - - // // ======[Get ID]===== - - // getSponserById: builder.query({ - // query: (id) => `/sponsor/admin/${id}`, - // }), - - // // ========[Update Sponser]======== - - // updateSponser: builder.mutation({ - // query: ({ data, id }) => ({ - // url: `/sponsor/admin/${id}`, - // method: "PATCH", - // body: data, - // }), - // invalidatesTags: ["getSponser"], - // }), + }), });