fix: dataset icon not showing in layer list (#275)

fix layer type and filter
reearth · Jul 12, 2022 · 8dbc889 · 8dbc889
1 parent 7d3eac0
commit 8dbc889
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 42 deletions.
diff --git a/src/components/organisms/EarthEditor/CanvasArea/convert.ts b/src/components/organisms/EarthEditor/CanvasArea/convert.ts
@@ -19,12 +19,12 @@ import {
   MergedPropertyGroupCommonFragmentFragment,
   EarthLayerFragment,
   EarthLayerItemFragment,
-  EarthLayerCommonFragment,
   GetEarthWidgetsQuery,
   PropertyFragmentFragment,
   WidgetZone as WidgetZoneType,
   WidgetSection as WidgetSectionType,
   WidgetArea as WidgetAreaType,
+  EarthLayer5Fragment,
 } from "@reearth/gql";
 import { valueFromGQL } from "@reearth/util/value";
 
@@ -132,18 +132,7 @@ const processMergedInfobox = (
   };
 };
 
-type GQLLayer = Maybe<
-  (
-    | {
-        __typename?: "LayerGroup";
-        layers?: GQLLayer[];
-      }
-    | EarthLayerItemFragment
-  ) &
-    EarthLayerCommonFragment
->;
-
-export const processLayer = (layer: Maybe<GQLLayer>): Layer | undefined => {
+export const processLayer = (layer: EarthLayer5Fragment): Layer | undefined => {
   if (!layer) return;
   return {
     id: layer.id,
@@ -161,7 +150,9 @@ export const processLayer = (layer: Maybe<GQLLayer>): Layer | undefined => {
     tags: processLayerTags(layer.tags),
     children:
       layer.__typename === "LayerGroup"
-        ? layer.layers?.map(processLayer).filter((l): l is Layer => !!l)
+        ? layer.layers
+            ?.map(l => processLayer((l as EarthLayer5Fragment) ?? undefined))
+            .filter((l): l is Layer => !!l)
         : undefined,
   };
 };

diff --git a/src/components/organisms/EarthEditor/OutlinePane/hooks.tsx b/src/components/organisms/EarthEditor/OutlinePane/hooks.tsx
@@ -125,7 +125,7 @@ export default () => {
   const layers = useMemo(
     () =>
       (data?.layer?.__typename === "LayerGroup" ? data.layer.layers : undefined)
-        ?.map(convertLayer)
+        ?.map(l => convertLayer(l as GQLLayer))
         .filter((l): l is Layer => !!l)
         .reverse() ?? [],
     [data?.layer],

diff --git a/src/components/organisms/EarthEditor/PropertyPane/convert.ts b/src/components/organisms/EarthEditor/PropertyPane/convert.ts
@@ -265,24 +265,23 @@ export const convertLinkableDatasets = (
     .filter((s): s is DatasetSchema => !!s);
 };
 
-type GQLLayer = Omit<NonNullable<GetLayersFromLayerIdQuery["layer"]>, "layers"> & {
+type GQLLayer = GetLayersFromLayerIdQuery["layer"] & {
   linkedDatasetSchemaId?: string | null;
   linkedDatasetId?: string | null;
   layers?: (GQLLayer | null | undefined)[];
   merged?: (GQLLayer | null | undefined)[];
 };
 
 export function convertLayers(data: GetLayersFromLayerIdQuery | undefined): Layer[] {
-  const layers: Maybe<GQLLayer>[] =
-    data?.layer?.__typename === "LayerGroup" ? data.layer.layers : [];
+  const layers = data?.layer?.__typename === "LayerGroup" ? data.layer.layers : [];
 
   function mapper(layer: Maybe<GQLLayer> | undefined): Layer | undefined {
     if (!layer) return undefined;
     return {
       id: layer.id,
       title: layer.name,
       visible: layer.isVisible,
-      linked: layer.__typename === "LayerGroup" && !!layer.linkedDatasetSchemaId,
+      linked: !!layer.linkedDatasetSchemaId,
       ...(layer.__typename === "LayerGroup"
         ? {
             group: true,
@@ -293,14 +292,14 @@ export function convertLayers(data: GetLayersFromLayerIdQuery | undefined): Laye
           }
         : {
             group: false,
-            linked: layer.__typename === "LayerItem" && !!layer.linkedDatasetId,
+            linked: !!layer.linkedDatasetId,
             icon: layer.pluginId === "reearth" ? layer.extensionId ?? undefined : undefined,
           }),
     };
   }
 
   return layers
-    .map(mapper)
+    .map(l => mapper(l as GQLLayer))
     .filter((l): l is Layer => !!l)
     .reverse();
 }
diff --git a/src/gql/fragments/layer.ts b/src/gql/fragments/layer.ts
@@ -9,6 +9,12 @@ export const LayerSystemFragments = gql`
     isVisible
     pluginId
     extensionId
+    ... on LayerGroup {
+      linkedDatasetSchemaId
+      layers {
+        id
+      }
+    }
     ... on LayerItem {
       linkedDatasetId
     }
@@ -127,6 +133,12 @@ export const EarthLayerFragments = gql`
         }
       }
     }
+    ... on LayerGroup {
+      linkedDatasetSchemaId
+      layers {
+        id
+      }
+    }
   }
 
   fragment EarthLayerItem on LayerItem {