Merge pull request #152 from hotosm/minor-updates

fix: minor issues

src/frontend/src/components/Dashboard/RequestLogs/index.tsx

@@ -2,7 +2,7 @@ import { useGetTaskListQuery } from '@Api/dashboard';
 import { FlexColumn } from '@Components/common/Layouts';
 import { Button } from '@Components/RadixComponents/Button';
 import { postTaskStatus } from '@Services/project';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { toast } from 'react-toastify';
 
 const RequestLogs = () => {
@@ -12,11 +12,14 @@ const RequestLogs = () => {
         (task: Record<string, any>) => task?.state === 'request logs',
       ),
   });
+  const queryClient = useQueryClient();
 
   const { mutate: respondToRequest } = useMutation<any, any, any, unknown>({
     mutationFn: postTaskStatus,
     onSuccess: () => {
       toast.success('Responded to the request');
+      queryClient.invalidateQueries({ queryKey: ['task-list'] });
+      queryClient.invalidateQueries({ queryKey: ['task-statistics'] });
     },
     onError: (err: any) => {
       toast.error(err.message);
@@ -27,7 +30,7 @@ const RequestLogs = () => {
     respondToRequest({
       projectId,
       taskId,
-      data: { event: 'bad' },
+      data: { event: 'reject' },
     });
   };
 

src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx

@@ -17,6 +17,8 @@ import { setUserState } from '@UserModule/store/actions/user';
 import googleIcon from '@Assets/images/google-icon.svg';
 import { toast } from 'react-toastify';
 
+const { BASE_URL } = process.env;
+
 const initialState = {
   username: '',
   password: '',
@@ -37,11 +39,19 @@ export default function Login() {
 
   const { mutate, isLoading } = useMutation<any, any, any, unknown>({
     mutationFn: signInUser,
-    onSuccess: (res: any) => {
+    onSuccess: async (res: any) => {
       dispatch(setUserState({ user: res.data }));
       localStorage.setItem('token', res.data.access_token);
       localStorage.setItem('refresh', res.data.refresh_token);
       toast.success('Logged In Successfully');
+      const userDetailsUrl = `${BASE_URL}/users/my-info/`;
+      const response2 = await fetch(userDetailsUrl, {
+        credentials: 'include',
+        headers: { 'access-token': res.data.access_token },
+      });
+      const userDetails = await response2.json();
+      const userDetailsString = JSON.stringify(userDetails);
+      localStorage.setItem('userprofile', userDetailsString);
       navigate('/projects');
     },
     onError: err => {

src/frontend/src/routes/types.ts

@@ -1,10 +1,16 @@
-import { LazyExoticComponent } from 'react';
+import { LazyExoticComponent, ReactNode } from 'react';
 
 export interface IRoute {
   id?: number;
   path: string;
   name: string;
-  component: LazyExoticComponent<() => JSX.Element> | (() => JSX.Element);
+  component:
+    | LazyExoticComponent<() => JSX.Element>
+    | (() => JSX.Element)
+    // eslint-disable-next-line no-unused-vars
+    | ((props: { children?: ReactNode }) => JSX.Element)
+    | (() => JSX.Element)
+    | (() => JSX.Element);
   authenticated?: boolean;
   children?: IRoute[];
 }