Skip to content

Commit 9466dcc

Browse files
committed
Revert "fix(cubejs-playground): update query builder"
This reverts commit 2eac0c0.
1 parent 2eac0c0 commit 9466dcc

File tree

5 files changed

+8
-17
lines changed

5 files changed

+8
-17
lines changed

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

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

415411
updateQuery(() => ({

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export function QueryBuilderToolBar() {
3838
isQueryEmpty,
3939
isApiBlocked,
4040
stopQuery,
41-
executedQuery,
4241
RequestStatusComponent,
4342
} = useQueryBuilderContext();
4443

@@ -82,7 +81,7 @@ export function QueryBuilderToolBar() {
8281
isDisabled={isQueryEmpty || !!verificationError || isVerifying || isApiBlocked}
8382
isLoading={isLoading}
8483
icon={
85-
!isQueryEmpty && executedQuery && !isResultOutdated ? (
84+
!isQueryEmpty && (isLoading || !isResultOutdated) ? (
8685
<ReloadOutlined />
8786
) : (
8887
<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 && typeof field.key === 'string') {
422+
if (field.key) {
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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,10 +1124,9 @@ export function useQueryBuilder(props: QueryBuilderProps) {
11241124
isQueryEmpty,
11251125
isApiTokenChanged,
11261126
isDataModelChanged,
1127-
isResultOutdated: !!(
1127+
isResultOutdated:
11281128
executedQuery &&
1129-
(queryHash !== getQueryHash(executedQuery) || isApiTokenChanged || isDataModelChanged)
1130-
),
1129+
(queryHash !== getQueryHash(executedQuery) || isApiTokenChanged || isDataModelChanged),
11311130
queryHash,
11321131
cubeApi,
11331132
hasPrivateMembers,

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

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

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

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

0 commit comments

Comments
 (0)