Fix ContentScopeIndicator for scope with optional dimensions (#2667)

Co-authored-by: Johannes Obermair <[email protected]>
vivid-planet · Oct 30, 2024 · 1cf01f7 · 1cf01f7
1 parent 37d71a8
commit 1cf01f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/tiny-moose-sip.md b/.changeset/tiny-moose-sip.md
@@ -0,0 +1,5 @@
+---
+"@comet/cms-admin": patch
+---
+
+Fix `ContentScopeIndicator` for scope with optional dimensions
diff --git a/packages/admin/cms-admin/src/contentScope/ContentScopeIndicator.tsx b/packages/admin/cms-admin/src/contentScope/ContentScopeIndicator.tsx
@@ -23,7 +23,7 @@ export const ContentScopeIndicator = ({ global = false, scope: passedScope, chil
 
     const findLabelForScopePart = (scopePart: keyof ContentScopeInterface) => {
         const label = values.find((value) => {
-            return value[scopePart].value === scope[scopePart];
+            return value[scopePart] && value[scopePart].value === scope[scopePart];
         })?.[scopePart].label;
 
         return label ?? capitalizeString(scope[scopePart]);

diff --git a/storybook/src/cms-admin/ContentScopeProvider/OptionalDimensions.tsx b/storybook/src/cms-admin/ContentScopeProvider/OptionalDimensions.tsx
@@ -1,5 +1,5 @@
 import { AppHeader, AppHeaderFillSpace, AppHeaderMenuButton, CometLogo, MainContent } from "@comet/admin";
-import { ContentScopeControls, ContentScopeProvider, ContentScopeValues, useContentScope } from "@comet/cms-admin";
+import { ContentScopeControls, ContentScopeIndicator, ContentScopeProvider, ContentScopeValues, useContentScope } from "@comet/cms-admin";
 import { Typography } from "@mui/material";
 import { storiesOf } from "@storybook/react";
 import React from "react";
@@ -49,6 +49,7 @@ storiesOf("@comet/cms-admin/Content Scope Provider", module)
                                 <ContentScopeControls />
                             </AppHeader>
                             <MainContent>
+                                <ContentScopeIndicator />
                                 <Typography gutterBottom>
                                     This is a development story to test optional scope dimensions in the content scope provider. Try changing the
                                     scope in the content scope select.