Skip to content

Commit d5cdc04

Browse files
committed
fix(cubejs-playground): update query builder * 4
1 parent f08886f commit d5cdc04

File tree

1 file changed

+16
-54
lines changed

1 file changed

+16
-54
lines changed

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

Lines changed: 16 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@ import {
2020
Title,
2121
} from '@cube-dev/ui-kit';
2222
import { forwardRef, Key, useEffect, useMemo, useState } from 'react';
23-
import {
24-
DragDropContext,
25-
Draggable,
26-
Droppable,
27-
OnDragEndResponder,
28-
} from 'react-beautiful-dnd';
23+
import { DragDropContext, Draggable, Droppable, OnDragEndResponder } from 'react-beautiful-dnd';
2924
import { TCubeMemberType } from '@cubejs-client/core';
3025

3126
import { useStoredTimezones, useEvent } from './hooks';
@@ -59,9 +54,7 @@ const LIMIT_OPTIONS: { key: number; label: string }[] = [
5954
{ key: 5000, label: '5,000 (Default)' },
6055
{ key: 50000, label: '50,000 (Max)' },
6156
];
62-
const LIMIT_OPTION_VALUES = LIMIT_OPTIONS.map(
63-
(option) => option.key
64-
) as number[];
57+
const LIMIT_OPTION_VALUES = LIMIT_OPTIONS.map((option) => option.key) as number[];
6558

6659
function timezoneByName(name: string) {
6760
return {
@@ -179,10 +172,7 @@ type OrderListItemProps = {
179172
onSortChange: (name: string, sorting: SortDirection) => void;
180173
};
181174

182-
export const OrderListItem = forwardRef(function OrderListItem(
183-
props: OrderListItemProps,
184-
ref
185-
) {
175+
export const OrderListItem = forwardRef(function OrderListItem(props: OrderListItemProps, ref) {
186176
const {
187177
name,
188178
memberType,
@@ -195,12 +185,7 @@ export const OrderListItem = forwardRef(function OrderListItem(
195185
const label = props.label ?? name;
196186

197187
return (
198-
<OrderListItemStyled
199-
ref={ref}
200-
key={name}
201-
data-member={memberType}
202-
{...otherProps}
203-
>
188+
<OrderListItemStyled ref={ref} key={name} data-member={memberType} {...otherProps}>
204189
<DragOutlined style={{ fontSize: 16 }} />
205190

206191
<MemberLabel name={label} member={memberType} />
@@ -215,19 +200,11 @@ export const OrderListItem = forwardRef(function OrderListItem(
215200
{ORDER_LABEL_BY_TYPE[cubeMemberKind ?? 'string'][0]}
216201
</SortButton>
217202

218-
<SortButton
219-
data-member={memberType}
220-
aria-label="Descending"
221-
value="desc"
222-
>
203+
<SortButton data-member={memberType} aria-label="Descending" value="desc">
223204
{ORDER_LABEL_BY_TYPE[cubeMemberKind ?? 'string'][1]}
224205
</SortButton>
225206

226-
<SortButton
227-
data-member={memberType}
228-
aria-label="No sorting"
229-
value="none"
230-
>
207+
<SortButton data-member={memberType} aria-label="No sorting" value="none">
231208
None
232209
</SortButton>
233210
</Radio.ButtonGroup>
@@ -241,9 +218,7 @@ export function QueryBuilderExtras() {
241218
const fields = [...(query?.dimensions ?? []), ...(query?.measures ?? [])];
242219
const storedTimezones = useStoredTimezones(query.timezone);
243220
const timeDimensions =
244-
query?.timeDimensions
245-
?.filter((time) => time.granularity)
246-
.map((time) => time.dimension) ?? [];
221+
query?.timeDimensions?.filter((time) => time.granularity).map((time) => time.dimension) ?? [];
247222

248223
timeDimensions.forEach((name) => {
249224
if (name && !fields.includes(name)) {
@@ -430,7 +405,11 @@ export function QueryBuilderExtras() {
430405
) : null
431406
}
432407
selectedKey={timezone}
433-
onSelectionChange={(val: Key) => {
408+
onSelectionChange={(val: Key | null) => {
409+
if (!val) {
410+
return;
411+
}
412+
434413
const timezone = val as string;
435414

436415
updateQuery(() => ({
@@ -447,12 +426,7 @@ export function QueryBuilderExtras() {
447426
return (
448427
<Select.Item key={tz.tzCode} textValue={tz.label}>
449428
<Space placeContent="space-between" preset="t3m">
450-
<Text
451-
nowrap
452-
ellipsis
453-
block
454-
styles={{ width: 'max 40x' }}
455-
>
429+
<Text nowrap ellipsis block styles={{ width: 'max 40x' }}>
456430
{name || 'UTC (Default)'}
457431
</Text>
458432
{zone ? (
@@ -519,13 +493,7 @@ export function QueryBuilderExtras() {
519493
)}
520494
</DialogTrigger>
521495
);
522-
}, [
523-
query.ungrouped,
524-
query.timezone,
525-
query.offset,
526-
storedTimezones.join('::'),
527-
query.limit,
528-
]);
496+
}, [query.ungrouped, query.timezone, query.offset, storedTimezones.join('::'), query.limit]);
529497

530498
const orderSelector = useMemo(() => {
531499
if (!allFields.length) {
@@ -552,17 +520,11 @@ export function QueryBuilderExtras() {
552520
)}
553521
</Button>
554522
<Dialog width="max 80x">
555-
<Content
556-
padding="(1.5x - 1ow)"
557-
style={{ minHeight: `${30 * allFields.length + 18}px` }}
558-
>
523+
<Content padding="(1.5x - 1ow)" style={{ minHeight: `${30 * allFields.length + 18}px` }}>
559524
<DragDropContext onDragEnd={onDrag}>
560525
<Droppable droppableId="queryOrder">
561526
{(provided) => (
562-
<OrderListContainer
563-
ref={provided.innerRef}
564-
{...provided.droppableProps}
565-
>
527+
<OrderListContainer ref={provided.innerRef} {...provided.droppableProps}>
566528
{allFields.map((name, index) => {
567529
const memberType = getMemberType(name);
568530

0 commit comments

Comments
 (0)