diff --git a/web-console/src/dialogs/status-dialog/status-dialog.tsx b/web-console/src/dialogs/status-dialog/status-dialog.tsx index 672fc40910f3..e87eb64a58cb 100644 --- a/web-console/src/dialogs/status-dialog/status-dialog.tsx +++ b/web-console/src/dialogs/status-dialog/status-dialog.tsx @@ -82,7 +82,7 @@ export const StatusDialog = React.memo(function StatusDialog(props: StatusDialog return (
- Version: {response.version} + Druid version: {response.version}
{ - const v = nullMode[prop]; - return `${prop}: ${typeof v === 'undefined' ? 'Not detected' : v}${ - v === newDefault ? ' (SQL compliant)' : '' - }${v === !newDefault ? ' (Legacy mode)' : ''}`; - }); -} diff --git a/web-console/src/views/home-view/__snapshots__/home-view.spec.tsx.snap b/web-console/src/views/home-view/__snapshots__/home-view.spec.tsx.snap index 02ac85096a65..f0827099e417 100644 --- a/web-console/src/views/home-view/__snapshots__/home-view.spec.tsx.snap +++ b/web-console/src/views/home-view/__snapshots__/home-view.spec.tsx.snap @@ -4,18 +4,7 @@ exports[`HomeView matches snapshot (coordinator) 1`] = `
- + - + - + - + {capabilities.hasSqlOrCoordinatorAccess() && ( <> diff --git a/web-console/src/views/home-view/status-card/status-card.spec.tsx b/web-console/src/views/home-view/status-card/status-card.spec.tsx index 2642b7d3b9b2..26f0523eedce 100644 --- a/web-console/src/views/home-view/status-card/status-card.spec.tsx +++ b/web-console/src/views/home-view/status-card/status-card.spec.tsx @@ -18,13 +18,11 @@ import { render } from '@testing-library/react'; -import { Capabilities } from '../../../helpers'; - import { StatusCard } from './status-card'; describe('StatusCard', () => { it('matches snapshot', () => { - const statusCard = ; + const statusCard = ; const { container } = render(statusCard); expect(container.firstChild).toMatchSnapshot(); diff --git a/web-console/src/views/home-view/status-card/status-card.tsx b/web-console/src/views/home-view/status-card/status-card.tsx index da85ab532cd8..65785f27e480 100644 --- a/web-console/src/views/home-view/status-card/status-card.tsx +++ b/web-console/src/views/home-view/status-card/status-card.tsx @@ -20,19 +20,9 @@ import { IconNames } from '@blueprintjs/icons'; import React, { useState } from 'react'; import { StatusDialog } from '../../../dialogs/status-dialog/status-dialog'; -import type { Capabilities } from '../../../helpers'; import { useQueryManager } from '../../../hooks'; import { Api } from '../../../singletons'; -import type { NullModeDetection } from '../../../utils'; -import { - deepGet, - explainNullModeDetection, - NULL_DETECTION_QUERY, - nullDetectionQueryResultDecoder, - pluralIfNeeded, - queryDruidRune, - summarizeNullModeDetection, -} from '../../../utils'; +import { pluralIfNeeded } from '../../../utils'; import { HomeViewCard } from '../home-view-card/home-view-card'; interface StatusSummary { @@ -40,12 +30,7 @@ interface StatusSummary { extensionCount: number; } -export interface StatusCardProps { - capabilities: Capabilities; -} - -export const StatusCard = React.memo(function StatusCard(props: StatusCardProps) { - const { capabilities } = props; +export const StatusCard = React.memo(function StatusCard() { const [showStatusDialog, setShowStatusDialog] = useState(false); const [statusSummaryState] = useQueryManager({ initQuery: null, @@ -58,17 +43,7 @@ export const StatusCard = React.memo(function StatusCard(props: StatusCardProps) }, }); - const [nullModeDetectionState] = useQueryManager({ - initQuery: capabilities, - processQuery: async (capabilities, cancelToken) => { - if (!capabilities.hasQuerying()) return {}; - const nullDetectionResponse = await queryDruidRune(NULL_DETECTION_QUERY, cancelToken); - return nullDetectionQueryResultDecoder(deepGet(nullDetectionResponse, '0.result')); - }, - }); - const statusSummary = statusSummaryState.data; - const nullModeDetection = nullModeDetectionState.data; return ( <> {`${pluralIfNeeded(statusSummary.extensionCount, 'extension')} loaded`}

)} - {nullModeDetection && ( -

- {summarizeNullModeDetection(nullModeDetection)} -

- )} +

+ SQL compliant NULL mode (built-in) +

{showStatusDialog && (