- updated tables, checked filters;

src/helpers/getQueryParamsForPaginatedEndpoint.js

@@ -1,7 +1,7 @@
 import { isEmpty, pathOr } from 'ramda';
 import formatDateString from './formatDateString';
 
-const getQueryParamsForPaginatedEndpoint = (lazyState, statuses, sortByCol = 'applicationId') => {
+const getQueryParamsForPaginatedEndpoint = (lazyState, statuses, sortByCol = 'applicationId', extraCfg = {}) => {
     let sortBy = {
         columnName: sortByCol,
         sortDesc: true
@@ -31,6 +31,7 @@ const getQueryParamsForPaginatedEndpoint = (lazyState, statuses, sortByCol = 'ap
             }
             return acc;
         }, {}),
+        ...extraCfg
     }
 }
 

src/pages/Bandi/components/AllBandiTable/index.js

@@ -104,8 +104,7 @@ const AllBandiTable = () => {
             onChange={(e) => options.filterCallback(e.value, options.index)}
             itemTemplate={statusItemTemplate}
             placeholder={translationStrings.selectOneLabel}
-            className="p-column-filter"
+            className="p-column-filter"/>;
-            showClear />;
     };
 
     const statusItemTemplate = (option) => {

src/pages/Bandi/components/AllBandiTableAsync/index.js

@@ -41,7 +41,7 @@ const AllBandiTableAsync = () => {
             status: { value: null, matchMode: 'equals' }
         }
     });
-    const statuses = [];
+    const statuses = ['DRAFT','PUBLISH','EXPIRED'];
 
     const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
 
@@ -111,8 +111,7 @@ const AllBandiTableAsync = () => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js

@@ -116,8 +116,7 @@ const AllBandiAccordion = ({ showOnlyPreferred = false }) => {
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const statusItemTemplate = (option) => {

src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js

@@ -41,7 +41,7 @@ const AllBandiPreInstructorTableAsync = () => {
             status: { value: null, matchMode: 'equals' }
         }
     });
-    const statuses = [];
+    const statuses = ['DRAFT','PUBLISH','EXPIRED'];
 
     const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
 
@@ -111,8 +111,7 @@ const AllBandiPreInstructorTableAsync = () => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/BandiPreInstructor/components/AllBandiTable/index.js

@@ -103,8 +103,7 @@ const AllBandiTable = () => {
             onChange={(e) => options.filterCallback(e.value, options.index)}
             itemTemplate={statusItemTemplate}
             placeholder={translationStrings.selectOneLabel}
-            className="p-column-filter"
+            className="p-column-filter"/>;
-            showClear />;
     };
 
     const statusItemTemplate = (option) => {

src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js

@@ -96,7 +96,11 @@ const AllBandiPreferredAccordion = () => {
     };
 
     const statusFilterTemplate = (options) => {
-        return <Dropdown value={options.value} options={statuses} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
+        return <Dropdown value={options.value}
+                         options={statuses}
+                         onChange={(e) => options.filterCallback(e.value, options.index)}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         className="p-column-filter"/>;
     };
 
     const statusItemTemplate = (option) => {

src/pages/Dashboard/components/DraftApplicationsTable/index.js

@@ -113,8 +113,7 @@ const DraftApplicationsTable = () => {
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const progressBodyTemplate = (options) => {

src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js

@@ -118,8 +118,7 @@ const DraftApplicationsTableAsync = () => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const actionsBodyTemplate = (rowData) => {

src/pages/Dashboard/components/LatestBandiTableAsync/index.js

@@ -111,8 +111,7 @@ const LatestBandiTableAsync = () => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js

@@ -176,8 +176,7 @@ const LatestBandiBeneficiarioTableAsync = () => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js

@@ -153,8 +153,7 @@ const MyLatestSubmissionsTable = () => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
                          itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
-                         className="p-column-filter"
+                         className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const progressBodyTemplate = (options) => {

src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js

@@ -176,8 +176,7 @@ const MyLatestSubmissionsTableAsync = () => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js

@@ -132,7 +132,10 @@ const InstructorManagerMieDomandeTable = ({ userId = null, statuses = [] }) => {
     };
 
     const statusFilterTemplate = (options) => {
-        return <Dropdown value={options.value} options={statusesForFilter} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
+        return <Dropdown value={options.value} options={statusesForFilter}
+                         onChange={(e) => options.filterCallback(e.value, options.index)}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         className="p-column-filter"/>;
     };
 
     const statusItemTemplate = (option) => {

src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js

@@ -103,8 +103,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js

@@ -114,8 +114,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {
@@ -196,7 +195,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
                 <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         sortable
                         filterField="applicationId" filter
-                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterMatchModeOptions={translationStrings.numberFilterOptions}
                         filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}

src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js

@@ -114,8 +114,7 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {
@@ -196,7 +195,7 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => {
                 <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         sortable
                         filterField="applicationId" filter
-                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterMatchModeOptions={translationStrings.numberFilterOptions}
                         filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}

src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js

@@ -132,7 +132,10 @@ const PreInstructorDomandeTable = ({ userId = null, statuses = [] }) => {
     };
 
     const statusFilterTemplate = (options) => {
-        return <Dropdown value={options.value} options={statusesForFilter} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
+        return <Dropdown value={options.value} options={statusesForFilter}
+                         onChange={(e) => options.filterCallback(e.value, options.index)}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         className="p-column-filter"/>;
     };
 
     const statusItemTemplate = (option) => {

src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js

@@ -128,8 +128,7 @@ const DocumentsTable = ({ type, reload = 0 }) => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
                          itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')}
-                         className="p-column-filter"
+                         className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const statusItemTemplate = (option) => {

src/pages/Domande/components/AllDomandeTable/index.js

@@ -111,8 +111,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/Domande/components/AllDomandeTableAsync/index.js

@@ -125,8 +125,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '' }) => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js

@@ -110,8 +110,7 @@ const AllDomandeArchiveTable = ({ updaterString = '' }) => {
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js

@@ -128,8 +128,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {

src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js

@@ -134,8 +134,7 @@ const BeneficiarioDomandeTable = () => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
                          itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
-                         className="p-column-filter"
+                         className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const progressBodyTemplate = (options) => {

src/pages/SoccorsoIstruttorioInstructorManager/index.js

@@ -6,9 +6,11 @@ import NumberFlow from '@number-flow/react';
 // components
 import DashboardService from '../../service/dashboard-service';
 import SoccorsiPreInstructorTableAsync from '../SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync';
+import { useStore } from '../../store';
 
 const SoccorsoIstruttorioInstructorManager = () => {
     const [mainStats, setMainStats] = useState({});
+    const userData = useStore().main.userData();
 
     const getStats = (data) => {
         if (data.status === 'SUCCESS') {
@@ -86,7 +88,7 @@ const SoccorsoIstruttorioInstructorManager = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <SoccorsiPreInstructorTableAsync userId={0}/>
+                <SoccorsiPreInstructorTableAsync userId={userData.id}/>
             </div>
         </div>
     )

src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js

@@ -120,7 +120,10 @@ const InstructorManagerSoccorsiTable = () => {
     };
 
     const statusFilterTemplate = (options) => {
-        return <Dropdown value={options.value} options={statuses} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
+        return <Dropdown value={options.value} options={statuses}
+                         onChange={(e) => options.filterCallback(e.value, options.index)}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         className="p-column-filter"/>;
     };
 
     const statusItemTemplate = (option) => {

src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js

@@ -42,9 +42,17 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
             status: { value: null, matchMode: 'equals' }
         }
     });
-    const statuses = [];
+    const statuses = ['AWAITING', 'RESPONSE_RECEIVED', 'CLOSE', 'EXPIRED'];
 
-    const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'applicationId'), [lazyState]);
+    const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(
+            lazyState,
+            statuses,
+            'applicationId',
+            {
+                personalRecords: true
+            }
+        ),
+        [lazyState]);
 
     const onPage = (event) => {
         setLazyState(event);
@@ -113,8 +121,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
                          itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
-                         className="p-column-filter"
+                         className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {
@@ -149,7 +156,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
                 <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         sortable
                         filterField="applicationId" filter
-                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterMatchModeOptions={translationStrings.numberFilterOptions}
                         filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}

src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js

@@ -123,7 +123,10 @@ const PreInstructorSoccorsiTable = ({ userId = null }) => {
     };
 
     const statusFilterTemplate = (options) => {
-        return <Dropdown value={options.value} options={statuses} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
+        return <Dropdown value={options.value} options={statuses}
+                         onChange={(e) => options.filterCallback(e.value, options.index)}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         className="p-column-filter"/>;
     };
 
     const statusItemTemplate = (option) => {

src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js

@@ -42,9 +42,17 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
             status: { value: null, matchMode: 'equals' }
         }
     });
-    const statuses = [];
+    const statuses = ['AWAITING', 'RESPONSE_RECEIVED', 'CLOSE', 'EXPIRED'];
 
-    const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'applicationId'), [lazyState]);
+    const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(
+            lazyState,
+            statuses,
+            'applicationId',
+            {
+                personalRecords: false
+            }
+        ),
+        [lazyState]);
 
     const onPage = (event) => {
         setLazyState(event);
@@ -113,8 +121,7 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
                          itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
-                         className="p-column-filter"
+                         className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const dateFilterTemplate = (options) => {
@@ -149,7 +156,7 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
                 <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         sortable
                         filterField="applicationId" filter
-                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterMatchModeOptions={translationStrings.numberFilterOptions}
                         filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}

src/pages/Users/components/AllUsersTable/index.js

@@ -132,8 +132,7 @@ const AllUsersTable = ({ updaterString = '' }) => {
         return <Dropdown value={options.value} options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
                          itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')}
-                         className="p-column-filter"
+                         className="p-column-filter"/>;
-                         showClear/>;
     };
 
     const statusItemTemplate = (option) => {