From c884c350388fe6617aa5a009fedffe70388cfe77 Mon Sep 17 00:00:00 2001 From: David Code Howard Date: Mon, 30 Oct 2023 12:27:02 -0400 Subject: [PATCH 1/3] chore: Update backend --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c10b8a3..d43c49ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "lodash": "^4.17.21", "react": "^18.2.0", "react-redux": "^8.1.3", - "terraso-backend": "github:techmatters/terraso-backend#f671497", + "terraso-backend": "github:techmatters/terraso-backend#612a23d", "uuid": "^9.0.1" }, "devDependencies": { @@ -13095,7 +13095,7 @@ }, "node_modules/terraso-backend": { "version": "0.1.0", - "resolved": "git+ssh://git@github.com/techmatters/terraso-backend.git#f67149781a7fd91b896d30e40b355fbd4811091d" + "resolved": "git+ssh://git@github.com/techmatters/terraso-backend.git#612a23d7d04fa99bf4d97ff90f45a77cb6aef574" }, "node_modules/test-exclude": { "version": "6.0.0", diff --git a/package.json b/package.json index 9e3ccdef..5adda805 100644 --- a/package.json +++ b/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#f671497", + "terraso-backend": "github:techmatters/terraso-backend#612a23d", "uuid": "^9.0.1" }, "scripts": { From babc75d89dfe9933682a8ae04036fd1c1fa87f69 Mon Sep 17 00:00:00 2001 From: David Code Howard Date: Tue, 31 Oct 2023 18:37:38 -0400 Subject: [PATCH 2/3] feat: Include measurement units in API fetch --- src/project/projectFragments.ts | 1 + src/project/projectSlice.ts | 2 ++ src/selectors.test.ts | 1 + 3 files changed, 4 insertions(+) diff --git a/src/project/projectFragments.ts b/src/project/projectFragments.ts index 29dcba9c..a67fb101 100644 --- a/src/project/projectFragments.ts +++ b/src/project/projectFragments.ts @@ -47,6 +47,7 @@ export const projectData = /* GraphQL */ ` description updatedAt archived + measurementUnits membershipList { ...projectMembershipList } diff --git a/src/project/projectSlice.ts b/src/project/projectSlice.ts index 6b67fc35..bbe43669 100644 --- a/src/project/projectSlice.ts +++ b/src/project/projectSlice.ts @@ -22,6 +22,7 @@ import { updateUsers, } from 'terraso-client-shared/account/accountSlice'; import { + MeasurementUnits, ProjectAddUserMutationInput, UserRole, } from 'terraso-client-shared/graphqlSchema/graphql'; @@ -48,6 +49,7 @@ export type Project = { memberships: Record; sites: SerializableSet; archived: boolean; + measurementUnits: MeasurementUnits; }; interface MembershipKey { diff --git a/src/selectors.test.ts b/src/selectors.test.ts index e021e6a6..757f9434 100644 --- a/src/selectors.test.ts +++ b/src/selectors.test.ts @@ -52,6 +52,7 @@ const generateProject = ( sites: siteSet, archived: false, memberships: keyBy(memberships, 'id'), + measurementUnits: 'METRIC', }; }; From 3a66b486bb9086fcebc301d6fd69bb66a5427bf6 Mon Sep 17 00:00:00 2001 From: David Code Howard Date: Wed, 1 Nov 2023 13:42:32 -0400 Subject: [PATCH 3/3] chore(deps): Update backend version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d43c49ab..38c93445 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "lodash": "^4.17.21", "react": "^18.2.0", "react-redux": "^8.1.3", - "terraso-backend": "github:techmatters/terraso-backend#612a23d", + "terraso-backend": "github:techmatters/terraso-backend#cb4335b", "uuid": "^9.0.1" }, "devDependencies": { @@ -13095,7 +13095,7 @@ }, "node_modules/terraso-backend": { "version": "0.1.0", - "resolved": "git+ssh://git@github.com/techmatters/terraso-backend.git#612a23d7d04fa99bf4d97ff90f45a77cb6aef574" + "resolved": "git+ssh://git@github.com/techmatters/terraso-backend.git#cb4335bb00577bfd2246015f1ac892fc607c8e2f" }, "node_modules/test-exclude": { "version": "6.0.0", diff --git a/package.json b/package.json index 5adda805..504bca92 100644 --- a/package.json +++ b/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#612a23d", + "terraso-backend": "github:techmatters/terraso-backend#cb4335b", "uuid": "^9.0.1" }, "scripts": {