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 setup module violation (#75692)
Fraserf702f1aa4538
diff --git a/frontend/src/metabase/redux/store/setup.ts b/frontend/src/metabase/redux/store/setup.tsindex 34495f0e6db..afa114884a1 100644--- a/frontend/src/metabase/redux/store/setup.ts+++ b/frontend/src/metabase/redux/store/setup.ts@@ -1,6 +1,15 @@-import type { SetupStep } from "metabase/setup/types";import type { DatabaseData, UsageReason } from "metabase-types/api";+export type SetupStep =+ | "welcome"+ | "language"+ | "user_info"+ | "usage_question"+ | "db_connection"+ | "license_token"+ | "data_usage"+ | "completed";+export interface Locale {name: string;code: string;diff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.tsindex ed179029b51..ca438f655d1 100644--- a/frontend/src/metabase/setup/actions.ts+++ b/frontend/src/metabase/setup/actions.ts@@ -9,7 +9,13 @@ import {updateSetting,updateSettings,} from "metabase/redux/settings";-import type { InviteInfo, Locale, State, UserInfo } from "metabase/redux/store";+import type {+ InviteInfo,+ Locale,+ SetupStep,+ State,+ UserInfo,+} from "metabase/redux/store";import { createAsyncThunk } from "metabase/redux/utils";import { getSetting } from "metabase/selectors/settings";import { SetupApi } from "metabase/services";@@ -31,7 +37,6 @@ import {getSetupToken,getUsageReason,} from "./selectors";-import type { SetupStep } from "./types";import { getDefaultLocale, getLocales } from "./utils";interface ThunkConfig {diff --git a/frontend/src/metabase/setup/analytics.ts b/frontend/src/metabase/setup/analytics.tsindex 80eb82617fc..4a1d8eb5eda 100644--- a/frontend/src/metabase/setup/analytics.ts+++ b/frontend/src/metabase/setup/analytics.ts@@ -1,9 +1,8 @@import { trackSchemaEvent } from "metabase/analytics";+import type { SetupStep } from "metabase/redux/store";import type { SetupVersion } from "metabase-types/analytics/setup";import type { UsageReason } from "metabase-types/api";-import type { SetupStep } from "./types";-/*** The internal "versioning" tracker that needs to be bumped for every significant* change to the setup flow. If you update the version here, make sure to add andiff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsxindex 6c0218cd015..302432db5ea 100644--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.unit.spec.tsx@@ -1,9 +1,9 @@import { renderWithProviders, screen } from "__support__/ui";+import type { SetupStep } from "metabase/redux/store";import {createMockSetupState,createMockState,} from "metabase/redux/store/mocks";-import type { SetupStep } from "metabase/setup/types";import { CompletedStep } from "./CompletedStep";diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsxindex 5ec7b471988..c00172fb22f 100644--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.unit.spec.tsx@@ -6,11 +6,11 @@ import {setupSettingsEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";+import type { SetupStep } from "metabase/redux/store";import {createMockSetupState,createMockState,} from "metabase/redux/store/mocks";-import type { SetupStep } from "metabase/setup/types";import { createMockSettings } from "metabase-types/api/mocks";import { DataUsageStep } from "./DataUsageStep";diff --git a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsx b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsxindex a083e5e0a12..90a5562b995 100644--- a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.unit.spec.tsx@@ -2,12 +2,12 @@ import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";import { renderWithProviders, screen, within } from "__support__/ui";+import type { SetupStep } from "metabase/redux/store";import {createMockSettingsState,createMockSetupState,createMockState,} from "metabase/redux/store/mocks";-import type { SetupStep } from "metabase/setup/types";import type { DatabaseData } from "metabase-types/api";import { createMockDatabaseData } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsxindex c264071dc11..54f1408045e 100644--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.unit.spec.tsx@@ -1,14 +1,13 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import type { Locale } from "metabase/redux/store";+import type { Locale, SetupStep } from "metabase/redux/store";import {createMockLocale,createMockSettingsState,createMockSetupState,createMockState,} from "metabase/redux/store/mocks";-import type { SetupStep } from "metabase/setup/types";import { LanguageStep } from "./LanguageStep";diff --git a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsxindex 4649685552d..f436bfd4f82 100644--- a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx+++ b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx@@ -1,8 +1,8 @@import { getLocalizationNoticeText } from "metabase/common/components/CommunityLocalizationNotice";import { LogoIcon } from "metabase/common/components/LogoIcon";import { useSelector } from "metabase/redux";+import type { SetupStep } from "metabase/redux/store";import { getSteps } from "metabase/setup/selectors";-import type { SetupStep } from "metabase/setup/types";import { Box, Flex, Icon, Text, Tooltip } from "metabase/ui";import { CloudMigrationHelp } from "../CloudMigrationHelp";diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsxindex 8695524775f..eac69e108e7 100644--- a/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsx+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.unit.spec.tsx@@ -1,12 +1,11 @@import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";-import type { UserInfo } from "metabase/redux/store";+import type { SetupStep, UserInfo } from "metabase/redux/store";import {createMockSetupState,createMockState,createMockUserInfo,} from "metabase/redux/store/mocks";-import type { SetupStep } from "metabase/setup/types";import { UserStep } from "./UserStep";diff --git a/frontend/src/metabase/setup/reducers.ts b/frontend/src/metabase/setup/reducers.tsindex e3054c1a43f..5ab17f47913 100644--- a/frontend/src/metabase/setup/reducers.ts+++ b/frontend/src/metabase/setup/reducers.ts@@ -1,6 +1,6 @@import { createReducer } from "@reduxjs/toolkit";-import type { SetupState } from "metabase/redux/store";+import type { SetupState, SetupStep } from "metabase/redux/store";import {loadLocaleDefaults,@@ -15,7 +15,6 @@ import {updateLocale,updateTracking,} from "./actions";-import type { SetupStep } from "./types";const getUserFromQueryParams = () => {const params = new URLSearchParams(window.location.search);diff --git a/frontend/src/metabase/setup/selectors.ts b/frontend/src/metabase/setup/selectors.tsindex 2ab4f3598e9..6489505bfb6 100644--- a/frontend/src/metabase/setup/selectors.ts+++ b/frontend/src/metabase/setup/selectors.ts@@ -1,12 +1,16 @@import { createSelector } from "@reduxjs/toolkit";import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";-import type { InviteInfo, Locale, State, UserInfo } from "metabase/redux/store";+import type {+ InviteInfo,+ Locale,+ SetupStep,+ State,+ UserInfo,+} from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";import type { DatabaseData, LocaleData } from "metabase-types/api";-import type { SetupStep } from "./types";-const DEFAULT_LOCALES: LocaleData[] = [];export const getStep = (state: State): SetupStep => {diff --git a/frontend/src/metabase/setup/tests/setup.tsx b/frontend/src/metabase/setup/tests/setup.tsxindex 3eb7d441bc8..72cd8655936 100644--- a/frontend/src/metabase/setup/tests/setup.tsx+++ b/frontend/src/metabase/setup/tests/setup.tsx@@ -12,6 +12,7 @@ import {} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders, screen } from "__support__/ui";+import type { SetupStep } from "metabase/redux/store";import {createMockSetupState,createMockState,@@ -27,7 +28,6 @@ import {} from "metabase-types/api/mocks";import { Setup } from "../components/Setup";-import type { SetupStep } from "../types";export interface SetupOpts {step?: SetupStep;diff --git a/frontend/src/metabase/setup/types.ts b/frontend/src/metabase/setup/types.tsdeleted file mode 100644index d2aa92b55b1..00000000000--- a/frontend/src/metabase/setup/types.ts+++ /dev/null@@ -1,9 +0,0 @@-export type SetupStep =- | "welcome"- | "language"- | "user_info"- | "usage_question"- | "db_connection"- | "license_token"- | "data_usage"- | "completed";diff --git a/frontend/src/metabase/setup/useStep.ts b/frontend/src/metabase/setup/useStep.tsindex e850e0c913a..37ada708a08 100644--- a/frontend/src/metabase/setup/useStep.ts+++ b/frontend/src/metabase/setup/useStep.ts@@ -1,4 +1,5 @@import { useDispatch, useSelector } from "metabase/redux";+import type { SetupStep } from "metabase/redux/store";import { selectStep } from "./actions";import {@@ -6,7 +7,6 @@ import {getIsStepActive,getIsStepCompleted,} from "./selectors";-import type { SetupStep } from "./types";export const useStep = (stepName: SetupStep) => {const isStepActive = useSelector((state) => getIsStepActive(state, stepName));