diff --git a/web-console/src/console-application.tsx b/web-console/src/console-application.tsx index 36a0b8aa392..8a166b932e8 100644 --- a/web-console/src/console-application.tsx +++ b/web-console/src/console-application.tsx @@ -327,7 +327,6 @@ export class ConsoleApplication extends React.PureComponent< baseQueryContext={baseQueryContext} serverQueryContext={serverQueryContext} queryEngines={queryEngines} - allowExplain goToTask={this.goToTasksWithTaskId} getClusterCapacity={maybeGetClusterCapacity} />, diff --git a/web-console/src/views/workbench-view/max-tasks-button/__snapshots__/max-tasks-button.spec.tsx.snap b/web-console/src/views/workbench-view/max-tasks-button/__snapshots__/max-tasks-button.spec.tsx.snap index d4326fdf6dc..89f2fdf4143 100644 --- a/web-console/src/views/workbench-view/max-tasks-button/__snapshots__/max-tasks-button.spec.tsx.snap +++ b/web-console/src/views/workbench-view/max-tasks-button/__snapshots__/max-tasks-button.spec.tsx.snap @@ -100,14 +100,13 @@ exports[`MaxTasksButton matches snapshot 1`] = ` multiline={true} onClick={[Function]} popoverProps={{}} - shouldDismissPopover={false} + shouldDismissPopover={true} text={ Max - : - uses the maximum possible tasks up to the specified limit. + : uses the maximum possible tasks up to the specified limit. } /> @@ -115,24 +114,28 @@ exports[`MaxTasksButton matches snapshot 1`] = ` active={false} disabled={false} icon="blank" - labelElement={ - - } multiline={true} onClick={[Function]} popoverProps={{}} - shouldDismissPopover={false} + shouldDismissPopover={true} text={ Auto - : - maximizes the number of tasks while staying within 512 MiB or 10,000 files per task, unless more tasks are needed to stay under the max task limit. + : uses the minimum number of tasks while + + + staying within constraints. + } /> diff --git a/web-console/src/views/workbench-view/max-tasks-button/max-tasks-button.tsx b/web-console/src/views/workbench-view/max-tasks-button/max-tasks-button.tsx index 21ba60f6b8d..509e943d8b7 100644 --- a/web-console/src/views/workbench-view/max-tasks-button/max-tasks-button.tsx +++ b/web-console/src/views/workbench-view/max-tasks-button/max-tasks-button.tsx @@ -19,34 +19,17 @@ import type { ButtonProps } from '@blueprintjs/core'; import { Button, Menu, MenuDivider, MenuItem, Popover, Position } from '@blueprintjs/core'; import { IconNames } from '@blueprintjs/icons'; -import type { JSX, ReactNode } from 'react'; +import type { JSX } from 'react'; import React, { useState } from 'react'; import { NumericInputDialog } from '../../../dialogs'; -import type { QueryContext, TaskAssignment } from '../../../druid-models'; +import type { QueryContext } from '../../../druid-models'; import { getQueryContextKey } from '../../../druid-models'; import { getLink } from '../../../links'; import { capitalizeFirst, deleteKeys, formatInteger, tickIcon } from '../../../utils'; -const MAX_NUM_TASK_OPTIONS = [2, 3, 4, 5, 7, 9, 11, 17, 33, 65, 129]; -const TASK_ASSIGNMENT_OPTIONS: TaskAssignment[] = ['max', 'auto']; - -const TASK_ASSIGNMENT_DESCRIPTION: Record = { - max: 'uses the maximum possible tasks up to the specified limit.', - auto: 'maximizes the number of tasks while staying within 512 MiB or 10,000 files per task, unless more tasks are needed to stay under the max task limit.', -}; - -const TASK_ASSIGNMENT_LABEL_ELEMENT: Record = { - auto: ( -