Sc-11626: minor fixes & clean up

web/gds-user-ui/src/components/AddNewVaspModal/AddNewVaspModal.tsx

@@ -55,7 +55,7 @@ function AddNewVaspModal() {
         closeModal();
       },
       onError: (error) => {
-        console.log('[mutate] error', error.response?.data.error);
+        // console.log('[mutate] error', error.response?.data.error);
         toast({
           title: error.response?.data?.error || error.message,
           status: 'error',

web/gds-user-ui/src/components/Collaborators/EditCollaborator/useUpdateCollaborator.ts

@@ -5,8 +5,7 @@ import type { UpdateCollaboratorMutation } from 'components/Collaborators/EditCo
 export function useUpdateCollaborator(): UpdateCollaboratorMutation {
     const mutation = useMutation(['update-Collaborator'], updateCollaboratorService, {
         onError: (error: any) => {
-            console.log('update-Collaborator-error', error);
-            console.log('update-Collaborator-error-response', error?.response.data?.error);
+            console.log(error);
         },
     });
     return {

web/gds-user-ui/src/hooks/useAuth.ts

@@ -51,7 +51,7 @@ const useAuth = () => {
       const currentTime = new Date().getTime() / 1000;
 
       if (currentTime > +getExpiryTime) {
-        console.log('token expired');
+        // console.log('token expired');
         clearCookies();
         logoutUser();
         return false;

web/gds-user-ui/src/hooks/useQuery.ts

@@ -1,9 +1,17 @@
+/* eslint-disable @typescript-eslint/no-shadow */
 import React from 'react';
 import { useLocation } from 'react-router-dom';
-function useQuery() {
-  const { search } = useLocation();
 
-  return React.useMemo(() => new URLSearchParams(search), [search]);
+function useQuery<QueryParams>() {
+  const { search } = useLocation();
+  return React.useMemo(() => {
+    const params = new URLSearchParams(search);
+    const result: any = {} as QueryParams;
+    params.forEach((value, key) => {
+      result[key] = value as unknown;
+    });
+    return result;
+  }, [search]);
 }
 
 export default useQuery;

web/gds-user-ui/src/modules/auth/login/user.slice.ts

@@ -73,7 +73,7 @@ export const getAuth0User: any = createAsyncThunk(
     try {
       // then login with auth0
       const getUserInfo: any = hasToken && (await auth0Hash());
-      console.log('[getUserInfo]', getUserInfo);
+      // console.log('[getUserInfo]', getUserInfo);
 
       if (getUserInfo && getUserInfo?.idTokenPayload?.email_verified) {
         const getUser = await logUserInBff();

web/gds-user-ui/src/modules/dashboard/certificate/registration.tsx

@@ -112,7 +112,6 @@ const Certificate: React.FC = () => {
 
   async function handleNextStepClick() {
     if (hasErroredField()) {
-      console.log('has errored field');
       // i think we should not use alert here , but we need to find a way to display the error message
       // eslint-disable-next-line no-alert
       if (window.confirm('Some elements required for registration are missing; continue anyway?')) {
@@ -148,7 +147,6 @@ const Certificate: React.FC = () => {
       values: methods.getValues()
     });
     if (isDirty) {
-      console.log('[isDirty at previous action]', getCurrentFormValue());
       await postRegistrationValue({
         ...methods.getValues(),
         state: {

web/gds-user-ui/src/modules/dashboard/collaborator/CollaboratorService.ts

@@ -14,7 +14,6 @@ export const createCollaborator = async (data: any): Promise<any> => {
   const response: any = await axiosInstance.post(`/collaborators`, {
     ...data
   });
-  console.log('response', response);
   return response;
 };
 

web/gds-user-ui/src/modules/dashboard/organization/SwitchOrganization.tsx

@@ -13,8 +13,7 @@ import { APP_PATH, APP_STATUS_CODE } from 'utils/constants';
 const SwitchOrganization: React.FC = () => {
   const toast = useToast();
   const { id } = useParams<{ id: string }>();
-  const query = useQuery();
-  const vaspName = query.get('vaspName');
+  const { vaspName } = useQuery<{ vaspName: string }>();
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const isCalled = useRef(false);
@@ -46,8 +45,6 @@ const SwitchOrganization: React.FC = () => {
           duration: 9000,
           isClosable: true
         });
-      } finally {
-        setIsLoading(false);
       }
     };
 
@@ -75,7 +72,7 @@ const SwitchOrganization: React.FC = () => {
     );
   };
 
-  return <>{isLoading && <TransparentLoader title={renderTitle()} opacity="full" />}</>;
+  return <>{isLoading && !isError && <TransparentLoader title={renderTitle()} opacity="full" />}</>;
 };
 
 export default SwitchOrganization;

web/gds-user-ui/src/modules/verify/index.tsx

@@ -8,14 +8,11 @@ import useAuth from 'hooks/useAuth';
 import { useNavigate } from 'react-router-dom';
 import TransparentLoader from 'components/Loader/TransparentLoader';
 const VerifyPage: React.FC = () => {
-  const query = useQuery();
+  const { vaspID, token, registered_directory } = useQuery();
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<any>();
   const [result, setResult] = useState<any>(null);
   const [isRedirected, setIsRedirected] = useState<boolean>(false);
-  const vaspID = query.get('vaspID');
-  const token = query.get('token');
-  const registered_directory = query.get('registered_directory');
   const { isLoggedIn } = useAuth();
   const navigate = useNavigate();
 

web/gds-user-ui/src/utils/permission.ts

@@ -13,18 +13,13 @@ export const getUserPermissionFromStore = () => {
 
 export const hasPermission = (permission: TUserPermission | TUserPermission[]) => {
   const userPermission = getUserPermissionFromStore();
-  console.log('userPermission', userPermission);
   if (isArray(permission)) {
-    // all permission element should be in userPermission
     return permission.every((p) => userPermission.includes(p));
   }
 
   return userPermission?.includes(permission);
 };
 
-export const canCreateOrganization = () => {
-  return hasPermission(USER_PERMISSION.CREATE_ORGANIZATIONS);
-};
 
 /**  hasRole function
  *   @params role: string | string[]
@@ -34,7 +29,6 @@ export const canCreateOrganization = () => {
 export const hasRole = (role: TUserRole | TUserRole[]) => {
   const userRole = Store.getState()?.user?.user?.role;
   if (isArray(role)) {
-    // all role element should be in userRole
     return role.every((r) => userRole.includes(r));
   }
 
@@ -45,3 +39,7 @@ export const hasRole = (role: TUserRole | TUserRole[]) => {
 export const canInviteCollaborator = () => {
   return hasPermission(USER_PERMISSION.UPDATE_COLLABORATOR);
 };
+
+export const canCreateOrganization = () => {
+  return hasPermission(USER_PERMISSION.CREATE_ORGANIZATIONS);
+};