Skip to content

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

our analytics strikes again (#66909)

Ryan Laurie037391a1eaf4
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx
index 793fd53b3ee..9fe110e21f4 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/oss.unit.spec.tsx
@@ -218,6 +218,12 @@ describe("MiniPicker", () => {
expect(await screen.findByText("Misc Metrics")).toBeInTheDocument();
});
+ it("shows the collection name for our analytics", async () => {
+ await setup({ searchQuery: "Fan" });
+ expect(await screen.findByText("Fanny")).toBeInTheDocument();
+ expect(await screen.findByText("Our analytics")).toBeInTheDocument();
+ });
+
it("shows db and schema names for table items in search results", async () => {
await setup({ searchQuery: "wick" });
expect(await screen.findByText("wickham")).toBeInTheDocument();
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsx
index 27fdb37fed6..6807d8be1e6 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/setup.tsx
@@ -235,6 +235,17 @@ export const setup = async (
}),
createMockSearchResult({ id: 304, model: "document", name: "Wickham" }),
createMockSearchResult({ id: 305, model: "collection", name: "Reynolds" }),
+ createMockSearchResult({
+ id: 306,
+ model: "metric",
+ name: "Fanny",
+ collection: {
+ // @ts-expect-error - can be null in search results
+ id: null,
+ // @ts-expect-error - can be null in search results
+ name: null,
+ },
+ }),
createMockSearchResult({
id: 401,
model: "table",
@@ -244,7 +255,8 @@ export const setup = async (
collection: {
// @ts-expect-error - can be null in search results
id: null,
- name: "",
+ // @ts-expect-error - can be null in search results
+ name: null,
},
}),
]);
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 e8223c27549..e527ff03c87 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
@@ -27,6 +27,7 @@ import type {
MiniPickerDatabaseItem,
MiniPickerPickableItem,
MiniPickerSchemaItem,
+ MiniPickerTableItem,
} from "../types";
import { MiniPickerItem } from "./MiniPickerItem";
@@ -337,10 +338,16 @@ export const MiniPickerListLoader = () => (
</Box>
);
-const isInCollection = (
+const isTableInDb = (
item: MiniPickerPickableItem,
-): item is MiniPickerCollectionItem => {
- return "collection" in item && !!item.collection && !!item.collection.name;
+): item is MiniPickerTableItem => {
+ // note: if you publish a table to Our analytics, we just can't figure that out
+ return (
+ item.model === "table" &&
+ "collection" in item &&
+ !!item.collection &&
+ !item.collection.name
+ );
};
const ItemList = ({ children }: { children: React.ReactNode[] }) => {
@@ -348,22 +355,22 @@ const ItemList = ({ children }: { children: React.ReactNode[] }) => {
};
const LocationInfo = ({ item }: { item: MiniPickerPickableItem }) => {
- const isCollectionItem = isInCollection(item);
+ const isTable = isTableInDb(item);
- const itemText = isCollectionItem
- ? item?.collection?.name
- : `${item.database_name}${item.table_schema ? ` (${item.table_schema})` : ""}`;
+ const itemText = isTable
+ ? `${item.database_name}${item.table_schema ? ` (${item.table_schema})` : ""}`
+ : (item?.collection?.name ?? t`Our analytics`);
if (!itemText) {
return null;
}
- const iconProps = isCollectionItem
- ? getIcon({
+ const iconProps = isTable
+ ? null
+ : getIcon({
...item.collection,
model: "collection",
- })
- : null;
+ });
return (
<Flex gap="xs" align="center">