Revert "fe-sprint1"

This reverts commit 6b740d2.
teamdigitale · Nov 17, 2023 · 693ef07 · 693ef07
1 parent aa6d2aa
commit 693ef07
Show file tree

Hide file tree

Showing 31 changed files with 1,539 additions and 4,326 deletions.
diff --git a/fe-piattaforma/.env.local b/fe-piattaforma/.env.local
diff --git a/fe-piattaforma/.gitignore b/fe-piattaforma/.gitignore
@@ -9,6 +9,7 @@ cypress*
 # Log files
 *.log
 *.eslintcache
+.env*
 .editorconfig
 
 ../.DS_Store

diff --git a/fe-piattaforma/package-lock.json b/fe-piattaforma/package-lock.json
diff --git a/fe-piattaforma/package.json b/fe-piattaforma/package.json
@@ -21,7 +21,6 @@
     "@reduxjs/toolkit": "^1.8.0",
     "axios": "^0.26.1",
     "bootstrap-italia": "^1.6.3",
-    "crypto-js": "^4.2.0",
     "cypress-axe": "^0.14.0",
     "design-react-kit": "^4.0.2",
     "draft-js": "^0.11.7",
@@ -54,7 +53,6 @@
     "@commitlint/config-conventional": "^17.0.2",
     "@commitlint/format": "^16.2.1",
     "@svgr/webpack": "^6.2.1",
-    "@types/crypto-js": "^4.2.1",
     "@types/draftjs-to-html": "^0.8.1",
     "@types/html-webpack-plugin": "^3.2.6",
     "@types/lodash.isempty": "^4.4.7",

diff --git a/fe-piattaforma/src/components/AccordionRow/accordionRow.tsx b/fe-piattaforma/src/components/AccordionRow/accordionRow.tsx
@@ -88,7 +88,7 @@ const AccordionRow: React.FC<AccordionRowI> = ({
               ) : null}
             </>
           ) : null}
-          <span className='font-weight-semibold ' >{title}</span>
+          <span className='font-weight-semibold'>{title}</span>
         </div>
         <div className={clsx(device.mediaIsPhone && 'd-flex flex-row')}>
           {clickEditAction ? (

diff --git a/fe-piattaforma/src/components/DetailsRow/detailsRow.tsx b/fe-piattaforma/src/components/DetailsRow/detailsRow.tsx
@@ -19,7 +19,7 @@ interface DetailsRowI {
 
 const statusCases = {
   SENT: 'INVIATO',
-  NOT_FILLED: 'NON COMPILATO',
+  NOT_SENT: 'NON INVIATO',
   FILLED_OUT: 'COMPILATO',
 };
 

diff --git a/fe-piattaforma/src/components/SearchBar/searchBar.tsx b/fe-piattaforma/src/components/SearchBar/searchBar.tsx
@@ -38,8 +38,6 @@ interface SearchBarI extends Omit<SelectI, 'onInputChange'> {
   tooltip?: boolean;
   tooltipText?: string;
   infoText?: string;
-  onQueryChange?: (query: string) => void;
-  disableSubmit?: boolean;
 }
 
 const SearchBar: React.FC<SearchBarI> = (props) => {
@@ -91,7 +89,6 @@ const SearchBar: React.FC<SearchBarI> = (props) => {
   };
 
   const handleOnSubmit = () => {
-    if (props.disableSubmit) return;
     if (!autocomplete && onSubmit) {
       onSubmit(searchValue);
       setSearchValue(searchValue);
@@ -161,11 +158,6 @@ const SearchBar: React.FC<SearchBarI> = (props) => {
 
   const device = useAppSelector(selectDevice);
 
-  const onInputQueryChange = useCallback((search) => {
-    setSearchValue((search ?? '').toString());
-    if (props.onQueryChange) props.onQueryChange(search ? search.toString(): '');
-  }, [props.onQueryChange]);
-
   return (
     <div className={clsx(className, 'search-bar-custom')}>
       {!device.mediaIsPhone && search ? (
@@ -209,7 +201,9 @@ const SearchBar: React.FC<SearchBarI> = (props) => {
                   device.mediaIsPhone && 'pl-0'
                 )}
                 field={id}
-                onInputChange={onInputQueryChange}
+                onInputChange={(search) =>
+                  setSearchValue((search || '').toString())
+                }
                 placeholder={device.mediaIsPhone ? '' : placeholder}
                 value={searchValue}
                 withLabel={false}
@@ -281,7 +275,6 @@ const SearchBar: React.FC<SearchBarI> = (props) => {
                   className='border-0'
                   onClick={handleOnSubmit}
                   color='primary'
-                  disabled={props.disableSubmit}
                 >
                   Cerca
                 </Button>
@@ -290,7 +283,6 @@ const SearchBar: React.FC<SearchBarI> = (props) => {
                   className='border-0'
                   onClick={handleOnSubmit}
                   aria-label='Avvia ricerca'
-                  disabled={props.disableSubmit}
                 >
                   <Icon
                     icon='it-search'

diff --git a/fe-piattaforma/src/components/SearchBarOptionsCitizen/searchBarOptionsCitizen.tsx b/fe-piattaforma/src/components/SearchBarOptionsCitizen/searchBarOptionsCitizen.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React from 'react';
 import SearchBar from '../SearchBar/searchBar';
 import { Form } from '..';
 import { FormGroup, Label } from 'design-react-kit';
@@ -15,7 +15,6 @@ interface SearchBarOptionsI {
   currentStep: string | undefined;
   steps: { [key: string]: string };
   alreadySearched?: (param: boolean) => void;
-  setSearchValue: (param: { type: string; value: string }) => void;
   resetModal?: () => void;
 }
 
@@ -25,7 +24,6 @@ const SearchBarOptionsCitizen: React.FC<SearchBarOptionsI> = ({
   currentStep,
   steps,
   alreadySearched,
-  setSearchValue,
   resetModal,
 }) => {
   const { t } = useTranslation();
@@ -36,26 +34,6 @@ const SearchBarOptionsCitizen: React.FC<SearchBarOptionsI> = ({
     if (resetModal) resetModal();
   };
 
-  const [canSubmit, setCanSubmit] = useState<boolean>(false);
-  const [query, setQuery] = useState<string>('');
-  const [mustValidateCf, setMustValidateCf] = useState<boolean>(true);
-
-  const isValidFiscalCode = useCallback((query: string) => {
-    return /^[A-Z]{6}[0-9]{2}[A-Z][0-9]{2}[A-Z][0-9]{3}[A-Z]$/i.test(query);
-  }, []);
-
-  const onRadioChange = useCallback((value: string) => {
-    setCurrentStep(value);
-    setRadioFilter(value);
-    setMustValidateCf(value === 'codiceFiscale');
-    setCanSubmit(value !== 'codiceFiscale' || isValidFiscalCode(query));
-  }, [setCurrentStep, setRadioFilter, query]);
-
-  const onQueryChange = useCallback(((query: string) => {
-    setCanSubmit(mustValidateCf ? isValidFiscalCode(query) : true);
-    setQuery(query);
-  }), [isValidFiscalCode, mustValidateCf]);
-
   return (
     <div
       className={clsx(
@@ -70,17 +48,19 @@ const SearchBarOptionsCitizen: React.FC<SearchBarOptionsI> = ({
         <Form id='form-searchbar-opt' className='m-3' showMandatory={false}>
           <FormGroup check className='justify-content-around'>
             {Object.keys(steps).map((item, index) => (
-              <div key={item} className='d-flex align-items-center'>
+              <div key={index} className='d-flex align-items-center'>
                 <Input
                   name='docType'
                   type='radio'
                   id={`current-step-${index}`}
                   checked={currentStep === steps[item]}
                   onClick={() => {
-                    onRadioChange(steps[item]);
+                    setCurrentStep(steps[item]);
+                    setRadioFilter(steps[item]);
                   }}
                   onInputChange={() => {
-                    onRadioChange(steps[item]);
+                    setCurrentStep(steps[item]);
+                    setRadioFilter(steps[item]);
                   }}
                 />
                 <Label check htmlFor={`current-step-${index}`}>
@@ -96,21 +76,13 @@ const SearchBarOptionsCitizen: React.FC<SearchBarOptionsI> = ({
         onSubmit={(data) => {
           if (resetModal) resetModal();
           if (data) {
-            const crypted = AES.encrypt(data, process?.env?.KEY_SECRET as string).toString();
-            const searchValue: SearchValue = {
-              type: currentStep as string,
-              value: data,
-            };
-            setSearchValue(searchValue);
             dispatch(
-              GetEntitySearchResult(crypted, currentStep ? currentStep : '')
+              GetEntitySearchResult(data, currentStep ? currentStep : '')
             );
             if (alreadySearched) alreadySearched(true);
           }
         }}
         onReset={handleSearchReset}
-        onQueryChange={onQueryChange}
-        disableSubmit={!canSubmit}
       />
     </div>
   );

diff --git a/fe-piattaforma/src/components/Table/view/tableMobile.tsx b/fe-piattaforma/src/components/Table/view/tableMobile.tsx
@@ -39,10 +39,9 @@ const TableMobile: React.FC<MobileTableI> = ({
         } = item;
 
         return {
-          title: id ,
-          /*title: cognome
+          title: cognome
             ? cognome + ' ' + nome
-            : nome || nome || label || name || attributo,*/
+            : nome || nome || label || name || attributo,
           status,
           id,
           actions,

diff --git a/fe-piattaforma/src/consts/monthsMapForFiscalCode.ts b/fe-piattaforma/src/consts/monthsMapForFiscalCode.ts
diff --git a/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/Services/citizensList.tsx b/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/Services/citizensList.tsx
@@ -236,7 +236,7 @@ const CitizensList: React.FC = () => {
   };
 
   const buttons: ButtonInButtonsBar[] = [
-    /*{
+    {
       text: 'Carica lista cittadini',
       outline: true,
       iconForButton: 'it-upload',
@@ -254,7 +254,7 @@ const CitizensList: React.FC = () => {
             },
           })
         ),
-    },*/
+    },
     {
       text: 'Aggiungi cittadino',
       color: 'primary',
@@ -309,7 +309,7 @@ const CitizensList: React.FC = () => {
           isDetail
           citizenList={true}
           tooltip
-          tooltiptext='Cerca cittadino per codice fiscale o numero documento'
+          tooltiptext='Cerca cittadino per nome, cognome, codice fiscale o  numero  documento'
         >
           {(citizens?.cittadini || []).map((citizen: CitizenI, i: number) => (
             <DetailsRow

diff --git a/...ttaforma/src/pages/administrator/AdministrativeArea/Entities/Services/servicesDetails.tsx b/...ttaforma/src/pages/administrator/AdministrativeArea/Entities/Services/servicesDetails.tsx
@@ -10,8 +10,8 @@ import {
   DeleteService,
   GetCitizenListServiceDetail,
   GetServicesDetail,
-  //GetServicesDetailFilters,
-  //SendSurveyToAll,
+  GetServicesDetailFilters,
+  SendSurveyToAll,
 } from '../../../../../redux/features/administrativeArea/services/servicesThunk';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import DetailLayout from '../../../../../components/DetailLayout/detailLayout';
@@ -254,7 +254,7 @@ const ServicesDetails = () => {
           '_blank'
         ),
     },
-    /*{
+    {
       size: 'xs',
       color: 'primary',
       text: 'Invia questionario a tutti',
@@ -286,7 +286,7 @@ const ServicesDetails = () => {
         dispatch(GetCitizenListServiceDetail(serviceId));
         dispatch(GetServicesDetailFilters(serviceId));
       },
-    },*/
+    },
   ];
 
   const onConfirmDelete = async () => {

diff --git a/fe-piattaforma/src/pages/administrator/CitizensArea/Entities/Citizens/citizens.tsx b/fe-piattaforma/src/pages/administrator/CitizensArea/Entities/Citizens/citizens.tsx
@@ -30,7 +30,6 @@ import { CRUDActionsI, CRUDActionTypes } from '../../../../../utils/common';
 import { formFieldI } from '../../../../../utils/formHelper';
 import PageTitle from '../../../../../components/PageTitle/pageTitle';
 import IconNote from '/public/assets/img/it-note-primary.png';
-import moment from "moment";
 
 const entity = 'citizensArea';
 const siteDropdownLabel = 'idsSedi';
@@ -105,7 +104,7 @@ const Citizens = () => {
     autocomplete: false,
     onHandleSearch: handleOnSearch,
     placeholder:
-    'Inserisci il codice fiscale o il numero documento del cittadino',
+      'Inserisci il cognome e/o il nome, oppure l’ID o il codice fiscale dell’utente',
     isClearable: true,
     title: 'Cerca cittadino',
   };
@@ -140,7 +139,6 @@ const Citizens = () => {
         name: td.cognome + ' ' + td.nome,
         numeroServizi: td.numeroServizi,
         numeroQuestionariCompilati: td.numeroQuestionariCompilati,
-        dataOraAggiornamento: moment(td.dataOraAggiornamento).format('YYYY-MM-DD HH:mm:ss')
       }))
     );
     return table;

diff --git a/fe-piattaforma/src/pages/administrator/CitizensArea/Entities/Citizens/citizensDetail.tsx b/fe-piattaforma/src/pages/administrator/CitizensArea/Entities/Citizens/citizensDetail.tsx
@@ -11,10 +11,10 @@ import FormCitizen from '../../../../forms/formCitizen';
 import DetailLayout from '../../../../../components/DetailLayout/detailLayout';
 import {
   closeModal,
-  //openModal,
+  openModal,
 } from '../../../../../redux/features/modal/modalSlice';
 import ManageCitizens from '../../../AdministrativeArea/Entities/modals/manageCitizens';
-//import { formTypes } from '../../../AdministrativeArea/Entities/utils';
+import { formTypes } from '../../../AdministrativeArea/Entities/utils';
 import { setInfoIdsBreadcrumb } from '../../../../../redux/features/app/appSlice';
 import CitizenServices from './CitizenServices';
 
@@ -43,7 +43,7 @@ const CitizensDetail: React.FC = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  /*const citizenButtons = [
+  const citizenButtons = [
     {
       color: 'primary',
       text: 'Modifica',
@@ -58,21 +58,23 @@ const CitizensDetail: React.FC = () => {
           })
         ),
     },
-  ];*/
+  ];
 
   return (
     <div className='container pb-3'>
       <DetailLayout
         titleInfo={{
           title:
-            citizen?.dettaglioCittadino?.id as string,
+            citizen?.dettaglioCittadino?.cognome +
+            ' ' +
+            citizen?.dettaglioCittadino?.nome,
           status: '',
           upperTitle: { icon: 'it-user', text: 'Cittadino' },
         }}
         buttonsPosition='BOTTOM'
         goBackTitle='I miei cittadini'
         goBackPath='/area-cittadini'
-        //formButtons={citizenButtons}
+        formButtons={citizenButtons}
       >
         <FormCitizen legend='form cittadino' formDisabled />
       </DetailLayout>