- fixed displaying proper label in the table filter dropdown;

.idea/.name

@@ -1 +0,0 @@
-configData.js

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

@@ -100,6 +100,7 @@ const AllBandiTable = () => {
     const statusFilterTemplate = (options) => {
         return <Dropdown
             value={options.value}
+            valueTemplate={getBandoLabel(options.value)}
             options={statuses}
             onChange={(e) => options.filterCallback(e.value, options.index)}
             itemTemplate={statusItemTemplate}

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

@@ -174,6 +174,7 @@ const AllBandiTableAsync = () => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

@@ -132,6 +132,7 @@ const AllBandiAccordion = ({ showOnlyPreferred = false, isAntiMoneylaundry = fal
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
                          itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
     };

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

@@ -141,6 +141,7 @@ const AllBandiPreInstructorTableAsync = () => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

@@ -99,6 +99,7 @@ const AllBandiTable = () => {
     const statusFilterTemplate = (options) => {
         return <Dropdown
             value={options.value}
+            valueTemplate={getBandoLabel(options.value)}
             options={statuses}
             onChange={(e) => options.filterCallback(e.value, options.index)}
             itemTemplate={statusItemTemplate}

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

@@ -97,6 +97,7 @@ const AllBandiPreferredAccordion = () => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value}
+                         valueTemplate={getBandoLabel(options.value)}
                          options={statuses}
                          onChange={(e) => options.filterCallback(e.value, options.index)}
                          itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}

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

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

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

@@ -108,6 +108,7 @@ const DraftApplicationsTableAsync = () => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

@@ -169,6 +169,7 @@ const LatestBandiTableAsync = () => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

@@ -178,6 +178,7 @@ const LatestBandiBeneficiarioTableAsync = ({ isAntiMoneylaundry = false }) => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

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

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

@@ -171,6 +171,7 @@ const MyLatestSubmissionsTableAsync = () => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

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

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

@@ -96,6 +96,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

@@ -106,6 +106,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

@@ -108,7 +108,9 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [],
     };
 
     const statusFilterTemplate = (options) => {
-        return <Dropdown value={options.value} options={applicationStatuses}
+        return <Dropdown value={options.value}
+                         valueTemplate={getBandoLabel(options.value)}
+                         options={applicationStatuses}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };
@@ -119,7 +121,8 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [],
                              }
                              setLazyState({ ...lazyState, filters, first: 0 });
                          }}
-                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         itemTemplate={statusItemTemplate}
+                         placeholder={translationStrings.selectOneLabel}
                          className="p-column-filter"/>;
     };
 

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

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

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

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

src/pages/DomandaEditInstructorManager/index.js

@@ -754,10 +754,10 @@ const DomandaEditInstructorManager = () => {
         setIsVisibleCompleteDialog(true);
     }
 
-    const initiateTFRejecting = () => {
+    /*const initiateTFRejecting = () => {
         setOperationType('tf_reject');
         setIsVisibleCompleteDialog(true);
-    }
+    }*/
 
     const doCheckNDG = () => {
         doSaveDraft(doGetNDGRequest);

src/pages/DomandaEditPreInstructor/index.js

@@ -754,10 +754,10 @@ const DomandaEditPreInstructor = () => {
         setIsVisibleCompleteDialog(true);
     }
 
-    const initiateTFRejecting = () => {
+    /*const initiateTFRejecting = () => {
         setOperationType('tf_reject');
         setIsVisibleCompleteDialog(true);
-    }
+    }*/
 
     const doCheckNDG = () => {
         doSaveDraft(doGetNDGRequest);

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

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

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

@@ -115,6 +115,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '' }) => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

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

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

@@ -118,6 +118,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

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

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

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

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

@@ -126,6 +126,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

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

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

@@ -126,6 +126,7 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
 
     const statusFilterTemplate = (options) => {
         return <Dropdown value={options.value} options={statuses}
+                         valueTemplate={getBandoLabel(options.value)}
                          onChange={(e) => {
                              options.filterCallback(e.value, options.index)
                              const filters = { ...lazyState.filters };

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

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