From 4773eff552777b2da934ce0029067e7d4840549d Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 17 Feb 2025 16:03:03 +0100
Subject: [PATCH] - fixed displaying statuses in the filter for tables; - added
 redirect to dashboard upon changing current company;

---
 src/components/TopBarProfileMenu/index.js             |  2 ++
 .../InstructorManagerMieDomandeTable/index.js         |  3 ++-
 .../components/PreInstructorDomandeTable/index.js     |  3 ++-
 src/pages/Domande/components/AllDomandeTable/index.js |  6 ++++--
 .../components/PreInstructorSoccorsiTable/index.js    | 11 +++++++----
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/TopBarProfileMenu/index.js b/src/components/TopBarProfileMenu/index.js
index 2c3c729..296527a 100644
--- a/src/components/TopBarProfileMenu/index.js
+++ b/src/components/TopBarProfileMenu/index.js
@@ -95,6 +95,8 @@ const TopBarProfileMenu = ({ menuLeftRef }) => {
                     detail: __('L\'azienda è stata cambiata')
                 });
             }
+
+            navigate('/')
         }
     }
 
diff --git a/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js b/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
index 752347f..d15bd47 100644
--- a/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
+++ b/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
@@ -102,7 +102,8 @@ const InstructorManagerMieDomandeTable = ({ userId = null, statuses = [] }) => {
             evaluationEndDate: {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
-            }
+            },
+            status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }
         });
     };
 
diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index 7791aa7..0592fff 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -102,7 +102,8 @@ const PreInstructorDomandeTable = ({ userId = null, statuses = [] }) => {
             evaluationEndDate: {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
-            }
+            },
+            status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }
         });
     };
 
diff --git a/src/pages/Domande/components/AllDomandeTable/index.js b/src/pages/Domande/components/AllDomandeTable/index.js
index 61ade5c..efeb7af 100644
--- a/src/pages/Domande/components/AllDomandeTable/index.js
+++ b/src/pages/Domande/components/AllDomandeTable/index.js
@@ -177,8 +177,10 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
                         filter sortable
                         filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '8rem' }}/>
-                <Column field="status" header={__('Stato', 'gepafin')}
-                        style={{ minWidth: '8rem' }} body={statusBodyTemplate}
+                <Column field="status"
+                        header={__('Stato', 'gepafin')}
+                        style={{ minWidth: '8rem' }}
+                        body={statusBodyTemplate}
                         filter
                         filterElement={statusFilterTemplate}/>
                 <Column header={__('Azioni', 'gepafin')}
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
index b74acd6..384ac29 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
@@ -94,8 +94,8 @@ const PreInstructorSoccorsiTable = ({ userId = null }) => {
             evaluationEndDate: {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
-            }
-        });
+            },
+            status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] },        });
     };
 
     const renderHeader = () => {
@@ -165,8 +165,11 @@ const PreInstructorSoccorsiTable = ({ userId = null }) => {
                         filterField="evaluationEndDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateExpirationBodyTemplate} filter filterElement={dateFilterTemplate}/>
-                <Column field="status" header={__('Stato', 'gepafin')}
-                        style={{ minWidth: '7rem' }} body={statusBodyTemplate} filter
+                <Column field="status"
+                        header={__('Stato', 'gepafin')}
+                        style={{ minWidth: '7rem' }}
+                        body={statusBodyTemplate}
+                        filter
                         filterElement={statusFilterTemplate} />
                 <Column header={__('Azioni', 'gepafin')}
                         body={actionsBodyTemplate}/>