From 6c5a051647545afe4346bf2bf6b1341ec8613510 Mon Sep 17 00:00:00 2001 From: Rahul-538 Date: Tue, 10 Dec 2024 12:23:39 +0530 Subject: [PATCH 1/4] minor change in guest authentication --- .../GuestWorkspace/GuestWorkspaceTable.jsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/GuestWorkspace/GuestWorkspaceTable.jsx b/src/components/GuestWorkspace/GuestWorkspaceTable.jsx index 817968e8..391a0aaf 100644 --- a/src/components/GuestWorkspace/GuestWorkspaceTable.jsx +++ b/src/components/GuestWorkspace/GuestWorkspaceTable.jsx @@ -259,6 +259,8 @@ const GuestWorkspaceTable = (props) => { const data = guestWorkspaceData && guestWorkspaceData.length > 0 ? pageSearch().map((el, i) => { + const isAuthenticated = + el.is_authenticated || authenticatedWorkspaces.includes(el.id); return [ el.id, el.workspace_name, @@ -271,13 +273,15 @@ const GuestWorkspaceTable = (props) => { handleViewWorkspace(el.id) : () => handleOpen(el.workspace_name, el.id) } From b5c526ec736179831914b2def17734e1ac517296 Mon Sep 17 00:00:00 2001 From: Rahul-538 Date: Fri, 20 Dec 2024 12:05:37 +0530 Subject: [PATCH 2/4] minor fix --- src/components/Tabs/organizationReports.jsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/Tabs/organizationReports.jsx b/src/components/Tabs/organizationReports.jsx index bf331d65..8684bb30 100644 --- a/src/components/Tabs/organizationReports.jsx +++ b/src/components/Tabs/organizationReports.jsx @@ -360,6 +360,11 @@ const OrganizationReports = () => { targetLanguage:targetLanguage, userId:userId, sendMail:sendMail})); + setSnackbarInfo({ + open: true, + message: "Project Report will be e-mailed to you shortly", + variant: "success", + }) }else if(projectReportType === 2){ dispatch(fetchOrganizationDetailedProjectReports( {orgId:Number(orgId), projectType:selectedType, From 934a6a60abf1fd585440b9ed635dbbccde35ad6e Mon Sep 17 00:00:00 2001 From: Rahul Kumar <142306874+Rahul-538@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:44:28 +0530 Subject: [PATCH 3/4] Update organizationReports.jsx --- src/components/Tabs/organizationReports.jsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/components/Tabs/organizationReports.jsx b/src/components/Tabs/organizationReports.jsx index 8684bb30..bf331d65 100644 --- a/src/components/Tabs/organizationReports.jsx +++ b/src/components/Tabs/organizationReports.jsx @@ -360,11 +360,6 @@ const OrganizationReports = () => { targetLanguage:targetLanguage, userId:userId, sendMail:sendMail})); - setSnackbarInfo({ - open: true, - message: "Project Report will be e-mailed to you shortly", - variant: "success", - }) }else if(projectReportType === 2){ dispatch(fetchOrganizationDetailedProjectReports( {orgId:Number(orgId), projectType:selectedType, From a6057955ed62f769da4079ab493419204a1a1d76 Mon Sep 17 00:00:00 2001 From: Rahul Kumar <142306874+Rahul-538@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:45:04 +0530 Subject: [PATCH 4/4] Update GuestWorkspaceTable.jsx --- src/components/GuestWorkspace/GuestWorkspaceTable.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/GuestWorkspace/GuestWorkspaceTable.jsx b/src/components/GuestWorkspace/GuestWorkspaceTable.jsx index 391a0aaf..5358fa53 100644 --- a/src/components/GuestWorkspace/GuestWorkspaceTable.jsx +++ b/src/components/GuestWorkspace/GuestWorkspaceTable.jsx @@ -260,7 +260,7 @@ const GuestWorkspaceTable = (props) => { guestWorkspaceData && guestWorkspaceData.length > 0 ? pageSearch().map((el, i) => { const isAuthenticated = - el.is_authenticated || authenticatedWorkspaces.includes(el.id); + el.is_autheticated || authenticatedWorkspaces.includes(el.id); return [ el.id, el.workspace_name, @@ -399,4 +399,4 @@ const GuestWorkspaceTable = (props) => { ); }; -export default GuestWorkspaceTable; \ No newline at end of file +export default GuestWorkspaceTable;