Siddhesh.More/tanami-admin-panel
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

update bugs

Browse Source
This commit is contained in:
YasinShaikh123
2024-12-20 17:17:18 +05:30
parent e41d6b17b9
commit 85be7c891e
7 changed files with 45 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.example
View File

@@ -24,4 +24,5 @@ VITE_STATUS_PROCESSING="Processing"
VITE_STATUS_OPEN="Open"
VITE_STATUS_CLOSED="Closed"
VITE_STATUS_EXITED="Exited"
VITE_STATUS_CANCELLED="Cancelled"
VITE_STATUS_CANCELLED="Cancelled"
VITE_STATUS_DEACTIVATE="DeActivate"

1
src/Pages/ChangePassword.jsx
View File

@@ -89,6 +89,7 @@ const ChangePassword = ({
<ToastBox message={res?.error?.data?.message} status={"error"} />
),
});
setAlert(false);
}
} catch (error) {
console.error(error);

14
src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx
View File

@@ -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"
}

12
src/Pages/IO_Management/ViewIO/ViewIOTable.jsx
View File

@@ -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"
}

26
src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
View File

@@ -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"
}

19
src/Pages/SubAdmin/SubAdminUpdateCreate.jsx
View File

@@ -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.`,

37
src/Services/subadmin.service.js
View File

@@ -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"],
// }),
}),
});