You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by be...@apache.org on 2026/08/01 20:03:27 UTC
(superset) branch master updated: feat(semantic layers): don't show samples tab in explore (#41509)
This is an automated email from the ASF dual-hosted git repository.
betodealmeida pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 9f66cb566bf feat(semantic layers): don't show samples tab in explore (#41509)
9f66cb566bf is described below
commit 9f66cb566bf1f7baf120ccdc8b408e1c518585d6
Author: Beto Dealmeida <ro...@dealmeida.net>
AuthorDate: Sat Aug 1 16:03:20 2026 -0400
feat(semantic layers): don't show samples tab in explore (#41509)
---
.../Chart/DrillDetail/DrillDetailPane.test.tsx | 6 ++
.../Chart/DrillDetail/DrillDetailPane.tsx | 12 +++-
.../Chart/useDrillDetailMenuItems/index.tsx | 17 +++++-
.../useDrillDetailMenuItems.test.tsx | 42 +++++++++++++
superset-frontend/src/dashboard/types.ts | 4 ++
.../components/DataTablesPane/DataTablesPane.tsx | 53 ++++++++++------
.../DataTablesPane/components/SamplesPane.tsx | 12 +++-
.../DataTablesPane/components/useResultsPane.tsx | 12 +++-
.../DataTablesPane/test/DataTablesPane.test.tsx | 49 ++++++++++++++-
.../DataTablesPane/test/SamplesPane.test.tsx | 6 +-
superset-frontend/src/explore/types.ts | 12 ++++
superset/common/query_actions.py | 9 +++
superset/connectors/sqla/models.py | 12 ++++
superset/semantic_layers/models.py | 8 +++
superset/superset_typing.py | 5 ++
superset/views/datasource/views.py | 17 ++++++
.../common/test_query_actions_drill_detail.py | 70 ++++++++++++++++++++++
tests/unit_tests/semantic_layers/models_test.py | 14 +++++
tests/unit_tests/views/datasource/views_test.py | 63 +++++++++++++++++++
19 files changed, 396 insertions(+), 27 deletions(-)
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx
index 72637c71084..3bf8fb6b36b 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx
@@ -216,6 +216,12 @@ test('should render the error', async () => {
.spyOn(SupersetClient, 'post')
.mockRejectedValue(new Error('Something went wrong'));
await waitForRender();
+ // The error is wrapped in an Alert component with a stable headline and the
+ // raw error text in the description — no more bare ``<pre>`` elements.
+ expect(await screen.findByRole('alert')).toBeVisible();
+ expect(
+ await screen.findByText('Failed to load drill-to-detail rows'),
+ ).toBeVisible();
expect(screen.getByText('Error: Something went wrong')).toBeInTheDocument();
});
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
index 98e3b46d9ad..d7378fc3904 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
@@ -42,6 +42,7 @@ import BooleanCell from '@superset-ui/core/components/Table/cell-renderers/Boole
import NullCell from '@superset-ui/core/components/Table/cell-renderers/NullCell';
import TimeCell from '@superset-ui/core/components/Table/cell-renderers/TimeCell';
import { EmptyState, Loading } from '@superset-ui/core/components';
+import { Alert } from '@apache-superset/core/components';
import { getDatasourceSamples } from 'src/components/Chart/chartAction';
import Table, {
ColumnsType,
@@ -362,13 +363,18 @@ export default function DrillDetailPane({
if (responseError) {
// Render error if page download failed
tableContent = (
- <pre
+ <div
css={css`
margin-top: ${theme.sizeUnit * 4}px;
`}
>
- {responseError}
- </pre>
+ <Alert
+ type="error"
+ showIcon
+ message={t('Failed to load drill-to-detail rows')}
+ description={responseError}
+ />
+ </div>
);
} else if (bootstrapping) {
// Render loading if first page hasn't loaded
diff --git a/superset-frontend/src/components/Chart/useDrillDetailMenuItems/index.tsx b/superset-frontend/src/components/Chart/useDrillDetailMenuItems/index.tsx
index 48aeef24dda..d99bc5358ff 100644
--- a/superset-frontend/src/components/Chart/useDrillDetailMenuItems/index.tsx
+++ b/superset-frontend/src/components/Chart/useDrillDetailMenuItems/index.tsx
@@ -50,6 +50,7 @@ const DISABLED_REASONS = {
DATABASE: t(
'Drill to detail is disabled for this database. Change the database settings to enable it.',
),
+ DATASOURCE: t('Drill to detail is not available for this datasource type.'),
NO_AGGREGATIONS: t(
'Drill to detail is disabled because this chart does not group data by dimension value.',
),
@@ -116,6 +117,17 @@ export const useDrillDetailMenuItems = ({
datasources[formData.datasource]?.database?.disable_drill_to_detail,
);
+ // Capability flag on the datasource itself. Datasources that don't model
+ // raw rows (e.g. semantic views) opt out via ``supports_drill_to_detail``
+ // in the explore data payload.
+ const datasourceSupportsDrillToDetail = useSelector<
+ RootState,
+ boolean | undefined
+ >(
+ ({ datasources }) =>
+ datasources[formData.datasource]?.supports_drill_to_detail,
+ );
+
const openModal = useCallback(
(filters: BinaryQueryObjectFilterClause[], event: MouseEvent) => {
onClick(event);
@@ -158,7 +170,10 @@ export const useDrillDetailMenuItems = ({
let drillDisabled;
let drillByDisabled;
- if (drillToDetailDisabled) {
+ if (datasourceSupportsDrillToDetail === false) {
+ drillDisabled = DISABLED_REASONS.DATASOURCE;
+ drillByDisabled = DISABLED_REASONS.DATASOURCE;
+ } else if (drillToDetailDisabled) {
drillDisabled = DISABLED_REASONS.DATABASE;
drillByDisabled = DISABLED_REASONS.DATABASE;
} else if (handlesDimensionContextMenu) {
diff --git a/superset-frontend/src/components/Chart/useDrillDetailMenuItems/useDrillDetailMenuItems.test.tsx b/superset-frontend/src/components/Chart/useDrillDetailMenuItems/useDrillDetailMenuItems.test.tsx
index 0e7e2a7c5df..8338d3e6bd3 100644
--- a/superset-frontend/src/components/Chart/useDrillDetailMenuItems/useDrillDetailMenuItems.test.tsx
+++ b/superset-frontend/src/components/Chart/useDrillDetailMenuItems/useDrillDetailMenuItems.test.tsx
@@ -444,3 +444,45 @@ test('context menu renders <NULL> for null dimension values', async () => {
await expectDrillToDetailByEnabled();
await expectDrillToDetailByDimension(filterNull);
});
+
+const buildStateWithUnsupportedDatasource = () => {
+ const baseState = getMockStoreWithNativeFilters().getState();
+ const datasourceKey = defaultFormData.datasource as string;
+ return {
+ ...baseState,
+ datasources: {
+ ...baseState.datasources,
+ [datasourceKey]: {
+ ...baseState.datasources[datasourceKey],
+ supports_drill_to_detail: false,
+ },
+ },
+ };
+};
+
+test('dropdown menu when datasource opts out via supports_drill_to_detail=false', async () => {
+ cleanup();
+ render(<MockRenderChart formData={defaultFormData} />, {
+ useRouter: true,
+ useRedux: true,
+ initialState: buildStateWithUnsupportedDatasource(),
+ });
+
+ await expectDrillToDetailDisabled(
+ 'Drill to detail is not available for this datasource type.',
+ );
+ await expectNoDrillToDetailBy();
+});
+
+test('context menu when datasource opts out via supports_drill_to_detail=false', async () => {
+ cleanup();
+ render(<MockRenderChart formData={defaultFormData} isContextMenu />, {
+ useRouter: true,
+ useRedux: true,
+ initialState: buildStateWithUnsupportedDatasource(),
+ });
+
+ const message = 'Drill to detail is not available for this datasource type.';
+ await expectDrillToDetailDisabled(message);
+ await expectDrillToDetailByDisabled(message);
+});
diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts
index 67b7704f8ca..6889d265228 100644
--- a/superset-frontend/src/dashboard/types.ts
+++ b/superset-frontend/src/dashboard/types.ts
@@ -232,6 +232,10 @@ export type Datasource = Dataset & {
// Populated by the dashboard datasets API alongside ``type``; declared here
// so callers can rely on structural typing instead of casting.
datasource_type?: DatasourceType;
+ /** False when the datasource can't return row samples (e.g. semantic views). */
+ supports_samples?: boolean;
+ /** False when the datasource can't answer drill-to-detail requests. */
+ supports_drill_to_detail?: boolean;
};
export type DatasourcesState = {
[key: string]: Datasource;
diff --git a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
index 4d7cb5c28a7..cb8878e3bf9 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
@@ -241,25 +241,44 @@ export const DataTablesPane = ({
}
}, [resultsTabFallback]);
+ // Hide the Samples tab for datasources that don't expose raw rows
+ // (e.g. semantic views). The check is intentionally ``=== false`` so that
+ // datasources from older backends that don't send the flag still show the
+ // tab and preserve current behavior.
+ const showSamplesTab = datasource?.supports_samples !== false;
+
+ // If the datasource swaps to one that doesn't support samples while the
+ // Samples tab is active (e.g. the user picks a semantic view), the tab
+ // disappears from ``tabItems`` and ``activeTabKey`` is orphaned. Fall back
+ // to Results so the panel keeps rendering content.
+ useEffect(() => {
+ if (!showSamplesTab && activeTabKey === ResultTypes.Samples) {
+ setActiveTabKey(ResultTypes.Results);
+ }
+ }, [showSamplesTab, activeTabKey]);
const tabItems = [
...queryResultsPanes,
- {
- key: ResultTypes.Samples,
- label: t('Samples'),
- children: (
- <StyledDiv>
- <SamplesPane
- datasource={datasource}
- queryFormData={queryFormData}
- queryForce={queryForce}
- isRequest={isRequest.samples}
- setForceQuery={setForceQuery}
- isVisible={ResultTypes.Samples === activeTabKey}
- canDownload={canDownload}
- />
- </StyledDiv>
- ),
- },
+ ...(showSamplesTab
+ ? [
+ {
+ key: ResultTypes.Samples,
+ label: t('Samples'),
+ children: (
+ <StyledDiv>
+ <SamplesPane
+ datasource={datasource}
+ queryFormData={queryFormData}
+ queryForce={queryForce}
+ isRequest={isRequest.samples}
+ setForceQuery={setForceQuery}
+ isVisible={ResultTypes.Samples === activeTabKey}
+ canDownload={canDownload}
+ />
+ </StyledDiv>
+ ),
+ },
+ ]
+ : []),
];
return (
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
index 9e2fa986164..3aa8a16fa71 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
@@ -21,6 +21,7 @@ import { t } from '@apache-superset/core/translation';
import { ensureIsArray } from '@superset-ui/core';
import { datasetLabelLower } from 'src/features/semanticLayers/label';
import { styled } from '@apache-superset/core/theme';
+import { Alert } from '@apache-superset/core/components';
import { EmptyState, Loading } from '@superset-ui/core/components';
import { GenericDataType } from '@apache-superset/core/common';
import { GridTable } from 'src/components/GridTable';
@@ -35,7 +36,7 @@ import {
import { TableControls, ROW_LIMIT_OPTIONS } from './DataTableControls';
import { SamplesPaneProps } from '../types';
-const Error = styled.pre`
+const ErrorAlertWrapper = styled.div`
margin-top: ${({ theme }) => `${theme.sizeUnit * 4}px`};
`;
@@ -155,7 +156,14 @@ export const SamplesPane = ({
rowLimitOptions={ROW_LIMIT_OPTIONS}
onRowLimitChange={handleRowLimitChange}
/>
- <Error>{responseError}</Error>
+ <ErrorAlertWrapper>
+ <Alert
+ type="error"
+ showIcon
+ message={t('Failed to load samples')}
+ description={responseError}
+ />
+ </ErrorAlertWrapper>
</>
);
}
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
index 4dcf1b5324a..ede48d3bf25 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
@@ -27,13 +27,14 @@ import {
QueryData,
} from '@superset-ui/core';
import { styled } from '@apache-superset/core/theme';
+import { Alert } from '@apache-superset/core/components';
import { EmptyState, Loading } from '@superset-ui/core/components';
import { getChartDataRequest } from 'src/components/Chart/chartAction';
import { ResultsPaneProps, QueryResultInterface } from '../types';
import { SingleQueryResultPane } from './SingleQueryResultPane';
import { TableControls, ROW_LIMIT_OPTIONS } from './DataTableControls';
-const Error = styled.pre`
+const ErrorAlertWrapper = styled.div`
margin-top: ${({ theme }) => `${theme.sizeUnit * 4}px`};
`;
@@ -199,7 +200,14 @@ export const useResultsPane = ({
isLoading={false}
canDownload={canDownload}
/>
- <Error>{responseError}</Error>
+ <ErrorAlertWrapper>
+ <Alert
+ type="error"
+ showIcon
+ message={t('Failed to load results')}
+ description={responseError}
+ />
+ </ErrorAlertWrapper>
</>
);
return Array(queryCount).fill(err);
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx
index 024602f2126..65b3b8423c2 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx
@@ -19,7 +19,12 @@
import fetchMock from 'fetch-mock';
import { FeatureFlag } from '@superset-ui/core';
import * as copyUtils from 'src/utils/copy';
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import {
+ render,
+ screen,
+ userEvent,
+ waitFor,
+} from 'spec/helpers/testing-library';
import { setupAGGridModules } from '@superset-ui/core/components/ThemedAgGridReact';
import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
import { DataTablesPane } from '..';
@@ -89,6 +94,48 @@ describe('DataTablesPane', () => {
expect(await screen.findByLabelText('Collapse data panel')).toBeVisible();
});
+ test('Hides Samples tab when datasource opts out via supports_samples=false', async () => {
+ const props = createDataTablesPaneProps(0);
+ const propsWithoutSamples = {
+ ...props,
+ datasource: { ...props.datasource, supports_samples: false },
+ };
+ render(<DataTablesPane {...propsWithoutSamples} />, { useRedux: true });
+ expect(await screen.findByText('Results')).toBeVisible();
+ expect(screen.queryByText('Samples')).not.toBeInTheDocument();
+ });
+
+ test('Falls back to Results when active Samples tab disappears mid-session', async () => {
+ // Regression for codeant Major finding on PR #41509: a datasource swap
+ // that hides the Samples tab while it was the active tab used to leave
+ // ``activeTabKey === 'samples'`` orphaned, rendering a blank panel.
+ const props = createDataTablesPaneProps(0);
+ const { rerender } = render(<DataTablesPane {...props} />, {
+ useRedux: true,
+ });
+
+ // Open the panel and pick the Samples tab.
+ userEvent.click(screen.getByLabelText('Expand data panel'));
+ userEvent.click(await screen.findByText('Samples'));
+ expect(await screen.findByLabelText('Collapse data panel')).toBeVisible();
+
+ // Swap to a datasource that doesn't support samples (e.g. a semantic
+ // view). The Samples tab should disappear and the panel should land on
+ // Results with content still rendered.
+ rerender(
+ <DataTablesPane
+ {...props}
+ datasource={{ ...props.datasource, supports_samples: false }}
+ />,
+ );
+ await waitFor(() => {
+ expect(screen.queryByText('Samples')).not.toBeInTheDocument();
+ });
+ expect(screen.getByText('Results')).toBeVisible();
+ // Panel stays expanded and renders Results content rather than going blank.
+ expect(screen.getByLabelText('Collapse data panel')).toBeVisible();
+ });
+
test('Should copy data table content correctly', async () => {
fetchMock.post(
'glob:*/api/v1/chart/data?form_data=%7B%22slice_id%22%3A456%7D',
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
index 26cff940c26..02b5fed7290 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
@@ -84,10 +84,14 @@ describe('SamplesPane', () => {
const props = createSamplesPaneProps({
datasourceId: 36,
});
- const { findByText } = render(<SamplesPane {...props} />, {
+ const { findByText, findByRole } = render(<SamplesPane {...props} />, {
useRedux: true,
});
+ // The error is now rendered inside an Alert component, with a clear
+ // headline message and the raw error text as the description.
+ expect(await findByRole('alert')).toBeVisible();
+ expect(await findByText('Failed to load samples')).toBeVisible();
expect(await findByText('Error: Bad request')).toBeVisible();
});
diff --git a/superset-frontend/src/explore/types.ts b/superset-frontend/src/explore/types.ts
index cb0ce75c80c..a9c499adcf6 100644
--- a/superset-frontend/src/explore/types.ts
+++ b/superset-frontend/src/explore/types.ts
@@ -74,6 +74,18 @@ export type Datasource = Dataset & {
schema?: string;
is_sqllab_view?: boolean;
extra?: string | object;
+ /**
+ * False when the datasource (e.g. a semantic view) doesn't model raw rows
+ * and therefore can't return a row sample. Defaults to true on the server
+ * side; missing here means the explore UI keeps current behavior.
+ */
+ supports_samples?: boolean;
+ /**
+ * False when the datasource doesn't model raw rows and therefore can't
+ * answer a drill-to-detail query. Tracked separately from
+ * ``supports_samples`` so the two capabilities can diverge.
+ */
+ supports_drill_to_detail?: boolean;
};
export interface ExplorePageInitialData {
diff --git a/superset/common/query_actions.py b/superset/common/query_actions.py
index fbb93e5030d..3178ae07510 100644
--- a/superset/common/query_actions.py
+++ b/superset/common/query_actions.py
@@ -235,6 +235,15 @@ def _get_drill_detail(
# todo(yongjie): Remove this function,
# when determining whether samples should be applied to the time filter.
datasource = _get_datasource(query_context, query_obj)
+ # Refuse for datasource types that don't model raw rows (e.g. semantic
+ # views). Mirrors the ``supports_samples`` gate on the ``/samples``
+ # endpoint so drill-detail is hard-blocked on the backend, not just
+ # hidden in the frontend menu. Defaults to ``True`` for any datasource
+ # class that doesn't explicitly opt out.
+ if not getattr(datasource, "supports_drill_to_detail", True):
+ raise QueryObjectValidationError(
+ _("Drill to detail is not available for this datasource type.")
+ )
query_obj = copy.copy(query_obj)
query_obj.is_timeseries = False
query_obj.metrics = None
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 09d9a65a049..72a19a5b434 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -193,6 +193,16 @@ class BaseDatasource(
# Only some datasources support Row Level Security
is_rls_supported: bool = False
+ # Datasources that can return raw row samples (anything backed by a SQL
+ # table can; semantic-layer abstractions cannot, since they only expose
+ # pre-defined metrics and dimensions).
+ supports_samples: bool = True
+
+ # Datasources that can answer "drill to detail" requests — i.e. fetch the
+ # raw rows underlying a chart cell. Conceptually similar to ``samples``
+ # but kept as a separate capability so the two can diverge.
+ supports_drill_to_detail: bool = True
+
@property
def name(self) -> str:
# can be a Column or a property pointing to one
@@ -486,6 +496,8 @@ class BaseDatasource(
"order_by_choices": self.order_by_choices,
"verbose_map": self.verbose_map,
"select_star": self.select_star,
+ "supports_samples": self.supports_samples,
+ "supports_drill_to_detail": self.supports_drill_to_detail,
}
def data_for_slices( # pylint: disable=too-many-locals # noqa: C901
diff --git a/superset/semantic_layers/models.py b/superset/semantic_layers/models.py
index ee52e3dc3cf..a4df1054ad1 100644
--- a/superset/semantic_layers/models.py
+++ b/superset/semantic_layers/models.py
@@ -200,6 +200,12 @@ class SemanticView(AuditMixinNullable, Model):
__tablename__ = "semantic_views"
+ # Semantic views expose pre-defined metrics and dimensions, not raw rows,
+ # so neither the "Samples" tab in Explore nor the "Drill to detail"
+ # affordance from the chart 3-dots menu can return anything meaningful.
+ supports_samples: bool = False
+ supports_drill_to_detail: bool = False
+
# Use integer as the primary key for cross-database auto-increment
# compatibility (sa.Identity() is not supported in MySQL or SQLite).
# The uuid column is a secondary unique identifier used in URLs and perms.
@@ -425,6 +431,8 @@ class SemanticView(AuditMixinNullable, Model):
"sql": None,
"select_star": None,
"editors": [],
+ "supports_samples": self.supports_samples,
+ "supports_drill_to_detail": self.supports_drill_to_detail,
"description": self.description,
"table_name": self.name,
"column_types": [
diff --git a/superset/superset_typing.py b/superset/superset_typing.py
index 099f369047d..d53a1532efd 100644
--- a/superset/superset_typing.py
+++ b/superset/superset_typing.py
@@ -346,6 +346,11 @@ class ExplorableData(TypedDict, total=False):
always_filter_main_dttm: bool
normalize_columns: bool
rls_filters: list[dict[str, Any]]
+ # Set by datasources that cannot return raw row samples (e.g. semantic
+ # views, which only expose pre-defined metrics and dimensions).
+ supports_samples: bool
+ # Set by datasources that cannot answer drill-to-detail requests.
+ supports_drill_to_detail: bool
VizData: TypeAlias = list[Any] | dict[Any, Any] | None
diff --git a/superset/views/datasource/views.py b/superset/views/datasource/views.py
index 9d983265de9..7cb96074f3e 100644
--- a/superset/views/datasource/views.py
+++ b/superset/views/datasource/views.py
@@ -202,6 +202,23 @@ class Datasource(BaseSupersetView):
payload = SamplesPayloadSchema().load(request.json)
except ValidationError as err:
return json_error_response(err.messages, status=400)
+
+ # Refuse early for datasource types that don't model raw rows
+ # (e.g. semantic views, which only expose pre-defined metrics and
+ # dimensions). Without this gate the request would still go through
+ # the standard query pipeline and fail with an opaque 500.
+ # ``supports_samples`` defaults to True for any datasource class that
+ # doesn't explicitly opt out, so SqlaTable/Query/SavedQuery continue
+ # to work without needing the attribute declared on each class.
+ ds_class = DatasourceDAO.sources.get(
+ DatasourceType(params["datasource_type"]),
+ )
+ if ds_class is not None and not getattr(ds_class, "supports_samples", True):
+ return json_error_response(
+ _("Samples are not available for this datasource type."),
+ status=400,
+ )
+
dashboard_id = None
if security_manager.is_guest_user():
if not params["dashboard_id"]:
diff --git a/tests/unit_tests/common/test_query_actions_drill_detail.py b/tests/unit_tests/common/test_query_actions_drill_detail.py
new file mode 100644
index 00000000000..0bd95aa8225
--- /dev/null
+++ b/tests/unit_tests/common/test_query_actions_drill_detail.py
@@ -0,0 +1,70 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from superset.common.query_actions import _get_drill_detail
+from superset.exceptions import QueryObjectValidationError
+
+
+def test_get_drill_detail_refuses_datasource_that_opts_out() -> None:
+ """
+ A datasource with ``supports_drill_to_detail = False`` (e.g. semantic
+ views) must be hard-blocked on the server. Without this gate the request
+ would fall through to ``_get_full`` and fail with an opaque error, and
+ the flag would only be enforced by the frontend menu — leaving the
+ chart-data API endpoint accepting drill-detail requests it shouldn't.
+ """
+ datasource = MagicMock()
+ datasource.supports_drill_to_detail = False
+
+ query_obj = MagicMock()
+ query_obj.datasource = datasource
+
+ query_context = MagicMock()
+
+ with pytest.raises(
+ QueryObjectValidationError,
+ match="Drill to detail is not available",
+ ):
+ _get_drill_detail(query_context, query_obj)
+
+
+def test_get_drill_detail_allows_datasource_without_flag() -> None:
+ """
+ Datasources that don't declare the flag (e.g. legacy ``SqlaTable``
+ subclasses via ``getattr`` default) must continue to work — the gate
+ only fires when the flag is explicitly ``False``.
+ """
+ datasource = MagicMock(spec=["columns"])
+ column = MagicMock()
+ column.column_name = "id"
+ datasource.columns = [column]
+
+ query_obj = MagicMock()
+ query_obj.datasource = datasource
+ query_obj.columns = []
+
+ query_context = MagicMock()
+
+ expected_payload: dict[str, list[dict[str, str]]] = {"data": []}
+ with patch(
+ "superset.common.query_actions._get_full", return_value=expected_payload
+ ) as mock_get_full:
+ assert _get_drill_detail(query_context, query_obj) is expected_payload
+ mock_get_full.assert_called_once()
diff --git a/tests/unit_tests/semantic_layers/models_test.py b/tests/unit_tests/semantic_layers/models_test.py
index af13d6d11e7..6400676f8b1 100644
--- a/tests/unit_tests/semantic_layers/models_test.py
+++ b/tests/unit_tests/semantic_layers/models_test.py
@@ -653,6 +653,15 @@ def test_semantic_view_data(
assert data["table_name"] == "Orders View"
assert data["datasource_name"] == "Orders View"
assert data["offset"] == 0
+ # Semantic views don't model raw rows, so neither samples nor
+ # drill-to-detail are available.
+ assert data["supports_samples"] is False
+ assert data["supports_drill_to_detail"] is False
+
+
+def test_semantic_view_supports_samples_is_false() -> None:
+ """The class-level flag opts SemanticView out of the Samples affordance."""
+ assert SemanticView.supports_samples is False
@pytest.fixture
@@ -767,6 +776,11 @@ def test_semantic_view_data_populates_time_grain_sqla(
assert grain_durations == sorted(["PT1H", "P1D", "P1M"])
+def test_semantic_view_supports_drill_to_detail_is_false() -> None:
+ """The class-level flag opts SemanticView out of Drill to detail."""
+ assert SemanticView.supports_drill_to_detail is False
+
+
def test_semantic_view_get_query_result(
mock_implementation: MagicMock,
) -> None:
diff --git a/tests/unit_tests/views/datasource/views_test.py b/tests/unit_tests/views/datasource/views_test.py
index 0ca11ed3fff..c1a771035a3 100644
--- a/tests/unit_tests/views/datasource/views_test.py
+++ b/tests/unit_tests/views/datasource/views_test.py
@@ -310,3 +310,66 @@ def test_save_non_editor_with_editors_field_is_rejected(
raw_save(_view_self())
mock_security_manager.raise_for_editorship.assert_called_once_with(mock_orm)
+
+
+# ---------------------------------------------------------------------------
+# Datasource.samples
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.views.datasource.views._", lambda s: s)
+@patch("superset.views.datasource.views.get_samples")
+@patch("superset.views.datasource.views.json_error_response")
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+def test_samples_returns_400_for_unsupported_datasource_type(
+ mock_security_manager: MagicMock,
+ mock_json_error_response: MagicMock,
+ mock_get_samples: MagicMock,
+) -> None:
+ """Semantic views can't return raw samples — endpoint should refuse with 400."""
+ from flask import Flask
+
+ mock_security_manager.is_guest_user.return_value = False
+ mock_json_error_response.return_value = "error-response"
+
+ raw_samples = _get_view_func("samples")
+ app = Flask(__name__)
+ with app.test_request_context(
+ "/datasource/samples?datasource_type=semantic_view&datasource_id=1",
+ method="POST",
+ json={},
+ ):
+ result = raw_samples(_view_self())
+
+ assert result == "error-response"
+ mock_json_error_response.assert_called_once()
+ _, kwargs = mock_json_error_response.call_args
+ assert kwargs.get("status") == 400
+ # The bail-out must happen before any sample fetching is attempted.
+ mock_get_samples.assert_not_called()
+
+
+@patch("superset.views.datasource.views.get_samples")
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+def test_samples_proceeds_for_supported_datasource_type(
+ mock_security_manager: MagicMock,
+ mock_get_samples: MagicMock,
+) -> None:
+ """A `query` datasource (supports_samples=True) bypasses the 400 short-circuit."""
+ from flask import Flask
+
+ mock_security_manager.is_guest_user.return_value = False
+ mock_get_samples.return_value = {"rows": []}
+
+ view = _view_self()
+ raw_samples = _get_view_func("samples")
+ app = Flask(__name__)
+ with app.test_request_context(
+ "/datasource/samples?datasource_type=query&datasource_id=1",
+ method="POST",
+ json={},
+ ):
+ raw_samples(view)
+
+ mock_get_samples.assert_called_once()
+ view.json_response.assert_called_once_with({"result": {"rows": []}})