diff --git a/src/pages/Bandi/components/AllBandiTable/index.js b/src/pages/Bandi/components/AllBandiTable/index.js index 54497d3..5a6c1ea 100644 --- a/src/pages/Bandi/components/AllBandiTable/index.js +++ b/src/pages/Bandi/components/AllBandiTable/index.js @@ -130,11 +130,13 @@ const AllBandiTable = () => { filter sortable filterPlaceholder={__('Cerca', 'gepafin')} style={{ minWidth: '8rem' }}/> - - diff --git a/src/pages/Bandi/components/AllBandiTableAsync/index.js b/src/pages/Bandi/components/AllBandiTableAsync/index.js index 4d76682..6b81818 100644 --- a/src/pages/Bandi/components/AllBandiTableAsync/index.js +++ b/src/pages/Bandi/components/AllBandiTableAsync/index.js @@ -36,8 +36,8 @@ const AllBandiTableAsync = () => { sortOrder: null, filters: { name: { value: null, matchMode: 'contains' }, - startDate: { value: null, matchMode: 'date_is' }, - endDate: { value: null, matchMode: 'date_is' }, + startDate: { value: null, matchMode: 'dateIs' }, + endDate: { value: null, matchMode: 'dateIs' }, status: { value: null, matchMode: 'equals' } } }); diff --git a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js index 5806b7c..4f5b400 100644 --- a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js +++ b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js @@ -36,8 +36,8 @@ const AllBandiPreInstructorTableAsync = () => { sortOrder: null, filters: { name: { value: null, matchMode: 'contains' }, - startDate: { value: null, matchMode: 'date_is' }, - endDate: { value: null, matchMode: 'date_is' }, + startDate: { value: null, matchMode: 'dateIs' }, + endDate: { value: null, matchMode: 'dateIs' }, status: { value: null, matchMode: 'equals' } } }); diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js index 8b1e4c3..b800235 100644 --- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js +++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js @@ -27,7 +27,6 @@ const BuilderElementSettings = ({ closeSettingsFn, callStatus, context }) => { const [settings, setSettings] = useState([]); const [validators, setValidators] = useState({}); const [dynamicData, setDynamicData] = useState([]); - const [reportData, setReportData] = useState({}); const [criteria, setCriteria] = useState([]); const numberBasedValidatorFields = ['min', 'max', 'minLength', 'maxLength']; const customValidationOptions = [ diff --git a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js index a3a5c4f..9be0f98 100644 --- a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js +++ b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js @@ -36,8 +36,8 @@ const LatestBandiTableAsync = () => { sortOrder: null, filters: { name: { value: null, matchMode: 'contains' }, - startDate: { value: null, matchMode: 'date_is' }, - endDate: { value: null, matchMode: 'date_is' }, + startDate: { value: null, matchMode: 'dateIs' }, + endDate: { value: null, matchMode: 'dateIs' }, status: { value: null, matchMode: 'equals' } } }); diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js index 06b99cd..f67380d 100644 --- a/src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js +++ b/src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js @@ -40,8 +40,8 @@ const LatestBandiBeneficiarioTableAsync = () => { sortOrder: null, filters: { name: { value: null, matchMode: 'contains' }, - startDate: { value: null, matchMode: 'date_is' }, - endDate: { value: null, matchMode: 'date_is' }, + startDate: { value: null, matchMode: 'dateIs' }, + endDate: { value: null, matchMode: 'dateIs' }, status: { value: null, matchMode: 'equals' } } }); diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js index 10883fe..2a29a85 100644 --- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js +++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js @@ -45,7 +45,8 @@ const MyLatestSubmissionsTableAsync = () => { id: { value: null, matchMode: 'equals' }, callTitle: { value: null, matchMode: 'contains' }, companyName: { value: null, matchMode: 'contains' }, - submissionDate: { value: null, matchMode: 'date_is' }, + callEndDate: { value: null, matchMode: 'dateIs' }, + modifiedDate: { value: null, matchMode: 'dateIs' }, assignedUserName: { value: null, matchMode: 'equals' }, status: { value: null, matchMode: 'equals' } } @@ -222,12 +223,14 @@ const MyLatestSubmissionsTableAsync = () => { style={{ minWidth: '8rem' }}/> { sortOrder: null, filters: { name: { value: null, matchMode: 'contains' }, - startDate: { value: null, matchMode: 'date_is' }, - endDate: { value: null, matchMode: 'date_is' }, + startDate: { value: null, matchMode: 'dateIs' }, + endDate: { value: null, matchMode: 'dateIs' }, status: { value: null, matchMode: 'equals' } } }); diff --git a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js index ba6d4f8..4d2bea2 100644 --- a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js +++ b/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js @@ -43,12 +43,12 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] }) sortField: null, sortOrder: null, filters: { - applicationId: { value: null, matchMode: 'contains' }, - protocolNumber: { value: null, matchMode: 'contains' }, + applicationId: { value: null, matchMode: 'equals' }, + protocolNumber: { value: null, matchMode: 'equals' }, callName: { value: null, matchMode: 'contains' }, companyName: { value: null, matchMode: 'contains' }, - submissionDate: { value: null, matchMode: 'date_is' }, - evaluationEndDate: { value: null, matchMode: 'date_is' }, + submissionDate: { value: null, matchMode: 'dateIs' }, + evaluationEndDate: { value: null, matchMode: 'dateIs' }, applicationStatus: { value: null, matchMode: 'equals' } } }); @@ -201,7 +201,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] }) {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE' diff --git a/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js b/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js index b355c42..5d64bac 100644 --- a/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js +++ b/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js @@ -43,12 +43,12 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => { sortField: null, sortOrder: null, filters: { - applicationId: { value: null, matchMode: 'contains' }, - protocolNumber: { value: null, matchMode: 'contains' }, + applicationId: { value: null, matchMode: 'equals' }, + protocolNumber: { value: null, matchMode: 'equals' }, callName: { value: null, matchMode: 'contains' }, companyName: { value: null, matchMode: 'contains' }, - submissionDate: { value: null, matchMode: 'date_is' }, - evaluationEndDate: { value: null, matchMode: 'date_is' }, + submissionDate: { value: null, matchMode: 'dateIs' }, + evaluationEndDate: { value: null, matchMode: 'dateIs' }, applicationStatus: { value: null, matchMode: 'equals' } } }); @@ -201,7 +201,7 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => { {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE' diff --git a/src/pages/Domande/components/AllDomandeTableAsync/index.js b/src/pages/Domande/components/AllDomandeTableAsync/index.js index 2a1626d..a618eff 100644 --- a/src/pages/Domande/components/AllDomandeTableAsync/index.js +++ b/src/pages/Domande/components/AllDomandeTableAsync/index.js @@ -38,7 +38,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '' }) => { id: { value: null, matchMode: 'equals' }, callTitle: { value: null, matchMode: 'contains' }, companyName: { value: null, matchMode: 'contains' }, - submissionDate: { value: null, matchMode: 'date_is' }, + submissionDate: { value: null, matchMode: 'dateIs' }, assignedUserName: { value: null, matchMode: 'equals' }, status: { value: null, matchMode: 'equals' } } diff --git a/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js b/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js index d7e3e54..54f3bf3 100644 --- a/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js +++ b/src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js @@ -42,7 +42,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => { id: { value: null, matchMode: 'equals' }, callTitle: { value: null, matchMode: 'contains' }, companyName: { value: null, matchMode: 'contains' }, - submissionDate: { value: null, matchMode: 'date_is' }, + submissionDate: { value: null, matchMode: 'dateIs' }, assignedUserName: { value: null, matchMode: 'equals' }, status: { value: null, matchMode: 'equals' } } diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js index ab92d60..30280d3 100644 --- a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js +++ b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js @@ -34,7 +34,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => { sortField: null, sortOrder: null, filters: { - applicationId: { value: null, matchMode: 'contains' }, + applicationId: { value: null, matchMode: 'equals' }, callName: { value: null, matchMode: 'contains' }, companyName: { value: null, matchMode: 'contains' }, startDate: { value: null, matchMode: 'dateIs' }, diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js index 9477e28..e612ccc 100644 --- a/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js +++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js @@ -34,7 +34,7 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => { sortField: null, sortOrder: null, filters: { - applicationId: { value: null, matchMode: 'contains' }, + applicationId: { value: null, matchMode: 'equals' }, callName: { value: null, matchMode: 'contains' }, companyName: { value: null, matchMode: 'contains' }, startDate: { value: null, matchMode: 'dateIs' }, diff --git a/src/pages/UserActivity/components/UserActivityTableAsync/index.js b/src/pages/UserActivity/components/UserActivityTableAsync/index.js index 87a7cd0..a736ac6 100644 --- a/src/pages/UserActivity/components/UserActivityTableAsync/index.js +++ b/src/pages/UserActivity/components/UserActivityTableAsync/index.js @@ -29,7 +29,7 @@ const UserActivityTableAsync = ({ chosenActivity = '', chosenPeriod = '' }) => { sortOrder: null, filters: { id: { value: null, matchMode: 'contains' }, - createdDate: { value: null, matchMode: 'date_is' }, + createdDate: { value: null, matchMode: 'dateIs' }, ipAddress: { value: null, matchMode: 'contains' } } }); diff --git a/src/store/zustand-x-opts.js b/src/store/zustand-x-opts.js index 793fd3d..05d784f 100644 --- a/src/store/zustand-x-opts.js +++ b/src/store/zustand-x-opts.js @@ -4,6 +4,7 @@ const zustandXOpts = { }, persist: { enabled: true, + name: 'main', partialize: (state) => ({ token: state.token, chosenCompanyId: state.chosenCompanyId,