fix: collapse site fields in project service

techmatters · Sep 13, 2023 · 8afc947 · 8afc947
1 parent a0e3a5e
commit 8afc947
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/project/projectService.ts b/src/project/projectService.ts
@@ -30,6 +30,7 @@ import type {
   Project,
   SerializableSet,
 } from 'terraso-client-shared/project/projectSlice';
+import { collapseSiteFields } from 'terraso-client-shared/site/siteService';
 import { Site } from 'terraso-client-shared/site/siteSlice';
 import * as terrasoApi from 'terraso-client-shared/terrasoApi/api';
 import {
@@ -66,7 +67,10 @@ const collapseProjectFields = collapseFields<
     sites: inp =>
       inp.siteSet.edges
         .map(edge => edge.node)
-        .reduce((x, y) => ({ ...x, [y.id]: y }), {} as Record<string, Site>),
+        .reduce(
+          (x, y) => ({ ...x, [y.id]: collapseSiteFields(y) }),
+          {} as Record<string, Site>,
+        ),
     memberships: inp =>
       inp.group.memberships.edges
         .map(({ node: { id, userRole, membershipStatus } }) => ({

diff --git a/src/site/siteService.ts b/src/site/siteService.ts
@@ -26,7 +26,7 @@ import type { Site } from 'terraso-client-shared/site/siteSlice';
 import * as terrasoApi from 'terraso-client-shared/terrasoApi/api';
 import { collapseConnectionEdges } from 'terraso-client-shared/terrasoApi/utils';
 
-const collapseSiteFields = (site: SiteDataFragment): Site => {
+export const collapseSiteFields = (site: SiteDataFragment): Site => {
   const { project, owner, ...rest } = site;
   return {
     ...rest,