Merge branch 'master' into PE-200-informativa-esercenti

pagopa · Nov 23, 2021 · f2bad12 · f2bad12
2 parents 02e8553 + 6cad28a
commit f2bad12
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 47 deletions.
diff --git a/src/components/Form/CreateProfileForm/ProfileData/ProfileData.tsx b/src/components/Form/CreateProfileForm/ProfileData/ProfileData.tsx
@@ -11,7 +11,7 @@ import Api from "../../../../api";
 import { RootState } from "../../../../store/store";
 import chainAxios from "../../../../utils/chainAxios";
 import { ProfileDataValidationSchema } from "../../ValidationSchemas";
-import { useTooltip, Severity } from "../../../../context/tooltip";
+import { Severity, useTooltip } from "../../../../context/tooltip";
 import { EmptyAddresses } from "../../../../utils/form_types";
 import ProfileInfo from "./ProfileInfo";
 import ReferentData from "./ReferentData";
@@ -126,18 +126,18 @@ const ProfileData = ({
                     ...profile.salesChannel,
                     addresses: !array.isEmpty(profile.salesChannel.addresses)
                       ? profile.salesChannel.addresses.map((address: any) => {
-                        const addressSplit = address.fullAddress
-                          .split(",")
-                          .map((item: string) => item.trim());
-                        return {
-                          street: addressSplit[0],
-                          city: addressSplit[1],
-                          district: addressSplit[2],
-                          zipCode: addressSplit[3],
-                          value: address.fullAddress,
-                          label: address.fullAddress
-                        };
-                      })
+                          const addressSplit = address.fullAddress
+                            .split(",")
+                            .map((item: string) => item.trim());
+                          return {
+                            street: addressSplit[0],
+                            city: addressSplit[1],
+                            district: addressSplit[2],
+                            zipCode: addressSplit[3],
+                            value: address.fullAddress,
+                            label: address.fullAddress
+                          };
+                        })
                       : [
                           {
                             fullAddress: ""
@@ -185,26 +185,30 @@ const ProfileData = ({
         return {
           salesChannel: {
             ...OfflineChannel,
-            addresses: EmptyAddresses.is(OfflineChannel.addresses)
-              ? []
-              : OfflineChannel.addresses.map((add: any) => ({
-                  fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
-                  coordinates: add.coordinates
-                }))
+            addresses:
+              EmptyAddresses.is(OfflineChannel.addresses) ||
+              OfflineChannel.allNationalAddresses
+                ? []
+                : OfflineChannel.addresses.map((add: any) => ({
+                    fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
+                    coordinates: add.coordinates
+                  }))
           }
         };
       case "BothChannels":
         return {
           salesChannel: {
             ...salesChannel,
-            addresses: EmptyAddresses.is(salesChannel.addresses)
-              ? []
-              : salesChannel.addresses.map((add: any) => ({
-                  fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
-                  coordinates: add.coordinates
-                }))
-              }
-          };
+            addresses:
+              EmptyAddresses.is(salesChannel.addresses) ||
+              salesChannel.allNationalAddresses
+                ? []
+                : salesChannel.addresses.map((add: any) => ({
+                    fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
+                    coordinates: add.coordinates
+                  }))
+          }
+        };
     }
   };
 

diff --git a/src/components/Form/CreateProfileForm/ProfileData/ProfileImage.tsx b/src/components/Form/CreateProfileForm/ProfileData/ProfileImage.tsx
@@ -1,22 +1,22 @@
 import React, { useEffect, useRef, useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { tryCatch } from "fp-ts/lib/TaskEither";
 import { toError } from "fp-ts/lib/Either";
-import { useTooltip, Severity } from "../../../../context/tooltip";
+import { Severity, useTooltip } from "../../../../context/tooltip";
 import CenteredLoading from "../../../CenteredLoading/CenteredLoading";
 import FormSection from "../../FormSection";
 import { setImage } from "../../../../store/agreement/agreementSlice";
 import PlusIcon from "../../../../assets/icons/plus.svg";
 import { RootState } from "../../../../store/store";
 import Api from "../../../../api/index";
-import { ImageErrorCode } from "../../../../api/generated";
 import chainAxios from "../../../../utils/chainAxios";
 
 const FooterDescription = (
   <p className="text-base font-weight-normal text-gray">
     Il file deve avere le seguenti caratteristiche:
     <br />
-    Dimensione dell&#39;immagine: minimo 800x600px / Dimensione del file: massimo 5Mb
+    Dimensione dell&#39;immagine: minimo 800x600px / Dimensione del file:
+    massimo 5Mb
     <br />
     Formato del file: JPG, PNG
   </p>
@@ -82,7 +82,6 @@ const ProfileImage = () => {
 
   return (
     <FormSection
-      hasIntroduction
       title="Immagine operatore"
       description="Caricare un'immagine che rappresenti i beni o i servizi trattati dall'Operatore"
       footerDescription={FooterDescription}

diff --git a/src/components/Form/CreateProfileForm/ProfileData/SalesChannelDiscountCodeType.tsx b/src/components/Form/CreateProfileForm/ProfileData/SalesChannelDiscountCodeType.tsx
@@ -57,8 +57,8 @@ const SalesChannelDiscountCodeType = () => (
         >
           <span className="text-sm">
             <a href="#">Con link a landing page</a>: fornirò per ogni
-            agevolazione un link a cui il cittadino che accede proveniendo da IO
-            potrà usufruire degli sconti a lui dedicati
+            agevolazione un link con cui il cittadino che accede proveniendo da IO
+            potrà usufruire degli sconti
           </span>
         </label>
       </div>

diff --git a/src/components/Form/CreateProfileForm/ProfileData/SalesChannels.tsx b/src/components/Form/CreateProfileForm/ProfileData/SalesChannels.tsx
@@ -321,7 +321,7 @@ Props) => (
     {hasOnlineOrBothChannels(formValues.salesChannel?.channelType) && (
       <FormSection
         title="Sito web"
-        description="Inserire l'URL del proprio e-commerce"
+        description="Inserire l'URL del proprio e-commerce o del proprio sito istituzionale"
         required
         isVisible
       >

diff --git a/src/components/Form/EditOperatorDataForm/EditOperatorDataForm.tsx b/src/components/Form/EditOperatorDataForm/EditOperatorDataForm.tsx
@@ -62,6 +62,7 @@ const updateProfile = (agreement: any, history: H.History) => async (
   }
 };
 
+// eslint-disable-next-line sonarjs/cognitive-complexity
 const EditOperatorDataForm = () => {
   const history = useHistory();
   const agreement = useSelector((state: RootState) => state.agreement.value);
@@ -136,22 +137,26 @@ const EditOperatorDataForm = () => {
         } = salesChannel;
         return {
           ...OfflineChannel,
-          addresses: EmptyAddresses.is(OfflineChannel.addresses)
-            ? []
-            : OfflineChannel.addresses.map((add: any) => ({
-                fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
-                coordinates: add.coordinates
-              }))
+          addresses:
+            EmptyAddresses.is(OfflineChannel.addresses) ||
+            OfflineChannel.allNationalAddresses
+              ? []
+              : OfflineChannel.addresses.map((add: any) => ({
+                  fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
+                  coordinates: add.coordinates
+                }))
         };
       case "BothChannels":
         return {
           ...salesChannel,
-          addresses: EmptyAddresses.is(salesChannel.addresses)
-            ? []
-            : salesChannel.addresses.map((add: any) => ({
-                fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
-                coordinates: add.coordinates
-              }))
+          addresses:
+            EmptyAddresses.is(salesChannel.addresses) ||
+            salesChannel.allNationalAddresses
+              ? []
+              : salesChannel.addresses.map((add: any) => ({
+                  fullAddress: `${add.street}, ${add.city}, ${add.district}, ${add.zipCode}`,
+                  coordinates: add.coordinates
+                }))
         };
     }
   };