Merge pull request #2069 from IFRCGo/feature/import-modal-updates

Update file names in local unit import modal

Author: frozenhelium

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/i18n.json

@@ -2,16 +2,16 @@
     "namespace": "localUnitImportModal",
     "strings": {
         "modalHeading": "Import Local Units for {countryName}",
-        "modalDescription": "Please select a local unit type and upload the CSV file",
+        "modalDescription": "Please select a local unit type and upload the xlsx file",
         "modalImportPendingDescription": "Your file is currently being processed. You can close this modal and check the result from the upload history",
         "closeButtonLabel": "Close",
         "localUnitTypeInputLabel": "Local unit type",
-        "uploadFileSectionTitle": "Upload CSV file",
-        "uploadFileSectionDescription": "Please make sure to select a supported file format (csv) with size less than 10MB",
+        "uploadFileSectionTitle": "Upload xlsx file",
+        "uploadFileSectionDescription": "Please make sure to select a supported file format (xlsx) with size less than 10MB",
         "selectFileButtonLabel": "Select a file",
         "cancelUploadButtonLabel": "Cancel",
         "startUploadButtonLabel": "Upload",
-        "contentStructureDescription": "The contents in the CSV should follow the structure provided in {templateLink}.",
+        "contentStructureDescription": "The contents in the xlsx should follow the structure provided in {templateLink}.",
         "templateLinkLabel": "this template",
         "noPermissionBothDescription": "You don't have permission and this unit is not externally managed.",
         "noPermissionErrorDescription": "You do not have the permission to upload local unit data",

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/index.tsx

@@ -258,7 +258,7 @@ function LocalUnitBulkUploadModal(props: Props) {
                     {isNotDefined(bulkUploadFile) && (
                         <RawFileInput
                             name="file"
-                            accept=".csv"
+                            accept=".xlsx"
                             onChange={setBulkUploadFile}
                             variant="secondary"
                             disabled={

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx

@@ -871,27 +871,27 @@ function LocalUnitsForm(props: Props) {
                                 error={error?.postcode}
                             />
                         </DiffWrapper>
+                        <DiffWrapper
+                            showPreviousValue={showValueChanges}
+                            value={value.focal_person_loc}
+                            previousValue={previousData?.focal_person_loc}
+                            diffViewEnabled={diffViewEnabled}
+                            className={styles.diffContainer}
+                        >
+                            <TextInput
+                                inputSectionClassName={styles.inputSection}
+                                required
+                                label={strings.focalPersonLocal}
+                                name="focal_person_loc"
+                                value={value.focal_person_loc}
+                                onChange={setFieldValue}
+                                readOnly={readOnly}
+                                error={error?.focal_person_loc}
+                            />
+                        </DiffWrapper>
                         {value.type === TYPE_HEALTH_CARE && (
                             hasUpdatePermission && (
                                 <>
-                                    <DiffWrapper
-                                        showPreviousValue={showValueChanges}
-                                        value={value.focal_person_loc}
-                                        previousValue={previousData?.focal_person_loc}
-                                        diffViewEnabled={diffViewEnabled}
-                                        className={styles.diffContainer}
-                                    >
-                                        <TextInput
-                                            inputSectionClassName={styles.inputSection}
-                                            required
-                                            label={strings.focalPersonLocal}
-                                            name="focal_person_loc"
-                                            value={value.focal_person_loc}
-                                            onChange={setFieldValue}
-                                            readOnly={readOnly}
-                                            error={error?.focal_person_loc}
-                                        />
-                                    </DiffWrapper>
                                     <DiffWrapper
                                         showPreviousValue={showValueChanges}
                                         value={value.focal_person_en}
@@ -1773,7 +1773,6 @@ function LocalUnitsForm(props: Props) {
                                 >
                                     <NumberInput
                                         inputSectionClassName={styles.inputSection}
-                                        required
                                         label={strings.totalNumberOfHumanResources}
                                         name="total_number_of_human_resource"
                                         value={value.health?.total_number_of_human_resource}

app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts

@@ -214,7 +214,6 @@ const schema: LocalUnitsFormSchema = {
                                         validations: [
                                             positiveIntegerCondition,
                                         ],
-                                        required: true,
                                     },
                                     general_practitioner: {
                                         validations: [