The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
UXW-285 filter not accessible questions in data picker (#66483)
Denis Berezinf04e790b903a
diff --git a/e2e/support/helpers/e2e-ui-elements-helpers.js b/e2e/support/helpers/e2e-ui-elements-helpers.jsindex da328570f4e..422b97261ff 100644--- a/e2e/support/helpers/e2e-ui-elements-helpers.js+++ b/e2e/support/helpers/e2e-ui-elements-helpers.js@@ -53,6 +53,10 @@ export function miniPickerBrowseAll() {return miniPicker().findByText("Browse all");}+export function miniPickerOurAnalytics() {+ return miniPicker().findByText("Our analytics");+}+export function miniPickerHeader() {return cy.findByTestId("mini-picker-header");}diff --git a/e2e/test/scenarios/data-studio/table-collection-permissions.cy.spec.ts b/e2e/test/scenarios/data-studio/table-collection-permissions.cy.spec.tsindex 2e2321db013..0e214c59b82 100644--- a/e2e/test/scenarios/data-studio/table-collection-permissions.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/table-collection-permissions.cy.spec.ts@@ -188,7 +188,7 @@ describe("scenarios > data studio > table collection permissions", () => {H.getNotebookStep("data").button("Join data").click();H.popover().findByText("Browse all").click();H.entityPickerModal().within(() => {- cy.findByText("Orders").click();+ cy.findByText("Orders Model").click();});H.getNotebookStep("join").button("Summarize").click();H.popover().findByText("Count of rows").click();diff --git a/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts b/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.tsindex 4f3eec710e1..d6f2ccf7af8 100644--- a/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts+++ b/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts@@ -1362,3 +1362,55 @@ describe("issue 64293", () => {});});});++describe("issue 13347", () => {+ beforeEach(() => {+ H.restore();+ H.restore("postgres-12");+ cy.signInAsAdmin();++ H.createQuestion({+ name: "13347 structured",+ database: WRITABLE_DB_ID,+ query: {+ "source-table": ORDERS_ID,+ },+ });++ H.createNativeQuestion({+ name: "13347 native",+ database: WRITABLE_DB_ID,+ native: {+ query: "SELECT * FROM ORDERS",+ },+ });++ cy.signInAsNormalUser();++ cy.visit("/");+ });++ it("should not display questions in mini data picker that cannot be used for new questions (metabase#13347)", () => {+ H.startNewQuestion();+ H.miniPickerOurAnalytics().click();++ H.miniPicker().within(() => {+ cy.findByText("Orders").should("exist");++ cy.findByText("13347 structured").should("not.exist");+ cy.findByText("13347 native").should("not.exist");+ });+ });++ it("should not display questions in big data picker that cannot be used for new questions (metabase#13347)", () => {+ H.startNewQuestion();+ H.miniPickerBrowseAll().click();++ H.entityPickerModalLevel(1).within(() => {+ cy.findByText("Orders").should("exist");++ cy.findByText("13347 structured").should("not.exist");+ cy.findByText("13347 native").should("not.exist");+ });+ });+});diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.tsindex 64086145abe..6e5db05eeec 100644--- a/frontend/src/metabase-types/api/collection.ts+++ b/frontend/src/metabase-types/api/collection.ts@@ -139,6 +139,7 @@ export interface CollectionItem {can_write?: boolean;can_restore?: boolean;can_delete?: boolean;+ can_run_adhoc_query?: boolean; // available only for data picker (#60021)"last-edit-info"?: LastEditInfo;location?: string;effective_location?: string;@@ -185,6 +186,7 @@ export type ListCollectionItemsRequest = {pinned_state?: "all" | "is_pinned" | "is_not_pinned";namespace?: "snippets";collection_type?: CollectionType;+ include_can_run_adhoc_query?: boolean;} & PaginationRequest &Partial<SortingOptions<ListCollectionItemsSortColumn>>;diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsx b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsxindex 2f9c2c4965c..1fe997d50dc 100644--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/components/CollectionItemList.tsx@@ -27,7 +27,7 @@ export const CollectionItemList = ({shouldShowItem,}: CollectionItemListProps) => {const {- data: collectionItems,+ data: items,error,isLoading,} = useListCollectionItemsQuery<{@@ -41,13 +41,14 @@ export const CollectionItemList = ({? {...query,models: getValidCollectionItemModels(query.models),+ include_can_run_adhoc_query: true,}: skipToken,);return (<ItemList- items={collectionItems?.data}+ items={items?.data}isLoading={isLoading}error={error}onClick={onClick}diff --git a/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/DataPicker/utils.tsindex ead9c390b06..a29a227dc2c 100644--- a/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/DataPicker/utils.ts@@ -1,3 +1,4 @@+import { canCollectionCardBeUsed } from "metabase/common/components/Pickers/utils";import { isNullOrUndefined } from "metabase/lib/types";import * as Lib from "metabase-lib";import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";@@ -135,12 +136,19 @@ export const createShouldShowItem = (return isNullOrUndefined(databaseId) || item.dbId === databaseId;}- if (- (isNullOrUndefined(databaseId) ||- !hasDatabaseId(item) ||- isNullOrUndefined(item.database_id)) &&- models.includes(item.model)- ) {+ const hasNoDb =+ isNullOrUndefined(databaseId) ||+ !hasDatabaseId(item) ||+ isNullOrUndefined(item.database_id);++ if (item.model === "card" && models.includes(item.model)) {+ return (+ canCollectionCardBeUsed(item as CollectionItem) &&+ (hasNoDb || item.database_id === databaseId)+ );+ }++ if (hasNoDb && models.includes(item.model)) {return true;}diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsxindex 09e6228a7eb..afa3a24354a 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx@@ -11,6 +11,7 @@ import {useSearchQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { canCollectionCardBeUsed } from "metabase/common/components/Pickers/utils";import { VirtualizedList } from "metabase/common/components/VirtualizedList";import { useSetting } from "metabase/common/hooks";import { PLUGIN_DATA_STUDIO } from "metabase/plugins";@@ -241,22 +242,21 @@ function DatabaseItemList({function CollectionItemList({ parent }: { parent: MiniPickerCollectionItem }) {const { setPath, onChange, isFolder, isHidden } = useMiniPickerContext();- const {- data: items,- isLoading,- isFetching,- } = useListCollectionItemsQuery({+ const { data, isLoading, isFetching } = useListCollectionItemsQuery({id: parent.id === null ? "root" : parent.id,+ include_can_run_adhoc_query: true,});+ const items = data?.data?.filter(canCollectionCardBeUsed);+if (isLoading || isFetching) {return <MiniPickerListLoader />;}- if (items?.data?.length) {+ if (items?.length) {return (<ItemList>- {items.data.map((item) => (+ {items.map((item) => (<MiniPickerItemkey={`${item.model}-${item.id}`}name={item.name}diff --git a/frontend/src/metabase/common/components/Pickers/utils.ts b/frontend/src/metabase/common/components/Pickers/utils.tsindex 4224fe43123..7366c48b4b7 100644--- a/frontend/src/metabase/common/components/Pickers/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/utils.ts@@ -2,6 +2,7 @@ import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";import { isNullOrUndefined } from "metabase/lib/types";import type {CollectionId,+ CollectionItem,CollectionItemModel,ListCollectionItemsRequest,} from "metabase-types/api";@@ -138,3 +139,13 @@ const resolveEntityId = (};}};++export const canCollectionCardBeUsed = (+ item: CollectionItem | CollectionPickerItem,+): boolean => {+ if (item.model === "card") {+ return "can_run_adhoc_query" in item ? !!item.can_run_adhoc_query : true;+ }++ return true;+};