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
Fix unit test violations (#75919)
Fraser8460bb54703b
diff --git a/.github/workflows/loki-stress-test-flake-fix.yml b/.github/workflows/loki-stress-test-flake-fix.ymlindex b6afa282a3a..dde2227a571 100644--- a/.github/workflows/loki-stress-test-flake-fix.yml+++ b/.github/workflows/loki-stress-test-flake-fix.yml@@ -13,10 +13,10 @@ on:type: stringrequired: trueburn_in:- description: "Number of times to run the test (e.g. 50)"+ description: "Number of times to run the test (e.g. 10)"type: stringrequired: true- default: "50"+ default: "10"jobs:detect-changed-stories:@@ -93,7 +93,7 @@ jobs:env:BRANCH_NAME: ${{ github.head_ref || github.ref_name }}STORY_FILES: ${{ needs.detect-changed-stories.outputs.story_files }}- BURN_IN: ${{ inputs.burn_in || 50 }}+ BURN_IN: ${{ inputs.burn_in || 10 }}EVENT_NAME: ${{ github.event_name }}PR_NUMBER: ${{ github.event.pull_request.number }}PR_ACTOR: ${{ github.event.pull_request.user.login }}@@ -154,7 +154,7 @@ jobs:- name: Stress-test Lokirun: |- BURN_IN=${{ inputs.burn_in || '50' }}+ BURN_IN=${{ inputs.burn_in || '10' }}STORY_FILES='${{ needs.detect-changed-stories.outputs.story_files }}'echo "Story files: $STORY_FILES"diff --git a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.unit.spec.tsxindex 9d645966dbc..abdf29ace9b 100644--- a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.unit.spec.tsx+++ b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.unit.spec.tsx@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";import { setupSearchEndpoints } from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import { createMockModelResult } from "metabase/browse/models/test-utils";import type { SearchResult } from "metabase-types/api";+import { createMockModelResult } from "metabase-types/api/mocks";import { SimpleDataPicker } from "./SimpleDataPicker";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsxindex 29577b66208..838c34c9dd5 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/hooks/use-field-distinct-values.unit.spec.tsx@@ -1,11 +1,11 @@import { renderHook } from "@testing-library/react";+import { mainReducers as reducers } from "__support__/entities-store";import {setupCardDataset,setupFieldEndpoints,} from "__support__/server-mocks";import { waitFor } from "__support__/ui";-import { mainReducers as reducers } from "metabase/reducers-main";import { MetabaseReduxProvider } from "metabase/redux";import { createMockState } from "metabase/redux/store/mocks";import { getStore } from "metabase/store";diff --git a/eslint.config.mjs b/eslint.config.mjsindex e4d5df0805e..53b8ae9be19 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -290,12 +290,7 @@ const configs = [},settings: {"boundaries/elements": boundaryElements,- "boundaries/ignore": [- "**/*.unit.spec.*",- "**/e2e/**",- "*.stories.*",- "test/**",- ],+ "boundaries/ignore": ["**/e2e/**", "test/**"],},rules: {"boundaries/element-types": [diff --git a/eslint.config.module-boundaries.mjs b/eslint.config.module-boundaries.mjsindex 689cf5d691c..aca69668285 100644--- a/eslint.config.module-boundaries.mjs+++ b/eslint.config.module-boundaries.mjs@@ -11,7 +11,10 @@ import { globalIgnores, defineConfig } from "eslint/config";const __dirname = path.dirname(fileURLToPath(import.meta.url));-import { elements as boundaryElements, rules as boundaryRules } from "./frontend/lint/module-boundaries.mjs";+import {+ elements as boundaryElements,+ rules as boundaryRules,+} from "./frontend/lint/module-boundaries.mjs";// dummy plugins to keep eslint from complaining about missing plugins and settingsconst alwaysPassingRule = {@@ -29,30 +32,20 @@ const alwaysPassingRule = {},};+// Resolve any rule name to the always-passing stub, so eslint-disable+// directives don't error with "Definition for rule ... was not found".const alwaysPassingPlugin = {- rules: {- "no-module-declaration": alwaysPassingRule,- "no-default-export": alwaysPassingRule,- "no-color-literals": alwaysPassingRule,- order: alwaysPassingRule,- "rules-of-hooks": alwaysPassingRule,- "no-unconditional-metabase-links-render": alwaysPassingRule,- "no-literal-string": alwaysPassingRule,- "no-literal-metabase-strings": alwaysPassingRule,- "no-require-imports": alwaysPassingRule,- "no-external-references-for-sdk-package-code": alwaysPassingRule,- "exhaustive-deps": alwaysPassingRule,- "no-unused-vars": alwaysPassingRule,- "no-unused-expressions": alwaysPassingRule,- "ban-ts-comment": alwaysPassingRule,- "no-empty-object-type": alwaysPassingRule,- "no-commonjs": alwaysPassingRule,- "consistent-type-imports": alwaysPassingRule,- },+ rules: new Proxy(+ {},+ {+ get: () => alwaysPassingRule,+ has: () => true,+ },+ ),};export default defineConfig([- globalIgnores(["**/*.unit.spec.*", "**/e2e/**", "*.stories.*", "test/**"]),+ globalIgnores(["**/e2e/**", "test/**"]),{linterOptions: {reportUnusedDisableDirectives: "off",@@ -76,17 +69,15 @@ export default defineConfig([i18next: alwaysPassingPlugin,"react-hooks": alwaysPassingPlugin,"@typescript-eslint": alwaysPassingPlugin,+ "testing-library": alwaysPassingPlugin,+ jest: alwaysPassingPlugin,+ "jest-dom": alwaysPassingPlugin,boundaries,react,},settings: {"boundaries/elements": boundaryElements,- "boundaries/ignore": [- "**/*.unit.spec.*",- "**/e2e/**",- "*.stories.*",- "test/**",- ],+ "boundaries/ignore": ["**/e2e/**", "test/**"],"import-x/resolver": {node: true,webpack: {diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex a23d4d8a393..f08131eae60 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -154,10 +154,14 @@ const elements = ["frontend/src/metabase/App.styled.tsx","frontend/src/metabase/AppKBarProvider.tsx","frontend/src/metabase/app/selectors.ts",+ "frontend/src/metabase/app/selectors.unit.spec.ts","frontend/src/metabase/reducers-main.ts",+ "frontend/src/metabase/reducers-common.ts",+ "frontend/src/metabase/reducers-public.ts","frontend/src/metabase/routes.tsx","frontend/src/metabase/routes-embed.tsx","frontend/src/metabase/route-guards.tsx",+ "frontend/src/metabase/route-guards.unit.spec.tsx","frontend/src/metabase/routes-public.tsx","frontend/src/metabase/AppThemeProvider.tsx","frontend/src/metabase/AppColorSchemeProvider.tsx",diff --git a/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.unit.spec.tsxindex 20498346d95..d1c4a8fd1a1 100644--- a/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.unit.spec.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/InteractiveQuestion/InteractiveQuestion.unit.spec.tsx@@ -44,12 +44,12 @@ import { renderWithSDKProviders } from "embedding-sdk-bundle/test/__support__/uiimport { createMockSdkConfig } from "embedding-sdk-bundle/test/mocks/config";import { setupSdkState } from "embedding-sdk-bundle/test/server-mocks/sdk-init";import type { SdkQuestionId } from "embedding-sdk-bundle/types/question";-import { createMockModelResult } from "metabase/browse/models/test-utils";import type { EmbeddingDataPicker } from "metabase/redux/store/embedding-data-picker";import {createMockCard,createMockCardQueryMetadata,createMockCollection,+ createMockModelResult,createMockTokenFeatures,createMockUser,} from "metabase-types/api/mocks";diff --git a/frontend/src/metabase-lib/v1/Question.unit.spec.js b/frontend/src/metabase-lib/v1/Question.unit.spec.jsindex c04dbd4a448..315b00441d3 100644--- a/frontend/src/metabase-lib/v1/Question.unit.spec.js+++ b/frontend/src/metabase-lib/v1/Question.unit.spec.js@@ -1,6 +1,4 @@import { createMockMetadata } from "__support__/metadata";-import { convertParametersToMbql } from "metabase/querying/parameters/utils/query";-import * as Lib from "metabase-lib";import {createMockColumn,createMockDatasetData,@@ -745,46 +743,6 @@ describe("Question", () => {});});- describe("convertParametersToMbql", () => {- it("should do nothing to a native question", () => {- expect(- convertParametersToMbql(native_orders_count_question, {- isComposed: false,- }),- ).toBe(native_orders_count_question);- });-- it("should convert a question with parameters into a new question with filters", () => {- const parameters = [- {- type: "string/starts-with",- name: "foo",- id: "foo_id",- target: ["dimension", ["field", PRODUCTS.CATEGORY, null]],- },- {- type: "string/=",- name: "bar",- id: "bar_id",- target: ["dimension", ["field", PRODUCTS.CATEGORY, null]],- },- ];-- const question = base_question- .setParameters(parameters)- .setParameterValues({- foo_id: "abc",- });-- const questionWithFilters = convertParametersToMbql(question, {- isComposed: false,- });-- expect(Lib.stageCount(questionWithFilters.query())).toBe(1);- expect(Lib.filters(questionWithFilters.query())).toHaveLength(1);- });- });-describe("Question.prototype.supportsImplicitActions", () => {it("should allow to create implicit actions for a raw model", () => {const question = new Question(orders_raw_card, metadata);diff --git a/frontend/src/metabase-lib/v1/metric/test-helpers.ts b/frontend/src/metabase-lib/v1/metric/test-helpers.tsnew file mode 100644index 00000000000..2b059977c64--- /dev/null+++ b/frontend/src/metabase-lib/v1/metric/test-helpers.ts@@ -0,0 +1,24 @@+import * as LibMetric from "metabase-lib/metric";+import Metadata from "metabase-lib/v1/metadata/Metadata";+import type { NormalizedMetric } from "metabase-types/api";++export function createMetricMetadata(metrics: NormalizedMetric[]): Metadata {+ const metadata = new Metadata();+ for (const metric of metrics) {+ const { collection: _normalizedCollectionId, ...rest } = metric;+ metadata.metrics[metric.id] = { ...rest, collection: null };+ }+ return metadata;+}++export function setupDefinition(+ metadata: Metadata,+ metricId: number,+): LibMetric.MetricDefinition {+ const provider = LibMetric.metadataProvider(metadata);+ const metricMeta = LibMetric.metricMetadata(provider, metricId);+ if (!metricMeta) {+ throw new Error(`Metric ${metricId} not found`);+ }+ return LibMetric.fromMetricMetadata(provider, metricMeta);+}diff --git a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsxindex 4e6f1a8353f..a548e8fc1ab 100644--- a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx+++ b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx@@ -2,13 +2,10 @@ import type { Store } from "@reduxjs/toolkit";import type { StoryFn } from "@storybook/react";import { HttpResponse, http } from "msw";import { useState } from "react";-import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getCommonStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";-import { Api } from "metabase/api";-import { commonReducers } from "metabase/reducers-common";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";@@ -32,16 +29,7 @@ const storeInitialState = createMockState({entities: createMockEntitiesState({}),});-const publicReducerNames = Object.keys(commonReducers);-const initialState = _.pick(storeInitialState, ...publicReducerNames) as State;--const storeMiddleware = [Api.middleware];--const store = getStore(- commonReducers,- initialState,- storeMiddleware,-) as unknown as Store<State>;+const store = getCommonStore(storeInitialState) as unknown as Store<State>;const ReduxDecorator = (Story: StoryFn) => {return (diff --git a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsxindex 3d33f370cfb..0d9c2c2f521 100644--- a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx@@ -23,7 +23,6 @@ import {} from "__support__/ui";import { ROOT_COLLECTION } from "metabase/collections/constants";import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";-import * as qbSelectors from "metabase/query_builder/selectors";import { QUESTION_NAME_MAX_LENGTH } from "metabase/questions/constants";import {createMockQueryBuilderState,@@ -811,11 +810,6 @@ describe("SaveQuestionModal", () => {await userEvent.click(screen.getByRole("button", { name: "Save" }));- // simulate slow response and further re-render of the modal- jest- .spyOn(qbSelectors, "getIsSavedQuestionChanged")- .mockReturnValue(false);-rerender();// verify that modal still has contentdiff --git a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsxindex a625f081b83..3ca804b18d8 100644--- a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx+++ b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx@@ -2,14 +2,11 @@ import type { Store } from "@reduxjs/toolkit";import { useArgs } from "@storybook/preview-api";import type { StoryFn } from "@storybook/react";import { t } from "ttag";-import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";-import { Api } from "metabase/api";import { LocaleProvider } from "metabase/embedding/LocaleProvider";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";@@ -21,17 +18,7 @@ const storeInitialState = createMockState({settings: mockSettings(),entities: createMockEntitiesState({}),});-const publicReducerNames = Object.keys(publicReducers);-const initialState = _.pick(storeInitialState, ...publicReducerNames) as State;-const reducers = publicReducers;--const storeMiddleware = [Api.middleware];--const store = getStore(- reducers,- initialState,- storeMiddleware,-) as unknown as Store<State>;+const store = getPublicStore(storeInitialState) as unknown as Store<State>;const ReduxDecorator = (Story: StoryFn) => {return (diff --git a/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx b/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsxindex 32217479cd3..f0dbb25f7f7 100644--- a/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx+++ b/frontend/src/metabase/common/hooks/use-user-key-value.unit.spec.tsx@@ -1,13 +1,13 @@import { act, renderHook } from "@testing-library/react";import fetchMock from "fetch-mock";+import { mainReducers as reducers } from "__support__/entities-store";import {setupDeleteUserKeyValueEndpoint,setupGetUserKeyValueEndpoint,setupUpdateUserKeyValueEndpoint,} from "__support__/server-mocks/user-key-value";import { waitFor } from "__support__/ui";-import { mainReducers as reducers } from "metabase/reducers-main";import { MetabaseReduxProvider } from "metabase/redux";import { createMockState } from "metabase/redux/store/mocks";import { getStore } from "metabase/store";diff --git a/frontend/src/metabase/dashboard/actions/cards.unit.spec.ts b/frontend/src/metabase/dashboard/actions/cards.unit.spec.tsindex 6a166aa52dd..bc21a15bf60 100644--- a/frontend/src/metabase/dashboard/actions/cards.unit.spec.ts+++ b/frontend/src/metabase/dashboard/actions/cards.unit.spec.ts@@ -2,15 +2,13 @@ import type { Store } from "@reduxjs/toolkit";import fetchMock from "fetch-mock";import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getMainStore } from "__support__/entities-store";import {setupCardQueryEndpoints,setupCardQueryMetadataEndpoint,setupCardsEndpoints,setupDatabasesEndpoints,} from "__support__/server-mocks";-import { Api } from "metabase/api";-import { mainReducers } from "metabase/reducers-main";import type { State, StoreDashcard } from "metabase/redux/store";import {createMockDashboardState,@@ -178,10 +176,8 @@ function setup({dashcards: _.indexBy(dashcards, "id"),});- const store = getStore(- { ...mainReducers, [Api.reducerPath]: Api.reducer },+ const store = getMainStore(createMockState({ dashboard: dashboardState }),- [Api.middleware],) as Store<State>;return { store };diff --git a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.tsindex 881ce02da66..9b7bf07c0c1 100644--- a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts+++ b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts@@ -1,6 +1,5 @@-import { getStore } from "__support__/entities-store";+import { getMainStore } from "__support__/entities-store";import { getParameters } from "metabase/dashboard/selectors";-import { mainReducers } from "metabase/reducers-main";import type { State } from "metabase/redux/store";import {createMockDashboardState,@@ -26,7 +25,7 @@ import {} from "./parameters";function setup(initialState: State) {- return getStore(mainReducers, initialState);+ return getMainStore(initialState);}describe("setParameterType", () => {diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.unit.spec.js b/frontend/src/metabase/dashboard/components/DashboardChartSettings/ChartNestedSettingSeriesMultiple.unit.spec.jssimilarity index 94%rename from frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.unit.spec.jsrename to frontend/src/metabase/dashboard/components/DashboardChartSettings/ChartNestedSettingSeriesMultiple.unit.spec.jsindex 24e76ba190d..29a65b70366 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.unit.spec.js+++ b/frontend/src/metabase/dashboard/components/DashboardChartSettings/ChartNestedSettingSeriesMultiple.unit.spec.js@@ -1,12 +1,15 @@-// these tests use ChartSettings directly, but logic we're testing lives in ChartNestedSettingSeries+// Exercises the multi-series settings UI (ChartNestedSettingSeries)+// It lives here because widget is only shown in dashboard context+// so it can only be rendered through DashboardChartSettings.import userEvent from "@testing-library/user-event";import { renderWithProviders, screen, within } from "__support__/ui";-import { DashboardChartSettings } from "metabase/dashboard/components/DashboardChartSettings";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import registerVisualizations from "metabase/visualizations/register";import { createMockCard } from "metabase-types/api/mocks";+import { DashboardChartSettings } from "./DashboardChartSettings";+registerVisualizations();function getSeries(display, index, changeSeriesName) {diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsxindex db2e346d3d6..f73b6bd85bb 100644--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx@@ -15,16 +15,22 @@ import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import { useDashboardUrlQuery } from "metabase/dashboard/hooks/use-dashboard-url-query";import { getSelectedTabId } from "metabase/dashboard/selectors";import { createTabSlug } from "metabase/dashboard/utils";-import { TEST_CARD } from "metabase/query_builder/containers/test-utils";import { useSelector } from "metabase/redux";import type { DashboardState, State } from "metabase/redux/store";import type { DashboardTab } from "metabase-types/api";+import { createMockCard } from "metabase-types/api/mocks";import { createMockDashboardCard } from "metabase-types/api/mocks/dashboard";import { DashboardTabs } from "./DashboardTabs";import { TEST_DASHBOARD_STATE } from "./test-utils";import { useDashboardTabs } from "./use-dashboard-tabs";+const TEST_CARD = createMockCard({+ id: 1,+ name: "Test card",+ type: "model",+});+function setup({tabs,slug = undefined,diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsxindex c056ec93ce7..484c0b49c8a 100644--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx@@ -1,14 +1,13 @@import type { Meta, StoryFn } from "@storybook/react";import { useCallback, useMemo, useState } from "react";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { BaseCell } from "metabase/data-grid";import { useDataGridInstance } from "metabase/data-grid/hooks/use-data-grid-instance";import type {ColumnOptions,RowIdColumnOptions,} from "metabase/data-grid/types";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {createMockSettingsState,@@ -46,7 +45,7 @@ type Story = StoryFn<typeof DataGrid>;const initialState = createMockState({settings: createMockSettingsState(),});-const store = getStore(publicReducers, initialState, []);+const store = getPublicStore(initialState, []);const sampleData = Array.from({ length: 2000 }, (_, rowIndex) => {return {diff --git a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsxindex ddc27f24286..c98e162b428 100644--- a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx+++ b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx@@ -1,17 +1,14 @@import type { Store } from "@reduxjs/toolkit";import type { StoryFn } from "@storybook/react";import { HttpResponse, http } from "msw";-import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getCommonStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import {ForceDocumentCardRenderDecorator,createWaitForChartsDecorator,} from "__support__/storybook";-import { Api } from "metabase/api";-import { commonReducers } from "metabase/reducers-common";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";@@ -40,16 +37,7 @@ const storeInitialState = createMockState({settings,entities: createMockEntitiesState({}),});-const publicReducerNames = Object.keys(commonReducers);-const initialState = _.pick(storeInitialState, ...publicReducerNames) as State;--const storeMiddleware = [Api.middleware];--const store = getStore(- commonReducers,- initialState,- storeMiddleware,-) as unknown as Store<State>;+const store = getCommonStore(storeInitialState) as unknown as Store<State>;const ReduxDecorator = (Story: StoryFn) => {return (diff --git a/frontend/src/metabase/metrics-viewer/utils/__tests__/test-helpers.ts b/frontend/src/metabase/metrics-viewer/utils/__tests__/test-helpers.tsindex b27d62d58fd..fd751a55635 100644--- a/frontend/src/metabase/metrics-viewer/utils/__tests__/test-helpers.ts+++ b/frontend/src/metabase/metrics-viewer/utils/__tests__/test-helpers.ts@@ -1,8 +1,11 @@import { createMockMetadata } from "__support__/metadata";import * as Lib from "metabase-lib";import * as LibMetric from "metabase-lib/metric";-import Metadata from "metabase-lib/v1/metadata/Metadata";-import type { NormalizedMetric } from "metabase-types/api";+import type Metadata from "metabase-lib/v1/metadata/Metadata";+import {+ createMetricMetadata,+ setupDefinition,+} from "metabase-lib/v1/metric/test-helpers";import { createMockMeasure } from "metabase-types/api/mocks/measure";import {createMockMetricDimension,@@ -109,26 +112,7 @@ export const GEO_DIM_IDX = {DATE_TIME: 5,};-export function createMetricMetadata(metrics: NormalizedMetric[]): Metadata {- const metadata = new Metadata();- for (const metric of metrics) {- const { collection: _normalizedCollectionId, ...rest } = metric;- metadata.metrics[metric.id] = { ...rest, collection: null };- }- return metadata;-}--export function setupDefinition(- metadata: Metadata,- metricId: number,-): LibMetric.MetricDefinition {- const provider = LibMetric.metadataProvider(metadata);- const metricMeta = LibMetric.metricMetadata(provider, metricId);- if (!metricMeta) {- throw new Error(`Metric ${metricId} not found`);- }- return LibMetric.fromMetricMetadata(provider, metricMeta);-}+export { createMetricMetadata, setupDefinition };export function setupDefinitionWithBreakout(metadata: Metadata,diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.unit.spec.ts b/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.unit.spec.tsindex 9ef69eacfc0..a5a59d58a60 100644--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.unit.spec.ts+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.unit.spec.ts@@ -1,9 +1,11 @@import {createMetricMetadata,+ setupDefinition,+} from "metabase-lib/v1/metric/test-helpers";+import {createMockMetricDimension,createMockNormalizedMetric,- setupDefinition,-} from "metabase/metrics-viewer/utils/__tests__/test-helpers";+} from "metabase-types/api/mocks/metric";import { getDefaultDimensions } from "./utils";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsxindex 1d28c185fde..c12f3c7d120 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx@@ -2,12 +2,12 @@ import userEvent from "@testing-library/user-event";import dayjs from "dayjs";import { screen, within } from "__support__/ui";-import { createMockModelResult } from "metabase/browse/models/test-utils";import { ROOT_COLLECTION } from "metabase/collections/constants";import * as Urls from "metabase/urls";import {createMockCard,createMockDashboard,+ createMockModelResult,createMockUser,} from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/palette/components/Palette.stories.tsx b/frontend/src/metabase/palette/components/Palette.stories.tsxindex c663098954a..bb4c6acfe29 100644--- a/frontend/src/metabase/palette/components/Palette.stories.tsx+++ b/frontend/src/metabase/palette/components/Palette.stories.tsx@@ -5,13 +5,10 @@ import type { StoryFn } from "@storybook/react";import { expect, userEvent, within } from "@storybook/test";import { KBarProvider, VisualState, useKBar } from "kbar";import { HttpResponse, http } from "msw";-import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getCommonStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";-import { Api } from "metabase/api";-import { commonReducers } from "metabase/reducers-common";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";@@ -31,11 +28,6 @@ const storeInitialState = createMockState({settings,entities: createMockEntitiesState({}),});-const publicReducerNames = Object.keys(commonReducers);-const initialState = _.pick(storeInitialState, ...publicReducerNames) as State;--const storeMiddleware = [Api.middleware];-// @ts-expect-error: incompatible prop types with registerVisualizationregisterVisualization(SmartScalar);// @ts-expect-error: incompatible prop types with registerVisualization@@ -45,11 +37,7 @@ registerVisualization(LineChart);// @ts-expect-error: incompatible prop types with registerVisualizationregisterVisualization(Table);-const store = getStore(- commonReducers,- initialState,- storeMiddleware,-) as unknown as Store<State>;+const store = getCommonStore(storeInitialState) as unknown as Store<State>;const ReduxDecorator = (Story: StoryFn) => {return (diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsxindex c68c54f9057..e4074697b6a 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-card-filters.stories.tsx@@ -3,16 +3,14 @@ import { userEvent, within } from "@storybook/test";import { HttpResponse, http } from "msw";import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { getNextId } from "__support__/utils";import { NumberColumn, StringColumn } from "__support__/visualizations";-import { Api } from "metabase/api";import {MockDashboardContext,type MockDashboardContextProps,} from "metabase/dashboard/context/mock-context";import { Heading } from "metabase/dashboard/visualizations/Heading";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,@@ -92,7 +90,7 @@ function ReduxDecorator(Story: StoryFn, context: StoryContext) {}),});- const store = getStore(publicReducers, initialState, [Api.middleware]);+ const store = getPublicStore(initialState);return (<MetabaseReduxProvider store={store}><Story />diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsxindex d8b68ef18aa..62734b4f809 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx@@ -3,18 +3,16 @@ import { userEvent, within } from "@storybook/test";import { HttpResponse, http } from "msw";import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { createMockEntitiesState } from "__support__/store";import { createWaitForResizeToStopDecorator } from "__support__/storybook";import { getNextId } from "__support__/utils";import { NumberColumn, StringColumn } from "__support__/visualizations";-import { Api } from "metabase/api";import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants";import {MockDashboardContext,type MockDashboardContextProps,} from "metabase/dashboard/context/mock-context";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,@@ -147,7 +145,7 @@ function ReduxDecorator(Story: StoryFn, context: StoryContext) {}),});- const store = getStore(publicReducers, initialState, [Api.middleware]);+ const store = getPublicStore(initialState);return (<MetabaseReduxProvider store={store}><Story />diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsxindex a9db17c45fe..1e3d6058dc5 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-pdf-export.stories.tsx@@ -4,17 +4,15 @@ import type { StoryContext, StoryFn } from "@storybook/react";import { userEvent, within } from "@storybook/test";import { HttpResponse, http } from "msw";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { createWaitForResizeToStopDecorator } from "__support__/storybook";import { getNextId } from "__support__/utils";-import { Api } from "metabase/api";import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants";import {MockDashboardContext,type MockDashboardContextProps,} from "metabase/dashboard/context/mock-context";import { PublicOrEmbeddedDashboardView } from "metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,@@ -119,7 +117,7 @@ function ReduxDecorator(Story: StoryFn, context: StoryContext) {},}),});- const store = getStore(publicReducers, initialState, [Api.middleware]);+ const store = getPublicStore(initialState);return (<MetabaseReduxProvider store={store}><Story />diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsxindex 1de272d7777..a04ced55127 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx@@ -5,17 +5,15 @@ import { HttpResponse, http } from "msw";import { useEffect, useMemo } from "react";import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { createWaitForResizeToStopDecorator } from "__support__/storybook";import { getNextId } from "__support__/utils";import { NumberColumn, StringColumn } from "__support__/visualizations";-import { Api } from "metabase/api";import { DASHBOARD_DISPLAY_ACTIONS } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants";import {MockDashboardContext,type MockDashboardContextProps,} from "metabase/dashboard/context/mock-context";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {createMockDashboardState,@@ -105,7 +103,7 @@ function ReduxDecorator(Story: StoryFn, context: StoryContext) {},}),});- const store = getStore(publicReducers, initialState, [Api.middleware]);+ const store = getPublicStore(initialState);return (<MetabaseReduxProvider store={store}><Story />diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsxindex 8fe0b9ab9cc..e2c2f4a9cde 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx@@ -5,7 +5,7 @@ import { userEvent, within } from "@storybook/test";import { HttpResponse, http } from "msw";import type { ComponentProps } from "react";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { createMockMetadata } from "__support__/metadata";import { createWaitForResizeToStopDecorator } from "__support__/storybook";import { getNextId } from "__support__/utils";@@ -14,8 +14,6 @@ import {NumberColumn,StringColumn,} from "__support__/visualizations";-import { Api } from "metabase/api";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import {createMockSettingsState,@@ -94,7 +92,7 @@ const initialState = createMockState({}),});-const store = getStore(publicReducers, initialState, [Api.middleware]);+const store = getPublicStore(initialState);const Template: StoryFn<PublicOrEmbeddedQuestionViewProps> = (args) => {return <PublicOrEmbeddedQuestionView {...args} />;diff --git a/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx b/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsxindex 06ec04d374e..0b0b56abb46 100644--- a/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx+++ b/frontend/src/metabase/public/hooks/use-set-embed-font.unit.spec.tsx@@ -2,7 +2,7 @@ import { renderHook } from "@testing-library/react";import type { Location } from "history";import type { PropsWithChildren } from "react";-import { mainReducers } from "metabase/reducers-main";+import { mainReducers } from "__support__/entities-store";import { MetabaseReduxProvider } from "metabase/redux";import type { EmbedState } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsxindex 8599e0f3be0..84c6fe36206 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx@@ -5,7 +5,6 @@ import { setupLastDownloadFormatEndpoints } from "__support__/server-mocks";import { screen, waitForLoaderToBeRemoved, within } from "__support__/ui";import { mockGetBoundingClientRect } from "__support__/utils";import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";-import NewModelOptions from "metabase/models/containers/NewModelOptions";import registerVisualizations from "metabase/visualizations/register";import {@@ -16,7 +15,6 @@ import {TEST_UNSAVED_NATIVE_CARD,TEST_UNSAVED_STRUCTURED_CARD,setup,- startNewNotebookModel,triggerMetadataChange,triggerNativeQueryChange,triggerNotebookQueryChange,@@ -42,22 +40,6 @@ describe("QueryBuilder - beforeunload events", () => {jest.resetAllMocks();});- describe("creating models", () => {- it("shows custom warning modal when leaving via SPA navigation", async () => {- const { mockEventListener } = await setup({- card: null,- initialRoute: "/model/new",- newModelOptionsComponent: NewModelOptions,- });-- await startNewNotebookModel();-- const mockEvent = callMockEvent(mockEventListener, "beforeunload");- expect(mockEvent.preventDefault).toHaveBeenCalled();- expect(mockEvent.returnValue).toBe(BEFORE_UNLOAD_UNSAVED_MESSAGE);- });- });-describe("editing models", () => {describe("editing queries", () => {it("should trigger beforeunload event when leaving edited query", async () => {diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsxindex 7a3da311cc8..1c334c8a1ae 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx@@ -2,9 +2,6 @@ import userEvent from "@testing-library/user-event";import { setupJestCanvasMock } from "jest-canvas-mock";import {- setupCardCreateEndpoint,- setupCardEndpoints,- setupCardQueryEndpoints,setupCardQueryMetadataEndpoint,setupCardsEndpoints,} from "__support__/server-mocks";@@ -16,13 +13,8 @@ import {within,} from "__support__/ui";import { mockGetBoundingClientRect } from "__support__/utils";-import { serializeCardForUrl } from "metabase/common/utils/card";-import NewModelOptions from "metabase/models/containers/NewModelOptions";import registerVisualizations from "metabase/visualizations/register";-import {- createMockCardQueryMetadata,- createMockDataset,-} from "metabase-types/api/mocks";+import { createMockCardQueryMetadata } from "metabase-types/api/mocks";import {TEST_DB,@@ -31,10 +23,8 @@ import {TEST_MODEL_DATASET,TEST_NATIVE_CARD,TEST_STRUCTURED_CARD,- TEST_UNSAVED_NATIVE_CARD,revertNotebookQueryChange,setup,- startNewNotebookModel,triggerMetadataChange,triggerNativeQueryChange,triggerNotebookQueryChange,@@ -63,90 +53,6 @@ describe("QueryBuilder - unsaved changes warning", () => {setupJestCanvasMock();});- describe("creating models", () => {- it("shows custom warning modal when leaving via SPA navigation", async () => {- const { history } = await setup({- card: null,- initialRoute: "/model/new",- newModelOptionsComponent: NewModelOptions,- });-- await startNewNotebookModel();-- act(() => {- history.push("/redirect");- });-- expect(screen.getByTestId("leave-confirmation")).toBeInTheDocument();- });-- it("shows custom warning modal when leaving via Cancel button", async () => {- await setup({- card: null,- initialRoute: "/model/new",- newModelOptionsComponent: NewModelOptions,- });-- await startNewNotebookModel();-- await userEvent.click(screen.getByRole("button", { name: "Cancel" }));-- expect(screen.getByTestId("leave-confirmation")).toBeInTheDocument();- });-- it("does not show custom warning modal when saving new model", async () => {- await setup({- card: null,- initialRoute: "/model/new",- newModelOptionsComponent: NewModelOptions,- });- setupCardCreateEndpoint();- setupCardEndpoints(TEST_NATIVE_CARD);- setupCardQueryEndpoints(TEST_NATIVE_CARD, createMockDataset());- setupCardQueryMetadataEndpoint(- TEST_NATIVE_CARD,- createMockCardQueryMetadata({- databases: [TEST_DB],- }),- );-- await startNewNotebookModel();- await waitForSaveToBeEnabled();-- await userEvent.click(screen.getByRole("button", { name: "Save" }));- await userEvent.click(- within(screen.getByTestId("save-question-modal")).getByText("Save"),- );-- await waitFor(() => {- expect(- screen.queryByTestId("save-question-modal"),- ).not.toBeInTheDocument();- });-- expect(- screen.queryByTestId("leave-confirmation"),- ).not.toBeInTheDocument();- });-- it("shows custom warning modal when user tries to leave an ad-hoc native query", async () => {- const { history } = await setup({- card: TEST_UNSAVED_NATIVE_CARD,- initialRoute: `/question#${serializeCardForUrl(- TEST_UNSAVED_NATIVE_CARD,- )}`,- });-- await triggerNativeQueryChange();-- act(() => {- history.push("/redirect");- });-- expect(screen.getByTestId("leave-confirmation")).toBeInTheDocument();- });- });-describe("editing models", () => {describe("editing as notebook question", () => {it("does not show custom warning modal after editing model-based question via notebook editor and saving it", async () => {diff --git a/frontend/src/metabase/query_builder/containers/test-utils.tsx b/frontend/src/metabase/query_builder/containers/test-utils.tsxindex 9478d9063ef..560bb550520 100644--- a/frontend/src/metabase/query_builder/containers/test-utils.tsx+++ b/frontend/src/metabase/query_builder/containers/test-utils.tsx@@ -1,7 +1,7 @@/* eslint-disable i18next/no-literal-string */import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import type { ComponentPropsWithoutRef, ComponentType } from "react";+import type { ComponentPropsWithoutRef } from "react";import { IndexRoute, Route } from "react-router";import {@@ -218,12 +218,6 @@ const TestQueryBuilder = (const TestHome = () => <NewItemMenu trigger={<button>New</button>} />;-// The real /model/new page (NewModelOptions) lives in the `models` feature.-// Feature modules can't import each other, so tests that need it inject it via-// `newModelOptionsComponent` (spec files are exempt from boundary rules); other-// tests never hit this route and get this stub.-const TestNewModelOptions = () => <div />;-const TestRedirect = () => <div />;const isSavedCard = (card: Card | UnsavedCard | null): card is Card => {@@ -234,9 +228,6 @@ interface SetupOpts {card: Card | UnsavedCard | null;dataset?: Dataset;initialRoute?: string;- // Loosely typed to match react-router's `component` prop: the real- // NewModelOptions receives router-injected props (location) the stub omits.- newModelOptionsComponent?: ComponentType<any>;timelines?: Timeline[];// Delay (ms) for the /api/timeline response, used to control its resolution// order relative to the question/bookmarks load.@@ -253,7 +244,6 @@ export const setup = async ({? `/${card.id}`: `#${serializeCardForUrl(card)}`}`,- newModelOptionsComponent = TestNewModelOptions,timelines = [],timelinesDelay,}: SetupOpts) => {@@ -299,7 +289,6 @@ export const setup = async ({<Route><Route path="/" component={TestHome} /><Route path="/model">- <Route path="new" component={newModelOptionsComponent} /><Route path="query" component={TestQueryBuilder} /><Route path="columns" component={TestQueryBuilder} /><Route path="metadata" component={TestQueryBuilder} />@@ -344,18 +333,6 @@ export const setup = async ({};};-export const startNewNotebookModel = async () => {- await userEvent.click(screen.getByText("Use the notebook editor"));- await waitForLoaderToBeRemoved();-- const modal = await screen.findByTestId("mini-picker");- await waitForLoaderToBeRemoved();- await userEvent.click(await within(modal).findByText("Sample Database"));- await userEvent.click(await within(modal).findByText("Orders"));-- expect(screen.getByRole("button", { name: "Get Answer" })).toBeEnabled();-};-export const triggerNativeQueryChange = async () => {await waitForNativeQueryEditorReady();diff --git a/frontend/src/metabase/query_builder/selectors.unit.spec.ts b/frontend/src/metabase/query_builder/selectors.unit.spec.tsindex bec260174fd..179c2808d4f 100644--- a/frontend/src/metabase/query_builder/selectors.unit.spec.ts+++ b/frontend/src/metabase/query_builder/selectors.unit.spec.ts@@ -8,6 +8,7 @@ import {getNativeEditorSelectedText,getQuestion,getQuestionDetailsTimelineDrawerState,+ getShouldShowUnsavedChangesWarning,} from "metabase/query_builder/selectors";import type {QueryBuilderState,@@ -482,3 +483,105 @@ describe("getIsVisualized", () => {expect(getIsVisualized(state)).toBe(true);});});++describe("getShouldShowUnsavedChangesWarning", () => {+ describe("when creating or editing a model", () => {+ function getModelCard(query: StructuredQuery) {+ return createMockCard({+ id: 1,+ type: "model",+ dataset_query: { type: "query", database: SAMPLE_DB_ID, query },+ });+ }+ const model = getModelCard({ "source-table": ORDERS_ID });++ it("warns when creating a new model", () => {+ const state = getBaseState({+ card: model,+ originalCard: undefined,+ uiControls: { queryBuilderMode: "dataset" },+ });+ expect(getShouldShowUnsavedChangesWarning(state)).toBe(true);+ });++ it("warns when an existing model has unsaved changes", () => {+ const state = getBaseState({+ card: getModelCard({ "source-table": PRODUCTS_ID }),+ originalCard: model,+ uiControls: { queryBuilderMode: "dataset" },+ });+ expect(getShouldShowUnsavedChangesWarning(state)).toBe(true);+ });++ it("does not warn when the model is unchanged", () => {+ const state = getBaseState({+ card: model,+ originalCard: model,+ uiControls: { queryBuilderMode: "dataset" },+ });+ expect(getShouldShowUnsavedChangesWarning(state)).toBe(false);+ });+ });++ describe("when editing a structured question", () => {+ const card = createMockCard({+ dataset_query: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: { "source-table": ORDERS_ID },+ },+ });++ it("warns when modified from the notebook editor", () => {+ const state = getBaseState({+ card,+ originalCard: card,+ uiControls: {+ queryBuilderMode: "notebook",+ isModifiedFromNotebook: true,+ },+ });+ expect(getShouldShowUnsavedChangesWarning(state)).toBe(true);+ });++ it("does not warn when not modified from the notebook editor", () => {+ const state = getBaseState({+ card,+ originalCard: card,+ uiControls: {+ queryBuilderMode: "notebook",+ isModifiedFromNotebook: false,+ },+ });+ expect(getShouldShowUnsavedChangesWarning(state)).toBe(false);+ });+ });++ describe("when creating a native question", () => {+ function getNativeCard(query: string) {+ return createMockCard({+ dataset_query: {+ type: "native",+ database: SAMPLE_DB_ID,+ native: createMockNativeQuery({ query }),+ },+ });+ }++ it("warns when the new native query is non-empty", () => {+ const state = getBaseState({+ card: getNativeCard("SELECT 1"),+ uiControls: { queryBuilderMode: "view" },+ });+ expect(getShouldShowUnsavedChangesWarning(state)).toBe(true);+ });++ it("does not warn when the new native query is empty", () => {+ const state = getBaseState({+ card: getNativeCard(""),+ uiControls: { queryBuilderMode: "view" },+ });+ expect(getShouldShowUnsavedChangesWarning(state)).toBe(false);+ });+ });+});diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsxindex f0f07cf6cde..a2272cf2bed 100644--- a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx@@ -5,10 +5,9 @@ import { userEvent, within } from "@storybook/test";import { merge } from "icepick";import { type ComponentProps, useEffect } from "react";-import { getStore } from "__support__/entities-store";+import { getPublicStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";-import { publicReducers } from "metabase/reducers-public";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";@@ -22,11 +21,7 @@ const storeInitialState = createMockState({settings: mockSettings(),entities: createMockEntitiesState({}),});-const store = getStore(- publicReducers,- storeInitialState,- [],-) as unknown as Store<State>;+const store = getPublicStore(storeInitialState, []) as unknown as Store<State>;const ReduxDecorator = (Story: StoryFn) => {return (diff --git a/frontend/src/metabase/querying/common/utils/question.unit.spec.ts b/frontend/src/metabase/querying/common/utils/question.unit.spec.tsnew file mode 100644index 00000000000..8d0b8ca4b1a--- /dev/null+++ b/frontend/src/metabase/querying/common/utils/question.unit.spec.ts@@ -0,0 +1,53 @@+import { createMockMetadata } from "__support__/metadata";+import Question from "metabase-lib/v1/Question";+import { createMockCard } from "metabase-types/api/mocks";+import {+ ORDERS_ID,+ PRODUCTS_ID,+ SAMPLE_DB_ID,+ createSampleDatabase,+} from "metabase-types/api/mocks/presets";++import { isQuestionDirty } from "./question";++const metadata = createMockMetadata({ databases: [createSampleDatabase()] });++function getModelQuestion(sourceTableId = ORDERS_ID) {+ return new Question(+ createMockCard({+ id: 1,+ type: "model",+ dataset_query: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: { "source-table": sourceTableId },+ },+ }),+ metadata,+ );+}++describe("isQuestionDirty", () => {+ it("is not dirty when there is no question", () => {+ expect(isQuestionDirty(undefined, undefined)).toBe(false);+ });++ it("is dirty for a new model that has no original question", () => {+ expect(isQuestionDirty(getModelQuestion(), undefined)).toBe(true);+ });++ it("is dirty when the model differs from its original", () => {+ expect(+ isQuestionDirty(+ getModelQuestion(PRODUCTS_ID),+ getModelQuestion(ORDERS_ID),+ ),+ ).toBe(true);+ });++ it("is not dirty when the model matches its original", () => {+ expect(+ isQuestionDirty(getModelQuestion(ORDERS_ID), getModelQuestion(ORDERS_ID)),+ ).toBe(false);+ });+});diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/tests/premium.unit.spec.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/tests/premium.unit.spec.tsxindex e0d973cf6e2..1b675fe6ae5 100644--- a/frontend/src/metabase/querying/components/SnippetSidebar/tests/premium.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/SnippetSidebar/tests/premium.unit.spec.tsx@@ -1,10 +1,7 @@import userEvent from "@testing-library/user-event";import { getIcon, screen } from "__support__/ui";-// TODO remove this and use proper reset functions once-// plugins initialization functions return proper teardown functions-// eslint-disable-next-line no-restricted-imports-import { resetPlugin } from "metabase-enterprise/snippets";+import { reinitialize } from "metabase/plugins";import type { SetupOpts } from "./setup";import { setup as baseSetup } from "./setup";@@ -19,7 +16,7 @@ async function setup(options: SetupOpts = {}) {describe("SnippetSidebar (EE with token feature)", () => {beforeEach(() => {- resetPlugin();+ reinitialize();});it("should display the `Change permissions` menu for admin users", async () => {diff --git a/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsxindex 4a187e6d8de..a3976d3cf83 100644--- a/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx@@ -8,13 +8,13 @@ import {} from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { getOriginalQuestion } from "metabase/query_builder/selectors";import {createMockQueryBuilderState,createMockState,} from "metabase/redux/store/mocks";import { getMetadata } from "metabase/selectors/metadata";import { checkNotNull } from "metabase/utils/types";+import Question from "metabase-lib/v1/Question";import { getTemplateTagParameter } from "metabase-lib/v1/parameters/utils/template-tags";import type {Card,@@ -86,7 +86,9 @@ const setup = ({database={databaseMetadata}databases={metadata.databasesList()}parameter={getTemplateTagParameter(tag)}- originalQuestion={getOriginalQuestion(state)}+ originalQuestion={+ originalCard ? new Question(originalCard, metadata) : undefined+ }setTemplateTag={setTemplateTag}setTemplateTagConfig={setTemplateTagConfig}setParameterValue={setParameterValue}diff --git a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsxindex 5a032cf6134..376b65c7dee 100644--- a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.unit.spec.tsx@@ -16,16 +16,6 @@ import {waitForLoaderToBeRemoved,within,} from "__support__/ui";-import type { RecentMetric } from "metabase/browse/metrics";-import {- createMockMetricResult,- createMockRecentMetric,-} from "metabase/browse/metrics/test-utils";-import type { RecentModel } from "metabase/browse/models";-import {- createMockModelResult,- createMockRecentModel,-} from "metabase/browse/models/test-utils";import type { DataPickerValue } from "metabase/common/components/Pickers/DataPicker";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";@@ -66,18 +56,14 @@ const MOCK_DATABASE = createSampleDatabase();const TEST_COLLECTION = createMockCollection({ id: "root" });const TEST_RECENT_TABLE = createMockRecentTableItem();-const TEST_RECENT_METRIC = createMockRecentMetric(- createMockMetricResult({- collection: TEST_COLLECTION,- name: "Metric",- }) as unknown as RecentMetric,-);-const TEST_RECENT_MODEL = createMockRecentModel(- createMockModelResult({- collection: TEST_COLLECTION,- name: "Model",- }) as unknown as RecentModel,-);+const TEST_RECENT_METRIC = createMockRecentCollectionItem({+ model: "metric",+ name: "Metric",+});+const TEST_RECENT_MODEL = createMockRecentCollectionItem({+ model: "dataset",+ name: "Model",+});const TEST_RECENT_CARD = createMockRecentCollectionItem({model: "card",diff --git a/frontend/src/metabase/querying/parameters/utils/query.unit.spec.ts b/frontend/src/metabase/querying/parameters/utils/query.unit.spec.tsindex 3f5781c0b09..8599e8fe298 100644--- a/frontend/src/metabase/querying/parameters/utils/query.unit.spec.ts+++ b/frontend/src/metabase/querying/parameters/utils/query.unit.spec.ts@@ -7,20 +7,29 @@ import {columnFinder,createMetadataProvider,} from "metabase-lib/test-helpers";+import Question from "metabase-lib/v1/Question";import type {ParameterTarget,ParameterType,ParameterValueOrArray,} from "metabase-types/api";-import { createMockField } from "metabase-types/api/mocks";+import {+ createMockCard,+ createMockField,+ createMockNativeDatasetQuery,+ createMockParameter,+ createMockStructuredDatasetQuery,+} from "metabase-types/api/mocks";import {ORDERS_ID,+ PRODUCTS,+ SAMPLE_DB_ID,createOrdersTable,createProductsTable,createSampleDatabase,} from "metabase-types/api/mocks/presets";-import { applyParameter } from "./query";+import { applyParameter, convertParametersToMbql } from "./query";type FilterParameterCase = {type: ParameterType;@@ -61,6 +70,26 @@ const METADATA = createMockMetadata({const PROVIDER = createMetadataProvider({ metadata: METADATA });+const BASE_QUESTION = new Question(+ createMockCard({+ dataset_query: createMockStructuredDatasetQuery({+ database: SAMPLE_DB_ID,+ query: { "source-table": ORDERS_ID },+ }),+ }),+ METADATA,+);++const NATIVE_QUESTION = new Question(+ createMockCard({+ dataset_query: createMockNativeDatasetQuery({+ database: SAMPLE_DB_ID,+ native: { query: "SELECT count(*) FROM orders" },+ }),+ }),+ METADATA,+);+describe("applyParameter", () => {describe("filter parameters", () => {const query = Lib.createTestQuery(PROVIDER, DEFAULT_TEST_QUERY);@@ -430,3 +459,41 @@ describe("applyParameter", () => {);});});++describe("convertParametersToMbql", () => {+ it("should do nothing to a native question", () => {+ expect(+ convertParametersToMbql(NATIVE_QUESTION, { isComposed: false }),+ ).toBe(NATIVE_QUESTION);+ });++ it("should convert a question with parameters into a new question with filters", () => {+ const parameters = [+ createMockParameter({+ type: "string/starts-with",+ name: "foo",+ id: "foo_id",+ target: ["dimension", ["field", PRODUCTS.CATEGORY, null]],+ }),+ createMockParameter({+ type: "string/=",+ name: "bar",+ id: "bar_id",+ target: ["dimension", ["field", PRODUCTS.CATEGORY, null]],+ }),+ ];++ const question = BASE_QUESTION.setParameters(parameters).setParameterValues(+ {+ foo_id: "abc",+ },+ );++ const questionWithFilters = convertParametersToMbql(question, {+ isComposed: false,+ });++ expect(Lib.stageCount(questionWithFilters.query())).toBe(1);+ expect(Lib.filters(questionWithFilters.query(), -1)).toHaveLength(1);+ });+});diff --git a/frontend/src/metabase/querying/run-query.unit.spec.ts b/frontend/src/metabase/querying/run-query.unit.spec.tsindex e209d61f0ec..be0394fe46d 100644--- a/frontend/src/metabase/querying/run-query.unit.spec.ts+++ b/frontend/src/metabase/querying/run-query.unit.spec.ts@@ -1,10 +1,8 @@import fetchMock from "fetch-mock";-import { getStore } from "__support__/entities-store";+import { getMainStore } from "__support__/entities-store";import { createMockEntitiesState } from "__support__/store";import { waitFor } from "__support__/ui";-import { Api } from "metabase/api";-import { mainReducers } from "metabase/reducers-main";import { createMockState } from "metabase/redux/store/mocks";import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";@@ -87,11 +85,7 @@ function getQueryEndpointPath(question: Question) {}function getRtkStore() {- return getStore(- { ...mainReducers, [Api.reducerPath]: Api.reducer },- createMockState(),- [Api.middleware],- );+ return getMainStore(createMockState());}async function setupRunQuestionQuery(question: Question) {diff --git a/frontend/src/metabase/redux/uploads.unit.spec.js b/frontend/src/metabase/redux/uploads.unit.spec.jsindex 7a5e81fcf75..2a59de10260 100644--- a/frontend/src/metabase/redux/uploads.unit.spec.js+++ b/frontend/src/metabase/redux/uploads.unit.spec.js@@ -1,8 +1,6 @@import fetchMock from "fetch-mock";-import { getStore } from "__support__/entities-store";-import { Api } from "metabase/api";-import { mainReducers } from "metabase/reducers-main";+import { getMainStore } from "__support__/entities-store";import { createMockState } from "metabase/redux/store/mocks";import {@@ -80,11 +78,7 @@ const mockReplaceCSV = (valid = true) => {describe("csv uploads", () => {describe("actions", () => {- const store = getStore(- { ...mainReducers, [Api.reducerPath]: Api.reducer },- createMockState(),- [Api.middleware],- );+ const store = getMainStore(createMockState());const dispatch = jest.spyOn(store, "dispatch");const file = new File(diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsxindex badc5a7ff65..94ed7e4f44e 100644--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx@@ -1,8 +1,7 @@import type { Store } from "@reduxjs/toolkit";import type { StoryFn } from "@storybook/react";-import _ from "underscore";-import { getStore } from "__support__/entities-store";+import { getCommonStore } from "__support__/entities-store";import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import {@@ -10,9 +9,7 @@ import {VisualizationWrapper,createWaitForResizeToStopDecorator,} from "__support__/storybook";-import { Api } from "metabase/api";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";-import { commonReducers } from "metabase/reducers-common";import { MetabaseReduxProvider } from "metabase/redux";import type { State } from "metabase/redux/store";import {@@ -38,16 +35,7 @@ const storeInitialState = createMockState({settings,entities: createMockEntitiesState({}),});-const publicReducerNames = Object.keys(commonReducers);-const initialState = _.pick(storeInitialState, ...publicReducerNames) as State;--const storeMiddleware = [Api.middleware];--const store = getStore(- commonReducers,- initialState,- storeMiddleware,-) as unknown as Store<State>;+const store = getCommonStore(storeInitialState) as unknown as Store<State>;export default {title: "viz/Table",diff --git a/frontend/test/__support__/entities-store.ts b/frontend/test/__support__/entities-store.tsindex dc274e52e5e..22d274df935 100644--- a/frontend/test/__support__/entities-store.ts+++ b/frontend/test/__support__/entities-store.ts@@ -1,8 +1,18 @@import type { Middleware, Reducer } from "@reduxjs/toolkit";import { combineReducers, configureStore } from "@reduxjs/toolkit";+import _ from "underscore";+import { Api } from "metabase/api";+import { commonReducers } from "metabase/reducers-common";+import { mainReducers } from "metabase/reducers-main";+import { publicReducers } from "metabase/reducers-public";import { reducer as entitiesReducer } from "metabase/redux/entities";import type { State } from "metabase/redux/store";+// Re-exported from the test-support tier so specs can build a main-app store+// without importing `metabase/reducers-main` directly, which would+// cross module boundaries. The test-support tier is exempt from those rules.++export { mainReducers };/*** Build a configured Redux store for tests.@@ -31,3 +41,58 @@ export function getStore(}).concat(middleware)) as never,});}++/**+ * Build a test store wired with the full main-app reducers (including the RTK+ * Query `Api` reducer). Use this instead of importing `mainReducers` from+ * `metabase/reducers-main` into specs.+ */+export function getMainStore(+ initialState: Partial<State> = {},+ middleware: Middleware[] = [Api.middleware],+) {+ return getStore(+ { ...mainReducers, [Api.reducerPath]: Api.reducer },+ initialState,+ middleware,+ );+}++function getManifestStore(+ reducers: Record<string, Reducer<any, any, any>>,+ initialState: Partial<State> = {},+ middleware: Middleware[] = [Api.middleware],+) {+ return getStore(+ reducers,+ _.pick(initialState, ...Object.keys(reducers)) as Partial<State>,+ middleware,+ );+}++/**+ * Build a test/Storybook store wired with the reducers shared between the main+ * and public apps. Use this instead of importing `commonReducers` from+ * `metabase/reducers-common` into stories, which would cross module boundaries.+ */+export function getCommonStore(+ initialState: Partial<State> = {},+ middleware: Middleware[] = [Api.middleware],+) {+ return getManifestStore(commonReducers, initialState, middleware);+}++/**+ * Build a test/Storybook store wired with the public-app reducers. Use this+ * instead of importing `publicReducers` from `metabase/reducers-public` into+ * stories, which would cross module boundaries.+ *+ * `publicReducers` mirrors `commonReducers` today, but stays a distinct entry+ * point so public stories keep their own source of truth.+ */+export function getPublicStore(+ initialState: Partial<State> = {},+ middleware: Middleware[] = [Api.middleware],+) {+ return getManifestStore(publicReducers, initialState, middleware);+}