-
-
-
-
-
-
-
-
+ {/* Right: Info section */}
+
+ {/* Org name */}
+
+
+ {/* SPRID */}
+
+
+
+
+
+ {/* Address */}
+
+
+
diff --git a/src/components/Organization/tempCodeRunnerFile.jsx b/src/components/Organization/tempCodeRunnerFile.jsx
new file mode 100644
index 00000000..f6957317
--- /dev/null
+++ b/src/components/Organization/tempCodeRunnerFile.jsx
@@ -0,0 +1 @@
+useAssignOrgToTenant
\ No newline at end of file
diff --git a/src/components/common/Modal.jsx b/src/components/common/Modal.jsx
index c00ede55..be64e5cf 100644
--- a/src/components/common/Modal.jsx
+++ b/src/components/common/Modal.jsx
@@ -1,4 +1,3 @@
-
import { useCallback } from "react";
const Modal = ({
@@ -7,16 +6,14 @@ const Modal = ({
title,
body,
disabled,
- size="md",
- position="top",
+ size = "md",
+ position = "top",
}) => {
const handleClose = useCallback(() => {
if (disabled) return;
onClose();
}, [disabled, onClose]);
-
-
if (!isOpen) return null;
return (
@@ -26,7 +23,10 @@ const Modal = ({
tabIndex="-1"
role="dialog"
>
-
+
{/* Header */}
@@ -36,16 +36,11 @@ const Modal = ({
className="btn-close btn-close-white"
onClick={handleClose}
aria-label="Close"
- >
-
-
+ >
{/* Body */}
{body}
-
-
-
diff --git a/src/hooks/useOrganization.js b/src/hooks/useOrganization.js
index 5c2ed19a..2d77438b 100644
--- a/src/hooks/useOrganization.js
+++ b/src/hooks/useOrganization.js
@@ -27,7 +27,7 @@ export const useOrganizationModal = () => {
orgData: options.orgData ?? orgData ?? null,
startStep: options.startStep ?? startStep ?? 1,
prevStep: options.prevStep ?? prevStep ?? 1,
- flowType: options.flowType ?? flowType ?? "default",
+ flowType: options.flowType ?? flowType ?? "default",
})
),
onClose: () => dispatch(closeOrgModal()),
@@ -35,21 +35,16 @@ export const useOrganizationModal = () => {
};
};
-
-
-
-export const useOrganizationBySPRID =(sprid)=>{
+export const useOrganizationBySPRID = (sprid) => {
return useQuery({
- queryKey:["organization by",sprid],
- queryFn:async()=>{
-
+ queryKey: ["organization by", sprid],
+ queryFn: async () => {
const resp = await OrganizationRepository.getOrganizationBySPRID(sprid);
return resp.data;
},
- enabled:!!sprid
- })
-}
-
+ enabled: !!sprid,
+ });
+};
export const useOrganizationsList = (
pageSize,
@@ -102,13 +97,15 @@ export const useCreateOrganization = (onSuccessCallback) => {
});
};
-export const useAssignOrgToProject=(onSuccessCallback)=>{
- const useClient = useQueryClient();
+export const useAssignOrgToProject = (onSuccessCallback) => {
+ const useClient = useQueryClient();
return useMutation({
mutationFn: async (payload) =>
await OrganizationRepository.assignOrganizationToProject(payload),
onSuccess: (_, variables) => {
- // useClient.invalidateQueries({ queryKey: ["organizationList"] });
+ useClient.invalidateQueries({
+ queryKey: ["projectAssignedOrganiztions"],
+ });
showToast("Organization successfully", "success");
if (onSuccessCallback) onSuccessCallback();
},
@@ -121,9 +118,9 @@ export const useAssignOrgToProject=(onSuccessCallback)=>{
);
},
});
-}
-export const useAssignOrgToTenant =(onSuccessCallback)=>{
- const useClient = useQueryClient();
+};
+export const useAssignOrgToTenant = (onSuccessCallback) => {
+ const useClient = useQueryClient();
return useMutation({
mutationFn: async (payload) =>
await OrganizationRepository.assignOrganizationToTenanat(payload),
@@ -141,9 +138,9 @@ export const useAssignOrgToTenant =(onSuccessCallback)=>{
);
},
});
-}
-export const useUpdateOrganization=()=>{
- const useClient = useQueryClient();
+};
+export const useUpdateOrganization = () => {
+ const useClient = useQueryClient();
return useMutation({
mutationFn: async (payload) =>
await OrganizationRepository.assignOrganizationToProject(payload),
@@ -161,4 +158,4 @@ export const useUpdateOrganization=()=>{
);
},
});
-}
\ No newline at end of file
+};
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index c2f3f9d8..33d26f59 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -177,7 +177,7 @@ export const useProjectInfra = (projectId) => {
data: projectInfra,
isLoading,
error,
- isFetched
+ isFetched,
} = useQuery({
queryKey: ["ProjectInfra", projectId],
queryFn: async () => {
@@ -191,7 +191,7 @@ export const useProjectInfra = (projectId) => {
},
});
- return { projectInfra, isLoading, error,isFetched };
+ return { projectInfra, isLoading, error, isFetched };
};
export const useProjectTasks = (workAreaId, IsExpandedArea = false) => {
@@ -268,26 +268,30 @@ export const useProjectLevelEmployeePermission = (employeeId, projectId) => {
});
};
-export const useProjectAssignedOrganizations =(projectId)=>{
+export const useProjectAssignedOrganizations = (projectId) => {
+ return useQuery({
+ queryKey: ["projectAssignedOrganiztions", projectId],
+ queryFn: async () => {
+ const resp = await ProjectRepository.getProjectAssignedOrganizations(
+ projectId
+ );
+ return resp.data;
+ },
+ enabled: !!projectId,
+ });
+};
+export const useProjectAssignedServices = (projectId) => {
return useQuery({
queryKey: ["projectAssignedServices", projectId],
queryFn: async () => {
- const resp = await ProjectRepository.getProjectAssignedOrganizations(projectId);
+ const resp = await ProjectRepository.getProjectAssignedServices(
+ projectId
+ );
return resp.data;
},
- enabled:!!projectId,
+ enabled: !!projectId,
});
-}
-export const useProjectAssignedServices =(projectId)=>{
- return useQuery({
- queryKey: ["projectAssignedServices", projectId],
- queryFn: async () => {
- const resp = await ProjectRepository.getProjectAssignedServices(projectId);
- return resp.data;
- },
- enabled:!!projectId,
- });
-}
+};
// -- -------------Mutation-------------------------------
diff --git a/src/pages/authentication/tempCodeRunnerFile.jsx b/src/pages/authentication/tempCodeRunnerFile.jsx
new file mode 100644
index 00000000..e9f12b60
--- /dev/null
+++ b/src/pages/authentication/tempCodeRunnerFile.jsx
@@ -0,0 +1 @@
+login
\ No newline at end of file
diff --git a/src/repositories/AuthRepository.jsx b/src/repositories/AuthRepository.jsx
index fba24745..5004c7ec 100644
--- a/src/repositories/AuthRepository.jsx
+++ b/src/repositories/AuthRepository.jsx
@@ -2,7 +2,7 @@ import { api } from "../utils/axiosClient";
const AuthRepository = {
// Public routes (no auth token required)
- login: (data) => api.postPublic("/api/auth/login", data),
+ login: (data) => api.postPublic("/api/auth/login/v1", data),
refreshToken: (data) => api.postPublic("/api/auth/refresh-token", data),
forgotPassword: (data) => api.postPublic("/api/auth/forgot-password", data),
resetPassword: (data) => api.postPublic("/api/auth/reset-password", data),
@@ -15,8 +15,7 @@ const AuthRepository = {
logout: (data) => api.post("/api/auth/logout", data),
profile: () => api.get("/api/user/profile"),
changepassword: (data) => api.post("/api/auth/change-password", data),
- appmenu:()=>api.get('/api/appmenu/get/menu')
-
+ appmenu: () => api.get("/api/appmenu/get/menu"),
};
export default AuthRepository;