diff --git a/docs/developers-guide/partner-and-community-drivers.md b/docs/developers-guide/partner-and-community-drivers.md
index c02ea4b619bcb6a3e04b2581d658756707760132..12a3aa47da45439c7f3122ff313bf745babf7634 100644
--- a/docs/developers-guide/partner-and-community-drivers.md
+++ b/docs/developers-guide/partner-and-community-drivers.md
@@ -77,7 +77,7 @@ Anyone can build a community driver. These are the currently known third-party d
| [Peaka](https://github.com/peakacom/metabase-driver) |  |  |
| [GreptimeDB](https://github.com/greptimeteam/greptimedb-metabase-driver) |  |  |
-If you don't see a driver for your database, then try looking in the comments of the [issue related to the database](https://github.com/metabase/metabase/labels/Database%2F). You might also find more by [searching on GitHub](https://github.com/search?q=metabase+driver).
+If you don't see a driver for your database, try looking in the comments of the [issue related to the database](https://github.com/metabase/metabase/labels/Database%2F). You might also find more drivers by searching on GitHub for "Metabase driver".
If you are having problems installing or using a community driver, your best bet is to contact the author of the driver.
diff --git a/docs/exploration-and-organization/collections.md b/docs/exploration-and-organization/collections.md
index c544f72530738b2cec351bb48acbdd39a23521c2..f893bd0ce8555722cf35b9cb6f89df45a2eb9281 100644
--- a/docs/exploration-and-organization/collections.md
+++ b/docs/exploration-and-organization/collections.md
@@ -79,6 +79,14 @@ If you're trying to move several things at once, click on the checkboxes next to
Note that you have to have Curate permission for the collection that you're moving a question into _and_ the collection you're moving the question out of. Metabase admins can move items into (and out of) anyone's [personal collection](#your-personal-collection).
+## Cleaning up collections
+
+{% include plans-blockquote.html feature="Collection cleanup" %}
+
+It's possible to ask too many questions. Fortunately, you can clean up collections by [trashing items](./delete-and-restore.md) that people haven't even looked at for a period of time. Cleaning up old questions and dashboards can keep your Metabase from getting too cluttered, and you can always resurrect items from the trash if you need to.
+
+On a collection page, click on the three-dot menu (**...**) and select **Clean things up**. Metabase will pull up a modal where you can select unused items to move to the trash. You can set how long items need to go unnoticed before they're culled by setting **Not used in over**, which you can set to trash items from one month ago to over two years ago. There's also a toggle to include/exclude items in sub-collections.
+
## Events and timelines
You can add events to collections, and organize those events into timelines. See [Events and timelines](events-and-timelines.md).
diff --git a/docs/exploration-and-organization/delete-and-restore.md b/docs/exploration-and-organization/delete-and-restore.md
index 5bcdb84286717a8350e48d2fa10c2c9587962675..3a85c7346a070f765e3a774fe1cea7946501b510 100644
--- a/docs/exploration-and-organization/delete-and-restore.md
+++ b/docs/exploration-and-organization/delete-and-restore.md
@@ -10,7 +10,7 @@ Sometimes your questions, dashboards, models, or collections outlive their usefu
Items in **Trash** won't show up in search (unless you use [advanced search filters](./exploration.md)), and you won't be able to use them to create new questions and dashboards.
-Moving items to Trash is not permanent: you'll be able to restore them to their original parent collection, or move them to another non-deleted collection. But if you'd' like to delete items permanently, [you can do that too](#permanently-deleting-items).
+Moving items to Trash isn't permanent; you'll be able to restore them to their original parent collection, or move them to another collection. But if you'd like to delete items permanently, [you can do that too](#permanently-deleting-items).
Deleting an item will affect any [dashboards](../dashboards/introduction.md), [subscriptions](../dashboards/subscriptions.md), or [SQL questions](../questions/native-editor/referencing-saved-questions-in-queries.md) that depend on that item, so be careful!
@@ -36,7 +36,7 @@ To move an item (question, dashboard, model, or collection) to Trash:
2. Click on the three dots menu;
3. Select "Move to trash".
-> When a collection is deleted, all items in the collection are deleted as well.
+When a collection is moved to the trash, Metabase moves all items in the collection to the trash as well.
You'll still be able to see the contents of the items in Trash, but you won't be able to modify them or use them as a source for other questions.
@@ -57,6 +57,10 @@ To restore an item:
If the item's original parent collection has been deleted as well, you won't see an option to **Restore**. You'll still be able to move the it from Trash to a different collection.
+### Cleaning up collections
+
+To move older, unused items in bulk to the trash, check out [cleaning up collections](./collections.md#cleaning-up-collections).
+
## How deleting an item affects related items
Deleting or restoring an item will affect other items that depend on that item.
diff --git a/e2e/support/helpers/api/createNativeQuestionAndDashboard.ts b/e2e/support/helpers/api/createNativeQuestionAndDashboard.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f25f828104b0d0f7799ac3e204a8008dc02d9c6c
--- /dev/null
+++ b/e2e/support/helpers/api/createNativeQuestionAndDashboard.ts
@@ -0,0 +1,46 @@
+import { createNativeQuestion } from "e2e/support/helpers";
+import type { CardId, Dashboard, DashboardCard } from "metabase-types/api";
+
+import { type DashboardDetails, createDashboard } from "./createDashboard";
+import type { NativeQuestionDetails } from "./createQuestion";
+
+export const createNativeQuestionAndDashboard = ({
+ questionDetails,
+ dashboardDetails,
+ cardDetails,
+}: {
+ questionDetails: NativeQuestionDetails;
+ dashboardDetails?: DashboardDetails;
+ cardDetails?: Partial<DashboardCard>;
+}): Cypress.Chainable<
+ Cypress.Response<DashboardCard> & { questionId: CardId }
+> => {
+ return createNativeQuestion(questionDetails).then(
+ ({ body: { id: questionId } }) => {
+ return createDashboard(dashboardDetails).then(
+ ({ body: { id: dashboardId } }) => {
+ return cy
+ .request<Dashboard>("PUT", `/api/dashboard/${dashboardId}`, {
+ dashcards: [
+ {
+ id: -1,
+ card_id: questionId,
+ // Add sane defaults for the dashboard card size
+ row: 0,
+ col: 0,
+ size_x: 11,
+ size_y: 6,
+ ...cardDetails,
+ },
+ ],
+ })
+ .then(response => ({
+ ...response,
+ body: response.body.dashcards[0],
+ questionId,
+ }));
+ },
+ );
+ },
+ );
+};
diff --git a/e2e/support/helpers/api/index.ts b/e2e/support/helpers/api/index.ts
index 47d6073d9dcc105ff94c0e8c3ad74d55302b48bc..ae10089e5d0542b7e77ab42d6b624a25fd47fa0c 100644
--- a/e2e/support/helpers/api/index.ts
+++ b/e2e/support/helpers/api/index.ts
@@ -11,6 +11,7 @@ export { createDashboardWithTabs } from "./createDashboardWithTabs";
export { createModerationReview } from "./createModerationReview";
export { createNativeQuestion } from "./createNativeQuestion";
export type { NativeQuestionDetails } from "./createNativeQuestion";
+export { createNativeQuestionAndDashboard } from "./createNativeQuestionAndDashboard";
export { createPulse } from "./createPulse";
export { createQuestion } from "./createQuestion";
export type {
diff --git a/e2e/support/helpers/e2e-ui-elements-helpers.js b/e2e/support/helpers/e2e-ui-elements-helpers.js
index 4994cf34e5abfa87b3c3070833552f40c893926c..33154d89f99289d0501d709a833de4a270bc69e6 100644
--- a/e2e/support/helpers/e2e-ui-elements-helpers.js
+++ b/e2e/support/helpers/e2e-ui-elements-helpers.js
@@ -284,6 +284,28 @@ export function tableHeaderClick(headerString) {
});
}
+export function assertTableData({ columns, firstRows = [] }) {
+ tableInteractive()
+ .findAllByTestId("header-cell")
+ .should("have.length", columns.length);
+
+ columns.forEach((column, index) => {
+ tableInteractive()
+ .findAllByTestId("header-cell")
+ .eq(index)
+ .should("have.text", column);
+ });
+
+ firstRows.forEach((row, rowIndex) => {
+ row.forEach((cell, cellIndex) => {
+ tableInteractiveBody()
+ .findAllByTestId("cell-data")
+ .eq(columns.length * rowIndex + cellIndex)
+ .should("have.text", cell);
+ });
+ });
+}
+
/**
* selects the global new button
* @param {*} menuItem optional, if provided, will click the New button and return the menu item with the text provided
diff --git a/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts b/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts
index 39d0596929b8b1b03113cfede09f47672dfcea34..0c76e4c41f2178a254a4bf687a4e2af44559c9c0 100644
--- a/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts
+++ b/e2e/test/scenarios/question/multiple-column-breakouts.cy.spec.ts
@@ -3,6 +3,7 @@ import {
type DashboardDetails,
type StructuredQuestionDetails,
assertQueryBuilderRowCount,
+ assertTableData,
createQuestion,
createQuestionAndDashboard,
dragField,
@@ -22,7 +23,6 @@ import {
startNewQuestion,
summarize,
tableInteractive,
- tableInteractiveBody,
visitDashboard,
visitEmbeddedPage,
visitPublicDashboard,
@@ -1825,31 +1825,3 @@ function tableHeaderClick(
.eq(columnIndex)
.trigger("mouseup");
}
-
-function assertTableData({
- columns = [],
- firstRows = [],
-}: {
- columns: string[];
- firstRows?: string[][];
-}) {
- tableInteractive()
- .findAllByTestId("header-cell")
- .should("have.length", columns.length);
-
- columns.forEach((column, index) => {
- tableInteractive()
- .findAllByTestId("header-cell")
- .eq(index)
- .should("have.text", column);
- });
-
- firstRows.forEach((row, rowIndex) => {
- row.forEach((cell, cellIndex) => {
- tableInteractiveBody()
- .findAllByTestId("cell-data")
- .eq(columns.length * rowIndex + cellIndex)
- .should("have.text", cell);
- });
- });
-}
diff --git a/e2e/test/scenarios/question/native-query-drill.cy.spec.ts b/e2e/test/scenarios/question/native-query-drill.cy.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ae169d541ede4e8916d1ff4adbd498c223c87e85
--- /dev/null
+++ b/e2e/test/scenarios/question/native-query-drill.cy.spec.ts
@@ -0,0 +1,479 @@
+import { SAMPLE_DB_ID } from "e2e/support/cypress_data";
+import {
+ type NativeQuestionDetails,
+ assertQueryBuilderRowCount,
+ assertTableData,
+ cartesianChartCircle,
+ createNativeQuestion,
+ createNativeQuestionAndDashboard,
+ echartsContainer,
+ getDashboardCard,
+ modal,
+ popover,
+ restore,
+ tableHeaderClick,
+ tableInteractive,
+ visitDashboard,
+ visitQuestion,
+ visitQuestionAdhoc,
+} from "e2e/support/helpers";
+
+const ordersTableQuestionDetails: NativeQuestionDetails = {
+ display: "table",
+ native: {
+ query: "SELECT ID, CREATED_AT, QUANTITY FROM ORDERS ORDER BY ID LIMIT 10",
+ },
+};
+
+const peopleTableQuestionDetails: NativeQuestionDetails = {
+ display: "table",
+ native: {
+ query: "SELECT ID, EMAIL, CREATED_AT FROM PEOPLE ORDER BY ID LIMIT 10",
+ },
+};
+
+const timeseriesLineQuestionDetails: NativeQuestionDetails = {
+ display: "line",
+ native: {
+ query: "SELECT CREATED_AT, QUANTITY FROM ORDERS ORDER BY ID LIMIT 10",
+ },
+ visualization_settings: {
+ "graph.dimensions": ["CREATED_AT"],
+ "graph.metrics": ["QUANTITY"],
+ },
+};
+
+const timeseriesWithCategoryLineQuestionDetails: NativeQuestionDetails = {
+ display: "line",
+ native: {
+ query:
+ "SELECT PRICE, CATEGORY, CREATED_AT FROM PRODUCTS ORDER BY ID LIMIT 10",
+ },
+ visualization_settings: {
+ "graph.dimensions": ["CREATED_AT", "CATEGORY"],
+ "graph.metrics": ["PRICE"],
+ },
+};
+
+const numericLineQuestionDetails: NativeQuestionDetails = {
+ display: "line",
+ native: {
+ query: "SELECT ID, QUANTITY FROM ORDERS ORDER BY ID LIMIT 10",
+ },
+ visualization_settings: {
+ "graph.dimensions": ["ID"],
+ "graph.metrics": ["QUANTITY"],
+ },
+};
+
+const pinMapQuestionDetails: NativeQuestionDetails = {
+ display: "map",
+ native: {
+ query: "SELECT LATITUDE, LONGITUDE FROM PEOPLE ORDER BY ID LIMIT 10",
+ },
+ visualization_settings: {
+ "map.type": "pin",
+ "map.longitude_column": "LONGITUDE",
+ "map.latitude_column": "LATITUDE",
+ },
+};
+
+const gridMapQuestionDetails: NativeQuestionDetails = {
+ display: "map",
+ native: {
+ query: "SELECT LATITUDE, LONGITUDE FROM PEOPLE ORDER BY ID LIMIT 10",
+ },
+ visualization_settings: {
+ "map.type": "grid",
+ "map.longitude_column": "LONGITUDE",
+ "map.latitude_column": "LATITUDE",
+ },
+};
+
+describe("scenarios > question > native query drill", () => {
+ beforeEach(() => {
+ restore();
+ cy.signInAsNormalUser();
+ cy.intercept("POST", "/api/dataset").as("dataset");
+ cy.intercept("POST", "/api/card").as("saveCard");
+ });
+
+ describe("query builder metadata", () => {
+ it("should allow to save an ad-hoc native query when attempting to drill", () => {
+ visitQuestionAdhoc({
+ display: "table",
+ dataset_query: {
+ database: SAMPLE_DB_ID,
+ type: "native",
+ native: peopleTableQuestionDetails.native,
+ },
+ });
+ cy.wait("@dataset");
+
+ tableInteractive().findByText("October 7, 2023, 1:34 AM").click();
+ popover().within(() => {
+ cy.findByText("Filter by this date").should("not.exist");
+ cy.button("Save").click();
+ });
+ modal().within(() => {
+ cy.findByLabelText("Name").type("SQL");
+ cy.button("Save").click();
+ cy.wait("@saveCard");
+ });
+ modal().findByText("Not now").click();
+
+ tableInteractive().findByText("October 7, 2023, 1:34 AM").click();
+ popover().within(() => {
+ cy.findByText("Filter by this date").should("be.visible");
+ cy.findByText("On").click();
+ });
+ cy.wait("@dataset");
+ assertQueryBuilderRowCount(1);
+ });
+ });
+
+ describe("query builder drills", () => {
+ it("column-extract drill", () => {
+ cy.log("from column header");
+ createNativeQuestion(ordersTableQuestionDetails, {
+ visitQuestion: true,
+ wrapId: true,
+ });
+ tableHeaderClick("CREATED_AT");
+ popover().within(() => {
+ cy.findByText("Extract day, month…").click();
+ cy.findByText("Quarter of year").click();
+ cy.wait("@dataset");
+ });
+ assertTableData({
+ columns: ["ID", "CREATED_AT", "QUANTITY", "Quarter of year"],
+ firstRows: [
+ ["1", "February 11, 2025, 9:40 PM", "2", "Q1"],
+ ["2", "May 15, 2024, 8:04 AM", "3", "Q2"],
+ ],
+ });
+
+ cy.log("from plus button");
+ visitQuestion("@questionId");
+ tableInteractive().button("Add column").click();
+ popover().within(() => {
+ cy.findByText("Extract part of column").click();
+ cy.findByText("CREATED_AT").click();
+ cy.findByText("Quarter of year").click();
+ cy.wait("@dataset");
+ });
+ assertTableData({
+ columns: ["ID", "CREATED_AT", "QUANTITY", "Quarter of year"],
+ firstRows: [
+ ["1", "February 11, 2025, 9:40 PM", "2", "Q1"],
+ ["2", "May 15, 2024, 8:04 AM", "3", "Q2"],
+ ],
+ });
+ });
+
+ it("combine-columns drill", () => {
+ cy.log("from column header");
+ createNativeQuestion(peopleTableQuestionDetails, {
+ visitQuestion: true,
+ wrapId: true,
+ });
+ tableHeaderClick("EMAIL");
+ popover().findByText("Combine columns").click();
+ popover().button("Done").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["ID", "EMAIL", "CREATED_AT", "Combined EMAIL, ID"],
+ firstRows: [
+ [
+ "1",
+ "borer-hudson@yahoo.com",
+ "October 7, 2023, 1:34 AM",
+ "borer-hudson@yahoo.com 1",
+ ],
+ ],
+ });
+
+ cy.log("from plus button");
+ visitQuestion("@questionId");
+ tableInteractive().button("Add column").click();
+ popover().findByText("Combine columns").click();
+ popover().button("Done").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["ID", "EMAIL", "CREATED_AT", "Combined ID, EMAIL"],
+ firstRows: [
+ [
+ "1",
+ "borer-hudson@yahoo.com",
+ "October 7, 2023, 1:34 AM",
+ "1 borer-hudson@yahoo.com",
+ ],
+ ],
+ });
+ });
+
+ it("column-filter drill", () => {
+ createNativeQuestion(ordersTableQuestionDetails, { visitQuestion: true });
+ assertQueryBuilderRowCount(10);
+ tableHeaderClick("QUANTITY");
+ popover().findByText("Filter by this column").click();
+ popover().within(() => {
+ cy.findByPlaceholderText("Min").type("2");
+ cy.findByPlaceholderText("Max").type("5");
+ cy.button("Add filter").click();
+ cy.wait("@dataset");
+ });
+ assertQueryBuilderRowCount(8);
+ });
+
+ it("distribution drill", () => {
+ createNativeQuestion(ordersTableQuestionDetails, { visitQuestion: true });
+ tableHeaderClick("QUANTITY");
+ popover().findByText("Distribution").click();
+ cy.wait("@dataset");
+ echartsContainer().within(() => {
+ cy.findByText("Count").should("be.visible");
+ cy.findByText("QUANTITY").should("be.visible");
+ });
+ assertQueryBuilderRowCount(5);
+ });
+
+ it("quick-filter drill", () => {
+ createNativeQuestion(timeseriesLineQuestionDetails, {
+ visitQuestion: true,
+ });
+ assertQueryBuilderRowCount(10);
+ cartesianChartCircle().eq(0).click();
+ popover().within(() => {
+ cy.findByText("Filter by this value").should("be.visible");
+ cy.findByText("=").click();
+ cy.wait("@dataset");
+ });
+ assertQueryBuilderRowCount(3);
+ });
+
+ it("sort drill", () => {
+ cy.log("ascending");
+ createNativeQuestion(ordersTableQuestionDetails, {
+ visitQuestion: true,
+ wrapId: true,
+ });
+ tableHeaderClick("QUANTITY");
+ popover().icon("arrow_up").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["ID", "CREATED_AT", "QUANTITY"],
+ firstRows: [["1", "February 11, 2025, 9:40 PM", "2"]],
+ });
+
+ cy.log("descending");
+ visitQuestion("@questionId");
+ tableHeaderClick("QUANTITY");
+ popover().icon("arrow_down").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["ID", "CREATED_AT", "QUANTITY"],
+ firstRows: [["8", "June 17, 2025, 2:37 AM", "7"]],
+ });
+ });
+
+ it("summarize drill", () => {
+ cy.log("distinct values");
+ createNativeQuestion(ordersTableQuestionDetails, {
+ visitQuestion: true,
+ wrapId: true,
+ });
+ tableHeaderClick("QUANTITY");
+ popover().findByText("Distinct values").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["Distinct values of QUANTITY"],
+ firstRows: [["5"]],
+ });
+
+ cy.log("sum");
+ visitQuestion("@questionId");
+ tableHeaderClick("QUANTITY");
+ popover().findByText("Sum").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["Sum of QUANTITY"],
+ firstRows: [["38"]],
+ });
+
+ cy.log("avg");
+ visitQuestion("@questionId");
+ tableHeaderClick("QUANTITY");
+ popover().findByText("Avg").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["Average of QUANTITY"],
+ firstRows: [["3.8"]],
+ });
+ });
+
+ it("summarize-column-by-time drill", () => {
+ createNativeQuestion(ordersTableQuestionDetails, { visitQuestion: true });
+ tableHeaderClick("QUANTITY");
+ popover().findByText("Sum over time").click();
+ cy.wait("@dataset");
+ assertTableData({
+ columns: ["CREATED_AT: Month", "Sum of QUANTITY"],
+ firstRows: [
+ ["May 2023", "3"],
+ ["May 2024", "3"],
+ ["September 2024", "5"],
+ ],
+ });
+ });
+
+ it("unsupported drills", () => {
+ cy.log("aggregated cell click");
+ createNativeQuestion(timeseriesLineQuestionDetails, {
+ visitQuestion: true,
+ });
+ assertQueryBuilderRowCount(10);
+ cartesianChartCircle().eq(0).click();
+ popover().within(() => {
+ cy.findByText(/See these/).should("not.exist");
+ cy.findByText(/Breakout by/).should("not.exist");
+ cy.findByText(/Automatic insights/).should("not.exist");
+ });
+
+ cy.log("legend item click");
+ createNativeQuestion(timeseriesWithCategoryLineQuestionDetails, {
+ visitQuestion: true,
+ });
+ cy.findByTestId("visualization-root").findByText("Gadget").click();
+ cy.findByRole("tooltip").should("not.exist");
+ });
+ });
+
+ describe("query builder brush filters", () => {
+ it("timeseries filter", () => {
+ createNativeQuestion(timeseriesLineQuestionDetails, {
+ visitQuestion: true,
+ });
+ assertQueryBuilderRowCount(10);
+ applyBrushFilter({ left: 200, right: 800 });
+ cy.wait("@dataset");
+ assertQueryBuilderRowCount(4);
+ });
+
+ it("numeric filter", () => {
+ createNativeQuestion(numericLineQuestionDetails, {
+ visitQuestion: true,
+ });
+ assertQueryBuilderRowCount(10);
+ applyBrushFilter({ left: 200, right: 800 });
+ cy.wait("@dataset");
+ assertQueryBuilderRowCount(5);
+ });
+
+ it("coordinates filter", () => {
+ cy.log("pin map");
+ createNativeQuestion(pinMapQuestionDetails, { visitQuestion: true });
+ cy.findByTestId("visualization-root").realHover();
+ cy.findByTestId("visualization-root").within(() => {
+ cy.findByText("Save as default view").should("be.visible");
+ cy.findByText("Draw box to filter").click();
+ });
+ applyBoxFilter({
+ top: 100,
+ left: 100,
+ right: 500,
+ bottom: 500,
+ });
+ cy.wait("@dataset");
+ assertQueryBuilderRowCount(1);
+
+ cy.log("grid map");
+ createNativeQuestion(gridMapQuestionDetails, { visitQuestion: true });
+ cy.findByTestId("visualization-root").realHover();
+ cy.findByTestId("visualization-root").within(() => {
+ cy.findByText("Save as default view").should("be.visible");
+ cy.findByText("Draw box to filter").should("not.exist");
+ });
+ });
+ });
+
+ describe("dashboard drills", () => {
+ it("quick-filter drill", () => {
+ cy.log("cell click");
+ createNativeQuestionAndDashboard({
+ questionDetails: ordersTableQuestionDetails,
+ }).then(({ body }) => visitDashboard(body.dashboard_id));
+ getDashboardCard().findByText("May 15, 2024, 8:04 AM").click();
+ popover().within(() => {
+ cy.findByText("Filter by this date").should("be.visible");
+ cy.findByText("On").click();
+ cy.wait("@dataset");
+ });
+ assertQueryBuilderRowCount(1);
+
+ cy.log("aggregated cell click");
+ createNativeQuestionAndDashboard({
+ questionDetails: timeseriesLineQuestionDetails,
+ }).then(({ body }) => visitDashboard(body.dashboard_id));
+ getDashboardCard().within(() => cartesianChartCircle().eq(0).click());
+ popover().within(() => {
+ cy.findByText("Filter by this value").should("be.visible");
+ cy.findByText("=").click();
+ cy.wait("@dataset");
+ });
+ assertQueryBuilderRowCount(3);
+ });
+ });
+
+ describe("dashboard brush filters", () => {
+ it("timeseries filter", () => {
+ createNativeQuestionAndDashboard({
+ questionDetails: timeseriesLineQuestionDetails,
+ }).then(({ body }) => visitDashboard(body.dashboard_id));
+ getDashboardCard().within(() =>
+ applyBrushFilter({ left: 100, right: 300 }),
+ );
+ cy.wait("@dataset");
+ assertQueryBuilderRowCount(4);
+ });
+
+ it("numeric filter", () => {
+ createNativeQuestionAndDashboard({
+ questionDetails: numericLineQuestionDetails,
+ }).then(({ body }) => visitDashboard(body.dashboard_id));
+ getDashboardCard().within(() =>
+ applyBrushFilter({ left: 100, right: 300 }),
+ );
+ cy.wait("@dataset");
+ assertQueryBuilderRowCount(5);
+ });
+ });
+});
+
+function applyBrushFilter({ left, right }: { left: number; right: number }) {
+ cy.wait(100); // wait to avoid grabbing the svg before the chart redraws
+
+ echartsContainer()
+ .trigger("mousedown", left, 100)
+ .trigger("mousemove", left, 100)
+ .trigger("mouseup", right, 100);
+}
+
+function applyBoxFilter({
+ top,
+ left,
+ right,
+ bottom,
+}: {
+ top: number;
+ left: number;
+ right: number;
+ bottom: number;
+}) {
+ cy.wait(100); // wait to avoid grabbing the svg before the chart redraws
+
+ cy.findByTestId("visualization-root")
+ .realMouseDown({ x: left, y: top })
+ .realMouseMove(right - left, bottom - top)
+ .realMouseUp({ x: right, y: bottom });
+}
diff --git a/e2e/test/scenarios/sharing/public-resource-downloads.cy.spec.ts b/e2e/test/scenarios/sharing/public-resource-downloads.cy.spec.ts
index 47701c1136445c7cdfa289320533afecd227b85a..c20823db1a2082eb6b9a7f358e8f6c89da8ea511 100644
--- a/e2e/test/scenarios/sharing/public-resource-downloads.cy.spec.ts
+++ b/e2e/test/scenarios/sharing/public-resource-downloads.cy.spec.ts
@@ -45,7 +45,7 @@ describeWithSnowplowEE(
popover()
.findByTestId("public-link-input")
- .should("not.have.value", "")
+ .should("contain.value", "/public/")
.invoke("val")
.then(url => {
publicLink = url as string;
@@ -126,6 +126,7 @@ describeWithSnowplowEE(
popover()
.findByTestId("public-link-input")
+ .should("contain.value", "/public/")
.invoke("val")
.then(url => {
publicLink = url as string;
diff --git a/e2e/test/scenarios/visualizations-charts/line_chart.cy.spec.js b/e2e/test/scenarios/visualizations-charts/line_chart.cy.spec.js
index 4cd81e921cd8a77d8a8911515d1aebced0c8aaf1..e9736df398f5375e9d3a7bf743d50310c37f147f 100644
--- a/e2e/test/scenarios/visualizations-charts/line_chart.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-charts/line_chart.cy.spec.js
@@ -807,55 +807,6 @@ describe("scenarios > visualizations > line chart", () => {
cy.findByText(X_AXIS_VALUE);
});
});
-
- it(
- "should apply brush filters to the native query series selecting area range when axis is a number",
- { viewportHeight: 800, viewportWidth: 1280 },
- () => {
- cy.createNativeQuestion(
- {
- native: {
- query: `
- SELECT
- ORDERS.QUANTITY AS "Quantity",
- COUNT(*) AS "count"
- FROM
- ORDERS
- GROUP BY
- ORDERS.QUANTITY
- `,
- },
- display: "line",
- visualization_settings: {
- "graph.metrics": ["count"],
- "graph.dimensions": ["Quantity"],
- },
- },
- { visitQuestion: true },
- );
-
- queryBuilderMain().within(() => {
- echartsContainer().findByText("Quantity").should("exist");
- });
- cy.wait(100); // wait to avoid grabbing the svg before the chart redraws
-
- cy.findByTestId("query-visualization-root")
- .trigger("mousedown", 180, 200)
- .trigger("mousemove", 180, 200)
- .trigger("mouseup", 220, 200);
-
- cy.findByTestId("filters-visibility-control").click();
- cy.findByTestId("filter-pill").should(
- "contain.text",
- "Quantity is between",
- );
- const X_AXIS_VALUE = 8;
- echartsContainer().within(() => {
- cy.get("text").contains("Quantity").should("be.visible");
- cy.findByText(X_AXIS_VALUE);
- });
- },
- );
});
function showTooltipForFirstCircleInSeries(seriesColor) {
diff --git a/src/metabase/query_analysis.clj b/src/metabase/query_analysis.clj
index e62fea3268f78309e19c3fbb075729841605142a..d09e578f012d5ef7cc434a747036624712203404 100644
--- a/src/metabase/query_analysis.clj
+++ b/src/metabase/query_analysis.clj
@@ -144,9 +144,7 @@
success? (some? references)]
(if-not success?
- (do
- (log/errorf "Failed to analyze query for card %s" card-id)
- (t2/update! :model/QueryAnalysis analysis-id {:status "failed"}))
+ (t2/update! :model/QueryAnalysis analysis-id {:status "failed"})
(do
(t2/insert! :model/QueryField (map field->row (:fields references)))
(t2/insert! :model/QueryTable (map table->row (:tables references)))
@@ -225,7 +223,7 @@
card-id (:id card)]
(cond
(not card) (log/warnf "Card not found: %s" card-id)
- (:archived card) (log/warnf "Skipping archived card: %s" card-id)
+ (:archived card) (log/debugf "Skipping archived card: %s" card-id)
:else (do
(log/debugf "Performing query analysis for card %s" card-id)
(update-query-analysis-for-card! card)))))