feat: temporary workaround to cover up inconsistency between list/ran…

…k soils
techmatters · Nov 29, 2024 · bcdc04b · bcdc04b
1 parent e0ecc10
commit bcdc04b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/dev-client/package-lock.json b/dev-client/package-lock.json
diff --git a/dev-client/package.json b/dev-client/package.json
@@ -80,7 +80,7 @@
     "react-native-svg": "^15.9.0",
     "react-native-tab-view": "^4.0.4",
     "reduce-reducers": "^1.0.4",
-    "terraso-client-shared": "github:techmatters/terraso-client-shared#cdf2161",
+    "terraso-client-shared": "github:techmatters/terraso-client-shared#ac0867a",
     "use-debounce": "^10.0.4",
     "uuid": "^10.0.0",
     "yup": "^1.4.0"

diff --git a/dev-client/src/model/soilId/soilIdFunctions.ts b/dev-client/src/model/soilId/soilIdFunctions.ts
@@ -20,7 +20,6 @@ import {mhvcToLab} from 'munsell';
 import {
   DataBasedSoilMatch,
   LabColorInput,
-  LocationBasedSoilMatch,
   Maybe,
   SoilIdInputData,
   SoilIdInputDepthDependentData,
@@ -159,10 +158,15 @@ export const soilIdEntryForStatus = (status: SoilIdStatus): SoilIdEntry => {
 };
 
 export const soilIdEntryLocationBased = (
-  matches: LocationBasedSoilMatch[],
+  matches: DataBasedSoilMatch[],
 ): SoilIdEntry => {
   return {
-    locationBasedMatches: matches,
+    locationBasedMatches: matches.map(
+      ({dataMatch, combinedMatch, locationMatch, ...rest}) => ({
+        ...rest,
+        match: combinedMatch,
+      }),
+    ),
     status: 'ready',
   };
 };

diff --git a/dev-client/src/model/soilId/soilIdSlice.ts b/dev-client/src/model/soilId/soilIdSlice.ts
@@ -17,7 +17,11 @@
 
 import {createSlice, Draft, PayloadAction} from '@reduxjs/toolkit';
 
-import {SoilDataPushFailureReason} from 'terraso-client-shared/graphqlSchema/graphql';
+import {
+  DataBasedSoilMatchesQuery,
+  SoilDataPushFailureReason,
+  SoilIdInputData,
+} from 'terraso-client-shared/graphqlSchema/graphql';
 import * as soilDataService from 'terraso-client-shared/soilId/soilDataService';
 import * as soilIdService from 'terraso-client-shared/soilId/soilIdService';
 import {
@@ -30,6 +34,7 @@ import {
   SoilIdKey,
 } from 'terraso-client-shared/soilId/soilIdTypes';
 import {createAsyncThunk} from 'terraso-client-shared/store/utils';
+import {Coords} from 'terraso-client-shared/types';
 
 import * as soilDataActions from 'terraso-mobile-client/model/soilId/actions/soilDataActions';
 import {
@@ -270,14 +275,19 @@ export const deleteProjectDepthInterval = createAsyncThunk(
   soilDataService.deleteProjectDepthInterval,
 );
 
-export const fetchLocationBasedSoilMatches = createAsyncThunk(
-  'soilId/fetchLocationBasedSoilMatches',
-  soilIdService.fetchLocationBasedSoilMatches,
+export const fetchLocationBasedSoilMatches = createAsyncThunk<
+  DataBasedSoilMatchesQuery['soilId']['dataBasedSoilMatches'],
+  Coords
+>('soilId/fetchLocationBasedSoilMatches', coords =>
+  soilIdService.fetchDataBasedSoilMatches({
+    coords,
+    soilData: {depthDependentData: []},
+  }),
 );
 
-export const fetchDataBasedSoilMatches = createAsyncThunk(
-  'soilId/fetchDataBasedSoilMatches',
-  soilIdService.fetchDataBasedSoilMatches,
-);
+export const fetchDataBasedSoilMatches = createAsyncThunk<
+  DataBasedSoilMatchesQuery['soilId']['dataBasedSoilMatches'],
+  {coords: Coords; soilData: SoilIdInputData; siteId?: string}
+>('soilId/fetchDataBasedSoilMatches', soilIdService.fetchDataBasedSoilMatches);
 
 export default soilIdSlice.reducer;