SW-7692 Replace nursery withdrawn species endpoint call with new t0 r… (#4768)

constanzauanini · web-flow · commit 093b2069c30e · 2025-11-12T17:06:10.000-03:00
…equired-species
diff --git a/src/api/types/generated-schema.ts b/src/api/types/generated-schema.ts
diff --git a/src/redux/features/nurseryWithdrawals/nurseryWithdrawalsSelectors.ts b/src/redux/features/nurseryWithdrawals/nurseryWithdrawalsSelectors.ts
@@ -1,8 +1,5 @@
 import { RootState } from 'src/redux/rootReducer';
 
-export const selectPlantingSiteWithdrawnSpecies = (requestId: string) => (state: RootState) =>
-  state.plantingSiteWithdrawnSpecies[requestId];
-
 export const selectNurseryWithdrawalsList = (requestId: string) => (state: RootState) =>
   state.nurseryWithdrawalsList[requestId];
 
diff --git a/src/redux/features/nurseryWithdrawals/nurseryWithdrawalsSlice.ts b/src/redux/features/nurseryWithdrawals/nurseryWithdrawalsSlice.ts
@@ -5,24 +5,11 @@ import { NurseryWithdrawalsSearchResponseElement } from 'src/services/NurseryWit
 import { FieldOptionsMap } from 'src/types/Search';
 
 import {
-  SpeciesPlot,
   requestCountNurseryWithdrawals,
   requestListNurseryWithdrawals,
   requestNurseryWithdrawalsFilterOptions,
-  requestPlantingSiteWithdrawnSpecies,
 } from './nurseryWithdrawalsThunks';
 
-const initialStatePlantingSiteWithdrawnSpecies: { [key: string]: StatusT<SpeciesPlot[]> } = {};
-
-export const plantingSiteWithdrawnSpeciesSlice = createSlice({
-  name: 'plantingSiteWithdrawnSpeciesSlice',
-  initialState: initialStatePlantingSiteWithdrawnSpecies,
-  reducers: {},
-  extraReducers: (builder) => {
-    buildReducers(requestPlantingSiteWithdrawnSpecies)(builder);
-  },
-});
-
 const initialStateNurseryWithdrawalsList: { [key: string]: StatusT<NurseryWithdrawalsSearchResponseElement[]> } = {};
 
 export const nurseryWithdrawalsListSlice = createSlice({
@@ -57,7 +44,6 @@ export const nurseryWithdrawalsCountSlice = createSlice({
 });
 
 const nurseryWithdrawalsReducers = {
-  plantingSiteWithdrawnSpecies: plantingSiteWithdrawnSpeciesSlice.reducer,
   nurseryWithdrawalsList: nurseryWithdrawalsListSlice.reducer,
   nurseryWithdrawalsFilterOptions: nurseryWithdrawalsFilterOptionsSlice.reducer,
   nurseryWithdrawalsCount: nurseryWithdrawalsCountSlice.reducer,
diff --git a/src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks.ts b/src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks.ts
@@ -5,27 +5,6 @@ import { NurseryWithdrawalsCountParams, NurseryWithdrawalsSearchParams } from 's
 import strings from 'src/strings';
 import { FieldOptionsMap, SearchResponseElement } from 'src/types/Search';
 
-export type SpeciesPlot = {
-  monitoringPlotId: number;
-  species: {
-    density: number;
-    speciesId: number;
-  }[];
-};
-
-export const requestPlantingSiteWithdrawnSpecies = createAsyncThunk(
-  'plantingSiteWithdrawnSpecies/get',
-  async (plantingSiteId: number, { rejectWithValue }) => {
-    const response = await NurseryWithdrawalService.getPlantingSiteWithdrawnSpecies(plantingSiteId);
-
-    if (response) {
-      return response.data?.plots;
-    }
-
-    return rejectWithValue(strings.GENERIC_ERROR);
-  }
-);
-
 export const requestListNurseryWithdrawals = createAsyncThunk(
   'nurseryWithdrawals/list',
   async (request: NurseryWithdrawalsSearchParams, { rejectWithValue }) => {
diff --git a/src/redux/features/tracking/trackingSelectors.ts b/src/redux/features/tracking/trackingSelectors.ts
@@ -53,3 +53,6 @@ export const selectProjectPlantingSiteList = (requestId: string) => (state: Root
 
 export const selectPlantingSiteT0AllSet = (requestId: string) => (state: RootState) =>
   state.plantingSiteT0AllSet[requestId];
+
+export const selectPlantingSiteT0Species = (requestId: string) => (state: RootState) =>
+  state.plantingSiteT0Species[requestId];
diff --git a/src/redux/features/tracking/trackingSlice.ts b/src/redux/features/tracking/trackingSlice.ts
@@ -8,6 +8,7 @@ import {
   PlantingSiteReportedPlants,
   PlantingSiteSearchResult,
   SiteT0Data,
+  SpeciesPlot,
 } from 'src/types/Tracking';
 
 import { MonitoringPlotsResponse, requestMonitoringPlots } from './trackingAsyncThunks';
@@ -17,6 +18,7 @@ import {
   requestAssignT0TempSiteData,
   requestGetPlantingSiteHistory,
   requestGetPlantingSiteT0AllSet,
+  requestGetPlantingSiteT0Species,
   requestListPlantingSiteHistories,
   requestListPlantingSites,
   requestListProjectPlantingSites,
@@ -286,6 +288,17 @@ export const plantingSiteT0AllSetSlice = createSlice({
   },
 });
 
+const initialPlantingSiteT0SpeciesState: { [key: string]: StatusT<SpeciesPlot[]> } = {};
+
+export const plantingSiteT0SpeciesSlice = createSlice({
+  name: 'plantingSiteT0SpeciesSlice',
+  initialState: initialPlantingSiteT0SpeciesState,
+  reducers: {},
+  extraReducers: (builder) => {
+    buildReducers(requestGetPlantingSiteT0Species, true)(builder);
+  },
+});
+
 const trackingReducers = {
   tracking: trackingSlice.reducer,
   plantingSitesSearchResults: plantingSitesSearchResultsSlice.reducer,
@@ -304,6 +317,7 @@ const trackingReducers = {
   assignT0TempSiteData: assignT0TempSiteData.reducer,
   projectPlantingSites: projectPlantingSiteListSlice.reducer,
   plantingSiteT0AllSet: plantingSiteT0AllSetSlice.reducer,
+  plantingSiteT0Species: plantingSiteT0SpeciesSlice.reducer,
 };
 
 export default trackingReducers;
diff --git a/src/redux/features/tracking/trackingThunks.ts b/src/redux/features/tracking/trackingThunks.ts
@@ -251,3 +251,16 @@ export const requestGetPlantingSiteT0AllSet = createAsyncThunk(
     return rejectWithValue(strings.GENERIC_ERROR);
   }
 );
+
+export const requestGetPlantingSiteT0Species = createAsyncThunk(
+  't0Species',
+  async (plantingSiteId: number, { rejectWithValue }) => {
+    const response = await TrackingService.getT0Species(plantingSiteId);
+
+    if (response && response.requestSucceeded) {
+      return response.data?.plots;
+    }
+
+    return rejectWithValue(strings.GENERIC_ERROR);
+  }
+);
diff --git a/src/scenes/PlantsDashboardRouter/components/PlantDashboardMap.tsx b/src/scenes/PlantsDashboardRouter/components/PlantDashboardMap.tsx
@@ -332,8 +332,8 @@ const PlantDashboardMap = ({
           plot.photos.filter(hasGpsCoordinates).map((photo) => {
             return {
               id: `photos/${photo.fileId}`,
-              longitude: photo.gpsCoordinates.coordinates[1],
-              latitude: photo.gpsCoordinates.coordinates[0],
+              longitude: photo.gpsCoordinates?.coordinates[1],
+              latitude: photo.gpsCoordinates?.coordinates[0],
               onClick: selectPhoto(plot.monitoringPlotId, results.observationId, photo),
               selected: selectedPhotos.find((selected) => selected.photo.fileId === photo.fileId) !== undefined,
               properties: {
diff --git a/src/scenes/SurvivalRateSettings/EditPermanentPlotsTab.tsx b/src/scenes/SurvivalRateSettings/EditPermanentPlotsTab.tsx
@@ -6,12 +6,11 @@ import { PageForm } from '@terraware/web-components';
 import { APP_PATHS } from 'src/constants';
 import { useSyncNavigate } from 'src/hooks/useSyncNavigate';
 import { usePlantingSiteData } from 'src/providers/Tracking/PlantingSiteContext';
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { selectAssignT0SiteData } from 'src/redux/features/tracking/trackingSelectors';
 import { PlotsWithObservationsSearchResult, requestAssignT0SiteData } from 'src/redux/features/tracking/trackingThunks';
 import { useAppDispatch, useAppSelector } from 'src/redux/store';
 import strings from 'src/strings';
-import { AssignSiteT0Data, PlotT0Data } from 'src/types/Tracking';
+import { AssignSiteT0Data, PlotT0Data, SpeciesPlot } from 'src/types/Tracking';
 import useForm from 'src/utils/useForm';
 import useSnackbar from 'src/utils/useSnackbar';
 
diff --git a/src/scenes/SurvivalRateSettings/EditSurvivalRateSettings.tsx b/src/scenes/SurvivalRateSettings/EditSurvivalRateSettings.tsx
@@ -10,20 +10,20 @@ import { APP_PATHS } from 'src/constants';
 import { useSyncNavigate } from 'src/hooks/useSyncNavigate';
 import { useLocalization } from 'src/providers';
 import { usePlantingSiteData } from 'src/providers/Tracking/PlantingSiteContext';
-import { selectPlantingSiteWithdrawnSpecies } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsSelectors';
 import {
-  SpeciesPlot,
-  requestPlantingSiteWithdrawnSpecies,
-} from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
-import { selectPlantingSiteT0, selectPlotsWithObservations } from 'src/redux/features/tracking/trackingSelectors';
+  selectPlantingSiteT0,
+  selectPlantingSiteT0Species,
+  selectPlotsWithObservations,
+} from 'src/redux/features/tracking/trackingSelectors';
 import {
   PlotsWithObservationsSearchResult,
+  requestGetPlantingSiteT0Species,
   requestPermanentPlotsWithObservations,
   requestPlantingSiteT0,
 } from 'src/redux/features/tracking/trackingThunks';
 import { useAppDispatch, useAppSelector } from 'src/redux/store';
 import strings from 'src/strings';
-import { SiteT0Data } from 'src/types/Tracking';
+import { SiteT0Data, SpeciesPlot } from 'src/types/Tracking';
 import useStickyTabs from 'src/utils/useStickyTabs';
 
 import ChangeTabWarningModal from './ChangeTabWarningModal';
@@ -42,7 +42,7 @@ const EditSurvivalRateSettings = ({ reloadObservations }: EditSurvivalRateSettin
   const [plotsRequestId, setPlotsRequestId] = useState('');
   const plotsWithObservationsResponse = useAppSelector(selectPlotsWithObservations(plotsRequestId));
   const [speciesRequestId, setSpeciesRequestId] = useState('');
-  const withdrawnSpeciesResponse = useAppSelector(selectPlantingSiteWithdrawnSpecies(speciesRequestId));
+  const withdrawnSpeciesResponse = useAppSelector(selectPlantingSiteT0Species(speciesRequestId));
   const [plotsWithObservations, setPlotsWithObservations] = useState<PlotsWithObservationsSearchResult[]>();
   const [withdrawnSpeciesPlots, setWithdrawnSpeciesPlots] = useState<SpeciesPlot[]>();
   const [showChangeTabWarning, setShowChangeTabWarning] = useState(false);
@@ -67,7 +67,7 @@ const EditSurvivalRateSettings = ({ reloadObservations }: EditSurvivalRateSettin
       setRequestId(request.requestId);
       const requestPlots = dispatch(requestPermanentPlotsWithObservations(plantingSite.id));
       setPlotsRequestId(requestPlots.requestId);
-      const requestSpeciesPlots = dispatch(requestPlantingSiteWithdrawnSpecies(plantingSite.id));
+      const requestSpeciesPlots = dispatch(requestGetPlantingSiteT0Species(plantingSite.id));
       setSpeciesRequestId(requestSpeciesPlots.requestId);
     }
   }, [dispatch, plantingSite, reloadObservations]);
diff --git a/src/scenes/SurvivalRateSettings/EditTemporaryPlotsTab.tsx b/src/scenes/SurvivalRateSettings/EditTemporaryPlotsTab.tsx
@@ -6,7 +6,6 @@ import { Checkbox, Icon, PageForm, Tooltip } from '@terraware/web-components';
 import { APP_PATHS } from 'src/constants';
 import { useSyncNavigate } from 'src/hooks/useSyncNavigate';
 import { usePlantingSiteData } from 'src/providers/Tracking/PlantingSiteContext';
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { updatePlantingSite } from 'src/redux/features/plantingSite/plantingSiteThunks';
 import { selectAssignT0TempSiteData } from 'src/redux/features/tracking/trackingSelectors';
 import {
@@ -15,7 +14,7 @@ import {
 } from 'src/redux/features/tracking/trackingThunks';
 import { useAppDispatch, useAppSelector } from 'src/redux/store';
 import strings from 'src/strings';
-import { AssignSiteT0TempData, ZoneT0Data } from 'src/types/Tracking';
+import { AssignSiteT0TempData, SpeciesPlot, ZoneT0Data } from 'src/types/Tracking';
 import useForm from 'src/utils/useForm';
 import useSnackbar from 'src/utils/useSnackbar';
 
@@ -117,7 +116,7 @@ const EditTemporaryPlotsTab = ({
         plotIds.includes(wsp.monitoringPlotId.toString())
       );
 
-      const speciesMap = new Map<number, { density: number; speciesId: number }>();
+      const speciesMap = new Map<number, { density?: number; speciesId: number }>();
       withdrawnSpeciesOfZone?.forEach((plot) => {
         plot.species.forEach((wdSpecies) => {
           if (!speciesMap.has(wdSpecies.speciesId)) {
diff --git a/src/scenes/SurvivalRateSettings/PermanentPlotsTab.tsx b/src/scenes/SurvivalRateSettings/PermanentPlotsTab.tsx
@@ -2,10 +2,9 @@ import React from 'react';
 
 import { Box, useTheme } from '@mui/material';
 
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { PlotsWithObservationsSearchResult } from 'src/redux/features/tracking/trackingThunks';
 import strings from 'src/strings';
-import { PlotT0Data } from 'src/types/Tracking';
+import { PlotT0Data, SpeciesPlot } from 'src/types/Tracking';
 
 import PlotT0Box from './PlotT0Box';
 
diff --git a/src/scenes/SurvivalRateSettings/PlotT0Box.tsx b/src/scenes/SurvivalRateSettings/PlotT0Box.tsx
@@ -8,10 +8,9 @@ import Link from 'src/components/common/Link';
 import { APP_PATHS } from 'src/constants';
 import { useLocalization } from 'src/providers';
 import { useSpeciesData } from 'src/providers/Species/SpeciesContext';
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { PlotsWithObservationsSearchResult } from 'src/redux/features/tracking/trackingThunks';
 import strings from 'src/strings';
-import { PlotT0Data } from 'src/types/Tracking';
+import { PlotT0Data, SpeciesPlot } from 'src/types/Tracking';
 import { getShortDate } from 'src/utils/dateFormatter';
 import { roundToDecimal } from 'src/utils/numbers';
 
diff --git a/src/scenes/SurvivalRateSettings/PlotT0EditBox.tsx b/src/scenes/SurvivalRateSettings/PlotT0EditBox.tsx
@@ -7,11 +7,10 @@ import { useDeviceInfo } from '@terraware/web-components/utils';
 import TextField from 'src/components/common/TextField';
 import { useLocalization } from 'src/providers';
 import { useSpeciesData } from 'src/providers/Species/SpeciesContext';
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { PlotT0Observation, PlotsWithObservationsSearchResult } from 'src/redux/features/tracking/trackingThunks';
 import strings from 'src/strings';
 import { Species } from 'src/types/Species';
-import { AssignSiteT0Data, PlotT0Data } from 'src/types/Tracking';
+import { AssignSiteT0Data, PlotT0Data, SpeciesPlot } from 'src/types/Tracking';
 import { getShortDate } from 'src/utils/dateFormatter';
 import { allowOneDecimal, roundToDecimal } from 'src/utils/numbers';
 
@@ -292,7 +291,7 @@ const PlotT0EditBox = ({ plot, t0Plot, record, setRecord, withdrawnSpeciesPlot }
   );
 
   const densityValue = useCallback(
-    (withdrawnSpecies: { density: number; speciesId: number }) => {
+    (withdrawnSpecies: { density?: number; speciesId: number }) => {
       const found = plotToSave?.densityData.find((densityData) => densityData.speciesId === withdrawnSpecies.speciesId);
       if (found) {
         return roundToDecimal(found.plotDensity, 1);
@@ -451,13 +450,15 @@ const PlotT0EditBox = ({ plot, t0Plot, record, setRecord, withdrawnSpeciesPlot }
                         />
                       </td>
                       <td>
-                        <Checkbox
-                          id={`density-${withdrawnSpecies.speciesId}`}
-                          label={roundToDecimal(withdrawnSpecies.density, 1)}
-                          name={`density-${withdrawnSpecies.speciesId}`}
-                          value={selectedWithdrawalCheckboxes.has(withdrawnSpecies.speciesId)}
-                          onChange={onWithdrawalValueSelected(withdrawnSpecies.speciesId)}
-                        />
+                        {withdrawnSpecies.density && (
+                          <Checkbox
+                            id={`density-${withdrawnSpecies.speciesId}`}
+                            label={roundToDecimal(withdrawnSpecies.density, 1)}
+                            name={`density-${withdrawnSpecies.speciesId}`}
+                            value={selectedWithdrawalCheckboxes.has(withdrawnSpecies.speciesId)}
+                            onChange={onWithdrawalValueSelected(withdrawnSpecies.speciesId)}
+                          />
+                        )}
                       </td>
                     </tr>
                   ))}
diff --git a/src/scenes/SurvivalRateSettings/TemporaryPlotsTab.tsx b/src/scenes/SurvivalRateSettings/TemporaryPlotsTab.tsx
@@ -3,10 +3,9 @@ import React, { useCallback } from 'react';
 import { Box, useTheme } from '@mui/material';
 import { Checkbox, Icon, Tooltip } from '@terraware/web-components';
 
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { PlotsWithObservationsSearchResult } from 'src/redux/features/tracking/trackingThunks';
 import strings from 'src/strings';
-import { SiteT0Data } from 'src/types/Tracking';
+import { SiteT0Data, SpeciesPlot } from 'src/types/Tracking';
 
 import ZoneT0Box from './ZoneT0Box';
 
diff --git a/src/scenes/SurvivalRateSettings/ZoneT0Box.tsx b/src/scenes/SurvivalRateSettings/ZoneT0Box.tsx
@@ -5,10 +5,9 @@ import { IconTooltip } from '@terraware/web-components';
 import { useDeviceInfo } from '@terraware/web-components/utils';
 
 import { useSpeciesData } from 'src/providers/Species/SpeciesContext';
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { PlotsWithObservationsSearchResult } from 'src/redux/features/tracking/trackingThunks';
 import strings from 'src/strings';
-import { ZoneT0Data } from 'src/types/Tracking';
+import { SpeciesPlot, ZoneT0Data } from 'src/types/Tracking';
 import { roundToDecimal } from 'src/utils/numbers';
 
 type ZoneT0BoxProps = {
@@ -31,7 +30,7 @@ const ZoneT0Box = ({ plotsWithObservations, withdrawnSpeciesPlot, t0Zone }: Zone
     if (!withdrawnSpeciesPlot) {
       return [];
     }
-    const speciesMap = new Map<number, { density: number; speciesId: number }>();
+    const speciesMap = new Map<number, { density?: number; speciesId: number }>();
     withdrawnSpeciesPlot.forEach((plot) => {
       plot.species.forEach((wdSpecies) => {
         if (!speciesMap.has(wdSpecies.speciesId)) {
diff --git a/src/scenes/SurvivalRateSettings/ZoneT0EditBox.tsx b/src/scenes/SurvivalRateSettings/ZoneT0EditBox.tsx
@@ -6,11 +6,10 @@ import { useDeviceInfo } from '@terraware/web-components/utils';
 
 import TextField from 'src/components/common/TextField';
 import { useSpeciesData } from 'src/providers/Species/SpeciesContext';
-import { SpeciesPlot } from 'src/redux/features/nurseryWithdrawals/nurseryWithdrawalsThunks';
 import { PlotsWithObservationsSearchResult } from 'src/redux/features/tracking/trackingThunks';
 import strings from 'src/strings';
 import { Species } from 'src/types/Species';
-import { AssignSiteT0TempData, ZoneT0Data } from 'src/types/Tracking';
+import { AssignSiteT0TempData, SpeciesPlot, ZoneT0Data } from 'src/types/Tracking';
 import { allowOneDecimal, roundToDecimal } from 'src/utils/numbers';
 
 import { AddedSpecies } from './PlotT0EditBox';
@@ -44,7 +43,7 @@ const ZoneT0EditBox = ({
     if (!withdrawnSpeciesPlot) {
       return [];
     }
-    const speciesMap = new Map<number, { density: number; speciesId: number }>();
+    const speciesMap = new Map<number, { density?: number; speciesId: number }>();
     withdrawnSpeciesPlot.forEach((plot) => {
       plot.species.forEach((wdSpecies) => {
         if (!speciesMap.has(wdSpecies.speciesId)) {
@@ -257,7 +256,7 @@ const ZoneT0EditBox = ({
   );
 
   const densityValue = useCallback(
-    (withdrawnSpecies: { density: number; speciesId: number }) => {
+    (withdrawnSpecies: { density?: number; speciesId: number }) => {
       const density = zoneToSave?.densityData.find(
         (densityData) => densityData.speciesId === withdrawnSpecies.speciesId
       )?.density;
@@ -333,13 +332,15 @@ const ZoneT0EditBox = ({
                     />
                   </td>
                   <td>
-                    <Checkbox
-                      id={`density-${withdrawnSpecies.speciesId}`}
-                      label={roundToDecimal(withdrawnSpecies.density, 1)}
-                      name={`density-${withdrawnSpecies.speciesId}`}
-                      value={selectedWithdrawalCheckboxes.has(withdrawnSpecies.speciesId)}
-                      onChange={onWithdrawalValueSelected(withdrawnSpecies.speciesId)}
-                    />
+                    {withdrawnSpecies.density && (
+                      <Checkbox
+                        id={`density-${withdrawnSpecies.speciesId}`}
+                        label={roundToDecimal(withdrawnSpecies.density, 1)}
+                        name={`density-${withdrawnSpecies.speciesId}`}
+                        value={selectedWithdrawalCheckboxes.has(withdrawnSpecies.speciesId)}
+                        onChange={onWithdrawalValueSelected(withdrawnSpecies.speciesId)}
+                      />
+                    )}
                   </td>
                 </tr>
               ))}
diff --git a/src/scenes/SurvivalRateSettings/index.tsx b/src/scenes/SurvivalRateSettings/index.tsx
diff --git a/src/services/TrackingService.ts b/src/services/TrackingService.ts
diff --git a/src/types/Observations.ts b/src/types/Observations.ts
diff --git a/src/types/Tracking.ts b/src/types/Tracking.ts
