fix: disable unused collection methods

src/constants.ts

@@ -55,9 +55,12 @@ export const DEPTH_INTERVAL_PRESETS = mapEntries(
 export const DEFAULT_ENABLED_SOIL_PIT_METHODS: SoilPitMethod[] = [
   'soilTexture',
   'soilColor',
-  'soilStructure',
 ];
 
+// export const DEFAULT_DISABLED_SOIL_PIT_METHODS: SoilPitMethod[] = [
+//   'soilStructure',
+// ];
+
 export const DEFAULT_PROJECT_SOIL_INTERVAL = fromEntries(
   soilPitMethods.map(method => [methodEnabled(method), false]),
 );

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

@@ -22,6 +22,8 @@ import { setSites } from 'terraso-client-shared/site/siteSlice';
 import * as soilDataService from 'terraso-client-shared/soilId/soilDataService';
 import * as soilIdService from 'terraso-client-shared/soilId/soilIdService';
 import {
+  CollectionMethod,
+  DisabledCollectionMethod,
   LoadingState,
   ProjectSoilSettings,
   SoilData,
@@ -36,6 +38,10 @@ import {
 export * from 'terraso-client-shared/soilId/soilIdTypes';
 export * from 'terraso-client-shared/soilId/soilIdFunctions';
 
+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

@@ -29,33 +29,51 @@ import type {
   SoilIdProjectSoilSettingsDepthIntervalPresetChoices,
   SoilIdSoilDataSurfaceCracksSelectChoices,
 } from 'terraso-client-shared/graphqlSchema/graphql';
+import { MethodRequired } from 'terraso-client-shared/soilId/soilIdSlice';
 import { Coords } from 'terraso-client-shared/types';
 
 export type LoadingState = 'loading' | 'error' | 'ready';
 
-export const soilPitMethods = [
-  'soilTexture',
-  'soilColor',
+export const soilPitMethods = ['soilTexture', 'soilColor'] as const;
+export const disabledSoilPitMethods = [
   'soilStructure',
   'carbonates',
   'ph',
   'electricalConductivity',
   'soilOrganicCarbonMatter',
   'sodiumAdsorptionRatio',
 ] as const;
+
+export const allSoilPitMethods = [
+  ...soilPitMethods,
+  ...disabledSoilPitMethods,
+] as const;
+
 export const collectionMethods = [
   'slope',
   'verticalCracking',
   ...soilPitMethods,
+  'notes',
+] as const;
+
+export const disabledCollectionMethods = [
   'soilLimitations',
   'landUseLandCover',
   'photos',
-  'notes',
+  ...disabledSoilPitMethods,
+] as const;
+
+export const allCollectionMethods = [
+  ...collectionMethods,
+  ...disabledCollectionMethods,
 ] as const;
 
 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;
@@ -71,12 +89,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 = [