Code polish

cube-js · Oct 8, 2024 · 9a72c42 · 9a72c42
1 parent b694196
commit 9a72c42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/cubejs-playground/src/QueryBuilderV2/components/ChartRenderer.tsx b/packages/cubejs-playground/src/QueryBuilderV2/components/ChartRenderer.tsx
@@ -122,8 +122,10 @@ function CartesianChart({
   let granularity = granularityField?.split('.')[2];
 
   if (!isPredefinedGranularity(granularity)) {
-    const granularityInfo = resultSet?.loadResponse.results[0].annotation.timeDimensions[granularityField]?.granularity;
-    granularity = minGranularityForIntervals(granularityInfo.interval, granularityInfo.offset || granularityFor(granularityInfo.origin));
+    const granularityInfo = resultSet?.loadResponse.results[0]?.annotation.timeDimensions[granularityField]?.granularity;
+    if (granularityInfo) {
+      granularity = minGranularityForIntervals(granularityInfo.interval, granularityInfo.offset || granularityFor(granularityInfo.origin));
+    }
   }
 
   const formatDate = useMemo(() => {

diff --git a/packages/cubejs-playground/src/QueryBuilderV2/components/TimeListMember.tsx b/packages/cubejs-playground/src/QueryBuilderV2/components/TimeListMember.tsx
@@ -70,9 +70,7 @@ export function TimeListMember(props: ListMemberProps) {
 
   const customGranularities = (member.type === 'time' && member.granularities) ?
     member.granularities.map(g => g.name) : [];
-  const memberGranularities = (member.type === 'time' && member.granularities) ?
-    member.granularities.map(g => g.name).concat(PREDEFINED_GRANULARITIES) :
-    PREDEFINED_GRANULARITIES;
+  const memberGranularities = customGranularities.concat(PREDEFINED_GRANULARITIES);
   const isGranularitySelectedMap = {};
   memberGranularities.forEach((granularity) => {
     isGranularitySelectedMap[granularity] = isSelected(granularity)