From 44ba9036cbfe0fc8f356cdb93033b147c2857998 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Mon, 7 Apr 2025 11:12:37 +0200 Subject: [PATCH] - updated tables, checked filters; --- .../getQueryParamsForPaginatedEndpoint.js | 3 ++- .../Bandi/components/AllBandiTable/index.js | 3 +-- .../components/AllBandiTableAsync/index.js | 5 ++--- .../components/AllBandiAccordion/index.js | 3 +-- .../AllBandiPreInstructorTableAsync/index.js | 5 ++--- .../components/AllBandiTable/index.js | 3 +-- .../AllBandiPreferredAccordion/index.js | 6 +++++- .../components/DraftApplicationsTable/index.js | 3 +-- .../DraftApplicationsTableAsync/index.js | 3 +-- .../components/LatestBandiTableAsync/index.js | 3 +-- .../LatestBandiBeneficiarioTableAsync/index.js | 3 +-- .../MyLatestSubmissionsTable/index.js | 3 +-- .../MyLatestSubmissionsTableAsync/index.js | 3 +-- .../InstructorManagerMieDomandeTable/index.js | 5 ++++- .../index.js | 3 +-- .../index.js | 5 ++--- .../DomandeTablePreInstructorAsync/index.js | 5 ++--- .../PreInstructorDomandeTable/index.js | 5 ++++- .../components/DocumentsTable/index.js | 3 +-- .../Domande/components/AllDomandeTable/index.js | 3 +-- .../components/AllDomandeTableAsync/index.js | 3 +-- .../components/AllDomandeArchiveTable/index.js | 3 +-- .../AllDomandeBeneficiarioTableAsync/index.js | 3 +-- .../BeneficiarioDomandeTable/index.js | 3 +-- .../index.js | 4 +++- .../InstructorManagerSoccorsiTable/index.js | 5 ++++- .../index.js | 17 ++++++++++++----- .../PreInstructorSoccorsiTable/index.js | 5 ++++- .../SoccorsiPreInstructorTableAsync/index.js | 17 ++++++++++++----- .../Users/components/AllUsersTable/index.js | 3 +-- 30 files changed, 75 insertions(+), 63 deletions(-) diff --git a/src/helpers/getQueryParamsForPaginatedEndpoint.js b/src/helpers/getQueryParamsForPaginatedEndpoint.js index 54f7eac..47ca48b 100644 --- a/src/helpers/getQueryParamsForPaginatedEndpoint.js +++ b/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 } } diff --git a/src/pages/Bandi/components/AllBandiTable/index.js b/src/pages/Bandi/components/AllBandiTable/index.js index 9e268e3..54497d3 100644 --- a/src/pages/Bandi/components/AllBandiTable/index.js +++ b/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" - showClear />; + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/Bandi/components/AllBandiTableAsync/index.js b/src/pages/Bandi/components/AllBandiTableAsync/index.js index 1b90675..4d76682 100644 --- a/src/pages/Bandi/components/AllBandiTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js index 8fd5d57..5472702 100644 --- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js +++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js @@ -116,8 +116,7 @@ const AllBandiAccordion = ({ showOnlyPreferred = false }) => { const statusFilterTemplate = (options) => { return options.filterCallback(e.value, options.index)} - itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js index a780c11..5806b7c 100644 --- a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/BandiPreInstructor/components/AllBandiTable/index.js b/src/pages/BandiPreInstructor/components/AllBandiTable/index.js index 06b57d7..138316b 100644 --- a/src/pages/BandiPreInstructor/components/AllBandiTable/index.js +++ b/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" - showClear />; + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js index 6f9b8fa..8a2ed9b 100644 --- a/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js +++ b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js @@ -96,7 +96,11 @@ const AllBandiPreferredAccordion = () => { }; const statusFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />; + return options.filterCallback(e.value, options.index)} + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/Dashboard/components/DraftApplicationsTable/index.js b/src/pages/Dashboard/components/DraftApplicationsTable/index.js index 24b093f..50f1481 100644 --- a/src/pages/Dashboard/components/DraftApplicationsTable/index.js +++ b/src/pages/Dashboard/components/DraftApplicationsTable/index.js @@ -113,8 +113,7 @@ const DraftApplicationsTable = () => { const statusFilterTemplate = (options) => { return options.filterCallback(e.value, options.index)} - itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const progressBodyTemplate = (options) => { diff --git a/src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js b/src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js index d35333c..72781cb 100644 --- a/src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const actionsBodyTemplate = (rowData) => { diff --git a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js index ad9c17e..a3a5c4f 100644 --- a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js index 1c17cf2..883d33b 100644 --- a/src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js index f5e8cc2..21d64e2 100644 --- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js +++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js @@ -153,8 +153,7 @@ const MyLatestSubmissionsTable = () => { return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} - className="p-column-filter" - showClear/>; + className="p-column-filter"/>; }; const progressBodyTemplate = (options) => { diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js index 91f49bf..5cb63c4 100644 --- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js b/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js index c11bfda..d2a4ab7 100644 --- a/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js +++ b/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js @@ -132,7 +132,10 @@ const InstructorManagerMieDomandeTable = ({ userId = null, statuses = [] }) => { }; const statusFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />; + return options.filterCallback(e.value, options.index)} + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js index ccd4961..a6dce26 100644 --- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js index efbc894..d711d37 100644 --- a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { @@ -196,7 +195,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] }) { } setLazyState({ ...lazyState, filters, first: 0 }); }} - itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { @@ -196,7 +195,7 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => { { }; const statusFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />; + return options.filterCallback(e.value, options.index)} + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js index 255ebc6..3b76d0d 100644 --- a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js +++ b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js @@ -128,8 +128,7 @@ const DocumentsTable = ({ type, reload = 0 }) => { return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')} - className="p-column-filter" - showClear/>; + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/Domande/components/AllDomandeTable/index.js b/src/pages/Domande/components/AllDomandeTable/index.js index 24591d1..2adb952 100644 --- a/src/pages/Domande/components/AllDomandeTable/index.js +++ b/src/pages/Domande/components/AllDomandeTable/index.js @@ -111,8 +111,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => { const statusFilterTemplate = (options) => { return options.filterCallback(e.value, options.index)} - itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/Domande/components/AllDomandeTableAsync/index.js b/src/pages/Domande/components/AllDomandeTableAsync/index.js index f361389..2a1626d 100644 --- a/src/pages/Domande/components/AllDomandeTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js b/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js index 0309588..eddafcc 100644 --- a/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js +++ b/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js @@ -110,8 +110,7 @@ const AllDomandeArchiveTable = ({ updaterString = '' }) => { const statusFilterTemplate = (options) => { return options.filterCallback(e.value, options.index)} - itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js b/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js index 2332c9f..b4e036b 100644 --- a/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js +++ b/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" - showClear/>; + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js index f6b5bd3..5e7b771 100644 --- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js +++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js @@ -134,8 +134,7 @@ const BeneficiarioDomandeTable = () => { return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} - className="p-column-filter" - showClear/>; + className="p-column-filter"/>; }; const progressBodyTemplate = (options) => { diff --git a/src/pages/SoccorsoIstruttorioInstructorManager/index.js b/src/pages/SoccorsoIstruttorioInstructorManager/index.js index 23bacbb..bb8feb9 100644 --- a/src/pages/SoccorsoIstruttorioInstructorManager/index.js +++ b/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 = () => {
- +
) diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js index 4434fbb..1c821ed 100644 --- a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js +++ b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js @@ -120,7 +120,10 @@ const InstructorManagerSoccorsiTable = () => { }; const statusFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />; + return options.filterCallback(e.value, options.index)} + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js index c6b87d8..ab92d60 100644 --- a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js +++ b/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" - showClear/>; + className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { @@ -149,7 +156,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => { { }; const statusFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />; + return options.filterCallback(e.value, options.index)} + itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} + className="p-column-filter"/>; }; const statusItemTemplate = (option) => { diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js index 33f2ca8..9477e28 100644 --- a/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js +++ b/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" - showClear/>; + className="p-column-filter"/>; }; const dateFilterTemplate = (options) => { @@ -149,7 +156,7 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => { { return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')} - className="p-column-filter" - showClear/>; + className="p-column-filter"/>; }; const statusItemTemplate = (option) => {