fix: ProjectSoilSettings type now does not expect disabled methods (#688

)

Co-authored-by: Carissa Knipe <[email protected]>

src/selectors.test.ts

@@ -146,21 +146,21 @@ const createProjectSettings = (
 ): Record<string, ProjectSoilSettings> => {
   return {
     [project.id]: {
-      carbonatesRequired: false,
+      // carbonatesRequired: false,
       depthIntervalPreset: 'LANDPKS',
       depthIntervals: [],
-      electricalConductivityRequired: false,
-      landUseLandCoverRequired: false,
+      // electricalConductivityRequired: false,
+      // landUseLandCoverRequired: false,
       notesRequired: false,
-      phRequired: false,
-      photosRequired: false,
+      // phRequired: false,
+      // photosRequired: false,
       slopeRequired: false,
-      sodiumAdsorptionRatioRequired: false,
+      // sodiumAdsorptionRatioRequired: false,
       soilColorRequired: false,
-      soilLimitationsRequired: false,
-      soilOrganicCarbonMatterRequired: false,
+      // soilLimitationsRequired: false,
+      // soilOrganicCarbonMatterRequired: false,
       soilPitRequired: false,
-      soilStructureRequired: false,
+      // soilStructureRequired: false,
       soilTextureRequired: false,
       verticalCrackingRequired: false,
       ...defaults,

src/soilId/soilIdSlice.ts

@@ -23,6 +23,7 @@ import * as soilDataService from 'terraso-client-shared/soilId/soilDataService';
 import {
   CollectionMethod,
   DepthInterval,
+  DisabledCollectionMethod,
   ProjectSoilSettings,
   SoilData,
   SoilPitMethod,
@@ -42,6 +43,10 @@ export const methodRequired = <T extends CollectionMethod>(
   method: T,
 ): `${T}Required` => `${method}Required`;
 
+export type MethodRequired<
+  T extends CollectionMethod | DisabledCollectionMethod,
+> = `${T}Required`;
+
 export type SoilState = {
   soilData: Record<string, SoilData | undefined>;
   projectSettings: Record<string, ProjectSoilSettings | undefined>;

src/soilId/soilIdTypes.ts

@@ -27,6 +27,7 @@ import type {
   SoilIdProjectSoilSettingsDepthIntervalPresetChoices,
   SoilIdSoilDataSurfaceCracksSelectChoices,
 } from 'terraso-client-shared/graphqlSchema/graphql';
+import { MethodRequired } from 'terraso-client-shared/soilId/soilIdSlice';
 
 export const soilPitMethods = ['soilTexture', 'soilColor'] as const;
 export const disabledSoilPitMethods = [
@@ -54,6 +55,7 @@ export const disabledCollectionMethods = [
   'soilLimitations',
   'landUseLandCover',
   'photos',
+  ...disabledSoilPitMethods,
 ] as const;
 
 export const allCollectionMethods = [
@@ -64,6 +66,9 @@ export const allCollectionMethods = [
 export type SoilPitMethod = (typeof soilPitMethods)[number];
 export type CollectionMethod = (typeof collectionMethods)[number];
 
+export type DisabledCollectionMethod =
+  (typeof disabledCollectionMethods)[number];
+
 export { DepthInterval };
 export type LabelledDepthInterval = {
   label: string;
@@ -79,12 +84,16 @@ export type SoilData = Omit<
   depthDependentData: DepthDependentSoilData[];
 };
 export type ProjectDepthInterval = Omit<ProjectDepthIntervalNode, 'project'>;
-export type ProjectSoilSettings = Omit<
+export type AllProjectSoilSettings = Omit<
   ProjectSoilSettingsNode,
   'project' | 'depthIntervals'
 > & {
   depthIntervals: ProjectDepthInterval[];
 };
+export type ProjectSoilSettings = Omit<
+  AllProjectSoilSettings,
+  MethodRequired<DisabledCollectionMethod>
+>;
 
 export type SoilTexture = SoilIdDepthDependentSoilDataTextureChoices;
 export const textures = [