LF-4672 (3) - rtk locations upgrade remove duplication

packages/webapp/.storybook/state.js

@@ -1383,96 +1383,6 @@ export default {
         },
       },
     },
-    barnReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    ceremonialReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    farmSiteBoundaryReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    fieldReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    gardenReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    greenhouseReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    surfaceWaterReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    naturalAreaReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    residenceReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    bufferZoneReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    watercourseReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    fenceReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    gateReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    waterValveReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
-    soilSampleLocationReducer: {
-      ids: [],
-      entities: {},
-      loading: false,
-      loaded: false,
-    },
     showedSpotlightReducer: {
       loaded: true,
       loading: false,
@@ -1708,6 +1618,13 @@ export default {
       loading: false,
       loaded: false,
     },
+    irrigationTaskReducer: {
+      ids: [],
+      entities: {},
+      loading: false,
+      error: null,
+      loaded: false,
+    },
     irrigationTaskTypesReducer: {
       irrigationTaskTypes: [
         {
@@ -1746,6 +1663,20 @@ export default {
       ids: [],
       entities: {},
     },
+    animalMovementTaskReducer: {
+      ids: [],
+      entities: {},
+      loading: false,
+      error: null,
+      loaded: false,
+    },
+    soilSampleTaskReducer: {
+      ids: [],
+      entities: {},
+      loading: false,
+      error: null,
+      loaded: false,
+    },
   },
   persistedStateReducer: {
     userLogReducer: {

packages/webapp/public/locales/en/message.json

@@ -124,6 +124,7 @@
   "MAP": {
     "FAIL_PATCH": "Failed to update",
     "FAIL_POST": "Failed to add new",
+    "FAIL_DELETE": "Failed to retire",
     "SUCCESS_DELETE": "Successfully retired",
     "SUCCESS_PATCH": "Successfully updated",
     "SUCCESS_POST": "Successfully saved"

packages/webapp/src/components/LocationDetailLayout/AreaDetails/AreaDetails.jsx → packages/webapp/src/components/LocationDetailLayout/AreaDetails.jsx

@@ -1,18 +1,14 @@
-import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useFormContext } from 'react-hook-form';
-import Input from '../../Form/Input';
-import PureWarningBox from '../../WarningBox';
-import { Label } from '../../Typography';
-import Unit from '../../Form/Unit';
-import { fieldEnum as areaEnum } from '../../../containers/constants';
-import { area_perimeter, area_total_area } from '../../../util/convert-units/unit';
-import InputAutoSize from '../../Form/InputAutoSize';
+import Input from '../Form/Input';
+import Unit from '../Form/Unit';
+import { fieldEnum as areaEnum } from '../../containers/constants';
+import { area_perimeter, area_total_area } from '../../util/convert-units/unit';
+import InputAutoSize from '../Form/InputAutoSize';
 
 export default function AreaDetails({
   name,
   showPerimeter,
-  history,
   children,
   system,
   isCreateLocationPage,
@@ -30,31 +26,9 @@ export default function AreaDetails({
     control,
     formState: { errors },
   } = useFormContext();
-  const [errorMessage, setErrorMessage] = useState();
-  useEffect(() => {
-    const handleOffline = () => setErrorMessage(t('FARM_MAP.AREA_DETAILS.NETWORK'));
-    const handleOnline = () => setErrorMessage(null);
-    window.addEventListener('offline', handleOffline);
-    window.addEventListener('online', handleOnline);
-    return () => {
-      window.removeEventListener('offline', handleOffline);
-      window.removeEventListener('online', handleOnline);
-    };
-  }, []);
-
-  useEffect(() => {
-    if (history?.location?.state?.error && !history?.location?.state?.error?.retire) {
-      setErrorMessage(history?.location?.state?.error);
-    }
-  }, [history?.location?.state?.error]);
 
   return (
     <>
-      {errorMessage && (
-        <PureWarningBox style={{ border: '1px solid var(--red700)', marginBottom: '48px' }}>
-          <Label style={{ marginBottom: '12px' }}>{errorMessage}</Label>
-        </PureWarningBox>
-      )}
       <Input
         data-cy="areaDetails-name"
         label={`${name}`}