Skip to content

Commit b3926ee

Browse files
committed
fix(cubejs-playground): update query builder * 2
1 parent 9466dcc commit b3926ee

File tree

1 file changed

+54
-12
lines changed

1 file changed

+54
-12
lines changed

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

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

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

5966
function timezoneByName(name: string) {
6067
return {
@@ -172,7 +179,10 @@ type OrderListItemProps = {
172179
onSortChange: (name: string, sorting: SortDirection) => void;
173180
};
174181

175-
export const OrderListItem = forwardRef(function OrderListItem(props: OrderListItemProps, ref) {
182+
export const OrderListItem = forwardRef(function OrderListItem(
183+
props: OrderListItemProps,
184+
ref
185+
) {
176186
const {
177187
name,
178188
memberType,
@@ -185,7 +195,12 @@ export const OrderListItem = forwardRef(function OrderListItem(props: OrderListI
185195
const label = props.label ?? name;
186196

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

191206
<MemberLabel name={label} member={memberType} />
@@ -200,11 +215,19 @@ export const OrderListItem = forwardRef(function OrderListItem(props: OrderListI
200215
{ORDER_LABEL_BY_TYPE[cubeMemberKind ?? 'string'][0]}
201216
</SortButton>
202217

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

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

223248
timeDimensions.forEach((name) => {
224249
if (name && !fields.includes(name)) {
@@ -405,7 +430,7 @@ export function QueryBuilderExtras() {
405430
) : null
406431
}
407432
selectedKey={timezone}
408-
onSelectionChange={(val: Key) => {
433+
onSelectionChange={(val: Key | null) => {
409434
const timezone = val as string;
410435

411436
updateQuery(() => ({
@@ -422,7 +447,12 @@ export function QueryBuilderExtras() {
422447
return (
423448
<Select.Item key={tz.tzCode} textValue={tz.label}>
424449
<Space placeContent="space-between" preset="t3m">
425-
<Text nowrap ellipsis block styles={{ width: 'max 40x' }}>
450+
<Text
451+
nowrap
452+
ellipsis
453+
block
454+
styles={{ width: 'max 40x' }}
455+
>
426456
{name || 'UTC (Default)'}
427457
</Text>
428458
{zone ? (
@@ -489,7 +519,13 @@ export function QueryBuilderExtras() {
489519
)}
490520
</DialogTrigger>
491521
);
492-
}, [query.ungrouped, query.timezone, query.offset, storedTimezones.join('::'), query.limit]);
522+
}, [
523+
query.ungrouped,
524+
query.timezone,
525+
query.offset,
526+
storedTimezones.join('::'),
527+
query.limit,
528+
]);
493529

494530
const orderSelector = useMemo(() => {
495531
if (!allFields.length) {
@@ -516,11 +552,17 @@ export function QueryBuilderExtras() {
516552
)}
517553
</Button>
518554
<Dialog width="max 80x">
519-
<Content padding="(1.5x - 1ow)" style={{ minHeight: `${30 * allFields.length + 18}px` }}>
555+
<Content
556+
padding="(1.5x - 1ow)"
557+
style={{ minHeight: `${30 * allFields.length + 18}px` }}
558+
>
520559
<DragDropContext onDragEnd={onDrag}>
521560
<Droppable droppableId="queryOrder">
522561
{(provided) => (
523-
<OrderListContainer ref={provided.innerRef} {...provided.droppableProps}>
562+
<OrderListContainer
563+
ref={provided.innerRef}
564+
{...provided.droppableProps}
565+
>
524566
{allFields.map((name, index) => {
525567
const memberType = getMemberType(name);
526568

0 commit comments

Comments
 (0)