fix: move measurement units to right model (d'oh!) (#363)

package.json

@@ -11,7 +11,7 @@
     "lodash": "^4.17.21",
     "react": "^18.2.0",
     "react-redux": "^8.1.3",
-    "terraso-backend": "github:techmatters/terraso-backend#ae60684",
+    "terraso-backend": "github:techmatters/terraso-backend#d50504f",
     "uuid": "^9.0.1"
   },
   "scripts": {

src/project/projectFragments.ts

@@ -44,6 +44,7 @@ export const projectData = /* GraphQL */ `
     id
     name
     privacy
+    measurementUnits
     description
     siteInstructions
     updatedAt

src/project/projectSlice.ts

@@ -23,6 +23,7 @@ import {
 } from 'terraso-client-shared/account/accountSlice';
 import {
   ProjectAddUserMutationInput,
+  ProjectManagementProjectMeasurementUnitsChoices,
   ProjectManagementProjectPrivacyChoices,
   ProjectMembershipProjectRoleChoices,
 } from 'terraso-client-shared/graphqlSchema/graphql';
@@ -48,6 +49,12 @@ export const PROJECT_ROLES = [
   'VIEWER',
 ] as const satisfies readonly ProjectRole[];
 
+export type MeasurementUnit = ProjectManagementProjectMeasurementUnitsChoices;
+export const MEASUREMENT_UNITS = [
+  'METRIC',
+  'ENGLISH',
+] as const satisfies readonly MeasurementUnit[];
+
 export type ProjectPrivacy = ProjectManagementProjectPrivacyChoices;
 export const PROJECT_PRIVACIES = [
   'PRIVATE',
@@ -57,7 +64,8 @@ export const PROJECT_PRIVACIES = [
 export type Project = {
   id: string;
   name: string;
-  privacy: 'PRIVATE' | 'PUBLIC';
+  privacy: ProjectPrivacy;
+  measurementUnits: MeasurementUnit;
   description: string;
   siteInstructions?: string;
   updatedAt: string; // this should be Date.toLocaleDateString; redux can't serialize Dates

src/selectors.test.ts

@@ -83,6 +83,7 @@ const generateProject = (
   return {
     id,
     name: id,
+    measurementUnits: 'METRIC',
     privacy: privacy ?? 'PRIVATE',
     description: '',
     updatedAt: '2023-10-12',
@@ -149,7 +150,6 @@ const createProjectSettings = (
       depthIntervals: [],
       electricalConductivityRequired: false,
       landUseLandCoverRequired: false,
-      measurementUnits: 'METRIC',
       notesRequired: false,
       phRequired: false,
       photosRequired: false,

src/soilId/soilIdFragments.ts

@@ -24,7 +24,6 @@ export const projectSoilSettings = /* GraphQL */ `
       }
       label
     }
-    measurementUnits
     depthIntervalPreset
     soilPitRequired
     slopeRequired

src/soilId/soilIdTypes.ts

@@ -25,7 +25,6 @@ import type {
   SoilIdDepthDependentSoilDataRockFragmentVolumeChoices,
   SoilIdDepthDependentSoilDataTextureChoices,
   SoilIdProjectSoilSettingsDepthIntervalPresetChoices,
-  SoilIdProjectSoilSettingsMeasurementUnitsChoices,
   SoilIdSoilDataSurfaceCracksSelectChoices,
 } from 'terraso-client-shared/graphqlSchema/graphql';
 
@@ -52,12 +51,6 @@ export const collectionMethods = [
 export type SoilPitMethod = (typeof soilPitMethods)[number];
 export type CollectionMethod = (typeof collectionMethods)[number];
 
-export type MeasurementUnit = SoilIdProjectSoilSettingsMeasurementUnitsChoices;
-export const MEASUREMENT_UNITS = [
-  'METRIC',
-  'IMPERIAL',
-] as const satisfies readonly MeasurementUnit[];
-
 export { DepthInterval };
 export type LabelledDepthInterval = {
   label: string;