Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

GDGT-1776 Query Builder transform fails at join stage (#69552)

Kamil Mielnik2291e7f38bd5
diff --git a/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.ts
index cf79b5a233d..0759a6e299f 100644
--- a/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/transforms/reproductions.cy.spec.ts
@@ -1,3 +1,5 @@
+import { createMockSearchResult } from "metabase-types/api/mocks";
+
const { H } = cy;
describe("issue #68378", () => {
@@ -28,6 +30,54 @@ describe("issue #68378", () => {
});
});
+describe("issue GDGT-1776", () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.resetTestTable({ type: "postgres", table: "empty_schema" });
+ cy.signInAsAdmin();
+ H.activateToken("bleeding-edge");
+
+ const ITEMS_COUNT = 1000;
+
+ cy.intercept("GET", "/api/collection/root/items*", {
+ statusCode: 200,
+ body: {
+ data: Array.from({ length: ITEMS_COUNT }).map((_value, index) => {
+ return createMockSearchResult({
+ id: index + 1,
+ model: "table",
+ });
+ }),
+ limit: null,
+ models: [
+ "card",
+ "collection",
+ "dashboard",
+ "dataset",
+ "document",
+ "metric",
+ "pulse",
+ "table",
+ "timeline",
+ ],
+ offset: null,
+ total: ITEMS_COUNT,
+ },
+ });
+ });
+
+ it("should not crash the app when processing lots of hidden items in the MiniPicker (GDGT-1776)", () => {
+ visitTransformListPage();
+ cy.button("Create a transform").click();
+ H.popover().findByText("Query builder").click();
+ H.popover().findByText("Our analytics").click();
+
+ cy.findByTestId("loading-indicator").should("not.exist");
+ H.main().findByText("Something’s gone wrong").should("not.exist");
+ cy.button("Cancel").should("be.visible");
+ });
+});
+
function visitTransformListPage() {
return cy.visit("/data-studio/transforms");
}
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
index 85daafe45c5..3b749a533b3 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
@@ -12,7 +12,6 @@ export const MiniPickerItem = ({
name,
onClick,
isFolder,
- isHidden,
display,
...menuItemProps
}: {
@@ -21,11 +20,7 @@ export const MiniPickerItem = ({
display?: MiniPickerCollectionItem["display"];
onClick?: () => void;
isFolder?: boolean;
- isHidden?: boolean;
} & MenuItemProps) => {
- if (isHidden) {
- return null;
- }
return (
<Box px="sm" py="2px">
<Menu.Item
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
index 7a4db89d54a..f7d770426a4 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
@@ -22,6 +22,7 @@ import { useSelector } from "metabase/lib/redux";
import { PLUGIN_LIBRARY } from "metabase/plugins";
import { Box, Flex, Icon, Repeat, Skeleton, Stack, Text } from "metabase/ui";
import type {
+ CollectionItem,
SchemaName,
SearchModel,
SearchRequest,
@@ -87,7 +88,6 @@ function RootItemList() {
<MiniPickerItem
key={db.id}
name={db.name}
- isHidden={isHidden({ model: "database", id: db.id, name: db.name })}
model="database"
isFolder
onClick={() => {
@@ -125,7 +125,6 @@ function RootItemList() {
key={db.id}
name={db.name}
model="database"
- isHidden={isHidden({ model: "database", id: db.id, name: db.name })}
isFolder
onClick={() => {
setPath([{ model: "database", id: db.id, name: db.name }]);
@@ -156,13 +155,24 @@ function DatabaseItemList({
parent: MiniPickerDatabaseItem | MiniPickerSchemaItem;
}) {
const { setPath, onChange, isHidden } = useMiniPickerContext();
- const { data: schemas, isLoading: isLoadingSchemas } =
+ const { data: allSchemas, isLoading: isLoadingSchemas } =
useListDatabaseSchemasQuery(
parent.model === "database"
? { id: parent.id, "can-query": true }
: skipToken,
);
+ const dbId = parent.model === "database" ? parent.id : parent.dbId!;
+
+ const schemas = allSchemas?.filter((schema) => {
+ return !isHidden({
+ model: "schema",
+ id: schema,
+ dbId,
+ name: schema,
+ });
+ });
+
const schemaName: SchemaName | null =
parent.model === "schema"
? String(parent.id)
@@ -170,8 +180,6 @@ function DatabaseItemList({
? schemas[0] // if there's one schema, go straight to tables
: null;
- const dbId = parent.model === "database" ? parent.id : parent.dbId!;
-
const { data: tablesData, isLoading: isLoadingTables } =
useListDatabaseSchemaTablesQuery(
schemaName !== null
@@ -194,12 +202,6 @@ function DatabaseItemList({
<MiniPickerItem
key={schema}
name={schema}
- isHidden={isHidden({
- model: "schema",
- id: schema,
- dbId,
- name: schema,
- })}
isFolder
model="schema"
onClick={() => {
@@ -223,11 +225,15 @@ function DatabaseItemList({
return <MiniPickerListLoader />;
}
- if (!isLoadingSchemas && tablesData?.length) {
+ const nonHiddenTables = tablesData?.filter((table) => {
+ return !isHidden({ model: "table", ...table });
+ });
+
+ if (!isLoadingSchemas && nonHiddenTables?.length) {
const tables =
parent.model === "schema"
- ? tablesData.filter((table) => table.schema === parent.id)
- : tablesData;
+ ? nonHiddenTables.filter((table) => table.schema === parent.id)
+ : nonHiddenTables;
return (
<ItemList>
@@ -235,7 +241,6 @@ function DatabaseItemList({
<MiniPickerItem
key={table.id}
name={table.display_name}
- isHidden={isHidden({ model: "table", ...table })}
model="table"
onClick={() => {
onChange({
@@ -260,7 +265,8 @@ function CollectionItemList({ parent }: { parent: MiniPickerCollectionItem }) {
include_can_run_adhoc_query: true,
});
- const items = data?.data?.filter(canCollectionCardBeUsed);
+ const allItems = data?.data?.filter(canCollectionCardBeUsed) ?? [];
+ const items: CollectionItem[] = allItems.filter((item) => !isHidden(item));
if (isLoading || isFetching) {
return <MiniPickerListLoader />;
@@ -276,7 +282,6 @@ function CollectionItemList({ parent }: { parent: MiniPickerCollectionItem }) {
model={item.model}
display={item.display}
isFolder={isFolder(item)}
- isHidden={isHidden(item)}
onClick={() => {
if (isFolder(item)) {
setPath((prevPath) => [