From fd4764d119d9611b217337555dccd1a4d6bc8c5c Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Mon, 11 Nov 2024 14:33:30 +0100 Subject: [PATCH] - merged with develop; - removed unused variables; --- src/assets/scss/components/appPage.scss | 15 ++++++++- .../Bandi/components/AllBandiTable/index.js | 7 ++-- .../components/AllBandiAccordion/index.js | 8 ++--- src/pages/BandoApplication/index.js | 1 + .../components/LatestBandiTable/index.js | 22 ------------- src/pages/Dashboard/index.js | 6 +--- .../components/LatestBandiTable/index.js | 11 ------- .../MyLatestSubmissionsTable/index.js | 10 +++--- src/pages/DashboardPreInstructor/index.js | 5 ++- src/pages/DomandaBeneficiario/index.js | 32 +------------------ src/pages/DomandaEditPreInstructor/index.js | 6 ++-- src/pages/Domande/index.js | 6 ++-- src/pages/SoccorsoEditPreInstructor/index.js | 2 +- .../PreInstructorSoccorsiTable/index.js | 4 +-- 14 files changed, 40 insertions(+), 95 deletions(-) diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index 3c62a17..fab7e1e 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -181,8 +181,21 @@ flex: 1 1 100%; } - ul { + ul, ol { padding-left: 1rem; + + li { + color: var(--global-textColor); + } + } + + a { + color: var(--global-textColor); + text-decoration: underline; + + &:hover { + text-decoration: none; + } } button { diff --git a/src/pages/Bandi/components/AllBandiTable/index.js b/src/pages/Bandi/components/AllBandiTable/index.js index 9d7ea77..8276815 100644 --- a/src/pages/Bandi/components/AllBandiTable/index.js +++ b/src/pages/Bandi/components/AllBandiTable/index.js @@ -2,9 +2,6 @@ import React, { useState, useEffect} from 'react'; import { __ } from '@wordpress/i18n'; import { is, uniq } from 'ramda'; -// store -import { storeSet, storeGet } from '../../../../store'; - // tools import getBandoSeverity from '../../../../helpers/getBandoSeverity'; import getBandoLabel from '../../../../helpers/getBandoLabel'; @@ -97,9 +94,9 @@ const AllBandiTable = () => { ); }; - const nameBodyTemplate = (rowData) => { + /*const nameBodyTemplate = (rowData) => { return {rowData.name} - } + }*/ const dateStartBodyTemplate = (rowData) => { return getDateFromISOstring(rowData.dates[0]); diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js index 0fc5fe1..8d167f8 100644 --- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js +++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js @@ -92,21 +92,21 @@ const AllBandiAccordion = () => { return ; }; - const addToFavourites = () => { + /*const addToFavourites = () => { console.log('addToFavourites'); - } + }*/ const goToBandoPage = (id) => { navigate(`/bandi/${id}`) } - const actionsBodyTemplate = (rowData) => { + /*const actionsBodyTemplate = (rowData) => { return
- } + }*/ const rowExpansionTemplate = (data) => { return ( diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js index 4d97627..cbc7d22 100644 --- a/src/pages/BandoApplication/index.js +++ b/src/pages/BandoApplication/index.js @@ -333,6 +333,7 @@ const BandoApplication = () => { }, dynamicData); if (data.data.applicationFormResponse.content) { + // eslint-disable-next-line array-callback-return data.data.applicationFormResponse.content.map((o) => { if (o.dynamicData && !isEmpty(o.dynamicData)) { formDataInitial[o.id] = pathOr('', o.dynamicData.split('.'), dynamicData); diff --git a/src/pages/Dashboard/components/LatestBandiTable/index.js b/src/pages/Dashboard/components/LatestBandiTable/index.js index a85dd9f..b1b1b36 100644 --- a/src/pages/Dashboard/components/LatestBandiTable/index.js +++ b/src/pages/Dashboard/components/LatestBandiTable/index.js @@ -2,13 +2,6 @@ import React, { useState, useEffect} from 'react'; import { __ } from '@wordpress/i18n'; import { uniq } from 'ramda'; -// tools -import getBandoLabel from '../../../../helpers/getBandoLabel'; -import getBandoSeverity from '../../../../helpers/getBandoSeverity'; - -// store -import { storeSet } from '../../../../store'; - // api import BandoService from '../../../../service/bando-service'; @@ -19,11 +12,8 @@ import { Column } from 'primereact/column'; import { InputText } from 'primereact/inputtext'; import { IconField } from 'primereact/iconfield'; import { InputIcon } from 'primereact/inputicon'; -import { Dropdown } from 'primereact/dropdown'; -import { InputNumber } from 'primereact/inputnumber'; import { Button } from 'primereact/button'; import { Calendar } from 'primereact/calendar'; -import { Tag } from 'primereact/tag'; import ProperBandoLabel from '../../../../components/ProperBandoLabel'; import { Link } from 'react-router-dom'; @@ -120,22 +110,10 @@ const LatestBandiTable = () => { return options.filterCallback(e.value, options.index)} dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999" />; }; - const balanceFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} />; - }; - const statusBodyTemplate = (rowData) => { return ; }; - const statusFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder="Select One" className="p-column-filter" showClear />; - }; - - const statusItemTemplate = (option) => { - return ; - }; - const actionsBodyTemplate = (rowData) => { return - - - - - - - - - - - - ); - }; - - const header = renderHeader(); - - const updateNewAmendmentData = (value, path) => { - const newData = wrap(data).set(path.split('.'), value).value(); - setData(newData); - } - const createCommunication = () => { setIsLoadingCommunication(true); CommunicationService.createCommunication(data.id, newCommData, createCommunicationCallback, errCreateCommunicationCallback); diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index 3a6d384..117caf0 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -189,7 +189,7 @@ const DomandaEditPreInstructor = () => { setCriterionDataTitle(criterion.label); const content =

{__('I campi correlati')}

- {criterion.criteriaMappedFields.map(o => criteriaDataItem(o))} + {criterion.criteriaMappedFields ? criterion.criteriaMappedFields.map(o => criteriaDataItem(o)) : null}
; setCriterionDataContent(content); setIsVisibleCriterionData(id); @@ -438,7 +438,7 @@ const DomandaEditPreInstructor = () => { }}> {o.label}
- {o.fileDetail.length === 1 + {o.fileDetail && o.fileDetail.length === 1 ?
- {o.fileDetail.length > 1 + {o.fileDetail && o.fileDetail.length > 1 ?
    { const [loading, setLoading] = useState(false); diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js index 72e7455..573a43e 100644 --- a/src/pages/SoccorsoEditPreInstructor/index.js +++ b/src/pages/SoccorsoEditPreInstructor/index.js @@ -50,7 +50,7 @@ const SoccorsoEditPreInstructor = () => { const { control, handleSubmit, - formState: { errors, isValid }, + formState: { errors }, setValue, register, trigger, diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js index 9610ba7..31a6a70 100644 --- a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js +++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js @@ -4,10 +4,10 @@ import { is, uniq } from 'ramda'; import { Link } from 'react-router-dom'; // store -import { storeSet, storeGet } from '../../../../store'; +import { storeGet } from '../../../../store'; // api -import ApplicationService from '../../../../service/application-service'; + // components import { FilterMatchMode, FilterOperator } from 'primereact/api';