Add new local unit tag in add local unit form modal

IFRCGo · Dec 20, 2024 · 08c1d9a · 08c1d9a
1 parent 19b09a0
commit 08c1d9a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json b/...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json
@@ -84,6 +84,7 @@
         "revertChangesContentQuestion": "Are you sure you want to have these changes revert in this project?",
         "confirmChangesModalHeading": "Confirm the Changes",
         "confirmChangesContentQuestion": "Are you sure you want to have these changes in this local unit?",
+        "newLocalUnitDescription": "New local unit",
         "latitude": "Latitude",
         "longitude": "Longitude"
     }

diff --git a/...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx b/...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
@@ -37,6 +37,7 @@ import {
     _cs,
     isDefined,
     isNotDefined,
+    isObject,
 } from '@togglecorp/fujs';
 import {
     createSubmitHandler,
@@ -646,7 +647,7 @@ function LocalUnitsForm(props: Props) {
             revertChanges(formValues as LocalUnitsRevertRequestPostBody);
             setShowRevertChangesModalFalse();
         },
-        [revertChanges],
+        [revertChanges, setShowRevertChangesModalFalse],
     );
 
     const latestChangesFormFields = useMemo(() => {
@@ -692,6 +693,8 @@ function LocalUnitsForm(props: Props) {
             setShowChangesModalTrue();
         },
         [
+            setError,
+            validate,
             setShowChangesModalTrue,
             localUnitDetailsResponse,
             value,
@@ -733,6 +736,15 @@ function LocalUnitsForm(props: Props) {
         };
     }, []);
 
+    const isNewLocalUnit = useMemo(() => {
+        if (isObject(previousData)) {
+            if (Object.keys(previousData).length <= 0) {
+                return true;
+            }
+        }
+        return false;
+    }, [previousData]);
+
     return (
         <div className={styles.localUnitsForm}>
             {isDefined(localUnitDetailsResponse)
@@ -769,6 +781,13 @@ function LocalUnitsForm(props: Props) {
             {isDefined(headingDescriptionRef) && isDefined(headingDescriptionRef.current) && (
                 <Portal container={headingDescriptionRef.current}>
                     <div className={styles.lastUpdateLabel}>
+                        {isNewLocalUnit && (
+                            <TextOutput
+                                className={styles.newLocalUnit}
+                                value={strings.newLocalUnitDescription}
+                                strongValue
+                            />
+                        )}
                         {resolveToComponent(
                             strings.lastUpdateLabel,
                             {
@@ -850,7 +869,8 @@ function LocalUnitsForm(props: Props) {
                                                 readOnly={!pristine}
                                             />
                                         )}
-                                        {localUnitDetailsResponse.is_locked && isDefined(previousData) && (
+                                        {localUnitDetailsResponse.is_locked
+                                            && !isNewLocalUnit && (
                                             <Button
                                                 name={undefined}
                                                 onClick={setShowRevertChangesModalTrue}

diff --git a/...dStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/styles.module.css b/...dStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/styles.module.css
@@ -33,5 +33,10 @@
 
 .last-update-label {
     color: var(--go-ui-color-text-light);
+
+    .new-local-unit {
+        color: var(--go-ui-color-positive);
+    }
+
 }
 
diff --git a/...ws/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsMap/index.tsx b/...ws/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsMap/index.tsx
@@ -630,7 +630,9 @@ function LocalUnitsMap(props: Props) {
                     setReadOnly={setReadOnlyLocalUnitModal}
                     onDeleteActionSuccess={refetchLocalUnits}
                     previousData={
-                        previousData?.previous_data_details as unknown as LocalUnitResponse
+                        superLocalUnitDetailResponse?.validated
+                            ? undefined
+                            : previousData?.previous_data_details as unknown as LocalUnitResponse
                     }
                 />
             ))}

diff --git a/...extAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx b/...extAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
@@ -127,6 +127,7 @@ function LocalUnitsTableActions(props: Props) {
         },
         [setShowLocalUnitModalFalse, onDeleteActionSuccess],
     );
+
     const handleViewLocalUnitClick = useCallback(
         () => {
             if (!isValidated) {
@@ -209,7 +210,9 @@ function LocalUnitsTableActions(props: Props) {
                     setReadOnly={setReadOnlyLocalUnitModal}
                     onDeleteActionSuccess={onDeleteActionSuccess}
                     previousData={
-                        previousData?.previous_data_details as unknown as LocalUnitResponse
+                        isValidated
+                            ? undefined
+                            : previousData?.previous_data_details as unknown as LocalUnitResponse
                     }
                 />
             )}