Skip to content

Commit 4d55bfe

Browse files
committed
Code polish
1 parent b694196 commit 4d55bfe

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

packages/cubejs-playground/src/QueryBuilderV2/components/ChartRenderer.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
TimeDimensionGranularity,
44
granularityFor,
55
minGranularityForIntervals,
6-
isPredefinedGranularity
6+
isPredefinedGranularity,
77
} from '@cubejs-client/core';
88
import { UseCubeQueryResult } from '@cubejs-client/react';
99
import { Skeleton, Tag, tasty } from '@cube-dev/ui-kit';
@@ -122,8 +122,14 @@ function CartesianChart({
122122
let granularity = granularityField?.split('.')[2];
123123

124124
if (!isPredefinedGranularity(granularity)) {
125-
const granularityInfo = resultSet?.loadResponse.results[0].annotation.timeDimensions[granularityField]?.granularity;
126-
granularity = minGranularityForIntervals(granularityInfo.interval, granularityInfo.offset || granularityFor(granularityInfo.origin));
125+
const granularityInfo =
126+
resultSet?.loadResponse.results[0]?.annotation.timeDimensions[granularityField]?.granularity;
127+
if (granularityInfo) {
128+
granularity = minGranularityForIntervals(
129+
granularityInfo.interval,
130+
granularityInfo.offset || granularityFor(granularityInfo.origin)
131+
);
132+
}
127133
}
128134

129135
const formatDate = useMemo(() => {

packages/cubejs-playground/src/QueryBuilderV2/components/TimeListMember.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,12 @@ export function TimeListMember(props: ListMemberProps) {
6868
const description = member.description;
6969
const isTimestampSelected = isSelected();
7070

71-
const customGranularities = (member.type === 'time' && member.granularities) ?
72-
member.granularities.map(g => g.name) : [];
73-
const memberGranularities = (member.type === 'time' && member.granularities) ?
74-
member.granularities.map(g => g.name).concat(PREDEFINED_GRANULARITIES) :
75-
PREDEFINED_GRANULARITIES;
71+
const customGranularities =
72+
member.type === 'time' && member.granularities ? member.granularities.map((g) => g.name) : [];
73+
const memberGranularities = customGranularities.concat(PREDEFINED_GRANULARITIES);
7674
const isGranularitySelectedMap = {};
7775
memberGranularities.forEach((granularity) => {
78-
isGranularitySelectedMap[granularity] = isSelected(granularity)
76+
isGranularitySelectedMap[granularity] = isSelected(granularity);
7977
});
8078
const selectedGranularity = memberGranularities.find((granularity) => isSelected(granularity));
8179

@@ -144,7 +142,8 @@ export function TimeListMember(props: ListMemberProps) {
144142
return null;
145143
}
146144

147-
return items.map((granularity, i) => (<ListMemberButton
145+
return items.map((granularity, i) => (
146+
<ListMemberButton
148147
key={`${name}.${granularity}`}
149148
icon={icon}
150149
data-member="timeDimension"
@@ -157,7 +156,7 @@ export function TimeListMember(props: ListMemberProps) {
157156
<Text ellipsis>{granularity}</Text>
158157
</ListMemberButton>
159158
));
160-
}
159+
};
161160

162161
return (
163162
<>

0 commit comments

Comments
 (0)