Skip to content

Commit 2eac0c0

Browse files
committed
fix(cubejs-playground): update query builder
1 parent 7da4fc4 commit 2eac0c0

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderExtras.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,11 @@ export function QueryBuilderExtras() {
405405
) : null
406406
}
407407
selectedKey={timezone}
408-
onSelectionChange={(val: Key) => {
408+
onSelectionChange={(val: Key | null) => {
409+
if (!val) {
410+
return;
411+
}
412+
409413
const timezone = val as string;
410414

411415
updateQuery(() => ({

packages/cubejs-playground/src/QueryBuilderV2/QueryBuilderToolBar.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export function QueryBuilderToolBar() {
3838
isQueryEmpty,
3939
isApiBlocked,
4040
stopQuery,
41+
executedQuery,
4142
RequestStatusComponent,
4243
} = useQueryBuilderContext();
4344

@@ -81,7 +82,7 @@ export function QueryBuilderToolBar() {
8182
isDisabled={isQueryEmpty || !!verificationError || isVerifying || isApiBlocked}
8283
isLoading={isLoading}
8384
icon={
84-
!isQueryEmpty && (isLoading || !isResultOutdated) ? (
85+
!isQueryEmpty && executedQuery && !isResultOutdated ? (
8586
<ReloadOutlined />
8687
) : (
8788
<PlayCircleOutlined />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ const TypeToChartComponent = {
419419
});
420420

421421
columnData.forEach((field: any, i: number) => {
422-
if (field.key) {
422+
if (field.key && typeof field.key === 'string') {
423423
granularityMap[field.key] = field.key.split('.')[2];
424424
} else {
425425
field.key = `key${i}`; // fallback index

packages/cubejs-playground/src/QueryBuilderV2/hooks/query-builder.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,9 +1124,10 @@ export function useQueryBuilder(props: QueryBuilderProps) {
11241124
isQueryEmpty,
11251125
isApiTokenChanged,
11261126
isDataModelChanged,
1127-
isResultOutdated:
1127+
isResultOutdated: !!(
11281128
executedQuery &&
1129-
(queryHash !== getQueryHash(executedQuery) || isApiTokenChanged || isDataModelChanged),
1129+
(queryHash !== getQueryHash(executedQuery) || isApiTokenChanged || isDataModelChanged)
1130+
),
11301131
queryHash,
11311132
cubeApi,
11321133
hasPrivateMembers,

packages/cubejs-playground/src/QueryBuilderV2/hooks/server-core-version-gte.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ export function useServerCoreVersionGte(version: string, currentVersion: string)
33
let gt = false;
44

55
try {
6-
const [, m, p] = currentVersion.split('.').map(Number);
7-
const [, m1, p1] = version.split('.').map(Number);
6+
const [major, minor, patch] = currentVersion.split('.').map(Number);
7+
const [major1, minor1, patch1] = version.split('.').map(Number);
88

9-
gt = m > m1 || (m === m1 && p >= p1);
9+
gt =
10+
major > major1 ||
11+
(major === major1 && minor > minor1) ||
12+
(major === major1 && minor === minor1 && patch >= patch1);
1013
} catch (_) {
1114
//
1215
}

0 commit comments

Comments
 (0)