Skip to content

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

Move `metabase/lib` to `metabase/utils` and move domain-related utils to other modules (#71467)

Romeo Van Snick773692eaf3e5
diff --git a/.claude/skills/analytics-events/SKILL.md b/.claude/skills/analytics-events/SKILL.md
index 56c002f8976..add4f99448f 100644
--- a/.claude/skills/analytics-events/SKILL.md
+++ b/.claude/skills/analytics-events/SKILL.md
@@ -15,7 +15,7 @@ Analytics events in Metabase use Snowplow with typed event schemas. All events m
**Key Files:**
- `frontend/src/metabase-types/analytics/event.ts` - Event type definitions
- `frontend/src/metabase-types/analytics/schema.ts` - Schema registry
-- `frontend/src/metabase/lib/analytics.ts` - Core tracking functions
+- `frontend/src/metabase/utils/analytics.ts` - Core tracking functions
- Feature-specific `analytics.ts` files - Tracking function wrappers
## Quick Checklist
@@ -91,7 +91,7 @@ export type DataStudioEvent =
In your feature's `analytics.ts` file (e.g., `enterprise/frontend/src/metabase-enterprise/data-studio/analytics.ts`):
```typescript
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackDataStudioTablePickerFiltersApplied = () => {
trackSimpleEvent({
@@ -471,7 +471,7 @@ Event type definitions (all in one place):
frontend/src/metabase-types/analytics/event.ts
Core tracking utilities:
-frontend/src/metabase/lib/analytics.ts
+frontend/src/metabase/utils/analytics.ts
```
## Real-World Examples
diff --git a/.github/workflows/mbql-library-changelog.yml b/.github/workflows/mbql-library-changelog.yml
index 8156a6330db..71d0f263cc3 100644
--- a/.github/workflows/mbql-library-changelog.yml
+++ b/.github/workflows/mbql-library-changelog.yml
@@ -8,7 +8,7 @@ on:
- unlabeled
- synchronize
paths:
- - src/metabase/lib/js.cljs
+ - src/metabase/utils/js.cljs
jobs:
mbql-library-changelog-check:
runs-on: ${{ vars.DEFAULT_RUNNER_KEY }}
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index 5f2899fc3c3..1a90b81bfb4 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -2,14 +2,14 @@ import React, { useEffect, useMemo } from "react";
import { ThemeProvider } from "metabase/ui";
-// @ts-expect-error: See metabase/lib/delay
+// @ts-expect-error: See metabase/utils/delay
// This will skip the skippable delays in stories
window.METABASE_REMOVE_DELAYS = true;
require("metabase/css/core/index.css");
require("metabase/css/vendor.css");
require("metabase/css/index.module.css");
-require("metabase/lib/dayjs");
+require("metabase/utils/dayjs");
import "@mantine/core/styles.css";
import "@mantine/dates/styles.css";
diff --git a/bb.edn b/bb.edn
index 45dd31d030a..effd98b60e3 100644
--- a/bb.edn
+++ b/bb.edn
@@ -85,7 +85,7 @@
fix-unused-requires
{:doc "Removes unused requires flagged by clj-kondo"
- :examples [["./bin/mage fix-unused-requires src/metabase/lib/validate.cljc" "Fix unused requires in a specific file"]
+ :examples [["./bin/mage fix-unused-requires src/metabase/utils/validate.cljc" "Fix unused requires in a specific file"]
["./bin/mage fix-unused-requires src" "Fix unused requires in all files in src"]]
:requires [[mage.fix-unused-requires :as fix]]
:arg-schema [:sequential [:string {:name "file-or-directory"
diff --git a/bin/build/test/i18n/create_artifacts/test_common.clj b/bin/build/test/i18n/create_artifacts/test_common.clj
index b81f80af807..60b1711a753 100644
--- a/bin/build/test/i18n/create_artifacts/test_common.clj
+++ b/bin/build/test/i18n/create_artifacts/test_common.clj
@@ -87,7 +87,7 @@
:str-plural nil
:fuzzy? false
:plural? false
- :source-references ["src/metabase/lib/aggregation.cljc"]
+ :source-references ["src/metabase/utils/aggregation.cljc"]
:comment nil})
(def ^:private cljs-message
@@ -97,7 +97,7 @@
:str-plural nil
:fuzzy? false
:plural? false
- :source-references ["src/metabase/lib/aggregation.cljs"]
+ :source-references ["src/metabase/utils/aggregation.cljs"]
:comment nil})
(def ^:private messages
diff --git a/bun.lock b/bun.lock
index ae95a27762b..e8c2b257e6a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -111,7 +111,7 @@
"js-cookie": "^2.1.2",
"js-yaml": "^4.1.1",
"json5": "2.2.2",
- "jspdf": "^4.2.1",
+ "jspdf": "^4.2.0",
"kbar": "0.1.0-beta.45",
"leaflet": "^1.2.0",
"leaflet-draw": "^0.4.9",
diff --git a/deps.edn b/deps.edn
index 69581ec8c56..5b6008b3e38 100644
--- a/deps.edn
+++ b/deps.edn
@@ -697,8 +697,8 @@
"resources/html-entities.edn"
"resources/openapi/.*"
"frontend/src/cljs"
- "frontend/test/metabase/lib/urls\\.unit\\.spec\\.js$"
- "frontend/test/metabase/lib/formatting\\.unit\\.spec\\.js$"
+ "frontend/src/metabase/utils/urls\\.unit\\.spec\\.js$"
+ "frontend/src/metabase/utils/formatting\\.unit\\.spec\\.js$"
"src/metabase/util/currency\\.cljc$"
"test/metabase/channel/render/png_test.clj"
"#.+#$"
diff --git a/docs/developers-guide/frontend.md b/docs/developers-guide/frontend.md
index c56803546d0..262731d4c22 100644
--- a/docs/developers-guide/frontend.md
+++ b/docs/developers-guide/frontend.md
@@ -51,7 +51,7 @@ Familiarize yourself with Mantine's Layout components. You can often save a lot
## Colors
-Colors should only be used in the form of mantine color props (primarily `c` and `bg`), or in css modules using variables eg: `color: var(--mb-color-text-primary);`. Using these colors ensures consistent visual design and user experience across both dark and light modes. Literal color values such as `black` or `#FFF` are not allowed, as well as using `color-mix` in your CSS modules to adjust the color or transparency of a variable. The full list of keys can be found in `frontend/src/metabase/lib/colors/types/color-keys.ts`, with their light and dark values found in `frontend/src/metabase/lib/colors/constants/themes`. If you find yourself requiring a color that does not already exist but is present in designs, reach out to the design team for guidance.
+Colors should only be used in the form of mantine color props (primarily `c` and `bg`), or in css modules using variables eg: `color: var(--mb-color-text-primary);`. Using these colors ensures consistent visual design and user experience across both dark and light modes. Literal color values such as `black` or `#FFF` are not allowed, as well as using `color-mix` in your CSS modules to adjust the color or transparency of a variable. The full list of keys can be found in `frontend/src/metabase/utils/colors/types/color-keys.ts`, with their light and dark values found in `frontend/src/metabase/utils/colors/constants/themes`. If you find yourself requiring a color that does not already exist but is present in designs, reach out to the design team for guidance.
## Unit testing
diff --git a/e2e/support/helpers/e2e-embedding-iframe-interactive-helpers.ts b/e2e/support/helpers/e2e-embedding-iframe-interactive-helpers.ts
index 7adfad58d1d..b0df33b76d2 100644
--- a/e2e/support/helpers/e2e-embedding-iframe-interactive-helpers.ts
+++ b/e2e/support/helpers/e2e-embedding-iframe-interactive-helpers.ts
@@ -47,7 +47,7 @@ export function postMessageToIframe(options: PostMessageOptions) {
const { messageData, iframeSelector } = options;
// this madness is necessary to simulate a real MessageEvent coming from the parent window
- // because in frontend/src/metabase/lib/embed.js we check e.source === window.parent
+ // because in frontend/src/metabase/utils/embed.js we check e.source === window.parent
cy.get(iframeSelector)
.should("be.visible")
.then(($iframe) => {
diff --git a/e2e/support/helpers/e2e-misc-helpers.js b/e2e/support/helpers/e2e-misc-helpers.js
index b9b663b136e..8ee9359a1ec 100644
--- a/e2e/support/helpers/e2e-misc-helpers.js
+++ b/e2e/support/helpers/e2e-misc-helpers.js
@@ -430,7 +430,7 @@ export const goToAuthOverviewPage = () => {
/**
* This function exists to work around custom dynamic anchor creation.
- * @see https://github.com/metabase/metabase/blob/master/frontend/src/metabase/lib/dom.js#L301-L312
+ * @see https://github.com/metabase/metabase/blob/master/frontend/src/metabase/utils/dom.js#L301-L312
*
* WARNING: For the assertions to work, ensure that a click event occurs on an anchor element afterwards.
*/
diff --git a/e2e/test-component/scenarios/embedding-sdk/dashboard-click-behavior.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/dashboard-click-behavior.cy.spec.tsx
index d6b7c062b1f..9f0867b0b9e 100644
--- a/e2e/test-component/scenarios/embedding-sdk/dashboard-click-behavior.cy.spec.tsx
+++ b/e2e/test-component/scenarios/embedding-sdk/dashboard-click-behavior.cy.spec.tsx
@@ -139,7 +139,7 @@ describe("scenarios > embedding-sdk > dashboard-click-behavior", () => {
});
it("should allow external URL click behaviors in the SDK (EMB-878)", () => {
- // External click behaviour use the open() function in metabase/lib/dom creates temporary anchors and calls .click()
+ // External click behaviour use the open() function in metabase/utils/dom creates temporary anchors and calls .click()
// To check that we call it, we stub the anchor element click
stubAnchorClick();
diff --git a/e2e/test-component/scenarios/embedding-sdk/editable-dashboard.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/editable-dashboard.cy.spec.tsx
index 99773fcc691..f094a850f8d 100644
--- a/e2e/test-component/scenarios/embedding-sdk/editable-dashboard.cy.spec.tsx
+++ b/e2e/test-component/scenarios/embedding-sdk/editable-dashboard.cy.spec.tsx
@@ -12,7 +12,7 @@ import { getSdkRoot } from "e2e/support/helpers/e2e-embedding-sdk-helpers";
import { mountSdkContent } from "e2e/support/helpers/embedding-sdk-component-testing/component-embedding-sdk-helpers";
import { signInAsAdminAndEnableEmbeddingSdk } from "e2e/support/helpers/embedding-sdk-testing";
import { mockAuthProviderAndJwtSignIn } from "e2e/support/helpers/embedding-sdk-testing/embedding-sdk-helpers";
-import { defer } from "metabase/lib/promise";
+import { defer } from "metabase/utils/promise";
import type {
ConcreteFieldReference,
DashboardCard,
diff --git a/e2e/test-component/scenarios/embedding-sdk/interactive-dashboard.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/interactive-dashboard.cy.spec.tsx
index c2e58a7da9d..25935c0f489 100644
--- a/e2e/test-component/scenarios/embedding-sdk/interactive-dashboard.cy.spec.tsx
+++ b/e2e/test-component/scenarios/embedding-sdk/interactive-dashboard.cy.spec.tsx
@@ -16,7 +16,7 @@ import { getSdkRoot } from "e2e/support/helpers/e2e-embedding-sdk-helpers";
import { mountSdkContent } from "e2e/support/helpers/embedding-sdk-component-testing/component-embedding-sdk-helpers";
import { signInAsAdminAndEnableEmbeddingSdk } from "e2e/support/helpers/embedding-sdk-testing";
import { mockAuthProviderAndJwtSignIn } from "e2e/support/helpers/embedding-sdk-testing/embedding-sdk-helpers";
-import { defer } from "metabase/lib/promise";
+import { defer } from "metabase/utils/promise";
import type {
ConcreteFieldReference,
DashboardCard,
diff --git a/e2e/test-component/scenarios/embedding-sdk/loading-performance.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/loading-performance.cy.spec.tsx
index 7f03b3585e4..4b7b4d35ce9 100644
--- a/e2e/test-component/scenarios/embedding-sdk/loading-performance.cy.spec.tsx
+++ b/e2e/test-component/scenarios/embedding-sdk/loading-performance.cy.spec.tsx
@@ -15,7 +15,7 @@ import {
signInAsAdminAndEnableEmbeddingSdk,
} from "e2e/support/helpers/embedding-sdk-testing";
import { deleteConflictingCljsGlobals } from "metabase/embedding-sdk/test/delete-conflicting-cljs-globals";
-import { defer } from "metabase/lib/promise";
+import { defer } from "metabase/utils/promise";
const { H } = cy;
diff --git a/e2e/test-component/scenarios/embedding-sdk/requests.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/requests.cy.spec.tsx
index d3fe05afb03..1fe6472f17e 100644
--- a/e2e/test-component/scenarios/embedding-sdk/requests.cy.spec.tsx
+++ b/e2e/test-component/scenarios/embedding-sdk/requests.cy.spec.tsx
@@ -16,7 +16,7 @@ import {
signInAsAdminAndEnableEmbeddingSdk,
} from "e2e/support/helpers/embedding-sdk-testing";
import { mockAuthProviderAndJwtSignIn } from "e2e/support/helpers/embedding-sdk-testing/embedding-sdk-helpers";
-import { defer } from "metabase/lib/promise";
+import { defer } from "metabase/utils/promise";
describe("scenarios > embedding-sdk > requests", () => {
describe("cache preflight requests", () => {
diff --git a/e2e/test/scenarios/admin/i18n/content-translation/constants.ts b/e2e/test/scenarios/admin/i18n/content-translation/constants.ts
index d7efae8557f..9107e89c6fe 100644
--- a/e2e/test/scenarios/admin/i18n/content-translation/constants.ts
+++ b/e2e/test/scenarios/admin/i18n/content-translation/constants.ts
@@ -1,4 +1,5 @@
import type { NonEmpty } from "metabase/i18n/types";
+import { clone } from "metabase/utils/clone";
import type { DictionaryArray } from "metabase-types/api";
export const germanFieldNames: NonEmpty<DictionaryArray> = [
@@ -59,14 +60,14 @@ export const nonAsciiFieldNames: DictionaryArray = [
export const columnNamesWithTypeText = ["Title", "Category", "Vendor"];
-export const invalidLocaleXX = structuredClone(germanFieldNames);
+export const invalidLocaleXX = clone(germanFieldNames);
invalidLocaleXX[0].locale = "xx";
-export const multipleInvalidLocales = structuredClone(germanFieldNames);
+export const multipleInvalidLocales = clone(germanFieldNames);
multipleInvalidLocales[0].locale = "ze";
multipleInvalidLocales[3].locale = "qe";
-export const stringTranslatedTwice = structuredClone(germanFieldNames);
+export const stringTranslatedTwice = clone(germanFieldNames);
stringTranslatedTwice.push({
locale: "de",
msgid: "Title",
diff --git a/e2e/test/scenarios/admin/performance/schedule.cy.spec.ts b/e2e/test/scenarios/admin/performance/schedule.cy.spec.ts
index a6df904f880..53ac61948d4 100644
--- a/e2e/test/scenarios/admin/performance/schedule.cy.spec.ts
+++ b/e2e/test/scenarios/admin/performance/schedule.cy.spec.ts
@@ -1,5 +1,5 @@
import type { ScheduleComponentType } from "metabase/common/components/Schedule/strings";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { CacheableModel } from "metabase-types/api";
import { interceptPerformanceRoutes } from "./helpers/e2e-performance-helpers";
diff --git a/e2e/test/scenarios/dashboard-cards/dashboard-card-resizing.cy.spec.js b/e2e/test/scenarios/dashboard-cards/dashboard-card-resizing.cy.spec.js
index a2b98835e79..4e5d9f451a5 100644
--- a/e2e/test/scenarios/dashboard-cards/dashboard-card-resizing.cy.spec.js
+++ b/e2e/test/scenarios/dashboard-cards/dashboard-card-resizing.cy.spec.js
@@ -3,7 +3,7 @@ import _ from "underscore";
const { H } = cy;
import { SAMPLE_DB_ID } from "e2e/support/cypress_data";
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
-import { GRID_WIDTH } from "metabase/lib/dashboard_grid";
+import { GRID_WIDTH } from "metabase/utils/dashboard_grid";
const VISUALIZATION_SIZES = {
line: {
diff --git a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
index a090a9e7d6d..50c2c6d4b9e 100644
--- a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
@@ -10,7 +10,7 @@ import {
ORDERS_QUESTION_ID,
} from "e2e/support/cypress_sample_instance_data";
import { cancelConfirmationModal } from "e2e/test/scenarios/admin/performance/helpers/modals-helpers";
-import { GRID_WIDTH } from "metabase/lib/dashboard_grid";
+import { GRID_WIDTH } from "metabase/utils/dashboard_grid";
import {
createMockVirtualCard,
createMockVirtualDashCard,
diff --git a/e2e/test/scenarios/documents/comments.cy.spec.ts b/e2e/test/scenarios/documents/comments.cy.spec.ts
index 3b5c7733edf..ea3d7a056f8 100644
--- a/e2e/test/scenarios/documents/comments.cy.spec.ts
+++ b/e2e/test/scenarios/documents/comments.cy.spec.ts
@@ -3,7 +3,7 @@ import {
ORDERS_QUESTION_ID,
} from "e2e/support/cypress_sample_instance_data";
import { deleteComment } from "e2e/support/helpers";
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import type { CommentId, DocumentId } from "metabase-types/api";
const { H } = cy;
diff --git a/e2e/test/scenarios/embedding/embedding-native.cy.spec.js b/e2e/test/scenarios/embedding/embedding-native.cy.spec.js
index 477f043148a..c5595ff348d 100644
--- a/e2e/test/scenarios/embedding/embedding-native.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-native.cy.spec.js
@@ -1,3 +1,4 @@
+import { clone } from "metabase/utils/clone";
const { H } = cy;
import * as SQLFilter from "../native-filters/helpers/e2e-sql-filter-helpers";
@@ -16,7 +17,7 @@ describe("scenarios > embedding > native questions", () => {
context("UI", () => {
function createAndVisitQuestion({ requiredTagName, defaultValue } = {}) {
- const details = structuredClone(questionDetails);
+ const details = clone(questionDetails);
if (requiredTagName) {
details.native["template-tags"][requiredTagName].default = defaultValue;
diff --git a/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js b/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
index dc1046b5ad2..216e6d0a450 100644
--- a/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
@@ -2,7 +2,7 @@ const { H } = cy;
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";
import { questionAsPinMapWithTiles } from "e2e/test/scenarios/embedding/shared/embedding-questions";
-import { defer } from "metabase/lib/promise";
+import { defer } from "metabase/utils/promise";
const { PRODUCTS, PRODUCTS_ID, ORDERS, ORDERS_ID } = SAMPLE_DATABASE;
describe("issue 15860", { tags: "@skip" }, () => {
diff --git a/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.js b/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.js
index 7bd5f7acc71..12d5a713c8d 100644
--- a/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.js
+++ b/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.js
@@ -9,7 +9,7 @@ import {
SECOND_COLLECTION_ID,
THIRD_COLLECTION_ID,
} from "e2e/support/cypress_sample_instance_data";
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import {
createMockDashboardCard,
createMockTextDashboardCard,
diff --git a/e2e/test/scenarios/filters/relative-datetime.cy.spec.js b/e2e/test/scenarios/filters/relative-datetime.cy.spec.js
index 8a1fdd67a08..adf46c11bf7 100644
--- a/e2e/test/scenarios/filters/relative-datetime.cy.spec.js
+++ b/e2e/test/scenarios/filters/relative-datetime.cy.spec.js
@@ -1,6 +1,6 @@
import dayjs from "dayjs";
-import "metabase/lib/dayjs";
+import "metabase/utils/dayjs";
const { H } = cy;
diff --git a/e2e/test/scenarios/permissions/sandboxing/helpers/e2e-sandboxing-helpers.ts b/e2e/test/scenarios/permissions/sandboxing/helpers/e2e-sandboxing-helpers.ts
index c23efc881ac..be64dd0f697 100644
--- a/e2e/test/scenarios/permissions/sandboxing/helpers/e2e-sandboxing-helpers.ts
+++ b/e2e/test/scenarios/permissions/sandboxing/helpers/e2e-sandboxing-helpers.ts
@@ -1,7 +1,7 @@
import { SAMPLE_DB_ID, USER_GROUPS } from "e2e/support/cypress_data";
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
import type { StructuredQuestionDetails } from "e2e/support/helpers";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type {
CollectionItem,
Dashboard,
diff --git a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.ts b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.ts
index b194376a0e8..484dd67a0b4 100644
--- a/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.ts
+++ b/e2e/test/scenarios/permissions/sandboxing/sandboxing-via-ui.cy.spec.ts
@@ -1,6 +1,6 @@
import { USER_GROUPS } from "e2e/support/cypress_data";
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { CollectionItem, Dashboard } from "metabase-types/api";
import {
diff --git a/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts b/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts
index 8aeb81c2361..a29b75a65d0 100644
--- a/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts
+++ b/e2e/test/scenarios/question/notebook-data-source.cy.spec.ts
@@ -7,7 +7,7 @@ import {
SECOND_COLLECTION_ID,
} from "e2e/support/cypress_sample_instance_data";
import type { StructuredQuestionDetails } from "e2e/support/helpers";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
const { ORDERS_ID, PRODUCTS_ID, REVIEWS_ID } = SAMPLE_DATABASE;
diff --git a/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts b/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts
index ebc2bc0b25d..b04f3e05fd7 100644
--- a/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts
+++ b/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts
@@ -12,7 +12,7 @@ import type {
QuestionDetails,
} from "e2e/support/helpers";
import { DataPermissionValue } from "metabase/admin/permissions/types";
-import { METAKEY } from "metabase/lib/browser";
+import { METAKEY } from "metabase/utils/browser";
const {
ORDERS,
diff --git a/e2e/test/scenarios/question/offset.cy.spec.ts b/e2e/test/scenarios/question/offset.cy.spec.ts
index 57aeb891250..ec22c9acbc7 100644
--- a/e2e/test/scenarios/question/offset.cy.spec.ts
+++ b/e2e/test/scenarios/question/offset.cy.spec.ts
@@ -1,7 +1,7 @@
const { H } = cy;
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
import type { StructuredQuestionDetails } from "e2e/support/helpers";
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import type {
Aggregation,
Breakout,
diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
index 04111292239..09c72d7bcac 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
@@ -35,12 +35,12 @@ import {
} from "metabase/embedding-sdk/config";
import { samlTokenStorage } from "metabase/embedding-sdk/lib/saml-token-storage";
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
-import api from "metabase/lib/api";
-import { createAsyncThunk } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";
import { loadSettings, refreshSiteSettings } from "metabase/redux/settings";
import { refreshCurrentUser } from "metabase/redux/user";
+import api from "metabase/utils/api";
+import { createAsyncThunk } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import type { Settings } from "metabase-types/api";
const GET_OR_REFRESH_SESSION = "sdk/token/GET_OR_REFRESH_SESSION";
diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsx
index cda5100819b..52116782d52 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsx
@@ -4,8 +4,8 @@ import { useBreakoutData } from "embedding-sdk-bundle/components/private/SdkQues
import { useFilterData } from "embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/hooks/use-filter-data";
import { useSummarizeData } from "embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/use-summarize-data";
import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";
-import { isNotNull } from "metabase/lib/types";
import { Text } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx b/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx
index 11260c25163..8cbc07b8cc7 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx
@@ -5,7 +5,7 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { useHasEmailSetup } from "metabase/common/hooks";
import { toggleSharing } from "metabase/dashboard/actions";
import { useDashboardContext } from "metabase/dashboard/context";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
/**
* @internal Do not import this component directly, use either SDK or EAJS EE plugins instead.
diff --git a/enterprise/frontend/src/embedding-sdk-package/cli/steps/generate-credentials.ts b/enterprise/frontend/src/embedding-sdk-package/cli/steps/generate-credentials.ts
index bfcac87d629..21003cb73cc 100644
--- a/enterprise/frontend/src/embedding-sdk-package/cli/steps/generate-credentials.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/cli/steps/generate-credentials.ts
@@ -1,6 +1,6 @@
import { input } from "@inquirer/prompts";
-import { isEmail } from "metabase/lib/email";
+import { isEmail } from "metabase/utils/email";
import type { CliStepMethod } from "../types/cli";
import { generateRandomDemoPassword } from "../utils/generate-password";
diff --git a/enterprise/frontend/src/embedding-sdk-package/cli/utils/get-local-metabase-container.ts b/enterprise/frontend/src/embedding-sdk-package/cli/utils/get-local-metabase-container.ts
index a581a66f583..1af311353bc 100644
--- a/enterprise/frontend/src/embedding-sdk-package/cli/utils/get-local-metabase-container.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/cli/utils/get-local-metabase-container.ts
@@ -1,7 +1,7 @@
import { exec as execCallback } from "child_process";
import { promisify } from "util";
-import { safeJsonParse } from "metabase/lib/json-parse";
+import { safeJsonParse } from "metabase/utils/json-parse";
import { CONTAINER_NAME } from "../constants/config";
diff --git a/enterprise/frontend/src/embedding-sdk-package/cli/utils/xray-models.ts b/enterprise/frontend/src/embedding-sdk-package/cli/utils/xray-models.ts
index 5e0c94691a5..97df24e5112 100644
--- a/enterprise/frontend/src/embedding-sdk-package/cli/utils/xray-models.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/cli/utils/xray-models.ts
@@ -2,7 +2,7 @@ import type {
MetabaseDashboard,
SdkDashboardId,
} from "embedding-sdk-bundle/types/dashboard";
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import { propagateErrorResponse } from "./propagate-error-response";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx
index 52be8414367..d021c734edd 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx
@@ -12,11 +12,11 @@ import { Questions } from "metabase/entities/questions";
import { Schemas } from "metabase/entities/schemas";
import { Search } from "metabase/entities/search";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { canUserCreateQueries } from "metabase/selectors/user";
import { Box, Popover } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import {
SAVED_QUESTIONS_VIRTUAL_DB_ID,
getQuestionIdFromVirtualTableId,
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
index e67dbec38f6..2d8953368a6 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import { createMockDatabase } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
index 36b74d32598..22b4ba6c1ee 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
@@ -7,8 +7,8 @@ import {
} from "metabase/common/components/AccordionList";
import CS from "metabase/css/core/index.css";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { isSyncCompleted } from "metabase/lib/syncing";
import { Icon } from "metabase/ui";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
index e075e9f7cf0..7b57a887470 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { render, renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import { createMockDatabase, createMockSchema } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
index 362c0557eca..03b6c714e44 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
@@ -14,9 +14,9 @@ import {
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { isSyncCompleted } from "metabase/lib/syncing";
-import { isNotNull } from "metabase/lib/types";
import { Box, DelayGroup, Flex, Icon, rem } from "metabase/ui";
+import { isSyncCompleted } from "metabase/utils/syncing";
+import { isNotNull } from "metabase/utils/types";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type Table from "metabase-lib/v1/metadata/Table";
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
index 21627f0eb1b..85ce8339755 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Database, InitialSyncStatus } from "metabase-types/api";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx
index 65a986e7636..08eb8989006 100644
--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx
+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx
@@ -14,8 +14,8 @@ import {
PERSONAL_COLLECTIONS,
buildCollectionTree,
} from "metabase/entities/collections";
-import { connect } from "metabase/lib/redux";
import { Box, Icon } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import SavedEntityList from "./SavedEntityList";
import SavedEntityPickerS from "./SavedEntityPicker.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx
index 29cd2e003fd..91076fdfa11 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx
@@ -13,7 +13,7 @@ import {
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useDatabaseQuery } from "metabase/common/hooks";
import { getParentPath } from "metabase/hoc/ModalRoute";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import { updateImpersonation } from "metabase-enterprise/advanced_permissions/reducer";
import { getImpersonation } from "metabase-enterprise/advanced_permissions/selectors";
import type {
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
index 9dc68ae8b5b..392674438d8 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx
@@ -12,7 +12,7 @@ import { Link } from "metabase/common/components/Link/Link";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { Form, FormProvider, FormSelect } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import { renderUserAttributesForSelect } from "metabase-enterprise/sandboxes/utils";
import type Database from "metabase-lib/v1/metadata/Database";
import type { UserAttributeKey } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
index aa7cd5c672a..b2f0284bd12 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationWarning/ImpersonationWarning.tsx
@@ -2,9 +2,9 @@ import { jt, t } from "ttag";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
-import { isEmpty } from "metabase/lib/validate";
import { Code } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
+import { isEmpty } from "metabase/utils/validate";
import type Database from "metabase-lib/v1/metadata/Database";
import { ImpersonationAlert } from "./ImpersonationWarning.styled";
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts
index 6df67691b13..6a66a1c7a73 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/services.ts
@@ -1,4 +1,4 @@
-import { GET } from "metabase/lib/api";
+import { GET } from "metabase/utils/api";
export const ImpersonationApi = {
get: GET("/api/ee/advanced-permissions/impersonation"),
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/AiFeatureAccessTable.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/AiFeatureAccessTable.tsx
index a487e4b97ce..7ffb7784705 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/AiFeatureAccessTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/AiFeatureAccessTable.tsx
@@ -3,7 +3,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { isDefaultGroup } from "metabase/lib/groups";
+import { isDefaultGroup } from "metabase/utils/groups";
import {
AIToolKey,
type GroupInfo,
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx
index eb24d7eac59..f991d6e73d2 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx
@@ -3,8 +3,8 @@ import { type ChangeEvent, useEffect, useMemo, useState } from "react";
import { c, t } from "ttag";
import _, { type Dictionary } from "underscore";
-import { isDefaultGroup } from "metabase/lib/groups";
import { Box, Checkbox, Switch, Text } from "metabase/ui";
+import { isDefaultGroup } from "metabase/utils/groups";
import { AllUsersHigherAccessTooltipIcon } from "metabase-enterprise/ai-controls/components/AllUsersHigherAccessTooltipIcon";
import {
AIToolKey,
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsx
index 946f6533b3c..e4055e352ea 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotSystemPromptsPage/MetabotSystemPromptsPage.tsx
@@ -4,9 +4,9 @@ import {
SettingsPageWrapper,
SettingsSection,
} from "metabase/admin/components/SettingsSection";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Text, Textarea } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useAdminSettingWithDebouncedInput } from "metabase-enterprise/ai-controls/hooks";
import S from "./MetabotSystemPromptsPage.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx
index e7e10c71fb9..844d5529ffc 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsSettingsSection.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { useListPermissionsGroupsQuery } from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import { isDefaultGroup } from "metabase/lib/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { Tabs } from "metabase/ui";
+import { isDefaultGroup } from "metabase/utils/groups";
import {
useGetAIControlsGroupLimitsQuery,
useGetAIControlsInstanceLimitQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx
index 9715c4b9024..697ea28699a 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { isEmpty } from "underscore";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { isDefaultGroup } from "metabase/lib/groups";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Stack, Text, TextInput } from "metabase/ui";
+import { isDefaultGroup } from "metabase/utils/groups";
import { AllUsersHigherAccessTooltipIcon } from "metabase-enterprise/ai-controls/components/AllUsersHigherAccessTooltipIcon";
import { useUpdateAIControlsGroupLimitMutation } from "metabase-enterprise/api";
import type { GroupInfo } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts b/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts
index 4b7b7d4228d..a36bf921012 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/api.ts
@@ -1,4 +1,4 @@
-import { GET, PUT } from "metabase/lib/api";
+import { GET, PUT } from "metabase/utils/api";
export const ApplicationPermissionsApi = {
graph: GET("/api/ee/advanced-permissions/application/graph"),
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx
index 8c5cf490afa..39a61268b98 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx
@@ -6,7 +6,7 @@ import { ApplicationPermissionsHelp } from "metabase/admin/permissions/component
import { PermissionsEditor } from "metabase/admin/permissions/components/PermissionsEditor";
import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";
import { Groups } from "metabase/entities/groups";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import {
initializeApplicationPermissions,
saveApplicationPermissions,
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js
index 3ab53f875e0..9573bc0339f 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js
@@ -2,13 +2,13 @@ import { assocIn } from "icepick";
import { t } from "ttag";
import { getErrorMessage } from "metabase/api/utils";
+import { addUndo } from "metabase/redux/undo";
import {
combineReducers,
createAction,
createThunkAction,
handleActions,
-} from "metabase/lib/redux";
-import { addUndo } from "metabase/redux/undo";
+} from "metabase/utils/redux";
import { ApplicationPermissionsApi } from "./api";
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
index 430d28d760e..e7c760b56e9 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
@@ -9,8 +9,8 @@ import {
getDefaultGroup,
getOrderedGroups,
} from "metabase/admin/permissions/selectors/data-permissions/groups";
-import { getGroupNameLocalized, isAdminGroup } from "metabase/lib/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
+import { getGroupNameLocalized, isAdminGroup } from "metabase/utils/groups";
import type { Group } from "metabase-types/api";
import { APPLICATION_PERMISSIONS_OPTIONS } from "./constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx
index 0eb106f188c..90f2680f170 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx
@@ -9,8 +9,8 @@ import { CheckBox } from "metabase/common/components/CheckBox";
import { EmptyState } from "metabase/common/components/EmptyState";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { displayNameForColumn, formatValue } from "metabase/lib/formatting";
import { Icon } from "metabase/ui";
+import { displayNameForColumn, formatValue } from "metabase/utils/formatting";
import { registerVisualization } from "metabase/visualizations/index";
import { isColumnRightAligned } from "metabase/visualizations/lib/table";
import { Table } from "metabase/visualizations/visualizations/Table/Table";
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsx
index a925716ee87..9955d0710ee 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsLink.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
import SidesheetS from "metabase/common/components/Sidesheet/sidesheet.module.css";
-import * as Urls from "metabase/lib/urls";
import type { InsightsLinkProps } from "metabase/plugins";
import { Flex, Icon } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { useGetAuditInfoQuery } from "metabase-enterprise/api";
import type { Collection } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx
index 1d823d8b0c5..544ed76b027 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import * as Urls from "metabase/lib/urls";
import type { InsightsMenuItemProps } from "metabase/plugins";
import { Icon, Menu } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { useGetAuditInfoQuery } from "metabase-enterprise/api";
export const InsightsMenuItem = ({
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx
index 8a87a3d698b..977afd14e48 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx
@@ -9,8 +9,8 @@ import _ from "underscore";
import { PaginationControls } from "metabase/common/components/PaginationControls";
import { usePagination } from "metabase/common/hooks/use-pagination";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import Question from "metabase-lib/v1/Question";
import { AuditMode } from "../lib/mode";
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx
index e7b710d77de..8dec8463d78 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/UnsubscribeUserModal/UnsubscribeUserModal.tsx
@@ -5,8 +5,8 @@ import { useGetUserQuery } from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useToast } from "metabase/common/hooks/use-toast";
-import { getResponseErrorMessage } from "metabase/lib/errors";
import { Stack, Text } from "metabase/ui";
+import { getResponseErrorMessage } from "metabase/utils/errors";
import { AuditApi } from "metabase-enterprise/services";
import type { User } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js b/enterprise/frontend/src/metabase-enterprise/audit_app/index.js
index 4f52c4fec69..9bfa7f79df3 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/index.js
@@ -1,13 +1,13 @@
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { isInternalUser } from "metabase/lib/urls";
import {
PLUGIN_ADMIN_USER_MENU_ITEMS,
PLUGIN_ADMIN_USER_MENU_ROUTES,
PLUGIN_AUDIT,
} from "metabase/plugins";
import { Menu } from "metabase/ui";
+import { isInternalUser } from "metabase/utils/urls";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { InsightsLink } from "./components/InsightsLink";
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/actions.ts b/enterprise/frontend/src/metabase-enterprise/auth/actions.ts
index b489a08d139..fbc683a3ca7 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/actions.ts
+++ b/enterprise/frontend/src/metabase-enterprise/auth/actions.ts
@@ -1,7 +1,7 @@
import { createAsyncThunk } from "@reduxjs/toolkit";
-import { redirect } from "metabase/lib/dom";
import { getSetting } from "metabase/selectors/settings";
+import { redirect } from "metabase/utils/dom";
import type { State } from "metabase-types/store";
import { getSSOUrl } from "./utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
index f0d9bce59ee..2e9150348a8 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
@@ -26,9 +26,9 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Button, Flex, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import {
type CustomOidcConfig,
type OidcCheckRequest,
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsx
index 23b6cc67163..04d630cd26b 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.tsx
@@ -2,8 +2,8 @@ import { useCallback, useEffect } from "react";
import { t } from "ttag";
import { AuthButton } from "metabase/auth/components/AuthButton";
-import { isWithinIframe } from "metabase/lib/dom";
-import { useDispatch } from "metabase/lib/redux";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { useDispatch } from "metabase/utils/redux";
import { loginSSO } from "../../actions";
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx
index 08813e3dfa4..74d03e813c8 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SsoButton/SsoButton.unit.spec.tsx
@@ -1,5 +1,6 @@
import { renderWithProviders, waitFor } from "__support__/ui";
-import * as domUtils from "metabase/lib/dom";
+import * as domUtils from "metabase/utils/dom";
+import * as iframeUtils from "metabase/utils/iframe";
import {
createMockSettingsState,
createMockState,
@@ -17,7 +18,7 @@ const setup = () => {
});
// simulate ebmedding
- jest.spyOn(domUtils, "isWithinIframe").mockReturnValue(true);
+ jest.spyOn(iframeUtils, "isWithinIframe").mockReturnValue(true);
renderWithProviders(<SsoButton />, { storeInitialState: state });
};
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/index.ts b/enterprise/frontend/src/metabase-enterprise/auth/index.ts
index 642097e0e46..915b912a720 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/auth/index.ts
@@ -1,5 +1,4 @@
import { LOGIN, LOGIN_GOOGLE } from "metabase/auth/actions";
-import MetabaseSettings from "metabase/lib/settings";
import {
PLUGIN_AUTH_PROVIDERS,
PLUGIN_IS_PASSWORD_USER,
@@ -7,6 +6,7 @@ import {
PLUGIN_REDUX_MIDDLEWARES,
} from "metabase/plugins";
import type { AuthProvider } from "metabase/plugins/types";
+import MetabaseSettings from "metabase/utils/settings";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import type { OidcAuthProvider, User } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js b/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js
index 11ab7d380b8..a4221530548 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js
+++ b/enterprise/frontend/src/metabase-enterprise/auth/middleware/session-middleware.js
@@ -2,7 +2,7 @@ import Cookies from "js-cookie";
import { replace } from "react-router-redux";
import { logout, refreshSession } from "metabase/auth/actions";
-import { isSameOrSiteUrlOrigin } from "metabase/lib/dom";
+import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
export const SESSION_KEY = "metabase.TIMEOUT";
export const COOKIE_POOLING_TIMEOUT = 3000;
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx
index 997c77d6433..a1d239aa55d 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/TableRowForCacheableItem.tsx
@@ -4,9 +4,9 @@ import { getShortStrategyLabel } from "metabase/admin/performance/utils";
import { MaybeLink } from "metabase/common/components/Badge/Badge.styled";
import { EllipsifiedCollectionPath } from "metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath";
import { Link } from "metabase/common/components/Link";
-import { getIcon } from "metabase/lib/icon";
-import * as Urls from "metabase/lib/urls";
import { Box, Button, Ellipsified, FixedSizeIcon, Flex } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import * as Urls from "metabase/utils/urls";
import type { CacheableModel } from "metabase-types/api";
import type { CacheableItem, UpdateTarget } from "../types";
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsx
index 0d24c1a2bb6..37c7c790634 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/utils.tsx
@@ -1,7 +1,7 @@
import { match } from "ts-pattern";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import type { CacheableDashboard, CacheableModel } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
index c61dbc79ecc..bd37c6b137e 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
@@ -10,11 +10,11 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import CS from "metabase/css/core/index.css";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { MetricPageShell } from "metabase/metrics/components/MetricPageShell";
import { metricUrls as defaultUrls } from "metabase/metrics/urls";
import type { MetricSettingsPageProps } from "metabase/plugins/oss/caching";
import { Card, Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { getItemName } from "metabase-enterprise/caching/components/utils";
import Question from "metabase-lib/v1/Question";
import type { CacheableModel } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/utils.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/caching/utils.unit.spec.tsx
index e482d95174d..451e6780646 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/utils.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/utils.unit.spec.tsx
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { CardType } from "metabase-types/api";
import { createMockCard, createMockSettings } from "metabase-types/api/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx
index dac2dbb1463..bb0b5d522fa 100644
--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx
@@ -8,9 +8,9 @@ import { PaginationControls } from "metabase/common/components/PaginationControl
import { useUserSetting } from "metabase/common/hooks";
import { useListSelect } from "metabase/common/hooks/use-list-select";
import { Search } from "metabase/entities/search";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Flex, Modal } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";
import type { SortingOptions } from "metabase-types/api/sorting";
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx
index b8bcd2220e2..2adc8608911 100644
--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx
@@ -11,8 +11,8 @@ import {
TableColumn,
} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";
import { Columns } from "metabase/common/components/ItemsTable/Columns";
-import { getIcon } from "metabase/lib/icon";
import { Ellipsified, FixedSizeIcon, Flex, Tooltip } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
import type { SortingOptions } from "metabase-types/api/sorting";
import type {
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.ts b/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.ts
index 34542f18d92..7ca37fe6fc5 100644
--- a/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
export const trackStaleItemsArchived = ({
collection_id,
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsx
index df8906f4bee..6569003220a 100644
--- a/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/index.tsx
@@ -4,9 +4,9 @@ import { skipToken, useListCollectionItemsQuery } from "metabase/api";
import { ForwardRefLink } from "metabase/common/components/Link";
import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen";
import { ModalRoute } from "metabase/hoc/ModalRoute";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import { Badge, Icon, Menu } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";
import { hasPremiumFeature } from "metabase-enterprise/settings";
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx
index c00958b5115..ed9a5a4deeb 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx
@@ -1,9 +1,9 @@
import { useMemo } from "react";
import { t } from "ttag";
-import type { ObjectWithModel } from "metabase/lib/icon";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import { Group, Icon, Text } from "metabase/ui";
+import type { ObjectWithModel } from "metabase/utils/icon";
import type { Collection } from "metabase-types/api";
export const CollectionAuthorityLevelDisplay = ({
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts b/enterprise/frontend/src/metabase-enterprise/collections/utils.ts
index c77c29277c6..29d710b2b50 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/collections/utils.ts
@@ -3,9 +3,9 @@ import type {
CollectionInstanceAnaltyicsConfig,
} from "metabase/collections/types";
import { getLibraryCollectionType } from "metabase/data-studio/utils";
-import type { IconData, ObjectWithModel } from "metabase/lib/icon";
-import { getIconBase } from "metabase/lib/icon";
import type { ItemWithCollection } from "metabase/plugins";
+import type { IconData, ObjectWithModel } from "metabase/utils/icon";
+import { getIconBase } from "metabase/utils/icon";
import type {
Bookmark,
Collection,
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
index 85914af83e2..3c9004e6bec 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
@@ -24,7 +24,6 @@ import {
FormSubmitButton,
useFormContext,
} from "metabase/forms";
-import { openSaveDialog } from "metabase/lib/dom";
import {
Button,
Group,
@@ -35,6 +34,7 @@ import {
Text,
Title,
} from "metabase/ui";
+import { openSaveDialog } from "metabase/utils/dom";
import { useUploadContentTranslationDictionaryMutation } from "metabase-enterprise/api";
import { contentTranslationEndpoints } from "../../constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx
index 50ceccc8404..77ed90993cc 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/CreateMenu.tsx
@@ -4,14 +4,14 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { trackMetricCreateStarted } from "metabase/data-studio/analytics";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import {
canUserCreateNativeQueries,
canUserCreateQueries,
} from "metabase/selectors/user";
import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { CollectionId } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
index fe4036b0095..2c0e8521784 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/LibraryPage.tsx
@@ -22,8 +22,6 @@ import {
} from "metabase/data-studio/common/utils";
import type { ExpandedState } from "metabase/data-studio/data-model/components/TablePicker/types";
import { LibraryUpsellPage } from "metabase/data-studio/upsells/pages";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { useRouter } from "metabase/router";
import {
@@ -40,6 +38,8 @@ import {
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { Collection, CollectionId } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx
index 4fc88dac257..c23412096cf 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.tsx
@@ -1,10 +1,10 @@
import { Link } from "react-router";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
-import { dataStudioArchivedSnippets } from "metabase/lib/urls";
import { getUserIsAdmin } from "metabase/selectors/user";
import { ActionIcon, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { dataStudioArchivedSnippets } from "metabase/utils/urls";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { CollectionId } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx
index af72239f08a..0e105ee8b17 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/RootSnippetsCollectionMenu.unit.spec.tsx
@@ -3,7 +3,7 @@ import { Route } from "react-router";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import { dataStudioArchivedSnippets } from "metabase/lib/urls";
+import { dataStudioArchivedSnippets } from "metabase/utils/urls";
import type { EnterpriseSettings } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks/state";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts
index 1456463a224..e897245f3ea 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks.ts
@@ -9,9 +9,9 @@ import type {
TreeItem,
} from "metabase/data-studio/common/types";
import { createEmptyStateItem } from "metabase/data-studio/common/utils";
-import { getIcon } from "metabase/lib/icon";
-import { useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { getIcon } from "metabase/utils/icon";
+import { useSelector } from "metabase/utils/redux";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { Collection, CollectionId } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
index f989964831e..2326703fcb4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx
@@ -10,8 +10,6 @@ import {
FormProvider,
FormSubmitButton,
} from "metabase/forms";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import type { PublishTablesModalProps } from "metabase/plugins";
import {
@@ -24,6 +22,8 @@ import {
Stack,
Text,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { usePublishTablesMutation } from "metabase-enterprise/api";
import type {
BulkTableInfo,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
index 38e86949f2e..81a3e9c5529 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
@@ -1,7 +1,7 @@
import { Link } from "metabase/common/components/Link";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Card } from "metabase-types/api";
interface DataStudioMetricBreadcrumbsProps {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
index 114526f632a..78d86473486 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -3,8 +3,8 @@ import { Link, type Route } from "react-router";
import { t } from "ttag";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import * as Urls from "metabase/lib/urls";
import { NewMetricPage } from "metabase/metrics/pages/NewMetricPage";
+import * as Urls from "metabase/utils/urls";
import { dataStudioMetricUrls } from "../../urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
index cae5e75b942..1ab55c2cc5c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
@@ -1,5 +1,5 @@
-import * as Urls from "metabase/lib/urls";
import type { MetricUrls } from "metabase/metrics/types";
+import * as Urls from "metabase/utils/urls";
export const dataStudioMetricUrls: MetricUrls = {
about: Urls.dataStudioMetric,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
index c4acd059e04..63c85014ec3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx
@@ -14,9 +14,9 @@ import {
PaneHeaderTabs,
} from "metabase/data-studio/common/components/PaneHeader";
import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { NativeQuerySnippet } from "metabase-types/api";
import { SnippetMoreMenu } from "../SnippetMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
index 2d1f71936f3..6857249cf73 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { useUpdateSnippetMutation } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { useToast } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Button, Group, Modal, Stack, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { NativeQuerySnippet } from "metabase-types/api";
type ArchiveSnippetModalProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
index 3dd5af58282..721c9cc466a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/ArchivedSnippetsPage.tsx
@@ -9,7 +9,6 @@ import { SectionLayout } from "metabase/data-studio/app/components/SectionLayout
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { useBuildSnippetTree } from "metabase/data-studio/common/hooks/use-build-snippet-tree";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
Card,
@@ -21,6 +20,7 @@ import {
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { CollectionItem } from "metabase-types/api";
import { useColumnDef } from "./hooks/useColumnDef";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx
index 13658cc7b07..f05da6347fa 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx
@@ -6,7 +6,6 @@ import {
isCollection,
isEmptyStateData,
} from "metabase/data-studio/common/utils";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import {
ActionIcon,
@@ -15,6 +14,7 @@ import {
Tooltip,
type TreeTableColumnDef,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import type { CollectionItem } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
index ad63ae95ba4..702aa573c1a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
@@ -18,10 +18,10 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { useToast } from "metabase/common/hooks";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { Alert, Card, Center, Flex, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { SnippetDescriptionSection } from "../../components/SnippetDescriptionSection";
import { SnippetHeader } from "../../components/SnippetHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
index 7cf56cd84a5..6dbbca3f36a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
@@ -19,10 +19,10 @@ import {
PaneHeaderActions,
PaneHeaderInput,
} from "metabase/data-studio/common/components/PaneHeader";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_REMOTE_SYNC, PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
import { Card, Flex, Stack } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type {
NativeQuerySnippet,
RegularCollectionId,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
index b776a91f1d7..bc946add648 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/SnippetDependenciesPage/SnippetDependenciesPage.tsx
@@ -3,9 +3,9 @@ import type { ReactNode } from "react";
import { skipToken, useGetSnippetQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { SnippetHeader } from "../../components/SnippetHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts
index 2ab5d15770f..370604b92d0 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts
@@ -1,5 +1,5 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
import type { MetadataEditEventDetail } from "metabase/metadata/pages/shared/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export function trackMetadataChange(detail: MetadataEditEventDetail) {
trackSimpleEvent({
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
index 99fd5b2f48e..fd271b42f03 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableHeader.tsx
@@ -5,7 +5,7 @@ import {
type PaneHeaderProps,
} from "metabase/data-studio/common/components/PaneHeader";
import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
import { TableMoreMenu } from "./TableMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
index 4ed0536efd7..da683dc9662 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableMoreMenu/TableMoreMenu.tsx
@@ -3,10 +3,10 @@ import { push } from "react-router-redux";
import { c, t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { ActionIcon, Icon, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
type TableModalType = "unpublish";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
index 76ed6361023..b8f023bf7f4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/components/TableHeader/TableTabs/TableTabs.tsx
@@ -5,10 +5,10 @@ import {
type PaneHeaderTab,
PaneHeaderTabs,
} from "metabase/data-studio/common/components/PaneHeader";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getLocation } from "metabase/selectors/routing";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
type TableTabsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
index 366c8f054e1..1e4ab44b3ac 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableDependenciesPage/TableDependenciesPage.tsx
@@ -3,9 +3,9 @@ import type { ReactNode } from "react";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
index 47b744adaca..61ca7b6c944 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableFieldsPage/TableFieldsPage.tsx
@@ -6,7 +6,6 @@ import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer/PageContainer";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import {
FieldEmptyState,
FieldSection,
@@ -26,6 +25,7 @@ import {
Stack,
Text,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { trackMetadataChange } from "../../analytics";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
index 2d2b4715cad..2ba69d926b9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasures.tsx
@@ -6,9 +6,9 @@ import {
EntityListItem,
} from "metabase/data-studio/common/components/EntityList";
import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Flex } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { ConcreteTableId, Table } from "metabase-types/api";
type TableMeasuresProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
index 07fd7e1c1d9..85dd60a0277 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
index 53efac06763..47e405a8960 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
@@ -6,8 +6,6 @@ import { DateTime } from "metabase/common/components/DateTime";
import { EditableText } from "metabase/common/components/EditableText";
import { Link } from "metabase/common/components/Link/Link";
import { useNumberFormatter } from "metabase/common/hooks/use-number-formatter";
-import { isNullOrUndefined } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import {
DataSourceInput,
EntityTypeInput,
@@ -26,6 +24,8 @@ import {
Text,
rem,
} from "metabase/ui";
+import { isNullOrUndefined } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import type { Table, TableDataSource, UserId } from "metabase-types/api";
import S from "./DescriptionSection.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
index 20f20e3edc4..e84fa75c279 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/TableOverview.tsx
@@ -1,9 +1,9 @@
import { useMemo } from "react";
import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Flex, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
index 7276be0d998..7427dc712a0 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverviewPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
index ceca1235b0b..f47b3ef2eda 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegments.tsx
@@ -6,9 +6,9 @@ import {
EntityListItem,
} from "metabase/data-studio/common/components/EntityList";
import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Flex } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { ConcreteTableId, Table } from "metabase-types/api";
type TableSegmentsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
index 3c6f18e9179..f1680e722f4 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableSegmentsPage/TableSegmentsPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TableHeader } from "../../components/TableHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.tsx
index 1049e672a43..2cbc4f7d070 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/EditTransformMenu/EditTransformMenu.tsx
@@ -3,9 +3,6 @@ import { Link } from "react-router";
import { push } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { transformEdit } from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import type { EditTransformMenuProps } from "metabase/plugins/oss/database";
import {
@@ -20,6 +17,9 @@ import {
Text,
Tooltip,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
+import { transformEdit } from "metabase/utils/urls";
import {
useCreateWorkspaceMutation,
useGetWorkspaceCheckoutQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts
index 020affdbe2a..5bb13699b14 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/hooks/useTransformSources.ts
@@ -1,8 +1,8 @@
import { useMemo } from "react";
import { useGetTransformQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import { useGetWorkspaceTransformQuery } from "metabase-enterprise/api";
import type {
PythonTransformSource,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx
index 1b2af70c66e..31b19f75733 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/WorkspaceSection.tsx
@@ -8,8 +8,6 @@ import { t } from "ttag";
import { ConfirmModal } from "metabase/common/components/ConfirmModal/ConfirmModal";
import { ForwardRefLink } from "metabase/common/components/Link";
import S from "metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.module.css";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import type { WorkspacesSectionProps } from "metabase/plugins/oss/database";
import { getLocation } from "metabase/selectors/routing";
@@ -29,6 +27,8 @@ import {
UnstyledButton,
} from "metabase/ui";
import type { MetabaseColorKey } from "metabase/ui/colors/types";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import {
useArchiveWorkspaceMutation,
useCreateWorkspaceMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/hooks/use-workspace-transform-run.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/hooks/use-workspace-transform-run.ts
index f486eaaca0d..bf516cb0de3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/hooks/use-workspace-transform-run.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/hooks/use-workspace-transform-run.ts
@@ -1,8 +1,8 @@
import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { useDispatch } from "metabase/utils/redux";
import {
useGetWorkspaceTransformQuery,
useRunWorkspaceTransformMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
index abc291c76b4..dd6df4d78eb 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspaceListPage/WorkspaceListPage.tsx
@@ -3,9 +3,9 @@ import { replace } from "react-router-redux";
import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Box, Text, Title } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { useGetWorkspacesQuery } from "metabase-enterprise/api";
export function WorkspaceListPage() {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx
index 169a178f8f5..192c47377a2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/SaveTransformButton.tsx
@@ -1,13 +1,13 @@
import { useMemo, useState } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
import { CreateTransformModal } from "metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal";
import type { NewTransformValues } from "metabase/transforms/pages/NewTransformPage/CreateTransformModal/form";
import { isSourceEmpty } from "metabase/transforms/utils";
import { Button } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import {
useCreateWorkspaceTransformMutation,
useUpdateWorkspaceTransformMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsx
index b5a9cacc9da..be63fc3c243 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/TransformTabContent.tsx
@@ -2,7 +2,6 @@ import { useDisclosure } from "@mantine/hooks";
import { useCallback, useEffect, useRef, useState } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
deactivateSuggestedTransform,
getMetabotSuggestedTransform,
@@ -15,6 +14,7 @@ import {
getInitialPythonSource,
} from "metabase/transforms/pages/NewTransformPage/utils";
import { Box, Button, Group, Icon, Stack } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { useDryRunWorkspaceTransformMutation } from "metabase-enterprise/api";
import { useWorkspaceTransformRun } from "metabase-enterprise/data-studio/workspaces/hooks";
import * as Lib from "metabase-lib";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx
index 6c0080e48ed..0234bba72b9 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/TransformTab/UpdateTargetModal/UpdateTargetModal.tsx
@@ -16,11 +16,11 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { SchemaFormSelect } from "metabase/transforms/components/SchemaFormSelect";
import { sourceDatabaseId } from "metabase/transforms/utils";
import { Box, Button, FocusTrap, Group, Modal, Stack, Text } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import { useUpdateWorkspaceTransformMutation } from "metabase-enterprise/api";
import type {
UpdateWorkspaceTransformRequest,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx
index 33949c60efb..ade77af1421 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/WorkspacePage.tsx
@@ -23,9 +23,6 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { ResizeHandle } from "metabase/common/components/ResizeHandle";
import { Sortable } from "metabase/common/components/Sortable";
import { PaneHeaderInput } from "metabase/data-studio/common/components/PaneHeader";
-import { useDispatch } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import { NAME_MAX_LENGTH } from "metabase/transforms/constants";
import {
ActionIcon,
@@ -37,6 +34,9 @@ import {
Stack,
Tabs,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import { MergeWorkspaceModal } from "metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/MergeWorkspaceModal";
import { RunWorkspaceMenu } from "metabase-enterprise/data-studio/workspaces/components/RunWorkspaceMenu/RunWorkspaceMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts
index c08826e79b6..a2561f8e800 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceActions.ts
@@ -2,9 +2,9 @@ import { useCallback, useState } from "react";
import { replace } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import {
useLazyGetWorkspaceTablesQuery,
useMergeWorkspaceMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts
index 458bc0d4463..656e03e2ee6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/useWorkspaceMetabot.ts
@@ -3,8 +3,6 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { useLazyGetTransformQuery } from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useRegisterMetabotContextProvider } from "metabase/metabot";
import { METABOT_PROFILE_OVERRIDES } from "metabase/metabot/constants";
import type {
@@ -26,6 +24,8 @@ import {
import { metabotActions } from "metabase/metabot/state/reducer";
import { getMetabotState } from "metabase/metabot/state/selectors";
import { getIsWorkspace } from "metabase/selectors/routing";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { useEnterpriseSelector } from "metabase-enterprise/redux";
import type {
DatabaseId,
diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx
index 2124c3f8ea8..0bfd10c1d9f 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationError.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { useSelector } from "metabase/lib/redux";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Button, Flex, Group, Icon, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const DatabaseReplicationError = ({
error,
diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx
index 7202fdc5399..0f855dad8ff 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx
@@ -12,7 +12,6 @@ import {
FormSubmitButton,
FormTextarea,
} from "metabase/forms";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import {
Box,
Card,
@@ -28,6 +27,7 @@ import {
Text,
UnstyledButton,
} from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import type {
PreviewDatabaseReplicationResponse,
TableInfo,
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx
index 5f7a3e0ed3b..0d1363688ba 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx
@@ -19,7 +19,6 @@ import {
import { getErrorMessage } from "metabase/api/utils";
import { useSetting } from "metabase/common/hooks";
import { useToast } from "metabase/common/hooks/use-toast";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import {
Alert,
@@ -34,6 +33,7 @@ import {
Tooltip,
UnstyledButton,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useUpdateRouterDatabaseMutation } from "metabase-enterprise/api";
import { renderUserAttributesForSelect } from "metabase-enterprise/sandboxes/utils";
import * as Urls from "metabase-enterprise/urls";
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx
index 20ffeb165aa..3fce594301f 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx
@@ -9,10 +9,10 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useDocsUrl } from "metabase/common/hooks";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { addUndo } from "metabase/redux/undo";
import { Flex, Icon, Modal, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { useCreateDestinationDatabaseMutation } from "metabase-enterprise/api";
import type { Database, DatabaseData } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx
index dc906a16748..3eceafe548d 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesList/DestinationDatabasesList.tsx
@@ -6,9 +6,9 @@ import { DatabaseConnectionHealthInfo } from "metabase/admin/databases/component
import { useListDatabasesQuery } from "metabase/api";
import { ForwardRefLink } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Flex, Icon, Menu, Text, UnstyledButton } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Urls from "metabase-enterprise/urls";
import type { Database, DatabaseId } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx
index bec66ef5bfe..53193a876ef 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabasesModal/DestinationDatabasesModal.tsx
@@ -1,9 +1,9 @@
import { push } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Modal } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { DestinationDatabasesList } from "../DestinationDatabasesList";
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx
index d6f820e2a26..7334e22aeca 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/RemoveDestinationDatabaseModal.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { DeleteDatabaseModal } from "metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal";
import { useDeleteDatabaseMutation, useGetDatabaseQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Modal } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
export const RemoveDestinationDatabaseModal = ({
params,
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts b/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts
index 82517dad62a..2e1de343193 100644
--- a/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts
+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/hooks.ts
@@ -1,7 +1,7 @@
import { useEffect } from "react";
import { replace } from "react-router-redux";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import * as Urls from "metabase-enterprise/urls";
import type { Database } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
index 6c838e4e574..d95c72817fb 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.tsx
@@ -9,7 +9,6 @@ import {
FormProvider,
FormSubmitButton,
} from "metabase/forms";
-import * as Urls from "metabase/lib/urls";
import type { CheckDependenciesFormProps } from "metabase/plugins";
import {
Anchor,
@@ -22,6 +21,7 @@ import {
Stack,
Text,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import visualizations from "metabase/visualizations";
import type {
Card as ApiCard,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx
index beccb13226e..a69e032ca90 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DependencyDiagnostics.tsx
@@ -4,8 +4,8 @@ import { useLayoutEffect, useState } from "react";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { trackDependencyDiagnosticsEntitySelected } from "metabase/data-studio/analytics";
-import type * as Urls from "metabase/lib/urls";
import { Center, Flex, Stack } from "metabase/ui";
+import type * as Urls from "metabase/utils/urls";
import {
useListBreakingGraphNodesQuery,
useListUnreferencedGraphNodesQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsFilterBar/DiagnosticsFilterBar.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsFilterBar/DiagnosticsFilterBar.tsx
index d55ec7f0f2c..bffe31c7a6e 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsFilterBar/DiagnosticsFilterBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsFilterBar/DiagnosticsFilterBar.tsx
@@ -2,8 +2,8 @@ import { useDebouncedCallback } from "@mantine/hooks";
import { type ChangeEvent, memo, useState } from "react";
import { t } from "ttag";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { FixedSizeIcon, Group, Loader, TextInput } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import type { DependencyFilterOptions } from "../../../types";
import { areFilterOptionsEqual, getSearchQuery } from "../../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx
index fad6c7d875f..e8ed0ee8a61 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsHeader/DiagnosticsHeader.tsx
@@ -7,7 +7,7 @@ import {
type PaneHeaderTab,
PaneHeaderTabs,
} from "metabase/data-studio/common/components/PaneHeader";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
export const DiagnosticsHeader = memo(function DiagnosticsHeader() {
const tabs: PaneHeaderTab[] = [
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsx
index f25e1b3523e..adc9ae41d3d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/InfoSection/InfoSection.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { DateTime } from "metabase/common/components/DateTime";
import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
-import { getUserName } from "metabase/lib/user";
import { Anchor, Box, Card, FixedSizeIcon, Group, Stack } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
+import { getUserName } from "metabase/utils/user";
import type { DependencyNode } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
index 1476f5fbdf6..215965cf068 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/DiagnosticsSidebar/SidebarHeader/SidebarHeader.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
-import * as Urls from "metabase/lib/urls";
import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { DependencyNode } from "metabase-types/api";
import { TOOLTIP_OPEN_DELAY_MS } from "../../../../constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.ts
index bb0d80274b6..eb66f57fad9 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyDiagnostics/utils.ts
@@ -1,4 +1,4 @@
-import type * as Urls from "metabase/lib/urls";
+import type * as Urls from "metabase/utils/urls";
import { DEFAULT_INCLUDE_PERSONAL_COLLECTIONS } from "../../constants";
import type {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx
index 4e700078d07..cf087bf223d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/GraphDependencyPanel.tsx
@@ -3,8 +3,8 @@ import { useLayoutEffect, useState } from "react";
import { t } from "ttag";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { Box, Card } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import { useListNodeDependentsQuery } from "metabase-enterprise/api";
import type {
DependencyEntry,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/EntrySearchInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/EntrySearchInput.tsx
index 3c5a474e5b1..9c30cd9ce22 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/EntrySearchInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/EntrySearchInput/EntrySearchInput.tsx
@@ -7,8 +7,8 @@ import {
useLogRecentItemMutation,
useSearchQuery,
} from "metabase/api";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { DefaultSelectItem, FixedSizeIcon, Loader, Select } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import {
type DependencyEntry,
type SearchModel,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
index c01caca1870..0c05eb72111 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphEntryInput/GraphEntryInput.tsx
@@ -3,8 +3,8 @@ import { useState } from "react";
import { push } from "react-router-redux";
import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
-import { useDispatch } from "metabase/lib/redux";
import { Card } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type {
DependencyEntry,
DependencyNode,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx
index 71cfd26cd56..a9a3250d702 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { EntityCreationInfo } from "metabase/common/components/EntityCreationInfo";
import { getColumnIcon } from "metabase/common/utils/columns";
import CS from "metabase/css/core/index.css";
-import { getUserName } from "metabase/lib/user";
import { Box, FixedSizeIcon, Group, Stack, Text, Title } from "metabase/ui";
+import { getUserName } from "metabase/utils/user";
import * as Lib from "metabase-lib";
import type { DependencyEntry, DependencyNode } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx
index f0f3bc46a56..64851bb3b31 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/PanelBody.unit.spec.tsx
@@ -1,7 +1,7 @@
import { Route } from "react-router";
import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { DependencyEntry, DependencyNode } from "metabase-types/api";
import {
createMockCardDependencyNode,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts
index 4d8c5fc5068..463d0e1690b 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { DependencyEntry, DependencyNode } from "metabase-types/api";
import type { NodeTableInfo } from "./types";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
index 6807c17e6ed..142a46bb8b1 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
import {
Box,
Breadcrumbs,
@@ -14,6 +13,7 @@ import {
Menu,
Stack,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { DependencyNode } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts
index c68aa5d9ef8..31a783ba7af 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/hooks/use-check-card-dependencies/use-check-card-dependencies.ts
@@ -1,11 +1,11 @@
import { useCallback } from "react";
-import { useStore } from "metabase/lib/redux";
import type {
UseCheckDependenciesProps,
UseCheckDependenciesResult,
} from "metabase/plugins";
import { getSubmittableQuestion } from "metabase/query_builder/selectors";
+import { useStore } from "metabase/utils/redux";
import { useLazyCheckCardDependenciesQuery } from "metabase-enterprise/api";
import type Question from "metabase-lib/v1/Question";
import type { CheckCardDependenciesRequest } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx
index 9c7b1a82b54..fa90dda61ef 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.tsx
@@ -3,8 +3,8 @@ import { useEffect, useMemo, useRef } from "react";
import { replace } from "react-router-redux";
import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";
-import { useDispatch } from "metabase/lib/redux";
-import type * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import type * as Urls from "metabase/utils/urls";
import { DependencyDiagnostics } from "../../components/DependencyDiagnostics";
import type {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsx
index 4f08fbf59d1..b099248e6ae 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/DependencyDiagnosticsPage.unit.spec.tsx
@@ -12,7 +12,7 @@ import {
screen,
within,
} from "__support__/ui";
-import type * as Urls from "metabase/lib/urls";
+import type * as Urls from "metabase/utils/urls";
import type {
DependencyDiagnosticsUserParams,
DependencyNode,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.ts
index a669876bfca..65331ddf5a7 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyDiagnosticsPage/utils.ts
@@ -1,6 +1,6 @@
import type { Location } from "history";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import {
DEPENDENCY_GROUP_TYPES,
DEPENDENCY_SORT_COLUMNS,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx
index 5fe0634a993..9fa8e24862c 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/DependencyGraphPage.tsx
@@ -2,10 +2,10 @@ import type { Location } from "history";
import { useContext } from "react";
import { skipToken } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { AppSwitcher } from "metabase/nav/components/AppSwitcher";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Stack } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { useGetDependencyGraphQuery } from "metabase-enterprise/api";
import { DependencyGraph } from "../../components/DependencyGraph";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts
index 67c0ff5cd89..dc5982bd38a 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts
@@ -1,4 +1,4 @@
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import { DEPENDENCY_TYPES, type DependencyEntry } from "metabase-types/api";
export function parseDependencyEntry(
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
index 71fca4009b4..d1b543b0cad 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
@@ -1,8 +1,8 @@
import { c, msgid, ngettext, t } from "ttag";
-import * as Urls from "metabase/lib/urls";
-import type { NamedUser } from "metabase/lib/user";
import type { IconName } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
+import type { NamedUser } from "metabase/utils/user";
import visualizations from "metabase/visualizations";
import type {
AnalysisFindingError,
diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts
index dfd89154c1d..764ec5946ee 100644
--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts
@@ -5,7 +5,7 @@ import type {
PermissionSubject,
SpecialGroupType,
} from "metabase/admin/permissions/types";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { Group, GroupsPermissions } from "metabase-types/api";
import { buildDataModelPermission } from "./data-model-permission";
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx
index e78ca580229..68aee04ba06 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx
@@ -6,8 +6,6 @@ import { t } from "ttag";
import { skipToken } from "metabase/api";
import { UpsellStorage } from "metabase/common/components/upsells/UpsellStorage";
import { useHasTokenFeature, useStoreUrl } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
-import { getSubpathSafeUrl } from "metabase/lib/urls";
import {
CONTENT_MAX_WIDTH,
ContactAdminAlert,
@@ -26,6 +24,8 @@ import {
Text,
Title,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { getSubpathSafeUrl } from "metabase/utils/urls";
import { useGetGsheetsFolderQuery } from "metabase-enterprise/api";
import {
DriveConnectionDisplay,
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
index e5cecab60a0..456b596f9de 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx
@@ -7,8 +7,6 @@ import { skipToken, useGetUserQuery } from "metabase/api";
import { CopyButton } from "metabase/common/components/CopyButton";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { Markdown } from "metabase/common/components/Markdown";
-import { useDispatch } from "metabase/lib/redux";
-import { getUserName } from "metabase/lib/user";
import {
Box,
Button,
@@ -20,6 +18,8 @@ import {
Text,
TextInput,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import { getUserName } from "metabase/utils/user";
import {
useGetGsheetsFolderQuery,
useGetServiceAccountQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx
index 2f77980cc8c..015299b46ad 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.tsx
@@ -6,9 +6,9 @@ import { t } from "ttag";
import { Api, skipToken } from "metabase/api";
import { tag } from "metabase/api/tags";
import { getErrorMessage } from "metabase/api/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import StatusLarge from "metabase/status/components/StatusLarge";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { useGetGsheetsFolderQuery } from "metabase-enterprise/api";
import { EnterpriseApi } from "metabase-enterprise/api/api";
import type { DatabaseId, GdrivePayload } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx
index bd1f7ab4e1e..c866da45afe 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveSyncStatus.unit.spec.tsx
@@ -9,7 +9,7 @@ import {
} from "__support__/server-mocks";
import { act, renderWithProviders, screen, waitFor } from "__support__/ui";
import { useListDatabasesQuery, useListTablesQuery } from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import { EnterpriseApi } from "metabase-enterprise/api/api";
import type { GdrivePayload } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx
index 90e0bdeee64..b2ac3b6c062 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { skipToken, useGetDatabaseQuery } from "metabase/api";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useSetting, useStoreUrl } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { _FileUploadErrorModal } from "metabase/status/components/FileUploadStatusLarge/FileUploadErrorModal";
import { Box, Button, Modal, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import databaseError from "./database-error.svg?component";
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.ts b/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.ts
index 94d2a7948d3..6bf79e0e5df 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export function trackSheetImportClick() {
trackSimpleEvent({
diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx
index cbf4d9146ef..59fa710dee8 100644
--- a/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/utils.tsx
@@ -5,8 +5,8 @@ import { t } from "ttag";
import { skipToken } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import {
useDeleteGsheetsFolderLinkMutation,
useGetServiceAccountQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts b/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts
index 5714d5fd43c..1dd0f1a5d97 100644
--- a/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts
+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/actions.ts
@@ -2,7 +2,7 @@ import { push } from "react-router-redux";
import { getAdminPaths } from "metabase/admin/app/selectors";
import { permissionApi } from "metabase/api";
-import { createThunkAction } from "metabase/lib/redux";
+import { createThunkAction } from "metabase/utils/redux";
import {
getRevokeManagerGroupsRedirect,
diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.ts b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.ts
index 2b5b1c9b924..c40c0803bec 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/utils.ts
@@ -1,4 +1,7 @@
-import { formatDateTimeWithUnit, formatNumber } from "metabase/lib/formatting";
+import {
+ formatDateTimeWithUnit,
+ formatNumber,
+} from "metabase/utils/formatting";
import type { BillingInfoLineItem } from "metabase-types/api";
import {
supportedDisplayTypes,
diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx
index 132e2ae34df..53536e8f743 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/license/components/LicenseAndBillingSettings/LicenseAndBillingSettings.tsx
@@ -13,9 +13,9 @@ import { useGetAdminSettingsDetailsQuery } from "metabase/api";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useSetting, useToast } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getUpgradeUrl } from "metabase/selectors/settings";
import { Box, Divider, Flex, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useGetBillingInfoQuery } from "metabase-enterprise/api";
import { useLicense } from "metabase-enterprise/settings/hooks/use-license";
import type { TokenStatus } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
index 3c8cc7a2385..dd38c2fcf2d 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
@@ -3,9 +3,9 @@ import { t } from "ttag";
import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";
import { useSetting, useStoreUrl, useToast } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import { getIsHosted } from "metabase/setup/selectors";
+import { useSelector } from "metabase/utils/redux";
import { useLicense } from "metabase-enterprise/settings/hooks/use-license";
const NOTIFICATION_TIMEOUT = 30_000;
diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx
index de9d21f08ff..1d895a96556 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.unit.spec.tsx
@@ -6,7 +6,7 @@ import {
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import * as domUtils from "metabase/lib/dom";
+import * as domUtils from "metabase/utils/dom";
import type { User } from "metabase-types/api";
import { createMockUser } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
index db32486ae1b..f10cef20afb 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabaseAIProviderSetup.tsx
@@ -4,8 +4,6 @@ import { jt, t } from "ttag";
import { getErrorMessage } from "metabase/api/utils";
import { useSetting } from "metabase/common/hooks";
-import { formatNumber } from "metabase/lib/formatting";
-import { useSelector } from "metabase/lib/redux";
import { getStoreUsers } from "metabase/selectors/store-users";
import {
Anchor,
@@ -22,6 +20,8 @@ import {
Tooltip,
UnstyledButton,
} from "metabase/ui";
+import { formatNumber } from "metabase/utils/formatting";
+import { useSelector } from "metabase/utils/redux";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { useGetMetabotUsageQuery } from "../../../api";
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/format.ts b/enterprise/frontend/src/metabase-enterprise/metabot/format.ts
index aafe6203f90..604bff0bc1f 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/format.ts
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/format.ts
@@ -1,4 +1,4 @@
-import { formatNumber } from "metabase/lib/formatting";
+import { formatNumber } from "metabase/utils/formatting";
export function formatMetabaseCost(value: number) {
return formatNumber(value, {
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/useMetabaseManagedAiPricing.ts b/enterprise/frontend/src/metabase-enterprise/metabot/useMetabaseManagedAiPricing.ts
index 0e07d89af0e..f25942e7d08 100644
--- a/enterprise/frontend/src/metabase-enterprise/metabot/useMetabaseManagedAiPricing.ts
+++ b/enterprise/frontend/src/metabase-enterprise/metabot/useMetabaseManagedAiPricing.ts
@@ -3,7 +3,7 @@ import { useMemo } from "react";
import {
type FormatNumberOptions,
formatNumber,
-} from "metabase/lib/formatting";
+} from "metabase/utils/formatting";
import { useListAddOnsQuery } from "metabase-enterprise/api";
import type { GetCloudAddOnsResponse } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx
index e4f6eecf400..fc8f5e7a62f 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.tsx
@@ -1,9 +1,9 @@
import { skipToken, useGetUserQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
-import { getRelativeTime } from "metabase/lib/time-dayjs";
import { getUser } from "metabase/selectors/user";
import { FixedSizeIcon, Flex, Icon, Text as UIText } from "metabase/ui";
import { alpha } from "metabase/ui/colors";
+import { useSelector } from "metabase/utils/redux";
+import { getRelativeTime } from "metabase/utils/time-dayjs";
import {
getIconForReview,
getLatestModerationReview,
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx
index bdbdc0d8727..2445ae96729 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewIcon/ModerationReviewIcon.tsx
@@ -1,5 +1,5 @@
-import { getRelativeTime } from "metabase/lib/time-dayjs";
import { Icon, Text, Tooltip } from "metabase/ui";
+import { getRelativeTime } from "metabase/utils/time-dayjs";
import type { ModerationReview, User } from "metabase-types/api";
import { getIconForReview, getModeratorDisplayText } from "../../service";
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx
index a4b2012ad42..67bef185480 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx
@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
import { Fragment } from "react";
import { useEditItemVerificationMutation } from "metabase/api";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import { getIsModerator } from "metabase-enterprise/moderation/selectors";
import { getLatestModerationReview } from "metabase-enterprise/moderation/service";
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx
index 357db380ac9..abbcee0b361 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/containers/ModerationReviewIcon/ModerationReviewIcon.tsx
@@ -1,7 +1,7 @@
import _ from "underscore";
-import { connect } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
import type { User } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx
index dd70ed9f94f..2f3400c6de9 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/hooks/useMenuItems.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { useEditItemVerificationMutation } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Icon, Menu } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Card, Dashboard, ModerationReview } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/redux.ts b/enterprise/frontend/src/metabase-enterprise/redux.ts
index 3c4724ea664..6ca948c4900 100644
--- a/enterprise/frontend/src/metabase-enterprise/redux.ts
+++ b/enterprise/frontend/src/metabase-enterprise/redux.ts
@@ -1,7 +1,7 @@
import type { TypedUseSelectorHook } from "react-redux";
import { createSelectorHook } from "react-redux";
-import { MetabaseReduxContext } from "metabase/lib/redux";
+import { MetabaseReduxContext } from "metabase/utils/redux";
// TODO: use the real type after we figure out what it is
type EnterpriseState = any;
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.ts
index 0d9be6f4fb2..21af6f1e155 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackBranchSwitched = ({
triggeredFrom,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsx
index 52327a87a0b..b0d2a69b83f 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/CollectionPath.tsx
@@ -1,7 +1,7 @@
import { Fragment } from "react";
-import { collection as collectionUrl } from "metabase/lib/urls";
import { Anchor, Group, Text } from "metabase/ui";
+import { collection as collectionUrl } from "metabase/utils/urls";
import type { CollectionPathSegment } from "../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsx
index 9c56fea98ba..0fe669bb23a 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/EntityLink.tsx
@@ -1,8 +1,8 @@
import { useMemo } from "react";
-import { type IconData, type IconModel, getIcon } from "metabase/lib/icon";
-import { modelToUrl } from "metabase/lib/urls";
import { Anchor, Group, Icon } from "metabase/ui";
+import { type IconData, type IconModel, getIcon } from "metabase/utils/icon";
+import { modelToUrl } from "metabase/utils/urls";
import type { RemoteSyncEntity } from "metabase-types/api";
import { getSyncStatusColor, getSyncStatusIcon } from "../../utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
index 785bd1559bb..45155a440e4 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
@@ -4,8 +4,8 @@ import { useCallback, useState } from "react";
import { t } from "ttag";
import { useToast } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Button, Combobox, Icon, Loader, Text, useCombobox } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import {
useGetHasRemoteChangesQuery,
useImportChangesMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsx
index c2538dbd3fc..5ed015f7ead 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncSetupMenuItem/GitSyncSetupMenuItem.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import type { GitSyncSetupMenuItemProps } from "metabase/plugins/types";
import { getUserIsAdmin } from "metabase/selectors/user";
import { FixedSizeIcon, Text, Tooltip, UnstyledButton } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import S from "./GitSyncSetupMenuItem.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx
index 65c60e2ddc0..add5a1645bf 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx
@@ -20,7 +20,6 @@ import {
FormSwitch,
FormTextInput,
} from "metabase/forms";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_TRANSFORMS } from "metabase/plugins";
import { getApplicationName } from "metabase/selectors/whitelabel";
import {
@@ -33,6 +32,7 @@ import {
Text,
Tooltip,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import {
useCreateLibraryMutation,
useGetLibraryCollectionQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsx
index 8ef2d4ebc63..69483ad4742 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SetupConflictInfo.tsx
@@ -1,8 +1,8 @@
import { useMemo } from "react";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { getCurrentTask } from "metabase-enterprise/remote_sync/selectors";
export const SetupConflictInfo = () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
index 0dce9e69082..309cae1597b 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/SyncConflictModal.tsx
@@ -6,9 +6,9 @@ import {
useGetSettingsQuery,
} from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Button, Group, Icon, Modal } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import {
useGetBranchesQuery,
useUpdateRemoteSyncSettingsMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx
index 58e56760047..f60998d39d9 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { ActionButton } from "metabase/common/components/ActionButton";
import { useToast } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Button, Group, Modal, Progress, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useCancelRemoteSyncCurrentTaskMutation } from "metabase-enterprise/api";
import type { RemoteSyncTaskType } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts
index bf3374e13ca..8ad8618bf92 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-git-sync-visible.ts
@@ -1,6 +1,6 @@
import { useAdminSetting } from "metabase/api/utils";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import { BRANCH_KEY, REMOTE_SYNC_KEY, TYPE_KEY } from "../constants";
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx
index 9b9fc93fb88..3fcc3068a48 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-sync-status.tsx
@@ -1,5 +1,5 @@
import { useSetting } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { useGetRemoteSyncCurrentTaskQuery } from "metabase-enterprise/api";
import { SyncProgressModal } from "../components/SyncProgressModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx
index 347f229de42..0d987ea3248 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementButton/SourceReplacementButton.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import type { SourceReplacementButtonProps } from "metabase/plugins";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import { useListSourceReplacementRunsQuery } from "metabase-enterprise/api";
export function SourceReplacementButton({
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsx
index eed03da45f9..dbcd193d0b0 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementStatus/SourceReplacementStatus.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import { Api, skipToken, useGetCardQuery } from "metabase/api";
import { useGetTableQuery } from "metabase/api/table";
import type { TagType } from "metabase/api/tags";
-import { useDispatch } from "metabase/lib/redux";
import StatusLarge from "metabase/status/components/StatusLarge";
import StatusSmall from "metabase/status/components/StatusSmall";
import {
@@ -13,6 +12,7 @@ import {
} from "metabase/status/components/utils/status";
import useStatusVisibility from "metabase/status/hooks/use-status-visibility";
import type { IconName } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import visualizations from "metabase/visualizations";
import {
useGetSourceReplacementRunQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx
index b697bcbb98b..cfdbc28f6c2 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/TransformToolsMenu/TransformToolsMenu.tsx
@@ -1,11 +1,11 @@
import { Link } from "react-router";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Button, Icon, Menu, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
export function TransformToolsMenu() {
const isAdmin = useSelector(getUserIsAdmin);
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx
index 22f21b61917..7e5ac66ecf4 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/LocationSection/LocationSection.tsx
@@ -1,9 +1,9 @@
import { Link } from "react-router";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
import { Anchor, FixedSizeIcon, Group, Stack } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Card } from "metabase-types/api";
type LocationSectionProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx
index cfe6953fb7a..f704552ff88 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelSidebar/SidebarHeader/SidebarHeader.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Card } from "metabase-types/api";
import S from "./SidebarHeader.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx
index 1c5da8493e1..3a6afc7c2f6 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/PageHeader/PageHeader.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
-import * as Urls from "metabase/lib/urls";
import { Box, Text, Title } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
export function PageHeader() {
return (
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx
index f6175579df2..eeab9ccfe4b 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx
@@ -16,8 +16,6 @@ import {
FormProvider,
FormSubmitButton,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { slugify } from "metabase/lib/formatting/url";
import { SchemaFormSelect } from "metabase/transforms/components/SchemaFormSelect";
import { TagsMultiFormSelect } from "metabase/transforms/components/TagsMultiFormSelect";
import { TargetNameInput } from "metabase/transforms/components/TargetNameInput";
@@ -31,6 +29,8 @@ import {
Stack,
Text,
} from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
+import { slugify } from "metabase/utils/formatting/url";
import { useReplaceModelWithTransformMutation } from "metabase-enterprise/api";
import type { Card, Database } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.js b/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.js
index dc3fe1cd526..8caa866c0f2 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.js
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.js
@@ -11,14 +11,14 @@ import {
DataPermissionType,
DataPermissionValue,
} from "metabase/admin/permissions/types";
+import { GTAPApi } from "metabase/services";
import {
combineReducers,
createAction,
createThunkAction,
handleActions,
withRequestState,
-} from "metabase/lib/redux";
-import { GTAPApi } from "metabase/services";
+} from "metabase/utils/redux";
import { getPolicyKey, getPolicyKeyFromParams } from "./utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx
index 4fe65742647..62c02b2a7a9 100644
--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx
@@ -7,7 +7,7 @@ import _ from "underscore";
import { useListUserAttributesQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { getParentPath } from "metabase/hoc/ModalRoute";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import {
getGroupTableAccessPolicy,
getPolicyRequestState,
diff --git a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx
index 66cdeca4a3e..35bbc84f35c 100644
--- a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx
@@ -7,10 +7,10 @@ import { BasicAdminSettingInput } from "metabase/admin/settings/components/widge
import { UpsellSemanticSearchPill } from "metabase/admin/upsells/UpsellSemanticSearch";
import { getErrorMessage, useAdminSetting } from "metabase/api/utils";
import { getPlan, isProPlan } from "metabase/common/utils/plan";
-import { useSelector } from "metabase/lib/redux";
import type { SearchSettingsWidgetProps } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import { Box, Progress, Stack, Text, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useGetSemanticSearchStatusQuery } from "metabase-enterprise/api/search";
function useLatch(bool: boolean) {
diff --git a/enterprise/frontend/src/metabase-enterprise/services.ts b/enterprise/frontend/src/metabase-enterprise/services.ts
index 3b8c5e8e184..1c7de0b1555 100644
--- a/enterprise/frontend/src/metabase-enterprise/services.ts
+++ b/enterprise/frontend/src/metabase-enterprise/services.ts
@@ -1,4 +1,4 @@
-import { DELETE, GET } from "metabase/lib/api";
+import { DELETE, GET } from "metabase/utils/api";
export const AuditApi = {
unsubscribe_user: DELETE("/api/ee/audit-app/user/:id/subscriptions"),
diff --git a/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts b/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts
index 2d1d5263a77..f082b48b368 100644
--- a/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts
+++ b/enterprise/frontend/src/metabase-enterprise/settings/hooks/use-license.ts
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useState } from "react";
import { t } from "ttag";
-import { reload } from "metabase/lib/dom";
import { SettingsApi, StoreApi } from "metabase/services";
+import { reload } from "metabase/utils/dom";
import type { TokenStatus } from "metabase-types/api";
export const LICENSE_ACCEPTED_URL_HASH = "#activated";
diff --git a/enterprise/frontend/src/metabase-enterprise/settings/index.ts b/enterprise/frontend/src/metabase-enterprise/settings/index.ts
index 4144259ff7a..ab3e094151f 100644
--- a/enterprise/frontend/src/metabase-enterprise/settings/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/settings/index.ts
@@ -1,5 +1,5 @@
import { isTest } from "metabase/env";
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { TokenFeature } from "metabase-types/api";
export function hasPremiumFeature(feature: TokenFeature) {
diff --git a/enterprise/frontend/src/metabase-enterprise/shared/reducer.ts b/enterprise/frontend/src/metabase-enterprise/shared/reducer.ts
index c355e6c5910..75b846646e9 100644
--- a/enterprise/frontend/src/metabase-enterprise/shared/reducer.ts
+++ b/enterprise/frontend/src/metabase-enterprise/shared/reducer.ts
@@ -1,7 +1,7 @@
import { createSlice } from "@reduxjs/toolkit";
-import { createAsyncThunk } from "metabase/lib/redux";
import { GTAPApi } from "metabase/services";
+import { createAsyncThunk } from "metabase/utils/redux";
import type { UserAttributeKey } from "metabase-types/api";
export const fetchUserAttributes = createAsyncThunk(
diff --git a/enterprise/frontend/src/metabase-enterprise/sharing/components/MutableParametersSection.tsx b/enterprise/frontend/src/metabase-enterprise/sharing/components/MutableParametersSection.tsx
index fb2b94c2a82..559c89e208c 100644
--- a/enterprise/frontend/src/metabase-enterprise/sharing/components/MutableParametersSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/sharing/components/MutableParametersSection.tsx
@@ -5,9 +5,9 @@ import _ from "underscore";
import { CollapseSection } from "metabase/common/components/CollapseSection";
import CS from "metabase/css/core/index.css";
-import { getPulseParameters } from "metabase/lib/pulse";
import { ParametersList } from "metabase/parameters/components/ParametersList";
import { getVisibleParameters } from "metabase/parameters/utils/ui";
+import { getPulseParameters } from "metabase/utils/pulse";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import { deriveFieldOperatorFromParameter } from "metabase-lib/v1/parameters/utils/operators";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx
index fcea127295b..17f2e0440f2 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx
@@ -14,8 +14,8 @@ import type { OmniPickerItem } from "metabase/common/components/Pickers";
import { isItemInCollectionOrItsDescendants } from "metabase/common/components/Pickers/utils";
import { SnippetCollections } from "metabase/entities/snippet-collections";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { connect } from "metabase/lib/redux";
+import * as Errors from "metabase/utils/errors";
+import { connect } from "metabase/utils/redux";
import type { Collection, CollectionId } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
index 0359313a044..d61a31fddb0 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx
@@ -3,7 +3,6 @@ import { t } from "ttag";
import { snippetApi, useUpdateCollectionMutation } from "metabase/api";
import { listTag } from "metabase/api/tags";
import { isRootCollection } from "metabase/collections/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import type { SnippetCollectionMenuProps } from "metabase/plugins";
import { addUndo } from "metabase/redux/undo";
import { getUserIsAdmin } from "metabase/selectors/user";
@@ -15,6 +14,7 @@ import {
Menu,
Tooltip,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
export function SnippetCollectionMenu({
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
index e22f6b83f7e..1d78665157a 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
@@ -3,8 +3,8 @@ import { useEffect } from "react";
import CollectionPermissionsModal from "metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal";
import { Modal } from "metabase/common/components/Modal";
import { SnippetCollections } from "metabase/entities/snippet-collections";
-import { useDispatch } from "metabase/lib/redux";
import type { SnippetCollectionPermissionsModalProps } from "metabase/plugins";
+import { useDispatch } from "metabase/utils/redux";
export function SnippetCollectionPermissionsModal({
collectionId,
diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx
index d827e1ceefa..e5c7cd79f3e 100644
--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PaginationControls } from "metabase/common/components/PaginationControls";
-import { useDispatch } from "metabase/lib/redux";
-import { adminToolsGrantAccess } from "metabase/lib/urls";
import { Box, Button, Flex, LoadingOverlay, Text, Title } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import { adminToolsGrantAccess } from "metabase/utils/urls";
import { useAccessGrantsQuery } from "../../hooks/useAccessGrantsQuery";
diff --git a/enterprise/frontend/src/metabase-enterprise/support/index.ts b/enterprise/frontend/src/metabase-enterprise/support/index.ts
index da3c4dd5f67..03bcb174967 100644
--- a/enterprise/frontend/src/metabase-enterprise/support/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/support/index.ts
@@ -1,5 +1,4 @@
-import { isEEBuild } from "metabase/lib/utils";
-import { PLUGIN_SUPPORT } from "metabase/plugins";
+import { PLUGIN_IS_EE_BUILD, PLUGIN_SUPPORT } from "metabase/plugins";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import {
@@ -8,7 +7,7 @@ import {
} from "./components/SupportSettingsSection";
export function initializePlugin() {
- if (hasPremiumFeature("support-users") && isEEBuild()) {
+ if (hasPremiumFeature("support-users") && PLUGIN_IS_EE_BUILD.isEEBuild()) {
PLUGIN_SUPPORT.isEnabled = true;
PLUGIN_SUPPORT.SupportSettings = SupportSettingsSection;
PLUGIN_SUPPORT.GrantAccessModal = GrantAccessModal;
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx
index 1951eebb242..9d050e4c7b9 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx
@@ -10,8 +10,8 @@ import { DatabaseInfoSection } from "metabase/admin/databases/components/Databas
import { hasDbRoutingEnabled } from "metabase/admin/databases/utils";
import { Toggle } from "metabase/common/components/Toggle";
import { ALLOWED_ENGINES_FOR_TABLE_EDITING } from "metabase/databases/constants";
-import { getResponseErrorMessage } from "metabase/lib/errors";
import { Alert, Box, Flex, Icon } from "metabase/ui";
+import { getResponseErrorMessage } from "metabase/utils/errors";
import type {
Database,
DatabaseData,
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.ts
index e0922e4dc4d..2c56c133ccc 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackTableEditingSettingsToggled = (
enabled: boolean,
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx
index ea59b5280af..a45bf87f6b6 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx
@@ -1,10 +1,10 @@
import { useMemo } from "react";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
import { HeadBreadcrumbs } from "metabase/query_builder/components/view/ViewHeader/components";
import type { DataSourcePart } from "metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils";
import { ViewHeading } from "metabase/query_builder/components/view/ViewSection";
+import * as Urls from "metabase/utils/urls";
import type { Database, Table } from "metabase-types/api";
type TableBreadcrumbsProps = {
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsx
index b0b57ce200e..a7fb4e33f03 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/common/getRowCountMessage.tsx
@@ -1,6 +1,6 @@
import { msgid, ngettext, t } from "ttag";
-import { formatNumber } from "metabase/lib/formatting/numbers";
+import { formatNumber } from "metabase/utils/formatting/numbers";
import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils/index";
import type { Dataset } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsx
index 860f62ee7cd..ddaca759a88 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDate.tsx
@@ -1,7 +1,7 @@
import { type KeyboardEvent, useCallback, useState } from "react";
-import { DEFAULT_DATE_STYLE } from "metabase/lib/formatting/datetime-utils";
import { DateInput } from "metabase/ui";
+import { DEFAULT_DATE_STYLE } from "metabase/utils/formatting/datetime-utils";
import type { TableActionInputSharedProps } from "./types";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsx
index 67e9b38a4ae..61c2bb501bd 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputDateTime.tsx
@@ -1,11 +1,11 @@
import { useDisclosure } from "@mantine/hooks";
import { type KeyboardEvent, useCallback, useState } from "react";
+import { DateTimePicker } from "metabase/ui";
import {
DEFAULT_DATE_STYLE,
DEFAULT_TIME_STYLE,
-} from "metabase/lib/formatting/datetime-utils";
-import { DateTimePicker } from "metabase/ui";
+} from "metabase/utils/formatting/datetime-utils";
import type { TableActionInputSharedProps } from "./types";
import { useDateValueWithoutTimezone } from "./use-date-value-without-timezone";
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsx
index 56886068273..d941b03634f 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.tsx
@@ -10,9 +10,9 @@ import {
} from "metabase/common/components/BulkActionBar";
import { GenericError } from "metabase/common/components/ErrorPages";
import { useCloseNavbarOnMount } from "metabase/common/hooks/use-close-navbar-on-mount";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Flex, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { extractRemappedColumns } from "metabase/visualizations";
import type { TableEditingActionScope } from "../api/types";
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.ts
index 0130c485299..bcbf4aa89d5 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.ts
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackDataRecordModified = ({
event_detail,
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsx
index 50728e5a18b..d4e2dbb84c0 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-edit-datagrid-column-options.tsx
@@ -2,7 +2,7 @@ import cx from "classnames";
import { useCallback, useMemo } from "react";
import type { ColumnOptions } from "metabase/data-grid";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import type { DescribeActionFormResponse } from "metabase-enterprise/table-editing/api/types";
import type { DatasetColumn, RowValue, RowValues } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
index 9b8ac6450bd..764d5bf8db8 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
@@ -3,8 +3,8 @@ import { Link } from "react-router";
import { jt, t } from "ttag";
import { useGetTableQuery } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { Anchor, Box, Button, Group, Icon, Stack, Text } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import {
getUpdateApiErrorMessage,
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/getUpdateErrorMessage.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/getUpdateErrorMessage.tsx
index de3dcf1d9d1..c498b2ee122 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/getUpdateErrorMessage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/getUpdateErrorMessage.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import type { GenericErrorResponse } from "metabase/lib/errors";
+import type { GenericErrorResponse } from "metabase/utils/errors";
export const getUpdateApiErrorMessage = (
error: GenericErrorResponse | unknown,
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx
index 35d6f52ba45..85499c1066f 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx
@@ -1,7 +1,7 @@
import { useMemo } from "react";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
import { ErrorUpdateToast } from "./ErrorUpdateToast";
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts
index 2636ebfbd55..60565741140 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-adhoc-table-query.ts
@@ -2,10 +2,10 @@ import type { Location } from "history";
import { useCallback, useEffect, useMemo } from "react";
import { push } from "react-router-redux";
-import { b64url_to_utf8, utf8_to_b64url } from "metabase/lib/encoding";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { loadMetadataForTable } from "metabase/questions/actions";
import { getMetadata } from "metabase/selectors/metadata";
+import { b64url_to_utf8, utf8_to_b64url } from "metabase/utils/encoding";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { OpaqueDatasetQuery } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.ts
index 9cfb54f3c04..9f2fb46ec22 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.ts
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/use-table-state-adhoc-query-update-strategy.ts
@@ -2,8 +2,8 @@ import type { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";
import { useCallback, useMemo } from "react";
import { datasetApi } from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
+import { useDispatch } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { DatasetQuery } from "metabase-types/api";
import type { RowCellsWithPkValue } from "../api/types";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx
index 80a35494c00..22d77c94508 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/EditUserStrategyModal/EditUserStrategyModal.tsx
@@ -7,8 +7,8 @@ import { useAdminSetting } from "metabase/api/utils";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useToast } from "metabase/common/hooks";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import { useDispatch } from "metabase/lib/redux";
import { Button, Flex, Group, Modal, Radio, Stack, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import S from "./EditUserStrategyModal.module.css";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx
index 6280080c5d6..4bc177c8f1b 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CanAccessTenantSpecificRoute/CanAccessTenantSpecificRoute.tsx
@@ -3,8 +3,8 @@ import type { ReactNode } from "react";
import { useGetCollectionQuery } from "metabase/api";
import { Unauthorized } from "metabase/common/components/ErrorPages";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
type Props = {
children: ReactNode;
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
index f148800d53b..73df11eea32 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
@@ -5,7 +5,6 @@ import { t } from "ttag";
import { getErrorMessage } from "metabase/api/utils";
import { useToast } from "metabase/common/hooks";
import { createEmptyTenantDraft } from "metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/utils";
-import { slugify } from "metabase/lib/formatting";
import type { CreatedTenantData } from "metabase/plugins/oss/tenants";
import {
Button,
@@ -17,6 +16,7 @@ import {
Text,
TextInput,
} from "metabase/ui";
+import { slugify } from "metabase/utils/formatting";
import type { DataSegregationStrategy, FieldId } from "metabase-types/api";
import { useCreateTenantMutation } from "../../../api/tenants";
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.tsx
index eea72cee290..f86c4ada0ab 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
@@ -5,9 +5,9 @@ import {
setupFieldEndpoints,
} from "__support__/server-mocks";
import { waitFor } from "__support__/ui";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { mainReducers as reducers } from "metabase/reducers-main";
import { getStore } from "metabase/store";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import type { FieldId, RowValue } from "metabase-types/api";
import { createMockField, createMockTable } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
index de2aa497962..c0d0d796a8e 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
@@ -10,11 +10,6 @@ import type { CreateCollectionProperties } from "metabase/collections/components
import { Tree } from "metabase/common/components/tree";
import { useSetting } from "metabase/common/hooks";
import { buildCollectionTree } from "metabase/entities/collections";
-import { useSelector } from "metabase/lib/redux";
-import {
- tenantSpecificCollections,
- tenantUsersPersonalCollections,
-} from "metabase/lib/urls";
import {
PaddedSidebarLink,
SidebarHeading,
@@ -23,6 +18,11 @@ import {
import { SidebarCollectionLink } from "metabase/nav/containers/MainNavbar/SidebarItems";
import { getIsTenantUser, getUserIsAdmin } from "metabase/selectors/user";
import { ActionIcon, Flex, Icon, Modal, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import {
+ tenantSpecificCollections,
+ tenantUsersPersonalCollections,
+} from "metabase/utils/urls";
import { useGetRemoteSyncChangesQuery } from "metabase-enterprise/api";
import { CollectionSyncStatusBadge } from "metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/CollectionSyncStatusBadge";
import type { Collection } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx
index 3aec8950f32..2f5bd731a9b 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx
@@ -2,8 +2,8 @@ import { t } from "ttag";
import { CollectionListView } from "metabase/common/components/CollectionListView";
import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { useListTenantsQuery } from "metabase-enterprise/api";
export const TenantCollectionList = () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
index 8f67a6bf40e..85069251ba5 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
@@ -29,7 +29,7 @@ import type {
import { assertNumericId } from "metabase/admin/permissions/types";
import { Collections } from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type { Collection, CollectionId } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
index bb556aeecf9..6e605487aa1 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
@@ -21,12 +21,12 @@ import {
getCollectionIcon,
} from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
+import { PLUGIN_TENANTS } from "metabase/plugins";
import {
getGroupNameLocalized,
isAdminGroup,
isDefaultGroup,
-} from "metabase/lib/groups";
-import { PLUGIN_TENANTS } from "metabase/plugins";
+} from "metabase/utils/groups";
import type {
Collection,
CollectionId,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx
index 44df06394b8..135cfb36db8 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantForm/TenantForm.tsx
@@ -9,8 +9,8 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Button } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import { LoginAttributesWidget } from "metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributesWidget";
import type { Tenant } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
index de3364def51..e263eb12937 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
@@ -23,7 +23,7 @@ import type { PermissionEditorEntity } from "metabase/admin/permissions/types";
import { assertNumericId } from "metabase/admin/permissions/types";
import { Collections } from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Collection, CollectionId } from "metabase-types/api";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
index 2e14d44c5c8..1c1cdb0f4b1 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
@@ -21,12 +21,12 @@ import {
getCollectionIcon,
} from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
+import { PLUGIN_TENANTS } from "metabase/plugins";
import {
getGroupNameLocalized,
isAdminGroup,
isDefaultGroup,
-} from "metabase/lib/groups";
-import { PLUGIN_TENANTS } from "metabase/plugins";
+} from "metabase/utils/groups";
import type {
CollectionId,
CollectionPermissions,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx
index 086e5432c6e..eff8b552c7a 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx
@@ -2,8 +2,8 @@ import { t } from "ttag";
import { CollectionListView } from "metabase/common/components/CollectionListView";
import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { useListTenantsQuery } from "metabase-enterprise/api";
export const TenantUsersList = () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx
index 786841d14cc..4bf008fa740 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { useListUsersQuery } from "metabase/api";
import { CollectionListView } from "metabase/common/components/CollectionListView";
import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { useGetTenantQuery } from "metabase-enterprise/api";
interface TenantUsersPersonalCollectionListProps {
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
index 56ae25caba5..ff0a91e4adc 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx
@@ -11,7 +11,6 @@ import { AdminContentTable } from "metabase/common/components/AdminContentTable"
import { ForwardRefLink } from "metabase/common/components/Link";
import { UserAvatar } from "metabase/common/components/UserAvatar";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
import {
Box,
Button,
@@ -22,6 +21,7 @@ import {
Text,
UnstyledButton,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import { tenantIdToColor } from "metabase-enterprise/tenants/utils/colors";
import * as Urls from "metabase-enterprise/urls";
import type { Tenant } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx
index 9ab0fc806b4..bddab560a17 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsSummaryOnboardingStep/TenantsSummaryOnboardingStep.tsx
@@ -4,10 +4,10 @@ import { push } from "react-router-redux";
import { jt, msgid, ngettext, t } from "ttag";
import { RelatedSettingCard } from "metabase/admin/components/RelatedSettingsSection";
-import { conjunct } from "metabase/lib/formatting/strings";
-import { useDispatch } from "metabase/lib/redux";
import type { CreatedTenantData } from "metabase/plugins/oss/tenants";
import { Button, Flex, SimpleGrid, Stack, Text, Title } from "metabase/ui";
+import { conjunct } from "metabase/utils/formatting/strings";
+import { useDispatch } from "metabase/utils/redux";
import type { DataSegregationStrategy } from "metabase-types/api";
import { useListTenantsQuery } from "../../../api/tenants";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsx
index fce33b2e1f7..3ece73c7a8a 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/NewTenantModal/NewTenantModal.tsx
@@ -2,9 +2,9 @@ import type { Location } from "history";
import { useMemo } from "react";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
import { Modal } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import { useCreateTenantMutation } from "metabase-enterprise/api";
import type { Tenant } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsx
index a1a974d4518..0c6ac138276 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantActivationModal.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
import {
useGetTenantQuery,
useUpdateTenantMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx
index b3527b09ea6..8777b470a69 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/containers/TenantsListingApp.tsx
@@ -7,9 +7,9 @@ import {
type ActiveStatus,
} from "metabase/admin/people/constants";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Group, Tabs, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useListTenantsQuery } from "metabase-enterprise/api";
import { EditUserStrategySettingsButton } from "../EditUserStrategySettingsButton";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
index 297c1a6300c..b956b91242c 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
@@ -18,8 +18,6 @@ import {
getCollectionIcon,
} from "metabase/entities/collections";
import { ModalRoute } from "metabase/hoc/ModalRoute";
-import { getGroupNameLocalized } from "metabase/lib/groups";
-import { useSelector } from "metabase/lib/redux";
import {
PLUGIN_ADMIN_PERMISSIONS_TABS,
PLUGIN_ADMIN_USER_MENU_ROUTES,
@@ -28,6 +26,8 @@ import {
import { getIsTenantUser, getUserIsAdmin } from "metabase/selectors/user";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Box, Text } from "metabase/ui";
+import { getGroupNameLocalized } from "metabase/utils/groups";
+import { useSelector } from "metabase/utils/redux";
import { useListTenantsQuery } from "metabase-enterprise/api";
import { hasPremiumFeature } from "metabase-enterprise/settings";
diff --git a/enterprise/frontend/src/metabase-enterprise/tools/mode.js b/enterprise/frontend/src/metabase-enterprise/tools/mode.js
index 40d65b3a25c..a0294bb83ce 100644
--- a/enterprise/frontend/src/metabase-enterprise/tools/mode.js
+++ b/enterprise/frontend/src/metabase-enterprise/tools/mode.js
@@ -1,7 +1,7 @@
import { push } from "react-router-redux";
import { t } from "ttag";
-import { question } from "metabase/lib/urls";
+import { question } from "metabase/utils/urls";
const CARD_ID_ROW_IDX = 0;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
index f79f758c571..9fbfc05f175 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/TransformInspectPage.tsx
@@ -3,11 +3,11 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import * as Urls from "metabase/lib/urls";
import { TransformHeader } from "metabase/transforms/components/TransformHeader";
import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";
import { RunSection } from "metabase/transforms/pages/TransformRunPage/RunSection";
import { Alert, Center, Icon, Text } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { InspectorContent } from "./components/InspectorContent";
import type { RouteParams } from "./types";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts
index cfe9dc3ca6a..c088b964f85 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensNavigator/useLensNavigation.ts
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
import { push, replace } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { InspectorLensMetadata } from "metabase-types/api";
import type { LensHandle, RouteParams } from "../../types";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
index 84d5911d7bd..28dc3d44a2e 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-inspector/pages/TransformInspectPage/components/LensSections/DefaultLensSections/components/VisualizationCard.tsx
@@ -2,9 +2,9 @@ import { memo } from "react";
import { useGetAdhocQueryMetadataQuery } from "metabase/api";
import { useSnapshotSelector } from "metabase/common/hooks";
-import * as Urls from "metabase/lib/urls";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Card, Loader, Stack } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import Visualization from "metabase/visualizations/components/Visualization";
import * as Lib from "metabase-lib";
import { defaultDisplay } from "metabase-lib/query/display";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.ts
index 360319ec3b9..cfcdb82ade5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/utils.ts
@@ -1,4 +1,4 @@
-import { slugify as toSlug } from "metabase/lib/formatting";
+import { slugify as toSlug } from "metabase/utils/formatting";
import type {
PythonTransformTableAliases,
PythonTransformTableEntry,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
index 5b68aac9bcc..1c165cd172a 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx
@@ -5,10 +5,10 @@ import { useWindowSize } from "react-use";
import { t } from "ttag";
import { clickableTokens } from "metabase/common/components/CodeMirror";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";
import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { SHARED_LIB_IMPORT_PATH } from "../../../constants";
import { PythonEditor } from "../../PythonEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsx
index f3c908618e6..2e7d32e8b6e 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/ExecutionOutputTable.tsx
@@ -1,5 +1,5 @@
import { DataGrid, useDataGridInstance } from "metabase/data-grid";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import type { RowValue, TestPythonTransformResponse } from "metabase-types/api";
export type Row = Record<string, RowValue>;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
index 69ef03d42f8..24a35d05316 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx
@@ -5,7 +5,6 @@ import EmptyCodeResult from "assets/img/empty-states/code.svg";
import { AnsiLogs } from "metabase/common/components/AnsiLogs";
import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
import { LoadingSpinner } from "metabase/common/components/MetadataInfo/MetadataInfo.styled";
-import { isMac } from "metabase/lib/browser";
import {
ActionIcon,
Box,
@@ -16,6 +15,7 @@ import {
Tabs,
Text,
} from "metabase/ui";
+import { isMac } from "metabase/utils/browser";
import type { TestPythonTransformResponse } from "metabase-types/api";
import { ExecutionOutputTable } from "./ExecutionOutputTable";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
index 006f394e0ad..8e86a635374 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonTransformTopBar/PythonTransformTopBar.tsx
@@ -4,11 +4,11 @@ import {
useGetDatabaseQuery,
useListDatabasesQuery,
} from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { DatabaseDataSelector } from "metabase/query_builder/components/DataSelector";
import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";
import { doesDatabaseSupportTransforms } from "metabase/transforms/utils";
import { Flex } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { EditTransformMenu } from "metabase-enterprise/data-studio/workspaces/components/EditTransformMenu";
import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
import { hasPremiumFeature } from "metabase-enterprise/settings";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
index 65a511a730f..85612d18398 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorHeader.tsx
@@ -6,8 +6,8 @@ import {
PaneHeader,
PanelHeaderTitle,
} from "metabase/data-studio/common/components/PaneHeader";
-import * as Urls from "metabase/lib/urls";
import { Button, Group } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
type PythonLibraryEditorHeaderProps = {
isDirty?: boolean;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
index 54c438e16cd..0792cdba039 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.tsx
@@ -5,11 +5,11 @@ import { t } from "ttag";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { isResourceNotFoundError } from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
-import type * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Alert, Box, Card, Stack } from "metabase/ui";
+import { isResourceNotFoundError } from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
+import type * as Urls from "metabase/utils/urls";
import {
useGetPythonLibraryQuery,
useUpdatePythonLibraryMutation,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx
index a4cfb973c2c..93f1b386d6e 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/CloudPurchaseContent.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { trackUpsellClicked } from "metabase/common/components/upsells/components/analytics";
import type { BillingPeriod } from "metabase/data-studio/upsells/types";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Button, Card, Divider, Flex, Group, Stack, Text } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { usePurchaseCloudAddOnMutation } from "metabase-enterprise/api";
import { TransformsSettingUpModal } from "metabase-enterprise/transforms/upsells/components/TransformsSettingUpModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
index f05107b9775..ce3cc2fbc11 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/upsells/PythonTransformsUpsellModal/PythonTransformsUpsellModal.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { trackUpsellViewed } from "metabase/common/components/upsells/components/analytics";
import { useStoreUrl } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getStoreUsers } from "metabase/selectors/store-users";
import { getIsHosted } from "metabase/setup/selectors";
import {
@@ -18,6 +17,7 @@ import {
Text,
Title,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useTransformsBilling } from "metabase-enterprise/transforms/upsells/hooks";
import { CloudPurchaseContent } from "./CloudPurchaseContent";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts
index 6fbfd54389e..63b3cbebb70 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/hooks/useTransformsBilling.ts
@@ -1,6 +1,6 @@
import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
import { getIsHosted } from "metabase/databases/selectors";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import {
useGetBillingInfoQuery,
useListAddOnsQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
index fe8058d81e6..f8c6b54511d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/upsells/pages/TransformsUpsellPage/TransformsUpsellPage.tsx
@@ -8,7 +8,6 @@ import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { DottedBackground } from "metabase/data-studio/upsells/components/DottedBackground";
import { LineDecorator } from "metabase/data-studio/upsells/components/LineDecorator";
import type { BillingPeriod } from "metabase/data-studio/upsells/types";
-import { useSelector } from "metabase/lib/redux";
import { getStoreUsers } from "metabase/selectors/store-users";
import {
Card,
@@ -20,6 +19,7 @@ import {
Text,
Title,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useTransformsBilling } from "../../hooks/useTransformsBilling";
diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
index df2cc934d17..ea60b8325f3 100644
--- a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
@@ -10,7 +10,6 @@ import { Link } from "metabase/common/components/Link";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { ClientSortableTable } from "metabase/common/components/Table";
import { useToast } from "metabase/common/hooks";
-import * as Urls from "metabase/lib/urls";
import {
Box,
Button,
@@ -20,6 +19,7 @@ import {
Icon,
Text,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import {
useDeleteUploadTableMutation,
useListUploadTablesQuery,
diff --git a/enterprise/frontend/src/metabase-enterprise/urls.ts b/enterprise/frontend/src/metabase-enterprise/urls.ts
index 4d22309d8ba..f1f66b97f47 100644
--- a/enterprise/frontend/src/metabase-enterprise/urls.ts
+++ b/enterprise/frontend/src/metabase-enterprise/urls.ts
@@ -1,6 +1,6 @@
import type { DatabaseId, Tenant } from "metabase-types/api";
-export * as Urls from "metabase/lib/urls";
+export * as Urls from "metabase/utils/urls";
export function viewDestinationDatabases(databaseId: DatabaseId) {
return `/admin/databases/${databaseId}/destination-databases`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsx
index 43564f56bd5..c64f4a59058 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettingsWidget/ColorSettingsWidget.unit.spec.tsx
@@ -1,11 +1,11 @@
import fetchMock from "fetch-mock";
import { renderWithProviders, screen } from "__support__/ui";
-import MetabaseSettings from "metabase/lib/settings";
import {
deriveChartShadeColor,
deriveChartTintColor,
} from "metabase/ui/colors/accents";
+import MetabaseSettings from "metabase/utils/settings";
import type { SettingKey } from "metabase-types/api";
import { ColorSettingsWidget } from "./ColorSettingsWidget";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageWidget/LandingPageWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageWidget/LandingPageWidget.tsx
index dd75298e2e6..36cbaf70bf2 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageWidget/LandingPageWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LandingPageWidget/LandingPageWidget.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";
import { useAdminSetting } from "metabase/api/utils";
-import type { GenericErrorResponse } from "metabase/lib/errors";
import { TextInput } from "metabase/ui";
+import type { GenericErrorResponse } from "metabase/utils/errors";
import { getRelativeLandingPageUrl } from "./utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx
index 20e54986c69..b7d8b35e771 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx
@@ -4,8 +4,8 @@ import PropTypes from "prop-types";
import { Component } from "react";
import CS from "metabase/css/core/index.css";
-import { parseDataUri, removeAllChildren } from "metabase/lib/dom";
-import { connect } from "metabase/lib/redux";
+import { parseDataUri } from "metabase/utils/data-url";
+import { connect } from "metabase/utils/redux";
import {
getIsDefaultMetabaseLogo,
getLogoUrl,
@@ -58,7 +58,7 @@ class LogoIcon extends Component {
this.abortController.abort();
}
- removeAllChildren(this._container);
+ this._container.replaceChildren();
const parsed = parseDataUri(url);
if (parsed) {
@@ -95,7 +95,7 @@ class LogoIcon extends Component {
svg.setAttribute("fill", "currentcolor");
this.updateSize(svg);
- removeAllChildren(this._container);
+ this._container.replaceChildren();
this._container.appendChild(svg);
} else {
this.loadImageFallback(url);
@@ -109,7 +109,7 @@ class LogoIcon extends Component {
}
loadImageFallback(url) {
- removeAllChildren(this._container);
+ this._container.replaceChildren();
const img = document.createElement("img");
img.src = url;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/index.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/index.ts
index 69e578bc214..386a8926866 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/index.ts
@@ -1,4 +1,3 @@
-import MetabaseSettings from "metabase/lib/settings";
import {
PLUGIN_APP_INIT_FUNCTIONS,
PLUGIN_LANDING_PAGE,
@@ -6,6 +5,7 @@ import {
PLUGIN_SELECTORS,
PLUGIN_WHITELABEL,
} from "metabase/plugins";
+import MetabaseSettings from "metabase/utils/settings";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import {
getApplicationName,
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.js b/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.js
index 71a804aa81c..16dd43a7f59 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.js
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/lib/whitelabel.js
@@ -1,5 +1,5 @@
-import MetabaseSettings from "metabase/lib/settings";
import { mutateColors } from "metabase/ui/colors/colors";
+import MetabaseSettings from "metabase/utils/settings";
export function updateColors() {
const scheme = MetabaseSettings.get("application-colors") || {};
diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx
index 09d027aa1d7..4d6cd50033e 100644
--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/components/WritableConnectionInfoSection/WritableConnectionInfoSection.tsx
@@ -12,9 +12,9 @@ import {
} from "metabase/admin/databases/utils";
import { useUpdateDatabaseMutation } from "metabase/api";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import * as Urls from "metabase/lib/urls";
import type { WritableConnectionInfoSectionProps } from "metabase/plugins/oss/writable-connection";
import { Alert, Button, Group, Icon } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
export function WritableConnectionInfoSection({
database,
diff --git a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx
index d20fc632ef1..bc16414f9bf 100644
--- a/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/writable_connection/pages/WritableConnectionInfoPage/WritableConnectionInfoPage.tsx
@@ -13,9 +13,9 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { DatabaseForm } from "metabase/databases/components/DatabaseForm";
import type { DatabaseFormConfig } from "metabase/databases/types";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Box, Flex, ScrollArea, Title } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Database, DatabaseData } from "metabase-types/api";
const FORM_CONFIG: DatabaseFormConfig = {
diff --git a/eslint.config.mjs b/eslint.config.mjs
index bf881924873..4e4f9b16abf 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -42,7 +42,7 @@ const baseMetabaseRestrictedConfig = {
{
name: "react-redux",
importNames: ["useSelector", "useDispatch", "connect"],
- message: "Please import from `metabase/lib/redux` instead.",
+ message: "Please import from `metabase/utils/redux` instead.",
},
{
name: "@mantine/core",
@@ -476,7 +476,7 @@ const configs = [
patterns: [
{
// There might be things that we might benefit from importing, like `defer`, in those cases we can change the regex here to allow them
- regex: "^metabase/(?!lib/promise$|embedding-sdk/test/).*",
+ regex: "^metabase/(?!utils/promise$|embedding-sdk/test/).*",
allowTypeImports: true,
message:
"We should avoid importing `metabase/` code in the component tests, we might accidentally include CLJS in the dependencies and that can create issues. Component tests should only use the code it needs to test, which is in the package.",
@@ -548,7 +548,7 @@ const configs = [
},
},
{
- files: ["frontend/src/metabase/lib/redux/hooks.ts"],
+ files: ["frontend/src/metabase/utils/redux/hooks.ts"],
rules: {
"no-restricted-imports": "off",
},
@@ -610,7 +610,7 @@ const configs = [
{
name: "react-redux",
importNames: ["useSelector", "useDispatch", "connect"],
- message: "Please import from `metabase/lib/redux` instead.",
+ message: "Please import from `metabase/utils/redux` instead.",
},
{
name: "@mantine/core",
@@ -649,22 +649,22 @@ const configs = [
group: [
"metabase/*",
"!metabase/env",
- "!metabase/lib",
+ "!metabase/utils",
"!metabase/querying",
"!metabase/services",
],
},
{
group: [
- "metabase/lib/*",
- "!metabase/lib/encoding",
- "!metabase/lib/formatting",
- "!metabase/lib/number",
- "!metabase/lib/time",
- "!metabase/lib/time-dayjs",
- "!metabase/lib/types",
- "!metabase/lib/urls",
- "!metabase/lib/utils",
+ "metabase/utils/*",
+ "!metabase/utils/encoding",
+ "!metabase/utils/formatting",
+ "!metabase/utils/number",
+ "!metabase/utils/time",
+ "!metabase/utils/time-dayjs",
+ "!metabase/utils/types",
+ "!metabase/utils/urls",
+ "!metabase/utils/clone",
],
},
],
@@ -837,7 +837,7 @@ const configs = [
message: 'Please use "useSdkSelector", "useSdkDispatch"',
},
{
- name: "metabase/lib/redux",
+ name: "metabase/utils/redux",
importNames: ["useStore", "useDispatch"],
message: 'Please use "useSdkStore", "useSdkDispatch"',
},
diff --git a/frontend/build/shared/rspack/resolve-aliases.js b/frontend/build/shared/rspack/resolve-aliases.js
index bbd69386c75..2413274e229 100644
--- a/frontend/build/shared/rspack/resolve-aliases.js
+++ b/frontend/build/shared/rspack/resolve-aliases.js
@@ -31,7 +31,7 @@ const isDevMode = IS_DEV_MODE;
const resolveEnterprisePathOrNoop = (subpath) =>
process.env.MB_EDITION === "ee"
? ENTERPRISE_SRC_PATH + subpath
- : SRC_PATH + "/lib/noop";
+ : SRC_PATH + "/utils/noop";
/**
* Shared resolve aliases used by both rspack.main.config.js and
@@ -76,7 +76,7 @@ const RESOLVE_ALIASES = {
process.env.MB_EDITION === "ee"
? ENTERPRISE_SRC_PATH + "/sdk-plugins"
: SRC_PATH + "/plugins/noop",
- "sdk-specific-imports": SRC_PATH + "/lib/noop",
+ "sdk-specific-imports": SRC_PATH + "/utils/noop",
};
module.exports = { RESOLVE_ALIASES };
diff --git a/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.js b/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.js
index d2c45fa3574..02fc15f29af 100644
--- a/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.js
+++ b/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.js
@@ -1,5 +1,5 @@
/**
- * @fileoverview Rule to ensure imports from metabase/lib/analytics only occur in files named "analytics.ts/tsx/js/jsx"
+ * @fileoverview Rule to ensure imports from metabase/utils/analytics only occur in files named "analytics.ts/tsx/js/jsx"
*/
//------------------------------------------------------------------------------
@@ -7,14 +7,14 @@
//------------------------------------------------------------------------------
const ERROR_MESSAGE =
- 'Imports from "metabase/lib/analytics" are only allowed in files named "analytics", Please create a type-safe wrapper for the analytics functions in an analytics.ts file, and call that function from your component or module.';
+ 'Imports from "metabase/utils/analytics" are only allowed in files named "analytics", Please create a type-safe wrapper for the analytics functions in an analytics.ts file, and call that function from your component or module.';
module.exports = {
meta: {
type: "problem",
docs: {
description:
- "Ensure imports from metabase/lib/analytics only occur in analytics files",
+ "Ensure imports from metabase/utils/analytics only occur in analytics files",
category: "Best Practices",
recommended: true,
},
@@ -36,10 +36,10 @@ module.exports = {
ImportDeclaration(node) {
const sourceValue = node.source.value;
- // Check if importing from metabase/lib/analytics
+ // Check if importing from metabase/utils/analytics
if (
typeof sourceValue === "string" &&
- sourceValue === "metabase/lib/analytics"
+ sourceValue === "metabase/utils/analytics"
) {
// If not in an analytics file, report an error
if (!isAnalyticsFile) {
diff --git a/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.js b/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.js
index b889d40a716..55a75d3ee11 100644
--- a/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.js
+++ b/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.js
@@ -12,27 +12,27 @@ const ruleTester = new RuleTester({
const VALID_CASES = [
{
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/analytics.ts",
},
{
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/analytics.tsx",
},
{
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/analytics.js",
},
{
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/analytics.jsx",
},
{
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "frontend/src/metabase/dashboard/analytics.ts",
},
{
- code: `import { someOtherFunction } from "metabase/lib/other";`,
+ code: `import { someOtherFunction } from "metabase/utils/other";`,
filename: "/path/to/Component.tsx",
},
{
@@ -46,43 +46,43 @@ const errorMessage = /are only allowed in files named "analytics"/;
const INVALID_CASES = [
{
name: "Detect import in non-analytics .tsx file",
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/Component.tsx",
error: errorMessage,
},
{
name: "Detect import in non-analytics .ts file",
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/utils.ts",
error: errorMessage,
},
{
name: "Detect type import in non-analytics .ts file",
- code: `import type { SchemaType } from "metabase/lib/analytics";`,
+ code: `import type { SchemaType } from "metabase/utils/analytics";`,
filename: "/path/to/utils.ts",
error: errorMessage,
},
{
name: "Detect import in non-analytics .js file",
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/helper.js",
error: errorMessage,
},
{
name: "Detect import in non-analytics .jsx file",
- code: `import { trackSchemaEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,
filename: "/path/to/Component.jsx",
error: errorMessage,
},
{
name: "Detect multiple imports from analytics",
- code: `import { trackSchemaEvent, trackSimpleEvent } from "metabase/lib/analytics";`,
+ code: `import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";`,
filename: "/path/to/DashCard.tsx",
error: errorMessage,
},
{
name: "Detect default import from analytics",
- code: `import analytics from "metabase/lib/analytics";`,
+ code: `import analytics from "metabase/utils/analytics";`,
filename: "/path/to/Component.tsx",
error: errorMessage,
},
diff --git a/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.js b/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.js
index b5e1393d0fd..32957ce06f6 100644
--- a/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.js
+++ b/frontend/lint/tests/no-unconditional-metabase-links-render.unit.spec.js
@@ -21,7 +21,7 @@ const ruleTester = new RuleTester({
const VALID_CASES = [
{
code: `
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
@@ -31,7 +31,7 @@ const docsLink = useSelector(state =>
},
{
code: `
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
@@ -76,7 +76,7 @@ const INVALID_CASES = [
{
name: "Detect getDocsUrl()",
code: `
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { getDocsUrl } from "metabase/selectors/settings";
const docsLink = useSelector(state =>
@@ -88,7 +88,7 @@ const docsLink = useSelector(state =>
{
name: "Detect getLearnUrl()",
code: `
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { getLearnUrl } from "metabase/selectors/settings";
const docsLink = useSelector(state =>
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx
index e3e12591ecf..4aa403c30e0 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkAdHocQuestion/SdkAdHocQuestion.tsx
@@ -2,8 +2,8 @@ import { useMemo } from "react";
import type { SdkQuestionProps } from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";
import { SdkQuestion } from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";
-import { deserializeCard, parseHash } from "metabase/lib/card";
-import * as Urls from "metabase/lib/urls";
+import { deserializeCard, parseHash } from "metabase/utils/card";
+import * as Urls from "metabase/utils/urls";
import type { QuestionMockLocationParameters } from "../SdkQuestion/context";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsx
index 07701a1d9d9..33760a82d45 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkGlobalFontsStyles.tsx
@@ -3,8 +3,8 @@ import { Global, css } from "@emotion/react";
import { useMemo } from "react";
import { defaultFontFiles } from "metabase/css/core/fonts.styled";
-import { useSelector } from "metabase/lib/redux";
import { getFontFiles } from "metabase/styled-components/selectors";
+import { useSelector } from "metabase/utils/redux";
/**
* css style to define the font files for the SDK
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/use-breakout-data.ts b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/use-breakout-data.ts
index 337bc7158f1..e393bf287dd 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/use-breakout-data.ts
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/use-breakout-data.ts
@@ -1,9 +1,9 @@
-import { isNotNull } from "metabase/lib/types";
import {
type ListItem as BreakoutListItem,
getBreakoutListItem,
} from "metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList";
import { useBreakoutQueryHandlers } from "metabase/query_builder/hooks";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsx
index c8f71dcc313..dfc42a68ff4 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ChartTypeDropdown/ChartTypeDropdown.tsx
@@ -2,8 +2,8 @@ import { useMemo } from "react";
import { t } from "ttag";
import type { IconName } from "metabase/embedding-sdk/types/icon";
-import { isNotNull } from "metabase/lib/types";
import { Combobox, Flex, Icon, Text, useCombobox } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import visualizations from "metabase/visualizations";
import type { Visualization } from "metabase/visualizations/types";
import type { CardDisplayType } from "metabase-types/api";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx
index d3fb5dd8286..d80bbcdca04 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx
@@ -2,7 +2,6 @@ import { useMemo } from "react";
import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";
import { useDatabaseListQuery } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import {
isQuestionDirty,
isQuestionRunnable,
@@ -11,6 +10,7 @@ import { Notebook as QBNotebook } from "metabase/querying/notebook/components/No
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { ScrollArea } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx
index e9bf6800dae..cac16eca33c 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx
@@ -2,10 +2,10 @@ import { useMemo } from "react";
import { useLatest } from "react-use";
import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";
-import { useSelector } from "metabase/lib/redux";
import { ResponsiveParametersList } from "metabase/query_builder/components/ResponsiveParametersList";
import { getMetadata } from "metabase/selectors/metadata";
import { Box } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";
import type { ParameterId } from "metabase-types/api";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx
index 9c97937a43c..cdb422442ed 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkThemeProvider.tsx
@@ -7,11 +7,11 @@ import { useEmbeddingThemeOverride } from "embedding-sdk-bundle/hooks/private/us
import { EnsureSingleInstance } from "embedding-sdk-shared/components/EnsureSingleInstance/EnsureSingleInstance";
import { useSetting } from "metabase/common/hooks";
import type { MetabaseEmbeddingTheme } from "metabase/embedding-sdk/theme";
-import { useSelector } from "metabase/lib/redux";
import { getFont } from "metabase/styled-components/selectors";
import { getMetabaseSdkCssVariables } from "metabase/styled-components/theme/css-variables";
import { ThemeProvider, useMantineTheme } from "metabase/ui";
import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";
+import { useSelector } from "metabase/utils/redux";
interface Props {
theme?: MetabaseEmbeddingTheme;
diff --git a/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.tsx b/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.tsx
index 1b7f96fe4d6..c6a5df88bfb 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.tsx
@@ -17,9 +17,9 @@ import { COLLECTION_PAGE_SIZE } from "metabase/collections/components/Collection
import { CollectionItemsTable } from "metabase/collections/components/CollectionContent/CollectionItemsTable";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useLocale } from "metabase/common/hooks/use-locale";
-import { isNotNull } from "metabase/lib/types";
import CollectionBreadcrumbs from "metabase/nav/containers/CollectionBreadcrumbs";
import { Icon, Stack } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import type { CollectionId, CollectionItemModel } from "metabase-types/api";
import { isObject } from "metabase-types/guards";
diff --git a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx
index 881ec09822a..d7d7e1bc369 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx
@@ -21,10 +21,10 @@ import { EnsureSingleInstance } from "embedding-sdk-shared/components/EnsureSing
import { useInstanceLocale } from "metabase/common/hooks/use-instance-locale";
import { isEmbeddingEajs } from "metabase/embedding-sdk/config";
import { isEmbeddingThemeV1 } from "metabase/embedding-sdk/theme";
-import { MetabaseReduxProvider, useSelector } from "metabase/lib/redux";
import { LocaleProvider } from "metabase/public/LocaleProvider";
import { setOptions } from "metabase/redux/embed";
import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";
+import { MetabaseReduxProvider, useSelector } from "metabase/utils/redux";
import { initializePlugins } from "sdk-ee-plugins";
import { SCOPED_CSS_RESET } from "../../private/PublicComponentStylesWrapper";
diff --git a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx
index bf14ac066c4..d295a5d9816 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.tsx
@@ -9,7 +9,7 @@ import type {
} from "embedding-sdk-bundle/types";
import { useCollectionQuery, useLocale } from "metabase/common/hooks";
import { CreateDashboardModal as CreateDashboardModalCore } from "metabase/dashboard/containers/CreateDashboardModal";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { createDashboardModalSchema } from "./CreateDashboardModal.schema";
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx
index 92405d0bd64..c984996e56d 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/InteractiveDashboard/InteractiveDashboard.tsx
@@ -9,7 +9,7 @@ import type { MetabasePluginsConfig } from "embedding-sdk-bundle/types/plugins";
import { PublicOrEmbeddedDashCardMenu } from "metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu";
import { DASHBOARD_ACTION } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys";
import type { MetabasePluginsConfig as InternalMetabasePluginsConfig } from "metabase/embedding-sdk/types/plugins";
-import { isQuestionCard } from "metabase/lib/dashboard";
+import { isQuestionCard } from "metabase/utils/dashboard";
import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
import { createEmbeddingSdkMode } from "metabase/visualizations/click-actions/modes/EmbeddingSdkMode";
import type { ClickActionModeGetter } from "metabase/visualizations/types";
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
index 0d87da4c7a8..0e5b048e881 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
@@ -62,12 +62,12 @@ import { getDashboardComplete, getIsDirty } from "metabase/dashboard/selectors";
import type { RefreshPeriod } from "metabase/dashboard/types";
import { EmbeddingEntityContextProvider } from "metabase/embedding/context";
import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";
-import { isStaticEmbeddingEntityLoadingError } from "metabase/lib/errors/is-static-embedding-entity-loading-error";
-import { useSelector } from "metabase/lib/redux";
import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
import { resetErrorPage, setErrorPage } from "metabase/redux/app";
import { dismissAllUndo } from "metabase/redux/undo";
import { getErrorPage } from "metabase/selectors/app";
+import { isStaticEmbeddingEntityLoadingError } from "metabase/utils/errors/is-static-embedding-entity-loading-error";
+import { useSelector } from "metabase/utils/redux";
import type { CardDisplayType } from "metabase-types/api";
import type {
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx
index 46c70da0eba..3b93fc377ef 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/StaticDashboard/StaticDashboard.tsx
@@ -3,7 +3,7 @@ import { useNormalizeGuestEmbedQuestionOrDashboardComponentProps } from "embeddi
import type { SdkDashboardEntityPublicProps } from "embedding-sdk-bundle/types/dashboard";
import { PublicOrEmbeddedDashCardMenu } from "metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu";
import { DASHBOARD_ACTION } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys";
-import { isQuestionCard } from "metabase/lib/dashboard";
+import { isQuestionCard } from "metabase/utils/dashboard";
import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
import { EmbeddingSdkStaticMode } from "metabase/visualizations/click-actions/modes/EmbeddingSdkStaticMode";
import type { ClickActionModeGetter } from "metabase/visualizations/types";
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx
index 34ea762c8a9..9a104ee908d 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/use-common-dashboard-params.tsx
@@ -4,15 +4,15 @@ import { usePrevious, useUnmount } from "react-use";
import { useSdkDispatch, useSdkStore } from "embedding-sdk-bundle/store";
import { getNewCardUrl } from "metabase/dashboard/actions/getNewCardUrl";
import type { NavigateToNewCardFromDashboardOpts } from "metabase/dashboard/components/DashCard/types";
-import { isJWT } from "metabase/lib/jwt";
-import { parseNumber } from "metabase/lib/number";
-import * as Urls from "metabase/lib/urls";
import {
NAVIGATE_TO_NEW_CARD,
reset as dashboardReset,
} from "metabase/redux/dashboard";
import { navigateBackToDashboard } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
+import { isJWT } from "metabase/utils/jwt";
+import { parseNumber } from "metabase/utils/number";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import {
type DashboardId,
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.ts
index 2991be6ab8f..e00bde8afc6 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers.ts
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useRef } from "react";
-import { useSelector } from "metabase/lib/redux";
import type { PublicOrEmbeddedDashboardEventHandlersProps } from "metabase/public/containers/PublicOrEmbeddedDashboard/types";
+import { useSelector } from "metabase/utils/redux";
import type { Dashboard } from "metabase-types/api";
import { getEventHandlers } from "../../store/selectors";
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts
index f6ed9dcb851..a51552ed699 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-embedding-theme-override.ts
@@ -11,11 +11,11 @@ import {
isEmbeddingThemeV2,
} from "metabase/embedding-sdk/theme";
import { setGlobalEmbeddingColors } from "metabase/embedding-sdk/theme/embedding-color-palette";
-import { useSelector } from "metabase/lib/redux";
import { getFont } from "metabase/styled-components/selectors";
import type { MantineThemeOverride } from "metabase/ui";
import { deriveFullMetabaseTheme } from "metabase/ui/colors";
import { getColorShades } from "metabase/ui/utils/colors";
+import { useSelector } from "metabase/utils/redux";
/**
* Returns the Mantine theme override for modular embedding.
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-extract-resource-id-from-jwt-token.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-extract-resource-id-from-jwt-token.ts
index 6c0dd3e4f4d..6f3a4842613 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-extract-resource-id-from-jwt-token.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-extract-resource-id-from-jwt-token.ts
@@ -2,7 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import type { SdkEntityToken } from "embedding-sdk-bundle/types";
-import { extractResourceIdFromJwtToken, isJWT } from "metabase/lib/jwt";
+import { extractResourceIdFromJwtToken, isJWT } from "metabase/utils/jwt";
export const useExtractResourceIdFromJwtToken = <TEntityId>({
isGuestEmbed,
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
index db481937a73..3915096304c 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-init-data/use-init-data-internal.ts
@@ -18,7 +18,7 @@ import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensur
import { getBuildInfo } from "embedding-sdk-shared/lib/get-build-info";
import registerDashboardVisualizations from "metabase/dashboard/visualizations/register";
import { EMBEDDING_SDK_CONFIG } from "metabase/embedding-sdk/config";
-import api from "metabase/lib/api";
+import api from "metabase/utils/api";
import registerVisualizations from "metabase/visualizations/register";
const registerVisualizationsOnce = _.once(registerVisualizations);
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-load-question.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-load-question.ts
index f646354c456..3fd896c375e 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-load-question.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-load-question.ts
@@ -16,8 +16,8 @@ import type {
SdkQuestionState,
SqlParameterValues,
} from "embedding-sdk-bundle/types/question";
-import { isStaticEmbeddingEntityLoadingError } from "metabase/lib/errors/is-static-embedding-entity-loading-error";
-import { type Deferred, defer } from "metabase/lib/promise";
+import { isStaticEmbeddingEntityLoadingError } from "metabase/utils/errors/is-static-embedding-entity-loading-error";
+import { type Deferred, defer } from "metabase/utils/promise";
import type Question from "metabase-lib/v1/Question";
import type { ParameterValuesMap } from "metabase-types/api";
import type { EntityToken } from "metabase-types/api/entity";
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-dashboard-params.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-dashboard-params.ts
index cb911adaf78..97f93c71db7 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-dashboard-params.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-dashboard-params.ts
@@ -6,7 +6,7 @@ import type { CommonStylingProps } from "embedding-sdk-bundle/types/props";
import { DEFAULT_DASHBOARD_DISPLAY_OPTIONS } from "metabase/dashboard/constants";
import type { EmbedDisplayParams } from "metabase/dashboard/types";
import type { ParameterValues } from "metabase/embedding-sdk/types/dashboard";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
/**
* @inline
diff --git a/frontend/src/embedding-sdk-bundle/lib/load-static-question.ts b/frontend/src/embedding-sdk-bundle/lib/load-static-question.ts
index 3f1de5124f3..2ece3e2aa53 100644
--- a/frontend/src/embedding-sdk-bundle/lib/load-static-question.ts
+++ b/frontend/src/embedding-sdk-bundle/lib/load-static-question.ts
@@ -1,5 +1,5 @@
-import type { Deferred } from "metabase/lib/promise";
import { CardApi } from "metabase/services";
+import type { Deferred } from "metabase/utils/promise";
import type { Card, Dataset, ParameterQueryObject } from "metabase-types/api";
interface Options {
diff --git a/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-query.ts b/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-query.ts
index 674f8405393..2b22927e580 100644
--- a/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-query.ts
+++ b/frontend/src/embedding-sdk-bundle/lib/sdk-question/run-question-query.ts
@@ -1,7 +1,7 @@
import { getGuestEmbedFilteredParameters } from "embedding-sdk-bundle/lib/get-guest-embed-filtered-parameters";
import type { SdkQuestionState } from "embedding-sdk-bundle/types/question";
-import type { Deferred } from "metabase/lib/promise";
import { runQuestionQuery } from "metabase/services";
+import type { Deferred } from "metabase/utils/promise";
import { getSensibleDisplays } from "metabase/visualizations";
import type Question from "metabase-lib/v1/Question";
import type { ParameterValuesMap } from "metabase-types/api";
diff --git a/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts b/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts
index cb60b56d019..f544d49453f 100644
--- a/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts
+++ b/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts
@@ -1,12 +1,12 @@
import _ from "underscore";
import type { SdkQuestionState } from "embedding-sdk-bundle/types/question";
-import type { Deferred } from "metabase/lib/promise";
import { computeQuestionPivotTable } from "metabase/query_builder/actions/core/pivot-table";
import { getAdHocQuestionWithVizSettings } from "metabase/query_builder/actions/core/utils";
import { createRawSeries } from "metabase/query_builder/utils";
import { loadMetadataForCard } from "metabase/questions/actions";
import { getMetadata } from "metabase/selectors/metadata";
+import type { Deferred } from "metabase/utils/promise";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { ParameterValuesMap } from "metabase-types/api";
diff --git a/frontend/src/embedding-sdk-bundle/store/auth/auth.ts b/frontend/src/embedding-sdk-bundle/store/auth/auth.ts
index 1afbbd3c64e..b7aa3756867 100644
--- a/frontend/src/embedding-sdk-bundle/store/auth/auth.ts
+++ b/frontend/src/embedding-sdk-bundle/store/auth/auth.ts
@@ -2,7 +2,7 @@ import type { Dispatch } from "@reduxjs/toolkit";
import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
-import { createAsyncThunk } from "metabase/lib/redux";
+import { createAsyncThunk } from "metabase/utils/redux";
// This is an SDK-only plugin and we co-locate it with its OSS usage for convenience and better three-shaking.
export const PLUGIN_EMBEDDING_SDK_AUTH = {
diff --git a/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts b/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts
index 7191529c33c..6407f6d4170 100644
--- a/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts
+++ b/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts
@@ -6,8 +6,8 @@ import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils/request-session-token";
import { isEmbeddingEajs } from "metabase/embedding-sdk/config";
-import { decodeJwt } from "metabase/lib/jwt";
-import { createAsyncThunk } from "metabase/lib/redux";
+import { decodeJwt } from "metabase/utils/jwt";
+import { createAsyncThunk } from "metabase/utils/redux";
import { getSessionTokenState } from "../selectors";
diff --git a/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts b/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts
index 3e284d55a9c..b7ade29f8ca 100644
--- a/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts
+++ b/frontend/src/embedding-sdk-bundle/store/guest-embed/guest-embed.ts
@@ -2,11 +2,11 @@ import { merge } from "icepick";
import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
import { overrideRequestsForGuestEmbeds } from "metabase/embedding/lib/override-requests-for-embeds";
-import { isJWT } from "metabase/lib/jwt";
-import { createAsyncThunk } from "metabase/lib/redux";
import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";
import type { OnBeforeRequestHandlerConfig } from "metabase/plugins/oss/api";
import { refreshSiteSettings } from "metabase/redux/settings";
+import { isJWT } from "metabase/utils/jwt";
+import { createAsyncThunk } from "metabase/utils/redux";
import { getOrRefreshGuestSession } from "./auth";
diff --git a/frontend/src/embedding-sdk-bundle/store/index.ts b/frontend/src/embedding-sdk-bundle/store/index.ts
index 1360d56c672..32d91f9d30c 100644
--- a/frontend/src/embedding-sdk-bundle/store/index.ts
+++ b/frontend/src/embedding-sdk-bundle/store/index.ts
@@ -1,16 +1,16 @@
import { type Reducer, combineReducers } from "@reduxjs/toolkit";
import { useContext } from "react";
-import {
- MetabaseReduxContext,
- useDispatch,
- useStore,
-} from "metabase/lib/redux";
import * as pulse from "metabase/notifications/pulse/reducers";
import * as qb from "metabase/query_builder/reducers";
import { commonReducers } from "metabase/reducers-common";
import { DEFAULT_EMBEDDING_ENTITY_TYPES } from "metabase/redux/embedding-data-picker";
import { getStore } from "metabase/store";
+import {
+ MetabaseReduxContext,
+ useDispatch,
+ useStore,
+} from "metabase/utils/redux";
import { reducer as visualizer } from "metabase/visualizer/visualizer.slice";
import { sdk } from "./reducer";
diff --git a/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts b/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts
index c8220fe8bb8..37df454f27c 100644
--- a/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts
+++ b/frontend/src/embedding-sdk-bundle/store/use-sdk-selector.ts
@@ -3,7 +3,7 @@ import type { TypedUseSelectorHook } from "react-redux";
import { createSelectorHook } from "react-redux";
import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
-import { MetabaseReduxContext } from "metabase/lib/redux";
+import { MetabaseReduxContext } from "metabase/utils/redux";
// eslint-disable-next-line metabase/no-literal-metabase-strings -- this string only shows in the console.
export const USE_OUTSIDE_OF_CONTEXT_MESSAGE = `Hooks from the Metabase modular embedding SDK must be used within a component wrapped by the MetabaseProvider`;
diff --git a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx
index 3cdc67c1069..8206959636d 100644
--- a/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx
+++ b/frontend/src/embedding-sdk-bundle/test/__support__/ui.tsx
@@ -9,9 +9,9 @@ import { createMockSdkState } from "embedding-sdk-bundle/test/mocks/state";
import type { MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-provider";
import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
import { Api } from "metabase/api";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import type { MantineThemeOverride } from "metabase/ui";
import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/embedding-sdk-bundle/types/question.ts b/frontend/src/embedding-sdk-bundle/types/question.ts
index c6a65704056..827a32f86fd 100644
--- a/frontend/src/embedding-sdk-bundle/types/question.ts
+++ b/frontend/src/embedding-sdk-bundle/types/question.ts
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
-import type { Deferred } from "metabase/lib/promise";
import type { QueryParams } from "metabase/query_builder/actions";
+import type { Deferred } from "metabase/utils/promise";
import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";
import type InternalQuestion from "metabase-lib/v1/Question";
import type { Card, ParameterValuesMap } from "metabase-types/api";
diff --git a/frontend/src/embedding-sdk-shared/.storybook/preview.tsx b/frontend/src/embedding-sdk-shared/.storybook/preview.tsx
index f4d47d1baed..ee633c1d1f0 100644
--- a/frontend/src/embedding-sdk-shared/.storybook/preview.tsx
+++ b/frontend/src/embedding-sdk-shared/.storybook/preview.tsx
@@ -11,7 +11,7 @@ defineBuildInfo("METABASE_EMBEDDING_SDK_PACKAGE_BUILD_INFO");
defineBuildInfo("METABASE_EMBEDDING_SDK_BUNDLE_BUILD_INFO");
defineGlobalDependencies();
-// @ts-expect-error: See metabase/lib/delay
+// @ts-expect-error: See metabase/utils/delay
// This will skip the skippable delays in stories
window.METABASE_REMOVE_DELAYS = true;
diff --git a/frontend/src/embedding-sdk-shared/lib/version-utils.ts b/frontend/src/embedding-sdk-shared/lib/version-utils.ts
index 2612f037de8..b0ada051233 100644
--- a/frontend/src/embedding-sdk-shared/lib/version-utils.ts
+++ b/frontend/src/embedding-sdk-shared/lib/version-utils.ts
@@ -1,7 +1,7 @@
// SKIPPED eslint-disable-next-line no-external-references-for-sdk-package-code
import { EMBEDDING_SDK_BUNDLE_UNKNOWN_VERSION } from "build-configs/embedding-sdk/constants/versions";
// SKIPPED eslint-disable-next-line no-external-references-for-sdk-package-code
-import { versionToNumericComponents } from "metabase/lib/utils";
+import { versionToNumericComponents } from "metabase/utils/version";
// They are mostly used for local development
export const isInvalidMetabaseVersion = (mbVersion: string) => {
diff --git a/frontend/src/metabase-lib/query/breakout.unit.spec.ts b/frontend/src/metabase-lib/query/breakout.unit.spec.ts
index 300e1d12fc2..68df260a56d 100644
--- a/frontend/src/metabase-lib/query/breakout.unit.spec.ts
+++ b/frontend/src/metabase-lib/query/breakout.unit.spec.ts
@@ -1,4 +1,4 @@
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase-lib/v1/Question.ts b/frontend/src/metabase-lib/v1/Question.ts
index 38f98f180ae..8174a3935a8 100644
--- a/frontend/src/metabase-lib/v1/Question.ts
+++ b/frontend/src/metabase-lib/v1/Question.ts
@@ -4,13 +4,12 @@ import { assoc, assocIn, chain, dissoc, getIn } from "icepick";
import slugg from "slugg";
import _ from "underscore";
-// eslint-disable-next-line no-restricted-imports
+/* eslint-disable no-restricted-imports */
+import { applyParameter } from "metabase/querying/parameters/utils/query";
import {
type SerializeCardOptions,
serializeCardForUrl,
-} from "metabase/lib/card";
-import { equals } from "metabase/lib/utils";
-import { applyParameter } from "metabase/querying/parameters/utils/query";
+} from "metabase/utils/card";
import * as Lib from "metabase-lib";
import {
ALERT_TYPE_PROGRESS_BAR_GOAL,
@@ -685,7 +684,7 @@ class Question {
const originalCard = originalQuestion?._getValueForComparison();
const currentCard = this._getValueForComparison();
- if (!equals(originalCard, currentCard)) {
+ if (!_.isEqual(originalCard, currentCard)) {
return true;
}
diff --git a/frontend/src/metabase-lib/v1/metadata/Field.ts b/frontend/src/metabase-lib/v1/metadata/Field.ts
index 9e4157c8d28..767398d4927 100644
--- a/frontend/src/metabase-lib/v1/metadata/Field.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Field.ts
@@ -2,7 +2,7 @@
// @ts-nocheck
import _ from "underscore";
-import { formatField, stripId } from "metabase/lib/formatting";
+import { formatField, stripId } from "metabase/utils/formatting";
import {
getFieldValues,
getRemappings,
diff --git a/frontend/src/metabase-lib/v1/metadata/Field.unit.spec.ts b/frontend/src/metabase-lib/v1/metadata/Field.unit.spec.ts
index 7605867cba3..2920d825183 100644
--- a/frontend/src/metabase-lib/v1/metadata/Field.unit.spec.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Field.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { TYPE } from "metabase-lib/v1/types/constants";
import type { Database, Field, Table } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase-lib/v1/metadata/Schema.ts b/frontend/src/metabase-lib/v1/metadata/Schema.ts
index c4a3c1b9807..e9da5e4673f 100644
--- a/frontend/src/metabase-lib/v1/metadata/Schema.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Schema.ts
@@ -1,4 +1,4 @@
-import { humanize, titleize } from "metabase/lib/formatting";
+import { humanize, titleize } from "metabase/utils/formatting";
import type { NormalizedSchema } from "metabase-types/api";
import type Database from "./Database";
diff --git a/frontend/src/metabase-lib/v1/metadata/Table.ts b/frontend/src/metabase-lib/v1/metadata/Table.ts
index 9ff603931c4..eecdfb1327a 100644
--- a/frontend/src/metabase-lib/v1/metadata/Table.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Table.ts
@@ -1,7 +1,7 @@
import _ from "underscore";
// NOTE: this needs to be imported first due to some cyclical dependency nonsense
-import { singularize } from "metabase/lib/formatting";
+import { singularize } from "metabase/utils/formatting";
import type { NormalizedTable } from "metabase-types/api";
import Question from "../Question";
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.ts b/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.ts
index bc5bd96e28c..c9051896ea1 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.ts
+++ b/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.ts
@@ -3,10 +3,10 @@ import _ from "underscore";
import {
formatDateTimeForParameter,
formatDateToRangeForParameter,
-} from "metabase/lib/formatting/date";
-import type { ValueAndColumnForColumnNameDate } from "metabase/lib/formatting/link";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import { checkNotNull } from "metabase/lib/types";
+} from "metabase/utils/formatting/date";
+import type { ValueAndColumnForColumnNameDate } from "metabase/utils/formatting/link";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
+import { checkNotNull } from "metabase/utils/types";
import type { ClickObjectDimension as DimensionType } from "metabase-lib";
import * as Lib from "metabase-lib";
import type { TemplateTagDimension } from "metabase-lib/v1/Dimension";
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.unit.spec.ts b/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.unit.spec.ts
index 974a89bd82a..e82ec9aba0f 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.unit.spec.ts
+++ b/frontend/src/metabase-lib/v1/parameters/utils/click-behavior.unit.spec.ts
@@ -1,6 +1,6 @@
import { createMockMetadata } from "__support__/metadata";
-import * as dateFormatUtils from "metabase/lib/formatting/date";
-import { checkNotNull } from "metabase/lib/types";
+import * as dateFormatUtils from "metabase/utils/formatting/date";
+import { checkNotNull } from "metabase/utils/types";
import Question from "metabase-lib/v1/Question";
import type Field from "metabase-lib/v1/metadata/Field";
import type { FieldId, TemplateTagType } from "metabase-types/api";
@@ -87,7 +87,7 @@ const emptyData = {
userAttribute: {},
};
-describe("metabase/lib/click-behavior", () => {
+describe("metabase/utils/click-behavior", () => {
describe("getDataFromClicked", () => {
it("should pull out column values from data", () => {
const column = createMockColumn({ name: "price" });
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/targets.ts b/frontend/src/metabase-lib/v1/parameters/utils/targets.ts
index 75fc8758b7e..cddb2893013 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/targets.ts
+++ b/frontend/src/metabase-lib/v1/parameters/utils/targets.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type { TemplateTagDimension } from "metabase-lib/v1/Dimension";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts b/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts
index 3a7c9d802cb..33be427bd4b 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts
+++ b/frontend/src/metabase-lib/v1/parameters/utils/targets.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
DEFAULT_TEST_QUERY,
diff --git a/frontend/src/metabase-lib/v1/queries/NativeQuery.ts b/frontend/src/metabase-lib/v1/queries/NativeQuery.ts
index 0768f6f5325..5969d006a16 100644
--- a/frontend/src/metabase-lib/v1/queries/NativeQuery.ts
+++ b/frontend/src/metabase-lib/v1/queries/NativeQuery.ts
@@ -1,7 +1,7 @@
import slugg from "slugg";
import _ from "underscore";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type Database from "metabase-lib/v1/metadata/Database";
diff --git a/frontend/src/metabase-lib/v1/queries/drills/dashboard-click-drill.js b/frontend/src/metabase-lib/v1/queries/drills/dashboard-click-drill.js
index dfd751134fa..f87220c42c7 100644
--- a/frontend/src/metabase-lib/v1/queries/drills/dashboard-click-drill.js
+++ b/frontend/src/metabase-lib/v1/queries/drills/dashboard-click-drill.js
@@ -3,8 +3,8 @@ import querystring from "querystring";
import { getIn } from "icepick";
import _ from "underscore";
-import { renderLinkURLForClick } from "metabase/lib/formatting/link";
-import * as Urls from "metabase/lib/urls";
+import { renderLinkURLForClick } from "metabase/utils/formatting/link";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import {
diff --git a/frontend/src/metabase-lib/v1/queries/utils/card.js b/frontend/src/metabase-lib/v1/queries/utils/card.js
index b332bd7bb59..559a02da41b 100644
--- a/frontend/src/metabase-lib/v1/queries/utils/card.js
+++ b/frontend/src/metabase-lib/v1/queries/utils/card.js
@@ -1,7 +1,7 @@
import { updateIn } from "icepick";
import _ from "underscore";
-import { copy } from "metabase/lib/utils";
+import { clone } from "metabase/utils/clone";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import { deriveFieldOperatorFromParameter } from "metabase-lib/v1/parameters/utils/operators";
@@ -51,7 +51,7 @@ export function applyParameters(
parameterMappings = [],
{ sparse = false } = {},
) {
- const datasetQuery = copy(card.dataset_query);
+ const datasetQuery = clone(card.dataset_query);
datasetQuery.parameters = [];
for (const parameter of parameters || []) {
const value = parameterValues[parameter.id];
diff --git a/frontend/src/metabase-lib/v1/queries/utils/pivot.ts b/frontend/src/metabase-lib/v1/queries/utils/pivot.ts
index 1f9c5197f51..16e900302ad 100644
--- a/frontend/src/metabase-lib/v1/queries/utils/pivot.ts
+++ b/frontend/src/metabase-lib/v1/queries/utils/pivot.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type {
diff --git a/frontend/src/metabase-lib/v1/urls.ts b/frontend/src/metabase-lib/v1/urls.ts
index 457e5bbd40a..31ddf386b4d 100644
--- a/frontend/src/metabase-lib/v1/urls.ts
+++ b/frontend/src/metabase-lib/v1/urls.ts
@@ -1,5 +1,5 @@
-import { utf8_to_b64url } from "metabase/lib/encoding";
-import * as Urls from "metabase/lib/urls";
+import { utf8_to_b64url } from "metabase/utils/encoding";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type { ParameterWithTarget } from "metabase-lib/v1/parameters/types";
import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";
diff --git a/frontend/src/metabase-lib/v1/utils/index.ts b/frontend/src/metabase-lib/v1/utils/index.ts
index 36bfc2558a7..c906cfa3f60 100644
--- a/frontend/src/metabase-lib/v1/utils/index.ts
+++ b/frontend/src/metabase-lib/v1/utils/index.ts
@@ -1,2 +1 @@
export { memoizeClass } from "./memoize-class";
-export { sortObject } from "./sort-object";
diff --git a/frontend/src/metabase-lib/v1/utils/sort-object.ts b/frontend/src/metabase-lib/v1/utils/sort-object.ts
deleted file mode 100644
index 2516e7acda5..00000000000
--- a/frontend/src/metabase-lib/v1/utils/sort-object.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// `sortObject` copies objects for deterministic serialization.
-// Objects that have equal keys and values don't necessarily serialize to the
-// same string. JSON.stringify prints properties in inserted order. This function
-// sorts keys before adding them to the duplicated object to ensure consistent
-// serialization.
-export function sortObject(obj: any | any[]): any | any[] {
- if (obj === null || typeof obj !== "object") {
- return obj;
- }
-
- if (Array.isArray(obj)) {
- return obj.map(sortObject);
- }
-
- const sortedKeyValues = Object.entries(obj).sort(([keyA], [keyB]) =>
- keyA.localeCompare(keyB),
- );
- const o: Record<string, any> = {};
-
- for (const [k, v] of sortedKeyValues) {
- o[k] = sortObject(v);
- }
-
- return o;
-}
diff --git a/frontend/src/metabase-types/api/card.ts b/frontend/src/metabase-types/api/card.ts
index 4de0f63ffd0..ced027ec3dc 100644
--- a/frontend/src/metabase-types/api/card.ts
+++ b/frontend/src/metabase-types/api/card.ts
@@ -1,9 +1,9 @@
-import type { CurrencyStyle } from "metabase/lib/formatting";
import type {
EmbeddingParameters,
EmbeddingType,
} from "metabase/public/lib/types";
import type { IconName } from "metabase/ui";
+import type { CurrencyStyle } from "metabase/utils/formatting";
import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
import type { EntityToken, EntityUuid } from "metabase-types/api/entity";
diff --git a/frontend/src/metabase-types/api/mocks/document.ts b/frontend/src/metabase-types/api/mocks/document.ts
index ee07f3a31d3..caa51fa15cf 100644
--- a/frontend/src/metabase-types/api/mocks/document.ts
+++ b/frontend/src/metabase-types/api/mocks/document.ts
@@ -1,4 +1,4 @@
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import type { Document, DocumentContent } from "metabase-types/api";
import { createMockUser } from "./user";
diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.ts
index 628731a2fbe..98e54c3bc89 100644
--- a/frontend/src/metabase-types/api/settings.ts
+++ b/frontend/src/metabase-types/api/settings.ts
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
import type { SdkIframeEmbedSetupSettings } from "metabase/embedding/embedding-iframe-sdk-setup/types";
-import type { CurrencyStyle } from "metabase/lib/formatting";
+import type { CurrencyStyle } from "metabase/utils/formatting";
import type { InputSettingType } from "./actions";
import type { DashboardId } from "./dashboard";
diff --git a/frontend/src/metabase-types/store/qb.ts b/frontend/src/metabase-types/store/qb.ts
index cc1ed716726..73becc47946 100644
--- a/frontend/src/metabase-types/store/qb.ts
+++ b/frontend/src/metabase-types/store/qb.ts
@@ -1,5 +1,5 @@
-import type { Deferred } from "metabase/lib/promise";
import type { QueryModalType } from "metabase/querying/constants";
+import type { Deferred } from "metabase/utils/promise";
import type { Widget } from "metabase/visualizations/types";
import type {
Card,
diff --git a/frontend/src/metabase/App.tsx b/frontend/src/metabase/App.tsx
index 737adb198ad..0957daeaa6a 100644
--- a/frontend/src/metabase/App.tsx
+++ b/frontend/src/metabase/App.tsx
@@ -16,8 +16,6 @@ import { ContentViewportContext } from "metabase/common/context/ContentViewportC
import CS from "metabase/css/core/index.css";
import ScrollToTop from "metabase/hoc/ScrollToTop";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { initializeIframeResizer } from "metabase/lib/dom";
-import { connect, useSelector } from "metabase/lib/redux";
import AppBar from "metabase/nav/containers/AppBar";
import Navbar from "metabase/nav/containers/Navbar";
import { setErrorPage } from "metabase/redux/app";
@@ -30,6 +28,8 @@ import {
} from "metabase/selectors/app";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { StatusListing } from "metabase/status/components/StatusListing";
+import { initializeIframeResizer } from "metabase/utils/dom";
+import { connect, useSelector } from "metabase/utils/redux";
import type { AppErrorDescriptor, State } from "metabase-types/store";
import { AppContainer, AppContent, AppContentContainer } from "./App.styled";
diff --git a/frontend/src/metabase/AppColorSchemeProvider.tsx b/frontend/src/metabase/AppColorSchemeProvider.tsx
index 82681465065..286ac7acebb 100644
--- a/frontend/src/metabase/AppColorSchemeProvider.tsx
+++ b/frontend/src/metabase/AppColorSchemeProvider.tsx
@@ -8,7 +8,6 @@ import {
import { useMedia } from "react-use";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import type { ColorScheme } from "metabase/lib/color-scheme";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import {
ColorSchemeContext,
@@ -16,6 +15,8 @@ import {
colorSchemeContextDefaultValue,
} from "metabase/ui/components/theme/ColorSchemeProvider";
+import type { ColorScheme } from "./utils/color-scheme";
+
interface AppColorSchemeProviderProps {
children: ReactNode;
defaultColorScheme?: ColorScheme;
diff --git a/frontend/src/metabase/AppThemeProvider.tsx b/frontend/src/metabase/AppThemeProvider.tsx
index 70f8cfc3067..3b9b84289b0 100644
--- a/frontend/src/metabase/AppThemeProvider.tsx
+++ b/frontend/src/metabase/AppThemeProvider.tsx
@@ -5,22 +5,22 @@ import {
isStaticEmbedding,
} from "metabase/embedding/config";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { PUT } from "metabase/lib/api";
-import { parseHashOptions } from "metabase/lib/browser";
+import type { DisplayTheme } from "metabase/public/lib/types";
+import type { MantineThemeOverride } from "metabase/ui";
+import { mutateColors } from "metabase/ui/colors/colors";
+import { ThemeProvider } from "metabase/ui/components/theme/ThemeProvider";
+import { PUT } from "metabase/utils/api";
+import { parseHashOptions } from "metabase/utils/browser";
import type {
ColorScheme,
ResolvedColorScheme,
-} from "metabase/lib/color-scheme";
+} from "metabase/utils/color-scheme";
import {
getUserColorScheme,
isValidColorScheme,
setUserColorSchemeAfterUpdate,
-} from "metabase/lib/color-scheme";
-import MetabaseSettings from "metabase/lib/settings";
-import type { DisplayTheme } from "metabase/public/lib/types";
-import type { MantineThemeOverride } from "metabase/ui";
-import { mutateColors } from "metabase/ui/colors/colors";
-import { ThemeProvider } from "metabase/ui/components/theme/ThemeProvider";
+} from "metabase/utils/color-scheme";
+import MetabaseSettings from "metabase/utils/settings";
import type { ColorSettings } from "metabase-types/api";
import { AppColorSchemeProvider } from "./AppColorSchemeProvider";
diff --git a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx
index 69a70b5b724..618c7946cf3 100644
--- a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx
+++ b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.tsx
@@ -3,8 +3,8 @@ import { useMemo } from "react";
import { t } from "ttag";
import { Radio } from "metabase/common/components/Radio";
-import { getFullName } from "metabase/lib/user";
import { PLUGIN_IS_PASSWORD_USER } from "metabase/plugins";
+import { getFullName } from "metabase/utils/user";
import type { User } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx
index 2831e23b3c2..612d63ac553 100644
--- a/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx
+++ b/frontend/src/metabase/account/app/containers/AccountApp/AccountApp.tsx
@@ -1,8 +1,8 @@
import type { Location } from "history";
import { push } from "react-router-redux";
-import { connect } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import AccountLayout from "../../components/AccountLayout";
diff --git a/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
index 955244a5a78..4028886e5ea 100644
--- a/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
+++ b/frontend/src/metabase/account/notifications/components/ArchiveModal/ArchiveModal.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { Button } from "metabase/common/components/Button";
import { ModalContent } from "metabase/common/components/ModalContent";
import { FormMessage } from "metabase/forms";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting";
-import { formatChannelRecipients } from "metabase/lib/pulse";
-import Settings from "metabase/lib/settings";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting";
+import { formatChannelRecipients } from "metabase/utils/pulse";
+import Settings from "metabase/utils/settings";
import type { Alert, DashboardSubscription, User } from "metabase-types/api";
import type { NotificationType } from "../../types";
diff --git a/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsx b/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsx
index 3e0ed4bf10c..0bf3ec89172 100644
--- a/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsx
+++ b/frontend/src/metabase/account/notifications/components/HelpModal/HelpModal.tsx
@@ -3,9 +3,9 @@ import { jt, t } from "ttag";
import { Button } from "metabase/common/components/Button";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { ModalContent } from "metabase/common/components/ModalContent";
-import { useSelector } from "metabase/lib/redux";
-import Settings from "metabase/lib/settings";
import { getApplicationName } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
+import Settings from "metabase/utils/settings";
import { ModalMessage } from "./HelpModal.styled";
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx
index 6b67869e802..7336c0c3370 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx
+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.tsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { formatCreatorMessage } from "metabase/account/notifications/components/NotificationCard/utils";
import type { DashboardSubscriptionListItem } from "metabase/account/notifications/types";
import { Link } from "metabase/common/components/Link";
-import { formatTitle } from "metabase/lib/notifications";
-import { canArchiveLegacyAlert, formatChannel } from "metabase/lib/pulse";
-import * as Urls from "metabase/lib/urls";
+import { formatTitle } from "metabase/utils/notifications";
+import { canArchiveLegacyAlert, formatChannel } from "metabase/utils/pulse";
+import * as Urls from "metabase/utils/urls";
import type { Channel, User } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx
index ce06179663d..8eda3357fcc 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx
+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx
@@ -11,14 +11,14 @@ import {
import { formatCreatorMessage } from "metabase/account/notifications/components/NotificationCard/utils";
import type { QuestionNotificationListItem } from "metabase/account/notifications/types";
import { Link } from "metabase/common/components/Link/Link";
+import { Group, Icon } from "metabase/ui";
import {
canArchive,
formatNotificationSchedule,
formatTitle,
getNotificationEnabledChannelsMap,
-} from "metabase/lib/notifications";
-import * as Urls from "metabase/lib/urls";
-import { Group, Icon } from "metabase/ui";
+} from "metabase/utils/notifications";
+import * as Urls from "metabase/utils/urls";
import type { User } from "metabase-types/api";
type NotificationCardProps = {
diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/utils.ts b/frontend/src/metabase/account/notifications/components/NotificationCard/utils.ts
index df0c734657a..0f7bebdb88c 100644
--- a/frontend/src/metabase/account/notifications/components/NotificationCard/utils.ts
+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/utils.ts
@@ -1,8 +1,8 @@
import { t } from "ttag";
import type { NotificationListItem } from "metabase/account/notifications/types";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting/date";
-import Settings from "metabase/lib/settings";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting/date";
+import Settings from "metabase/utils/settings";
import type { UserId } from "metabase-types/api";
export const formatCreatorMessage = (
diff --git a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx
index 9e946a9ff3e..ff318352ad4 100644
--- a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx
+++ b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.tsx
@@ -6,8 +6,8 @@ import {
useUpdateSubscriptionMutation,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import { ArchiveNotificationModal } from "../../components/ArchiveModal";
import { getPulseId } from "../../selectors";
diff --git a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx
index b155b403fe8..17e9537bba2 100644
--- a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx
+++ b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx
@@ -4,12 +4,12 @@ import { useMemo } from "react";
import type { NotificationListItem } from "metabase/account/notifications/types";
import { skipToken, useListNotificationsQuery } from "metabase/api";
import { Pulses } from "metabase/entities/pulses";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
import {
canManageSubscriptions as canManageSubscriptionsSelector,
getUser,
} from "metabase/selectors/user";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
import type { DashboardSubscription } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx
index 7dfe49334dc..4639602fe35 100644
--- a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx
+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx
@@ -8,9 +8,9 @@ import {
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useToast } from "metabase/common/hooks/use-toast";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { UnsubscribeConfirmModal } from "metabase/notifications/modals/UnsubscribeConfirmModal";
import { getUser } from "metabase/selectors/user";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Notification, User } from "metabase-types/api";
import { getAlertId } from "../../selectors";
diff --git a/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx b/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx
index 8f8d22ed700..778b0b7326f 100644
--- a/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx
+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.tsx
@@ -2,8 +2,8 @@ import { skipToken } from "@reduxjs/toolkit/query/react";
import { useGetSubscriptionQuery, useUnsubscribeMutation } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { navigateToArchive } from "../../actions";
import { UnsubscribeModal } from "../../components/UnsubscribeModal";
diff --git a/frontend/src/metabase/account/password/actions.ts b/frontend/src/metabase/account/password/actions.ts
index a706d087b88..1cd22af3391 100644
--- a/frontend/src/metabase/account/password/actions.ts
+++ b/frontend/src/metabase/account/password/actions.ts
@@ -1,10 +1,10 @@
import { getIn } from "icepick";
-import MetabaseSettings from "metabase/lib/settings";
import { UtilApi } from "metabase/services";
+import { passwordComplexityDescription } from "metabase/utils/password";
export const validatePassword = async (password: string) => {
- const error = MetabaseSettings.passwordComplexityDescription(password);
+ const error = passwordComplexityDescription(password);
if (error) {
return error;
}
diff --git a/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx b/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx
index 407ffb699c0..13bc909f578 100644
--- a/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx
+++ b/frontend/src/metabase/account/password/containers/UserPasswordApp/UserPasswordApp.tsx
@@ -1,6 +1,6 @@
-import { connect } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { State } from "metabase-types/store";
import { validatePassword } from "../../actions";
diff --git a/frontend/src/metabase/account/profile/actions.ts b/frontend/src/metabase/account/profile/actions.ts
index 22ff2f636b7..cb7bdc5172a 100644
--- a/frontend/src/metabase/account/profile/actions.ts
+++ b/frontend/src/metabase/account/profile/actions.ts
@@ -1,5 +1,5 @@
import { userApi } from "metabase/api";
-import { createThunkAction } from "metabase/lib/redux";
+import { createThunkAction } from "metabase/utils/redux";
import type { User } from "metabase-types/api";
import type { UserProfileData } from "./types";
diff --git a/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx b/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx
index 131b19bf786..8eeb76a188d 100644
--- a/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx
+++ b/frontend/src/metabase/account/profile/components/UserProfileForm/UserProfileForm.tsx
@@ -13,8 +13,8 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Box, Text } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { LocaleData, User } from "metabase-types/api";
import type { UserProfileData } from "../../types";
diff --git a/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx b/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx
index dec3ece1364..bd68485c284 100644
--- a/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx
+++ b/frontend/src/metabase/account/profile/containers/UserProfileApp/UserProfileApp.tsx
@@ -1,6 +1,6 @@
-import { connect } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { State } from "metabase-types/store";
import { updateUser } from "../../actions";
diff --git a/frontend/src/metabase/actions/components/ActionViz/Action.tsx b/frontend/src/metabase/actions/components/ActionViz/Action.tsx
index 1064db77a00..d5ef376f426 100644
--- a/frontend/src/metabase/actions/components/ActionViz/Action.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/Action.tsx
@@ -11,9 +11,9 @@ import {
getParameterValues,
} from "metabase/dashboard/selectors";
import { getActionIsEnabledInDatabase } from "metabase/dashboard/utils";
-import { connect, useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Tooltip } from "metabase/ui";
+import { connect, useSelector } from "metabase/utils/redux";
import type { VisualizationProps } from "metabase/visualizations/types";
import Question from "metabase-lib/v1/Question";
import type {
diff --git a/frontend/src/metabase/actions/components/ActionViz/Action.unit.spec.tsx b/frontend/src/metabase/actions/components/ActionViz/Action.unit.spec.tsx
index b810f1d21a1..d91bc891ddd 100644
--- a/frontend/src/metabase/actions/components/ActionViz/Action.unit.spec.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/Action.unit.spec.tsx
@@ -16,7 +16,7 @@ import {
within,
} from "__support__/ui";
import { getActionIsEnabledInDatabase } from "metabase/dashboard/utils";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type {
ActionDashboardCard,
Database,
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx
index 2529248fc20..101e1b45d5f 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.tsx
@@ -6,7 +6,7 @@ import { Button } from "metabase/common/components/Button";
import { EmptyState } from "metabase/common/components/EmptyState";
import CS from "metabase/css/core/index.css";
import { setActionForDashcard } from "metabase/dashboard/actions";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type {
ActionDashboardCard,
Dashboard,
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsx
index 08a93bb5187..51960feb92b 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.tsx
@@ -6,7 +6,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import type { SelectChangeEvent } from "metabase/common/components/Select";
import { Select } from "metabase/common/components/Select";
import { setParameterMapping } from "metabase/dashboard/actions";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type {
ActionDashboardCard,
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionVizForm.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionVizForm.tsx
index 89b347439f3..117cd209004 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionVizForm.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionVizForm.tsx
@@ -8,8 +8,8 @@ import ActionParametersInputForm, {
import { useActionInitialValues } from "metabase/actions/hooks/use-action-initial-values";
import { getFormTitle, isImplicitUpdateAction } from "metabase/actions/utils";
import { Modal } from "metabase/common/components/Modal";
-import { getDashboardType } from "metabase/lib/dashboard";
import { ActionsApi, PublicApi } from "metabase/services";
+import { getDashboardType } from "metabase/utils/dashboard";
import type {
ActionDashboardCard,
Dashboard,
diff --git a/frontend/src/metabase/actions/components/ActionViz/utils.ts b/frontend/src/metabase/actions/components/ActionViz/utils.ts
index 6566dd5d1c5..385cc801849 100644
--- a/frontend/src/metabase/actions/components/ActionViz/utils.ts
+++ b/frontend/src/metabase/actions/components/ActionViz/utils.ts
@@ -1,8 +1,8 @@
import _ from "underscore";
import { isImplicitDeleteAction } from "metabase/actions/utils";
-import { isNotNull } from "metabase/lib/types";
-import { isEmpty } from "metabase/lib/validate";
+import { isNotNull } from "metabase/utils/types";
+import { isEmpty } from "metabase/utils/validate";
import type {
ActionDashboardCard,
ActionParameterValue,
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
index f87e9745363..a4fa829848b 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
@@ -15,8 +15,8 @@ import type {
import { Actions } from "metabase/entities/actions";
import { Databases } from "metabase/entities/databases";
import { Questions } from "metabase/entities/questions";
-import { connect } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
index d48fcf4325a..c16f9756f64 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
@@ -16,7 +16,7 @@ import {
DataReferenceTriggerButton,
} from "metabase/actions/containers/ActionCreator/InlineDataReference";
import { Button } from "metabase/common/components/Button";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { ActionFormSettings, WritebackAction } from "metabase-types/api";
import InlineActionSettings, {
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx b/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx
index 0f536ae4e33..b1f1e4156ed 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx
@@ -10,8 +10,8 @@ import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { FormTextArea } from "metabase/common/components/FormTextArea";
import type { CreateQueryActionParams } from "metabase/entities/actions";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { FormModelPicker } from "metabase/models/containers/FormModelPicker";
+import * as Errors from "metabase/utils/errors";
const ACTION_SCHEMA = Yup.object({
name: Yup.string()
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx
index 6e01b215b38..291e7e563cd 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.tsx
@@ -1,9 +1,9 @@
import { jt, t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
import { InfoText } from "./Description.styled";
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
index 3d24dd8490c..888bd971d6d 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.tsx
@@ -9,7 +9,7 @@ import type { ActionFormFieldProps } from "metabase/actions/types";
import { inputTypeHasOptions } from "metabase/actions/utils";
import { CheckBox } from "metabase/common/components/CheckBox";
import { Radio } from "metabase/common/components/Radio";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type {
FieldSettings,
FieldType,
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/utils.ts b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/utils.ts
index 8171269a2ef..de554654416 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/utils.ts
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/utils.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { moveElement } from "metabase/lib/arrays";
+import { moveElement } from "metabase/utils/arrays";
import type { FieldSettingsMap, InputSettingType } from "metabase-types/api";
const inputTypeMap: Record<InputSettingType, string> = {
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
index 9f9f1db196b..5e5663825d7 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx
@@ -10,11 +10,11 @@ import { SidebarContent } from "metabase/common/components/SidebarContent";
import { TextArea } from "metabase/common/components/TextArea";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import { Actions } from "metabase/entities/actions/actions";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getSetting } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Switch, Tooltip } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type {
ActionFormSettings,
WritebackAction,
diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx
index d305bedd39f..95dbc4e5e95 100644
--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx
@@ -6,9 +6,9 @@ import _ from "underscore";
import { skipToken, useGetActionQuery } from "metabase/api";
import { Questions } from "metabase/entities/questions";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { setErrorPage } from "metabase/redux/app";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import type { WritebackAction } from "metabase-types/api";
import type { AppErrorDescriptor, State } from "metabase-types/store";
diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx
index 9d0e657e4a5..a982c4fcb41 100644
--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.unit.spec.tsx
@@ -14,7 +14,7 @@ import {
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Card, WritebackAction } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsx b/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsx
index dc445b108e5..f8fb8c6d0ef 100644
--- a/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsx
+++ b/frontend/src/metabase/actions/containers/ActionExecuteModal/ActionExecuteModal.tsx
@@ -3,9 +3,9 @@ import { useCallback } from "react";
import { skipToken, useGetActionQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { Modal } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type {
ParametersForActionExecution,
WritebackActionId,
diff --git a/frontend/src/metabase/actions/hooks/use-action-form/utils.ts b/frontend/src/metabase/actions/hooks/use-action-form/utils.ts
index b2464f6c1fa..ab5e63f5380 100644
--- a/frontend/src/metabase/actions/hooks/use-action-form/utils.ts
+++ b/frontend/src/metabase/actions/hooks/use-action-form/utils.ts
@@ -2,7 +2,7 @@ import dayjs from "dayjs";
import type { FieldSettings as LocalFieldSettings } from "metabase/actions/types";
import { getDefaultFieldSettings } from "metabase/actions/utils";
-import { isEmpty } from "metabase/lib/validate";
+import { isEmpty } from "metabase/utils/validate";
import { getParameterType } from "metabase-lib/v1/parameters/utils/parameter-type";
import type {
FieldSettings,
diff --git a/frontend/src/metabase/actions/utils.ts b/frontend/src/metabase/actions/utils.ts
index 58ef9cbf42b..47144aa1ee4 100644
--- a/frontend/src/metabase/actions/utils.ts
+++ b/frontend/src/metabase/actions/utils.ts
@@ -1,7 +1,7 @@
import { t } from "ttag";
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import type Field from "metabase-lib/v1/metadata/Field";
import { TYPE } from "metabase-lib/v1/types/constants";
import type {
diff --git a/frontend/src/metabase/admin/admin.ts b/frontend/src/metabase/admin/admin.ts
index c6a14b8b196..c30fe561f90 100644
--- a/frontend/src/metabase/admin/admin.ts
+++ b/frontend/src/metabase/admin/admin.ts
@@ -5,7 +5,7 @@ import { databasesReducer as databases } from "metabase/admin/databases/database
import { datamodel } from "metabase/admin/datamodel/datamodel";
import { people } from "metabase/admin/people/people";
import { permissions } from "metabase/admin/permissions/permissions";
-import { combineReducers } from "metabase/lib/redux";
+import { combineReducers } from "metabase/utils/redux";
export const admin = combineReducers({
app,
diff --git a/frontend/src/metabase/admin/app/actions.ts b/frontend/src/metabase/admin/app/actions.ts
index 798d2a0677c..bfd10e5d4db 100644
--- a/frontend/src/metabase/admin/app/actions.ts
+++ b/frontend/src/metabase/admin/app/actions.ts
@@ -1,5 +1,5 @@
-import { createAsyncThunk } from "metabase/lib/redux";
import { updateSetting } from "metabase/redux/settings";
+import { createAsyncThunk } from "metabase/utils/redux";
import { getCurrentVersion } from "./selectors";
diff --git a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx
index 919f6f673ec..d7e496d8fe1 100644
--- a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx
+++ b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx
@@ -1,7 +1,7 @@
import _ from "underscore";
import { Databases } from "metabase/entities/databases";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type Database from "metabase-lib/v1/metadata/Database";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/app/reducers.ts b/frontend/src/metabase/admin/app/reducers.ts
index 25f84fa8283..c5743e15028 100644
--- a/frontend/src/metabase/admin/app/reducers.ts
+++ b/frontend/src/metabase/admin/app/reducers.ts
@@ -1,10 +1,10 @@
import { createReducer } from "@reduxjs/toolkit";
import { t } from "ttag";
-import { combineReducers } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import { PLUGIN_ADMIN_ALLOWED_PATH_GETTERS } from "metabase/plugins";
import { refreshCurrentUser } from "metabase/redux/user";
+import { combineReducers } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import type { AdminPath, AdminPathKey } from "metabase-types/store";
export const getAdminPaths: () => AdminPath[] = () => {
diff --git a/frontend/src/metabase/admin/app/selectors.ts b/frontend/src/metabase/admin/app/selectors.ts
index 26648bc068f..91e51adb558 100644
--- a/frontend/src/metabase/admin/app/selectors.ts
+++ b/frontend/src/metabase/admin/app/selectors.ts
@@ -1,5 +1,5 @@
import { getEngines } from "metabase/databases/selectors";
-import { isDeprecatedEngine } from "metabase/lib/engine";
+import { isDeprecatedEngine } from "metabase/databases/utils/engine";
import type Database from "metabase-lib/v1/metadata/Database";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsx b/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsx
index 6640be2eb01..e7648007d1d 100644
--- a/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsx
+++ b/frontend/src/metabase/admin/components/AdminNav/AdminNav.tsx
@@ -1,7 +1,6 @@
import type React from "react";
import { Link } from "metabase/common/components/Link";
-import { useSelector } from "metabase/lib/redux";
import { getLocation } from "metabase/selectors/routing";
import {
Icon,
@@ -11,6 +10,7 @@ import {
Stack,
type StackProps,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const AdminNavWrapper = ({
children,
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx
index 8c7c2a083be..31b39713b06 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx
@@ -9,9 +9,9 @@ import {
} from "metabase/api";
import { ActionButton } from "metabase/common/components/ActionButton";
import { Tables } from "metabase/entities/tables";
-import { useDispatch } from "metabase/lib/redux";
-import { isSyncCompleted } from "metabase/lib/syncing";
import { Button, Flex, Tooltip } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { Database } from "metabase-types/api";
import { isDbModifiable } from "../../utils";
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx
index 6fe5b38c2b9..1f44a631fcd 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseDangerZoneSection/DatabaseDangerZoneSection.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { DeleteDatabaseModal } from "metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal";
import { useDiscardDatabaseFieldValuesMutation } from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { isSyncCompleted } from "metabase/lib/syncing";
import { Button, Flex } from "metabase/ui";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { Database, DatabaseId } from "metabase-types/api";
import { DatabaseInfoSection } from "../DatabaseInfoSection";
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx
index 466328baad3..f8343491348 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx
@@ -15,8 +15,8 @@ import type {
DatabaseFormConfig,
FormLocation,
} from "metabase/databases/types";
-import { useDispatch } from "metabase/lib/redux";
import { Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type {
DatabaseData,
DatabaseEditErrorType,
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
index 35e4aea9fbb..2b1f8a2ce9e 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx
@@ -7,7 +7,6 @@ import { useDocsUrl, useSetting } from "metabase/common/hooks";
import { getHelpUrl } from "metabase/common/utils/help-url";
import CS from "metabase/css/core/index.css";
import { getEngines } from "metabase/databases/selectors";
-import { useSelector } from "metabase/lib/redux";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import {
@@ -20,6 +19,7 @@ import {
ScrollArea,
Title,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { EngineKey } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx
index 00f0bf15f27..495fa62a310 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/MarkdownLink.tsx
@@ -2,8 +2,8 @@ import type { ComponentProps } from "react";
import { Link } from "react-router";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
export const MarkdownLink = ({ href, children }: ComponentProps<"a">) => {
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsx b/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsx
index b010eef2471..31c3ff5ca4d 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseList/DatabaseList.tsx
@@ -6,9 +6,9 @@ import { t } from "ttag";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
import { FormMessage } from "metabase/forms";
-import { isSyncCompleted } from "metabase/lib/syncing";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import { Button, Flex, Loader, UnstyledButton } from "metabase/ui";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { Database, Engine } from "metabase-types/api";
const query = {
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelActionsSection/ModelActionsSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelActionsSection/ModelActionsSection.tsx
index 7a3d74e0414..e208e50175d 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelActionsSection/ModelActionsSection.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelActionsSection/ModelActionsSection.tsx
@@ -1,8 +1,8 @@
import { useState } from "react";
import { t } from "ttag";
-import { getResponseErrorMessage } from "metabase/lib/errors";
import { Alert, Box, Flex, Icon, Switch } from "metabase/ui";
+import { getResponseErrorMessage } from "metabase/utils/errors";
import { Description, Error, Label } from "../../DatabaseFeatureComponents";
diff --git a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
index 884c3f3d4de..16a987862e9 100644
--- a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
+++ b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
@@ -5,8 +5,6 @@ import { useAsync } from "react-use";
import { jt, t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { MetabaseApi } from "metabase/services";
import {
Alert,
@@ -21,6 +19,8 @@ import {
Text,
UnstyledButton,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Database, DatabaseUsageInfo } from "metabase-types/api";
import ContentRemovalConfirmation from "../ContentRemovalConfirmation";
diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx
index 81cf39ce8b3..19b840580c7 100644
--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx
+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx
@@ -1,8 +1,8 @@
import { c } from "ttag";
import { getEngines } from "metabase/databases/selectors";
-import { useSelector } from "metabase/lib/redux";
import { Flex, Stack, Text, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Database } from "metabase-types/api";
import { isEngineKey } from "metabase-types/guards";
diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx
index 9e1758a9738..bbf9c12d355 100644
--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx
+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.tsx
@@ -1,9 +1,9 @@
import { Link } from "react-router";
import { t } from "ttag";
-import { isSyncInProgress } from "metabase/lib/syncing";
-import { browseDatabase } from "metabase/lib/urls";
import { Button, Flex, Icon } from "metabase/ui";
+import { isSyncInProgress } from "metabase/utils/syncing";
+import { browseDatabase } from "metabase/utils/urls";
import type { Database } from "metabase-types/api";
interface Props {
diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx
index e12a3debe55..07a660320a7 100644
--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx
+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/HeaderLinkGroup.unit.spec.tsx
@@ -1,7 +1,7 @@
import { Route } from "react-router";
import { renderWithProviders, screen } from "__support__/ui";
-import { browseDatabase } from "metabase/lib/urls";
+import { browseDatabase } from "metabase/utils/urls";
import type { Database } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
index 234826ee9e2..00194e50dec 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabaseEditApp.tsx
@@ -16,7 +16,6 @@ import CS from "metabase/css/core/index.css";
import { ReturnToSetupGuideModal } from "metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal";
import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { connect, useSelector } from "metabase/lib/redux";
import {
PLUGIN_DATABASE_REPLICATION,
PLUGIN_DB_ROUTING,
@@ -26,6 +25,7 @@ import {
} from "metabase/plugins";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Divider, Flex } from "metabase/ui";
+import { connect, useSelector } from "metabase/utils/redux";
import type { DatabaseId, Database as DatabaseType } from "metabase-types/api";
import { DatabaseConnectionInfoSection } from "../components/DatabaseConnectionInfoSection";
diff --git a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx
index bcb8737bc53..3fed9f00b4f 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabaseListApp.tsx
@@ -6,10 +6,10 @@ import {
} from "metabase/api";
import { LoadingAndGenericErrorWrapper } from "metabase/common/components/LoadingAndGenericErrorWrapper";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
-import { isSyncInProgress } from "metabase/lib/syncing";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
+import { isSyncInProgress } from "metabase/utils/syncing";
import { DatabaseList } from "../components/DatabaseList";
import { getDeletes, getDeletionError } from "../selectors";
diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
index b0ef1e47a55..c4b2022d124 100644
--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx
@@ -5,7 +5,6 @@ import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { getEngines } from "metabase/databases/selectors";
-import { useSelector } from "metabase/lib/redux";
import {
Box,
Button,
@@ -16,6 +15,7 @@ import {
Text,
Title,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { EngineKey } from "metabase-types/api";
import { DatabaseEditConnectionForm } from "../components/DatabaseEditConnectionForm";
diff --git a/frontend/src/metabase/admin/databases/containers/analytics.ts b/frontend/src/metabase/admin/databases/containers/analytics.ts
index 71e64a80cae..6dcf3268c42 100644
--- a/frontend/src/metabase/admin/databases/containers/analytics.ts
+++ b/frontend/src/metabase/admin/databases/containers/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackHelpButtonClick = () => {
trackSimpleEvent({
diff --git a/frontend/src/metabase/admin/databases/database.ts b/frontend/src/metabase/admin/databases/database.ts
index 73fa7f409fb..835e04cebf7 100644
--- a/frontend/src/metabase/admin/databases/database.ts
+++ b/frontend/src/metabase/admin/databases/database.ts
@@ -2,7 +2,7 @@ import { createAction, createReducer } from "@reduxjs/toolkit";
import { push } from "react-router-redux";
import { Databases } from "metabase/entities/databases";
-import { combineReducers } from "metabase/lib/redux";
+import { combineReducers } from "metabase/utils/redux";
import type { DatabaseData, DatabaseId } from "metabase-types/api";
import type { Dispatch } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts b/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts
index 3e25cb4694c..1ae80f0ecd4 100644
--- a/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts
+++ b/frontend/src/metabase/admin/databases/hooks/use-database-connection.ts
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { skipToken, useGetDatabaseQuery } from "metabase/api";
import { getDefaultEngineKey } from "metabase/databases/utils/engine";
import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";
-import { useDispatch } from "metabase/lib/redux";
import { PLUGIN_DB_ROUTING } from "metabase/plugins";
+import { useDispatch } from "metabase/utils/redux";
import type { DatabaseId, Engine, EngineKey } from "metabase-types/api";
interface UseDatabaseConnectionProps {
diff --git a/frontend/src/metabase/admin/datamodel/components/QueryDefinition/QueryDefinition.tsx b/frontend/src/metabase/admin/datamodel/components/QueryDefinition/QueryDefinition.tsx
index 5d99a781083..a8c59fbfc41 100644
--- a/frontend/src/metabase/admin/datamodel/components/QueryDefinition/QueryDefinition.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/QueryDefinition/QueryDefinition.tsx
@@ -1,8 +1,8 @@
import { getSegmentQuery } from "metabase/admin/datamodel/utils/segments";
-import { useSelector } from "metabase/lib/redux";
import { FilterPill } from "metabase/querying/filters/components/FilterPanel/FilterPill";
import { getMetadata } from "metabase/selectors/metadata";
import { Flex } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { DatasetQuery, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx
index e7c250a127d..8d46e5c9354 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx
@@ -2,8 +2,8 @@ import { useDisclosure } from "@mantine/hooks";
import { Link } from "react-router";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
import { ActionIcon, Icon, Menu } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Segment } from "metabase-types/api";
import S from "./SegmentActionSelect.module.css";
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
index 11fdfd7ecca..db43fe62932 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.tsx
@@ -10,11 +10,11 @@ import {
} from "metabase/admin/datamodel/utils/segments";
import { Button } from "metabase/common/components/Button/Button";
import { FieldSet } from "metabase/common/components/FieldSet";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { SegmentEditor } from "metabase/querying/segments/components/SegmentEditor";
import { getMetadata } from "metabase/selectors/metadata";
import { Alert } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { DatasetQuery, Segment, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx
index 691f8c48e50..ac9ee263b61 100644
--- a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx
@@ -1,8 +1,8 @@
import { Link } from "react-router";
-import * as Urls from "metabase/lib/urls";
import { TableBreadcrumbs } from "metabase/metadata/components";
import { Box, Flex, Group, Icon } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Segment } from "metabase-types/api";
import { SegmentActionSelect } from "./SegmentActionSelect";
diff --git a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
index ba4ff9f5baa..0eaa62c1d1d 100644
--- a/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
+++ b/frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.tsx
@@ -5,8 +5,8 @@ import { t } from "ttag";
import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";
+import * as Urls from "metabase/utils/urls";
import type {
Revision as RevisionType,
Segment,
diff --git a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx
index 5bb98cbe1a0..b875013fb4b 100644
--- a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.tsx
@@ -3,9 +3,9 @@ import _ from "underscore";
import { Segments } from "metabase/entities/segments";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { Revision, RevisionId, Segment, User } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx
index d05be0beebb..2f430fe0b30 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.tsx
@@ -9,8 +9,8 @@ import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";
import { trackSegmentCreated } from "metabase/data-studio/analytics";
import { Segments } from "metabase/entities/segments";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { connect } from "metabase/utils/redux";
import type { Segment } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
index 0b12741035d..1673afaea78 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.unit.spec.tsx
@@ -20,7 +20,7 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { createMockCollection } from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx
index 13ea4ef28b1..5d1ba8667a6 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.tsx
@@ -11,10 +11,10 @@ import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";
import { Segments } from "metabase/entities/segments";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Segment } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/datamodel/datamodel.ts b/frontend/src/metabase/admin/datamodel/datamodel.ts
index 1e41cb53db6..1689f3f7c15 100644
--- a/frontend/src/metabase/admin/datamodel/datamodel.ts
+++ b/frontend/src/metabase/admin/datamodel/datamodel.ts
@@ -1,9 +1,9 @@
+import { RevisionsApi } from "metabase/services";
import {
combineReducers,
createThunkAction,
handleActions,
-} from "metabase/lib/redux";
-import { RevisionsApi } from "metabase/services";
+} from "metabase/utils/redux";
import type { Revision, RevisionId } from "metabase-types/api";
export const FETCH_REVISIONS = "metabase/admin/datamodel/FETCH_REVISIONS";
diff --git a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
index 27da665fbaf..435542ebcdc 100644
--- a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
+++ b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.tsx
@@ -7,9 +7,9 @@ import { t } from "ttag";
import { FieldSet } from "metabase/common/components/FieldSet";
import CS from "metabase/css/core/index.css";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
import { DatabaseSchemaAndTableDataSelector } from "metabase/query_builder/components/DataSelector";
import { Icon } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import type { ConcreteTableId, Segment, Table } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsx b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsx
index 36596117377..7becdd95b59 100644
--- a/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsx
+++ b/frontend/src/metabase/admin/embedding/components/EmbeddingNav.tsx
@@ -6,9 +6,9 @@ import {
AdminNavWrapper,
} from "metabase/admin/components/AdminNav";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getLocation } from "metabase/selectors/routing";
import { Divider, Flex, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function EmbeddingNav() {
const hasSimpleEmbedding = useHasTokenFeature("embedding_simple");
diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
index 336ddf89b5e..ef31d131650 100644
--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
@@ -10,15 +10,15 @@ import {
import { AdminPaneLayout } from "metabase/common/components/AdminPaneLayout";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import { useToast } from "metabase/common/hooks/use-toast";
+import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
+import { Box, Button, Text } from "metabase/ui";
import {
canEditMembership,
getGroupNameLocalized,
isAdminGroup,
isDefaultGroup,
-} from "metabase/lib/groups";
-import { useDispatch } from "metabase/lib/redux";
-import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
-import { Box, Button, Text } from "metabase/ui";
+} from "metabase/utils/groups";
+import { useDispatch } from "metabase/utils/redux";
import type { Group, Member, Membership, User } from "metabase-types/api";
import { Alert } from "./Alert";
diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
index 2b1425ab476..43e70d717ec 100644
--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
@@ -6,12 +6,12 @@ import { AdminContentTable } from "metabase/common/components/AdminContentTable"
import { Link } from "metabase/common/components/Link";
import { PaginationControls } from "metabase/common/components/PaginationControls";
import { usePagination } from "metabase/common/hooks/use-pagination";
-import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";
-import { useSelector } from "metabase/lib/redux";
-import { getFullName } from "metabase/lib/user";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import { getUser } from "metabase/selectors/user";
import { Box, Flex, Icon, Text, Tooltip, UnstyledButton } from "metabase/ui";
+import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
+import { useSelector } from "metabase/utils/redux";
+import { getFullName } from "metabase/utils/user";
import type { Group, Member, Membership } from "metabase-types/api";
import { AddMemberRow } from "../AddMemberRow";
diff --git a/frontend/src/metabase/admin/people/components/GroupSummary.tsx b/frontend/src/metabase/admin/people/components/GroupSummary.tsx
index 45d0b6b3442..9f3a5c89e00 100644
--- a/frontend/src/metabase/admin/people/components/GroupSummary.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupSummary.tsx
@@ -1,7 +1,7 @@
import { msgid, ngettext, t } from "ttag";
-import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";
import { Box, type BoxProps } from "metabase/ui";
+import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
import type { GroupInfo } from "metabase-types/api";
interface GroupSummaryProps extends BoxProps {
diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.tsx b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
index 691afcad27c..d7246df9c4c 100644
--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
@@ -12,12 +12,6 @@ import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { UserAvatar } from "metabase/common/components/UserAvatar";
import CS from "metabase/css/core/index.css";
-import {
- getGroupNameLocalized,
- isAdminGroup,
- isDefaultGroup,
-} from "metabase/lib/groups";
-import { KEYCODE_ENTER } from "metabase/lib/keyboard";
import { PLUGIN_TENANTS } from "metabase/plugins";
import {
Box,
@@ -28,6 +22,12 @@ import {
Menu,
UnstyledButton,
} from "metabase/ui";
+import {
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/utils/groups";
+import { KEYCODE_ENTER } from "metabase/utils/keyboard";
import type { ApiKey, GroupInfo } from "metabase-types/api";
import { groupIdToColor } from "../colors";
diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
index 6501b7ff834..9f28527a5a6 100644
--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
@@ -2,15 +2,15 @@ import { useDisclosure } from "@mantine/hooks";
import { useMemo } from "react";
import { t } from "ttag";
+import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
+import { Box, Divider, Flex, Icon, Popover } from "metabase/ui";
import {
getGroupNameLocalized,
isAdminGroup,
isDataAnalystGroup,
isDefaultGroup,
-} from "metabase/lib/groups";
-import { isNotNull } from "metabase/lib/types";
-import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
-import { Box, Divider, Flex, Icon, Popover } from "metabase/ui";
+} from "metabase/utils/groups";
+import { isNotNull } from "metabase/utils/types";
import type { GroupInfo, Member } from "metabase-types/api";
import { GroupSummary } from "../GroupSummary";
diff --git a/frontend/src/metabase/admin/people/components/PeopleList.tsx b/frontend/src/metabase/admin/people/components/PeopleList.tsx
index c0524a8a669..0915618f048 100644
--- a/frontend/src/metabase/admin/people/components/PeopleList.tsx
+++ b/frontend/src/metabase/admin/people/components/PeopleList.tsx
@@ -14,9 +14,9 @@ import { PaginationControls } from "metabase/common/components/PaginationControl
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
import { PLUGIN_GROUP_MANAGERS } from "metabase/plugins";
import { Box, Flex, Icon, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type {
GroupId,
GroupInfo,
diff --git a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx b/frontend/src/metabase/admin/people/components/PeopleListRow.tsx
index ac0a4a4365d..600f776673e 100644
--- a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx
+++ b/frontend/src/metabase/admin/people/components/PeopleListRow.tsx
@@ -4,9 +4,6 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { UserAvatar } from "metabase/common/components/UserAvatar";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { getFullName } from "metabase/lib/user";
import { PLUGIN_ADMIN_USER_MENU_ITEMS, PLUGIN_TENANTS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import {
@@ -18,6 +15,9 @@ import {
Tooltip,
UnstyledButton,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
+import { getFullName } from "metabase/utils/user";
import type {
GroupId,
GroupInfo,
diff --git a/frontend/src/metabase/admin/people/components/PeopleNav.tsx b/frontend/src/metabase/admin/people/components/PeopleNav.tsx
index a416762c643..51275e49c29 100644
--- a/frontend/src/metabase/admin/people/components/PeopleNav.tsx
+++ b/frontend/src/metabase/admin/people/components/PeopleNav.tsx
@@ -8,9 +8,9 @@ import {
import { shouldNudgeToPro } from "metabase/admin/people/selectors";
import { UpsellSSO } from "metabase/admin/upsells";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getLocation } from "metabase/selectors/routing";
import { Divider, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function PeopleNav() {
const shouldNudge = useSelector(shouldNudgeToPro) as boolean;
diff --git a/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsx b/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsx
index d341537a5a3..d7fb5d8e550 100644
--- a/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsx
+++ b/frontend/src/metabase/admin/people/components/ReactivateUserButton.tsx
@@ -2,8 +2,8 @@ import cx from "classnames";
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import * as Urls from "metabase/lib/urls";
import { Icon, Tooltip } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { User } from "metabase-types/api";
import S from "./ReactivateUserButton.module.css";
diff --git a/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx b/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx
index c96e81d7617..250260d76ec 100644
--- a/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/GroupDetailApp.tsx
@@ -6,8 +6,8 @@ import {
useListUserMembershipsQuery,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import { GroupDetail } from "../components/GroupDetail";
diff --git a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx
index 0bbd0cfa1a5..8dc8fb73e7a 100644
--- a/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/GroupsListingApp.tsx
@@ -14,9 +14,9 @@ import {
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useSetting } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Group } from "metabase-types/api";
import { GroupsListing } from "../components/GroupsListing";
diff --git a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
index 4fdb0e53d07..d63326025d6 100644
--- a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
@@ -2,12 +2,12 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { useCreateUserMutation } from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
-import { generatePassword } from "metabase/lib/security";
-import MetabaseSettings from "metabase/lib/settings";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { Modal } from "metabase/ui";
+import { generatePassword } from "metabase/utils/password";
+import { useDispatch } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
+import * as Urls from "metabase/utils/urls";
import type { User as UserType } from "metabase-types/api";
import { UserForm } from "../forms/UserForm";
diff --git a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
index 62e1482cd2f..80f3a02c5e0 100644
--- a/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
+++ b/frontend/src/metabase/admin/people/containers/PeopleListingApp/PeopleListingApp.tsx
@@ -6,11 +6,11 @@ import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { useListPermissionsGroupsQuery, useListUsersQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
import { Box, Button, Flex, Group, Tabs, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { PeopleList } from "../../components/PeopleList";
import { SearchFilter } from "../../components/SearchFilter";
diff --git a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
index 39fd43c9b40..dd1c78d1e7a 100644
--- a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
@@ -13,10 +13,10 @@ import { CopyButton } from "metabase/common/components/CopyButton";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PasswordReveal } from "metabase/common/components/PasswordReveal";
import { useToast } from "metabase/common/hooks/use-toast";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { generatePassword } from "metabase/lib/security";
-import MetabaseSettings from "metabase/lib/settings";
import { Button, Flex, Modal, Text, TextInput } from "metabase/ui";
+import { generatePassword } from "metabase/utils/password";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import type { User } from "metabase-types/api";
import { clearTemporaryPassword, storeTemporaryPassword } from "../people";
diff --git a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
index 22095568104..cf28227ad47 100644
--- a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
@@ -9,10 +9,10 @@ import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PasswordReveal } from "metabase/common/components/PasswordReveal";
import CS from "metabase/css/core/index.css";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { getSetting, isSsoEnabled } from "metabase/selectors/settings";
import { Box } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { User } from "metabase-types/api";
import { clearTemporaryPassword } from "../people";
diff --git a/frontend/src/metabase/admin/people/forms/UserForm.tsx b/frontend/src/metabase/admin/people/forms/UserForm.tsx
index 676f90c547b..28185f0a2e7 100644
--- a/frontend/src/metabase/admin/people/forms/UserForm.tsx
+++ b/frontend/src/metabase/admin/people/forms/UserForm.tsx
@@ -10,12 +10,12 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import {
PLUGIN_ADMIN_USER_FORM_FIELDS,
PLUGIN_TENANTS,
} from "metabase/plugins";
import { Button } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { User, UserId } from "metabase-types/api";
const localUserSchema = Yup.object({
diff --git a/frontend/src/metabase/admin/people/hooks/use-people-query.ts b/frontend/src/metabase/admin/people/hooks/use-people-query.ts
index f12c813ed7b..3396565d3b0 100644
--- a/frontend/src/metabase/admin/people/hooks/use-people-query.ts
+++ b/frontend/src/metabase/admin/people/hooks/use-people-query.ts
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { usePagination } from "metabase/common/hooks/use-pagination";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import type { UserTenancy } from "metabase-types/api";
import { ACTIVE_STATUS, type ActiveStatus } from "../constants";
diff --git a/frontend/src/metabase/admin/people/people.ts b/frontend/src/metabase/admin/people/people.ts
index 21ba0031d84..02c72d4799a 100644
--- a/frontend/src/metabase/admin/people/people.ts
+++ b/frontend/src/metabase/admin/people/people.ts
@@ -1,6 +1,6 @@
import { type PayloadAction, createSlice } from "@reduxjs/toolkit";
-import { combineReducers } from "metabase/lib/redux";
+import { combineReducers } from "metabase/utils/redux";
import type { TemporaryPasswordsState } from "metabase-types/store";
const initialState: TemporaryPasswordsState = {};
diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
index cca139b7060..0f178ac3ef6 100644
--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
@@ -11,7 +11,6 @@ import { ModelCachingScheduleWidget } from "metabase/admin/settings/components/w
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { useDocsUrl, useSetting, useToast } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { refreshSiteSettings } from "metabase/redux/settings";
import {
getApplicationName,
@@ -19,6 +18,7 @@ import {
} from "metabase/selectors/whitelabel";
import { PersistedModelsApi } from "metabase/services";
import { Switch, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import ModelPersistenceConfigurationS from "./ModelPersistenceConfiguration.module.css";
diff --git a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx b/frontend/src/metabase/admin/performance/components/StrategyForm.tsx
index e7ca42d8460..3c82c722176 100644
--- a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx
+++ b/frontend/src/metabase/admin/performance/components/StrategyForm.tsx
@@ -17,7 +17,6 @@ import {
FormTextInput,
useFormContext,
} from "metabase/forms";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_CACHING } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import {
@@ -32,6 +31,7 @@ import {
Title,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type {
CacheStrategy,
CacheStrategyType,
diff --git a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx
index 1c68cc5b921..f36df74f350 100644
--- a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx
+++ b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.tsx
@@ -1,8 +1,8 @@
import { useEffect, useRef } from "react";
import { push } from "react-router-redux";
-import { useDispatch } from "metabase/lib/redux";
import { useRouter } from "metabase/router";
+import { useDispatch } from "metabase/utils/redux";
type Props = {
shouldConfirm: boolean;
diff --git a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx
index 07beca82f02..38c55d0b1bb 100644
--- a/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx
+++ b/frontend/src/metabase/admin/performance/hooks/useConfirmOnRouteLeave.unit.spec.tsx
@@ -2,7 +2,7 @@ import type { History } from "history";
import { Route } from "react-router";
import { act, renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { useConfirmOnRouteLeave } from "./useConfirmOnRouteLeave";
diff --git a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx
index 565682dd740..8c7ed5e9c96 100644
--- a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx
+++ b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx
@@ -1,8 +1,8 @@
import { useCallback } from "react";
import { useInvalidateCacheConfigsMutation } from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
import type { CacheableModel } from "metabase-types/api";
import { isErrorWithMessage, resolveSmoothly } from "../utils";
diff --git a/frontend/src/metabase/admin/performance/utils.tsx b/frontend/src/metabase/admin/performance/utils.tsx
index 60f56d4f7bf..f9abefde3d1 100644
--- a/frontend/src/metabase/admin/performance/utils.tsx
+++ b/frontend/src/metabase/admin/performance/utils.tsx
@@ -4,8 +4,8 @@ import type { SchemaObjectDescription } from "yup/lib/schema";
import { cronToScheduleSettings } from "metabase/common/components/Schedule/cron";
import { getScheduleStrings } from "metabase/common/components/Schedule/strings";
-import { isNullOrUndefined } from "metabase/lib/types";
import { PLUGIN_CACHING } from "metabase/plugins";
+import { isNullOrUndefined } from "metabase/utils/types";
import type {
AdaptiveStrategy,
CacheConfig,
diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
index b395fb960f1..63fc41d48fb 100644
--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
@@ -9,8 +9,8 @@ import { ModalContent } from "metabase/common/components/ModalContent";
import CS from "metabase/css/core/index.css";
import { Collections } from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
-import { connect, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { connect, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection, CollectionNamespace } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx
index 22c66ee4237..f80fd3884b7 100644
--- a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx
+++ b/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx
@@ -4,7 +4,6 @@ import { PermissionHelpDescription } from "metabase/admin/permissions/components
import { DataPermissionValue } from "metabase/admin/permissions/types";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_TRANSFORMS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import {
@@ -18,6 +17,7 @@ import {
Title,
rem,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { hasPermissionValueInGraph } from "../../utils/graph/data-permissions";
diff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx b/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx
index bba9c174094..8138b2a9efe 100644
--- a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx
+++ b/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx
@@ -7,8 +7,8 @@ import { Input } from "metabase/common/components/Input";
import { Tree } from "metabase/common/components/tree";
import type { ITreeNodeItem } from "metabase/common/components/tree/types";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import type { IconName } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import {
AdminTreeNode,
diff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.unit.spec.tsx b/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.unit.spec.tsx
index 262ed4a61ab..544b5ee57b0 100644
--- a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.unit.spec.tsx
+++ b/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.unit.spec.tsx
@@ -1,5 +1,5 @@
import { act, fireEvent, render, screen } from "__support__/ui";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import { FilterableTree } from "./FilterableTree";
diff --git a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx
index cebccbf30e0..a70bdd768bc 100644
--- a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx
+++ b/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx
@@ -2,9 +2,9 @@ import { Link } from "react-router";
import { jt, t } from "ttag";
import { useModalOpen } from "metabase/common/hooks/use-modal-open";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { Button, Flex, Modal, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const LegacyPermissionsModal = ({
isOpen,
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
index aee6d54301b..72429521659 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
@@ -5,8 +5,8 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { Input } from "metabase/common/components/Input";
import { Subhead } from "metabase/common/components/type/Subhead";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { Text } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import type {
PermissionEditorBreadcrumb,
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx
index 3799e1f5b5a..b86d22a82c1 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { updateUserSetting } from "metabase/redux/settings";
import { getDocsUrl } from "metabase/selectors/settings";
import { Alert, Anchor, Box, Icon, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
export const PermissionsEditorSplitPermsMessage = () => {
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
index 46e7b9ffe0f..41df09f81b4 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
@@ -19,7 +19,6 @@ import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { useToggle } from "metabase/common/hooks/use-toggle";
import CS from "metabase/css/core/index.css";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { updateUserSetting } from "metabase/redux/settings";
import type { IconName } from "metabase/ui";
import {
@@ -28,6 +27,7 @@ import {
Modal as NewModal,
Text,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import {
clearSaveError as clearPermissionsSaveError,
diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
index 9746a963345..0097ce86004 100644
--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
@@ -7,7 +7,7 @@ import _ from "underscore";
import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";
import { Collections } from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
-import { connect, useSelector } from "metabase/lib/redux";
+import { connect, useSelector } from "metabase/utils/redux";
import type { Collection, CollectionId } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
index 4d5316e09ae..1743f82313e 100644
--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
@@ -6,10 +6,10 @@ import _ from "underscore";
import { skipToken, useGetDatabaseMetadataQuery } from "metabase/api";
import { Databases } from "metabase/entities/databases";
import { Groups } from "metabase/entities/groups";
-import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
import { Center, Loader } from "metabase/ui";
+import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type Database from "metabase-lib/v1/metadata/Database";
import type { DatabaseId, Group } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx
index 5698dde7e08..7fa7fbf1fb0 100644
--- a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx
@@ -5,10 +5,10 @@ import { t } from "ttag";
import _ from "underscore";
import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning";
-import { connect, useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import { Center, Loader } from "metabase/ui";
+import { connect, useDispatch, useSelector } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import {
diff --git a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx
index e4cd40a9ee4..20d799f1596 100644
--- a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx
@@ -5,10 +5,10 @@ import { t } from "ttag";
import _ from "underscore";
import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning";
-import { connect, useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import { Center, Loader } from "metabase/ui";
+import { connect, useDispatch, useSelector } from "metabase/utils/redux";
import type { GroupId } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/permissions/permissions.ts b/frontend/src/metabase/admin/permissions/permissions.ts
index 184844e2313..6513ec8aa4f 100644
--- a/frontend/src/metabase/admin/permissions/permissions.ts
+++ b/frontend/src/metabase/admin/permissions/permissions.ts
@@ -21,17 +21,17 @@ import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/ur
import { type ErrorPayload, getErrorMessage } from "metabase/api/utils/errors";
import { Groups } from "metabase/entities/groups";
import { Tables } from "metabase/entities/tables";
-import {
- combineReducers,
- createAction,
- createThunkAction,
-} from "metabase/lib/redux";
import {
PLUGIN_ADVANCED_PERMISSIONS,
PLUGIN_DATA_PERMISSIONS,
} from "metabase/plugins";
import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
import { CollectionsApi, PermissionsApi } from "metabase/services";
+import {
+ combineReducers,
+ createAction,
+ createThunkAction,
+} from "metabase/utils/redux";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
Collection,
diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
index 08f45e74e04..59780f3dc2b 100644
--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
@@ -15,14 +15,14 @@ import {
} from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
import { SnippetCollections } from "metabase/entities/snippet-collections";
+import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";
import {
getGroupNameLocalized,
getGroupSortOrder,
getSpecialGroupType,
isDefaultGroup,
-} from "metabase/lib/groups";
-import { isNotNull } from "metabase/lib/types";
-import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";
+} from "metabase/utils/groups";
+import { isNotNull } from "metabase/utils/types";
import type {
Collection,
CollectionId,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
index 385db5c0881..f37cb316c9a 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { isNotFalsy } from "metabase/lib/types";
+import { isNotFalsy } from "metabase/utils/types";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type Table from "metabase-lib/v1/metadata/Table";
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
index 915175c5f56..3731d5e3926 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
@@ -3,9 +3,9 @@ import { createSelector } from "@reduxjs/toolkit";
import { t } from "ttag";
import type { ITreeNodeItem } from "metabase/common/components/tree/types";
-import { isNotNull } from "metabase/lib/types";
import { PLUGIN_AUDIT } from "metabase/plugins";
import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
+import { isNotNull } from "metabase/utils/types";
import type Database from "metabase-lib/v1/metadata/Database";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { Database as DatabaseType } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
index 52b88d7e191..6885d354a44 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
@@ -1,7 +1,7 @@
import { createSelector } from "@reduxjs/toolkit";
import { t } from "ttag";
-import { getGroupNameLocalized } from "metabase/lib/groups";
+import { getGroupNameLocalized } from "metabase/utils/groups";
import type { Group } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts
index bee34151d91..0da82466aa5 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts
@@ -2,13 +2,13 @@ import { createSelector } from "@reduxjs/toolkit";
import _ from "underscore";
import { Groups } from "metabase/entities/groups";
+import { PLUGIN_TENANTS } from "metabase/plugins";
import {
getGroupSortOrder,
isAdminGroup,
isDataAnalystGroup,
isDefaultGroup,
-} from "metabase/lib/groups";
-import { PLUGIN_TENANTS } from "metabase/plugins";
+} from "metabase/utils/groups";
import type { Group } from "metabase-types/api";
const isPinnedGroup = (group: Group) =>
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
index 2192802c375..402def809b9 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
@@ -7,7 +7,6 @@ import { getPlan } from "metabase/common/utils/plan";
import { getIsHosted } from "metabase/databases/selectors";
import { Groups } from "metabase/entities/groups";
import { Tables } from "metabase/entities/tables";
-import { getSpecialGroupType, isDefaultGroup } from "metabase/lib/groups";
import {
PLUGIN_AUDIT,
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
@@ -16,6 +15,7 @@ import {
import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { getTokenFeature } from "metabase/setup";
+import { getSpecialGroupType, isDefaultGroup } from "metabase/utils/groups";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type { Database, Group, GroupsPermissions } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts b/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
index 7c47dcb178d..efaff7e6048 100644
--- a/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
+++ b/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
@@ -1,4 +1,4 @@
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type Table from "metabase-lib/v1/metadata/Table";
diff --git a/frontend/src/metabase/admin/settings/analytics.ts b/frontend/src/metabase/admin/settings/analytics.ts
index 1c69bcb9b52..403665c8cc6 100644
--- a/frontend/src/metabase/admin/settings/analytics.ts
+++ b/frontend/src/metabase/admin/settings/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
export const trackTrackingPermissionChanged = (isEnabled: boolean) => {
trackSchemaEvent("settings", {
diff --git a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx
index 522eea539a9..938208a349b 100644
--- a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx
+++ b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.tsx
@@ -6,8 +6,8 @@ import { c, t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { useGetEnvVarDocsUrl } from "metabase/admin/settings/utils";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { isNotNull } from "metabase/lib/types";
import { Anchor, Button, Text } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import type { SettingDefinition } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/settings/auth/constants.ts b/frontend/src/metabase/admin/settings/auth/constants.ts
index b0a2c1db596..88f3220d258 100644
--- a/frontend/src/metabase/admin/settings/auth/constants.ts
+++ b/frontend/src/metabase/admin/settings/auth/constants.ts
@@ -1,6 +1,6 @@
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import type { SettingDefinition } from "metabase-types/api";
const REQUIRED_SCHEMA = {
diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx
index 4b38b7677b3..3e73020affd 100644
--- a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx
+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx
@@ -9,7 +9,6 @@ import { useListApiKeysQuery } from "metabase/api";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { ClientSortableTable } from "metabase/common/components/Table";
import CS from "metabase/css/core/index.css";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting/date";
import {
Button,
Ellipsified,
@@ -20,6 +19,7 @@ import {
Title,
} from "metabase/ui";
import { getThemeOverrides } from "metabase/ui/theme";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting/date";
import type { ApiKey } from "metabase-types/api";
import { CreateApiKeyModal } from "./CreateApiKeyModal";
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx
index d4136550c1f..454023d155a 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.tsx
@@ -7,10 +7,10 @@ import {
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useStoreUrl } from "metabase/common/hooks";
import { type Plan, getPlan } from "metabase/common/utils/plan";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { refreshSiteSettings } from "metabase/redux/settings";
import { getSetting } from "metabase/selectors/settings";
import { Box } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { CloudMigration } from "metabase-types/api/cloud-migration";
import { MigrationCreationError } from "./MigrationCreationError";
diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
index 5bc9ce0ab04..f6f7ccb99bb 100644
--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx
@@ -6,7 +6,6 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useSetting } from "metabase/common/hooks";
import { useToggle } from "metabase/common/hooks/use-toggle";
import type { Plan } from "metabase/common/utils/plan";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
import {
Box,
@@ -18,6 +17,7 @@ import {
Progress,
Text,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import { MigrationCard } from "./CloudPanel.styled";
import type { InProgressCloudMigration, InProgressStates } from "./utils";
diff --git a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
index b8681c98ffd..b5299c04bbb 100644
--- a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
@@ -17,8 +17,8 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Box, Button, Chip, Flex, Modal, Stack } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { SettingDefinitionMap, SettingKey } from "metabase-types/api";
import { SetByEnvVarWrapper } from "../widgets/AdminSettingInput";
diff --git a/frontend/src/metabase/admin/settings/components/Email/analytics.ts b/frontend/src/metabase/admin/settings/components/Email/analytics.ts
index e2358e08c47..3f02ceafff7 100644
--- a/frontend/src/metabase/admin/settings/components/Email/analytics.ts
+++ b/frontend/src/metabase/admin/settings/components/Email/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
type SMTPSetupEventDetail = "self-hosted" | "cloud";
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSdkSettings/EmbeddingSdkSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSdkSettings/EmbeddingSdkSettings.tsx
index ae03f32c8c3..17a7b8e5803 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSdkSettings/EmbeddingSdkSettings.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSdkSettings/EmbeddingSdkSettings.tsx
@@ -6,8 +6,7 @@ import { UpsellSdkLink } from "metabase/admin/upsells/UpsellSdkLink";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl, useUrlWithUtm } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { isEEBuild } from "metabase/lib/utils";
-import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";
+import { PLUGIN_EMBEDDING_SDK, PLUGIN_IS_EE_BUILD } from "metabase/plugins";
import { EmbeddingSettingsCard } from "../EmbeddingSettingsCard";
@@ -19,7 +18,7 @@ const utmTags = {
};
export const EmbeddingSdkSettings = () => {
- const isEE = isEEBuild();
+ const isEE = PLUGIN_IS_EE_BUILD.isEEBuild();
const isReactSdkFeatureAvailable = PLUGIN_EMBEDDING_SDK.isEnabled();
const implementJwtUrl = useDocsUrl("embedding/sdk/authentication", {
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx
index 17f04e08b38..e5e0dac90bc 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx
@@ -3,11 +3,10 @@ import { jt, t } from "ttag";
import { Alert } from "metabase/common/components/Alert";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useSetting } from "metabase/common/hooks";
-import { isSameOrigin } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
-import { isEmpty } from "metabase/lib/utils";
import { getDocsUrl } from "metabase/selectors/settings";
import { Box, Center, Stack, Text } from "metabase/ui";
+import { isSameOrigin } from "metabase/utils/dom";
+import { useSelector } from "metabase/utils/redux";
import S from "./EmbeddingAppSameSiteCookieDescription.module.css";
@@ -63,7 +62,7 @@ function authorizedOriginsContainsNonInstanceDomain(
// metabase#43523
return false;
- if (isEmpty(authorizedOriginsString)) {
+ if (!authorizedOriginsString || authorizedOriginsString.trim() === "") {
return false;
}
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx
index 74f238e126e..e8a3aa514c0 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx
@@ -14,11 +14,11 @@ import {
useHasTokenFeature,
useSetting,
} from "metabase/common/hooks";
-import { isEEBuild } from "metabase/lib/utils";
import {
PLUGIN_ADMIN_SETTINGS,
PLUGIN_CONTENT_TRANSLATION,
PLUGIN_EMBEDDING_SDK,
+ PLUGIN_IS_EE_BUILD,
} from "metabase/plugins";
import { Box, Group, Icon, Stack, Text } from "metabase/ui";
@@ -28,7 +28,7 @@ import { EmbeddingSettingsCard } from "../EmbeddingSettingsCard";
import { SharedCombinedEmbeddingSettings } from "../SharedCombinedEmbeddingSettings";
function EmbeddingSettingsPageWrapper({ children }: PropsWithChildren) {
- const isEE = isEEBuild();
+ const isEE = PLUGIN_IS_EE_BUILD.isEEBuild();
const isUsingTenants = useSetting("use-tenants");
const hasSimpleEmbedding = useHasTokenFeature("embedding_simple");
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx
index e8d99910ffe..5f78959cfe2 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { setOpenModalWithProps } from "metabase/redux/ui";
import { Button } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
export const NewEmbedButton = () => {
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx
index 2a88c914531..f34b9c1254c 100644
--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx
+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx
@@ -5,7 +5,6 @@ import { EmbeddingSettingsCard } from "metabase/admin/settings/components/Embedd
import { NewEmbedButton } from "metabase/admin/settings/components/EmbeddingSettings/NewEmbedButton/NewEmbedButton";
import { UpsellBanner } from "metabase/common/components/upsells/components";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import {
PLUGIN_ADMIN_SETTINGS,
PLUGIN_CONTENT_TRANSLATION,
@@ -13,6 +12,7 @@ import {
} from "metabase/plugins";
import { getUpgradeUrl } from "metabase/selectors/settings";
import { Box, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { SettingTitle } from "../../SettingHeader";
import { EmbeddedResources } from "../../widgets/PublicLinksListing/EmbeddedResources";
diff --git a/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsx b/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsx
index 59eb7107b8a..f6f227148ef 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsLicense/SettingsLicense.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { useSelector } from "metabase/lib/redux";
import { getUpgradeUrl } from "metabase/selectors/settings";
import { Box, Button, Divider, Flex, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import { SettingHeader } from "../SettingHeader";
diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx
index 815273dfbcb..6e3e72982d6 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/SettingsNav.tsx
@@ -9,10 +9,10 @@ import {
} from "metabase/admin/components/AdminNav";
import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";
import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { getLocation } from "metabase/selectors/routing";
import { Divider, Flex } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { UpdatesNavItem } from "./UpdatesNavItem";
diff --git a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx
index a3a4c5dca92..851ba408380 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsNav/UpdatesNavItem.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { getCurrentVersion } from "metabase/admin/app/selectors";
import { useGetVersionInfoQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
-import { newVersionAvailable } from "metabase/lib/utils";
import { Indicator } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { newVersionAvailable } from "metabase/utils/version";
import { SettingsNavItem } from "./SettingsNav";
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/LicenseSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/LicenseSettingsPage.tsx
index e11692ab84f..47df1895b36 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/LicenseSettingsPage.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/LicenseSettingsPage.tsx
@@ -1,10 +1,9 @@
-import { isEEBuild } from "metabase/lib/utils";
-import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
+import { PLUGIN_ADMIN_SETTINGS, PLUGIN_IS_EE_BUILD } from "metabase/plugins";
import { SettingsLicense } from "../SettingsLicense";
export function LicenseSettingsPage() {
- if (isEEBuild()) {
+ if (PLUGIN_IS_EE_BUILD.isEEBuild()) {
return <PLUGIN_ADMIN_SETTINGS.LicenseAndBillingSettings />;
}
diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx
index 25e16334eea..d8b842fae68 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/LocalizationSettingsPage.tsx
@@ -7,9 +7,9 @@ import {
} from "metabase/admin/components/SettingsSection";
import { CommunityLocalizationNotice } from "metabase/common/components/CommunityLocalizationNotice";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { AdminSettingInput } from "../widgets/AdminSettingInput";
import { FormattingWidget } from "../widgets/FormattingWidget";
diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/utils.unit.spec.ts b/frontend/src/metabase/admin/settings/components/UploadSettings/utils.unit.spec.ts
index 0f94aa47568..0a27c693d89 100644
--- a/frontend/src/metabase/admin/settings/components/UploadSettings/utils.unit.spec.ts
+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/utils.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Database, Schema } from "metabase-types/api";
import { createMockDatabase, createMockSchema } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
index 6c51aadf529..0103f115bd9 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
@@ -12,8 +12,8 @@ import { Option, Select } from "metabase/common/components/Select";
import AdminS from "metabase/css/admin.module.css";
import ButtonsS from "metabase/css/components/buttons.module.css";
import CS from "metabase/css/core/index.css";
-import { uuid } from "metabase/lib/uuid";
import { Button, Ellipsified, Image, Stack, Text } from "metabase/ui";
+import { uuid } from "metabase/utils/uuid";
import { LeafletChoropleth } from "metabase/visualizations/components/LeafletChoropleth";
import type {
CustomGeoJSONMap,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsx
index e93aa977e92..99a7f8315da 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomHomepageDashboardSetting.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { useAdminSetting } from "metabase/api/utils";
import { DashboardSelector } from "metabase/common/components/DashboardSelector";
-import { useDispatch } from "metabase/lib/redux";
import { refreshCurrentUser } from "metabase/redux/user";
import { Stack } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { DashboardId } from "metabase-types/api";
import { trackCustomHomepageDashboardEnabled } from "../../analytics";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx
index 90a7d0f6948..b7e6b38b34d 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx
@@ -4,14 +4,14 @@ import _ from "underscore";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
import { useAdminSetting } from "metabase/api/utils";
+import { Box, Radio, Select, Stack, Switch, Text } from "metabase/ui";
import {
type CurrencyStyle,
getCurrencyOptions,
getCurrencyStyleOptions,
getDateStyleOptionsForUnit,
getTimeStyleOptions,
-} from "metabase/lib/formatting";
-import { Box, Radio, Select, Stack, Switch, Text } from "metabase/ui";
+} from "metabase/utils/formatting";
import type { FormattingSettings } from "metabase-types/api";
import { SetByEnvVar } from "./AdminSettingInput";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx
index 92add4843e6..520e6857991 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx
@@ -1,9 +1,9 @@
import _ from "underscore";
import { Groups } from "metabase/entities/groups";
-import { connect } from "metabase/lib/redux";
import { updateSetting } from "metabase/redux/settings";
import { getSetting } from "metabase/selectors/settings";
+import { connect } from "metabase/utils/redux";
import type { Settings } from "metabase-types/api/settings";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
index 189143d37a0..d52f10506ae 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
@@ -8,8 +8,8 @@ import { getErrorMessage } from "metabase/api/utils/errors";
import { AdminContentTable } from "metabase/common/components/AdminContentTable";
import CS from "metabase/css/core/index.css";
import { FormSwitch } from "metabase/forms";
-import { isDefaultGroup } from "metabase/lib/groups";
import { Icon, Tooltip } from "metabase/ui";
+import { isDefaultGroup } from "metabase/utils/groups";
import type { Group, GroupId } from "metabase-types/api";
import AddMappingRow from "./AddMappingRow";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsx
index af5a113f7f8..9eefdc21af8 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupSelect/GroupSelect.tsx
@@ -5,15 +5,15 @@ import { GroupSummary } from "metabase/admin/people/components/GroupSummary";
import type { GroupIds, UserGroupType } from "metabase/admin/types";
import { Select } from "metabase/common/components/Select";
import CS from "metabase/css/core/index.css";
+import { Box, Icon, Popover } from "metabase/ui";
+import { color } from "metabase/ui/colors";
import {
canEditMembership,
getGroupNameLocalized,
isAdminGroup,
isDefaultGroup,
-} from "metabase/lib/groups";
-import { isNotNull } from "metabase/lib/types";
-import { Box, Icon, Popover } from "metabase/ui";
-import { color } from "metabase/ui/colors";
+} from "metabase/utils/groups";
+import { isNotNull } from "metabase/utils/types";
import type { GroupInfo } from "metabase-types/api";
function getGroupColor(group: Pick<GroupInfo, "magic_group_type">) {
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx
index db064528a20..2f5a3ebf1ac 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx
@@ -10,8 +10,8 @@ import type {
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { isAdminGroup } from "metabase/lib/groups";
import { Icon, Tooltip } from "metabase/ui";
+import { isAdminGroup } from "metabase/utils/groups";
import type { GroupId, GroupInfo } from "metabase-types/api";
import DeleteGroupMappingModal from "../DeleteGroupMappingModal";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsx
index 8c45279938e..6ac1890acd9 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/HttpsOnlyWidget.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { useAdminSetting } from "metabase/api/utils";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { fetchWithTimeout } from "metabase/lib/fetchWithTimeout";
+import { fetchWithTimeout } from "metabase/utils/fetchWithTimeout";
import { AdminSettingInput } from "./AdminSettingInput";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/ModelCachingScheduleWidget/ModelCachingScheduleWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/ModelCachingScheduleWidget/ModelCachingScheduleWidget.tsx
index 1714dc08c2e..772ca53e5d6 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/ModelCachingScheduleWidget/ModelCachingScheduleWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/ModelCachingScheduleWidget/ModelCachingScheduleWidget.tsx
@@ -2,8 +2,8 @@ import { useCallback, useState } from "react";
import { t } from "ttag";
import { CronExpressionInput } from "metabase/common/components/CronExpressioInput";
-import { formatCronExpressionForUI } from "metabase/lib/cron";
import { Group, Select, Stack, Text } from "metabase/ui";
+import { formatCronExpressionForUI } from "metabase/utils/cron";
interface ModelCachingScheduleWidgetProps {
value: string;
diff --git a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx
index 3478794449b..b19e20f0901 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx
@@ -13,8 +13,6 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import { getResponseErrorMessage } from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import {
Alert,
@@ -28,6 +26,8 @@ import {
Text,
Title,
} from "metabase/ui";
+import { getResponseErrorMessage } from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
import {
type NotificationAuthMethods,
type NotificationAuthType,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsx
index bf73afd6619..c5d8ca17840 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/EmbeddedResources.tsx
@@ -4,8 +4,8 @@ import {
useListEmbeddableCardsQuery,
useListEmbeddableDashboardsQuery,
} from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { Stack } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type {
GetEmbeddableCard,
GetEmbeddableDashboard,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsx
index 232775312c5..1b4c82c34c9 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicDocumentResources.tsx
@@ -5,7 +5,7 @@ import {
useDeleteDocumentPublicLinkMutation,
useListPublicDocumentsQuery,
} from "metabase/api";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Document } from "metabase-types/api";
export const PublicLinksDocumentListing = () => {
diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsx
index 2899672104d..fac70591fde 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.unit.spec.tsx
@@ -3,7 +3,7 @@ import { act } from "react-dom/test-utils";
import { renderWithProviders, screen, within } from "__support__/ui";
import { UndoListing } from "metabase/common/components/UndoListing";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { GetPublicCard } from "metabase-types/api";
import { PublicLinksListing } from "./PublicLinksListing";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx
index 6f6d17986e5..b1216dd46c1 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicResources.tsx
@@ -9,7 +9,7 @@ import {
useListPublicDashboardsQuery,
} from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type {
GetPublicAction,
GetPublicCard,
diff --git a/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsx
index a1efadb015a..5f6b4de2335 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/SiteUrlWidget.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { useAdminSetting } from "metabase/api/utils";
import { InputWithSelectPrefix } from "metabase/common/components/InputWithSelectPrefix";
import { useHasTokenFeature } from "metabase/common/hooks";
-import type { GenericErrorResponse } from "metabase/lib/errors";
import { Box, Text } from "metabase/ui";
+import type { GenericErrorResponse } from "metabase/utils/errors";
import { SettingHeader } from "../SettingHeader";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx
index fe9bfe7c10d..7c6bbb32ea7 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx
@@ -6,9 +6,9 @@ import { useGetVersionInfoQuery } from "metabase/api";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import ButtonsS from "metabase/css/components/buttons.module.css";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
-import { newVersionAvailable, versionIsLatest } from "metabase/lib/utils";
import { Tabs } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { newVersionAvailable, versionIsLatest } from "metabase/utils/version";
import S from "./VersionUpdateNotice.module.css";
diff --git a/frontend/src/metabase/admin/settings/settings.ts b/frontend/src/metabase/admin/settings/settings.ts
index 6a032d524f9..b817145b8d9 100644
--- a/frontend/src/metabase/admin/settings/settings.ts
+++ b/frontend/src/metabase/admin/settings/settings.ts
@@ -1,8 +1,8 @@
import type { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";
-import { createThunkAction } from "metabase/lib/redux";
import { refreshSiteSettings } from "metabase/redux/settings";
import { SettingsApi } from "metabase/services";
+import { createThunkAction } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
// ACTION TYPES AND ACTION CREATORS
diff --git a/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsx b/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsx
index 62ddeb315f1..9e53ca47ada 100644
--- a/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsx
+++ b/frontend/src/metabase/admin/settings/slack/SlackSetupForm.tsx
@@ -9,8 +9,8 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Flex, Stack } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
type FormValues = { "slack-app-token": string };
diff --git a/frontend/src/metabase/admin/tools/components/Help/Help.tsx b/frontend/src/metabase/admin/tools/components/Help/Help.tsx
index e077b3380e3..a40e3d8267b 100644
--- a/frontend/src/metabase/admin/tools/components/Help/Help.tsx
+++ b/frontend/src/metabase/admin/tools/components/Help/Help.tsx
@@ -13,11 +13,11 @@ import { CopyButton } from "metabase/common/components/CopyButton";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_SUPPORT } from "metabase/plugins";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { UtilApi } from "metabase/services";
import { Box, Code, Group } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import S from "./help.module.css";
diff --git a/frontend/src/metabase/admin/tools/components/JobInfoApp.tsx b/frontend/src/metabase/admin/tools/components/JobInfoApp.tsx
index 907836042af..897dd380db8 100644
--- a/frontend/src/metabase/admin/tools/components/JobInfoApp.tsx
+++ b/frontend/src/metabase/admin/tools/components/JobInfoApp.tsx
@@ -11,8 +11,8 @@ import { useGetTasksInfoQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
import { Ellipsified, Flex, Stack } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { Job } from "metabase-types/api";
interface SchedulerInfoProps {
diff --git a/frontend/src/metabase/admin/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsx
index b86df30a5bf..7cdedc89308 100644
--- a/frontend/src/metabase/admin/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsx
+++ b/frontend/src/metabase/admin/tools/components/LogLevelsModal/LogLevelsModal.unit.spec.tsx
@@ -16,7 +16,7 @@ import {
} from "__support__/ui";
import { getNextId } from "__support__/utils";
import { ModalRoute } from "metabase/hoc/ModalRoute";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { LoggerPreset } from "metabase-types/api";
import { createMockLoggerPreset } from "metabase-types/api/mocks/logger";
diff --git a/frontend/src/metabase/admin/tools/components/Logs/Logs.tsx b/frontend/src/metabase/admin/tools/components/Logs/Logs.tsx
index 970dd3d1368..bb789506706 100644
--- a/frontend/src/metabase/admin/tools/components/Logs/Logs.tsx
+++ b/frontend/src/metabase/admin/tools/components/Logs/Logs.tsx
@@ -12,8 +12,8 @@ import {
import { AnsiLogs } from "metabase/common/components/AnsiLogs";
import { Option, Select } from "metabase/common/components/Select";
import { useUrlState } from "metabase/common/hooks/use-url-state";
-import { openSaveDialog } from "metabase/lib/dom";
import { Button, Flex, Icon, TextInput } from "metabase/ui";
+import { openSaveDialog } from "metabase/utils/dom";
import { LogsContainer, LogsContent } from "./Logs.styled";
import { usePollingLogsQuery, useTailLogs } from "./hooks";
diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx
index 1d8b3c21aaa..7ea7f879ad2 100644
--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx
+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx
@@ -8,7 +8,7 @@ import { Link } from "metabase/common/components/Link";
import { ModalContent } from "metabase/common/components/ModalContent";
import ButtonsS from "metabase/css/components/buttons.module.css";
import { PersistedModels } from "metabase/entities/persisted-models";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type { ModelCacheRefreshStatus } from "metabase-types/api";
import { ErrorBox } from "./ModelCacheRefreshJobs.styled";
diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx
index 183463d1529..03e6aa46bfb 100644
--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx
+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx
@@ -18,10 +18,10 @@ import { usePagination } from "metabase/common/hooks/use-pagination";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
import { PersistedModels } from "metabase/entities/persisted-models";
-import { capitalize } from "metabase/lib/formatting";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Icon, Tooltip } from "metabase/ui";
+import { capitalize } from "metabase/utils/formatting";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { checkCanRefreshModelCache } from "metabase-lib/v1/metadata/utils/models";
import type { ModelCacheRefreshStatus } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsx b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsx
index 34795294a91..e5c5979623a 100644
--- a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.tsx
@@ -8,8 +8,6 @@ import { CodeEditor } from "metabase/common/components/CodeEditor";
import { CopyButton } from "metabase/common/components/CopyButton";
import { DateTime } from "metabase/common/components/DateTime";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { openSaveDialog } from "metabase/lib/dom";
-import * as Urls from "metabase/lib/urls";
import {
Anchor,
Box,
@@ -22,6 +20,8 @@ import {
Title,
Tooltip,
} from "metabase/ui";
+import { openSaveDialog } from "metabase/utils/dom";
+import * as Urls from "metabase/utils/urls";
import type { Database } from "metabase-types/api";
import { SettingsSection } from "../../../components/SettingsSection";
diff --git a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx
index b99558d5fc1..0a39d5ecf38 100644
--- a/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskDetailsPage/TaskDetailsPage.unit.spec.tsx
@@ -12,7 +12,7 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Task } from "metabase-types/api";
import { createMockTask } from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
diff --git a/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsx
index 6d3ce1828c0..8f07abcf893 100644
--- a/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskListPage/TaskListPage.unit.spec.tsx
@@ -17,7 +17,7 @@ import {
within,
} from "__support__/ui";
import { URL_UPDATE_DEBOUNCE_DELAY } from "metabase/common/hooks/use-url-state";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { ListTasksResponse } from "metabase-types/api";
import { createMockTask } from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
diff --git a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx
index f5aaefbd9c7..0e0c62925d5 100644
--- a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx
@@ -9,9 +9,9 @@ import { SortableColumnHeader } from "metabase/common/components/ItemsTable/Base
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Box, Ellipsified, Flex } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type {
Database,
ListTasksSortColumn,
diff --git a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx
index d0fabe11d41..395a9234364 100644
--- a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.tsx
@@ -10,8 +10,6 @@ import { DateTime } from "metabase/common/components/DateTime";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import {
Anchor,
Box,
@@ -23,6 +21,8 @@ import {
Title,
Tooltip,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Task } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx
index 02f4ea83c5a..4c37d854702 100644
--- a/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskRunDetailsPage/TaskRunDetailsPage.unit.spec.tsx
@@ -9,7 +9,7 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { TaskRunExtended } from "metabase-types/api";
import { createMockTaskRunExtended } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx
index 9f6a1877955..a1d0787e3c8 100644
--- a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsPage.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { ListTaskRunsResponse } from "metabase-types/api";
import { createMockTaskRun } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx
index 410104a8e5a..bfdf72e1217 100644
--- a/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskRunsPage/TaskRunsTable.tsx
@@ -6,9 +6,9 @@ import { DateTime } from "metabase/common/components/DateTime";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Box, Ellipsified, Flex } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { TaskRun } from "metabase-types/api";
import { formatTaskRunType, renderTaskRunCounters } from "../../utils";
diff --git a/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx b/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx
index 883473dc72d..43aeabc2ae9 100644
--- a/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx
+++ b/frontend/src/metabase/admin/tools/components/TasksTabs/TasksTabs.tsx
@@ -2,9 +2,9 @@ import { type WithRouterProps, withRouter } from "react-router";
import { push } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Flex, Icon, Tabs, Title, Tooltip } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import {
SettingsPageWrapper,
diff --git a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx b/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
index 510c35e1be5..104d16c1e10 100644
--- a/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
+++ b/frontend/src/metabase/admin/tools/components/ToolsApp.tsx
@@ -8,7 +8,7 @@ import {
AdminNavWrapper,
} from "metabase/admin/components/AdminNav";
import { AdminSettingsLayout } from "metabase/common/components/AdminLayout/AdminSettingsLayout";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
type ToolsAppProps = {
location: Location;
diff --git a/frontend/src/metabase/admin/tools/utils.ts b/frontend/src/metabase/admin/tools/utils.ts
index 91442991354..3c34f80340f 100644
--- a/frontend/src/metabase/admin/tools/utils.ts
+++ b/frontend/src/metabase/admin/tools/utils.ts
@@ -1,7 +1,7 @@
import { match } from "ts-pattern";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type {
Task,
TaskRun,
diff --git a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx
index 75e6c2cb512..acebac82696 100644
--- a/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellBetterSupport.tsx
@@ -3,10 +3,10 @@ import { c, t } from "ttag";
import { UpsellBanner } from "metabase/common/components/upsells/components";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
import { getPlan } from "metabase/common/utils/plan";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import { Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const UpsellBetterSupport = ({ location }: { location: string }) => {
const campaign = "better-hosting";
diff --git a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx
index a553d9364f6..ca98273e978 100644
--- a/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellEmailWhitelabel.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { UpsellPill } from "metabase/common/components/upsells/components";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getIsHosted } from "metabase/setup/selectors";
+import { useSelector } from "metabase/utils/redux";
export const UpsellEmailWhitelabelPill = ({ source }: { source: string }) => {
const isHosted = useSelector(getIsHosted);
diff --git a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
index 569791e21dc..7d27f92fede 100644
--- a/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellHosting.tsx
@@ -3,8 +3,8 @@ import { jt, t } from "ttag";
import { UpsellBanner } from "metabase/common/components/upsells/components";
import { useSetting } from "metabase/common/hooks";
import { getPlan, isProPlan } from "metabase/common/utils/plan";
-import { useSelector } from "metabase/lib/redux";
import { getIsHosted } from "metabase/setup/selectors";
+import { useSelector } from "metabase/utils/redux";
export const UpsellHostingBanner = ({ location }: { location: string }) => {
const isHosted = useSelector(getIsHosted);
diff --git a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx b/frontend/src/metabase/admin/upsells/UpsellSSO.tsx
index 6e56ec1f500..2836ded12e8 100644
--- a/frontend/src/metabase/admin/upsells/UpsellSSO.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellSSO.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
import { hasAnySsoFeature } from "metabase/common/utils/plan";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import { Box, List } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const UpsellSSO = ({ location }: { location: string }) => {
const campaign = "sso";
diff --git a/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsx b/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsx
index 10891147466..4ca3dea3ebc 100644
--- a/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellSdkLink.tsx
@@ -4,10 +4,10 @@ import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import CS from "metabase/css/core/index.css";
import linkStyles from "metabase/css/core/link.module.css";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getUpgradeUrl } from "metabase/selectors/settings";
import { UnstyledButton } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function UpsellSdkLink() {
const campaign = "embedding-sdk";
diff --git a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx b/frontend/src/metabase/admin/upsells/UpsellUploads.tsx
index 15a23fef0bf..825913cf41c 100644
--- a/frontend/src/metabase/admin/upsells/UpsellUploads.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellUploads.tsx
@@ -3,9 +3,9 @@ import { c, t } from "ttag";
import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
import { getPlan } from "metabase/common/utils/plan";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export const UpsellUploads = ({ location }: { location: string }) => {
const campaign = "manage-uploads";
diff --git a/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx b/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx
index ac711bb5537..d29b04802af 100644
--- a/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx
+++ b/frontend/src/metabase/admin/upsells/UpsellWhitelabel.tsx
@@ -6,9 +6,9 @@ import S from "metabase/common/components/upsells/components/Upsells.module.css"
import { useUpsellLink } from "metabase/common/components/upsells/components/use-upsell-link";
import { UPGRADE_URL } from "metabase/common/components/upsells/constants";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getDocsUrl } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export const UpsellWhitelabel = ({ source }: { source: string }) => {
const isWhitelabeled = useHasTokenFeature("whitelabel");
diff --git a/frontend/src/metabase/admin/utils.ts b/frontend/src/metabase/admin/utils.ts
index 25ed62fd401..097877e2862 100644
--- a/frontend/src/metabase/admin/utils.ts
+++ b/frontend/src/metabase/admin/utils.ts
@@ -3,8 +3,8 @@ import { push, replace, routerActions } from "react-router-redux";
import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
import { getAdminPaths } from "metabase/admin/app/selectors";
-import { MetabaseReduxContext, connect } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
+import { MetabaseReduxContext, connect } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import type { AdminPath } from "metabase-types/store/admin";
diff --git a/frontend/src/metabase/analytics.ts b/frontend/src/metabase/analytics.ts
index d768d723304..2c1161e7a5d 100644
--- a/frontend/src/metabase/analytics.ts
+++ b/frontend/src/metabase/analytics.ts
@@ -1 +1 @@
-export { createTracker, trackPageView } from "metabase/lib/analytics";
+export { createTracker, trackPageView } from "metabase/utils/analytics";
diff --git a/frontend/src/metabase/api/ai-streaming/requests.ts b/frontend/src/metabase/api/ai-streaming/requests.ts
index e03633d4e38..0e14ef6d865 100644
--- a/frontend/src/metabase/api/ai-streaming/requests.ts
+++ b/frontend/src/metabase/api/ai-streaming/requests.ts
@@ -1,6 +1,6 @@
import { nanoid } from "@reduxjs/toolkit";
-import api from "metabase/lib/api";
+import api from "metabase/utils/api";
import type { JSONValue } from "metabase-types/api";
import { type AIStreamingConfig, processChatResponse } from "./process-stream";
diff --git a/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts b/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts
index 5cd434117a6..eaea91ff2ce 100644
--- a/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts
+++ b/frontend/src/metabase/api/ai-streaming/requests.unit.spec.ts
@@ -1,6 +1,6 @@
import fetchMock from "fetch-mock";
-import api from "metabase/lib/api";
+import api from "metabase/utils/api";
import {
aiStreamingQuery,
diff --git a/frontend/src/metabase/api/ai-streaming/test-utils.ts b/frontend/src/metabase/api/ai-streaming/test-utils.ts
index 419c45f64b8..c7182b87a95 100644
--- a/frontend/src/metabase/api/ai-streaming/test-utils.ts
+++ b/frontend/src/metabase/api/ai-streaming/test-utils.ts
@@ -1,4 +1,4 @@
-import { defer } from "metabase/lib/promise";
+import { defer } from "metabase/utils/promise";
export function createPauses<Count extends number>(count: Count) {
const pauses = new Array(count).fill(null).map(() => defer());
diff --git a/frontend/src/metabase/api/analytics.ts b/frontend/src/metabase/api/analytics.ts
index 87c5ec71d2e..2552e31907b 100644
--- a/frontend/src/metabase/api/analytics.ts
+++ b/frontend/src/metabase/api/analytics.ts
@@ -1,6 +1,6 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
-import { openSaveDialog } from "metabase/lib/dom";
-import { hashSearchTerm, shouldReportSearchTerm } from "metabase/lib/search";
+import { trackSchemaEvent } from "metabase/utils/analytics";
+import { openSaveDialog } from "metabase/utils/dom";
+import { hashSearchTerm, shouldReportSearchTerm } from "metabase/utils/search";
import type { SearchRequest, SearchResponse } from "metabase-types/api";
import { Api } from "./api";
diff --git a/frontend/src/metabase/api/api.ts b/frontend/src/metabase/api/api.ts
index 61d02831c09..476ce8d7356 100644
--- a/frontend/src/metabase/api/api.ts
+++ b/frontend/src/metabase/api/api.ts
@@ -10,7 +10,7 @@ import {
createStoreHook,
} from "react-redux";
-import { MetabaseReduxContext } from "metabase/lib/redux";
+import { MetabaseReduxContext } from "metabase/utils/redux";
import { apiQuery } from "./query";
import { TAG_TYPES } from "./tags";
diff --git a/frontend/src/metabase/api/automagic-dashboards.ts b/frontend/src/metabase/api/automagic-dashboards.ts
index 8fffa7e851a..c5c57a77f68 100644
--- a/frontend/src/metabase/api/automagic-dashboards.ts
+++ b/frontend/src/metabase/api/automagic-dashboards.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { QueryMetadataSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
Dashboard,
DashboardQueryMetadata,
diff --git a/frontend/src/metabase/api/card.ts b/frontend/src/metabase/api/card.ts
index bad46cb7df3..dadca2241c9 100644
--- a/frontend/src/metabase/api/card.ts
+++ b/frontend/src/metabase/api/card.ts
@@ -1,6 +1,6 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { PLUGIN_API } from "metabase/plugins";
import { QueryMetadataSchema, QuestionSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
Card,
CardId,
diff --git a/frontend/src/metabase/api/dashboard.ts b/frontend/src/metabase/api/dashboard.ts
index 5700373b45b..a916b31fdaf 100644
--- a/frontend/src/metabase/api/dashboard.ts
+++ b/frontend/src/metabase/api/dashboard.ts
@@ -1,6 +1,6 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { PLUGIN_API } from "metabase/plugins";
import { QueryMetadataSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
CopyDashboardRequest,
CreateDashboardRequest,
diff --git a/frontend/src/metabase/api/database.ts b/frontend/src/metabase/api/database.ts
index 82606c624ed..e139dc9cb9d 100644
--- a/frontend/src/metabase/api/database.ts
+++ b/frontend/src/metabase/api/database.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { DatabaseSchema, FieldSchema, TableSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
AutocompleteRequest,
AutocompleteSuggestion,
diff --git a/frontend/src/metabase/api/dataset.ts b/frontend/src/metabase/api/dataset.ts
index 59c4a590615..a2ccc695d3c 100644
--- a/frontend/src/metabase/api/dataset.ts
+++ b/frontend/src/metabase/api/dataset.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { QueryMetadataSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
CardQueryMetadata,
Dataset,
diff --git a/frontend/src/metabase/api/field.ts b/frontend/src/metabase/api/field.ts
index 4538e817d3c..730a759b1e1 100644
--- a/frontend/src/metabase/api/field.ts
+++ b/frontend/src/metabase/api/field.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { FieldSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
CreateFieldDimensionRequest,
Field,
diff --git a/frontend/src/metabase/api/measure.ts b/frontend/src/metabase/api/measure.ts
index 113834511e9..33a987bc87f 100644
--- a/frontend/src/metabase/api/measure.ts
+++ b/frontend/src/metabase/api/measure.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { MeasureSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
CreateMeasureRequest,
FieldValue,
diff --git a/frontend/src/metabase/api/metric.ts b/frontend/src/metabase/api/metric.ts
index 0359846bdfc..1b39d92d0c4 100644
--- a/frontend/src/metabase/api/metric.ts
+++ b/frontend/src/metabase/api/metric.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { MetricSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
Dataset,
FieldValue,
diff --git a/frontend/src/metabase/api/query.ts b/frontend/src/metabase/api/query.ts
index f04c9f79372..0db665b9bc7 100644
--- a/frontend/src/metabase/api/query.ts
+++ b/frontend/src/metabase/api/query.ts
@@ -1,6 +1,6 @@
import type { BaseQueryFn } from "@reduxjs/toolkit/query/react";
-import api from "metabase/lib/api";
+import api from "metabase/utils/api";
type AllowedHTTPMethods = "GET" | "POST" | "PUT" | "DELETE";
const allowedHTTPMethods = new Set<AllowedHTTPMethods>([
diff --git a/frontend/src/metabase/api/segment.ts b/frontend/src/metabase/api/segment.ts
index 343c1705258..8713246ba58 100644
--- a/frontend/src/metabase/api/segment.ts
+++ b/frontend/src/metabase/api/segment.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { SegmentSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
CreateSegmentRequest,
Segment,
diff --git a/frontend/src/metabase/api/session.ts b/frontend/src/metabase/api/session.ts
index f3bc8b8f6d4..68a5af5721f 100644
--- a/frontend/src/metabase/api/session.ts
+++ b/frontend/src/metabase/api/session.ts
@@ -1,9 +1,9 @@
+import { loadSettings } from "metabase/redux/settings";
import {
isValidColorScheme,
setUserColorSchemeAfterUpdate,
-} from "metabase/lib/color-scheme";
-import MetabaseSettings from "metabase/lib/settings";
-import { loadSettings } from "metabase/redux/settings";
+} from "metabase/utils/color-scheme";
+import MetabaseSettings from "metabase/utils/settings";
import type {
EnterpriseSettings,
PasswordResetTokenStatus,
diff --git a/frontend/src/metabase/api/snippet.ts b/frontend/src/metabase/api/snippet.ts
index af0c5a537cb..0ce3c4bcda7 100644
--- a/frontend/src/metabase/api/snippet.ts
+++ b/frontend/src/metabase/api/snippet.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { SnippetSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
CreateSnippetRequest,
ListSnippetsParams,
diff --git a/frontend/src/metabase/api/table.ts b/frontend/src/metabase/api/table.ts
index 22bf6c337be..0df678600c7 100644
--- a/frontend/src/metabase/api/table.ts
+++ b/frontend/src/metabase/api/table.ts
@@ -1,5 +1,5 @@
-import { updateMetadata } from "metabase/lib/redux/metadata";
import { ForeignKeySchema, TableSchema } from "metabase/schema";
+import { updateMetadata } from "metabase/utils/redux/metadata";
import type {
BulkTableSelection,
BulkTableSelectionInfo,
diff --git a/frontend/src/metabase/api/tags/utils.ts b/frontend/src/metabase/api/tags/utils.ts
index 4a0b2bab9af..034333ade45 100644
--- a/frontend/src/metabase/api/tags/utils.ts
+++ b/frontend/src/metabase/api/tags/utils.ts
@@ -1,6 +1,6 @@
import type { TagDescription } from "@reduxjs/toolkit/query";
-import { isVirtualDashCard } from "metabase/lib/dashboard";
+import { isVirtualDashCard } from "metabase/utils/dashboard";
import type {
Alert,
ApiKey,
diff --git a/frontend/src/metabase/api/transform.ts b/frontend/src/metabase/api/transform.ts
index 59f50a038d3..c603fa57b75 100644
--- a/frontend/src/metabase/api/transform.ts
+++ b/frontend/src/metabase/api/transform.ts
@@ -1,4 +1,4 @@
-import { isResourceNotFoundError } from "metabase/lib/errors";
+import { isResourceNotFoundError } from "metabase/utils/errors";
import type {
CreateTransformRequest,
Dataset,
diff --git a/frontend/src/metabase/api/utils/use-token-refresh.ts b/frontend/src/metabase/api/utils/use-token-refresh.ts
index 12b7efc7510..7ee9a80c681 100644
--- a/frontend/src/metabase/api/utils/use-token-refresh.ts
+++ b/frontend/src/metabase/api/utils/use-token-refresh.ts
@@ -5,7 +5,7 @@ import {
useGetSettingsQuery,
useRefreshTokenStatusMutation,
} from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { TokenStatusFeature } from "metabase-types/api";
const REFRESH_INTERVAL = 10 * 1000; // 10 seconds
diff --git a/frontend/src/metabase/app-embed-sdk.tsx b/frontend/src/metabase/app-embed-sdk.tsx
index 473ca17c7c5..b0d27e0e63c 100644
--- a/frontend/src/metabase/app-embed-sdk.tsx
+++ b/frontend/src/metabase/app-embed-sdk.tsx
@@ -1,7 +1,7 @@
import { createRoot } from "react-dom/client";
// Setup CSP nonce for CodeMirror dynamic styles
-import "metabase/lib/csp";
+import "metabase/utils/csp";
// Import the embedding SDK vendors side-effects
import "metabase/embedding-sdk/vendors-side-effects";
diff --git a/frontend/src/metabase/app-main.js b/frontend/src/metabase/app-main.js
index b923e2dd8a1..d19f8862b38 100644
--- a/frontend/src/metabase/app-main.js
+++ b/frontend/src/metabase/app-main.js
@@ -6,11 +6,11 @@ import { push } from "react-router-redux";
import _ from "underscore";
import { init } from "metabase/app";
-import api from "metabase/lib/api";
import { mainReducers } from "metabase/reducers-main";
import { setErrorPage } from "metabase/redux/app";
import { clearCurrentUser } from "metabase/redux/user";
import { getRoutes } from "metabase/routes";
+import api from "metabase/utils/api";
// If any of these receives a 403, we should display the "not authorized" page.
const NOT_AUTHORIZED_TRIGGERS = [
diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.js
index a7c13c0edb1..31fa232528d 100644
--- a/frontend/src/metabase/app.js
+++ b/frontend/src/metabase/app.js
@@ -7,14 +7,10 @@ import "@xyflow/react/dist/style.css";
// Should be imported before any other metabase import
import "ee-overrides";
-import "metabase/lib/dayjs";
-
-// If enabled this monkeypatches `t` and `jt` to return blacked out
-// strings/elements to assist in finding untranslated strings.
-import "metabase/lib/i18n-debug";
+import "metabase/utils/dayjs";
// set the locale before loading anything else
-import "metabase/lib/i18n";
+import "metabase/utils/i18n";
// NOTE: why do we need to load this here?
import "metabase/ui/colors";
@@ -25,7 +21,7 @@ import "metabase/plugins/builtin";
// This is conditionally aliased in the webpack config.
// If EE isn't enabled, it loads an empty file.
// Set CSP nonce for dynamic style injection (e.g. CodeMirror)
-import "metabase/lib/csp";
+import "metabase/utils/csp";
import { createHistory } from "history";
import { DragDropContextProvider } from "react-dnd";
@@ -37,17 +33,17 @@ import { initializePlugins } from "ee-plugins";
import { AppThemeProvider } from "metabase/AppThemeProvider";
import { ModifiedBackend } from "metabase/common/components/dnd/ModifiedBackend";
import registerDashboardVisualizations from "metabase/dashboard/visualizations/register";
-import api from "metabase/lib/api";
-import { initializeEmbedding } from "metabase/lib/embed";
-import { captureConsoleErrors } from "metabase/lib/errors";
-import { initTracing, rotateTraceId } from "metabase/lib/otel";
-import { MetabaseReduxProvider } from "metabase/lib/redux/custom-context";
-import MetabaseSettings from "metabase/lib/settings";
import { MetabotProvider } from "metabase/metabot/context";
import { PLUGIN_APP_INIT_FUNCTIONS } from "metabase/plugins";
import { refreshSiteSettings } from "metabase/redux/settings";
import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";
import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";
+import api from "metabase/utils/api";
+import { initializeEmbedding } from "metabase/utils/embed";
+import { captureConsoleErrors } from "metabase/utils/errors";
+import { initTracing, rotateTraceId } from "metabase/utils/otel";
+import { MetabaseReduxProvider } from "metabase/utils/redux/custom-context";
+import MetabaseSettings from "metabase/utils/settings";
import registerVisualizations from "metabase/visualizations/register";
import { createTracker } from "./analytics";
diff --git a/frontend/src/metabase/archive/actions.ts b/frontend/src/metabase/archive/actions.ts
index 1d238a5b532..79789039329 100644
--- a/frontend/src/metabase/archive/actions.ts
+++ b/frontend/src/metabase/archive/actions.ts
@@ -1,8 +1,8 @@
import { push } from "react-router-redux";
import { t } from "ttag";
-import { createThunkAction } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { createThunkAction } from "metabase/utils/redux";
export const deletePermanently = createThunkAction(
"metabase/archive/DELETE_PERMANENTLY",
diff --git a/frontend/src/metabase/archive/analytics.ts b/frontend/src/metabase/archive/analytics.ts
index 646c7795d1a..05708163ac9 100644
--- a/frontend/src/metabase/archive/analytics.ts
+++ b/frontend/src/metabase/archive/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
type MoveToTrashEventDetail =
| "question"
diff --git a/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsx b/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsx
index e7e3a577e21..ee4560aaa67 100644
--- a/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsx
+++ b/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsx
@@ -1,7 +1,7 @@
import { useDashboardContext } from "metabase/dashboard/context";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Dashboards } from "metabase/entities/dashboards";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import { ArchivedEntityBanner } from "./ArchivedEntityBanner";
diff --git a/frontend/src/metabase/auth/actions.ts b/frontend/src/metabase/auth/actions.ts
index 3fc4ee9fe26..5c6233c929d 100644
--- a/frontend/src/metabase/auth/actions.ts
+++ b/frontend/src/metabase/auth/actions.ts
@@ -2,18 +2,18 @@ import { type UnknownAction, createAction } from "@reduxjs/toolkit";
import { getIn } from "icepick";
import { push } from "react-router-redux";
-import { deleteSession, initiateSLO } from "metabase/lib/auth";
-import { isSmallScreen, reload } from "metabase/lib/dom";
-import { loadLocalization } from "metabase/lib/i18n";
-import { createAsyncThunk } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
-import * as Urls from "metabase/lib/urls";
import { openNavbar } from "metabase/redux/app";
import { refreshSiteSettings } from "metabase/redux/settings";
import { clearCurrentUser, refreshCurrentUser } from "metabase/redux/user";
import { getSetting } from "metabase/selectors/settings";
import { getUser } from "metabase/selectors/user";
import { SessionApi, UtilApi } from "metabase/services";
+import { deleteSession, initiateSLO } from "metabase/utils/auth";
+import { isSmallScreen, reload } from "metabase/utils/dom";
+import { loadLocalization } from "metabase/utils/i18n";
+import { passwordComplexityDescription } from "metabase/utils/password";
+import { createAsyncThunk } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { LoginData } from "./types";
@@ -167,7 +167,7 @@ export const resetPassword = createAsyncThunk(
);
export const validatePassword = async (password: string) => {
- const error = MetabaseSettings.passwordComplexityDescription(password);
+ const error = passwordComplexityDescription(password);
if (error) {
return error;
}
diff --git a/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsx b/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsx
index a3279b3e20b..c753e5dce66 100644
--- a/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsx
+++ b/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.tsx
@@ -2,8 +2,8 @@ import type { ReactNode } from "react";
import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";
import { LogoIcon } from "metabase/common/components/LogoIcon";
-import { useSelector } from "metabase/lib/redux";
import { getLoginPageIllustration } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
import {
LayoutBody,
diff --git a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx
index c4956ac9a28..6867a77688f 100644
--- a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx
+++ b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.tsx
@@ -3,7 +3,7 @@ import { useCallback, useState } from "react";
import { t } from "ttag";
import { Button } from "metabase/common/components/Button";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { forgotPassword } from "../../actions";
import { getIsEmailConfigured, getIsLdapEnabled } from "../../selectors";
diff --git a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx
index a8f5841de52..f1b7d6c8710 100644
--- a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx
+++ b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx
@@ -6,9 +6,9 @@ import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormInput } from "metabase/common/components/FormInput";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
+import * as Errors from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
import type { ForgotPasswordData } from "../../types";
diff --git a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
index b86d0ce1cd2..52c7ac72a76 100644
--- a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
+++ b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.tsx
@@ -6,9 +6,10 @@ import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
import { Link } from "metabase/common/components/Link";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Box, Checkbox, useColorScheme } from "metabase/ui";
+import { getCspNonce } from "metabase/utils/csp";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { loginGoogle } from "../../actions";
import { getGoogleClientId, getSiteLocale } from "../../selectors";
@@ -61,7 +62,7 @@ export const GoogleButton = ({ redirectUrl, isCard }: GoogleButtonProps) => {
<Box ref={buttonContainer}>
{isCard && clientId ? (
<ErrorBoundary>
- <GoogleOAuthProvider clientId={clientId} nonce={window.MetabaseNonce}>
+ <GoogleOAuthProvider clientId={clientId} nonce={getCspNonce()}>
<GoogleLogin
useOneTap
onSuccess={handleLogin}
diff --git a/frontend/src/metabase/auth/components/Login/Login.tsx b/frontend/src/metabase/auth/components/Login/Login.tsx
index c95823ebbba..ecdfef182b2 100644
--- a/frontend/src/metabase/auth/components/Login/Login.tsx
+++ b/frontend/src/metabase/auth/components/Login/Login.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import _ from "underscore";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useSelector } from "metabase/lib/redux";
import type { AuthProvider } from "metabase/plugins/types";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Box, Divider } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { getAuthProviders } from "../../selectors";
import { AuthLayout } from "../AuthLayout";
diff --git a/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx b/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx
index f4133956131..dbdf9ca3d55 100644
--- a/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx
+++ b/frontend/src/metabase/auth/components/LoginForm/LoginForm.tsx
@@ -10,7 +10,7 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import type { LoginData } from "../../types";
diff --git a/frontend/src/metabase/auth/components/Logout/Logout.tsx b/frontend/src/metabase/auth/components/Logout/Logout.tsx
index 0e7e7edb1b9..8d0050ef5bc 100644
--- a/frontend/src/metabase/auth/components/Logout/Logout.tsx
+++ b/frontend/src/metabase/auth/components/Logout/Logout.tsx
@@ -1,6 +1,6 @@
import { useEffect } from "react";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import { logout } from "../../actions";
diff --git a/frontend/src/metabase/auth/components/Logout/Logout.unit.spec.tsx b/frontend/src/metabase/auth/components/Logout/Logout.unit.spec.tsx
index 62141d4089d..0afffcba2d5 100644
--- a/frontend/src/metabase/auth/components/Logout/Logout.unit.spec.tsx
+++ b/frontend/src/metabase/auth/components/Logout/Logout.unit.spec.tsx
@@ -2,7 +2,7 @@ import fetchMock from "fetch-mock";
import { setupLogoutEndpoint } from "__support__/server-mocks";
import { renderWithProviders, waitFor } from "__support__/ui";
-import * as domUtils from "metabase/lib/dom";
+import * as domUtils from "metabase/utils/dom";
import { Logout } from "./Logout";
diff --git a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx
index 77b3ed60b73..63c38ca049e 100644
--- a/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx
+++ b/frontend/src/metabase/auth/components/PasswordButton/PasswordButton.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { getIsLdapEnabled } from "../../selectors";
import { AuthButton } from "../AuthButton";
diff --git a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx
index 1281113ae31..9ebe5572fef 100644
--- a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx
+++ b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.tsx
@@ -1,7 +1,7 @@
import { useCallback } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { login } from "../../actions";
import {
diff --git a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx
index e2059f795ff..78a7a0e2e4a 100644
--- a/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx
+++ b/frontend/src/metabase/auth/components/PasswordPanel/PasswordPanel.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
setupPropertiesEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
import {
createMockSettingsState,
diff --git a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx
index 054af8a9096..11161a37ad8 100644
--- a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx
+++ b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.tsx
@@ -7,7 +7,7 @@ import { useGetPasswordResetTokenStatusQuery } from "metabase/api";
import { Button } from "metabase/common/components/Button";
import { Link } from "metabase/common/components/Link";
import { useToast } from "metabase/common/hooks/use-toast";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import { resetPassword, validatePassword } from "../../actions";
import type { ResetPasswordData } from "../../types";
diff --git a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx
index 3096ce476cc..50d76c7c430 100644
--- a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx
+++ b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx
@@ -7,8 +7,8 @@ import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormInput } from "metabase/common/components/FormInput";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import MetabaseSettings from "metabase/lib/settings";
+import * as Errors from "metabase/utils/errors";
+import { passwordComplexityDescription } from "metabase/utils/password";
import type { ResetPasswordData } from "../../types";
@@ -46,7 +46,7 @@ export const ResetPasswordForm = ({
}, []);
const passwordDescription = useMemo(() => {
- return MetabaseSettings.passwordComplexityDescription();
+ return passwordComplexityDescription();
}, []);
const validationContext = useMemo(
diff --git a/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsx b/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsx
index 9fc491e69ad..d0fba9d95cb 100644
--- a/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsx
+++ b/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsx
@@ -1,11 +1,11 @@
import _ from "underscore";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
-import { isSyncInProgress } from "metabase/lib/syncing";
-import * as Urls from "metabase/lib/urls";
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
+import { connect } from "metabase/utils/redux";
+import { isSyncInProgress } from "metabase/utils/syncing";
+import * as Urls from "metabase/utils/urls";
import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";
import * as ML_Urls from "metabase-lib/v1/urls";
diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.tsx
index 676339ffe2b..89a5a220665 100644
--- a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx
+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.tsx
@@ -8,11 +8,11 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { getEngineLogo } from "metabase/databases/utils/engine";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { newDatabase } from "metabase/lib/urls";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Flex, Group, Stack, Text, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
+import { newDatabase } from "metabase/utils/urls";
import { BrowseCard } from "../components/BrowseCard";
import S from "../components/BrowseContainer.module.css";
diff --git a/frontend/src/metabase/browse/databases/analytics.ts b/frontend/src/metabase/browse/databases/analytics.ts
index 310860dc8d3..e49d5d5a6df 100644
--- a/frontend/src/metabase/browse/databases/analytics.ts
+++ b/frontend/src/metabase/browse/databases/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackAddDatabaseDBList = () => {
trackSimpleEvent({
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index a6a01f3210f..872827acc87 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -10,8 +10,6 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadin
import { useDocsUrl } from "metabase/common/hooks";
import { useFetchMetrics } from "metabase/common/hooks/use-fetch-metrics";
import { trackMetricCreateStarted } from "metabase/data-studio/analytics";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_CONTENT_VERIFICATION, PLUGIN_LIBRARY } from "metabase/plugins";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { canUserCreateQueries } from "metabase/selectors/user";
@@ -27,6 +25,8 @@ import {
Title,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import S from "../components/BrowseContainer.module.css";
diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
index e12ab1c0644..a3cd10b4a18 100644
--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx
+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
@@ -25,8 +25,6 @@ import { Link } from "metabase/common/components/Link";
import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Questions } from "metabase/entities/questions";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import {
Button,
FixedSizeIcon,
@@ -37,6 +35,8 @@ import {
Repeat,
Skeleton,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { SortingOptions } from "metabase-types/api";
import BrowseTableS from "../components/BrowseTable.module.css";
diff --git a/frontend/src/metabase/browse/metrics/analytics.ts b/frontend/src/metabase/browse/metrics/analytics.ts
index 2815f42ca83..ac98d2980a2 100644
--- a/frontend/src/metabase/browse/metrics/analytics.ts
+++ b/frontend/src/metabase/browse/metrics/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackNewMetricInitiated = () =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/browse/metrics/utils.ts b/frontend/src/metabase/browse/metrics/utils.ts
index ab7cf37c772..69c92cdc242 100644
--- a/frontend/src/metabase/browse/metrics/utils.ts
+++ b/frontend/src/metabase/browse/metrics/utils.ts
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { getCollectionPathAsString } from "metabase/collections/utils";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import { isDate } from "metabase-lib/v1/types/utils/isa";
import type { Dataset, SortingOptions } from "metabase-types/api";
diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsx
index 2c8f5d5b23c..7cbd8be296d 100644
--- a/frontend/src/metabase/browse/models/BrowseModels.tsx
+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx
@@ -8,7 +8,6 @@ import { ForwardRefLink } from "metabase/common/components/Link";
import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";
import { useDocsUrl } from "metabase/common/hooks";
import { useFetchModels } from "metabase/common/hooks/use-fetch-models";
-import { useSelector } from "metabase/lib/redux";
import {
PLUGIN_COLLECTIONS,
PLUGIN_CONTENT_VERIFICATION,
@@ -30,6 +29,7 @@ import {
Title,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import S from "../components/BrowseContainer.module.css";
diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsx
index ec91cfd7253..3cdab34cd05 100644
--- a/frontend/src/metabase/browse/models/ModelsTable.tsx
+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx
@@ -18,9 +18,6 @@ import { Columns } from "metabase/common/components/ItemsTable/Columns";
import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";
import { Link } from "metabase/common/components/Link";
import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";
-import { getIcon } from "metabase/lib/icon";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import {
Ellipsified,
FixedSizeIcon,
@@ -29,6 +26,9 @@ import {
Repeat,
Skeleton,
} from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { SortingOptions } from "metabase-types/api";
import BrowseTableS from "../components/BrowseTable.module.css";
diff --git a/frontend/src/metabase/browse/models/analytics.ts b/frontend/src/metabase/browse/models/analytics.ts
index 6145246d9b3..6edbbe09cac 100644
--- a/frontend/src/metabase/browse/models/analytics.ts
+++ b/frontend/src/metabase/browse/models/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent, trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";
import type { CardId } from "metabase-types/api";
export const trackModelClick = (modelId: CardId) =>
diff --git a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx
index 6f4892adc75..24d1ba55bad 100644
--- a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx
+++ b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx
@@ -6,8 +6,8 @@ import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";
import CS from "metabase/css/core/index.css";
import { Databases } from "metabase/entities/databases";
import { Schemas } from "metabase/entities/schemas";
-import * as Urls from "metabase/lib/urls";
import { Flex } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { CollectionItem } from "metabase-types/api";
import { BrowseCard } from "../components/BrowseCard";
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx
index 39cde718aeb..7799df4356e 100644
--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx
+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx
@@ -7,12 +7,12 @@ import { BrowseGrid } from "metabase/browse/components/BrowseGrid";
import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
-import { isSyncInProgress } from "metabase/lib/syncing";
import { PLUGIN_TABLE_EDITING } from "metabase/plugins";
import { getShallowDatabases as getDatabases } from "metabase/selectors/metadata";
import { getUserIsAdmin } from "metabase/selectors/user";
import { ActionIcon, Flex, Group, Icon, Loader, Paper } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { isSyncInProgress } from "metabase/utils/syncing";
import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";
import {
diff --git a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts
index 939c14adea4..aebf468c8c1 100644
--- a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts
+++ b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts
@@ -2,8 +2,8 @@ import { t } from "ttag";
import { skipToken, useGetDatabaseQuery } from "metabase/api";
import { Databases } from "metabase/entities/databases";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { DatabaseId } from "metabase-types/api";
diff --git a/frontend/src/metabase/browse/tables/analytics.ts b/frontend/src/metabase/browse/tables/analytics.ts
index f92c1cf10e5..ceab3b72cd2 100644
--- a/frontend/src/metabase/browse/tables/analytics.ts
+++ b/frontend/src/metabase/browse/tables/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent, trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";
import type { ConcreteTableId } from "metabase-types/api";
export const trackTableClick = (tableId: ConcreteTableId) =>
diff --git a/frontend/src/metabase/collections/analytics.ts b/frontend/src/metabase/collections/analytics.ts
index 1733d63c6ee..141ca22258f 100644
--- a/frontend/src/metabase/collections/analytics.ts
+++ b/frontend/src/metabase/collections/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { CollectionItem } from "metabase-types/api/collection";
export const trackDataReferenceClicked = () => {
diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
index 3b3510504a6..f6bdcf33489 100644
--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
@@ -25,10 +25,10 @@ import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { EntityItem } from "metabase/common/components/EntityItem";
import { useToast } from "metabase/common/hooks/use-toast";
import { bookmarks as BookmarkEntity } from "metabase/entities";
-import { connect, useDispatch } from "metabase/lib/redux";
-import { entityForObject } from "metabase/lib/schema";
-import * as Urls from "metabase/lib/urls";
+import { entityForObject } from "metabase/entities/utils";
import { getSetting } from "metabase/selectors/settings";
+import { connect, useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type Database from "metabase-lib/v1/metadata/Database";
import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx
index ad8824dc812..27ee1bd0184 100644
--- a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx
+++ b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx
@@ -7,8 +7,8 @@ import _ from "underscore";
import { ArchiveModal } from "metabase/common/components/ArchiveModal";
import { Collections } from "metabase/entities/collections";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
const mapDispatchToProps = {
setCollectionArchived: Collections.actions.setArchived,
diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx
index 9a4ce5c007e..6e4783baf7d 100644
--- a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx
+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx
@@ -8,8 +8,8 @@ import {
BulkActionDangerButton,
} from "metabase/common/components/BulkActionBar";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
import type { Collection, CollectionItem } from "metabase-types/api";
type ArchivedBulkActionsProps = {
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx
index 29c7594170e..fda7a3a8082 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx
@@ -9,11 +9,11 @@ import {
} from "metabase/common/hooks";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Databases } from "metabase/entities/databases";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import type { UploadFileProps } from "metabase/redux/uploads";
import { uploadFile as uploadFileAction } from "metabase/redux/uploads";
import { getSetting } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type {
BookmarkId,
BookmarkType,
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
index 8d247d5d325..f1a79cb1fe2 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
@@ -34,8 +34,8 @@ import { useListSelect } from "metabase/common/hooks/use-list-select";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Collections } from "metabase/entities/collections";
import { Search } from "metabase/entities/search";
-import { useDispatch } from "metabase/lib/redux";
import { MAX_UPLOAD_SIZE, MAX_UPLOAD_STRING } from "metabase/redux/uploads";
+import { useDispatch } from "metabase/utils/redux";
import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
diff --git a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx
index 9dddbff1bf6..0199785045a 100644
--- a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx
+++ b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { Collections } from "metabase/entities/collections";
import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";
-import { connect } from "metabase/lib/redux";
-import { entityTypeForObject } from "metabase/lib/schema";
+import { entityTypeForObject } from "metabase/entities/utils";
+import { connect } from "metabase/utils/redux";
function mapStateToProps(state: any, props: any) {
return {
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.ts b/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.ts
index 9f72f5d6974..9f5706018d3 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.ts
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackCollectionNewButtonClicked = () =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
index f853cf84e7a..a1f5f209159 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
@@ -6,13 +6,13 @@ import {
isInstanceAnalyticsCollection,
isRootTrashCollection,
} from "metabase/collections/utils";
-import { useSelector } from "metabase/lib/redux";
import {
PLUGIN_COLLECTIONS,
PLUGIN_COLLECTION_COMPONENTS,
} from "metabase/plugins";
import { getIsTenantUser, getUser } from "metabase/selectors/user";
import { Icon } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Collection } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsx
index ed6955acdaf..0e17fed3a6b 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionExportAnalytics.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { useExportAnalyticsMutation } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { hasActiveExport } from "metabase/redux/analytics-export";
import { Box, Text, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { CollectionHeaderButton } from "./CollectionHeader.styled";
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsx
index 25b5126c0c8..cb521225fbc 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionNewButton.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
-import { useDispatch } from "metabase/lib/redux";
import { setOpenModal } from "metabase/redux/ui";
+import { useDispatch } from "metabase/utils/redux";
import { trackNewCollectionFromHeaderInitiated } from "./analytics";
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx
index df6c64c5a5a..a0d3509b125 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionPermissions.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection } from "metabase-types/api";
interface CollectionPermissionsProps {
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
index 588e93417c0..f60a3a6988e 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
@@ -2,8 +2,8 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen";
-import * as Urls from "metabase/lib/urls";
import { Indicator, Tooltip } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Collection } from "metabase-types/api";
import { CollectionHeaderButton } from "./CollectionHeader.styled";
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
index 875c68ebc9f..392519fecce 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { Button } from "metabase/common/components/Button";
import { Link } from "metabase/common/components/Link";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Modal } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import {
InfoModalBody,
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/analytics.ts b/frontend/src/metabase/collections/components/CollectionHeader/analytics.ts
index b4d05b02acc..b551326cc5f 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/analytics.ts
+++ b/frontend/src/metabase/collections/components/CollectionHeader/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackNewCollectionFromHeaderInitiated = () =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx
index 9bd1fe8e578..229815cab4f 100644
--- a/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx
+++ b/frontend/src/metabase/collections/components/CollectionLanding/CollectionLanding.tsx
@@ -3,9 +3,9 @@ import { useEffect } from "react";
import { replace } from "react-router-redux";
import { useGetCollectionQuery } from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
-import { extractCollectionId } from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
+import { extractCollectionId } from "metabase/utils/urls";
import { CollectionContent } from "../CollectionContent";
diff --git a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx
index 32c09f902b0..906ffbe772f 100644
--- a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx
+++ b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx
@@ -11,9 +11,9 @@ import {
import { ForwardRefLink } from "metabase/common/components/Link";
import { useHasDashboardQuestionCandidates } from "metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks";
import { UserHasSeenAll } from "metabase/common/components/UserHasSeen/UserHasSeenAll";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";
import { ActionIcon, Icon, Indicator, Menu, Tooltip } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Collection } from "metabase-types/api";
export interface CollectionMenuProps {
diff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
index 78b2aa3b624..635e867ffcb 100644
--- a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
+++ b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
@@ -18,9 +18,9 @@ import type {
} from "metabase/common/components/Pickers";
import { Collections } from "metabase/entities/collections";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { connect } from "metabase/lib/redux";
import { PLUGIN_TENANTS } from "metabase/plugins";
+import * as Errors from "metabase/utils/errors";
+import { connect } from "metabase/utils/redux";
import type { Collection } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx
index 87ad7b083ff..b6d38c34c2a 100644
--- a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx
+++ b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx
@@ -9,8 +9,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { MoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModal";
import { useCollectionQuery } from "metabase/common/hooks";
import { Collections } from "metabase/entities/collections";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection, CollectionId } from "metabase-types/api";
export interface MoveCollectionModalProps {
diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx
index 762fc40ff95..f7fbde66e6b 100644
--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx
+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx
@@ -8,11 +8,11 @@ import type {
DeleteBookmark,
} from "metabase/collections/types";
import { EventSandbox } from "metabase/common/components/EventSandbox";
-import { getIcon } from "metabase/lib/icon";
-import { modelToUrl } from "metabase/lib/urls";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { Tooltip } from "metabase/ui";
import { Flex, type IconName, Skeleton } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { modelToUrl } from "metabase/utils/urls";
import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx
index c2746cc2f67..f7f1591f2f7 100644
--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx
+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx
@@ -6,7 +6,7 @@ import {
screen,
getIcon as testGetIcon,
} from "__support__/ui";
-import { getIcon } from "metabase/lib/icon";
+import { getIcon } from "metabase/utils/icon";
import type { CollectionItem, CollectionItemModel } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx
index 81b96e67269..518bb19112b 100644
--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx
+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx
@@ -12,10 +12,10 @@ import {
} from "metabase/collections/utils";
import { EventSandbox } from "metabase/common/components/EventSandbox";
import CS from "metabase/css/core/index.css";
-import { getIcon } from "metabase/lib/icon";
-import { modelToUrl } from "metabase/lib/urls";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { Box, Flex, Group, Icon, Text } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { modelToUrl } from "metabase/utils/urls";
import Visualization from "metabase/visualizations/components/Visualization";
import type Database from "metabase-lib/v1/metadata/Database";
import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";
diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx
index f736e8a18f0..b45816d36ec 100644
--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx
+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx
@@ -2,10 +2,10 @@ import { useMemo } from "react";
import { useGetCardQuery } from "metabase/api";
import { QuestionResultLoader } from "metabase/common/components/QuestionResultLoader";
-import { getResponseErrorMessage } from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import type { IconName } from "metabase/ui";
+import { getResponseErrorMessage } from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
import {
getGenericErrorMessage,
getPermissionErrorMessage,
diff --git a/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx
index b241c045ae0..5b13e9e7447 100644
--- a/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx
+++ b/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx
@@ -1,6 +1,6 @@
import { Collections } from "metabase/entities/collections";
-import { connect } from "metabase/lib/redux";
import { uploadFile } from "metabase/redux/uploads";
+import { connect } from "metabase/utils/redux";
import type { Collection } from "metabase-types/api";
import CollectionHeader from "../../components/CollectionHeader";
diff --git a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx
index 05ea1e4b0c6..6928b38c293 100644
--- a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx
+++ b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";
import { Collections } from "metabase/entities/collections";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Modal } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx b/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx
index 1a3cd2a40f1..ca15b49f73b 100644
--- a/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx
+++ b/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx
@@ -1,6 +1,6 @@
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_COLLECTION_COMPONENTS } from "metabase/plugins";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
export function FormAuthorityLevelField() {
const isAdmin = useSelector(getUserIsAdmin);
diff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
index 18350858f68..cebc3b6bb9a 100644
--- a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
+++ b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
@@ -28,8 +28,8 @@ import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import { Collections } from "metabase/entities/collections";
import { getCollectionIcon } from "metabase/entities/collections/utils";
import { Dashboards } from "metabase/entities/dashboards";
-import { useSelector } from "metabase/lib/redux";
import { Button, Flex, Icon } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { CollectionId, DashboardId } from "metabase-types/api";
function ItemName({
diff --git a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
index 60341762e57..8c20b4bc2cb 100644
--- a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
+++ b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
@@ -21,9 +21,9 @@ import { SnippetCollectionName } from "metabase/common/components/SnippetCollect
import { TransformCollectionName } from "metabase/common/components/TransformCollectionName";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import { Collections } from "metabase/entities/collections";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { Button, Icon, Input } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { CollectionId, CollectionNamespace } from "metabase-types/api";
interface FormCollectionPickerProps extends HTMLAttributes<HTMLDivElement> {
diff --git a/frontend/src/metabase/collections/hooks.ts b/frontend/src/metabase/collections/hooks.ts
index fafdcf1db7b..f800173c3af 100644
--- a/frontend/src/metabase/collections/hooks.ts
+++ b/frontend/src/metabase/collections/hooks.ts
@@ -1,6 +1,6 @@
import getInitialCollectionId from "metabase/entities/collections/getInitialCollectionId";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
+import { useSelector } from "metabase/utils/redux";
import type { CollectionId } from "metabase-types/api";
export const useOSSGetDefaultCollectionId = (
diff --git a/frontend/src/metabase/collections/schemas.ts b/frontend/src/metabase/collections/schemas.ts
index 98a597a503f..001e6e74fe6 100644
--- a/frontend/src/metabase/collections/schemas.ts
+++ b/frontend/src/metabase/collections/schemas.ts
@@ -1,6 +1,6 @@
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
export const COLLECTION_FORM_SCHEMA = Yup.object({
name: Yup.string()
diff --git a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
index a1705e16eaa..08ef5d32eca 100644
--- a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
+++ b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.tsx
@@ -7,8 +7,6 @@ import { type KeyboardEventHandler, useEffect, useMemo, useState } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { METAKEY } from "metabase/lib/browser";
-import { useSelector } from "metabase/lib/redux";
import { EditorBubbleMenu } from "metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu";
import type { FormattingOptions } from "metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/types";
import { CustomStarterKit } from "metabase/rich_text_editing/tiptap/extensions/CustomStarterKit/CustomStarterKit";
@@ -21,6 +19,8 @@ import { LINK_SEARCH_MODELS } from "metabase/rich_text_editing/tiptap/extensions
import { createSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";
import { getSetting } from "metabase/selectors/settings";
import { ActionIcon, Box, Flex, Icon, Tooltip } from "metabase/ui";
+import { METAKEY } from "metabase/utils/browser";
+import { useSelector } from "metabase/utils/redux";
import type { DocumentContent } from "metabase-types/api";
import S from "./CommentEditor.module.css";
diff --git a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx b/frontend/src/metabase/comments/components/Discussion/Discussion.tsx
index e23bc728b6d..541607db22a 100644
--- a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx
+++ b/frontend/src/metabase/comments/components/Discussion/Discussion.tsx
@@ -10,9 +10,9 @@ import {
import { getCommentsUrl } from "metabase/comments/utils";
import { useToast } from "metabase/common/hooks";
import { setHoveredChildTargetId } from "metabase/documents/documents.slice";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import { Avatar, Stack, Timeline, rem } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type {
Comment,
CommentEntityType,
diff --git a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx
index cb066502074..8351d8dc115 100644
--- a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx
+++ b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx
@@ -5,9 +5,9 @@ import { useLocation } from "react-use";
import { t } from "ttag";
import { formatCommentDate, getCommentNodeId } from "metabase/comments/utils";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import { Avatar, Box, Group, Icon, Text, Timeline, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Comment, DocumentContent } from "metabase-types/api";
import { CommentEditor } from "../CommentEditor";
diff --git a/frontend/src/metabase/comments/components/Discussion/Reaction.tsx b/frontend/src/metabase/comments/components/Discussion/Reaction.tsx
index 2c20c23c94d..135a7406d66 100644
--- a/frontend/src/metabase/comments/components/Discussion/Reaction.tsx
+++ b/frontend/src/metabase/comments/components/Discussion/Reaction.tsx
@@ -1,9 +1,9 @@
import cx from "classnames";
import { useCallback, useMemo } from "react";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import { Flex, Text, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { CommentReaction } from "metabase-types/api";
import S from "./Discussion.module.css";
diff --git a/frontend/src/metabase/comments/utils.ts b/frontend/src/metabase/comments/utils.ts
index fbf26b4de45..704da13d52b 100644
--- a/frontend/src/metabase/comments/utils.ts
+++ b/frontend/src/metabase/comments/utils.ts
@@ -3,7 +3,7 @@ import { replace } from "react-router-redux";
import type { LocationSensorState } from "react-use/lib/useLocation";
import { match } from "ts-pattern";
-import type { DispatchFn } from "metabase/lib/redux";
+import type { DispatchFn } from "metabase/utils/redux";
import type { Comment, CommentEntityType, EntityId } from "metabase-types/api";
import type { CommentThread } from "./types";
diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
index 84fbb9d01e1..10186ede00b 100644
--- a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
+++ b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.tsx
@@ -15,11 +15,11 @@ import { ListSearchField } from "metabase/common/components/ListSearchField";
import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import ListS from "metabase/css/components/list.module.css";
import CS from "metabase/css/core/index.css";
-import { isTouchDevice } from "metabase/lib/browser";
import type { TextInputProps } from "metabase/ui";
import { Box, Icon, Text, isValidIconName } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import { color } from "metabase/ui/utils/colors";
+import { isTouchDevice } from "metabase/utils/browser";
import styles from "./AccordionListCell.module.css";
import {
diff --git a/frontend/src/metabase/common/components/AdHocQuestionLoader.tsx b/frontend/src/metabase/common/components/AdHocQuestionLoader.tsx
index 49926707af0..188c1f07c43 100644
--- a/frontend/src/metabase/common/components/AdHocQuestionLoader.tsx
+++ b/frontend/src/metabase/common/components/AdHocQuestionLoader.tsx
@@ -1,10 +1,10 @@
import type { ReactNode } from "react";
import { useCallback, useEffect, useRef, useState } from "react";
-import { deserializeCardFromUrl } from "metabase/lib/card";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { loadMetadataForCard } from "metabase/questions/actions";
import { getMetadata } from "metabase/selectors/metadata";
+import { deserializeCardFromUrl } from "metabase/utils/card";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { UnsavedCard } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsx b/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsx
index c6fcf6eb27b..95bec3939e6 100644
--- a/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/AdHocQuestionLoader.unit.spec.tsx
@@ -1,6 +1,6 @@
import { render } from "__support__/ui";
import { delay } from "__support__/utils";
-import * as Card from "metabase/lib/card";
+import * as Card from "metabase/utils/card";
import * as Lib from "metabase-lib";
import {
DEFAULT_TEST_QUERY,
diff --git a/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx b/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx
index b8b9b059050..74c22365e45 100644
--- a/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx
+++ b/frontend/src/metabase/common/components/AdminAwareEmptyState/AdminAwareEmptyState.tsx
@@ -1,9 +1,9 @@
import type { ReactNode } from "react";
import { EmptyState } from "metabase/common/components/EmptyState";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import type { IconName } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
/*
* AdminAwareEmptyState is a component that can
diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
index 932dd672ab7..35a37a937ec 100644
--- a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
+++ b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
@@ -14,7 +14,6 @@ import {
import { Popover } from "metabase/common/components/MetadataInfo/Popover";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { useSelector } from "metabase/lib/redux";
import {
ExpressionWidget,
ExpressionWidgetHeader,
@@ -27,6 +26,7 @@ import {
} from "metabase/querying/expressions";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Flex, Icon, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { QueryColumnPicker } from "../QueryColumnPicker";
diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
index 77279b00183..9cfa7ce1858 100644
--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
@@ -1,8 +1,6 @@
import dayjs from "dayjs";
import { useSetting, useUserSetting } from "metabase/common/hooks";
-import { isWithinIframe } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
import { DevModeBanner } from "metabase/nav/components/DevModeBanner";
import {
LicenseTokenMissingBanner,
@@ -13,6 +11,8 @@ import { ReadOnlyBanner } from "metabase/nav/components/ReadOnlyBanner";
import { TrialBanner } from "metabase/nav/components/TrialBanner";
import { getUserIsAdmin } from "metabase/selectors/user";
import { getIsHosted } from "metabase/setup/selectors";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { useSelector } from "metabase/utils/redux";
import { getCurrentUTCTimestamp, shouldShowTrialBanner } from "./utils";
diff --git a/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsx b/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsx
index cb1292bc705..f67ce44cf4b 100644
--- a/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsx
+++ b/frontend/src/metabase/common/components/AutocompleteInput/AutocompleteInput.tsx
@@ -3,7 +3,6 @@ import { useMemo, useRef } from "react";
import { TippyPopoverWithTrigger } from "metabase/common/components/PopoverWithTrigger/TippyPopoverWithTrigger";
import { SelectList } from "metabase/common/components/SelectList";
import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";
-import { composeEventHandlers } from "metabase/lib/compose-event-handlers";
import type { VisualizationSettings } from "metabase-types/api";
import type { InputProps } from "../Input";
@@ -87,15 +86,18 @@ export const AutocompleteInput = ({
{...rest}
value={value}
onClick={handleShowPopover}
- onFocus={composeEventHandlers<React.FocusEvent<HTMLInputElement>>(
- onFocus,
- handleShowPopover,
- )}
- onChange={composeEventHandlers(handleChange, handleShowPopover)}
- onBlur={composeEventHandlers<React.FocusEvent<HTMLInputElement>>(
- onBlur,
- closePopover,
- )}
+ onFocus={(evt) => {
+ onFocus?.(evt);
+ handleShowPopover();
+ }}
+ onChange={(evt) => {
+ handleChange(evt);
+ handleShowPopover();
+ }}
+ onBlur={(evt) => {
+ onBlur?.(evt);
+ closePopover();
+ }}
/>
)}
placement="bottom-start"
diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx
index 9309ef04997..5ac3c106be0 100644
--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx
+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx
@@ -2,9 +2,9 @@ import cx from "classnames";
import type { HTMLAttributes } from "react";
import Animation from "metabase/css/core/animation.module.css";
-import { useSelector } from "metabase/lib/redux";
import { getIsNavbarOpen } from "metabase/selectors/app";
import { Box, type BoxProps, Flex, Portal, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { BulkActionsToast, ToastCard } from "./BulkActionBar.styled";
diff --git a/frontend/src/metabase/common/components/Button/Button.tsx b/frontend/src/metabase/common/components/Button/Button.tsx
index 8646e1d87a2..ce82627ed37 100644
--- a/frontend/src/metabase/common/components/Button/Button.tsx
+++ b/frontend/src/metabase/common/components/Button/Button.tsx
@@ -8,10 +8,10 @@ import _ from "underscore";
import ButtonsS from "metabase/css/components/buttons.module.css";
import CS from "metabase/css/core/index.css";
import SpacingS from "metabase/css/core/spacing.module.css";
-import { isNotNull } from "metabase/lib/types";
import type { IconName } from "metabase/ui";
import { Icon } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
+import { isNotNull } from "metabase/utils/types";
import {
ButtonContent,
diff --git a/frontend/src/metabase/common/components/CodeMirror/utils.ts b/frontend/src/metabase/common/components/CodeMirror/utils.ts
index 62681016eef..3b5c48a19e0 100644
--- a/frontend/src/metabase/common/components/CodeMirror/utils.ts
+++ b/frontend/src/metabase/common/components/CodeMirror/utils.ts
@@ -34,13 +34,13 @@ import {
Prec,
type Transaction,
} from "@uiw/react-codemirror";
-import { getNonce } from "get-nonce";
import { useMemo } from "react";
-import { isMac } from "metabase/lib/browser";
-import { isNotNull } from "metabase/lib/types";
import { monospaceFontFamily } from "metabase/styled-components/theme";
import { metabaseSyntaxHighlighting } from "metabase/ui/syntax";
+import { isMac } from "metabase/utils/browser";
+import { getCspNonce } from "metabase/utils/csp";
+import { isNotNull } from "metabase/utils/types";
import { highlightRanges } from "./highlights";
@@ -116,7 +116,7 @@ function useBaseExtensions({
// CodeMirror injects css into the DOM,
// to make this work, it needs the have the correct CSP nonce.
function nonce() {
- const nonce = getNonce();
+ const nonce = getCspNonce();
if (!nonce) {
return null;
}
diff --git a/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsx b/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsx
index c02e2b7be91..2886b71c76d 100644
--- a/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsx
+++ b/frontend/src/metabase/common/components/CommunityLocalizationNotice/CommunityLocalizationNotice.tsx
@@ -1,12 +1,12 @@
import { jt, t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { useSelector } from "metabase/lib/redux";
import { CROWDIN_URL } from "metabase/selectors/settings";
import {
getIsWhiteLabeling,
getShowMetabaseLinks,
} from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
export function getLocalizationNoticeText({
mentionMetabase,
diff --git a/frontend/src/metabase/common/components/CronExpressioInput/CronExpressionInput.tsx b/frontend/src/metabase/common/components/CronExpressioInput/CronExpressionInput.tsx
index 3a151293652..9f231980072 100644
--- a/frontend/src/metabase/common/components/CronExpressioInput/CronExpressionInput.tsx
+++ b/frontend/src/metabase/common/components/CronExpressioInput/CronExpressionInput.tsx
@@ -2,10 +2,6 @@ import { useMemo, useState } from "react";
import { jt, msgid, ngettext, t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import {
- getScheduleExplanation,
- validateCronExpression,
-} from "metabase/lib/cron";
import {
Flex,
type FlexProps,
@@ -15,6 +11,10 @@ import {
type TextProps,
Tooltip,
} from "metabase/ui";
+import {
+ getScheduleExplanation,
+ validateCronExpression,
+} from "metabase/utils/cron";
import S from "./CronExpressionInput.module.css";
diff --git a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx
index a38b0512486..06a9fbe9743 100644
--- a/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx
+++ b/frontend/src/metabase/common/components/DatabaseMultiSelect/DatabaseMultiSelect.stories.tsx
@@ -8,9 +8,9 @@ import { getStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { Api } from "metabase/api";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { commonReducers } from "metabase/reducers-common";
import { Stack, Text } from "metabase/ui";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import type { Database, DatabaseId } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/common/components/DateTime/DateTime.tsx b/frontend/src/metabase/common/components/DateTime/DateTime.tsx
index d040430f046..599ef8b9b14 100644
--- a/frontend/src/metabase/common/components/DateTime/DateTime.tsx
+++ b/frontend/src/metabase/common/components/DateTime/DateTime.tsx
@@ -1,8 +1,8 @@
import { type HTMLAttributes, forwardRef } from "react";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
-import MetabaseSettings from "metabase/lib/settings";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
+import MetabaseSettings from "metabase/utils/settings";
import type { DatetimeUnit } from "metabase-types/api";
type DateTimeProps = HTMLAttributes<HTMLSpanElement> & {
diff --git a/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsx b/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsx
index e75329092be..c76295ef07e 100644
--- a/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/DateTime/DateTime.unit.spec.tsx
@@ -5,8 +5,8 @@ import { DateTime } from "metabase/common/components/DateTime";
import {
DEFAULT_DATE_STYLE,
DEFAULT_TIME_STYLE,
-} from "metabase/lib/formatting/datetime-utils";
-import MetabaseSettings from "metabase/lib/settings";
+} from "metabase/utils/formatting/datetime-utils";
+import MetabaseSettings from "metabase/utils/settings";
describe("DateTime", () => {
const TEST_DATE = "2021-06-08T14:40:10";
diff --git a/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx b/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
index 4a0548f7759..5ed63aa23eb 100644
--- a/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
+++ b/frontend/src/metabase/common/components/EntityCreationInfo/EntityCreationInfo.tsx
@@ -2,8 +2,8 @@ import { c, t } from "ttag";
import { DateTime } from "metabase/common/components/DateTime";
import CS from "metabase/css/core/index.css";
-import { type NamedUser, getUserName } from "metabase/lib/user";
import { Box, FixedSizeIcon, Group, Stack, Title } from "metabase/ui";
+import { type NamedUser, getUserName } from "metabase/utils/user";
type EntityCreationInfoProps = {
createdAt?: string | null;
diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx
index 50eda5ced9c..4ed70cdaca3 100644
--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx
+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx
@@ -25,9 +25,9 @@ import { CheckBox } from "metabase/common/components/CheckBox";
import { EntityMenu } from "metabase/common/components/EntityMenu";
import { Swapper } from "metabase/common/components/Swapper";
import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
import type { IconName, IconProps } from "metabase/ui";
import { Ellipsified, Icon } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { CollectionItem } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/common/components/ErrorPages/DiagnosticCheckboxes.tsx b/frontend/src/metabase/common/components/ErrorPages/DiagnosticCheckboxes.tsx
index 151623f421d..025533e4f57 100644
--- a/frontend/src/metabase/common/components/ErrorPages/DiagnosticCheckboxes.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/DiagnosticCheckboxes.tsx
@@ -1,8 +1,8 @@
import { c, t } from "ttag";
import { FormCheckbox } from "metabase/forms";
-import { capitalize } from "metabase/lib/formatting";
import { Stack } from "metabase/ui";
+import { capitalize } from "metabase/utils/formatting";
import type { ErrorPayload } from "./types";
diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
index eca558bea04..32d5ac36643 100644
--- a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
@@ -7,14 +7,14 @@ import { useSendBugReportMutation } from "metabase/api/bug-report";
import { MetabotLogo } from "metabase/common/components/MetabotLogo";
import { useSetting } from "metabase/common/hooks";
import { useToggle } from "metabase/common/hooks/use-toggle";
-import { downloadObjectAsJson } from "metabase/lib/download";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { closeDiagnostics } from "metabase/redux/app";
import { addUndo } from "metabase/redux/undo";
import { getIsErrorDiagnosticModalOpen } from "metabase/selectors/app";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Button, Flex, Icon, Loader, Modal, Stack, Text } from "metabase/ui";
+import { downloadObjectAsJson } from "metabase/utils/download";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { BugReportModal } from "./BugReportModal";
import { DownloadDiagnosticModal } from "./DownloadDiagnosticModal";
diff --git a/frontend/src/metabase/common/components/ErrorPages/analytics.ts b/frontend/src/metabase/common/components/ErrorPages/analytics.ts
index eeda5515156..ee7ee2a5d76 100644
--- a/frontend/src/metabase/common/components/ErrorPages/analytics.ts
+++ b/frontend/src/metabase/common/components/ErrorPages/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackErrorDiagnosticModalOpened = (
triggeredFrom: "profile-menu" | "command-palette",
diff --git a/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts b/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts
index 66533a0098b..0132082e77b 100644
--- a/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts
+++ b/frontend/src/metabase/common/components/ErrorPages/use-error-info.ts
@@ -1,9 +1,9 @@
import { useAsync } from "react-use";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
import { MetabaseApi, UtilApi } from "metabase/services";
+import { useSelector } from "metabase/utils/redux";
import type { ErrorPayload, ReportableEntityName } from "./types";
import { getBrowserInfo, getEntityDetails, hasQueryData } from "./utils";
diff --git a/frontend/src/metabase/common/components/ErrorPages/utils.ts b/frontend/src/metabase/common/components/ErrorPages/utils.ts
index dd55c4aad03..bac2510660f 100644
--- a/frontend/src/metabase/common/components/ErrorPages/utils.ts
+++ b/frontend/src/metabase/common/components/ErrorPages/utils.ts
@@ -1,7 +1,7 @@
import Bowser from "bowser";
-import { b64url_to_utf8 } from "metabase/lib/encoding";
import { CardApi, CollectionsApi, DashboardApi } from "metabase/services";
+import { b64url_to_utf8 } from "metabase/utils/encoding";
import type { ReportableEntityName } from "./types";
diff --git a/frontend/src/metabase/common/components/ExpandingContent/ExpandingContent.jsx b/frontend/src/metabase/common/components/ExpandingContent/ExpandingContent.jsx
index a5108f3a1f4..6762c7501ba 100644
--- a/frontend/src/metabase/common/components/ExpandingContent/ExpandingContent.jsx
+++ b/frontend/src/metabase/common/components/ExpandingContent/ExpandingContent.jsx
@@ -3,7 +3,7 @@ import cx from "classnames";
import { Component } from "react";
import CS from "metabase/css/core/index.css";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
export class ExpandingContent extends Component {
constructor({ isInitiallyOpen }) {
diff --git a/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx b/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx
index 05a5d60542f..ede150a8f74 100644
--- a/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx
+++ b/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx
@@ -13,8 +13,8 @@ import _ from "underscore";
import CS from "metabase/css/core/index.css";
import { isCypressActive } from "metabase/env";
-import { delay } from "metabase/lib/delay";
-import resizeObserver from "metabase/lib/resize-observer";
+import { delay } from "metabase/utils/delay";
+import resizeObserver from "metabase/utils/resize-observer";
const WAIT_TIME = delay(300);
diff --git a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx
index 1caa060023e..34bf96cc534 100644
--- a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx
+++ b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx
@@ -4,9 +4,9 @@ import { c, t } from "ttag";
import { useSetting } from "metabase/common/hooks";
import type { ExportFormat } from "metabase/common/types/export";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Checkbox, SegmentedControl, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
interface ExportSettingsWidgetProps {
formats: ExportFormat[];
diff --git a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx
index 72c4e6d15a1..50341510a96 100644
--- a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx
+++ b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx
@@ -2,7 +2,7 @@ import type { AnchorHTMLAttributes, ReactNode, Ref } from "react";
import { forwardRef } from "react";
import CS from "metabase/css/core/index.css";
-import { getUrlTarget } from "metabase/lib/dom";
+import { getUrlTarget } from "metabase/utils/dom";
import S from "./ExternalLink.module.css";
diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx
index b00147a65c9..4329ad2ea05 100644
--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx
@@ -6,11 +6,11 @@ import { getIcon, renderWithProviders, screen } from "__support__/ui";
import { DEFAULT_VISIBLE_COLUMNS_LIST } from "metabase/collections/components/CollectionContent";
import { getVisibleColumnsMap } from "metabase/common/components/ItemsTable/utils";
import type { ItemWithLastEditInfo } from "metabase/common/components/LastEditInfoLabel/LastEditInfoLabel";
+import type { IconName } from "metabase/ui";
import {
DEFAULT_DATE_STYLE,
DEFAULT_TIME_STYLE,
-} from "metabase/lib/formatting/datetime-utils";
-import type { IconName } from "metabase/ui";
+} from "metabase/utils/formatting/datetime-utils";
import type { CollectionItem } from "metabase-types/api";
import { createMockCollection } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx
index 0e9dbead6de..22ae59b282a 100644
--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody.tsx
@@ -4,8 +4,8 @@ import {
} from "metabase/common/components/ItemsTable/BaseItemTableRow";
import type { BaseItemsTableProps } from "metabase/common/components/ItemsTable/BaseItemsTable";
import { DefaultItemRenderer } from "metabase/common/components/ItemsTable/DefaultItemRenderer";
-import { useSelector } from "metabase/lib/redux";
import { getIsDndAvailable } from "metabase/selectors/app";
+import { useSelector } from "metabase/utils/redux";
import type { CollectionItem } from "metabase-types/api";
import { TBody } from "../BaseItemsTable.styled";
diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
index 465e261de25..965ab5fcf74 100644
--- a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx
@@ -10,12 +10,11 @@ import { Markdown } from "metabase/common/components/Markdown";
import { ArchiveButton } from "metabase/embedding/components/ArchiveButton";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { isTouchDevice } from "metabase/lib/browser";
-import { modelToUrl } from "metabase/lib/urls";
-import { getUserName } from "metabase/lib/user";
import { PLUGIN_MODERATION } from "metabase/plugins";
-import type { IconProps } from "metabase/ui";
-import { Ellipsified, Tooltip } from "metabase/ui";
+import { Ellipsified, type IconProps, Tooltip } from "metabase/ui";
+import { isTouchDevice } from "metabase/utils/browser";
+import { modelToUrl } from "metabase/utils/urls";
+import { getUserName } from "metabase/utils/user";
import type {
CollectionItem,
ListCollectionItemsSortColumn,
diff --git a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx
index bafe8ec6fc8..ad5c076ae21 100644
--- a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx
@@ -5,7 +5,7 @@ import type { OnToggleSelectedWithItem } from "metabase/collections/types";
import { isRootTrashCollection } from "metabase/collections/utils";
import type { BaseItemsTableProps } from "metabase/common/components/ItemsTable/BaseItemsTable";
import { Columns } from "metabase/common/components/ItemsTable/Columns";
-import { getIcon } from "metabase/lib/icon";
+import { getIcon } from "metabase/utils/icon";
import type Database from "metabase-lib/v1/metadata/Database";
import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx
index 84eee3d88d0..06c43059801 100644
--- a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx
+++ b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx
@@ -3,12 +3,12 @@ import type { MouseEventHandler } from "react";
import { t } from "ttag";
import { DateTime } from "metabase/common/components/DateTime";
-import { connect } from "metabase/lib/redux";
-import type { NamedUser } from "metabase/lib/user";
-import { getFullName } from "metabase/lib/user";
import { getUser } from "metabase/selectors/user";
import type { TooltipProps } from "metabase/ui";
import { Text, Tooltip, UnstyledButton } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
+import type { NamedUser } from "metabase/utils/user";
+import { getFullName } from "metabase/utils/user";
import type { User } from "metabase-types/api";
export type ItemWithLastEditInfo = {
diff --git a/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.tsx b/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.tsx
index 3c1a08c055b..d38ab615716 100644
--- a/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.tsx
+++ b/frontend/src/metabase/common/components/LoadingSpinner/LoadingSpinner.tsx
@@ -1,5 +1,5 @@
-import { isReducedMotionPreferred } from "metabase/lib/dom";
import { Icon } from "metabase/ui";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
import { SpinnerIcon, SpinnerRoot } from "./LoadingSpinner.styled";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/DateTimeFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/DateTimeFingerprint.tsx
index 9a4b3016551..25f5d28cd7d 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/DateTimeFingerprint.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/DateTimeFingerprint.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting";
import type * as Lib from "metabase-lib";
import { Table } from "../MetadataInfo.styled";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx
index 7c349034426..67ebd7951f5 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.styled.tsx
@@ -3,7 +3,7 @@ import styled from "@emotion/styled";
import type { ComponentProps } from "react";
import { LoadingSpinner as LoadingSpinnerBase } from "metabase/common/components/LoadingSpinner";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
const TRANSITION_DURATION = () => (isReducedMotionPreferred() ? "0" : "0.25s");
diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx
index 60ef7bdaa4f..c365c56e047 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnFingerprintInfo/GlobalFingerprint.tsx
@@ -1,9 +1,9 @@
import { msgid, ngettext, t } from "ttag";
import { useGetFieldValuesQuery } from "metabase/api";
-import { formatNumber } from "metabase/lib/formatting";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { formatNumber } from "metabase/utils/formatting";
+import { useSelector } from "metabase/utils/redux";
import type { FieldId, FieldValue } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx
index 466ada042bb..5a750e4b033 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.styled.tsx
@@ -2,10 +2,10 @@
import styled from "@emotion/styled";
import { LoadingSpinner as LoadingSpinnerBase } from "metabase/common/components/LoadingSpinner";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
import { Icon } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import { color } from "metabase/ui/utils/colors";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
const TRANSITION_DURATION = () => (isReducedMotionPreferred() ? "0" : "0.25s");
diff --git a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsx b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsx
index 48fe91fa41d..62c69a7ec34 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/SemanticTypeLabel/SemanticTypeLabel.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import {
getSemanticTypeIcon,
getSemanticTypeName,
-} from "metabase/lib/schema_metadata";
+} from "metabase/common/utils/fields";
import {
Label,
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx
index 2a071b59c1b..f199db4745a 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.unit.spec.tsx
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Table } from "metabase-types/api";
import { createMockField, createMockTable } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx
index 5d2bdcb75b3..e48eb94ad15 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.unit.spec.tsx
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Table } from "metabase-types/api";
import {
createMockField,
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
index ea13f74a59f..889979ca37c 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx
@@ -3,7 +3,7 @@ import { useAsyncFn } from "react-use";
import { t } from "ttag";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type Table from "metabase-lib/v1/metadata/Table";
import { Description, EmptyDescription } from "../MetadataInfo";
diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx
index c5ec531c460..9a76f2fabd0 100644
--- a/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/MetadataInfo/TableLabel/TableLabel.unit.spec.tsx
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Table } from "metabase-types/api";
import { createMockTable } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx
index 8bae5fa568c..b467cb4ac90 100644
--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx
+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/MoveQuestionsIntoDashboardsModal.tsx
@@ -11,10 +11,10 @@ import {
useMoveCollectionDashboardQuestionCandidatesMutation,
} from "metabase/api";
import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { addUndo } from "metabase/redux/undo";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { ConfirmMoveDashboardQuestionCandidatesModal } from "./ConfirmMoveDashboardQuestionCandidatesModal";
import { MoveQuestionsIntoDashboardsInfoModal } from "./MoveQuestionsIntoDashboardsInfoModal";
diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.ts b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.ts
index 6f13f631022..6091e8bffbf 100644
--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.ts
+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks.ts
@@ -2,8 +2,8 @@ import {
skipToken,
useListCollectionDashboardQuestionCandidatesQuery,
} from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import type { CollectionId } from "metabase-types/api";
export const useHasDashboardQuestionCandidates = (
diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx
index 88f1561b950..3e6ca2c69ed 100644
--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx
+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx
@@ -2,13 +2,13 @@ import { push } from "react-router-redux";
import _ from "underscore";
import { Databases } from "metabase/entities/databases";
-import { connect } from "metabase/lib/redux";
import { closeNavbar } from "metabase/redux/app";
import { getHasDatabaseWithJsonEngine } from "metabase/selectors/data";
import {
canUserCreateNativeQueries,
canUserCreateQueries,
} from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
import type Database from "metabase-lib/v1/metadata/Database";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx
index 94d4f17828c..bbd3d486e8c 100644
--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx
+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenuView.tsx
@@ -3,14 +3,14 @@ import { useMemo } from "react";
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getNewMenuItemAIExploration } from "metabase/metabot/components/NewMenuItemAIExploration";
import { useUserMetabotPermissions } from "metabase/metabot/hooks";
import { setOpenModal } from "metabase/redux/ui";
import { getSetting } from "metabase/selectors/settings";
import { getUserCanWriteToCollections } from "metabase/selectors/user";
import { Box, Icon, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { CollectionId } from "metabase-types/api";
import { trackNewMenuItemClicked } from "./analytics";
diff --git a/frontend/src/metabase/common/components/NewItemMenu/analytics.ts b/frontend/src/metabase/common/components/NewItemMenu/analytics.ts
index 8f32961a5f7..42d10dfa0e4 100644
--- a/frontend/src/metabase/common/components/NewItemMenu/analytics.ts
+++ b/frontend/src/metabase/common/components/NewItemMenu/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackNewMenuItemClicked = (
item: "question" | "native-query" | "dashboard",
diff --git a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx
index 594a14b1b1f..242386617e1 100644
--- a/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx
+++ b/frontend/src/metabase/common/components/NotFoundFallbackPage.tsx
@@ -3,8 +3,8 @@ import { replace } from "react-router-redux";
import { useMount } from "react-use";
import { NotFound } from "metabase/common/components/ErrorPages";
-import { connect } from "metabase/lib/redux";
import { refreshCurrentUser } from "metabase/redux/user";
+import { connect } from "metabase/utils/redux";
type DispatchProps = {
refreshCurrentUser: () => any;
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx
index b55aff35e93..91318c3b470 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/EntityPickerModal.tsx
@@ -8,8 +8,8 @@ import { t } from "ttag";
import { useModalOpen } from "metabase/common/hooks/use-modal-open";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
-import resizeObserver from "metabase/lib/resize-observer";
import { ActionIcon, Box, Icon, Modal, TextInput } from "metabase/ui";
+import resizeObserver from "metabase/utils/resize-observer";
import type { RecentContexts } from "metabase-types/api";
import { useLogRecentItem } from "../hooks";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx
index 973cefb14ee..efe7cb8ec81 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemList.tsx
@@ -3,7 +3,6 @@ import { useMemo } from "react";
import { VirtualizedList } from "metabase/common/components/VirtualizedList";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { LoadingAndErrorWrapper } from "metabase/public/containers/PublicAction/PublicAction.styled";
import { getIsTenantUser } from "metabase/selectors/user";
@@ -15,6 +14,7 @@ import {
NavLink,
type NavLinkProps,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useOmniPickerContext } from "../../context";
import type { OmniPickerItem } from "../../types";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
index 733beb4fab5..3633cd3f509 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/SearchResults.tsx
@@ -4,7 +4,6 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { VirtualizedList } from "metabase/common/components/VirtualizedList";
import { NoObjectError } from "metabase/common/components/errors/NoObjectError";
-import { getIcon } from "metabase/lib/icon";
import { PLUGIN_LIBRARY, PLUGIN_MODERATION } from "metabase/plugins";
import {
Box,
@@ -15,6 +14,7 @@ import {
SegmentedControl,
Text,
} from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
import type { OmniPickerItem, OmniPickerTableItem, SearchScope } from "../..";
import { useOmniPickerContext } from "../../context";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsx
index 0153ccb5f75..18e2f2ae16b 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsx
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsx
@@ -13,9 +13,9 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { Button, Flex, Modal } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import { useOmniPickerContext } from "../../context";
import type { OmniPickerCollectionItem } from "../../types";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts
index f86e9cccad1..c6dabbf797c 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-path-from-value.ts
@@ -13,8 +13,8 @@ import {
transformApi,
} from "metabase/api";
import { useGetPersonalCollection } from "metabase/common/hooks/use-get-personal-collection";
-import { type DispatchFn, useDispatch } from "metabase/lib/redux";
import { PLUGIN_LIBRARY } from "metabase/plugins";
+import { type DispatchFn, useDispatch } from "metabase/utils/redux";
import type {
Collection,
CollectionNamespace,
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
index 50bf9cf4d54..a018ffb52c9 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts
@@ -13,9 +13,13 @@ import {
useSetting,
} from "metabase/common/hooks";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
-import { type DispatchFn, useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_LIBRARY, PLUGIN_TENANTS } from "metabase/plugins";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
+import {
+ type DispatchFn,
+ useDispatch,
+ useSelector,
+} from "metabase/utils/redux";
import type {
Collection,
CollectionNamespace,
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
index a703eb8e312..427b60972e8 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { collectionApi } from "metabase/api";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
-import type { DispatchFn } from "metabase/lib/redux";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { getRootCollectionItem as getTransformsRootCollectionItem } from "metabase/transforms/utils";
+import type { DispatchFn } from "metabase/utils/redux";
import type { CollectionNamespace } from "metabase-types/api";
import type { OmniPickerCollectionItem } from "../types";
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts
index 45db17f8482..fa31c5610d9 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.ts
@@ -1,7 +1,7 @@
import _ from "underscore";
-import { type IconData, getIcon } from "metabase/lib/icon";
import type { ColorName } from "metabase/ui/colors/types";
+import { type IconData, getIcon } from "metabase/utils/icon";
import type {
CollectionItemModel,
CollectionNamespace,
diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.ts
index 16e9e2a1804..1c1a9b46566 100644
--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.ts
+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/utils.unit.spec.ts
@@ -1,4 +1,4 @@
-import { getIcon } from "metabase/lib/icon";
+import { getIcon } from "metabase/utils/icon";
import type { CollectionItemModel } from "metabase-types/api";
import {
@@ -16,7 +16,7 @@ import {
isSelectedItem,
} from "./utils";
-jest.mock("metabase/lib/icon", () => ({
+jest.mock("metabase/utils/icon", () => ({
getIcon: jest.fn(),
}));
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
index 0ce5ee93739..6fb7be35093 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItem.tsx
@@ -1,6 +1,5 @@
-import { getIcon } from "metabase/lib/icon";
-import { Ellipsified } from "metabase/ui";
-import { Box, Icon, Menu, type MenuItemProps } from "metabase/ui";
+import { Box, Ellipsified, Icon, Menu, type MenuItemProps } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
import type {
MiniPickerCollectionItem,
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
index aa1b796f00d..7caf14f2e8c 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx
@@ -16,8 +16,6 @@ import { canCollectionCardBeUsed } from "metabase/common/components/Pickers/util
import { VirtualizedList } from "metabase/common/components/VirtualizedList";
import { useSetting } from "metabase/common/hooks";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { getIcon } from "metabase/lib/icon";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_LIBRARY } from "metabase/plugins";
import {
Box,
@@ -29,6 +27,8 @@ import {
Stack,
Text,
} from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { useSelector } from "metabase/utils/redux";
import type {
CollectionItem,
SchemaName,
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts b/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts
index 6d24607b36b..b3967f1c000 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/utils.ts
@@ -3,8 +3,8 @@ import { useDeepCompareEffect } from "react-use";
import { t } from "ttag";
import { cardApi, collectionApi, databaseApi, tableApi } from "metabase/api";
-import type { DispatchFn } from "metabase/lib/redux";
-import { useDispatch } from "metabase/lib/redux";
+import type { DispatchFn } from "metabase/utils/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { SchemaName } from "metabase-types/api";
import type { DataPickerValue } from "../DataPicker";
diff --git a/frontend/src/metabase/common/components/Popover/Popover.module.css b/frontend/src/metabase/common/components/Popover/Popover.module.css
index 1093f312aa7..6929f4b4b6c 100644
--- a/frontend/src/metabase/common/components/Popover/Popover.module.css
+++ b/frontend/src/metabase/common/components/Popover/Popover.module.css
@@ -45,7 +45,7 @@
}
/* Global id for an element used for positioning tooltips.
- * Check usage in metabase/lib/dom.ts when removing this component. */
+ * Check usage in metabase/utils/dom.ts when removing this component. */
:global(#popover-event-target) {
position: fixed;
width: 6px;
diff --git a/frontend/src/metabase/common/components/Popover/TippyPopover.tsx b/frontend/src/metabase/common/components/Popover/TippyPopover.tsx
index 58f5504049d..d794e134730 100644
--- a/frontend/src/metabase/common/components/Popover/TippyPopover.tsx
+++ b/frontend/src/metabase/common/components/Popover/TippyPopover.tsx
@@ -8,8 +8,8 @@ import { EventSandbox } from "metabase/common/components/EventSandbox";
import { getPortalRootElement } from "metabase/css/core/overlays/utils";
import ZIndex from "metabase/css/core/z-index.module.css";
import { isCypressActive } from "metabase/env";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
import { useSequencedContentCloseHandler } from "metabase/ui/hooks/use-sequenced-content-close-handler";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
import type { SizeToFitOptions } from "./SizeToFitModifier";
import { sizeToFitModifierFn } from "./SizeToFitModifier";
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
index ecd6e7daf6d..8b7f8c0369f 100644
--- a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
@@ -13,7 +13,6 @@ import {
import { useLocale } from "metabase/common/hooks";
import { getColumnGroupIcon } from "metabase/common/utils/column-groups";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { isNotNull } from "metabase/lib/types";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import {
type DefinedClauseName,
@@ -24,6 +23,7 @@ import type { IconName } from "metabase/ui";
import { DelayGroup, Icon } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
import { color } from "metabase/ui/utils/colors";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { ColumnBucketPickerPopover } from "./ColumnBucketPickerPopover";
diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
index 573d0acdbd3..c1e97f59572 100644
--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx
@@ -10,7 +10,6 @@ import type {
TableExportFormat,
} from "metabase/common/types/export";
import CS from "metabase/css/core/index.css";
-import { exportFormatPng, exportFormats } from "metabase/lib/urls";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import {
Box,
@@ -23,6 +22,7 @@ import {
Text,
Title,
} from "metabase/ui";
+import { exportFormatPng, exportFormats } from "metabase/utils/urls";
import { canSavePng } from "metabase/visualizations";
import type Question from "metabase-lib/v1/Question";
import type { Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.ts b/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.ts
index 03c552a8e36..70e5fd2fec9 100644
--- a/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.ts
+++ b/frontend/src/metabase/common/components/QuestionDownloadWidget/use-download-data.ts
@@ -1,11 +1,11 @@
import { useAsyncFn } from "react-use";
import type { AsyncFnReturn } from "react-use/lib/useAsyncFn";
-import { useDispatch } from "metabase/lib/redux";
import {
type DownloadQueryResultsOpts,
downloadQueryResults,
} from "metabase/redux/downloads";
+import { useDispatch } from "metabase/utils/redux";
export type UseDownloadDataParams = Pick<
DownloadQueryResultsOpts,
diff --git a/frontend/src/metabase/common/components/QuestionLoader.tsx b/frontend/src/metabase/common/components/QuestionLoader.tsx
index 4a496a5c11d..110f579a7c6 100644
--- a/frontend/src/metabase/common/components/QuestionLoader.tsx
+++ b/frontend/src/metabase/common/components/QuestionLoader.tsx
@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
import { AdHocQuestionLoader } from "metabase/common/components/AdHocQuestionLoader";
import { SavedQuestionLoader } from "metabase/common/components/SavedQuestionLoader";
import renderPropToHOC from "metabase/hoc/RenderPropToHOC";
-import { serializeCardForUrl } from "metabase/lib/card";
+import { serializeCardForUrl } from "metabase/utils/card";
import type Question from "metabase-lib/v1/Question";
import type { CardId, UnsavedCard } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/QuestionResultLoader.tsx b/frontend/src/metabase/common/components/QuestionResultLoader.tsx
index 8e518cc39cb..1772421e7a0 100644
--- a/frontend/src/metabase/common/components/QuestionResultLoader.tsx
+++ b/frontend/src/metabase/common/components/QuestionResultLoader.tsx
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import { useCallback, useEffect, useRef, useState } from "react";
import { useEffectOnce } from "react-use";
-import type { Deferred } from "metabase/lib/promise";
-import { defer } from "metabase/lib/promise";
import { runQuestionQuery } from "metabase/services";
+import type { Deferred } from "metabase/utils/promise";
+import { defer } from "metabase/utils/promise";
import type Question from "metabase-lib/v1/Question";
import type { Dataset, RawSeries } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
index 93b6174a944..d1e04feb650 100644
--- a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { getFormattedTime } from "metabase/common/components/DateTime/DateTime";
-import { getRelativeTime } from "metabase/lib/time-dayjs";
import type { RevisionOrModerationEvent } from "metabase/plugins";
import { Box, Button, Center, Flex, Icon, Text, Tooltip } from "metabase/ui";
+import { getRelativeTime } from "metabase/utils/time-dayjs";
import type { Revision } from "metabase-types/api";
import S from "./RevisionHistoryTimeline.module.css";
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts b/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts
index fb545b1cbc1..881e677762f 100644
--- a/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackVersionRevertClicked = (
entity: "card" | "dashboard" | "document" | "transform",
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx
index 450e503f9ea..b55ea694a39 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx
@@ -19,9 +19,9 @@ import {
isInstanceAnalyticsCollection,
} from "metabase/collections/utils";
import { FormProvider } from "metabase/forms";
-import { useSelector } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import type { CollectionId, DashboardId } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/schema.ts b/frontend/src/metabase/common/components/SaveQuestionForm/schema.ts
index 074f0def759..e75276437d7 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/schema.ts
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/schema.ts
@@ -1,7 +1,7 @@
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
import { QUESTION_NAME_MAX_LENGTH } from "metabase/questions/constants";
+import * as Errors from "metabase/utils/errors";
export const SAVE_QUESTION_SCHEMA = Yup.object({
saveType: Yup.string().oneOf(["overwrite", "create"]),
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/util.ts b/frontend/src/metabase/common/components/SaveQuestionForm/util.ts
index 104b54a7aff..c20c1b88997 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/util.ts
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/util.ts
@@ -6,7 +6,7 @@ import {
canonicalCollectionIdOrEntityId,
} from "metabase/collections/utils";
import { trackMetricCreated } from "metabase/data-studio/analytics";
-import { isNullOrUndefined } from "metabase/lib/types";
+import { isNullOrUndefined } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import type { CardType } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/SavedQuestionLoader.tsx b/frontend/src/metabase/common/components/SavedQuestionLoader.tsx
index 4f62718ceb3..ae7d1eb23f2 100644
--- a/frontend/src/metabase/common/components/SavedQuestionLoader.tsx
+++ b/frontend/src/metabase/common/components/SavedQuestionLoader.tsx
@@ -2,9 +2,9 @@ import type { ReactNode } from "react";
import { useEffect, useMemo } from "react";
import { skipToken, useGetCardQuery } from "metabase/api";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { loadMetadataForCard } from "metabase/questions/actions";
import { getMetadata } from "metabase/selectors/metadata";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import Question from "metabase-lib/v1/Question";
import type { CardId } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx
index f6223b5dd16..f33b2e9d42c 100644
--- a/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx
+++ b/frontend/src/metabase/common/components/Schedule/AutoWidthSelect.tsx
@@ -1,9 +1,9 @@
import { useMemo } from "react";
-import { useSelector } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
import type { SelectProps } from "metabase/ui";
import { Select } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import { getLongestSelectLabel, measureTextWidthSafely } from "./utils";
diff --git a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx
index f77e2c0e4ec..8d5a6df4696 100644
--- a/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx
+++ b/frontend/src/metabase/common/components/Schedule/Schedule.stories.tsx
@@ -8,9 +8,9 @@ import { getStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { Api } from "metabase/api";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { LocaleProvider } from "metabase/public/LocaleProvider";
import { publicReducers } from "metabase/reducers-public";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import type { ScheduleSettings } from "metabase-types/api";
import type { State } from "metabase-types/store";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/common/components/Schedule/Schedule.tsx b/frontend/src/metabase/common/components/Schedule/Schedule.tsx
index dad4c1027d3..e94926652a3 100644
--- a/frontend/src/metabase/common/components/Schedule/Schedule.tsx
+++ b/frontend/src/metabase/common/components/Schedule/Schedule.tsx
@@ -5,9 +5,9 @@ import { c, msgid, ngettext } from "ttag";
import _ from "underscore";
import { CronExpressionInput } from "metabase/common/components/CronExpressioInput";
-import { formatCronExpressionForUI } from "metabase/lib/cron";
-import { removeNullAndUndefinedValues } from "metabase/lib/types";
import { Box, Flex, type FlexProps } from "metabase/ui";
+import { formatCronExpressionForUI } from "metabase/utils/cron";
+import { removeNullAndUndefinedValues } from "metabase/utils/types";
import type { ScheduleSettings, ScheduleType } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/common/components/Schedule/components.tsx b/frontend/src/metabase/common/components/Schedule/components.tsx
index a56c848f64e..10a66f6f53a 100644
--- a/frontend/src/metabase/common/components/Schedule/components.tsx
+++ b/frontend/src/metabase/common/components/Schedule/components.tsx
@@ -1,11 +1,11 @@
import { useMemo } from "react";
import { t } from "ttag";
-import { capitalize } from "metabase/lib/formatting/strings";
-import { useSelector } from "metabase/lib/redux";
-import { has24HourModeSetting } from "metabase/lib/time-dayjs";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Box, Group, SegmentedControl, Tooltip } from "metabase/ui";
+import { capitalize } from "metabase/utils/formatting/strings";
+import { useSelector } from "metabase/utils/redux";
+import { has24HourModeSetting } from "metabase/utils/time-dayjs";
import type {
ScheduleDayType,
ScheduleFrameType,
diff --git a/frontend/src/metabase/common/components/Schedule/strings.ts b/frontend/src/metabase/common/components/Schedule/strings.ts
index b78d94ae116..5196632f076 100644
--- a/frontend/src/metabase/common/components/Schedule/strings.ts
+++ b/frontend/src/metabase/common/components/Schedule/strings.ts
@@ -1,7 +1,7 @@
import { c, msgid, ngettext, t } from "ttag";
import _ from "underscore";
-import { has24HourModeSetting } from "metabase/lib/time-dayjs";
+import { has24HourModeSetting } from "metabase/utils/time-dayjs";
import type { ScheduleDayType, ScheduleFrameType } from "metabase-types/api";
function intToOption(n: number) {
diff --git a/frontend/src/metabase/common/components/Schedule/strings.unit.spec.ts b/frontend/src/metabase/common/components/Schedule/strings.unit.spec.ts
index 87061e16a5a..307b236c863 100644
--- a/frontend/src/metabase/common/components/Schedule/strings.unit.spec.ts
+++ b/frontend/src/metabase/common/components/Schedule/strings.unit.spec.ts
@@ -1,8 +1,8 @@
-import { has24HourModeSetting } from "metabase/lib/time-dayjs";
+import { has24HourModeSetting } from "metabase/utils/time-dayjs";
import { getHours } from "./strings";
-jest.mock("metabase/lib/time-dayjs", () => ({
+jest.mock("metabase/utils/time-dayjs", () => ({
has24HourModeSetting: jest.fn(),
}));
diff --git a/frontend/src/metabase/common/components/Schedule/utils.tsx b/frontend/src/metabase/common/components/Schedule/utils.tsx
index 31ca164d48c..db3c66fbeac 100644
--- a/frontend/src/metabase/common/components/Schedule/utils.tsx
+++ b/frontend/src/metabase/common/components/Schedule/utils.tsx
@@ -2,8 +2,8 @@ import type { ReactNode } from "react";
import { match } from "ts-pattern";
import _ from "underscore";
-import { measureTextWidth } from "metabase/lib/measure-text";
import type { SelectProps } from "metabase/ui";
+import { measureTextWidth } from "metabase/utils/measure-text";
import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import type { ScheduleSettings } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsx b/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsx
index 746b1276609..093631f35af 100644
--- a/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsx
+++ b/frontend/src/metabase/common/components/SchedulePicker/DynamicWidthSelect.tsx
@@ -1,9 +1,9 @@
import { useMemo } from "react";
-import { useSelector } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
import type { SelectProps } from "metabase/ui";
import { Select } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import {
getLongestSelectLabel,
diff --git a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx
index dfa9e4d550f..87c207ea6df 100644
--- a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx
+++ b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx
@@ -3,15 +3,6 @@ import { type CSSProperties, Component } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import {
- AM_PM_OPTIONS,
- HOUR_OPTIONS,
- MINUTE_OPTIONS,
- MONTH_DAY_OPTIONS,
- getDayOfWeekOptions,
-} from "metabase/lib/date-time";
-import { capitalize } from "metabase/lib/formatting/strings";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import {
Box,
@@ -19,6 +10,15 @@ import {
SegmentedControl,
type SelectOption,
} from "metabase/ui";
+import {
+ AM_PM_OPTIONS,
+ HOUR_OPTIONS,
+ MINUTE_OPTIONS,
+ MONTH_DAY_OPTIONS,
+ getDayOfWeekOptions,
+} from "metabase/utils/date-time";
+import { capitalize } from "metabase/utils/formatting/strings";
+import { useSelector } from "metabase/utils/redux";
import type {
ScheduleDayType,
ScheduleFrameType,
diff --git a/frontend/src/metabase/common/components/SendTestPulse/SendTestPulse.tsx b/frontend/src/metabase/common/components/SendTestPulse/SendTestPulse.tsx
index 6fb318a5bd5..4817699b7ed 100644
--- a/frontend/src/metabase/common/components/SendTestPulse/SendTestPulse.tsx
+++ b/frontend/src/metabase/common/components/SendTestPulse/SendTestPulse.tsx
@@ -2,7 +2,7 @@ import { useCallback } from "react";
import { t } from "ttag";
import { ActionButton } from "metabase/common/components/ActionButton";
-import { cleanPulse } from "metabase/lib/pulse";
+import { cleanPulse } from "metabase/utils/pulse";
import type { Channel, ChannelSpecs } from "metabase-types/api";
import type { DashboardSubscriptionData } from "metabase-types/store";
diff --git a/frontend/src/metabase/common/components/Sortable/SortableList.tsx b/frontend/src/metabase/common/components/Sortable/SortableList.tsx
index 8a568546bc1..ce4992cb0bc 100644
--- a/frontend/src/metabase/common/components/Sortable/SortableList.tsx
+++ b/frontend/src/metabase/common/components/Sortable/SortableList.tsx
@@ -12,7 +12,7 @@ import _ from "underscore";
import GrabberS from "metabase/css/components/grabber.module.css";
import { getPortalRootElement } from "metabase/css/core/overlays/utils";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
export type SortableDivider = {
afterIndex: number;
diff --git a/frontend/src/metabase/common/components/TokenField/TokenField.tsx b/frontend/src/metabase/common/components/TokenField/TokenField.tsx
index 7241d2187bf..51fece32995 100644
--- a/frontend/src/metabase/common/components/TokenField/TokenField.tsx
+++ b/frontend/src/metabase/common/components/TokenField/TokenField.tsx
@@ -5,7 +5,8 @@ import _ from "underscore";
import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";
import FormS from "metabase/css/components/form.module.css";
import CS from "metabase/css/core/index.css";
-import { isObscured } from "metabase/lib/dom";
+import { Icon } from "metabase/ui";
+import { isObscured } from "metabase/utils/dom";
import {
KEYCODE_BACKSPACE,
KEYCODE_DOWN,
@@ -16,8 +17,7 @@ import {
KEY_BACKSPACE,
KEY_COMMA,
KEY_ENTER,
-} from "metabase/lib/keyboard";
-import { Icon } from "metabase/ui";
+} from "metabase/utils/keyboard";
import { TokenFieldAddon, TokenFieldItem } from "../TokenFieldItem";
diff --git a/frontend/src/metabase/common/components/TokenField/TokenField.unit.spec.js b/frontend/src/metabase/common/components/TokenField/TokenField.unit.spec.js
index 63e8acbb983..c316f492a6d 100644
--- a/frontend/src/metabase/common/components/TokenField/TokenField.unit.spec.js
+++ b/frontend/src/metabase/common/components/TokenField/TokenField.unit.spec.js
@@ -4,7 +4,7 @@ import userEvent from "@testing-library/user-event";
import { Component } from "react";
import { act, fireEvent, render, screen, within } from "__support__/ui";
-import { KEYCODE_ENTER } from "metabase/lib/keyboard";
+import { KEYCODE_ENTER } from "metabase/utils/keyboard";
import { TokenField } from "./TokenField";
diff --git a/frontend/src/metabase/common/components/Tooltip/Tooltip.tsx b/frontend/src/metabase/common/components/Tooltip/Tooltip.tsx
index f77114ddc18..20d4200e039 100644
--- a/frontend/src/metabase/common/components/Tooltip/Tooltip.tsx
+++ b/frontend/src/metabase/common/components/Tooltip/Tooltip.tsx
@@ -5,7 +5,7 @@ import * as ReactIs from "react-is";
import ZIndex from "metabase/css/core/z-index.module.css";
import { EMBEDDING_SDK_PORTAL_ROOT_ELEMENT_ID } from "metabase/embedding-sdk/config";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
import { isReactDOMTypeElement } from "metabase-types/guards";
const TippyComponent = Tippy.default;
diff --git a/frontend/src/metabase/common/components/UndoListing.tsx b/frontend/src/metabase/common/components/UndoListing.tsx
index 57e7c84d9ac..195657d251c 100644
--- a/frontend/src/metabase/common/components/UndoListing.tsx
+++ b/frontend/src/metabase/common/components/UndoListing.tsx
@@ -15,8 +15,6 @@ import {
import { t } from "ttag";
import ZIndex from "metabase/css/core/z-index.module.css";
-import { capitalize, inflect } from "metabase/lib/formatting";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
dismissUndo,
pauseUndo,
@@ -24,6 +22,8 @@ import {
resumeUndo,
} from "metabase/redux/undo";
import { Ellipsified, Portal, Progress } from "metabase/ui";
+import { capitalize, inflect } from "metabase/utils/formatting";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Undo } from "metabase-types/store/undo";
import CS from "./UndoListing.module.css";
diff --git a/frontend/src/metabase/common/components/Unsubscribe.tsx b/frontend/src/metabase/common/components/Unsubscribe.tsx
index 4740764d5f3..abfdafc58db 100644
--- a/frontend/src/metabase/common/components/Unsubscribe.tsx
+++ b/frontend/src/metabase/common/components/Unsubscribe.tsx
@@ -9,13 +9,13 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";
import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { LogoIcon } from "metabase/common/components/LogoIcon";
-import { useSelector } from "metabase/lib/redux";
import { getLoginPageIllustration } from "metabase/selectors/whitelabel";
import {
NotificationUnsubscribeApi,
PulseUnsubscribeApi,
} from "metabase/services";
import { Center, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import {
CheckmarkIcon,
diff --git a/frontend/src/metabase/common/components/UserCollectionList.tsx b/frontend/src/metabase/common/components/UserCollectionList.tsx
index 6316fc18842..28299641987 100644
--- a/frontend/src/metabase/common/components/UserCollectionList.tsx
+++ b/frontend/src/metabase/common/components/UserCollectionList.tsx
@@ -4,8 +4,8 @@ import {
PERSONAL_COLLECTIONS,
ROOT_COLLECTION,
} from "metabase/entities/collections/constants";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
export const UserCollectionList = () => {
const { data, isLoading } = useListUsersQuery({});
diff --git a/frontend/src/metabase/common/components/errors/NoDataError.tsx b/frontend/src/metabase/common/components/errors/NoDataError.tsx
index 13f4a0c8cdd..eaf36f00ee5 100644
--- a/frontend/src/metabase/common/components/errors/NoDataError.tsx
+++ b/frontend/src/metabase/common/components/errors/NoDataError.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { getNoDataIllustration } from "metabase/selectors/whitelabel";
import type { ImageProps } from "metabase/ui";
import { Image } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function NoDataError(props: ImageProps) {
const noDataIllustration = useSelector(getNoDataIllustration);
diff --git a/frontend/src/metabase/common/components/errors/NoObjectError.tsx b/frontend/src/metabase/common/components/errors/NoObjectError.tsx
index a0b77ec851e..e0f4fd94ab6 100644
--- a/frontend/src/metabase/common/components/errors/NoObjectError.tsx
+++ b/frontend/src/metabase/common/components/errors/NoObjectError.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { getNoObjectIllustration } from "metabase/selectors/whitelabel";
import type { ImageProps } from "metabase/ui";
import { Image } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function NoObjectError(props: ImageProps) {
const noObjectIllustration = useSelector(getNoObjectIllustration);
diff --git a/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx b/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx
index c04ab0b2031..23f2206753e 100644
--- a/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx
+++ b/frontend/src/metabase/common/components/upsells/UpsellUsageAnalytics.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getDocsUrl } from "metabase/selectors/settings";
import { Box, type BoxProps, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { UpsellCard, type UpsellCardProps } from "./UpsellCard";
import { UPGRADE_URL } from "./constants";
diff --git a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx
index 155ac74530a..97ea9b4bf68 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpgradeModal/use-upgrade-action.tsx
@@ -1,8 +1,8 @@
import { useCallback } from "react";
import { useSetting } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
import { setOpenModal } from "metabase/redux/ui";
+import { useDispatch } from "metabase/utils/redux";
import { DATA_STUDIO_UPGRADE_URL, UPGRADE_URL } from "../../constants";
import { useUpsellLink } from "../use-upsell-link";
diff --git a/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx b/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx
index d1527935efe..fc80473e83f 100644
--- a/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx
+++ b/frontend/src/metabase/common/components/upsells/components/UpsellWrapper.tsx
@@ -1,5 +1,5 @@
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
/**
* we should wrap all upsell components in this HoC to ensure that they are only rendered for admins
diff --git a/frontend/src/metabase/common/components/upsells/components/analytics.ts b/frontend/src/metabase/common/components/upsells/components/analytics.ts
index 30a6a21d583..67cd969edd1 100644
--- a/frontend/src/metabase/common/components/upsells/components/analytics.ts
+++ b/frontend/src/metabase/common/components/upsells/components/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
type UpsellEventProps = {
location: string;
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.ts
index 358939cfd5b..f51230b9344 100644
--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.ts
+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.ts
@@ -1,7 +1,7 @@
import type { Action } from "@reduxjs/toolkit";
import { useDeepCompareEffect, usePrevious } from "react-use";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
export interface EntityFetchOptions {
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx
index 732e62065cb..8dd9beb48de 100644
--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx
+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx
@@ -15,8 +15,8 @@ import {
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { Databases } from "metabase/entities/databases";
import { Tables } from "metabase/entities/tables";
-import { delay } from "metabase/lib/promise";
-import { useDispatch } from "metabase/lib/redux";
+import { delay } from "metabase/utils/promise";
+import { useDispatch } from "metabase/utils/redux";
import type Database from "metabase-lib/v1/metadata/Database";
import type Table from "metabase-lib/v1/metadata/Table";
import type { TableListQuery } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.ts
index a7b1e894184..03c2aec5141 100644
--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.ts
+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.ts
@@ -1,7 +1,7 @@
import type { Action } from "@reduxjs/toolkit";
import { useDeepCompareEffect } from "react-use";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
export interface EntityQuery<TId> {
diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.unit.spec.tsx
index 0065aa6df67..d3f4d6e9f81 100644
--- a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.unit.spec.tsx
+++ b/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
within,
} from "__support__/ui";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import {
createMockCollection,
createMockCollectionItem,
diff --git a/frontend/src/metabase/common/hooks/is-route-in-sync.ts b/frontend/src/metabase/common/hooks/is-route-in-sync.ts
index 3a82ed10857..f87d21ea3e6 100644
--- a/frontend/src/metabase/common/hooks/is-route-in-sync.ts
+++ b/frontend/src/metabase/common/hooks/is-route-in-sync.ts
@@ -1,4 +1,5 @@
-import { getPathnameWithoutSubPath, isWithinIframe } from "metabase/lib/dom";
+import { getPathnameWithoutSubPath } from "metabase/utils/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
/**
* Returns whether the current route is in sync with the given pathname,
diff --git a/frontend/src/metabase/common/hooks/is-route-in-sync.unit.spec.ts b/frontend/src/metabase/common/hooks/is-route-in-sync.unit.spec.ts
index 14636ac5949..5a35dc884f4 100644
--- a/frontend/src/metabase/common/hooks/is-route-in-sync.unit.spec.ts
+++ b/frontend/src/metabase/common/hooks/is-route-in-sync.unit.spec.ts
@@ -1,4 +1,4 @@
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import { isRouteInSync } from "./is-route-in-sync";
diff --git a/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsx b/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsx
index 655a27a779b..b195b6f2ba2 100644
--- a/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsx
+++ b/frontend/src/metabase/common/hooks/use-close-navbar-on-mount.tsx
@@ -1,7 +1,7 @@
import { useMount } from "react-use";
-import { useDispatch } from "metabase/lib/redux";
import { closeNavbar } from "metabase/redux/app";
+import { useDispatch } from "metabase/utils/redux";
export function useCloseNavbarOnMount() {
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts b/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts
index 6c54597305e..ff4e356332a 100644
--- a/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts
+++ b/frontend/src/metabase/common/hooks/use-confirm-route-leave-modal.ts
@@ -4,7 +4,7 @@ import type { InjectedRouter, Route } from "react-router";
import { goBack, push, replace } from "react-router-redux";
import { match } from "ts-pattern";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import { useBeforeUnload } from "./use-before-unload";
diff --git a/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.ts b/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.ts
index 2750d47d47b..61b199e7018 100644
--- a/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.ts
+++ b/frontend/src/metabase/common/hooks/use-docs-url/use-docs-url.ts
@@ -1,10 +1,10 @@
-import { useSelector } from "metabase/lib/redux";
import {
type UtmProps,
getDocsUrl,
getLearnUrl,
} from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
type DocsUtmProps = Omit<UtmProps, "utm_medium"> & {
utm_medium?: UtmProps["utm_medium"];
diff --git a/frontend/src/metabase/common/hooks/use-get-personal-collection.ts b/frontend/src/metabase/common/hooks/use-get-personal-collection.ts
index ae0af399957..1b4f432765e 100644
--- a/frontend/src/metabase/common/hooks/use-get-personal-collection.ts
+++ b/frontend/src/metabase/common/hooks/use-get-personal-collection.ts
@@ -1,6 +1,6 @@
import { skipToken, useGetCollectionQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
/**
* gets the personal collection for the current user
diff --git a/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.ts b/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.ts
index 1846ccf1313..d67399a9699 100644
--- a/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.ts
+++ b/frontend/src/metabase/common/hooks/use-get-personal-collection/use-get-personal-collection.ts
@@ -1,6 +1,6 @@
import { skipToken, useGetCollectionQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
/**
* Hook that fetches the personal collection for the currently logged-in user.
diff --git a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts
index 004d1645395..f0366644c4b 100644
--- a/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts
+++ b/frontend/src/metabase/common/hooks/use-has-token-feature/use-has-token-feature.ts
@@ -1,5 +1,5 @@
-import { useSelector } from "metabase/lib/redux";
import { getTokenFeature } from "metabase/setup/selectors";
+import { useSelector } from "metabase/utils/redux";
import type { TokenFeature } from "metabase-types/api";
export const useHasTokenFeature = (settingName: TokenFeature) => {
diff --git a/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx b/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx
index 07653ded175..802854ca9bd 100644
--- a/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx
+++ b/frontend/src/metabase/common/hooks/use-homepage-dashboard.tsx
@@ -1,7 +1,7 @@
import { skipToken, useGetDashboardQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getCustomHomePageDashboardId } from "metabase/selectors/app";
import { getSettingsLoading } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export const useHomepageDashboard = () => {
const dashboardId = useSelector(getCustomHomePageDashboardId);
diff --git a/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts b/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts
index d5cadc76700..ec9e7c09401 100644
--- a/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts
+++ b/frontend/src/metabase/common/hooks/use-instance-locale/use-instance-locale.ts
@@ -1,5 +1,5 @@
-import { useSelector } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export const useInstanceLocale = () => {
return useSelector((state) => getSetting(state, "site-locale"));
diff --git a/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts b/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts
index 5c4e00ac223..37dac915187 100644
--- a/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts
+++ b/frontend/src/metabase/common/hooks/use-is-at-homepage-dashboard.ts
@@ -1,7 +1,7 @@
import { useLocation } from "react-use";
-import { useSelector } from "metabase/lib/redux";
import { getCustomHomePageDashboardId } from "metabase/selectors/app";
+import { useSelector } from "metabase/utils/redux";
import { useSetting } from "./use-setting";
diff --git a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts b/frontend/src/metabase/common/hooks/use-locale/use-locale.ts
index 16d10abd2d1..8483c85bd6e 100644
--- a/frontend/src/metabase/common/hooks/use-locale/use-locale.ts
+++ b/frontend/src/metabase/common/hooks/use-locale/use-locale.ts
@@ -1,9 +1,9 @@
import { useContext } from "react";
import { useInstanceLocale } from "metabase/common/hooks/use-instance-locale";
-import { useSelector } from "metabase/lib/redux";
import { FrontendLocaleContext } from "metabase/public/LocaleProvider";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
/** Get the user's locale or, if that has not been set, the instance locale
*
diff --git a/frontend/src/metabase/common/hooks/use-number-formatter.ts b/frontend/src/metabase/common/hooks/use-number-formatter.ts
index 63beb265911..aa87c76f93b 100644
--- a/frontend/src/metabase/common/hooks/use-number-formatter.ts
+++ b/frontend/src/metabase/common/hooks/use-number-formatter.ts
@@ -4,7 +4,7 @@ import { useSetting } from "metabase/common/hooks";
import {
type FormatNumberOptions,
formatNumber,
-} from "metabase/lib/formatting/numbers";
+} from "metabase/utils/formatting/numbers";
export type UseFormatNumberOptions = FormatNumberOptions & {
ignoreInstanceSettings?: boolean;
diff --git a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts b/frontend/src/metabase/common/hooks/use-setting/use-setting.ts
index 9480f690424..e43f8f5ae23 100644
--- a/frontend/src/metabase/common/hooks/use-setting/use-setting.ts
+++ b/frontend/src/metabase/common/hooks/use-setting/use-setting.ts
@@ -1,9 +1,9 @@
import { useCallback, useMemo } from "react";
import _ from "underscore";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { updateUserSetting } from "metabase/redux/settings";
import { getSetting } from "metabase/selectors/settings";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { EnterpriseSettingKey, UserSettings } from "metabase-types/api";
export const useSetting = <SettingName extends EnterpriseSettingKey>(
diff --git a/frontend/src/metabase/common/hooks/use-show-other-users-collections.ts b/frontend/src/metabase/common/hooks/use-show-other-users-collections.ts
index 8adb4d3a52d..7a1a6f69e78 100644
--- a/frontend/src/metabase/common/hooks/use-show-other-users-collections.ts
+++ b/frontend/src/metabase/common/hooks/use-show-other-users-collections.ts
@@ -1,5 +1,5 @@
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import { useSetting } from "./use-setting";
diff --git a/frontend/src/metabase/common/hooks/use-snapshot-selector.ts b/frontend/src/metabase/common/hooks/use-snapshot-selector.ts
index d818a70ca2d..cfe557ce935 100644
--- a/frontend/src/metabase/common/hooks/use-snapshot-selector.ts
+++ b/frontend/src/metabase/common/hooks/use-snapshot-selector.ts
@@ -1,6 +1,6 @@
import { type DependencyList, useEffect, useRef } from "react";
-import { useStore } from "metabase/lib/redux";
+import { useStore } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
/**
diff --git a/frontend/src/metabase/common/hooks/use-store-url/use-store-url.ts b/frontend/src/metabase/common/hooks/use-store-url/use-store-url.ts
index 3f3f6bf2941..2765fd9fac9 100644
--- a/frontend/src/metabase/common/hooks/use-store-url/use-store-url.ts
+++ b/frontend/src/metabase/common/hooks/use-store-url/use-store-url.ts
@@ -1,5 +1,5 @@
-import { useSelector } from "metabase/lib/redux";
import { type StorePaths, getStoreUrl } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export function useStoreUrl(storePath: StorePaths = "") {
return useSelector((state) => getStoreUrl(state, storePath));
diff --git a/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.ts b/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.ts
index cda0045e876..c28838bfeb5 100644
--- a/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.ts
+++ b/frontend/src/metabase/common/hooks/use-temp-storage/use-temp-storage.ts
@@ -1,7 +1,7 @@
import { useCallback } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { setTempSetting } from "metabase/redux/app";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type {
State,
TempStorageKey,
diff --git a/frontend/src/metabase/common/hooks/use-toast/use-toast.ts b/frontend/src/metabase/common/hooks/use-toast/use-toast.ts
index e03c717cf1f..66b160a9691 100644
--- a/frontend/src/metabase/common/hooks/use-toast/use-toast.ts
+++ b/frontend/src/metabase/common/hooks/use-toast/use-toast.ts
@@ -1,7 +1,7 @@
import { useCallback } from "react";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo, dismissUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
import type { Undo } from "metabase-types/store/undo";
export type ToastArgs = Omit<Undo, "id" | "timeoutId">;
diff --git a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts
index 300d80a54ae..3e70c77c9b1 100644
--- a/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts
+++ b/frontend/src/metabase/common/hooks/use-url-state/use-url-state.ts
@@ -4,7 +4,7 @@ import { push, replace } from "react-router-redux";
import { useEffectOnce, useLatest } from "react-use";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
type BaseState = Record<string, unknown>;
diff --git a/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.ts b/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.ts
index 20661544e53..25144f14f0c 100644
--- a/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.ts
+++ b/frontend/src/metabase/common/hooks/use-url-with-utm/use-url-with-utm.ts
@@ -1,5 +1,5 @@
-import { useSelector } from "metabase/lib/redux";
import { type UtmProps, getUrlWithUtm } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export function useUrlWithUtm(url: string, utm: UtmProps): string;
export function useUrlWithUtm(url: undefined, utm: UtmProps): undefined;
diff --git a/frontend/src/metabase/common/hooks/use-user-key-value.ts b/frontend/src/metabase/common/hooks/use-user-key-value.ts
index f3f477c1157..9780b10cd70 100644
--- a/frontend/src/metabase/common/hooks/use-user-key-value.ts
+++ b/frontend/src/metabase/common/hooks/use-user-key-value.ts
@@ -6,8 +6,8 @@ import {
useGetUserKeyValueQuery,
useUpdateKeyValueMutation,
} from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import type { UserKeyValue } from "metabase-types/api";
export interface UseUserKeyValueParams<T extends UserKeyValue> {
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.tsx
index e39d90352f4..6220f89fc0c 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
@@ -7,9 +7,9 @@ import {
setupUpdateUserKeyValueEndpoint,
} from "__support__/server-mocks/user-key-value";
import { waitFor } from "__support__/ui";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { mainReducers as reducers } from "metabase/reducers-main";
import { getStore } from "metabase/store";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import type { UserKeyValue } from "metabase-types/api";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/common/utils/collections.ts b/frontend/src/metabase/common/utils/collections.ts
index a8f8cf22e1f..79c99cad771 100644
--- a/frontend/src/metabase/common/utils/collections.ts
+++ b/frontend/src/metabase/common/utils/collections.ts
@@ -1,3 +1,7 @@
+import { t } from "ttag";
+
+import type { Crumb } from "metabase/common/components/Breadcrumbs";
+import { isNotNull } from "metabase/utils/types";
import type { Collection, CollectionId } from "metabase-types/api";
export const findCollectionById = (
@@ -19,3 +23,34 @@ export const findCollectionById = (
collectionId,
);
};
+
+export const getCollectionBreadCrumbs = (
+ collection: Collection | undefined,
+ collectionsById: Partial<Record<CollectionId, Collection>>,
+ callback: (id: CollectionId) => void,
+): Crumb[] => {
+ if (collection?.path) {
+ return [
+ ...collection.path
+ .map((id) => collectionsById[id])
+ .filter(isNotNull)
+ .map(
+ (collection): Crumb => [
+ collection.name,
+ () => callback(collection.id),
+ ],
+ ),
+ [collection.name],
+ ];
+ }
+
+ const rootCollection = collectionsById.root;
+ if (!rootCollection) {
+ return [[t`Unknown`]];
+ }
+
+ return [
+ [rootCollection.name, () => callback(rootCollection.id)],
+ [t`Unknown`],
+ ];
+};
diff --git a/frontend/src/metabase/common/utils/collections.unit.spec.ts b/frontend/src/metabase/common/utils/collections.unit.spec.ts
index 00032da7551..019e7cdb3be 100644
--- a/frontend/src/metabase/common/utils/collections.unit.spec.ts
+++ b/frontend/src/metabase/common/utils/collections.unit.spec.ts
@@ -1,7 +1,8 @@
+import type { Crumb } from "metabase/common/components/Breadcrumbs";
import type { Collection } from "metabase-types/api";
import { createMockCollection } from "metabase-types/api/mocks";
-import { findCollectionById } from "./collections";
+import { findCollectionById, getCollectionBreadCrumbs } from "./collections";
describe("findCollectionById", () => {
it("should return null when collections array is empty or undefined", () => {
@@ -55,3 +56,56 @@ describe("findCollectionById", () => {
expect(result).toEqual(deeplyNestedCollection);
});
});
+
+const getCrumbAction = (crumb: Crumb) => {
+ if (
+ !Array.isArray(crumb) ||
+ crumb.length < 2 ||
+ typeof crumb[1] !== "function"
+ ) {
+ throw new Error("Expected crumb callback action");
+ }
+
+ return crumb[1];
+};
+
+const collectionsById = {
+ root: createMockCollection({ id: "root", name: "Our analytics", path: [] }),
+ 1: createMockCollection({ id: 1, name: "parent", path: ["root"] }),
+ 2: createMockCollection({ id: 2, name: "child", path: ["root", 1] }),
+};
+
+describe("getCollectionBreadCrumbs", () => {
+ it("returns path starting from root", () => {
+ const crumbs = getCollectionBreadCrumbs(
+ collectionsById[2],
+ collectionsById,
+ jest.fn(),
+ );
+
+ expect(crumbs).toMatchObject([
+ ["Our analytics", expect.any(Function)],
+ ["parent", expect.any(Function)],
+ ["child"],
+ ]);
+ });
+
+ it("makes collection step functions calling the callback with the collection id", () => {
+ const callbackMock = jest.fn();
+ const crumbs = getCollectionBreadCrumbs(
+ collectionsById[2],
+ collectionsById,
+ callbackMock,
+ );
+
+ const rootCallback = getCrumbAction(crumbs[0]);
+ // Workaround to simulate actual event object passed by React, impossible to construct.
+ rootCallback(undefined as never);
+ expect(callbackMock).toHaveBeenCalledWith("root");
+
+ const parentCallback = getCrumbAction(crumbs[1]);
+ // Workaround to simulate actual event object passed by React, impossible to construct.
+ parentCallback(undefined as never);
+ expect(callbackMock).toHaveBeenCalledWith(1);
+ });
+});
diff --git a/frontend/src/metabase/common/utils/column-groups.unit.spec.ts b/frontend/src/metabase/common/utils/column-groups.unit.spec.ts
index 4619b2cefb6..177d9fb9627 100644
--- a/frontend/src/metabase/common/utils/column-groups.unit.spec.ts
+++ b/frontend/src/metabase/common/utils/column-groups.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { SAMPLE_METADATA } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/lib/downloads.ts b/frontend/src/metabase/common/utils/dataset.ts
similarity index 100%
rename from frontend/src/metabase/lib/downloads.ts
rename to frontend/src/metabase/common/utils/dataset.ts
diff --git a/frontend/src/metabase/lib/core.ts b/frontend/src/metabase/common/utils/fields.ts
similarity index 95%
rename from frontend/src/metabase/lib/core.ts
rename to frontend/src/metabase/common/utils/fields.ts
index bf918811510..8a6f8de9913 100644
--- a/frontend/src/metabase/lib/core.ts
+++ b/frontend/src/metabase/common/utils/fields.ts
@@ -627,3 +627,22 @@ export const FIELD_VISIBILITY_TYPES = [
},
},
];
+
+export function getSemanticTypeIcon(
+ semanticType: string | null | undefined,
+ fallback?: IconName,
+): IconName | undefined {
+ if (!semanticType) {
+ return fallback;
+ }
+ const semanticTypeMetadata = FIELD_SEMANTIC_TYPES_MAP[semanticType];
+ return semanticTypeMetadata?.icon ?? fallback;
+}
+
+export function getSemanticTypeName(semanticType: string | null | undefined) {
+ if (!semanticType) {
+ return undefined;
+ }
+ const semanticTypeMetadata = FIELD_SEMANTIC_TYPES_MAP[semanticType];
+ return semanticTypeMetadata?.name;
+}
diff --git a/frontend/test/metabase/lib/schema_metadata.unit.spec.ts b/frontend/src/metabase/common/utils/fields.unit.spec.ts
similarity index 66%
rename from frontend/test/metabase/lib/schema_metadata.unit.spec.ts
rename to frontend/src/metabase/common/utils/fields.unit.spec.ts
index fb6b4261f64..7a69555dac2 100644
--- a/frontend/test/metabase/lib/schema_metadata.unit.spec.ts
+++ b/frontend/src/metabase/common/utils/fields.unit.spec.ts
@@ -1,25 +1,8 @@
-import {
- foreignKeyCountsByOriginTable,
- getSemanticTypeIcon,
- getSemanticTypeName,
-} from "metabase/lib/schema_metadata";
-import type ForeignKey from "metabase-lib/v1/metadata/ForeignKey";
import { TYPE } from "metabase-lib/v1/types/constants";
-describe("schema_metadata", () => {
- describe("foreignKeyCountsByOriginTable", () => {
- it("should count occurrences by origin.table.id", () => {
- expect(
- foreignKeyCountsByOriginTable([
- { origin: { table: { id: 123 } } },
- { origin: { table: { id: 123 } } },
- { origin: { table: { id: 123 } } },
- { origin: { table: { id: 456 } } },
- ] as ForeignKey[]),
- ).toEqual({ 123: 3, 456: 1 });
- });
- });
+import { getSemanticTypeIcon, getSemanticTypeName } from "./fields";
+describe("fields", () => {
describe("getSemanticTypeIcon", () => {
it("should return an icon associated with the given semantic type", () => {
expect(getSemanticTypeIcon(TYPE.PK)).toEqual("label");
diff --git a/frontend/src/metabase/lib/timelines.ts b/frontend/src/metabase/common/utils/timelines.ts
similarity index 100%
rename from frontend/src/metabase/lib/timelines.ts
rename to frontend/src/metabase/common/utils/timelines.ts
diff --git a/frontend/src/metabase/common/utils/user.ts b/frontend/src/metabase/common/utils/user.ts
index 2ebd6cb511a..f810d6b64d9 100644
--- a/frontend/src/metabase/common/utils/user.ts
+++ b/frontend/src/metabase/common/utils/user.ts
@@ -1,4 +1,4 @@
-import { isEmail } from "metabase/lib/email";
+import { isEmail } from "metabase/utils/email";
import type { BaseUser, Group } from "metabase-types/api";
export type PartialUser = Partial<
diff --git a/frontend/src/metabase/dashboard/actions/actions.ts b/frontend/src/metabase/dashboard/actions/actions.ts
index bf6222eb0df..8c185aa9823 100644
--- a/frontend/src/metabase/dashboard/actions/actions.ts
+++ b/frontend/src/metabase/dashboard/actions/actions.ts
@@ -3,9 +3,9 @@ import {
getActionExecutionMessage,
} from "metabase/actions/utils";
import { SIDEBAR_NAME } from "metabase/dashboard/constants";
-import { getDashboardType } from "metabase/lib/dashboard";
import { addUndo } from "metabase/redux/undo";
import { ActionsApi, PublicApi } from "metabase/services";
+import { getDashboardType } from "metabase/utils/dashboard";
import type {
ActionDashboardCard,
ActionFormSubmitResult,
diff --git a/frontend/src/metabase/dashboard/actions/auto-wire-parameters/actions.ts b/frontend/src/metabase/dashboard/actions/auto-wire-parameters/actions.ts
index 59b219f7964..eb4de982c6b 100644
--- a/frontend/src/metabase/dashboard/actions/auto-wire-parameters/actions.ts
+++ b/frontend/src/metabase/dashboard/actions/auto-wire-parameters/actions.ts
@@ -20,11 +20,11 @@ import {
getTabs,
} from "metabase/dashboard/selectors";
import { findDashCardForInlineParameter } from "metabase/dashboard/utils";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
import {
getMappingOptionByTarget,
getParameterMappingOptions,
} from "metabase/parameters/utils/mapping-options";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
import type {
DashCardId,
DashboardParameterMapping,
diff --git a/frontend/src/metabase/dashboard/actions/auto-wire-parameters/utils.ts b/frontend/src/metabase/dashboard/actions/auto-wire-parameters/utils.ts
index e23e4b4f4f4..dac56513654 100644
--- a/frontend/src/metabase/dashboard/actions/auto-wire-parameters/utils.ts
+++ b/frontend/src/metabase/dashboard/actions/auto-wire-parameters/utils.ts
@@ -3,12 +3,15 @@ import _ from "underscore";
import { isActionDashCard } from "metabase/actions/utils";
import { getExistingDashCards } from "metabase/dashboard/actions/utils";
import { findDashCardForInlineParameter } from "metabase/dashboard/utils";
-import { isQuestionDashCard, isVirtualDashCard } from "metabase/lib/dashboard";
import {
type ParameterMappingOption,
getMappingOptionByTarget,
getParameterMappingOptions,
} from "metabase/parameters/utils/mapping-options";
+import {
+ isQuestionDashCard,
+ isVirtualDashCard,
+} from "metabase/utils/dashboard";
import type Question from "metabase-lib/v1/Question";
import type {
CardId,
diff --git a/frontend/src/metabase/dashboard/actions/cards-typed.ts b/frontend/src/metabase/dashboard/actions/cards-typed.ts
index caad26ae1c2..fa091b59b93 100644
--- a/frontend/src/metabase/dashboard/actions/cards-typed.ts
+++ b/frontend/src/metabase/dashboard/actions/cards-typed.ts
@@ -3,16 +3,19 @@ import { t } from "ttag";
import _ from "underscore";
import { Questions } from "metabase/entities/questions";
-import { isQuestionDashCard, isVirtualDashCard } from "metabase/lib/dashboard";
+import { loadMetadataForCard } from "metabase/questions/actions";
+import { addUndo } from "metabase/redux/undo";
+import {
+ isQuestionDashCard,
+ isVirtualDashCard,
+} from "metabase/utils/dashboard";
import {
DEFAULT_CARD_SIZE,
GRID_WIDTH,
getPositionForNewDashCard,
-} from "metabase/lib/dashboard_grid";
-import { createThunkAction } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
-import { loadMetadataForCard } from "metabase/questions/actions";
-import { addUndo } from "metabase/redux/undo";
+} from "metabase/utils/dashboard_grid";
+import { createThunkAction } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import { getDefaultSize } from "metabase/visualizations";
import {
getCardIdsFromColumnValueMappings,
diff --git a/frontend/src/metabase/dashboard/actions/data-fetching.ts b/frontend/src/metabase/dashboard/actions/data-fetching.ts
index 80852134f56..bc26a95502c 100644
--- a/frontend/src/metabase/dashboard/actions/data-fetching.ts
+++ b/frontend/src/metabase/dashboard/actions/data-fetching.ts
@@ -2,6 +2,7 @@ import { createAction } from "@reduxjs/toolkit";
import { getIn } from "icepick";
import { denormalize, normalize, schema } from "normalizr";
import { t } from "ttag";
+import _ from "underscore";
import { automagicDashboardsApi, dashboardApi } from "metabase/api";
import { showAutoApplyFiltersToast } from "metabase/dashboard/actions/parameters";
@@ -22,17 +23,6 @@ import {
getAllDashboardCards,
getCurrentTabDashboardCards,
} from "metabase/dashboard/utils";
-import {
- getDashboardType,
- isQuestionDashCard,
- isVirtualDashCard,
-} from "metabase/lib/dashboard";
-import { entityCompatibleQuery } from "metabase/lib/entities";
-import type { Deferred } from "metabase/lib/promise";
-import { defer } from "metabase/lib/promise";
-import { createAsyncThunk, createThunkAction } from "metabase/lib/redux";
-import { equals } from "metabase/lib/utils";
-import { uuid } from "metabase/lib/uuid";
import { getSavedDashboardUiParameters } from "metabase/parameters/utils/dashboards";
import { addFields } from "metabase/redux/metadata";
import { getMetadata } from "metabase/selectors/metadata";
@@ -45,6 +35,16 @@ import {
PublicApi,
maybeUsePivotEndpoint,
} from "metabase/services";
+import {
+ getDashboardType,
+ isQuestionDashCard,
+ isVirtualDashCard,
+} from "metabase/utils/dashboard";
+import { entityCompatibleQuery } from "metabase/utils/entities";
+import type { Deferred } from "metabase/utils/promise";
+import { defer } from "metabase/utils/promise";
+import { createAsyncThunk, createThunkAction } from "metabase/utils/redux";
+import { uuid } from "metabase/utils/uuid";
import { isVisualizerDashboardCard } from "metabase/visualizer/utils";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import { getParameterValuesByIdFromQueryParams } from "metabase-lib/v1/parameters/utils/parameter-parsing";
@@ -269,7 +269,7 @@ export const fetchCardDataAction = createAsyncThunk<
// if reload not set, check to see if the last result has the same query dict and return that
if (
lastResult &&
- equals(
+ _.isEqual(
getDatasetQueryParams(lastResult.json_query),
getDatasetQueryParams(datasetQuery),
)
@@ -288,7 +288,7 @@ export const fetchCardDataAction = createAsyncThunk<
// state so that the loader spinner shows as expected (#33767)
const hasParametersChanged =
!lastResult ||
- !equals(
+ !_.isEqual(
getDatasetQueryParams(lastResult.json_query),
getDatasetQueryParams(datasetQuery),
);
diff --git a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
index 5ebd291d4b4..7f8718ac713 100644
--- a/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/actions/data-fetching.unit.spec.ts
@@ -8,7 +8,7 @@ import {
} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { Api } from "metabase/api";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
import type { Dashboard } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/actions/navigation.ts b/frontend/src/metabase/dashboard/actions/navigation.ts
index a070f812611..32aed5c82b4 100644
--- a/frontend/src/metabase/dashboard/actions/navigation.ts
+++ b/frontend/src/metabase/dashboard/actions/navigation.ts
@@ -1,9 +1,9 @@
-import { isQuestionDashCard } from "metabase/lib/dashboard";
-import { createThunkAction } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { openUrl } from "metabase/redux/app";
import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";
import { getMetadata } from "metabase/selectors/metadata";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
+import { createThunkAction } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { Card, DashboardCard, VirtualCard } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/actions/parameters.tsx b/frontend/src/metabase/dashboard/actions/parameters.tsx
index 468f7e09c3f..2a0f992a868 100644
--- a/frontend/src/metabase/dashboard/actions/parameters.tsx
+++ b/frontend/src/metabase/dashboard/actions/parameters.tsx
@@ -13,8 +13,6 @@ import {
import { getParameterMappings } from "metabase/dashboard/actions/auto-wire-parameters/utils";
import { updateDashboard } from "metabase/dashboard/actions/save";
import { SIDEBAR_NAME } from "metabase/dashboard/constants";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
-import { createAction, createThunkAction } from "metabase/lib/redux";
import {
type NewParameterOpts,
createParameter,
@@ -26,6 +24,8 @@ import { selectTab, setParameterValues } from "metabase/redux/dashboard";
import { addUndo, dismissUndo } from "metabase/redux/undo";
import { getMetadata } from "metabase/selectors/metadata";
import { Text } from "metabase/ui";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
+import { createAction, createThunkAction } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { getParameterValuesByIdFromQueryParams } from "metabase-lib/v1/parameters/utils/parameter-parsing";
import {
diff --git a/frontend/src/metabase/dashboard/actions/revisions.ts b/frontend/src/metabase/dashboard/actions/revisions.ts
index 17d0a51a822..edd4ff5f24b 100644
--- a/frontend/src/metabase/dashboard/actions/revisions.ts
+++ b/frontend/src/metabase/dashboard/actions/revisions.ts
@@ -3,9 +3,9 @@ import {
fetchDashboard,
fetchDashboardCardData,
} from "metabase/dashboard/actions";
-import { entityCompatibleQuery } from "metabase/lib/entities";
-import { createThunkAction } from "metabase/lib/redux";
import { REVERT_TO_REVISION } from "metabase/redux/dashboard";
+import { entityCompatibleQuery } from "metabase/utils/entities";
+import { createThunkAction } from "metabase/utils/redux";
import type { DashboardId, Revision } from "metabase-types/api";
export const revertToRevision = createThunkAction(
diff --git a/frontend/src/metabase/dashboard/actions/save.ts b/frontend/src/metabase/dashboard/actions/save.ts
index a9214fd2e92..4c92287e594 100644
--- a/frontend/src/metabase/dashboard/actions/save.ts
+++ b/frontend/src/metabase/dashboard/actions/save.ts
@@ -2,9 +2,9 @@ import { assocIn, dissocIn, getIn } from "icepick";
import _ from "underscore";
import { Dashboards } from "metabase/entities/dashboards";
-import { createThunkAction } from "metabase/lib/redux";
import { UPDATE_DASHBOARD_AND_CARDS } from "metabase/redux/dashboard";
import { CardApi } from "metabase/services";
+import { createThunkAction } from "metabase/utils/redux";
import { clickBehaviorIsValid } from "metabase-lib/v1/parameters/utils/click-behavior";
import type { DashCardId, ParameterId } from "metabase-types/api";
import type {
diff --git a/frontend/src/metabase/dashboard/actions/tabs.ts b/frontend/src/metabase/dashboard/actions/tabs.ts
index 076176e20e6..a1663a880d3 100644
--- a/frontend/src/metabase/dashboard/actions/tabs.ts
+++ b/frontend/src/metabase/dashboard/actions/tabs.ts
@@ -5,11 +5,11 @@ import { t } from "ttag";
import { CANCEL_EDITING_DASHBOARD } from "metabase/dashboard/actions/core";
import { Dashboards } from "metabase/entities/dashboards";
-import { isVirtualDashCard } from "metabase/lib/dashboard";
-import { getPositionForNewDashCard } from "metabase/lib/dashboard_grid";
-import { checkNotNull } from "metabase/lib/types";
import { INITIALIZE, selectTab } from "metabase/redux/dashboard";
import { addUndo } from "metabase/redux/undo";
+import { isVirtualDashCard } from "metabase/utils/dashboard";
+import { getPositionForNewDashCard } from "metabase/utils/dashboard_grid";
+import { checkNotNull } from "metabase/utils/types";
import type {
DashCardId,
DashboardId,
diff --git a/frontend/src/metabase/dashboard/actions/trash.ts b/frontend/src/metabase/dashboard/actions/trash.ts
index b33b28ca537..7714f429642 100644
--- a/frontend/src/metabase/dashboard/actions/trash.ts
+++ b/frontend/src/metabase/dashboard/actions/trash.ts
@@ -6,8 +6,8 @@ import { canonicalCollectionId } from "metabase/collections/utils";
import { fetchDashboard } from "metabase/dashboard/actions";
import { Dashboards } from "metabase/entities/dashboards";
import { Questions } from "metabase/entities/questions";
-import { createThunkAction } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { createThunkAction } from "metabase/utils/redux";
// just using the entity action doesn't cause the dashboard to live update
// calling fetchDashboard ensures that the view updates with the last values
diff --git a/frontend/src/metabase/dashboard/actions/ui.ts b/frontend/src/metabase/dashboard/actions/ui.ts
index 6a80b4f371a..b4ecdc8572d 100644
--- a/frontend/src/metabase/dashboard/actions/ui.ts
+++ b/frontend/src/metabase/dashboard/actions/ui.ts
@@ -1,5 +1,5 @@
import { SIDEBAR_NAME } from "metabase/dashboard/constants";
-import { createAction, createThunkAction } from "metabase/lib/redux";
+import { createAction, createThunkAction } from "metabase/utils/redux";
import type { DashCardId } from "metabase-types/api";
import type {
DashboardSidebarName,
diff --git a/frontend/src/metabase/dashboard/actions/utils.ts b/frontend/src/metabase/dashboard/actions/utils.ts
index af22d68c6b2..81fce08d198 100644
--- a/frontend/src/metabase/dashboard/actions/utils.ts
+++ b/frontend/src/metabase/dashboard/actions/utils.ts
@@ -2,7 +2,7 @@ import { t } from "ttag";
import _ from "underscore";
import { getIframeDomainName } from "metabase/dashboard/visualizations/IFrameViz/utils";
-import { isActionDashCard } from "metabase/lib/dashboard";
+import { isActionDashCard } from "metabase/utils/dashboard";
import type {
DashCardId,
Dashboard,
diff --git a/frontend/src/metabase/dashboard/analytics.ts b/frontend/src/metabase/dashboard/analytics.ts
index 074d333b451..6a992f83f31 100644
--- a/frontend/src/metabase/dashboard/analytics.ts
+++ b/frontend/src/metabase/dashboard/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent, trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";
import type {
DashboardId,
DashboardWidth,
diff --git a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
index 8e487224bbe..f3f16b861be 100644
--- a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx
@@ -10,7 +10,6 @@ import { Sidebar } from "metabase/common/components/Sidebar";
import CS from "metabase/css/core/index.css";
import { useDashboardContext } from "metabase/dashboard/context";
import { Form, FormProvider, FormSelect, FormTextInput } from "metabase/forms";
-import { checkNotNull } from "metabase/lib/types";
import {
Box,
Button,
@@ -21,6 +20,7 @@ import {
Stack,
Title,
} from "metabase/ui";
+import { checkNotNull } from "metabase/utils/types";
import type { ActionDashboardCard } from "metabase-types/api";
const settings = checkNotNull(ActionViz.settings);
diff --git a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx
index 02d26bf15b9..5ee432f15c2 100644
--- a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx
@@ -8,9 +8,9 @@ import {
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { getNextId } from "__support__/utils";
import { ROOT_COLLECTION as ROOT } from "metabase/entities/collections";
-import { checkNotNull } from "metabase/lib/types";
-// TODO: Move this to a more suitable location for sharing.
import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";
+import { checkNotNull } from "metabase/utils/types";
+// TODO: Move this to a more suitable location for sharing.
import type { Collection, CollectionItem, Dashboard } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx
index 61bf9f1412f..47f7c447d88 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx
@@ -8,7 +8,7 @@ import {
type DashboardContextReturned,
useDashboardContext,
} from "metabase/dashboard/context";
-import { isTableDisplay } from "metabase/lib/click-behavior";
+import { isTableDisplay } from "metabase/utils/click-behavior";
import {
canSaveClickBehavior,
clickBehaviorIsValid,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx
index c3cf2fab2a2..642051a6d0e 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx
@@ -2,8 +2,8 @@ import { getIn } from "icepick";
import { useMemo } from "react";
import { getDashcardData } from "metabase/dashboard/selectors";
-import { isTableDisplay } from "metabase/lib/click-behavior";
-import { useSelector } from "metabase/lib/redux";
+import { isTableDisplay } from "metabase/utils/click-behavior";
+import { useSelector } from "metabase/utils/redux";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
ClickBehavior,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsx
index 72e6f1e8381..80ea89d009c 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsx
@@ -1,7 +1,7 @@
import { jt, t } from "ttag";
-import { isTableDisplay } from "metabase/lib/click-behavior";
import { Box, Icon } from "metabase/ui";
+import { isTableDisplay } from "metabase/utils/click-behavior";
import type { DashboardCard, DatasetColumn } from "metabase-types/api";
import S from "../ClickBehaviorSidebar.module.css";
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
index 3948ec7c586..cb9479933b6 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx
@@ -4,7 +4,6 @@ import { useCallback, useState } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { isTableDisplay } from "metabase/lib/click-behavior";
import {
Button,
Flex,
@@ -13,6 +12,7 @@ import {
Text,
TextInputBlurChange,
} from "metabase/ui";
+import { isTableDisplay } from "metabase/utils/click-behavior";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import { clickBehaviorIsValid } from "metabase-lib/v1/parameters/utils/click-behavior";
import type {
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsx
index ff22ad47f12..5797dc292f6 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsx
@@ -3,8 +3,8 @@ import { useCallback } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { isTableDisplay } from "metabase/lib/click-behavior";
import type { IconName } from "metabase/ui";
+import { isTableDisplay } from "metabase/utils/click-behavior";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
ArbitraryCustomDestinationClickBehavior,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx
index 3f925c42012..071b9c6eafc 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx
@@ -18,10 +18,10 @@ import { getDashboard } from "metabase/dashboard/selectors";
import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
import { Dashboards } from "metabase/entities/dashboards";
import { Questions } from "metabase/entities/questions";
-import { useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
import { Button, Icon, Select } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import Question from "metabase-lib/v1/Question";
import type {
CardId,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx
index 2bc339a94f0..fb4729a8db4 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx
@@ -16,7 +16,7 @@ import {
} from "__support__/ui";
import { getNextId } from "__support__/utils";
import { ROOT_COLLECTION as ROOT } from "metabase/entities/collections";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type {
CollectionItem,
Dashboard,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/TableClickBehaviorView.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/TableClickBehaviorView.tsx
index 77d9ace41aa..f9594564544 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/TableClickBehaviorView.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/TableClickBehaviorView.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import _ from "underscore";
import CS from "metabase/css/core/index.css";
-import { hasActionsMenu } from "metabase/lib/click-behavior";
+import { hasActionsMenu } from "metabase/utils/click-behavior";
import type {
ClickBehavior,
ClickBehaviorType,
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.ts b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.ts
index 8ea7064d02e..db5ca393611 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.ts
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/hooks.ts
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { hasActionsMenu } from "metabase/lib/click-behavior";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
+import { hasActionsMenu } from "metabase/utils/click-behavior";
+import { useSelector } from "metabase/utils/redux";
import type { ClickBehaviorType, DashboardCard } from "metabase-types/api";
export function useClickBehaviorOptionName(
diff --git a/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts b/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts
index 4e47fa46462..d953f7abe6a 100644
--- a/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts
+++ b/frontend/src/metabase/dashboard/components/ClickMappings/hooks.ts
@@ -1,12 +1,12 @@
import { useEffect, useMemo, useState } from "react";
import { getDashcardData, getParameters } from "metabase/dashboard/selectors";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
import { loadMetadataForCard } from "metabase/questions/actions";
import { getMetadata } from "metabase/selectors/metadata";
import { GTAPApi } from "metabase/services";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import Question from "metabase-lib/v1/Question";
import {
getTargetsForDashboard,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.tsx b/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.tsx
index 5d3ece0bfac..7c7953e79c7 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.tsx
@@ -2,8 +2,8 @@ import cx from "classnames";
import { useCallback } from "react";
import { t } from "ttag";
-import { getClickBehaviorDescription } from "metabase/lib/click-behavior";
import { Box, Flex, Icon } from "metabase/ui";
+import { getClickBehaviorDescription } from "metabase/utils/click-behavior";
import type { DashboardCard, QuestionDashboardCard } from "metabase-types/api";
import S from "./ClickBehaviorSidebarOverlay.module.css";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
index 83e25d51ca4..979a3f8f173 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx
@@ -16,13 +16,13 @@ import {
isDashcardLoading,
} from "metabase/dashboard/utils";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { isQuestionCard, isQuestionDashCard } from "metabase/lib/dashboard";
-import { useDispatch, useSelector, useStore } from "metabase/lib/redux";
import type { NewParameterOpts } from "metabase/parameters/utils/dashboards";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
import { getMetadata } from "metabase/selectors/metadata";
import { Box } from "metabase/ui";
+import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";
+import { useDispatch, useSelector, useStore } from "metabase/utils/redux";
import { getVisualizationRaw } from "metabase/visualizations";
import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsx
index 6ad0f80cac5..d38aca2736a 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/ActionSettingsButton/ActionSettingsButton.tsx
@@ -2,7 +2,7 @@ import { useEffect } from "react";
import { t } from "ttag";
import { setEditingDashcardId } from "metabase/dashboard/actions";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type { ActionDashboardCard } from "metabase-types/api";
import { DashCardActionButton } from "../DashCardActionButton/DashCardActionButton";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.tsx
index b5d56f9f923..dc1cab23fa1 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.tsx
@@ -10,9 +10,12 @@ import {
isLinkDashCard,
supportsInlineParameters,
} from "metabase/dashboard/utils";
-import { isQuestionDashCard, isVirtualDashCard } from "metabase/lib/dashboard";
import type { NewParameterOpts } from "metabase/parameters/utils/dashboards";
import { Box, Icon } from "metabase/ui";
+import {
+ isQuestionDashCard,
+ isVirtualDashCard,
+} from "metabase/utils/dashboard";
import { getVisualizationRaw } from "metabase/visualizations";
import {
isDisabledForVisualizer,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsx
index 5a9ab9d2ead..5e0f6c4ff33 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardTabMenu/DashCardTabMenu.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { moveDashCardToTab } from "metabase/dashboard/actions";
import { getSelectedTabId, getTabs } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Divider, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { DashCardId } from "metabase-types/api";
import { DashCardActionButton } from "../DashCardActionButton/DashCardActionButton";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.ts b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.ts
index 392d53d7c35..b305b7331c2 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.ts
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackVisualizeAnotherWayClicked = () =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx
index 043eb304e6e..67f6778a0eb 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx
@@ -5,6 +5,7 @@ import { t } from "ttag";
import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";
import { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";
+import { canDownloadResults } from "metabase/common/utils/dataset";
import { canEditQuestion } from "metabase/dashboard/components/DashCard/DashCardMenu/utils";
import {
type DashboardContextReturned,
@@ -12,10 +13,9 @@ import {
} from "metabase/dashboard/context";
import { getParameterValuesBySlugMap } from "metabase/dashboard/selectors";
import { transformSdkQuestion } from "metabase/embedding-sdk/lib/transform-question";
-import { canDownloadResults } from "metabase/lib/downloads";
-import { useStore } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { ActionIcon, Icon, Menu, type MenuProps } from "metabase/ui";
+import { useStore } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";
import type Question from "metabase-lib/v1/Question";
import { InternalQuery } from "metabase-lib/v1/queries/InternalQuery";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
index d830cad4ddf..aa9eaaf8df5 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
@@ -7,9 +7,9 @@ import {
} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { getIcon, renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Card, Dataset } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
index 0bbd505bf86..2efac4c2a9b 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
@@ -2,13 +2,13 @@ import { useMemo } from "react";
import { t } from "ttag";
import { useSdkDashboardContext } from "embedding-sdk-bundle/components/public/dashboard/context";
+import { canDownloadResults } from "metabase/common/utils/dataset";
import { editQuestion } from "metabase/dashboard/actions";
import { useDashboardContext } from "metabase/dashboard/context";
import { transformSdkQuestion } from "metabase/embedding-sdk/lib/transform-question";
import type { DashboardCardCustomMenuItem } from "metabase/embedding-sdk/types/plugins";
-import { canDownloadResults } from "metabase/lib/downloads";
-import { useDispatch } from "metabase/lib/redux";
import { Icon, Menu } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type { DashCardId, Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx
index 0ecc711b858..4f80dabe9c1 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx
@@ -9,14 +9,14 @@ import {
getQuestionByCard,
} from "metabase/dashboard/selectors";
import { isNativeDashCard } from "metabase/dashboard/utils";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
-import { connect } from "metabase/lib/redux";
import {
type ParameterMappingOption,
getMappingOptionByTarget,
} from "metabase/parameters/utils/mapping-options";
import { getIsRecentlyAutoConnectedDashcard } from "metabase/redux/undo";
import { Box, Flex, Icon, Text, Transition } from "metabase/ui";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
+import { connect } from "metabase/utils/redux";
import { getMobileHeight } from "metabase/visualizations/shared/utils/sizes";
import type Question from "metabase-lib/v1/Question";
import { isDateParameter } from "metabase-lib/v1/parameters/utils/parameter-type";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsx
index 3ad0763cd5f..c6b2ebbc269 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapperContent.tsx
@@ -9,8 +9,6 @@ import {
getVirtualCardType,
showVirtualDashCardInfoText,
} from "metabase/dashboard/utils";
-import { isQuestionDashCard, isVirtualDashCard } from "metabase/lib/dashboard";
-import { useDispatch } from "metabase/lib/redux";
import type { ParameterMappingOption } from "metabase/parameters/utils/mapping-options";
import {
Box,
@@ -22,6 +20,11 @@ import {
Tooltip,
Transition,
} from "metabase/ui";
+import {
+ isQuestionDashCard,
+ isVirtualDashCard,
+} from "metabase/utils/dashboard";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import { isTemporalUnitParameter } from "metabase-lib/v1/parameters/utils/parameter-type";
import type {
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.tsx
index 1ab9a241b1c..696c4841dd0 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.tsx
@@ -2,9 +2,9 @@ import cx from "classnames";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
import { Flex } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
import type { DashboardCard } from "metabase-types/api";
import { DashCardCardParameterMapperConnected } from "./DashCardCardParameterMapper";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsx
index 993f47298e4..fc5f28ebaf0 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl, getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import {
isDateParameter,
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index 4bfb0079b0a..1ebcd4e8f40 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -18,10 +18,6 @@ import {
} from "metabase/dashboard/selectors";
import { getVirtualCardType } from "metabase/dashboard/utils";
import { EmbeddingEntityContextProvider } from "metabase/embedding/context";
-import { isVirtualDashCard } from "metabase/lib/dashboard";
-import { duration } from "metabase/lib/formatting";
-import { measureTextWidth } from "metabase/lib/measure-text";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import {
@@ -38,6 +34,10 @@ import {
Title,
Transition,
} from "metabase/ui";
+import { isVirtualDashCard } from "metabase/utils/dashboard";
+import { duration } from "metabase/utils/formatting";
+import { measureTextWidth } from "metabase/utils/measure-text";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getVisualizationRaw, isCartesianChart } from "metabase/visualizations";
import Visualization from "metabase/visualizations/components/Visualization";
import type { LoadingViewProps } from "metabase/visualizations/components/Visualization/LoadingView/LoadingView";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx
index 34cefdd70e3..ba17b057f62 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/PublicOrEmbeddedDashCardMenu.tsx
@@ -7,10 +7,10 @@ import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownl
import { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";
import { useDashboardContext } from "metabase/dashboard/context";
import { getParameterValuesBySlugMap } from "metabase/dashboard/selectors";
-import { useSelector, useStore } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
import { ActionIcon, Icon, Menu } from "metabase/ui";
+import { useSelector, useStore } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";
import Question from "metabase-lib/v1/Question";
import type { DashboardCard, Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/components/DashCard/dashcard-ids.ts b/frontend/src/metabase/dashboard/components/DashCard/dashcard-ids.ts
index 6caa25c2618..78afc83fa66 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/dashcard-ids.ts
+++ b/frontend/src/metabase/dashboard/components/DashCard/dashcard-ids.ts
@@ -1,5 +1,5 @@
-import { isJWT } from "metabase/lib/jwt";
-import { isUuid } from "metabase/lib/uuid";
+import { isJWT } from "metabase/utils/jwt";
+import { isUuid } from "metabase/utils/uuid";
import type { DashboardCard } from "metabase-types/api";
export const getDashcardTokenId = (dashcard: DashboardCard) =>
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
index fabaa4c0fa0..7a47c08d06d 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
@@ -9,11 +9,11 @@ import { DashboardHeader } from "metabase/dashboard/components/DashboardHeader";
import { useDashboardContext } from "metabase/dashboard/context";
import { getIsHeaderVisible } from "metabase/dashboard/selectors";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { useSelector } from "metabase/lib/redux";
import { FilterApplyToast } from "metabase/parameters/components/FilterApplyToast";
import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
import { Box, Flex, Loader } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { DashboardCard } from "metabase-types/api";
import { DASHBOARD_PDF_EXPORT_ROOT_ID } from "../../constants";
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx b/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx
index 5574aee133a..943028beb57 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard/components/Grid.tsx
@@ -2,12 +2,12 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import { useDashboardContext } from "metabase/dashboard/context";
-import { useSelector } from "metabase/lib/redux";
import {
canUserCreateNativeQueries,
canUserCreateQueries,
} from "metabase/selectors/user";
import { Loader } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { DashboardCard } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsx b/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsx
index f013a9858a7..fc217116b06 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard/components/ParametersList.tsx
@@ -1,5 +1,5 @@
import { getDashboardHeaderValuePopulatedParameters } from "metabase/dashboard/selectors";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import {
type DashboardParameterListProps,
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.ts b/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.ts
index 834be221a97..4c93237c996 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.ts
+++ b/frontend/src/metabase/dashboard/components/Dashboard/use-set-dashboard-attribute.ts
@@ -2,7 +2,7 @@ import { useCallback } from "react";
import { setDashboardAttributes } from "metabase/dashboard/actions";
import { getDashboardComplete } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Dashboard as IDashboard } from "metabase-types/api";
export const useSetDashboardAttributeHandler = () => {
diff --git a/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx b/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx
index b38d585dd83..bfdf4be9f03 100644
--- a/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx
@@ -2,8 +2,8 @@ import { BookmarkToggle } from "metabase/common/components/BookmarkToggle";
import { useBookmarkListQuery } from "metabase/common/hooks";
import { useDashboardContext } from "metabase/dashboard/context/context";
import { Bookmarks } from "metabase/entities/bookmarks";
-import { useDispatch } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
+import { useDispatch } from "metabase/utils/redux";
import type { DashboardId, Bookmark as IBookmark } from "metabase-types/api";
import { trackDashboardBookmarked } from "../analytics";
diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx
index cbf22176a8d..5d5c4815317 100644
--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx
@@ -9,8 +9,8 @@ import type { CopyDashboardFormProperties } from "metabase/dashboard/containers/
import { Collections } from "metabase/entities/collections";
import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";
import { Dashboards } from "metabase/entities/dashboards";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Dashboard } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx b/frontend/src/metabase/dashboard/components/DashboardGrid.tsx
index 49951d1f82c..f32703840e8 100644
--- a/frontend/src/metabase/dashboard/components/DashboardGrid.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardGrid.tsx
@@ -18,18 +18,18 @@ import {
import { ContentViewportContext } from "metabase/common/context/ContentViewportContext";
import DashboardS from "metabase/css/dashboard.module.css";
import { getVisibleCardIds } from "metabase/dashboard/utils";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
+import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
+import { addUndo } from "metabase/redux/undo";
+import { Box, Flex, type FlexProps } from "metabase/ui";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
import {
GRID_ASPECT_RATIO,
GRID_BREAKPOINTS,
GRID_COLUMNS,
GRID_WIDTH,
MIN_ROW_HEIGHT,
-} from "metabase/lib/dashboard_grid";
-import { connect } from "metabase/lib/redux";
-import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
-import { addUndo } from "metabase/redux/undo";
-import { Box, Flex, type FlexProps } from "metabase/ui";
+} from "metabase/utils/dashboard_grid";
+import { connect } from "metabase/utils/redux";
import LegendS from "metabase/visualizations/components/Legend.module.css";
import { VisualizerModal } from "metabase/visualizer/components/VisualizerModal";
import {
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx
index 757e56fe12f..11abb92dc8c 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeader.tsx
@@ -16,11 +16,11 @@ import {
getIsEditing,
} from "metabase/dashboard/selectors";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { fetchPulseFormInput } from "metabase/notifications/pulse/actions";
import { getSetting } from "metabase/selectors/settings";
import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";
import { Flex, Loader } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Dashboard } from "metabase-types/api";
import { SIDEBAR_NAME } from "../../constants";
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx
index 0808b078c72..e035e398090 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.tsx
@@ -14,13 +14,13 @@ import {
getHasModelActionsEnabled,
getIsEditing,
} from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getPulseFormInput } from "metabase/notifications/pulse/selectors";
import {
canManageSubscriptions as canManageSubscriptionsSelector,
getUserIsAdmin,
} from "metabase/selectors/user";
import { Box } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
export const DashboardHeaderButtonRow = ({
isPublic = false,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
index ddabb1f7e42..5fed80741a6 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx
@@ -21,13 +21,13 @@ import {
getIsShowDashboardSettingsSidebar,
getIsSidebarOpen,
} from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
PLUGIN_COLLECTION_COMPONENTS,
PLUGIN_MODERATION,
} from "metabase/plugins";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
import { Box, Flex } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Collection, Dashboard as IDashboard } from "metabase-types/api";
import { Dashboard } from "../Dashboard";
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsx
index 21c3f1b2df1..c805b0e9b90 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddActionElementButton.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { addActionToDashboard } from "metabase/dashboard/actions";
import { useDashboardContext } from "metabase/dashboard/context/context";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
export const AddActionElementButton = () => {
const { dashboard, selectedTabId } = useDashboardContext();
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsx
index 1dd6436e1b5..01a5764c84b 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddLinkOrEmbedButton.tsx
@@ -6,8 +6,8 @@ import {
addLinkDashCardToDashboard,
} from "metabase/dashboard/actions";
import { getDashboard, getSelectedTabId } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Group, Icon, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
export const AddLinkOrEmbedButton = () => {
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx
index 4fac1b85b28..fd4dce365fc 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx
@@ -5,8 +5,8 @@ import { addSectionToDashboard } from "metabase/dashboard/actions";
import { SectionLayoutPreview } from "metabase/dashboard/components/DashboardHeader/SectionLayoutPreview";
import { useDashboardContext } from "metabase/dashboard/context/context";
import { type SectionLayout, layoutOptions } from "metabase/dashboard/sections";
-import { useDispatch } from "metabase/lib/redux";
import { Flex, Menu } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import AddSectionButtonS from "./AddSectionButton.module.css";
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx
index 8b15331fa65..218a24fc405 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardActionMenu.tsx
@@ -8,11 +8,11 @@ import { setSharing as setDashboardSubscriptionSidebarOpen } from "metabase/dash
import { useDashboardContext } from "metabase/dashboard/context/context";
import { useRefreshDashboard } from "metabase/dashboard/hooks";
import { getIsSharing as getIsDashboardSubscriptionSidebarOpen } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { DashboardSubscriptionMenuItem } from "metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { PLUGIN_CACHING, PLUGIN_MODERATION } from "metabase/plugins";
import { Icon, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
type DashboardActionMenuProps = {
canResetFilters: boolean;
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsx
index d4f67cd2f56..627f3c941f6 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardInfoButton.tsx
@@ -5,9 +5,9 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { SIDEBAR_NAME } from "metabase/dashboard/constants";
import { useDashboardContext } from "metabase/dashboard/context/context";
import { getIsShowDashboardInfoSidebar } from "metabase/dashboard/selectors";
-import { useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import type { ActionIconProps } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const DashboardInfoButton = (
props: ActionIconProps & ButtonHTMLAttributes<HTMLButtonElement>,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsx
index 2674636df75..ba93f7a6aad 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/ExportAsPdfButton.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { useDashboardContext } from "metabase/dashboard/context";
-import { useDispatch } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { downloadDashboardToPdf } from "metabase/redux/downloads";
import type { ActionIconProps } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
export const ExportAsPdfButton = (
props: ActionIconProps & ButtonHTMLAttributes<HTMLButtonElement>,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx
index ff47d6443b0..2ab3212ec5a 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/SaveEditButton.tsx
@@ -5,10 +5,10 @@ import { ActionButton } from "metabase/common/components/ActionButton";
import ButtonsS from "metabase/css/components/buttons.module.css";
import { useDashboardContext } from "metabase/dashboard/context/context";
import { getMissingRequiredParameters } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { dismissAllUndo } from "metabase/redux/undo";
import { Tooltip } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
export const SaveEditButton = () => {
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx
index 4c813e3fe73..0fe5bdb095f 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx
@@ -8,9 +8,9 @@ import { Link } from "metabase/common/components/Link";
import { SidesheetCardSection } from "metabase/common/components/Sidesheet";
import Styles from "metabase/css/core/index.css";
import { DashboardPublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover";
-import { collection as collectionUrl } from "metabase/lib/urls";
-import { getUserName } from "metabase/lib/user";
import { Box, FixedSizeIcon, Flex, Text } from "metabase/ui";
+import { collection as collectionUrl } from "metabase/utils/urls";
+import { getUserName } from "metabase/utils/user";
import type { Dashboard } from "metabase-types/api";
import SidebarStyles from "./DashboardInfoSidebar.module.css";
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/DashboardEntityIdCard.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/DashboardEntityIdCard.tsx
index 2e92e0c4664..57acad0e50b 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/DashboardEntityIdCard.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardEntityIdCard/DashboardEntityIdCard.tsx
@@ -10,8 +10,8 @@ import {
SidesheetCardTitle,
} from "metabase/common/components/Sidesheet";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { isWithinIframe } from "metabase/lib/dom";
import { Collapse, Divider, Group, Icon, Stack, Text } from "metabase/ui";
+import { isWithinIframe } from "metabase/utils/iframe";
import type { Dashboard } from "metabase-types/api";
import Styles from "./DashboardEntityIdCard.module.css";
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
index c04fb276f16..b87c76bd3b6 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
@@ -24,10 +24,10 @@ import {
type DashboardContextReturned,
useDashboardContext,
} from "metabase/dashboard/context";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { getUser } from "metabase/selectors/user";
import { Stack, Tabs, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type {
Dashboard,
ModerationReview,
diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx
index 7b1c76c63cc..dee2dd9cb4d 100644
--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { useConfirmRouteLeaveModal } from "metabase/common/hooks/use-confirm-route-leave-modal";
import { updateDashboardAndCards } from "metabase/dashboard/actions/save";
import { getIsDirty, getIsEditing } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { dismissAllUndo } from "metabase/redux/undo";
import { Box, Button, Flex, Modal, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { isNavigatingToCreateADashboardQuestion } from "./utils";
diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts
index 6b9a47580c6..a25c6d64124 100644
--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts
+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/utils.ts
@@ -1,6 +1,6 @@
import type { Location } from "history";
-import { deserializeCard, parseHash } from "metabase/lib/card";
+import { deserializeCard, parseHash } from "metabase/utils/card";
export const isNavigatingToCreateADashboardQuestion = (
nextLocation?: Location,
diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx
index f654674fcc7..4ef4d997569 100644
--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx
@@ -6,10 +6,10 @@ import { Link } from "metabase/common/components/Link";
import { MoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModal";
import { ROOT_COLLECTION } from "metabase/entities/collections";
import { Dashboards } from "metabase/entities/dashboards";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Flex, Icon } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { CollectionId, Dashboard, DashboardId } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsx b/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsx
index 5b92b5a85f0..13267ae6c17 100644
--- a/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardParameterList/DashboardParameterList.tsx
@@ -9,8 +9,8 @@ import {
} from "metabase/dashboard/actions";
import { DASHBOARD_PARAMETERS_PDF_EXPORT_NODE_CLASSNAME } from "metabase/dashboard/constants";
import { useDashboardContext } from "metabase/dashboard/context";
-import { useDispatch } from "metabase/lib/redux";
import { ParametersList } from "metabase/parameters/components/ParametersList";
+import { useDispatch } from "metabase/utils/redux";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
diff --git a/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsx b/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsx
index ca6597e4188..9e33df0bc61 100644
--- a/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.tsx
@@ -7,10 +7,10 @@ import { useDashboardContext } from "metabase/dashboard/context";
import { useIsParameterPanelSticky } from "metabase/dashboard/hooks/use-is-parameter-panel-sticky";
import { getDashboardHeaderValuePopulatedParameters } from "metabase/dashboard/selectors";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { isSmallScreen } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
import { getVisibleParameters } from "metabase/parameters/utils/ui";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
+import { isSmallScreen } from "metabase/utils/dom";
+import { useSelector } from "metabase/utils/redux";
import { Dashboard } from "../Dashboard";
import DashboardS from "../Dashboard/Dashboard.module.css";
diff --git a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx
index da5e35cce8b..51e13315197 100644
--- a/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardSettingsSidebar/DashboardSettingsSidebar.tsx
@@ -8,9 +8,9 @@ import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import { toggleAutoApplyFilters } from "metabase/dashboard/actions/parameters";
import { useDashboardContext } from "metabase/dashboard/context";
import { isDashboardCacheable } from "metabase/dashboard/utils";
-import { useDispatch } from "metabase/lib/redux";
import { PLUGIN_CACHING } from "metabase/plugins";
import { Switch, useModalsStack } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { CacheableDashboard, Dashboard } from "metabase-types/api";
export function DashboardSettingsSidebar() {
diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx
index 88738302294..82b4b0a668c 100644
--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.tsx
@@ -10,9 +10,9 @@ import { TabRow } from "metabase/common/components/TabRow";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import CS from "metabase/css/core/index.css";
import { useDashboardContext } from "metabase/dashboard/context";
-import { isVirtualDashCard } from "metabase/lib/dashboard";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { Flex, List } from "metabase/ui";
+import { isVirtualDashCard } from "metabase/utils/dashboard";
import type { SelectedTabId } from "metabase-types/store";
import S from "./DashboardTabs.module.css";
diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx
index 987209ca4e5..d68252145fb 100644
--- a/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/DashboardTabs.unit.spec.tsx
@@ -14,9 +14,9 @@ import { getDefaultTab, resetTempTabId } from "metabase/dashboard/actions";
import { useDashboardUrlQuery } from "metabase/dashboard/hooks/use-dashboard-url-query";
import { getSelectedTabId } from "metabase/dashboard/selectors";
import { createTabSlug } from "metabase/dashboard/utils";
-import { useSelector } from "metabase/lib/redux";
import { MockDashboardContext } from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";
import { TEST_CARD } from "metabase/query_builder/containers/test-utils";
+import { useSelector } from "metabase/utils/redux";
import type { DashboardTab } from "metabase-types/api";
import { createMockDashboardCard } from "metabase-types/api/mocks/dashboard";
import type { DashboardState, State } from "metabase-types/store";
diff --git a/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.ts b/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.ts
index 2d6e699d886..de14ebc2861 100644
--- a/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.ts
+++ b/frontend/src/metabase/dashboard/components/DashboardTabs/use-dashboard-tabs.ts
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { trackTabDuplicated } from "metabase/dashboard/analytics";
import { useDashboardContext } from "metabase/dashboard/context";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
import type { SelectedTabId } from "metabase-types/store";
let tabDeletionId = 1;
diff --git a/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx b/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx
index 3865cd320ac..e728bea9a23 100644
--- a/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/ExtraEditButtonsMenu/ExtraEditButtonsMenu.tsx
@@ -4,8 +4,8 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { setDashboardAttributes } from "metabase/dashboard/actions";
import { trackDashboardWidthChange } from "metabase/dashboard/analytics";
import { getDashboard, getDashboardId } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Box, Popover, Stack, Switch } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
const EXTRA_BUTTONS_DESCRIPTION = t`Toggle width`;
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx
index 847ac49bada..d301a11b81f 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx
@@ -17,11 +17,11 @@ import { addCardWithVisualization } from "metabase/dashboard/actions";
import { getSelectedTabId } from "metabase/dashboard/selectors";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { Search } from "metabase/entities/search";
-import { DEFAULT_SEARCH_LIMIT } from "metabase/lib/constants";
-import { getIcon } from "metabase/lib/icon";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { ActionIcon, Box, Flex, Icon, Tooltip } from "metabase/ui";
+import { DEFAULT_SEARCH_LIMIT } from "metabase/utils/constants";
+import { getIcon } from "metabase/utils/icon";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { VisualizerModal } from "metabase/visualizer/components/VisualizerModal";
import type { CardId, CollectionId } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx
index 961677b49da..00f23b6d6b2 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx
@@ -8,20 +8,20 @@ import { Input } from "metabase/common/components/Input";
import { SelectList } from "metabase/common/components/SelectList";
import type { BaseSelectListItemProps } from "metabase/common/components/SelectList/BaseSelectListItem";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
+import { getCollectionBreadCrumbs } from "metabase/common/utils/collections";
import { useDashboardContext } from "metabase/dashboard/context";
import { getDashboard } from "metabase/dashboard/selectors";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
-import { getCrumbs } from "metabase/lib/collections";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
-import { getIcon } from "metabase/lib/icon";
-import { connect, useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import {
canUserCreateNativeQueries,
canUserCreateQueries,
} from "metabase/selectors/user";
import { Button, Flex, Icon } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
+import { getIcon } from "metabase/utils/icon";
+import { connect, useDispatch, useSelector } from "metabase/utils/redux";
import type { Collection, CollectionId } from "metabase-types/api";
import { QuestionList } from "./QuestionList";
@@ -50,7 +50,11 @@ function QuestionPickerInner({
);
const collection = collectionsById[currentCollectionId];
- const crumbs = getCrumbs(collection, collectionsById, setCurrentCollectionId);
+ const crumbs = getCollectionBreadCrumbs(
+ collection,
+ collectionsById,
+ setCurrentCollectionId,
+ );
const handleSearchTextChange: React.ChangeEventHandler<HTMLInputElement> = (
e,
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts
index 76b39361c28..56e9476b02e 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/actions.ts
@@ -1,8 +1,8 @@
import { push } from "react-router-redux";
import { getDashboard } from "metabase/dashboard/selectors";
-import { createThunkAction } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { createThunkAction } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Dashboard } from "metabase-types/api";
const ADD_DASHBOARD_QUESTION = "metabase/dashboard/ADD_DASHBOARD_QUESTION";
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.ts
index ef2cdf40c35..48851720a5a 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.ts
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackVisualizeAnotherWayClicked = () =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidgetTarget.tsx b/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidgetTarget.tsx
index b3c956063da..bc0af26bfd7 100644
--- a/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidgetTarget.tsx
+++ b/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidgetTarget.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton/ToolbarButton";
import { CountdownIcon } from "metabase/common/components/icons/CountdownIcon";
-import { isNotNull } from "metabase/lib/types";
import type { ActionIconProps } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
type RefreshWidgetTargetProps = {
period: number | null;
diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx
index b9de449a56a..81d09dcc5ae 100644
--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx
+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx
@@ -7,8 +7,8 @@ import { ArchiveModal } from "metabase/common/components/ArchiveModal";
import { setArchivedDashboard } from "metabase/dashboard/actions";
import { Collections } from "metabase/entities/collections";
import { Dashboards } from "metabase/entities/dashboards";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Dashboard } from "metabase-types/api";
type OwnProps = {
diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
index bb4bb884a8b..1c0dd012331 100644
--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
@@ -21,10 +21,10 @@ import { useDashboardUrlQuery } from "metabase/dashboard/hooks";
import { ReturnToSetupGuideModal } from "metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal";
import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { addUndo } from "metabase/redux/undo";
import { Box, Flex, Group } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Dashboard as IDashboard } from "metabase-types/api";
import { FixedWidthContainer } from "../../components/Dashboard/DashboardComponents";
diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.ts b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.ts
index 566ffb92ee1..b2f6752de2c 100644
--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.ts
+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { RelatedDashboardXRays } from "metabase-types/api";
export const trackSuggestedXRayClicked = (
diff --git a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx
index 7cce6a5b7f6..c7b5158cb45 100644
--- a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx
+++ b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx
@@ -19,9 +19,9 @@ import {
FormTextInput,
FormTextarea,
} from "metabase/forms";
-import { isVirtualDashCard } from "metabase/lib/dashboard";
-import * as Errors from "metabase/lib/errors";
import { Group, Icon, Tooltip } from "metabase/ui";
+import { isVirtualDashCard } from "metabase/utils/dashboard";
+import * as Errors from "metabase/utils/errors";
import type { CollectionId, Dashboard, DashboardId } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx
index 5fc09a5c3d6..dc943478c14 100644
--- a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx
+++ b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx
@@ -15,9 +15,9 @@ import {
FormTextInput,
FormTextarea,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
import { Button, Stack } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
import type { CollectionId, Dashboard } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx b/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx
index 2223405cfb8..1b2d68485c2 100644
--- a/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx
+++ b/frontend/src/metabase/dashboard/containers/CreateDashboardModal.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import type { SdkCollectionId } from "embedding-sdk-bundle/types";
import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Modal, type ModalProps } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { CollectionId, Dashboard } from "metabase-types/api";
import { CreateDashboardForm } from "./CreateDashboardForm";
diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx
index 8617426c3dc..c2b89705f7f 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.tsx
@@ -32,10 +32,10 @@ import {
usePageTitle,
usePageTitleWithLoadingTime,
} from "metabase/hooks/use-page-title";
-import { parseHashOptions, stringifyHashOptions } from "metabase/lib/browser";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { setErrorPage } from "metabase/redux/app";
+import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { DashboardId, Dashboard as IDashboard } from "metabase-types/api";
import { useRegisterDashboardMetabotContext } from "../../hooks/use-register-dashboard-metabot-context";
diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
index 575bbdaedcd..04d203abda9 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/DashboardApp.unit.spec.tsx
@@ -26,7 +26,7 @@ import {
} from "__support__/ui";
import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
import { DashboardApp } from "metabase/dashboard/containers/DashboardApp/DashboardApp";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Dashboard } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.ts b/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.ts
index 25fbc34b8d9..23b537d8e8a 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.ts
+++ b/frontend/src/metabase/dashboard/containers/DashboardApp/use-slow-card-notification.ts
@@ -6,8 +6,8 @@ import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import { useWebNotification } from "metabase/common/hooks/use-web-notification";
import { DASHBOARD_SLOW_TIMEOUT } from "metabase/dashboard/constants";
import { useDashboardContext } from "metabase/dashboard/context";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo, dismissUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
export const useSlowCardNotification = () => {
const { dashboard, isRunning, isLoadingComplete } = useDashboardContext();
diff --git a/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx b/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx
index d7eeca45f5e..6cf97ee106a 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx
@@ -4,8 +4,8 @@ import {
} from "metabase/api";
import { getParameters } from "metabase/dashboard/selectors";
import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";
-import { useSelector } from "metabase/lib/redux";
import { EmbedModal } from "metabase/public/components/EmbedModal";
+import { useSelector } from "metabase/utils/redux";
import type { Dashboard } from "metabase-types/api";
export type DashboardSharingEmbeddingModalProps = {
diff --git a/frontend/src/metabase/dashboard/context/context.redux.ts b/frontend/src/metabase/dashboard/context/context.redux.ts
index 91344d4e13f..80ad167abec 100644
--- a/frontend/src/metabase/dashboard/context/context.redux.ts
+++ b/frontend/src/metabase/dashboard/context/context.redux.ts
@@ -50,7 +50,6 @@ import {
renameTab,
undoDeleteTab,
} from "metabase/dashboard/actions/tabs";
-import { connect } from "metabase/lib/redux";
import {
initialize,
reset,
@@ -62,6 +61,7 @@ import {
canManageSubscriptions,
getUserIsAdmin,
} from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import {
diff --git a/frontend/src/metabase/dashboard/grid-utils.ts b/frontend/src/metabase/dashboard/grid-utils.ts
index 170be496631..8a1e5bd8ab0 100644
--- a/frontend/src/metabase/dashboard/grid-utils.ts
+++ b/frontend/src/metabase/dashboard/grid-utils.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { DEFAULT_CARD_SIZE } from "metabase/lib/dashboard_grid";
+import { DEFAULT_CARD_SIZE } from "metabase/utils/dashboard_grid";
import { getVisualizationRaw } from "metabase/visualizations";
import type {
BaseDashboardCard,
diff --git a/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.ts b/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.ts
index eafe07efa27..19e63740025 100644
--- a/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-auto-scroll-to-dashcard.ts
@@ -2,8 +2,8 @@ import type { LocationDescriptorObject } from "history";
import { useCallback, useMemo } from "react";
import { replace } from "react-router-redux";
-import { parseHashOptions, stringifyHashOptions } from "metabase/lib/browser";
-import { useDispatch } from "metabase/lib/redux";
+import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";
+import { useDispatch } from "metabase/utils/redux";
import type { DashCardId } from "metabase-types/api";
export interface UseAutoScrollToDashcardResult {
diff --git a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts
index a2f38677521..281d895bd91 100644
--- a/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-click-behavior-data.ts
@@ -11,9 +11,9 @@ import {
getParameterValuesBySlugMap,
getParameters,
} from "metabase/dashboard/selectors";
-import { getLinkTargets } from "metabase/lib/click-behavior";
-import { useStore } from "metabase/lib/redux";
import { getUserAttributes } from "metabase/selectors/user";
+import { getLinkTargets } from "metabase/utils/click-behavior";
+import { useStore } from "metabase/utils/redux";
import type { ClickObject } from "metabase/visualizations/types";
import Question from "metabase-lib/v1/Question";
import type { DashCardId } from "metabase-types/api";
diff --git a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts
index 608171756c0..aa5955fa1e9 100644
--- a/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-dashboard-url-query.ts
@@ -6,10 +6,10 @@ import { usePrevious } from "react-use";
import _ from "underscore";
import { useSetting } from "metabase/common/hooks";
-import { IS_EMBED_PREVIEW } from "metabase/lib/embed";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { selectTab } from "metabase/redux/dashboard";
+import { IS_EMBED_PREVIEW } from "metabase/utils/embed";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";
import {
diff --git a/frontend/src/metabase/dashboard/hooks/use-location-sync.ts b/frontend/src/metabase/dashboard/hooks/use-location-sync.ts
index 18710d08f91..de3e9c477ed 100644
--- a/frontend/src/metabase/dashboard/hooks/use-location-sync.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-location-sync.ts
@@ -4,9 +4,9 @@ import { replace } from "react-router-redux";
import { usePrevious } from "react-use";
import { omit } from "underscore";
-import { parseHashOptions, stringifyHashOptions } from "metabase/lib/browser";
-import { useDispatch } from "metabase/lib/redux";
-import { isNullOrUndefined } from "metabase/lib/types";
+import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";
+import { useDispatch } from "metabase/utils/redux";
+import { isNullOrUndefined } from "metabase/utils/types";
type SYNCED_KEY = "refresh" | "fullscreen";
diff --git a/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.ts b/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.ts
index 0b81b47c60a..9ee3e0d4c76 100644
--- a/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-refresh-dashboard.ts
@@ -4,7 +4,7 @@ import {
fetchDashboard,
fetchDashboardCardData,
} from "metabase/dashboard/actions";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { DashboardId, ParameterValuesMap } from "metabase-types/api";
interface UseRefreshDashboardProps {
diff --git a/frontend/src/metabase/dashboard/hooks/use-responsive-parameter-list.ts b/frontend/src/metabase/dashboard/hooks/use-responsive-parameter-list.ts
index ce0a95d97b9..3d62c6a3409 100644
--- a/frontend/src/metabase/dashboard/hooks/use-responsive-parameter-list.ts
+++ b/frontend/src/metabase/dashboard/hooks/use-responsive-parameter-list.ts
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useRef, useState } from "react";
import { useDashboardContext } from "metabase/dashboard/context";
-import resizeObserver from "metabase/lib/resize-observer";
+import resizeObserver from "metabase/utils/resize-observer";
type Opts = {
reservedWidth: number;
diff --git a/frontend/src/metabase/dashboard/reducers-typed.ts b/frontend/src/metabase/dashboard/reducers-typed.ts
index 532ccdb57a4..096798cea03 100644
--- a/frontend/src/metabase/dashboard/reducers-typed.ts
+++ b/frontend/src/metabase/dashboard/reducers-typed.ts
@@ -10,7 +10,6 @@ import {
} from "metabase/api";
import { Dashboards } from "metabase/entities/dashboards";
import { Questions } from "metabase/entities/questions";
-import { handleActions } from "metabase/lib/redux";
import { REVERT_TO_REVISION } from "metabase/query_builder/actions";
import {
INITIALIZE,
@@ -21,6 +20,7 @@ import {
reset,
} from "metabase/redux/dashboard";
import { NAVIGATE_BACK_TO_DASHBOARD } from "metabase/redux/query-builder";
+import { handleActions } from "metabase/utils/redux";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
Card,
diff --git a/frontend/src/metabase/dashboard/reducers.ts b/frontend/src/metabase/dashboard/reducers.ts
index c3fa2452a7b..c5c86ed94a3 100644
--- a/frontend/src/metabase/dashboard/reducers.ts
+++ b/frontend/src/metabase/dashboard/reducers.ts
@@ -3,8 +3,8 @@ import { assoc, chain, merge, updateIn } from "icepick";
import { Actions } from "metabase/entities/actions";
import { Questions } from "metabase/entities/questions";
-import { combineReducers } from "metabase/lib/redux";
import { SET_PARAMETER_VALUES, initialize } from "metabase/redux/dashboard";
+import { combineReducers } from "metabase/utils/redux";
import type { Card, WritebackAction } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/sections.ts b/frontend/src/metabase/dashboard/sections.ts
index 3a627dcee20..40774064431 100644
--- a/frontend/src/metabase/dashboard/sections.ts
+++ b/frontend/src/metabase/dashboard/sections.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { GRID_WIDTH } from "metabase/lib/dashboard_grid";
+import { GRID_WIDTH } from "metabase/utils/dashboard_grid";
import type {
DashboardCardLayoutAttrs,
VirtualCard,
diff --git a/frontend/src/metabase/dashboard/selectors.ts b/frontend/src/metabase/dashboard/selectors.ts
index 19f276db333..fc8652ca4b3 100644
--- a/frontend/src/metabase/dashboard/selectors.ts
+++ b/frontend/src/metabase/dashboard/selectors.ts
@@ -8,9 +8,6 @@ import {
SIDEBAR_NAME,
} from "metabase/dashboard/constants";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { isQuestionCard, isQuestionDashCard } from "metabase/lib/dashboard";
-import { isNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import {
getDashboardQuestions,
getSavedDashboardUiParameters,
@@ -26,6 +23,9 @@ import {
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { getIsWebApp } from "metabase/selectors/web-app";
+import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";
+import { isNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";
import Question from "metabase-lib/v1/Question";
import {
diff --git a/frontend/src/metabase/dashboard/utils.ts b/frontend/src/metabase/dashboard/utils.ts
index f17e297e378..02c16b26e4b 100644
--- a/frontend/src/metabase/dashboard/utils.ts
+++ b/frontend/src/metabase/dashboard/utils.ts
@@ -1,10 +1,13 @@
import type { Location } from "history";
import _ from "underscore";
-import { isQuestionDashCard, isVirtualDashCard } from "metabase/lib/dashboard";
-import { SERVER_ERROR_TYPES } from "metabase/lib/errors";
-import { isStaticEmbeddingEntityLoadingError } from "metabase/lib/errors/is-static-embedding-entity-loading-error";
-import type { StaticEmbeddingEntityError } from "metabase/lib/errors/types";
+import {
+ isQuestionDashCard,
+ isVirtualDashCard,
+} from "metabase/utils/dashboard";
+import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
+import { isStaticEmbeddingEntityLoadingError } from "metabase/utils/errors/is-static-embedding-entity-loading-error";
+import type { StaticEmbeddingEntityError } from "metabase/utils/errors/types";
import {
getGenericErrorMessage,
getPermissionErrorMessage,
diff --git a/frontend/src/metabase/dashboard/utils.unit.spec.ts b/frontend/src/metabase/dashboard/utils.unit.spec.ts
index 50760088d2d..20f1db41171 100644
--- a/frontend/src/metabase/dashboard/utils.unit.spec.ts
+++ b/frontend/src/metabase/dashboard/utils.unit.spec.ts
@@ -15,8 +15,8 @@ import {
setDashboardHeaderParameterIndex,
syncParametersAndEmbeddingParams,
} from "metabase/dashboard/utils";
-import { SERVER_ERROR_TYPES } from "metabase/lib/errors";
-import { checkNotNull } from "metabase/lib/types";
+import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
+import { checkNotNull } from "metabase/utils/types";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { ParameterValueOrArray } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsx b/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsx
index d40e2812b58..9269db65714 100644
--- a/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/DashCardPlaceholder.tsx
@@ -7,8 +7,8 @@ import {
isInDbTree,
} from "metabase/common/components/Pickers";
import { replaceCard } from "metabase/dashboard/actions";
-import { useDispatch } from "metabase/lib/redux";
import { Button, Flex } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type {
VisualizationDefinition,
VisualizationProps,
diff --git a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx
index caefff63f7d..21d0102003b 100644
--- a/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/Heading/Heading.tsx
@@ -14,11 +14,11 @@ import {
getParameterValues,
} from "metabase/dashboard/selectors";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { measureTextWidth } from "metabase/lib/measure-text";
-import { useSelector } from "metabase/lib/redux";
-import { isEmpty } from "metabase/lib/validate";
import { getSetting } from "metabase/selectors/settings";
import { Box, Ellipsified, Flex } from "metabase/ui";
+import { measureTextWidth } from "metabase/utils/measure-text";
+import { useSelector } from "metabase/utils/redux";
+import { isEmpty } from "metabase/utils/validate";
import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type {
Dashboard,
diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
index ac9f1e8fcfa..5252b012aef 100644
--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/IFrameViz.tsx
@@ -6,9 +6,9 @@ import { Link } from "metabase/common/components/Link";
import { useDocsUrl, useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { getParameterValues } from "metabase/dashboard/selectors";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Button, Group, Icon, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type {
Dashboard,
diff --git a/frontend/src/metabase/dashboard/visualizations/IFrameViz/utils.ts b/frontend/src/metabase/dashboard/visualizations/IFrameViz/utils.ts
index 6c5b7c36f90..2591e4606f6 100644
--- a/frontend/src/metabase/dashboard/visualizations/IFrameViz/utils.ts
+++ b/frontend/src/metabase/dashboard/visualizations/IFrameViz/utils.ts
@@ -1,4 +1,4 @@
-import { isSafeUrl } from "metabase/lib/formatting/link";
+import { isSafeUrl } from "metabase/utils/formatting/link";
/**
* Reconstructs a URL from its parts while preserving parameter placeholders (e.g. {{param}}).
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx
index baf1b7136f5..9c17063d85c 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/EntityDisplay.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { Markdown } from "metabase/common/components/Markdown";
-import { getIcon } from "metabase/lib/icon";
-import { isEmpty } from "metabase/lib/validate";
import { Icon } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { isEmpty } from "metabase/utils/validate";
import type { UnrestrictedLinkEntity } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
index ba1891a90d6..5bd7de11c72 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
@@ -6,10 +6,10 @@ import { TippyPopover } from "metabase/common/components/Popover/TippyPopover";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { getParameterValues } from "metabase/dashboard/selectors";
import { Search } from "metabase/entities/search";
-import { getUrlTarget } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
-import { modelToUrl } from "metabase/lib/urls";
import { SearchResults } from "metabase/nav/components/search/SearchResults";
+import { getUrlTarget } from "metabase/utils/dom";
+import { useSelector } from "metabase/utils/redux";
+import { modelToUrl } from "metabase/utils/urls";
import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type {
Dashboard,
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
index 626c2f40210..6ac4933132c 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.unit.spec.tsx
@@ -14,7 +14,7 @@ import {
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import * as domUtils from "metabase/lib/dom";
+import * as iframeUtils from "metabase/utils/iframe";
import registerVisualizations from "metabase/visualizations/register";
import type {
LinkCardSettings,
@@ -317,7 +317,7 @@ describe("LinkViz", () => {
it("sets embedded entity links to not open in new tabs", () => {
// here, we're mocking this appearing in an iframe
- jest.spyOn(domUtils, "isWithinIframe").mockReturnValue(true);
+ jest.spyOn(iframeUtils, "isWithinIframe").mockReturnValue(true);
setup({
isEditing: false,
diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx
index 35cbdfd9e6b..678abcd964b 100644
--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx
+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.stories.tsx
@@ -8,9 +8,9 @@ import type {
ColumnOptions,
RowIdColumnOptions,
} from "metabase/data-grid/types";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { publicReducers } from "metabase/reducers-public";
import { Checkbox, Flex } from "metabase/ui";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import {
createMockSettingsState,
createMockState,
diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx
index ea57f0042a1..009ea3cab32 100644
--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx
+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx
@@ -10,7 +10,7 @@ import { useCallback, useEffect, useState } from "react";
import _ from "underscore";
import { useForceUpdate } from "metabase/common/hooks/use-force-update";
-import { getScrollBarSize } from "metabase/lib/dom";
+import { getScrollBarSize } from "metabase/utils/dom";
import {
ADD_COLUMN_BUTTON_WIDTH,
diff --git a/frontend/src/metabase/data-grid/hooks/use-body-cell-measure.tsx b/frontend/src/metabase/data-grid/hooks/use-body-cell-measure.tsx
index 2b617dc617f..b133a3a9413 100644
--- a/frontend/src/metabase/data-grid/hooks/use-body-cell-measure.tsx
+++ b/frontend/src/metabase/data-grid/hooks/use-body-cell-measure.tsx
@@ -4,7 +4,7 @@ import { createPortal } from "react-dom";
import { getPortalRootElement } from "metabase/css/core/overlays/utils";
import { BodyCell } from "metabase/data-grid/components/BodyCell/BodyCell";
-import { reactNodeToHtmlString } from "metabase/lib/react-to-html";
+import { reactNodeToHtmlString } from "metabase/utils/react-to-html";
import { DEFAULT_FONT_SIZE } from "../constants";
import type { DataGridTheme } from "../types";
diff --git a/frontend/src/metabase/data-grid/hooks/use-data-grid-instance.tsx b/frontend/src/metabase/data-grid/hooks/use-data-grid-instance.tsx
index 20daed1ef65..143137721bb 100644
--- a/frontend/src/metabase/data-grid/hooks/use-data-grid-instance.tsx
+++ b/frontend/src/metabase/data-grid/hooks/use-data-grid-instance.tsx
@@ -42,8 +42,8 @@ import type {
} from "metabase/data-grid/types";
import { getDataColumn } from "metabase/data-grid/utils/columns/data-column";
import { getRowIdColumn } from "metabase/data-grid/utils/columns/row-id-column";
-import { getScrollBarSize } from "metabase/lib/dom";
-import { isNotNull } from "metabase/lib/types";
+import { getScrollBarSize } from "metabase/utils/dom";
+import { isNotNull } from "metabase/utils/types";
import { getTruncatedColumnSizing } from "../utils/column-sizing";
import { maybeExpandColumnWidths } from "../utils/maybe-expand-column-widths";
diff --git a/frontend/src/metabase/data-grid/hooks/use-measure-column-widths.tsx b/frontend/src/metabase/data-grid/hooks/use-measure-column-widths.tsx
index 65a5eeb141a..190d17362f8 100644
--- a/frontend/src/metabase/data-grid/hooks/use-measure-column-widths.tsx
+++ b/frontend/src/metabase/data-grid/hooks/use-measure-column-widths.tsx
@@ -8,10 +8,10 @@ import type { Root } from "react-dom/client";
import type { ColumnOptions, DataGridTheme } from "metabase/data-grid/types";
import { pickRowsToMeasure } from "metabase/data-grid/utils/column-sizing";
-import { createMeasurementContainer } from "metabase/lib/measure-container";
-import { renderRoot, unmountRoot } from "metabase/lib/react-compat";
-import { isNotNull } from "metabase/lib/types";
import { MeasurementProviders } from "metabase/ui/components/theme/MeasurementProviders";
+import { createMeasurementContainer } from "metabase/utils/measure-container";
+import { renderRoot, unmountRoot } from "metabase/utils/react-compat";
+import { isNotNull } from "metabase/utils/types";
import { DataGridThemeProvider } from "./use-table-theme";
diff --git a/frontend/src/metabase/data-studio/analytics.ts b/frontend/src/metabase/data-studio/analytics.ts
index b3af214880a..d801a06633c 100644
--- a/frontend/src/metabase/data-studio/analytics.ts
+++ b/frontend/src/metabase/data-studio/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { CollectionId, ConcreteTableId } from "metabase-types/api";
export const trackDataStudioLibraryCreated = (id: CollectionId) => {
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
index d96d577c723..8f958baf8e0 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/DataStudioLayout.tsx
@@ -7,9 +7,6 @@ import { ForwardRefLink } from "metabase/common/components/Link";
import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";
import { useHasTokenFeature } from "metabase/common/hooks";
import { useUserKeyValue } from "metabase/common/hooks/use-user-key-value";
-import { isMac } from "metabase/lib/browser";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import {
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
@@ -35,6 +32,9 @@ import {
Text,
Tooltip,
} from "metabase/ui";
+import { isMac } from "metabase/utils/browser";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import S from "./DataStudioLayout.module.css";
import { getCurrentTab } from "./utils";
diff --git a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
index 116306d60d4..56c22a7820e 100644
--- a/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
+++ b/frontend/src/metabase/data-studio/app/pages/DataStudioLayout/utils.ts
@@ -1,4 +1,4 @@
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
type TabName =
| "data"
diff --git a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
index 08c3229ce6a..80270cc1343 100644
--- a/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
+++ b/frontend/src/metabase/data-studio/app/pages/TransformsSectionLayout/TransformsSectionLayout.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { useSetting } from "metabase/common/hooks";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_TRANSFORMS } from "metabase/plugins";
import { EnableTransformsPage } from "metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage";
import { getShouldShowTransformsUpsell } from "metabase/transforms/selectors";
+import { useSelector } from "metabase/utils/redux";
import { SectionLayout } from "../../components/SectionLayout";
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
index 3bbce5fcbf9..4741a4f19dc 100644
--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx
@@ -2,8 +2,8 @@ import { skipToken } from "@reduxjs/toolkit/query";
import { Link } from "react-router";
import { useListDatabaseSchemasQuery } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { Ellipsified } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
import { DataStudioBreadcrumbs } from "../DataStudioBreadcrumbs";
diff --git a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
index 9a98e81b02a..66572884883 100644
--- a/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx
@@ -1,6 +1,6 @@
import { Link } from "react-router";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
import { useCollectionPath } from "../../hooks/use-collection-path/useCollectionPath";
diff --git a/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
index bc91e91a3e7..df8368d5fd1 100644
--- a/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
+++ b/frontend/src/metabase/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx
@@ -4,9 +4,9 @@ import {
type PaneHeaderTab,
PaneHeaderTabs,
} from "metabase/data-studio/common/components/PaneHeader";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getLocation } from "metabase/selectors/routing";
+import { useSelector } from "metabase/utils/redux";
export type EntityDetailTabUrls = {
definition: string;
diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
index fa8e86dd171..f99eab06fda 100644
--- a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
+++ b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
@@ -1,9 +1,9 @@
import { useMemo } from "react";
import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
-import { useSelector } from "metabase/lib/redux";
import { QueryVisualization } from "metabase/querying/components/QueryVisualization";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import Question from "metabase-lib/v1/Question";
import type { Card, Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
index a06af3c24bf..07456e7cd1e 100644
--- a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
+++ b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
@@ -3,7 +3,6 @@ import { Link } from "react-router";
import { t } from "ttag";
import { EditableText } from "metabase/common/components/EditableText";
-import { useSelector } from "metabase/lib/redux";
import { MetabotDataStudioButton } from "metabase/metabot/components/MetabotDataStudioButton";
import { AppSwitcher } from "metabase/nav/components/AppSwitcher";
import { getLocation } from "metabase/selectors/routing";
@@ -18,6 +17,7 @@ import {
type StackProps,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import S from "./PaneHeader.module.css";
import type { PaneHeaderTab } from "./types";
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts
index a2f4a86b0a9..1e569c4e184 100644
--- a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts
+++ b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/use-build-snippet-tree.ts
@@ -2,8 +2,8 @@ import { useMemo } from "react";
import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";
import type { TreeItem } from "metabase/data-studio/common/types";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
+import { useSelector } from "metabase/utils/redux";
import { buildActiveSnippetTree, buildArchivedSnippetTree } from "./utils";
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts b/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
index 802c8801342..1305ad2b0b6 100644
--- a/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
+++ b/frontend/src/metabase/data-studio/common/hooks/use-load-table-with-metadata/use-load-table-with-metadata.ts
@@ -5,7 +5,7 @@ import {
skipToken,
useGetTableQueryMetadataQuery,
} from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { TableId } from "metabase-types/api";
type UseLoadTableWithMetadataOptions = {
diff --git a/frontend/src/metabase/data-studio/common/utils/create-empty-space-item.ts b/frontend/src/metabase/data-studio/common/utils/create-empty-space-item.ts
index b866ddd677d..84394ddf2b5 100644
--- a/frontend/src/metabase/data-studio/common/utils/create-empty-space-item.ts
+++ b/frontend/src/metabase/data-studio/common/utils/create-empty-space-item.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { CollectionId } from "metabase-types/api";
import type { LibrarySectionType, TreeItem } from "../types";
diff --git a/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts b/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts
index 9f55506a995..37d96edf944 100644
--- a/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts
+++ b/frontend/src/metabase/data-studio/common/utils/get-dataset-query-preview-url.ts
@@ -1,4 +1,4 @@
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { DatasetQuery } from "metabase-types/api";
export function getDatasetQueryPreviewUrl(
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx
index 5282da5c98d..dd33466d21b 100644
--- a/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx
+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx
@@ -1,6 +1,6 @@
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Flex } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { DatasetQuery, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx
index bb5edcbfadf..a91f8cafce8 100644
--- a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx
+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { useListRevisionsQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSelector } from "metabase/lib/redux";
import { getUserId } from "metabase/selectors/user";
import { Center, Stack, Text, Timeline } from "metabase/ui";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";
+import { useSelector } from "metabase/utils/redux";
import type { RevisionEntityType, TableId } from "metabase-types/api";
import { RevisionItem } from "./RevisionItem";
diff --git a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx
index 02d8e50febf..fa11e381f70 100644
--- a/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx
+++ b/frontend/src/metabase/data-studio/components/RevisionHistory/RevisionItem.tsx
@@ -3,9 +3,9 @@ import relativeTime from "dayjs/plugin/relativeTime";
import { t } from "ttag";
import { UserAvatar } from "metabase/common/components/UserAvatar";
-import { useSelector } from "metabase/lib/redux";
import { getUserId } from "metabase/selectors/user";
import { Box, Flex, Stack, Text, Timeline } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { FieldDiff, Revision, TableId } from "metabase-types/api";
import { RevisionDiff } from "./RevisionDiff";
diff --git a/frontend/src/metabase/data-studio/data-model/analytics.ts b/frontend/src/metabase/data-studio/data-model/analytics.ts
index 2ab5d15770f..370604b92d0 100644
--- a/frontend/src/metabase/data-studio/data-model/analytics.ts
+++ b/frontend/src/metabase/data-studio/data-model/analytics.ts
@@ -1,5 +1,5 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
import type { MetadataEditEventDetail } from "metabase/metadata/pages/shared/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export function trackMetadataChange(detail: MetadataEditEventDetail) {
trackSimpleEvent({
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
index 57ed7f369a5..37b6129f972 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/components/TablePicker.tsx
@@ -4,7 +4,6 @@ import { usePrevious } from "react-use";
import { t } from "ttag";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { PLUGIN_LIBRARY } from "metabase/plugins";
import {
Badge,
@@ -19,6 +18,7 @@ import {
Tooltip,
rem,
} from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
import { useSelection } from "../../../pages/DataModel/contexts/SelectionContext";
import type { RouteParams } from "../../../pages/DataModel/types";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
index 832e2da0d2b..11f63b9c2d3 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useSearch.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { skipToken, useSearchQuery } from "metabase/api";
-import { isSyncCompleted } from "metabase/lib/syncing";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { DatabaseNode, SchemaNode, TableNode, TreeNode } from "../types";
import { node, rootNode } from "../utils";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
index cd78c1f086a..187cb8745b3 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/hooks/useTableLoader.ts
@@ -7,7 +7,7 @@ import {
useLazyListDatabaseSchemasQuery,
useLazyListDatabasesQuery,
} from "metabase/api";
-import { isSyncCompleted } from "metabase/lib/syncing";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { DatabaseId, SchemaName } from "metabase-types/api";
import { UNNAMED_SCHEMA_NAME } from "../constants";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx b/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx
index caeadb1b888..fa00f841112 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TablePicker/wrappers.tsx
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useState } from "react";
import { replace } from "react-router-redux";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { RouteParams } from "../../pages/DataModel/types";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
index 5c6d61df4c4..dbcbaa9d8e9 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/TableSection.tsx
@@ -9,10 +9,6 @@ import {
import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import type { DataStudioTableMetadataTab } from "metabase/lib/urls/data-studio";
-import { dependencyGraph } from "metabase/lib/urls/dependencies";
import {
FieldOrderPicker,
NameDescriptionInput,
@@ -38,6 +34,10 @@ import {
Tabs,
Tooltip,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
+import type { DataStudioTableMetadataTab } from "metabase/utils/urls/data-studio";
+import { dependencyGraph } from "metabase/utils/urls/dependencies";
import {
type FieldId,
type Table,
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
index ea38a04ae83..1d77bc8e405 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/MeasureList/MeasureList.tsx
@@ -4,9 +4,9 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
import { trackMeasureCreateStarted } from "metabase/data-studio/analytics";
import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Button, Group, Icon, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { ConcreteTableId, Table } from "metabase-types/api";
import S from "../../TableSection.module.css";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx
index 5bd25f623be..5564d57d741 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentItem.unit.spec.tsx
@@ -1,7 +1,7 @@
import { Route } from "react-router";
import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import { createMockSegment } from "metabase-types/api/mocks";
import { SegmentItem } from "./SegmentItem";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
index a74ebc96222..750fb5a05ed 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/SegmentList/SegmentList.tsx
@@ -4,9 +4,9 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
import { trackSegmentCreateStarted } from "metabase/data-studio/analytics";
import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Button, Group, Icon, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
import S from "../../TableSection.module.css";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
index 6b402b9c32c..9bddec0eeed 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditBulk.tsx
@@ -7,7 +7,6 @@ import {
trackDataStudioBulkAttributeUpdated,
trackDataStudioBulkSyncSettingsClicked,
} from "metabase/data-studio/analytics";
-import { useSelector } from "metabase/lib/redux";
import {
DataSourceInput,
EntityTypeInput,
@@ -17,6 +16,7 @@ import {
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_LIBRARY, PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { Box, Button, Group, Icon, Stack, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type {
TableDataLayer,
TableDataSource,
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx
index 4ff1d45b171..3ff4212aa8e 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableAttributesEditSingle.tsx
@@ -3,7 +3,6 @@ import { Link } from "react-router";
import { t } from "ttag";
import { useUpdateTableMutation } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import {
DataSourceInput,
EntityTypeInput,
@@ -12,6 +11,7 @@ import {
} from "metabase/metadata/components";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Icon, Text } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type {
Table,
TableDataLayer,
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
index 00117a96f7d..a508502f3ba 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.tsx
@@ -1,8 +1,8 @@
import { Link } from "react-router";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
import { Box } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
import S from "./TableCollection.module.css";
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx
index 30df9e3b4ae..b068b187e47 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableMetadata.tsx
@@ -4,10 +4,10 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
import { useNumberFormatter } from "metabase/common/hooks/use-number-formatter";
-import { isNullOrUndefined } from "metabase/lib/types";
-import { dependencyGraph } from "metabase/lib/urls/dependencies";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Ellipsified, Group, Stack, Text } from "metabase/ui";
+import { isNullOrUndefined } from "metabase/utils/types";
+import { dependencyGraph } from "metabase/utils/urls/dependencies";
import type { Table } from "metabase-types/api";
interface Props {
diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
index f8225b71b7d..63cdff67383 100644
--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/tests/setup.tsx
@@ -8,7 +8,7 @@ import {
import { mockSettings } from "__support__/settings";
import { renderWithProviders } from "__support__/ui";
import type { RouteParams } from "metabase/data-studio/data-model/pages/DataModel/types";
-import type { DataStudioTableMetadataTab } from "metabase/lib/urls";
+import type { DataStudioTableMetadataTab } from "metabase/utils/urls";
import type {
Database,
EnterpriseSettings,
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
index bb17ba8119f..c224f2f767f 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.tsx
@@ -15,7 +15,6 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContai
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { hasLibraryCollection } from "metabase/data-studio/common/utils";
import { isCypressActive } from "metabase/env";
-import * as Urls from "metabase/lib/urls";
import {
FieldSection,
FieldValuesModal,
@@ -36,6 +35,7 @@ import {
Stack,
rem,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { trackMetadataChange } from "../../analytics";
import {
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
index a75bc3cc841..46fc342995d 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/DataModel.unit.spec.tsx
@@ -24,9 +24,9 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import { checkNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import registerVisualizations from "metabase/visualizations/register";
import type {
Database,
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts
index be7b27ccab5..a971929dae2 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/types.ts
@@ -1,4 +1,4 @@
-import type { DataStudioTableMetadataTab } from "metabase/lib/urls/data-studio";
+import type { DataStudioTableMetadataTab } from "metabase/utils/urls/data-studio";
import type {
DatabaseId,
FieldId,
diff --git a/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts b/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts
index c7b3c313d4c..a675684e36d 100644
--- a/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts
+++ b/frontend/src/metabase/data-studio/data-model/pages/DataModel/utils.ts
@@ -1,5 +1,5 @@
-import * as Urls from "metabase/lib/urls";
-import { isDataStudioTableMetadataTab } from "metabase/lib/urls/data-studio";
+import * as Urls from "metabase/utils/urls";
+import { isDataStudioTableMetadataTab } from "metabase/utils/urls/data-studio";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import type { ParsedRouteParams, RouteParams } from "./types";
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
index 3a82e6315b8..936decd1e30 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx
@@ -4,7 +4,7 @@ import {
DataModelBreadcrumbs,
PublishedTableBreadcrumbs,
} from "metabase/data-studio/common/components/Breadcrumbs";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Measure, Table } from "metabase-types/api";
type MeasureBreadcrumbsProps = {
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
index 3fb0a6a1764..33531a16354 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
@@ -6,7 +6,7 @@ import {
setupTablesEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Collection, Measure, Table } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
index af5da41f373..9e4ce17c5fc 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-data-model-measure-page.ts
@@ -7,9 +7,9 @@ import {
useGetMeasureQuery,
useUpdateMeasureMutation,
} from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
index 7d9146d0a23..82f167b47cc 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page.ts
@@ -8,8 +8,8 @@ import {
useUpdateMeasureMutation,
} from "metabase/api";
import { useToast } from "metabase/common/hooks/use-toast";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
import type { MeasureTabUrls } from "../types";
diff --git a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
index 517e57b7ab5..f13b66cb595 100644
--- a/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx
@@ -3,8 +3,8 @@ import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
index 59848a89565..0af379bd628 100644
--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
@@ -8,10 +8,10 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";
-import { useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
import { Button, Group } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { Measure } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
index bae53df06be..78fa443431a 100644
--- a/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx
@@ -9,10 +9,10 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { trackMeasureCreated } from "metabase/data-studio/analytics";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
import { Button } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { DatasetQuery, Measure, Table } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
index a94c2409eb4..75a47792a9b 100644
--- a/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
+++ b/frontend/src/metabase/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx
@@ -3,8 +3,8 @@ import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";
import { NewMeasurePage } from "../NewMeasurePage";
diff --git a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
index 67a16a0ab0d..6a599704f93 100644
--- a/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
+++ b/frontend/src/metabase/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
@@ -2,9 +2,9 @@ import { useCallback } from "react";
import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { openUrl } from "metabase/redux/app";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
type DataStudioToolbarButtonProps = {
diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsx
index cf8476f6452..e7123cffac0 100644
--- a/frontend/src/metabase/data-studio/routes.tsx
+++ b/frontend/src/metabase/data-studio/routes.tsx
@@ -2,7 +2,6 @@ import type { Store } from "@reduxjs/toolkit";
import type { ComponentType } from "react";
import { IndexRoute, Route } from "react-router";
-import * as Urls from "metabase/lib/urls";
import {
PLUGIN_DEPENDENCIES,
PLUGIN_FEATURE_LEVEL_PERMISSIONS,
@@ -11,6 +10,7 @@ import {
} from "metabase/plugins";
import { getDataStudioTransformRoutes } from "metabase/transforms/routes";
import { canAccessTransforms } from "metabase/transforms/selectors";
+import * as Urls from "metabase/utils/urls";
import type { State } from "metabase-types/store";
import { DataSectionLayout } from "./app/pages/DataSectionLayout";
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
index db4afc70b1f..032be8266b6 100644
--- a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx
@@ -4,7 +4,7 @@ import {
DataModelBreadcrumbs,
PublishedTableBreadcrumbs,
} from "metabase/data-studio/common/components/Breadcrumbs";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Segment, Table } from "metabase-types/api";
type SegmentBreadcrumbsProps = {
diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx
index 003543e875d..3210775c2ad 100644
--- a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx
@@ -7,7 +7,7 @@ import {
} from "__support__/server-mocks";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/entities/collections";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Segment, Table } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
index b9d58db64f3..f09d281cbad 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-data-model-segment-page.ts
@@ -7,9 +7,9 @@ import {
useGetSegmentQuery,
useUpdateSegmentMutation,
} from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
index b41bacff9b3..11a644ef588 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page.ts
@@ -8,8 +8,8 @@ import {
useUpdateSegmentMutation,
} from "metabase/api";
import { useToast } from "metabase/common/hooks/use-toast";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";
import type { SegmentTabUrls } from "../types";
diff --git a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
index bc0a19a8477..21a1e573f2b 100644
--- a/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/DataModelNewSegmentPage/DataModelNewSegmentPage.tsx
@@ -3,8 +3,8 @@ import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import { DataModelSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
diff --git a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
index 0e1c21399f9..705d88da51c 100644
--- a/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx
@@ -9,10 +9,10 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { trackSegmentCreated } from "metabase/data-studio/analytics";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
import { Button } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { DatasetQuery, Segment, Table } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
index 2fe55a6c0e7..508160a6523 100644
--- a/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/PublishedTableNewSegmentPage/PublishedTableNewSegmentPage.tsx
@@ -3,8 +3,8 @@ import type { Route } from "react-router";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useLoadTableWithMetadata } from "metabase/data-studio/common/hooks/use-load-table-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { PublishedTableSegmentBreadcrumbs } from "../../components/SegmentBreadcrumbs";
import { NewSegmentPage } from "../NewSegmentPage";
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
index 7f8310022a4..7bd9c7f2945 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
@@ -8,10 +8,10 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";
import { getUserCanWriteSegments } from "metabase/data-studio/selectors";
-import { useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
import { Button, Group } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { Segment } from "metabase-types/api";
diff --git a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
index 1103b938385..346f7295146 100644
--- a/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
+++ b/frontend/src/metabase/data-studio/segments/pages/SegmentDetailPage/tests/setup.tsx
@@ -10,7 +10,7 @@ import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
import { DataModelSegmentBreadcrumbs } from "metabase/data-studio/segments/components/SegmentBreadcrumbs";
import { SegmentDetailPage } from "metabase/data-studio/segments/pages/SegmentDetailPage";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type {
EnterpriseSettings,
Segment,
diff --git a/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx b/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx
index 97a3e6474c0..8f132937f0c 100644
--- a/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx
+++ b/frontend/src/metabase/data-studio/upsells/components/UpsellCardContent.tsx
@@ -8,7 +8,6 @@ import {
trackUpsellClicked,
trackUpsellViewed,
} from "metabase/common/components/upsells/components/analytics";
-import { useSelector } from "metabase/lib/redux";
import { getStoreUsers } from "metabase/selectors/store-users";
import { getIsHosted } from "metabase/setup/selectors";
import {
@@ -24,6 +23,7 @@ import {
Title,
rem,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import S from "./UpsellCardContent.module.css";
diff --git a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
index 9e1e700ab43..276cd671aaa 100644
--- a/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
+++ b/frontend/src/metabase/data-studio/upsells/pages/RemoteSyncUpsellPage.tsx
@@ -5,9 +5,9 @@ import { DATA_STUDIO_UPGRADE_URL } from "metabase/common/components/upsells/cons
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { UpsellCardContent } from "metabase/data-studio/upsells/components/UpsellCardContent";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { DottedBackground } from "../components/DottedBackground";
import { LineDecorator } from "../components/LineDecorator";
diff --git a/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.ts b/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.ts
index c0774466012..a52636b784e 100644
--- a/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.ts
+++ b/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { FormLocation } from "../../types";
diff --git a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx
index 9809908feb6..4ddd43a211e 100644
--- a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx
@@ -9,7 +9,6 @@ import {
getEngineLogo,
getEngineOptions,
} from "metabase/databases/utils/engine";
-import { useSelector } from "metabase/lib/redux";
import {
Button,
Center,
@@ -22,6 +21,7 @@ import {
Text,
useCombobox,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import S from "./DatabaseEngineList.module.css";
diff --git a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx
index dcb2e8ac237..6cafd5dbc96 100644
--- a/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseForm/DatabaseForm.tsx
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { Form, FormProvider } from "metabase/forms";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import type { DatabaseData, EngineKey } from "metabase-types/api";
import { getEngines } from "../../selectors";
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx
index 4f8427380fd..5fc889f9d19 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/AdditionalHelpButtonGroup.tsx
@@ -2,12 +2,12 @@ import { Link } from "react-router";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getDocsUrl } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Button, Divider, Icon } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { ContactSupportButtonSection } from "./ContactSupportButtonSection";
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx
index 107fef74100..995aacbdacc 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/ContactSupportButtonSection.tsx
@@ -2,9 +2,9 @@ import { Link } from "react-router";
import { t } from "ttag";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { Button, Flex } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { TroubleshootingTip } from "./TroubleshootingTip";
diff --git a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx
index f7d09321b84..1cc776b91f6 100644
--- a/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseFormError/useTroubleshootingTips.tsx
@@ -3,11 +3,11 @@ import { useMemo } from "react";
import { c, t } from "ttag";
import { identity } from "underscore";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { getIsHosted } from "metabase/setup";
import { Code } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import type { TipProps as _TipProps } from "./TroubleshootingTip";
diff --git a/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx b/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx
index afdb57bc7d2..94bc6d0d1d6 100644
--- a/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx
+++ b/frontend/src/metabase/databases/components/DatabaseHelpCard/DatabaseHelpCard.tsx
@@ -2,8 +2,8 @@ import { jt, t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { HelpCard } from "metabase/common/components/HelpCard";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl, getSetting } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export interface DatabaseHelpCardProps {
className?: string;
diff --git a/frontend/src/metabase/databases/utils/engine.ts b/frontend/src/metabase/databases/utils/engine.ts
index 33aae69001c..7529a506fc5 100644
--- a/frontend/src/metabase/databases/utils/engine.ts
+++ b/frontend/src/metabase/databases/utils/engine.ts
@@ -46,3 +46,34 @@ export const getEngineLogo = (engine: string): string | undefined => {
export const getDefaultEngineKey = (engines: Record<string, Engine>) => {
return engines["postgres"] ? "postgres" : Object.keys(engines)[0];
};
+
+export function getEngineNativeType(engine?: string): "sql" | "json" {
+ switch (engine) {
+ case "mongo":
+ case "druid":
+ return "json";
+ default:
+ return "sql";
+ }
+}
+
+export function getNativeQueryLanguage(engine?: string) {
+ return getEngineNativeType(engine).toUpperCase() as "SQL" | "JSON";
+}
+
+type JSONQuery = Record<string, any> | Record<string, any>[];
+
+function formatJsonQuery(query: JSONQuery) {
+ return JSON.stringify(query, null, 2);
+}
+
+export function formatNativeQuery(query: string | JSONQuery): string {
+ return typeof query === "string" ? query : formatJsonQuery(query);
+}
+
+export function isDeprecatedEngine(
+ engines: Record<string, Engine> = {},
+ engine: string,
+) {
+ return engines[engine] != null && engines[engine]["superseded-by"] != null;
+}
diff --git a/frontend/src/metabase/lib/engine.unit.spec.ts b/frontend/src/metabase/databases/utils/engine.unit.spec.ts
similarity index 99%
rename from frontend/src/metabase/lib/engine.unit.spec.ts
rename to frontend/src/metabase/databases/utils/engine.unit.spec.ts
index 1c448d9cdcd..1976cf3f290 100644
--- a/frontend/src/metabase/lib/engine.unit.spec.ts
+++ b/frontend/src/metabase/databases/utils/engine.unit.spec.ts
@@ -1,10 +1,11 @@
+import type { Engine } from "metabase-types/api";
+
import {
formatNativeQuery,
getEngineNativeType,
getNativeQueryLanguage,
isDeprecatedEngine,
-} from "metabase/lib/engine";
-import type { Engine } from "metabase-types/api";
+} from "./engine";
describe("getEngineNativeType", () => {
it("should be sql when engine is undefined", () => {
diff --git a/frontend/src/metabase/databases/utils/schema.ts b/frontend/src/metabase/databases/utils/schema.ts
index 5bce2ad9006..a91e7930401 100644
--- a/frontend/src/metabase/databases/utils/schema.ts
+++ b/frontend/src/metabase/databases/utils/schema.ts
@@ -1,7 +1,7 @@
import type { TestContext } from "yup";
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import type {
DatabaseData,
DatabaseFieldGroup,
diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
index 7c25b2240e9..f055b3df7e4 100644
--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx
@@ -24,7 +24,6 @@ import {
getHeaderColumns,
getRowName,
} from "metabase/detail-view/utils";
-import type { OptionsType } from "metabase/lib/formatting/types";
import { ActionsApi } from "metabase/services";
import {
Box,
@@ -36,6 +35,7 @@ import {
Tooltip,
rem,
} from "metabase/ui";
+import type { OptionsType } from "metabase/utils/formatting/types";
import { DeleteObjectModal } from "metabase/visualizations/components/ObjectDetail/DeleteObjectModal";
import * as Lib from "metabase-lib";
import { isPK } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/detail-view/components/DetailsGroup/DetailsGroup.tsx b/frontend/src/metabase/detail-view/components/DetailsGroup/DetailsGroup.tsx
index 75a547ea518..0ea673b269c 100644
--- a/frontend/src/metabase/detail-view/components/DetailsGroup/DetailsGroup.tsx
+++ b/frontend/src/metabase/detail-view/components/DetailsGroup/DetailsGroup.tsx
@@ -4,8 +4,8 @@ import {
renderValue,
} from "metabase/detail-view/utils";
import { useTranslateContent } from "metabase/i18n/hooks";
-import type { OptionsType } from "metabase/lib/formatting/types";
import { Flex, Group, Stack, Text, rem } from "metabase/ui";
+import type { OptionsType } from "metabase/utils/formatting/types";
import type { DatasetColumn, RowValues, Table } from "metabase-types/api";
import S from "./DetailsGroup.module.css";
diff --git a/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx b/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx
index acae4720305..a9d3a7f8d07 100644
--- a/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx
+++ b/frontend/src/metabase/detail-view/components/Nav/CollectionBreadcrumb.tsx
@@ -1,5 +1,5 @@
import { useGetCollectionQuery } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { CollectionId } from "metabase-types/api";
import { Breadcrumb } from "./Breadcrumb";
diff --git a/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx b/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx
index 3e80d6245a8..dbccc1e9ca1 100644
--- a/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx
+++ b/frontend/src/metabase/detail-view/components/Nav/ModelNav.tsx
@@ -5,8 +5,8 @@ import {
useGetCardQuery,
useGetCollectionQuery,
} from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { Group, type GroupProps } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { Table } from "metabase-types/api";
diff --git a/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx b/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx
index 403f1469caf..ea5b393c7e5 100644
--- a/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx
+++ b/frontend/src/metabase/detail-view/components/Nav/TableNav.tsx
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
import { skipToken, useListDatabaseSchemasQuery } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { Group, type GroupProps } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Table } from "metabase-types/api";
import { Breadcrumb } from "./Breadcrumb";
diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx
index 20c3baa4abf..9eccd13f6ea 100644
--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx
+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx
@@ -6,9 +6,9 @@ import { useLatest } from "react-use";
import { t } from "ttag";
import { skipToken, useGetAdhocQueryQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Loader, Stack, Text, rem } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { ForeignKey } from "metabase-types/api";
diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.ts b/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.ts
index 14e44670b24..b2cca06344a 100644
--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.ts
+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/utils.ts
@@ -1,5 +1,5 @@
-import { parseNumber } from "metabase/lib/number";
-import * as Urls from "metabase/lib/urls";
+import { parseNumber } from "metabase/utils/number";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx
index c2656e44575..917ab219708 100644
--- a/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx
+++ b/frontend/src/metabase/detail-view/pages/ModelDetailPage/ModelDetailPage.tsx
@@ -12,11 +12,11 @@ import {
getRowName,
getTableQuery,
} from "metabase/detail-view/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { closeNavbar, setDetailView } from "metabase/redux/app";
import { getIsNavbarOpen } from "metabase/selectors/app";
import { getMetadata } from "metabase/selectors/metadata";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { extractRemappedColumns } from "metabase/visualizations";
import * as Lib from "metabase-lib";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
diff --git a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx
index 24fa5455fd0..cfb0313dab0 100644
--- a/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx
+++ b/frontend/src/metabase/detail-view/pages/TableDetailPage/TableDetailPage.tsx
@@ -15,10 +15,10 @@ import {
getRowName,
getTableQuery,
} from "metabase/detail-view/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { closeNavbar, setDetailView } from "metabase/redux/app";
import { getIsNavbarOpen } from "metabase/selectors/app";
import { getMetadata } from "metabase/selectors/metadata";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { extractRemappedColumns } from "metabase/visualizations";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/detail-view/utils.ts b/frontend/src/metabase/detail-view/utils.ts
index 7d1aa1dea89..c7687254f30 100644
--- a/frontend/src/metabase/detail-view/utils.ts
+++ b/frontend/src/metabase/detail-view/utils.ts
@@ -1,5 +1,5 @@
import type { ContentTranslationFunction } from "metabase/i18n/types";
-import { type OptionsType, formatValue } from "metabase/lib/formatting";
+import { type OptionsType, formatValue } from "metabase/utils/formatting";
import { getComputedSettings } from "metabase/visualizations/lib/settings";
import {
getGlobalSettingsForColumn,
diff --git a/frontend/src/metabase/documents/analytics.ts b/frontend/src/metabase/documents/analytics.ts
index 3d4ebf1c893..97593cc0026 100644
--- a/frontend/src/metabase/documents/analytics.ts
+++ b/frontend/src/metabase/documents/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { Document } from "metabase-types/api";
export const trackDocumentCreated = (document: Document) => {
diff --git a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx
index 2bf4a3e0bf0..57bc6b5e52c 100644
--- a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx
+++ b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx
@@ -17,7 +17,6 @@ import Animation from "metabase/css/core/animation.module.css";
import { useDocumentState } from "metabase/documents/hooks/use-document-state";
import { getCurrentDocument } from "metabase/documents/selectors";
import { getListCommentsQuery } from "metabase/documents/utils/api";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
ActionIcon,
Box,
@@ -28,6 +27,7 @@ import {
Text,
Title,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Comment, DocumentContent } from "metabase-types/api";
import S from "./CommentsSidesheet.module.css";
diff --git a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx
index 68bb993907d..fd2504f5efa 100644
--- a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx
+++ b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx
@@ -4,7 +4,7 @@ import { deletePermanently } from "metabase/archive/actions";
import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Documents } from "metabase/entities/documents";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getCurrentDocument } from "../selectors";
diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsx
index 5718535aa09..2e5b1f952ff 100644
--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx
+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx
@@ -9,8 +9,6 @@ import {
} from "metabase/common/components/DateTime";
import { useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { isWithinIframe } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import {
ActionIcon,
@@ -25,6 +23,8 @@ import {
Transition,
type TransitionProps,
} from "metabase/ui";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { useSelector } from "metabase/utils/redux";
import type { Document } from "metabase-types/api";
import { DocumentPublicLinkPopover } from "../../embedding/components/PublicLinkPopover";
diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsx
index 89cb2deff52..d90232091f5 100644
--- a/frontend/src/metabase/documents/components/DocumentPage.tsx
+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx
@@ -39,11 +39,11 @@ import { useToast } from "metabase/common/hooks";
import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";
import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { extractEntityId } from "metabase/lib/urls";
-import * as Urls from "metabase/lib/urls";
import { setErrorPage } from "metabase/redux/app";
import { Box } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { extractEntityId } from "metabase/utils/urls";
+import * as Urls from "metabase/utils/urls";
import type {
Card,
CollectionId,
diff --git a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx
index 95419e0d376..7125633766b 100644
--- a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx
+++ b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx
@@ -12,8 +12,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import type { Document } from "metabase-types/api";
interface DocumentRevisionHistorySidebarProps {
diff --git a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx
index 05c765f9e70..16d6fdca94a 100644
--- a/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx
+++ b/frontend/src/metabase/documents/components/Editor/Editor.stories.tsx
@@ -7,8 +7,8 @@ import { getStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { Api } from "metabase/api";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { commonReducers } from "metabase/reducers-common";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import { registerVisualization } from "metabase/visualizations";
import { LineChart } from "metabase/visualizations/visualizations/LineChart";
import { PieChart } from "metabase/visualizations/visualizations/PieChart";
diff --git a/frontend/src/metabase/documents/components/Editor/Editor.tsx b/frontend/src/metabase/documents/components/Editor/Editor.tsx
index 2cc863bd773..e3563f309f0 100644
--- a/frontend/src/metabase/documents/components/Editor/Editor.tsx
+++ b/frontend/src/metabase/documents/components/Editor/Editor.tsx
@@ -11,7 +11,6 @@ import { DND_IGNORE_CLASS_NAME } from "metabase/common/components/dnd";
import { getMentionsCache } from "metabase/documents/selectors";
import { isMetabotBlock } from "metabase/documents/utils/editorNodeUtils";
import { getMentionsCacheKey } from "metabase/documents/utils/mentionsUtils";
-import { useSelector, useStore } from "metabase/lib/redux";
import { EditorBubbleMenu } from "metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu";
import { CardEmbed } from "metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode";
import { CommandExtension } from "metabase/rich_text_editing/tiptap/extensions/Command/CommandExtension";
@@ -38,6 +37,7 @@ import { DROP_ZONE_COLOR } from "metabase/rich_text_editing/tiptap/extensions/sh
import { createSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";
import { getSetting } from "metabase/selectors/settings";
import { Box, Loader } from "metabase/ui";
+import { useSelector, useStore } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import type { CardEmbedRef } from "metabase-types/store/documents";
diff --git a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
index 08d1e8a06fe..f7fe896cbc5 100644
--- a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
+++ b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx
@@ -2,7 +2,6 @@ import type { Editor } from "@tiptap/react";
import { useCallback } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
ActionIcon,
Box,
@@ -14,6 +13,7 @@ import {
Stack,
Text,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
import type {
CardDisplayType,
diff --git a/frontend/src/metabase/documents/hooks/use-block-menus.ts b/frontend/src/metabase/documents/hooks/use-block-menus.ts
index 3a8ec73f54e..ea5f29201c0 100644
--- a/frontend/src/metabase/documents/hooks/use-block-menus.ts
+++ b/frontend/src/metabase/documents/hooks/use-block-menus.ts
@@ -9,9 +9,9 @@ import {
getHoveredChildTargetId,
} from "metabase/documents/selectors";
import { isTopLevel } from "metabase/documents/utils/editorNodeUtils";
-import { isWithinIframe } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
-import { documentWithAnchor } from "metabase/lib/urls";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { useSelector } from "metabase/utils/redux";
+import { documentWithAnchor } from "metabase/utils/urls";
interface UseBlockMenusOptions {
node: NodeViewProps["node"];
diff --git a/frontend/src/metabase/documents/hooks/use-card-data.ts b/frontend/src/metabase/documents/hooks/use-card-data.ts
index 24dfae5fb71..f1a4b45c085 100644
--- a/frontend/src/metabase/documents/hooks/use-card-data.ts
+++ b/frontend/src/metabase/documents/hooks/use-card-data.ts
@@ -5,8 +5,8 @@ import {
useGetAdhocPivotQueryQuery,
useGetAdhocQueryQuery,
} from "metabase/api/dataset";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import Question from "metabase-lib/v1/Question";
import { getPivotOptions } from "metabase-lib/v1/queries/utils/pivot";
import type { Card, Dataset, RawSeries } from "metabase-types/api";
diff --git a/frontend/src/metabase/documents/hooks/use-document-state.ts b/frontend/src/metabase/documents/hooks/use-document-state.ts
index 5094ba4897d..3f1aafe25e8 100644
--- a/frontend/src/metabase/documents/hooks/use-document-state.ts
+++ b/frontend/src/metabase/documents/hooks/use-document-state.ts
@@ -1,7 +1,7 @@
import type { JSONContent } from "@tiptap/react";
import { useCallback, useEffect, useRef, useState } from "react";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { DocumentContent } from "metabase-types/api";
import type { CardEmbedRef } from "metabase-types/store/documents";
diff --git a/frontend/src/metabase/documents/hooks/use-draft-card-operations.ts b/frontend/src/metabase/documents/hooks/use-draft-card-operations.ts
index bf3ee3ceba1..6f3b39339f1 100644
--- a/frontend/src/metabase/documents/hooks/use-draft-card-operations.ts
+++ b/frontend/src/metabase/documents/hooks/use-draft-card-operations.ts
@@ -2,7 +2,7 @@ import type { Editor } from "@tiptap/react";
import { useCallback } from "react";
import { datasetApi } from "metabase/api/dataset";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { Card, Dataset } from "metabase-types/api";
import { createDraftCard, generateDraftCardId } from "../documents.slice";
diff --git a/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.ts b/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.ts
index 8b9924de56b..7501023f680 100644
--- a/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.ts
+++ b/frontend/src/metabase/documents/hooks/use-unresolved-comments-count.ts
@@ -3,7 +3,7 @@ import { getTargetChildCommentThreads } from "metabase/comments/utils";
import { getUnresolvedComments } from "metabase/documents/components/Editor/CommentsMenu";
import { getCurrentDocument } from "metabase/documents/selectors";
import { getListCommentsQuery } from "metabase/documents/utils/api";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
export function useUnresolvedCommentsCount(targetId: string) {
const document = useSelector(getCurrentDocument);
diff --git a/frontend/src/metabase/documents/routes.tsx b/frontend/src/metabase/documents/routes.tsx
index 080c7d41321..45f2e438f2e 100644
--- a/frontend/src/metabase/documents/routes.tsx
+++ b/frontend/src/metabase/documents/routes.tsx
@@ -1,6 +1,6 @@
import type { ComponentProps } from "react";
-import { extractEntityId } from "metabase/lib/urls";
+import { extractEntityId } from "metabase/utils/urls";
import { DocumentPage } from "./components/DocumentPage";
diff --git a/frontend/src/metabase/documents/utils/api.ts b/frontend/src/metabase/documents/utils/api.ts
index 5b3a1ff664d..ead8ff99322 100644
--- a/frontend/src/metabase/documents/utils/api.ts
+++ b/frontend/src/metabase/documents/utils/api.ts
@@ -1,7 +1,7 @@
import type { SkipToken } from "@reduxjs/toolkit/query";
import { skipToken } from "metabase/api";
-import { isWithinIframe } from "metabase/lib/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
import type { Document, ListCommentsRequest } from "metabase-types/api";
export function getListCommentsQuery(
diff --git a/frontend/src/metabase/documents/utils/visualizationUtils.ts b/frontend/src/metabase/documents/utils/visualizationUtils.ts
index 053c2059db9..40b1759fba4 100644
--- a/frontend/src/metabase/documents/utils/visualizationUtils.ts
+++ b/frontend/src/metabase/documents/utils/visualizationUtils.ts
@@ -1,8 +1,8 @@
import { useMemo } from "react";
-import { isNotNull } from "metabase/lib/types";
import { getSensibleVisualizations } from "metabase/query_builder/components/chart-type-selector/use-question-visualization-state";
import type { IconName } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import visualizations from "metabase/visualizations";
import type { CardDisplayType, Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/embedding-sdk/theme/default-component-theme.ts b/frontend/src/metabase/embedding-sdk/theme/default-component-theme.ts
index ac63a1106b1..1d694e77397 100644
--- a/frontend/src/metabase/embedding-sdk/theme/default-component-theme.ts
+++ b/frontend/src/metabase/embedding-sdk/theme/default-component-theme.ts
@@ -3,8 +3,8 @@ import { merge } from "icepick";
import { OVERLAY_Z_INDEX } from "metabase/css/core/overlays/constants";
import { EMBEDDING_SDK_PORTAL_ROOT_ELEMENT_ID } from "metabase/embedding-sdk/config";
import type { MetabaseComponentTheme } from "metabase/embedding-sdk/theme";
-import type { DeepPartial } from "metabase/lib/types";
import type { MantineThemeOverride } from "metabase/ui";
+import type { DeepPartial } from "metabase/utils/types";
export const DEFAULT_SDK_FONT_SIZE = 14;
diff --git a/frontend/src/metabase/embedding-sdk/types/utils.ts b/frontend/src/metabase/embedding-sdk/types/utils.ts
index 56487150a71..e51eada8e52 100644
--- a/frontend/src/metabase/embedding-sdk/types/utils.ts
+++ b/frontend/src/metabase/embedding-sdk/types/utils.ts
@@ -1,4 +1,4 @@
-export type { DeepPartial } from "metabase/lib/types";
+export type { DeepPartial } from "metabase/utils/types";
// https://www.raygesualdo.com/posts/flattening-object-keys-with-typescript-types/
export type FlattenObjectKeys<
diff --git a/frontend/src/metabase/embedding-sdk/vendors-side-effects.ts b/frontend/src/metabase/embedding-sdk/vendors-side-effects.ts
index ba6bc2d8b22..75dd8d1d78e 100644
--- a/frontend/src/metabase/embedding-sdk/vendors-side-effects.ts
+++ b/frontend/src/metabase/embedding-sdk/vendors-side-effects.ts
@@ -4,4 +4,4 @@ import "@mantine/dates/styles.css";
import "metabase/css/vendor.css";
import "metabase/css/index.module.css";
-import "metabase/lib/dayjs";
+import "metabase/utils/dayjs";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx
index a057c7cfd0a..269071e79e8 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DashboardPublicLinkPopover.tsx
@@ -2,11 +2,11 @@ import {
useCreateDashboardPublicLinkMutation,
useDeleteDashboardPublicLinkMutation,
} from "metabase/api";
-import { publicDashboard as getPublicDashboardUrl } from "metabase/lib/urls";
import {
trackPublicLinkCopied,
trackPublicLinkRemoved,
} from "metabase/public/lib/analytics";
+import { publicDashboard as getPublicDashboardUrl } from "metabase/utils/urls";
import type { Dashboard } from "metabase-types/api";
import { PublicLinkPopover } from "./PublicLinkPopover";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx
index 928c716e9ea..c5586611fff 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx
@@ -5,13 +5,13 @@ import {
useCreateDocumentPublicLinkMutation,
useDeleteDocumentPublicLinkMutation,
} from "metabase/api";
-import { publicDocument as getPublicDocumentUrl } from "metabase/lib/urls/documents";
import {
trackPublicEmbedCodeCopied,
trackPublicLinkCopied,
trackPublicLinkRemoved,
} from "metabase/public/lib/analytics";
import { Box, Popover, Title } from "metabase/ui";
+import { publicDocument as getPublicDocumentUrl } from "metabase/utils/urls/documents";
import type { Document } from "metabase-types/api";
import { DocumentPublicLinkPopoverContent } from "./DocumentPublicLinkPopoverContent";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx
index 1a6b7fa26fa..5bad6c8d42c 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx
@@ -2,7 +2,6 @@ import { useState } from "react";
import { t } from "ttag";
import { CopyButton } from "metabase/common/components/CopyButton";
-import { useSelector } from "metabase/lib/redux";
import { getPublicEmbedHTMLWithResizer } from "metabase/public/lib/code-templates";
import { getUserIsAdmin } from "metabase/selectors/user";
import {
@@ -17,6 +16,7 @@ import {
TextInput,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import S from "./DocumentPublicLinkPopoverContent.module.css";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx
index 0836d744bb4..b8811b8da51 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx
@@ -1,9 +1,9 @@
import { useAsync } from "react-use";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Box, Popover, Text, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { PublicLinkCopyPanel } from "./PublicLinkCopyPanel";
import type { ExportFormatType } from "./types";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx
index 95c334f81f8..138ee4bffe5 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.tsx
@@ -4,14 +4,14 @@ import {
useCreateCardPublicLinkMutation,
useDeleteCardPublicLinkMutation,
} from "metabase/api";
-import {
- exportFormats,
- publicQuestion as getPublicQuestionUrl,
-} from "metabase/lib/urls";
import {
trackPublicLinkCopied,
trackPublicLinkRemoved,
} from "metabase/public/lib/analytics";
+import {
+ exportFormats,
+ publicQuestion as getPublicQuestionUrl,
+} from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import { PublicLinkPopover } from "./PublicLinkPopover";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx
index 7e6dc8c0d3c..5a60f98c775 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/QuestionPublicLinkPopover.unit.spec.tsx
@@ -6,8 +6,8 @@ import { setupCardPublicLinkEndpoints } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import { createMockCard, createMockUser } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/types.ts b/frontend/src/metabase/embedding/components/PublicLinkPopover/types.ts
index 10dccbf4951..b008591a2d9 100644
--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/types.ts
+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/types.ts
@@ -1,3 +1,3 @@
-import type { exportFormats } from "metabase/lib/urls";
+import type { exportFormats } from "metabase/utils/urls";
export type ExportFormatType = (typeof exportFormats)[number] | null;
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx b/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx
index f073563868c..61ff1e8fd77 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/DashboardSharingMenu.tsx
@@ -1,8 +1,8 @@
import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
import { getIsDashCardsRunning } from "metabase/dashboard/selectors";
import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";
-import { useSelector } from "metabase/lib/redux";
import { Flex, Menu } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Dashboard } from "metabase-types/api";
import { useSharingModal } from "../../hooks/use-sharing-modal";
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx
index 0f3c8c72366..beca9d022c4 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Icon, Menu } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function EmbedMenuItem({ onClick }: { onClick: () => void }) {
const isAdmin = useSelector(getUserIsAdmin);
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsx
index 33f90a0cc85..1a6469e250b 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem.tsx
@@ -1,6 +1,6 @@
-import { useDispatch } from "metabase/lib/redux";
import { downloadDashboardToPdf } from "metabase/redux/downloads";
import { Icon, Menu } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import { getExportTabAsPdfButtonText } from "metabase/visualizations/lib/save-dashboard-pdf";
import type { Dashboard } from "metabase-types/api";
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsx
index 5bed037633c..f8d455ba49e 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem.tsx
@@ -3,9 +3,9 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
import { useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Button, Icon, Menu } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function PublicLinkMenuItem({
hasPublicLink,
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx
index 78267e06fa8..50dccf8d124 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx
@@ -3,7 +3,6 @@ import { t } from "ttag";
import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
import { useSetting } from "metabase/common/hooks";
import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { MODAL_TYPES } from "metabase/querying/constants";
import { setUIControls } from "metabase/redux/query-builder";
import {
@@ -11,6 +10,7 @@ import {
getUserIsAdmin,
} from "metabase/selectors/user";
import { Flex } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import { useSharingModal } from "../../hooks/use-sharing-modal";
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx b/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx
index 9ced951d9f8..09ff8de8ff0 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/test/setup.tsx
@@ -12,8 +12,8 @@ import { setupWebhookChannelsEndpoint } from "__support__/server-mocks/channel";
import { setupListNotificationEndpoints } from "__support__/server-mocks/notification";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import { useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
+import { useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import Question from "metabase-lib/v1/Question";
import type { Card, Dashboard, Notification, User } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/embedding/config.ts b/frontend/src/metabase/embedding/config.ts
index e36afd5bfaa..fcb6117bbf8 100644
--- a/frontend/src/metabase/embedding/config.ts
+++ b/frontend/src/metabase/embedding/config.ts
@@ -1,5 +1,5 @@
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { isWithinIframe } from "metabase/lib/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
type InternalEmbeddingConfig = {
isPublicEmbedding: boolean;
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx
index d41cbe6afc7..ec78c7c87ec 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx
+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubHomePage.tsx
@@ -5,8 +5,8 @@ import { t } from "ttag";
import { CustomHomePageModal } from "metabase/home/components/CustomHomePageModal";
import { dismissEmbeddingHomepage } from "metabase/home/components/EmbedHomepage/actions";
import { MetabotGreeting } from "metabase/home/components/HomeGreeting";
-import { useDispatch } from "metabase/lib/redux";
import { ActionIcon, Group, Icon, Menu, Stack, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import { EmbeddingHub } from "./EmbeddingHub";
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx
index 46e3ded69bf..fcb67f4dce4 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx
+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubXrayPickerModal.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { DataPickerModal } from "metabase/common/components/Pickers/DataPicker";
import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { TableId } from "metabase-types/api";
interface EmbeddingHubXrayPickerModalProps {
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx b/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx
index b3b69f9d1fc..a878028310c 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx
+++ b/frontend/src/metabase/embedding/embedding-hub/components/ReturnToSetupGuideModal/ReturnToSetupGuideModal.tsx
@@ -2,8 +2,8 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { EMBEDDING_SETUP_GUIDE_PATH } from "metabase/embedding/embedding-hub/constants";
-import { useDispatch } from "metabase/lib/redux";
import { Button, Group, Modal, Stack, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
interface ReturnToSetupGuideModalProps {
opened: boolean;
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.ts b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.ts
index 6cea56c36e7..35287e98d77 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.ts
+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-update-all-tenant-users-group-permissions.ts
@@ -3,9 +3,9 @@ import { useCallback, useMemo } from "react";
import { Api, databaseApi, useListPermissionsGroupsQuery } from "metabase/api";
import { tableApi } from "metabase/api/table";
import { listTag } from "metabase/api/tags";
-import { useDispatch } from "metabase/lib/redux";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { PermissionsApi } from "metabase/services";
+import { useDispatch } from "metabase/utils/redux";
import type { DatabaseId, TableId } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.ts b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.ts
index d63051990e7..cce1034a97f 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.ts
+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-upsert-group-table-access-policies.ts
@@ -2,7 +2,7 @@ import { useCallback, useState } from "react";
import { t } from "ttag";
import { tableApi, useListGroupTableAccessPoliciesQuery } from "metabase/api";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type { TableColumnSelection } from "../RlsDataSelector";
diff --git a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts
index 2c09c7bf5e3..b5eddb768ac 100644
--- a/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts
+++ b/frontend/src/metabase/embedding/embedding-hub/components/SetupPermissionsAndTenantsPage/hooks/use-xray-dashboards.ts
@@ -10,7 +10,7 @@ import {
} from "metabase/api";
import { listTag } from "metabase/api/tags";
import { createDashCard, createVirtualCard } from "metabase/dashboard/utils";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import type {
CollectionId,
CollectionItem,
diff --git a/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.ts b/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.ts
index 4d649de7dd4..8732d7c0fe6 100644
--- a/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.ts
+++ b/frontend/src/metabase/embedding/embedding-hub/hooks/use-get-embedding-hub-steps.ts
@@ -1,12 +1,12 @@
import { useCallback, useMemo } from "react";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import {
PLUGIN_TENANTS,
type SdkIframeEmbedSetupModalInitialState,
} from "metabase/plugins";
import { setOpenModalWithProps } from "metabase/redux/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { EmbeddingHubStep } from "../types";
diff --git a/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts b/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts
index 40e5d747b45..0142b6a8450 100644
--- a/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts
+++ b/frontend/src/metabase/embedding/embedding-hub/hooks/use-help-url.ts
@@ -1,6 +1,6 @@
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getIsPaidPlan } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
export const useHelpUrl = () => {
const isPaidPlan = useSelector(getIsPaidPlan);
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts
index 6b1862a2ab4..ef9a060ad78 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts
@@ -7,9 +7,9 @@ import type {
import { getAuthSubTypeForSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-auth-sub-type-for-settings";
import { getAuthTypeForSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-auth-type-for-settings";
import { countEmbeddingParameterOptions } from "metabase/embedding/lib/count-embedding-parameter-options";
-import { trackSimpleEvent } from "metabase/lib/analytics";
import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";
import type { EmbeddingParameters } from "metabase/public/lib/types";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { Card, Dashboard } from "metabase-types/api";
import type {
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx
index 91eb71993bf..94685e08172 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/EmbeddingUpsell.tsx
@@ -3,9 +3,9 @@ import { t } from "ttag";
import { UpsellCard } from "metabase/common/components/upsells/UpsellCard";
import { UTM_LOCATION } from "metabase/embedding/embedding-iframe-sdk-setup/analytics";
import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_ADMIN_SETTINGS } from "metabase/plugins";
import { getUpgradeUrl } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
type Props = {
campaign: string;
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx
index 8b5dff60cb8..911055bb582 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx
@@ -3,9 +3,9 @@ import { c, t } from "ttag";
import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";
import { useSdkIframeEmbedSetupContext } from "metabase/embedding/embedding-iframe-sdk-setup/context";
import { getResourceTypeFromExperience } from "metabase/embedding/embedding-iframe-sdk-setup/utils/get-resource-type-from-experience";
-import { useDispatch } from "metabase/lib/redux";
import { setOpenModalWithProps } from "metabase/redux/ui";
import { Alert, Anchor, Box, Flex, Icon, Stack, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
export const LegacyStaticEmbeddingAlert = () => {
const { isGuestEmbedsEnabled, settings, resource, experience, onClose } =
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx
index 870e3d865a5..e17e9e6dd7c 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal.tsx
@@ -13,7 +13,6 @@ import { AuthenticationSection } from "metabase/embedding/embedding-iframe-sdk-s
import { SdkIframeGuestEmbedStatusBar } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeGuestEmbedStatusBar";
import { EMBED_STEPS } from "metabase/embedding/embedding-iframe-sdk-setup/constants";
import { isQuestionOrDashboardSettings } from "metabase/embedding/embedding-iframe-sdk-setup/utils/is-question-or-dashboard-settings";
-import { useDispatch } from "metabase/lib/redux";
import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";
import { closeModal } from "metabase/redux/ui";
import {
@@ -27,6 +26,7 @@ import {
Modal,
Stack,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { SettingKey } from "metabase-types/api";
import { useSdkIframeEmbedSetupContext } from "../context";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts
index f6c970aa696..403c97b4e93 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.ts
@@ -2,10 +2,10 @@ import { useEffect, useMemo, useRef } from "react";
import { useLatest, usePrevious } from "react-use";
import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getSavedDashboardUiParameters } from "metabase/parameters/utils/dashboards";
import { addFields } from "metabase/redux/metadata";
import { getMetadata } from "metabase/selectors/metadata";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";
import type { Card, Dashboard, Parameter } from "metabase-types/api";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts
index 05140470ca6..c9501f2e50a 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-available-parameters.unit.spec.ts
@@ -10,7 +10,7 @@ import {
const mockDispatch = jest.fn();
-jest.mock("metabase/lib/redux", () => ({
+jest.mock("metabase/utils/redux", () => ({
useDispatch: () => mockDispatch,
useSelector: jest.fn(),
}));
@@ -31,7 +31,7 @@ jest.mock("metabase/selectors/metadata", () => ({
getMetadata: jest.fn(),
}));
-const mockUseSelector = jest.requireMock("metabase/lib/redux").useSelector;
+const mockUseSelector = jest.requireMock("metabase/utils/redux").useSelector;
const mockGetSavedDashboardUiParameters = jest.requireMock(
"metabase/parameters/utils/dashboards",
).getSavedDashboardUiParameters;
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts
index 64e50f07e2b..e756909ecbb 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-get-current-resource.ts
@@ -4,7 +4,7 @@ import { skipToken, useGetCardQuery } from "metabase/api";
import { fetchDashboard } from "metabase/dashboard/actions";
import { getDashboardComplete } from "metabase/dashboard/selectors";
import type { SdkIframeEmbedSetupExperience } from "metabase/embedding/embedding-iframe-sdk-setup/types";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Card, Dashboard, DashboardId } from "metabase-types/api";
const getResource = ({
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.ts
index d6799572f67..2491ce0cb68 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/hooks/use-recently-created-dashboards.ts
@@ -2,8 +2,8 @@ import { useMemo } from "react";
import _ from "underscore";
import { useSearchQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getUserId } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import type { SearchResult } from "metabase-types/api";
import type { SdkIframeEmbedSetupRecentItem } from "../types";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
index 86ee70328ac..5a7d30be008 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
@@ -21,11 +21,11 @@ import type { SdkQuestionEntityPublicProps } from "embedding-sdk-bundle/types/qu
import { applyThemePreset } from "embedding-sdk-shared/lib/apply-theme-preset";
import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/EmbeddingFooter";
import { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";
-import { createTracker } from "metabase/lib/analytics-untyped";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_EMBEDDING_IFRAME_SDK } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import { Stack } from "metabase/ui";
+import { createTracker } from "metabase/utils/analytics-untyped";
+import { useSelector } from "metabase/utils/redux";
import { useParamRerenderKey } from "../hooks/use-param-rerender-key";
import { useSdkIframeEmbedEventBus } from "../hooks/use-sdk-iframe-embed-event-bus";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts
index 386edc2fcf9..4a009596649 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts
@@ -6,7 +6,7 @@ import type {
EmbedAuthManagerContext,
} from "metabase/embedding/embedding-iframe-sdk/types/auth-manager";
import type { ComponentToAttributes } from "metabase/embedding/embedding-iframe-sdk/types/modular-embedding";
-import { decodeJwt } from "metabase/lib/jwt";
+import { decodeJwt } from "metabase/utils/jwt";
import { debouncedReportAnalytics } from "./analytics";
import {
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.ts
index be00bcc8453..18335087cef 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
import type { EmbeddedAnalyticsJsEventSchema } from "metabase-types/analytics/embedded-analytics-js";
export const trackEmbeddedAnalyticsJs = (
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-param-rerender-key.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-param-rerender-key.ts
index f5a083fc4a8..974f3899049 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-param-rerender-key.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-param-rerender-key.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { P, match } from "ts-pattern";
-import { stableStringify } from "metabase/lib/objects";
+import { stableStringify } from "metabase/utils/objects";
import type { SdkIframeEmbedSettings } from "../types/embed";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.ts
index 2e731810b98..27f9e828f5f 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/use-sdk-iframe-embed-event-bus.ts
@@ -3,7 +3,7 @@ import { match } from "ts-pattern";
import { setGuestTokenFetchError } from "embedding-sdk-bundle/store/guest-embed";
import type { SdkStore } from "embedding-sdk-bundle/store/types";
-import { isWithinIframe } from "metabase/lib/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
import type { EmbeddedAnalyticsJsEventSchema } from "metabase-types/analytics/embedded-analytics-js";
import type {
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/utils/request-session-token.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/utils/request-session-token.ts
index d6f1bc85ff3..264b43d0a24 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/utils/request-session-token.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/utils/request-session-token.ts
@@ -1,7 +1,7 @@
import { AUTH_TIMEOUT } from "embedding-sdk-bundle/errors";
import { samlTokenStorage } from "metabase/embedding-sdk/lib/saml-token-storage";
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
-import { isWithinIframe } from "metabase/lib/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
import { WAIT_FOR_SESSION_TOKEN_TIMEOUT } from "../constants";
import type {
diff --git a/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.ts b/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.ts
index 42794b7cb7b..838ea8e9b49 100644
--- a/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.ts
+++ b/frontend/src/metabase/embedding/hooks/use-open-embed-js-wizard.ts
@@ -1,8 +1,8 @@
import { useCallback } from "react";
-import { useDispatch } from "metabase/lib/redux";
import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";
import { setOpenModalWithProps } from "metabase/redux/ui";
+import { useDispatch } from "metabase/utils/redux";
export const useOpenEmbedJsWizard = ({
initialState,
diff --git a/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts b/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts
index 32136cf149e..5596f273983 100644
--- a/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts
+++ b/frontend/src/metabase/embedding/hooks/use-sharing-modal.ts
@@ -6,12 +6,12 @@ import type {
} from "metabase/embedding/components/SharingMenu/types";
import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";
import { useOpenEmbedJsWizard } from "metabase/embedding/hooks/use-open-embed-js-wizard";
-import { useDispatch } from "metabase/lib/redux";
import type {
EmbedResource,
EmbedResourceType,
} from "metabase/public/lib/types";
import { setOpenModal } from "metabase/redux/ui";
+import { useDispatch } from "metabase/utils/redux";
export const useSharingModal = <
TModalType extends DashboardSharingModalType | QuestionSharingModalType,
diff --git a/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsx b/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsx
index 9986dc3768a..dadeee848d2 100644
--- a/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/hooks/use-sharing-modal.unit.spec.tsx
@@ -13,7 +13,7 @@ import { useSharingModal } from "./use-sharing-modal";
const mockDispatch = jest.fn();
const mockOpenEmbedJsWizard = jest.fn();
-jest.mock("metabase/lib/redux", () => ({
+jest.mock("metabase/utils/redux", () => ({
useDispatch: () => mockDispatch,
}));
diff --git a/frontend/src/metabase/entities/actions/actions.ts b/frontend/src/metabase/entities/actions/actions.ts
index 283b8af6e49..767b90d9684 100644
--- a/frontend/src/metabase/entities/actions/actions.ts
+++ b/frontend/src/metabase/entities/actions/actions.ts
@@ -6,13 +6,13 @@ import {
useGetActionQuery,
useListActionsQuery,
} from "metabase/api";
+import { ActionSchema } from "metabase/schema";
import {
createEntity,
entityCompatibleQuery,
undo,
-} from "metabase/lib/entities";
-import { createThunkAction } from "metabase/lib/redux";
-import { ActionSchema } from "metabase/schema";
+} from "metabase/utils/entities";
+import { createThunkAction } from "metabase/utils/redux";
import type {
CreateActionRequest,
GetActionRequest,
diff --git a/frontend/src/metabase/entities/bookmarks.js b/frontend/src/metabase/entities/bookmarks.js
index 3490c621bb8..8028da66895 100644
--- a/frontend/src/metabase/entities/bookmarks.js
+++ b/frontend/src/metabase/entities/bookmarks.js
@@ -8,9 +8,9 @@ import { Collections } from "metabase/entities/collections";
import { Dashboards } from "metabase/entities/dashboards";
import { Documents } from "metabase/entities/documents";
import { Questions } from "metabase/entities/questions";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
import { addUndo } from "metabase/redux/undo";
import { BookmarkSchema } from "metabase/schema";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
const REORDER_ACTION = `metabase/entities/bookmarks/REORDER_ACTION`;
diff --git a/frontend/src/metabase/entities/collections/collections.ts b/frontend/src/metabase/entities/collections/collections.ts
index 974b674e92b..953b67cd566 100644
--- a/frontend/src/metabase/entities/collections/collections.ts
+++ b/frontend/src/metabase/entities/collections/collections.ts
@@ -13,13 +13,13 @@ import {
canonicalCollectionId,
isRootTrashCollection,
} from "metabase/collections/utils";
+import { CollectionSchema } from "metabase/schema";
+import { getUserPersonalCollectionId } from "metabase/selectors/user";
import {
createEntity,
entityCompatibleQuery,
undo,
-} from "metabase/lib/entities";
-import { CollectionSchema } from "metabase/schema";
-import { getUserPersonalCollectionId } from "metabase/selectors/user";
+} from "metabase/utils/entities";
import type {
Collection,
CreateCollectionRequest,
diff --git a/frontend/src/metabase/entities/collections/getInitialCollectionId.ts b/frontend/src/metabase/entities/collections/getInitialCollectionId.ts
index cfadf47e255..06570f9efdd 100644
--- a/frontend/src/metabase/entities/collections/getInitialCollectionId.ts
+++ b/frontend/src/metabase/entities/collections/getInitialCollectionId.ts
@@ -6,8 +6,8 @@ import {
isLibraryCollection,
isRootTrashCollection,
} from "metabase/collections/utils";
-import * as Urls from "metabase/lib/urls/collections";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
+import * as Urls from "metabase/utils/urls/collections";
import type { Collection, CollectionId } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js b/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js
index 57be20f0561..d7a363a8546 100644
--- a/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js
+++ b/frontend/src/metabase/entities/containers/EntityListLoader.unit.spec.js
@@ -4,7 +4,7 @@ import { waitFor } from "@testing-library/react";
import { renderWithProviders } from "__support__/ui";
import { EntityListLoader } from "metabase/entities/containers/rtk-query";
-import { Api } from "metabase/lib/api";
+import { Api } from "metabase/utils/api";
describe("EntityListLoader", () => {
let _makeRequest;
diff --git a/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsx b/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsx
index b8f05e33027..002e70618d6 100644
--- a/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsx
+++ b/frontend/src/metabase/entities/containers/rtk-query/EntityListLoader.tsx
@@ -8,13 +8,13 @@ import {
LoadingAndErrorWrapper as DefaultLoadingAndErrorWrapper,
type LoadingAndErrorWrapperProps,
} from "metabase/common/components/LoadingAndErrorWrapper";
-import { capitalize } from "metabase/lib/formatting";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
setRequestError,
setRequestLoaded,
setRequestLoading,
} from "metabase/redux/requests";
+import { capitalize } from "metabase/utils/formatting";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { isObject } from "metabase-types/guards";
import type {
diff --git a/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsx b/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsx
index ca20f7a49d9..96da83054c0 100644
--- a/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsx
+++ b/frontend/src/metabase/entities/containers/rtk-query/EntityObjectLoader.tsx
@@ -8,12 +8,12 @@ import {
LoadingAndErrorWrapper as DefaultLoadingAndErrorWrapper,
type LoadingAndErrorWrapperProps,
} from "metabase/common/components/LoadingAndErrorWrapper";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
setRequestError,
setRequestLoaded,
setRequestLoading,
} from "metabase/redux/requests";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Dispatch } from "metabase-types/store";
import type {
diff --git a/frontend/src/metabase/entities/dashboards.js b/frontend/src/metabase/entities/dashboards.js
index 0229033d563..e4237615ac4 100644
--- a/frontend/src/metabase/entities/dashboards.js
+++ b/frontend/src/metabase/entities/dashboards.js
@@ -13,14 +13,14 @@ import {
getCollectionType,
normalizedCollection,
} from "metabase/entities/collections/utils";
+import { addUndo } from "metabase/redux/undo";
+import { color } from "metabase/ui/colors";
import {
createEntity,
entityCompatibleQuery,
undo,
-} from "metabase/lib/entities";
-import { compose, withAction, withRequestState } from "metabase/lib/redux";
-import { addUndo } from "metabase/redux/undo";
-import { color } from "metabase/ui/colors";
+} from "metabase/utils/entities";
+import { compose, withAction, withRequestState } from "metabase/utils/redux";
const COPY_ACTION = `metabase/entities/dashboards/COPY`;
diff --git a/frontend/src/metabase/entities/databases.js b/frontend/src/metabase/entities/databases.js
index ea3eb95f61a..dbb62a9fa47 100644
--- a/frontend/src/metabase/entities/databases.js
+++ b/frontend/src/metabase/entities/databases.js
@@ -8,14 +8,14 @@ import {
useGetDatabaseQuery,
useListDatabasesQuery,
} from "metabase/api";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
-import { createThunkAction, fetchData } from "metabase/lib/redux";
import { DatabaseSchema } from "metabase/schema";
import {
getMetadata,
getMetadataUnfiltered,
} from "metabase/selectors/metadata";
import { color } from "metabase/ui/colors";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
+import { createThunkAction, fetchData } from "metabase/utils/redux";
import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";
// OBJECT ACTIONS
diff --git a/frontend/src/metabase/entities/documents.ts b/frontend/src/metabase/entities/documents.ts
index 0c5133d9289..99334995892 100644
--- a/frontend/src/metabase/entities/documents.ts
+++ b/frontend/src/metabase/entities/documents.ts
@@ -5,13 +5,13 @@ import {
canonicalCollectionId,
isRootTrashCollection,
} from "metabase/collections/utils";
+import { DocumentSchema } from "metabase/schema";
+import { color } from "metabase/ui/utils/colors";
import {
createEntity,
entityCompatibleQuery,
undo,
-} from "metabase/lib/entities";
-import { DocumentSchema } from "metabase/schema";
-import { color } from "metabase/ui/utils/colors";
+} from "metabase/utils/entities";
import type {
Collection,
CopyDocumentRequest,
diff --git a/frontend/src/metabase/entities/fields.js b/frontend/src/metabase/entities/fields.js
index 76d11a65ab2..d3c52138e52 100644
--- a/frontend/src/metabase/entities/fields.js
+++ b/frontend/src/metabase/entities/fields.js
@@ -9,11 +9,16 @@ import {
useGetFieldQuery,
useGetFieldValuesQuery,
} from "metabase/api";
+import { FieldSchema } from "metabase/schema";
+import {
+ getMetadata,
+ getMetadataUnfiltered,
+} from "metabase/selectors/metadata";
import {
createEntity,
entityCompatibleQuery,
notify,
-} from "metabase/lib/entities";
+} from "metabase/utils/entities";
import {
compose,
createAction,
@@ -23,12 +28,7 @@ import {
withAction,
withCachedDataAndRequestState,
withNormalize,
-} from "metabase/lib/redux";
-import { FieldSchema } from "metabase/schema";
-import {
- getMetadata,
- getMetadataUnfiltered,
-} from "metabase/selectors/metadata";
+} from "metabase/utils/redux";
import { getUniqueFieldId } from "metabase-lib/v1/metadata/utils/fields";
import { getFieldValues } from "metabase-lib/v1/queries/utils/field";
diff --git a/frontend/src/metabase/entities/groups.js b/frontend/src/metabase/entities/groups.js
index c86ce6434dc..537a666adbb 100644
--- a/frontend/src/metabase/entities/groups.js
+++ b/frontend/src/metabase/entities/groups.js
@@ -6,7 +6,7 @@ import {
useGetPermissionsGroupQuery,
useListPermissionsGroupsQuery,
} from "metabase/api";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts b/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts
index 1a6fe40893b..46de8a0c4a4 100644
--- a/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts
+++ b/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts
@@ -4,8 +4,8 @@
* to be treated as an entity (for now at least) so that it will play nicely with search
*/
-import { createEntity } from "metabase/lib/entities";
import { IndexedEntitySchema } from "metabase/schema";
+import { createEntity } from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/measures.js b/frontend/src/metabase/entities/measures.js
index 7ec98ebcb68..1225b052908 100644
--- a/frontend/src/metabase/entities/measures.js
+++ b/frontend/src/metabase/entities/measures.js
@@ -3,10 +3,10 @@ import {
useGetMeasureQuery,
useListMeasuresQuery,
} from "metabase/api";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
import { MeasureSchema } from "metabase/schema";
import { getMetadata } from "metabase/selectors/metadata";
import { color } from "metabase/ui/colors";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/metrics.js b/frontend/src/metabase/entities/metrics.js
index 0c291c71dfe..0d7f61f954d 100644
--- a/frontend/src/metabase/entities/metrics.js
+++ b/frontend/src/metabase/entities/metrics.js
@@ -3,10 +3,10 @@ import {
useGetMetricQuery,
useListMetricsQuery,
} from "metabase/api";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
import { MetricSchema } from "metabase/schema";
import { getMetadata } from "metabase/selectors/metadata";
import { color } from "metabase/ui/colors";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/persisted-models.js b/frontend/src/metabase/entities/persisted-models.js
index 93c6e10a7d5..28a42cdb290 100644
--- a/frontend/src/metabase/entities/persisted-models.js
+++ b/frontend/src/metabase/entities/persisted-models.js
@@ -8,8 +8,8 @@ import {
useGetPersistedInfoQuery,
useListPersistedInfoQuery,
} from "metabase/api";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
import { PersistedModelSchema } from "metabase/schema";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
const REFRESH_CACHE = "metabase/entities/persistedModels/REFRESH_CACHE";
diff --git a/frontend/src/metabase/entities/pulses.js b/frontend/src/metabase/entities/pulses.js
index 7bc3fc8bb28..6fc39a84bbd 100644
--- a/frontend/src/metabase/entities/pulses.js
+++ b/frontend/src/metabase/entities/pulses.js
@@ -6,12 +6,12 @@ import {
useListSubscriptionsQuery,
} from "metabase/api";
import { getCollectionType } from "metabase/entities/collections/utils";
+import { color } from "metabase/ui/colors";
import {
createEntity,
entityCompatibleQuery,
undo,
-} from "metabase/lib/entities";
-import { color } from "metabase/ui/colors";
+} from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
*/
diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.js
index 5adf3242db1..ebae14c6094 100644
--- a/frontend/src/metabase/entities/questions.js
+++ b/frontend/src/metabase/entities/questions.js
@@ -11,11 +11,6 @@ import {
getCollectionType,
normalizedCollection,
} from "metabase/entities/collections";
-import {
- createEntity,
- entityCompatibleQuery,
- undo,
-} from "metabase/lib/entities";
import {
API_UPDATE_QUESTION,
SOFT_RELOAD_CARD,
@@ -25,6 +20,11 @@ import {
getMetadataUnfiltered,
} from "metabase/selectors/metadata";
import { color } from "metabase/ui/colors";
+import {
+ createEntity,
+ entityCompatibleQuery,
+ undo,
+} from "metabase/utils/entities";
export const INJECT_RTK_QUERY_QUESTION_VALUE =
"metabase/entities/questions/FETCH_ADHOC_METADATA";
diff --git a/frontend/src/metabase/entities/schemas.js b/frontend/src/metabase/entities/schemas.js
index ede8c53fbb4..d45561f933f 100644
--- a/frontend/src/metabase/entities/schemas.js
+++ b/frontend/src/metabase/entities/schemas.js
@@ -9,9 +9,9 @@ import {
useListSyncableDatabaseSchemasQuery,
} from "metabase/api";
import { Questions } from "metabase/entities/questions";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
import { SchemaSchema } from "metabase/schema";
import { getMetadata } from "metabase/selectors/metadata";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
import {
SAVED_QUESTIONS_VIRTUAL_DB_ID,
getCollectionVirtualSchemaId,
diff --git a/frontend/src/metabase/entities/search.js b/frontend/src/metabase/entities/search.js
index c572f2331c3..c425e04770a 100644
--- a/frontend/src/metabase/entities/search.js
+++ b/frontend/src/metabase/entities/search.js
@@ -9,9 +9,9 @@ import {
useSearchQuery,
} from "metabase/api";
import { canonicalCollectionId } from "metabase/collections/utils";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
-import { entityForObject } from "metabase/lib/schema";
+import { entityForObject } from "metabase/entities/utils";
import { ObjectUnionSchema } from "metabase/schema";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
import { Actions } from "./actions";
import { Bookmarks } from "./bookmarks";
diff --git a/frontend/src/metabase/entities/segments.js b/frontend/src/metabase/entities/segments.js
index 436d89ed044..09a1ab2dc3a 100644
--- a/frontend/src/metabase/entities/segments.js
+++ b/frontend/src/metabase/entities/segments.js
@@ -3,10 +3,10 @@ import {
useGetSegmentQuery,
useListSegmentsQuery,
} from "metabase/api";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
import { SegmentSchema } from "metabase/schema";
import { getMetadata } from "metabase/selectors/metadata";
import { color } from "metabase/ui/colors";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/snippet-collections.js b/frontend/src/metabase/entities/snippet-collections.js
index 2def31ef5d4..d0aef868be1 100644
--- a/frontend/src/metabase/entities/snippet-collections.js
+++ b/frontend/src/metabase/entities/snippet-collections.js
@@ -9,8 +9,8 @@ import {
getExpandedCollectionsById,
useListQuery as useListCollectionsQuery,
} from "metabase/entities/collections";
-import { createEntity, undo } from "metabase/lib/entities";
import { SnippetCollectionSchema } from "metabase/schema";
+import { createEntity, undo } from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/snippets.js b/frontend/src/metabase/entities/snippets.js
index afec5c1f614..15439b48150 100644
--- a/frontend/src/metabase/entities/snippets.js
+++ b/frontend/src/metabase/entities/snippets.js
@@ -3,7 +3,7 @@ import {
useGetSnippetQuery,
useListSnippetsQuery,
} from "metabase/api";
-import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";
+import { createEntity, entityCompatibleQuery } from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/tables.js b/frontend/src/metabase/entities/tables.js
index 049ade4c3ee..a2ff5b0cc92 100644
--- a/frontend/src/metabase/entities/tables.js
+++ b/frontend/src/metabase/entities/tables.js
@@ -18,11 +18,17 @@ import {
import { Fields } from "metabase/entities/fields";
import { Questions } from "metabase/entities/questions";
import { Segments } from "metabase/entities/segments";
+import { TableSchema } from "metabase/schema";
+import {
+ getMetadata,
+ getMetadataUnfiltered,
+} from "metabase/selectors/metadata";
+import { color } from "metabase/ui/colors";
import {
createEntity,
entityCompatibleQuery,
notify,
-} from "metabase/lib/entities";
+} from "metabase/utils/entities";
import {
compose,
createThunkAction,
@@ -31,13 +37,7 @@ import {
withAction,
withCachedDataAndRequestState,
withNormalize,
-} from "metabase/lib/redux";
-import { TableSchema } from "metabase/schema";
-import {
- getMetadata,
- getMetadataUnfiltered,
-} from "metabase/selectors/metadata";
-import { color } from "metabase/ui/colors";
+} from "metabase/utils/redux";
import {
convertSavedQuestionToVirtualTable,
getCollectionVirtualSchemaId,
diff --git a/frontend/src/metabase/entities/timeline-events.js b/frontend/src/metabase/entities/timeline-events.js
index be92e1f59f1..dd3bc9c8506 100644
--- a/frontend/src/metabase/entities/timeline-events.js
+++ b/frontend/src/metabase/entities/timeline-events.js
@@ -1,12 +1,12 @@
import { t } from "ttag";
import { timelineEventApi, useGetTimelineEventQuery } from "metabase/api";
+import { TimelineEventSchema } from "metabase/schema";
import {
createEntity,
entityCompatibleQuery,
undo,
-} from "metabase/lib/entities";
-import { TimelineEventSchema } from "metabase/schema";
+} from "metabase/utils/entities";
/**
* @deprecated use "metabase/api" instead
diff --git a/frontend/src/metabase/entities/timelines.js b/frontend/src/metabase/entities/timelines.js
index 45077d4c459..05a813e4b70 100644
--- a/frontend/src/metabase/entities/timelines.js
+++ b/frontend/src/metabase/entities/timelines.js
@@ -11,13 +11,16 @@ import {
useListTimelinesQuery,
} from "metabase/api";
import { canonicalCollectionId } from "metabase/collections/utils";
+import {
+ getDefaultTimeline,
+ getTimelineName,
+} from "metabase/common/utils/timelines";
+import { TimelineSchema } from "metabase/schema";
import {
createEntity,
entityCompatibleQuery,
undo,
-} from "metabase/lib/entities";
-import { getDefaultTimeline, getTimelineName } from "metabase/lib/timelines";
-import { TimelineSchema } from "metabase/schema";
+} from "metabase/utils/entities";
import { TimelineEvents } from "./timeline-events";
diff --git a/frontend/src/metabase/entities/transforms.ts b/frontend/src/metabase/entities/transforms.ts
index ccb6f8941a7..8fa6a1d0da6 100644
--- a/frontend/src/metabase/entities/transforms.ts
+++ b/frontend/src/metabase/entities/transforms.ts
@@ -1,6 +1,6 @@
-import { createEntity } from "metabase/lib/entities";
import { TransformSchema } from "metabase/schema";
import { color } from "metabase/ui/utils/colors";
+import { createEntity } from "metabase/utils/entities";
import type { Transform } from "metabase-types/api";
/**
diff --git a/frontend/src/metabase/lib/schema/schema.ts b/frontend/src/metabase/entities/utils.ts
similarity index 100%
rename from frontend/src/metabase/lib/schema/schema.ts
rename to frontend/src/metabase/entities/utils.ts
diff --git a/frontend/src/metabase/lib/schema/schema.unit.spec.ts b/frontend/src/metabase/entities/utils.unit.spec.ts
similarity index 93%
rename from frontend/src/metabase/lib/schema/schema.unit.spec.ts
rename to frontend/src/metabase/entities/utils.unit.spec.ts
index c7f863dfb9f..03c1aaf3bb1 100644
--- a/frontend/src/metabase/lib/schema/schema.unit.spec.ts
+++ b/frontend/src/metabase/entities/utils.unit.spec.ts
@@ -1,4 +1,7 @@
-import { entityTypeForModel, entityTypeForObject } from "./schema";
+import {
+ entityTypeForModel,
+ entityTypeForObject,
+} from "metabase/entities/utils";
describe("schemas", () => {
const MODEL_ENTITY_TYPE = [
diff --git a/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx b/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
index 383c75ec5a5..d0f3192cc63 100644
--- a/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
+++ b/frontend/src/metabase/forms/components/FormGroupsWidget/FormGroupsWidget.tsx
@@ -6,8 +6,8 @@ import _ from "underscore";
import { MembershipSelect } from "metabase/admin/people/components/MembershipSelect";
import { useListPermissionsGroupsQuery } from "metabase/api";
import { FormField } from "metabase/common/components/FormField";
-import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
+import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
import type { GroupId, Member } from "metabase-types/api";
interface FormGroupsWidgetProps extends HTMLAttributes<HTMLDivElement> {
diff --git a/frontend/src/metabase/forms/hooks/use-form-submit/use-form-submit.ts b/frontend/src/metabase/forms/hooks/use-form-submit/use-form-submit.ts
index 943cf3b4911..a6b15cada71 100644
--- a/frontend/src/metabase/forms/hooks/use-form-submit/use-form-submit.ts
+++ b/frontend/src/metabase/forms/hooks/use-form-submit/use-form-submit.ts
@@ -2,7 +2,7 @@ import type { FormikHelpers } from "formik";
import type { Dispatch, SetStateAction } from "react";
import { useCallback, useState } from "react";
-import { getResponseErrorMessage } from "metabase/lib/errors";
+import { getResponseErrorMessage } from "metabase/utils/errors";
import type { FormState } from "../../contexts";
diff --git a/frontend/src/metabase/get-is-embed-preview.ts b/frontend/src/metabase/get-is-embed-preview.ts
index 79f861fd274..4b67473a051 100644
--- a/frontend/src/metabase/get-is-embed-preview.ts
+++ b/frontend/src/metabase/get-is-embed-preview.ts
@@ -1,4 +1,4 @@
-import { IS_EMBED_PREVIEW } from "metabase/lib/embed";
+import { IS_EMBED_PREVIEW } from "metabase/utils/embed";
/**
* The only point of putting this into its own function
diff --git a/frontend/src/metabase/hoc/ModalRoute.tsx b/frontend/src/metabase/hoc/ModalRoute.tsx
index d5ef06b939c..3e2953b8065 100644
--- a/frontend/src/metabase/hoc/ModalRoute.tsx
+++ b/frontend/src/metabase/hoc/ModalRoute.tsx
@@ -4,8 +4,8 @@ import { Route } from "react-router";
import { push } from "react-router-redux";
import { Modal } from "metabase/common/components/Modal";
-import { connect } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
+import { connect } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
type RouteParams = Record<string, string | undefined>;
diff --git a/frontend/src/metabase/hoc/Remapped.jsx b/frontend/src/metabase/hoc/Remapped.jsx
index 3b3e85d06ca..c24ca3ceb77 100644
--- a/frontend/src/metabase/hoc/Remapped.jsx
+++ b/frontend/src/metabase/hoc/Remapped.jsx
@@ -1,9 +1,9 @@
/* eslint-disable react/prop-types */
import { Component } from "react";
-import { connect } from "metabase/lib/redux";
import { fetchRemapping } from "metabase/redux/metadata";
import { getMetadata } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
const mapStateToProps = (state, props) => ({
metadata: getMetadata(state, props),
diff --git a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx
index 70126f70c3f..6da9da6627c 100644
--- a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx
+++ b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx
@@ -6,10 +6,10 @@ import { updateSettings } from "metabase/admin/settings/settings";
import { DashboardSelector } from "metabase/common/components/DashboardSelector/DashboardSelector";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo, dismissUndo } from "metabase/redux/undo";
import { refreshCurrentUser } from "metabase/redux/user";
import { Box, Button, Flex, Modal, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { DashboardId } from "metabase-types/api";
const CUSTOM_HOMEPAGE_SETTING_KEY = "custom-homepage";
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx
index 39e3eb5ae44..ae41d3cbb29 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx
+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedHomepage.tsx
@@ -4,10 +4,10 @@ import { t } from "ttag";
import { useSendProductFeedbackMutation } from "metabase/api/product-feedback";
import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
import { getPlan } from "metabase/common/utils/plan";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { isEEBuild } from "metabase/lib/utils";
+import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";
import { addUndo } from "metabase/redux/undo";
import { getDocsUrl, getSetting } from "metabase/selectors/settings";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { EmbeddingHomepageDismissReason } from "metabase-types/api";
import { EmbedHomepageView } from "./EmbedHomepageView";
@@ -77,7 +77,7 @@ export const EmbedHomepage = () => {
}
};
- const variant = isEEBuild() ? "ee" : "oss";
+ const variant = PLUGIN_IS_EE_BUILD.isEEBuild() ? "ee" : "oss";
return (
<>
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts b/frontend/src/metabase/home/components/EmbedHomepage/actions.ts
index d1b23d7fccc..57ec368e76d 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/actions.ts
+++ b/frontend/src/metabase/home/components/EmbedHomepage/actions.ts
@@ -1,5 +1,5 @@
-import { createAsyncThunk } from "metabase/lib/redux";
import { updateSetting } from "metabase/redux/settings";
+import { createAsyncThunk } from "metabase/utils/redux";
import type { EmbeddingHomepageDismissReason } from "metabase-types/api";
import { trackEmbeddingHomepageDismissed } from "./analytics";
diff --git a/frontend/src/metabase/home/components/EmbedHomepage/analytics.ts b/frontend/src/metabase/home/components/EmbedHomepage/analytics.ts
index b48fd0dbb4c..f1605a6772b 100644
--- a/frontend/src/metabase/home/components/EmbedHomepage/analytics.ts
+++ b/frontend/src/metabase/home/components/EmbedHomepage/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
import type { EmbeddingHomepageDismissReason } from "metabase-types/api";
const SCHEMA_NAME = "embedding_homepage";
diff --git a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
index 0c99d622c65..48892bab20a 100644
--- a/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
+++ b/frontend/src/metabase/home/components/HomeContent/HomeContent.tsx
@@ -3,9 +3,9 @@ import { useMemo } from "react";
import { useListPopularItemsQuery, useListRecentsQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useDatabaseListQuery, useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
-import { isSyncCompleted } from "metabase/lib/syncing";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type Database from "metabase-lib/v1/metadata/Database";
import type { PopularItem, RecentItem, User } from "metabase-types/api";
diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
index 5e42cb6fa98..43fccd4dd50 100644
--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
@@ -5,9 +5,9 @@ import _ from "underscore";
import { MetabotLogo } from "metabase/common/components/MetabotLogo";
import animationStyles from "metabase/css/core/animation.module.css";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import { Flex, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { getHasMetabotLogo } from "../../selectors";
diff --git a/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsx b/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsx
index 9ff9e5efe58..1ba0cf095b8 100644
--- a/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsx
+++ b/frontend/src/metabase/home/components/HomeHelpCard/HomeHelpCard.tsx
@@ -4,13 +4,13 @@ import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getLearnUrl } from "metabase/selectors/settings";
import {
getApplicationName,
getShowMetabaseLinks,
} from "metabase/selectors/whitelabel";
import { Card, Flex, Icon, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const HomeHelpCard = (): JSX.Element | null => {
const cardTitleId = useUniqueId();
diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx
index 71ccb3cbd87..62bd5d1efa3 100644
--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx
+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx
@@ -5,10 +5,10 @@ import { t } from "ttag";
import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";
import { useHasTokenFeature, useSetting } from "metabase/common/hooks";
import { EmbeddingHubHomePage } from "metabase/embedding/embedding-hub";
-import { useSelector } from "metabase/lib/redux";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
import { getLandingPageIllustration } from "metabase/selectors/whitelabel";
import { Box, Button, Icon, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { CustomHomePageModal } from "../CustomHomePageModal";
import { HomeGreeting } from "../HomeGreeting";
diff --git a/frontend/src/metabase/home/components/HomePage/HomePage.tsx b/frontend/src/metabase/home/components/HomePage/HomePage.tsx
index 85c3af85b87..d77267263cd 100644
--- a/frontend/src/metabase/home/components/HomePage/HomePage.tsx
+++ b/frontend/src/metabase/home/components/HomePage/HomePage.tsx
@@ -4,10 +4,10 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useHomepageDashboard } from "metabase/common/hooks/use-homepage-dashboard";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { updateUserSetting } from "metabase/redux/settings";
import { addUndo } from "metabase/redux/undo";
import { getHasDismissedCustomHomePageToast } from "metabase/selectors/app";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { HomeContent } from "../HomeContent";
import { HomeLayout } from "../HomeLayout";
diff --git a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx
index 2c352f354e7..df6658cf608 100644
--- a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx
+++ b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx
@@ -3,9 +3,9 @@ import _ from "underscore";
import { useListPopularItemsQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { getIcon } from "metabase/lib/icon";
-import { getName } from "metabase/lib/name";
-import * as Urls from "metabase/lib/urls";
+import { getIcon } from "metabase/utils/icon";
+import { getName } from "metabase/utils/name";
+import * as Urls from "metabase/utils/urls";
import type { PopularItem } from "metabase-types/api";
import { HomeCaption } from "../HomeCaption";
diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx
index da843450365..f1310363c3f 100644
--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx
+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx
@@ -2,11 +2,11 @@ import { t } from "ttag";
import { useListRecentsQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { getIcon } from "metabase/lib/icon";
-import { getName } from "metabase/lib/name";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getUser } from "metabase/selectors/user";
+import { getIcon } from "metabase/utils/icon";
+import { getName } from "metabase/utils/name";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { RecentItem } from "metabase-types/api";
import { isWithinWeeks } from "../../utils";
diff --git a/frontend/src/metabase/home/components/HomeXrayCard/analytics.ts b/frontend/src/metabase/home/components/HomeXrayCard/analytics.ts
index ad58e933c65..d70237da255 100644
--- a/frontend/src/metabase/home/components/HomeXrayCard/analytics.ts
+++ b/frontend/src/metabase/home/components/HomeXrayCard/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackHomeXRayClicked = () => {
trackSimpleEvent({
diff --git a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx
index 8000903bae8..4697d09e508 100644
--- a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx
+++ b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx
@@ -10,11 +10,11 @@ import {
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { Select } from "metabase/common/components/Select";
-import { useSelector } from "metabase/lib/redux";
-import { isSyncCompleted } from "metabase/lib/syncing";
-import { isNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import { getApplicationName } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
+import { isSyncCompleted } from "metabase/utils/syncing";
+import { isNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import type { Database, DatabaseXray } from "metabase-types/api";
import { HomeCaption } from "../HomeCaption";
diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
index 0dac8886a9a..6f011e4456a 100644
--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx
@@ -15,8 +15,6 @@ import { OnboardingIllustration } from "metabase/common/components/OnboardingIll
import { useSetting, useTempStorage } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import { getIsXrayEnabled } from "metabase/home/selectors";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useHelpLink } from "metabase/nav/components/AppSwitcher/useHelpLink";
import {
getDocsUrl,
@@ -40,6 +38,8 @@ import {
Title,
rem,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import S from "./Onboarding.module.css";
import {
diff --git a/frontend/src/metabase/home/components/Onboarding/analytics.ts b/frontend/src/metabase/home/components/Onboarding/analytics.ts
index 480f704df54..e06d1d2f36c 100644
--- a/frontend/src/metabase/home/components/Onboarding/analytics.ts
+++ b/frontend/src/metabase/home/components/Onboarding/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { ChecklistItemCTA, ChecklistItemValue } from "./types";
diff --git a/frontend/src/metabase/home/utils.ts b/frontend/src/metabase/home/utils.ts
index dfb6e88bf0d..2b894f41670 100644
--- a/frontend/src/metabase/home/utils.ts
+++ b/frontend/src/metabase/home/utils.ts
@@ -1,6 +1,6 @@
import dayjs from "dayjs";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
export const isWithinWeeks = (
timestamp: string,
diff --git a/frontend/src/metabase/lib/collections.ts b/frontend/src/metabase/lib/collections.ts
deleted file mode 100644
index edb399c4e86..00000000000
--- a/frontend/src/metabase/lib/collections.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { t } from "ttag";
-
-import type { Crumb } from "metabase/common/components/Breadcrumbs";
-import { isNotNull } from "metabase/lib/types";
-import type { Collection, CollectionId } from "metabase-types/api";
-
-export const getCrumbs = (
- collection: Collection | undefined,
- collectionsById: Partial<Record<CollectionId, Collection>>,
- callback: (id: CollectionId) => void,
-): Crumb[] => {
- if (collection?.path) {
- return [
- ...collection.path
- .map((id) => collectionsById[id])
- .filter(isNotNull)
- .map(
- (collection): Crumb => [
- collection.name,
- () => callback(collection.id),
- ],
- ),
- [collection.name],
- ];
- }
-
- const rootCollection = collectionsById.root;
- if (!rootCollection) {
- return [[t`Unknown`]];
- }
-
- return [
- [rootCollection.name, () => callback(rootCollection.id)],
- [t`Unknown`],
- ];
-};
diff --git a/frontend/src/metabase/lib/collections.unit.spec.ts b/frontend/src/metabase/lib/collections.unit.spec.ts
deleted file mode 100644
index aa819d42a28..00000000000
--- a/frontend/src/metabase/lib/collections.unit.spec.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import type { Crumb } from "metabase/common/components/Breadcrumbs";
-import { createMockCollection } from "metabase-types/api/mocks";
-
-import { getCrumbs } from "./collections";
-
-const getCrumbAction = (crumb: Crumb) => {
- if (
- !Array.isArray(crumb) ||
- crumb.length < 2 ||
- typeof crumb[1] !== "function"
- ) {
- throw new Error("Expected crumb callback action");
- }
-
- return crumb[1];
-};
-
-const collectionsById = {
- root: createMockCollection({ id: "root", name: "Our analytics", path: [] }),
- 1: createMockCollection({ id: 1, name: "parent", path: ["root"] }),
- 2: createMockCollection({ id: 2, name: "child", path: ["root", 1] }),
-};
-
-describe("getCrumbs", () => {
- it("returns path starting from root", () => {
- const crumbs = getCrumbs(collectionsById[2], collectionsById, jest.fn());
-
- expect(crumbs).toMatchObject([
- ["Our analytics", expect.any(Function)],
- ["parent", expect.any(Function)],
- ["child"],
- ]);
- });
-
- it("makes collection step functions calling the callback with the collection id", () => {
- const callbackMock = jest.fn();
- const crumbs = getCrumbs(collectionsById[2], collectionsById, callbackMock);
-
- const rootCallback = getCrumbAction(crumbs[0]);
- // Workaround to simulate actual event object passed by React, impossible to construct.
- rootCallback(undefined as never);
- expect(callbackMock).toHaveBeenCalledWith("root");
-
- const parentCallback = getCrumbAction(crumbs[1]);
- // Workaround to simulate actual event object passed by React, impossible to construct.
- parentCallback(undefined as never);
- expect(callbackMock).toHaveBeenCalledWith(1);
- });
-});
diff --git a/frontend/src/metabase/lib/compat/check-version.ts b/frontend/src/metabase/lib/compat/check-version.ts
deleted file mode 100644
index 7196128312f..00000000000
--- a/frontend/src/metabase/lib/compat/check-version.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from "react";
-
-export const getMajorReactVersion = () => {
- const versionParts = React.version.split(".").map(Number);
-
- return versionParts[0];
-};
diff --git a/frontend/src/metabase/lib/compose-event-handlers.ts b/frontend/src/metabase/lib/compose-event-handlers.ts
deleted file mode 100644
index 7fd53806156..00000000000
--- a/frontend/src/metabase/lib/compose-event-handlers.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-type HandlerType<E> = ((event: E) => void) | undefined;
-
-export const composeEventHandlers = <E>(...handlers: HandlerType<E>[]) => {
- return function handleEvent(event: E) {
- handlers.forEach((handler) => {
- if (typeof handler === "function") {
- handler(event);
- }
- });
- };
-};
diff --git a/frontend/src/metabase/lib/engine.ts b/frontend/src/metabase/lib/engine.ts
deleted file mode 100644
index 7e4009791ce..00000000000
--- a/frontend/src/metabase/lib/engine.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { Engine } from "metabase-types/api";
-
-export function getEngineNativeType(engine?: string): "sql" | "json" {
- switch (engine) {
- case "mongo":
- case "druid":
- return "json";
- default:
- return "sql";
- }
-}
-
-export function getNativeQueryLanguage(engine?: string) {
- return getEngineNativeType(engine).toUpperCase() as "SQL" | "JSON";
-}
-
-type JSONQuery = Record<string, any> | Record<string, any>[];
-
-function formatJsonQuery(query: JSONQuery) {
- return JSON.stringify(query, null, 2);
-}
-
-export function formatNativeQuery(query: string | JSONQuery): string {
- return typeof query === "string" ? query : formatJsonQuery(query);
-}
-
-export function isDeprecatedEngine(
- engines: Record<string, Engine> = {},
- engine: string,
-) {
- return engines[engine] != null && engines[engine]["superseded-by"] != null;
-}
diff --git a/frontend/src/metabase/lib/fetchWithTimeout.ts b/frontend/src/metabase/lib/fetchWithTimeout.ts
deleted file mode 100644
index a2d4b21b59e..00000000000
--- a/frontend/src/metabase/lib/fetchWithTimeout.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-const DEFAULT_TIMEOUT = 7000;
-
-/* wrapper around fetch that allows passing a timeout prop */
-export function fetchWithTimeout(
- url: string,
- options: RequestInit & { timeout?: number } = {},
-) {
- const controller = new AbortController();
- const timeout = setTimeout(() => {
- controller.abort();
- }, options?.timeout || DEFAULT_TIMEOUT);
-
- return fetch(url, {
- ...options,
- signal: controller.signal,
- })
- .then((res) => {
- clearTimeout(timeout);
- return res;
- })
- .catch((err: Error) => {
- clearTimeout(timeout);
- if (err.name === "AbortError") {
- throw new Error(`Request tp ${url} timed out`);
- }
- throw new Error(err.message || "error fetching");
- });
-}
diff --git a/frontend/src/metabase/lib/formatting.ts b/frontend/src/metabase/lib/formatting.ts
deleted file mode 100644
index fd4220f6a82..00000000000
--- a/frontend/src/metabase/lib/formatting.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export * from "./formatting/column";
-export * from "./formatting/currency";
-export * from "./formatting/date";
-export * from "./formatting/email";
-export * from "./formatting/field";
-export * from "./formatting/geography";
-export * from "./formatting/image";
-export * from "./formatting/numbers";
-export * from "./formatting/strings";
-export * from "./formatting/time";
-export * from "./formatting/types";
-export * from "./formatting/url";
-export * from "./formatting/value";
diff --git a/frontend/src/metabase/lib/formatting/date.unit.spec.tsx b/frontend/src/metabase/lib/formatting/date.unit.spec.tsx
deleted file mode 100644
index 5645a7baafe..00000000000
--- a/frontend/src/metabase/lib/formatting/date.unit.spec.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import {
- DATE_RANGE_FORMAT_SPECS,
- SPECIFIC_DATE_TIME_UNITS,
- formatDateTimeForParameter,
- formatDateTimeRangeWithUnit,
-} from "metabase/lib/formatting/date";
-
-describe("formatDateTimeRangeWithUnit", () => {
- for (const unit of SPECIFIC_DATE_TIME_UNITS) {
- describe(`formats for unit ${unit}`, () => {
- const specs = DATE_RANGE_FORMAT_SPECS[unit];
-
- it("should have a default spec", () => {
- const defaultSpec = specs.find((spec) => spec.same === null);
- expect(defaultSpec).toBeDefined();
- });
-
- for (const spec of specs) {
- const {
- same,
- tests: { verbose, compact, removedYear, removedDay },
- } = spec;
-
- const inside = same
- ? `inside the same ${same}`
- : "with no units in common";
-
- if (verbose) {
- const { output, verboseOutput, input } = verbose;
-
- it(`should correctly format a ${unit} range ${inside}`, () => {
- const options = { type: "tooltip" };
-
- expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
- output,
- );
-
- if (verboseOutput) {
- // eslint-disable-next-line jest/no-conditional-expect
- expect(formatDateTimeRangeWithUnit(input, unit)).toBe(
- verboseOutput,
- );
- }
- });
- }
-
- if (compact) {
- const { output, input } = compact;
-
- it(`(options.compact) should correctly compact format a ${unit} range ${inside}`, () => {
- const options = { compact: true };
-
- expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
- output,
- );
- });
- }
-
- if (removedYear) {
- const { output, input } = removedYear;
-
- it(`(options.removeYear) should correctly format a ${unit} range ${inside} with the year removed`, () => {
- const options = { type: "tooltip", removeYear: true };
-
- expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
- output,
- );
- });
- }
-
- if (removedDay) {
- const { output, input } = removedDay;
-
- it(`(options.removeDay) should correctly format a ${unit} range ${inside} with the day removed`, () => {
- const options = { type: "tooltip", removeDay: true };
-
- expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
- output,
- );
- });
- }
- }
- });
- }
-});
-
-describe("formatDateTimeRangeWithUnit with date_style", () => {
- it("should format M/D/YYYY style in cells", () => {
- const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
- const options = { type: "cell" as const, date_style: "M/D/YYYY" };
-
- expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
- "1/1/2017 – 1/7/2017",
- );
- });
-
- it("should format D/M/YYYY style in cells", () => {
- const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
- const options = { type: "cell" as const, date_style: "D/M/YYYY" };
-
- expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
- "1/1/2017 – 7/1/2017",
- );
- });
-
- it("should format YYYY/M/D style in cells", () => {
- const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
- const options = { type: "cell" as const, date_style: "YYYY/M/D" };
-
- expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
- "2017/1/1 – 2017/1/7",
- );
- });
-
- it("should format D MMMM, YYYY style in cells", () => {
- const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
- const options = { type: "cell" as const, date_style: "D MMMM, YYYY" };
-
- expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
- "1 January, 2017 – 7 January, 2017",
- );
- });
-
- it("should format week across months with M/D/YYYY in cells", () => {
- const input: [string] = ["2017-01-29"]; // Week: 2017-01-29 to 2017-02-04
- const options = { type: "cell" as const, date_style: "M/D/YYYY" };
-
- expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
- "1/29/2017 – 2/4/2017",
- );
- });
-
- it("should format week across years with M/D/YYYY in cells", () => {
- const input: [string] = ["2017-12-31"]; // Week: 2017-12-31 to 2018-01-06
- const options = { type: "cell" as const, date_style: "M/D/YYYY" };
-
- expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
- "12/31/2017 – 1/6/2018",
- );
- });
-
- it("should respect custom separator with M/D/YYYY style", () => {
- const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
- const options = {
- type: "cell" as const,
- date_style: "M/D/YYYY",
- date_separator: "-",
- };
-
- expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
- "1-1-2017 – 1-7-2017",
- );
- });
-});
-
-describe("formatDateTimeForParameter", () => {
- const value = "2020-01-01T06:00:00+05:00";
-
- it("should format year", () => {
- expect(formatDateTimeForParameter(value, "year")).toBe(
- "2020-01-01~2020-12-31",
- );
- });
-
- it("should format quarter", () => {
- expect(formatDateTimeForParameter(value, "quarter")).toBe("Q1-2020");
- });
-
- it("should format month", () => {
- expect(formatDateTimeForParameter(value, "month")).toBe("2020-01");
- });
-
- it("should format week", () => {
- expect(formatDateTimeForParameter(value, "week")).toBe(
- "2019-12-29~2020-01-04",
- );
- });
-
- it("should format day", () => {
- expect(formatDateTimeForParameter(value, "day")).toBe("2020-01-01");
- });
-
- it("should format hour", () => {
- expect(formatDateTimeForParameter(value, "hour")).toBe("2020-01-01T06:00");
- });
-
- it("should format minute", () => {
- expect(formatDateTimeForParameter(value, "minute")).toBe(
- "2020-01-01T06:00",
- );
- });
-
- it("should format quarter-of-year as a day", () => {
- expect(formatDateTimeForParameter(value, "quarter-of-year")).toBe(
- "2020-01-01",
- );
- });
-});
diff --git a/frontend/src/metabase/lib/formatting/numbers.unit.spec.ts b/frontend/src/metabase/lib/formatting/numbers.unit.spec.ts
deleted file mode 100644
index 2492f8e0ccd..00000000000
--- a/frontend/src/metabase/lib/formatting/numbers.unit.spec.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { formatNumber, numberFormatterForOptions } from "./numbers";
-
-describe("formatNumber", () => {
- it("should respect the decimals setting even when compact is true (metabase#54063)", () => {
- const result = formatNumber(4.271250189320243, {
- compact: true,
- decimals: 0,
- });
-
- expect(result).toEqual("4");
- });
-
- it("should show the correct currency format (metabase#34242)", () => {
- const numberFormatter = numberFormatterForOptions({
- number_style: "currency",
- currency: "USD",
- currency_style: "symbol",
- maximumFractionDigits: 2,
- });
-
- const compactResult = formatNumber(-500000, {
- currency: "USD",
- number_style: "currency",
- currency_style: "symbol",
- currency_in_header: true,
- number_separators: ".,",
- _numberFormatter: numberFormatter,
- compact: true,
- });
- expect(compactResult).toEqual("-$500.0k");
-
- const fullResult = formatNumber(-500000, {
- compact: false,
- maximumFractionDigits: 2,
- currency: "USD",
- number_style: "currency",
- currency_style: "symbol",
- currency_in_header: true,
- number_separators: ".,",
- _numberFormatter: numberFormatter,
- });
- expect(fullResult).toEqual("-$500,000.00");
- });
-
- it("should work with scientific notation (metabase#25222)", () => {
- expect(
- formatNumber(0.000000000015, {
- number_style: "scientific",
- }),
- ).toEqual("1.5e-11");
-
- expect(
- formatNumber(1.000000015, {
- number_style: "scientific",
- }),
- ).toEqual("1.000000015e+0");
-
- expect(
- formatNumber(1.000015, {
- number_style: "scientific",
- }),
- ).toEqual("1.000015e+0");
- });
-
- describe("compact mode with decimals setting", () => {
- it("should respect various decimal settings in compact mode (metabase#63145)", () => {
- const value = 1234567;
-
- expect(
- formatNumber(value, {
- compact: true,
- decimals: 0,
- }),
- ).toBe("1M");
-
- expect(
- formatNumber(value, {
- compact: true,
- decimals: 1,
- }),
- ).toBe("1.2M");
-
- expect(
- formatNumber(value, {
- compact: true,
- decimals: 2,
- }),
- ).toBe("1.23M");
-
- expect(
- formatNumber(value, {
- compact: true,
- decimals: 3,
- }),
- ).toBe("1.235M");
-
- expect(
- formatNumber(value, {
- compact: true,
- decimals: 4,
- }),
- ).toBe("1.2346M");
- });
- });
-
- describe("formatNumber – compact rounding (metabase#59454)", () => {
- it("rounds billions with 0 decimals", () => {
- expect(
- formatNumber(1_499_999_999, {
- compact: true,
- maximumFractionDigits: 0,
- }),
- ).toBe("1B");
- expect(
- formatNumber(1_500_000_000, {
- compact: true,
- maximumFractionDigits: 0,
- }),
- ).toBe("2B");
- expect(
- formatNumber(1_949_999_999, {
- compact: true,
- maximumFractionDigits: 0,
- }),
- ).toBe("2B");
- });
-
- it("carries to the next unit at 999.5M (0 decimals)", () => {
- expect(
- formatNumber(999_499_999, { compact: true, maximumFractionDigits: 0 }),
- ).toBe("999M");
- expect(
- formatNumber(999_500_000, { compact: true, maximumFractionDigits: 0 }),
- ).toBe("1B");
- });
-
- it("keeps sign with rounding", () => {
- expect(
- formatNumber(-1_950_000_000, {
- compact: true,
- maximumFractionDigits: 0,
- }),
- ).toBe("-2B");
- });
-
- it("respects explicit decimals when provided", () => {
- expect(
- formatNumber(1_950_000_000, {
- compact: true,
- minimumFractionDigits: 1,
- maximumFractionDigits: 1,
- }),
- ).toBe("2.0B");
- });
- });
-});
-
-describe("formatNumber with scale (multiply function)", () => {
- it("should multiply regular numbers with scale", () => {
- expect(formatNumber(5, { scale: 3 })).toBe("15");
- expect(formatNumber(2.5, { scale: 4 })).toBe("10");
- });
-
- it("should multiply bigint with integer scale", () => {
- expect(formatNumber(BigInt(5), { scale: 3 })).toBe("15");
- expect(formatNumber(BigInt(100), { scale: 7 })).toBe("700");
- });
-
- it("should convert bigint to number when scaling with float", () => {
- expect(formatNumber(BigInt(5), { scale: 2.5 })).toBe("12.5");
- expect(formatNumber(BigInt(10), { scale: 1.5 })).toBe("15");
- });
-
- it("should handle edge cases with scale", () => {
- expect(formatNumber(0, { scale: 5 })).toBe("0");
- expect(formatNumber(BigInt(0), { scale: 3 })).toBe("0");
- expect(formatNumber(BigInt(5), { scale: 0 })).toBe("0");
- expect(formatNumber(BigInt(5), { scale: 0.5 })).toBe("2.5");
- });
-
- it("should handle negative numbers with scale", () => {
- expect(formatNumber(-5, { scale: 3 })).toBe("-15");
- expect(formatNumber(BigInt(-5), { scale: 3 })).toBe("-15");
- expect(formatNumber(BigInt(-5), { scale: 2.5 })).toBe("-12.5");
- });
-});
diff --git a/frontend/src/metabase/lib/i18n-debug.js b/frontend/src/metabase/lib/i18n-debug.js
deleted file mode 100644
index 521aeb47181..00000000000
--- a/frontend/src/metabase/lib/i18n-debug.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { HAS_LOCAL_STORAGE } from "metabase/lib/dom";
-
-// If enabled this monkeypatches `t` and `jt` to return blacked out
-// strings/elements to assist in finding untranslated strings.
-//
-// Enable:
-// localStorage["metabase-i18n-debug"] = true; window.location.reload()
-//
-// Disable:
-// delete localStorage["metabase-i18n-debug"]; window.location.reload()
-//
-// Should be loaded before almost everything else.
-
-// special strings that need to be handled specially
-const SPECIAL_STRINGS = new Set([
- // Expression editor aggregation names need to be unique for the parser
- "Count",
- "CumulativeCount",
- "Sum",
- "CumulativeSum",
- "Distinct",
- "StandardDeviation",
- "Average",
- "Min",
- "Max",
-]);
-
-const obfuscateString = (original, string) => {
- if (SPECIAL_STRINGS.has(original)) {
- return string.toUpperCase();
- } else {
- // divide by 2 because Unicode `FULL BLOCK` is quite wide
- return new Array(Math.ceil(string.length / 2) + 1).join("█");
- }
-};
-
-export function enableTranslatedStringReplacement() {
- const c3po = require("ttag");
-
- const _t = c3po.t;
- const _jt = c3po.jt;
- const _ngettext = c3po.ngettext;
- const _c = c3po.c;
-
- c3po.t = (...args) => {
- return obfuscateString(args[0][0], _t(...args));
- };
- c3po.ngettext = (...args) => {
- return obfuscateString(args[0][0], _ngettext(...args));
- };
- c3po.jt = (...args) => {
- const elements = _jt(...args);
- return <span style={{ backgroundColor: "currentcolor" }}>{elements}</span>;
- };
- c3po.c = (...args) => {
- return Object.assign(_c(...args), {
- t: c3po.t,
- jt: c3po.jt,
- ngettext: c3po.ngettext,
- });
- };
-}
-
-if (HAS_LOCAL_STORAGE && window.localStorage["metabase-i18n-debug"]) {
- enableTranslatedStringReplacement();
-}
diff --git a/frontend/src/metabase/lib/iframe.ts b/frontend/src/metabase/lib/iframe.ts
deleted file mode 100644
index 878e4525144..00000000000
--- a/frontend/src/metabase/lib/iframe.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// check that we're both iframed, and the parent is a Metabase instance
-// used for detecting if we're previewing an embed
-export const IFRAMED_IN_SELF = (function () {
- try {
- return window.self !== window.parent && Boolean(window.parent.METABASE);
- } catch (e) {
- return false;
- }
-})();
diff --git a/frontend/src/metabase/lib/schema/index.ts b/frontend/src/metabase/lib/schema/index.ts
deleted file mode 100644
index 686fbd9e9f9..00000000000
--- a/frontend/src/metabase/lib/schema/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./schema";
diff --git a/frontend/src/metabase/lib/schema_metadata.ts b/frontend/src/metabase/lib/schema_metadata.ts
deleted file mode 100644
index 4540433af9d..00000000000
--- a/frontend/src/metabase/lib/schema_metadata.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { FIELD_SEMANTIC_TYPES_MAP } from "metabase/lib/core";
-import type { IconName } from "metabase/ui";
-import type ForeignKey from "metabase-lib/v1/metadata/ForeignKey";
-
-export function foreignKeyCountsByOriginTable(fks: ForeignKey[]) {
- return fks
- .map(function (fk) {
- return fk.origin?.table?.id ?? undefined;
- })
- .reduce<Record<number | string, number>>(function (prev, curr) {
- if (curr !== undefined) {
- if (curr in prev) {
- prev[curr]++;
- } else {
- prev[curr] = 1;
- }
- }
-
- return prev;
- }, {});
-}
-
-export function getSemanticTypeIcon(
- semanticType: string | null | undefined,
- fallback?: IconName,
-): IconName | undefined {
- if (!semanticType) {
- return fallback;
- }
- const semanticTypeMetadata = FIELD_SEMANTIC_TYPES_MAP[semanticType];
- return semanticTypeMetadata?.icon ?? fallback;
-}
-
-export function getSemanticTypeName(semanticType: string | null | undefined) {
- if (!semanticType) {
- return undefined;
- }
- const semanticTypeMetadata = FIELD_SEMANTIC_TYPES_MAP[semanticType];
- return semanticTypeMetadata?.name;
-}
diff --git a/frontend/src/metabase/lib/security.ts b/frontend/src/metabase/lib/security.ts
deleted file mode 100644
index b6b4fce50d8..00000000000
--- a/frontend/src/metabase/lib/security.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import MetabaseSettings from "metabase/lib/settings";
-import type { PasswordComplexity } from "metabase-types/api";
-
-const LOWER = "abcdefghijklmnopqrstuvwxyz";
-const UPPER = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-const DIGITS = "0123456789";
-const SPECIAL = "!@#$%^&*()-_+=";
-const ALL = LOWER + UPPER + DIGITS + SPECIAL;
-
-function randomIndex(max: number): number {
- const array = new Uint32Array(1);
- crypto.getRandomValues(array);
- return array[0] % max;
-}
-
-function randomChar(charset: string): string {
- return charset[randomIndex(charset.length)];
-}
-
-// generate a password that satisfies `complexity` requirements, by default the ones that come back in the
-// `password-complexity` Setting; must be a map like {total: 6, digit: 1}
-export const generatePassword = (
- complexityParam?: PasswordComplexity,
-): string => {
- const complexity =
- complexityParam || MetabaseSettings.passwordComplexityRequirements() || {};
-
- // generated password must be at least `complexity.total`, but can be longer
- // so hard code a minimum of 14
- const len = Math.max(complexity.total || 0, 14);
-
- const chars: string[] = [];
-
- // seed required characters from each category to guarantee requirements are met
- for (let i = 0; i < (complexity.lower || 0); i++) {
- chars.push(randomChar(LOWER));
- }
- for (let i = 0; i < (complexity.upper || 0); i++) {
- chars.push(randomChar(UPPER));
- }
- for (let i = 0; i < (complexity.digit || 0); i++) {
- chars.push(randomChar(DIGITS));
- }
- for (let i = 0; i < (complexity.special || 0); i++) {
- chars.push(randomChar(SPECIAL));
- }
-
- // fill remaining length with random characters from full charset
- while (chars.length < len) {
- chars.push(randomChar(ALL));
- }
-
- // Fisher-Yates shuffle to avoid required chars clustering at the start
- for (let i = chars.length - 1; i > 0; i--) {
- const j = randomIndex(i + 1);
- [chars[i], chars[j]] = [chars[j], chars[i]];
- }
-
- return chars.join("");
-};
diff --git a/frontend/src/metabase/lib/time-dayjs.unit.spec.ts b/frontend/src/metabase/lib/time-dayjs.unit.spec.ts
deleted file mode 100644
index cb08cc84c46..00000000000
--- a/frontend/src/metabase/lib/time-dayjs.unit.spec.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import dayjs from "dayjs";
-
-import {
- parseTime,
- parseTimestamp,
- timezoneToUTCOffset,
-} from "metabase/lib/time-dayjs";
-
-describe("time-dayjs", () => {
- describe("parseTimestamp", () => {
- afterEach(() => {
- dayjs.updateLocale(dayjs.locale(), { weekStart: 0 });
- });
-
- it("should parse week of year correctly", () => {
- const daysOfWeek = [0, 1, 2, 3, 4, 5, 6];
- daysOfWeek.forEach((dayOfWeek) => {
- dayjs.updateLocale(dayjs.locale(), { weekStart: dayOfWeek });
- expect(parseTimestamp(1, "week-of-year").isoWeek()).toBe(1);
- expect(parseTimestamp(2, "week-of-year").isoWeek()).toBe(2);
- expect(parseTimestamp(52, "week-of-year").isoWeek()).toBe(52);
- expect(parseTimestamp(53, "week-of-year").isoWeek()).toBe(53);
- });
- });
-
- it("should not parse small numbers as timestamps when non-timestamp unit is provided", () => {
- // When unit="month", small numbers should return an invalid date
- // rather than being interpreted as milliseconds since epoch
- const result = parseTimestamp(1, "month");
-
- // Small numbers with units like "month", "quarter", "year" don't make sense
- // as timestamps, so parseTimestamp should return an invalid date
- expect(result.isValid()).toBe(false);
- });
- });
-
- describe("timezoneToUTCOffset", () => {
- it.each([
- ["UTC", "+00:00"],
- ["America/New_York", "-04:00"],
- ["America/Los_Angeles", "-07:00"],
- ["Europe/London", "+01:00"],
- ["Asia/Tokyo", "+09:00"],
- ["Pacific/Auckland", "+12:00"],
- ])(
- "should return the correct UTC offset for %s",
- (timezone, expectedOffset) => {
- expect(timezoneToUTCOffset(timezone)).toBe(expectedOffset);
- },
- );
- });
-
- describe("parseTime", () => {
- const PARSE_TIME_TESTS = [
- ["01:02:03.456+07:00", "1:02 AM"],
- ["01:02", "1:02 AM"],
- ["22:29:59.26816+01:00", "10:29 PM"],
- ["22:29:59.412459+01:00", "10:29 PM"],
- ["19:14:42.926221+01:00", "7:14 PM"],
- ["19:14:42.13202+01:00", "7:14 PM"],
- ["13:38:58.987352+01:00", "1:38 PM"],
- ["13:38:58.001001+01:00", "1:38 PM"],
- ["17:01:23+01:00", "5:01 PM"],
- ];
-
- test.each(PARSE_TIME_TESTS)(
- `parseTime(%p) to be %p`,
- (value, resultStr) => {
- const result = parseTime(value);
- expect(result.format("h:mm A")).toBe(resultStr);
- },
- );
- });
-});
diff --git a/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsx b/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsx
index 33953e06a28..76d6889d0e2 100644
--- a/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsx
+++ b/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsx
@@ -1,10 +1,5 @@
import { useMemo } from "react";
-import {
- formatNumber,
- formatValue,
- getCurrencySymbol,
-} from "metabase/lib/formatting";
import {
Badge,
Box,
@@ -15,6 +10,11 @@ import {
Stack,
Text,
} from "metabase/ui";
+import {
+ formatNumber,
+ formatValue,
+ getCurrencySymbol,
+} from "metabase/utils/formatting";
import { MiniBarCell } from "metabase/visualizations/components/TableInteractive/cells/MiniBarCell";
import { getColumnExtent } from "metabase/visualizations/lib/utils";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
diff --git a/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx b/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx
index 1be81b9a284..2cf5f046ba7 100644
--- a/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx
+++ b/frontend/src/metabase/list-view/components/ListViz/ListViz.tsx
@@ -2,9 +2,6 @@ import cx from "classnames";
import { useMemo } from "react";
import { t } from "ttag";
-import { displayNameForColumn } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { updateQuestion } from "metabase/query_builder/actions";
import {
getIsListViewConfigurationShown,
@@ -12,6 +9,9 @@ import {
} from "metabase/query_builder/selectors";
import { Box, type IconName } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
+import { displayNameForColumn } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import ChartSettingLinkUrlInput from "metabase/visualizations/components/settings/ChartSettingLinkUrlInput";
import { columnSettings } from "metabase/visualizations/lib/settings/column";
import {
diff --git a/frontend/src/metabase/metabot/analytics.ts b/frontend/src/metabase/metabot/analytics.ts
index f960b015043..7d922c14244 100644
--- a/frontend/src/metabase/metabot/analytics.ts
+++ b/frontend/src/metabase/metabot/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackMetabotChatOpened = (
origin: "header" | "command_palette" | "keyboard_shortcut" | "native_editor",
diff --git a/frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx b/frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx
index 4726f4ae3e3..1457a9e8747 100644
--- a/frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx
+++ b/frontend/src/metabase/metabot/components/AIDashboardAnalysisSidebar/AIDashboardAnalysisSidebar.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { Sidebar } from "metabase/common/components/Sidebar";
import { useDashboardContext } from "metabase/dashboard/context";
import { getIsDashCardsLoadingComplete } from "metabase/dashboard/selectors";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { useDashCardAnalysis } from "../../hooks/useDashCardAnalysis";
import { AIAnalysisContentWrapper } from "../AIAnalysisContentWrapper/AIAnalysisContentWrapper";
diff --git a/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx b/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx
index 713cde08da3..7ae72951c6e 100644
--- a/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx
+++ b/frontend/src/metabase/metabot/components/AIMarkdown/components/MarkdownSmartLink.tsx
@@ -1,11 +1,11 @@
import { match } from "ts-pattern";
-import { getIcon } from "metabase/lib/icon";
-import { modelToUrl } from "metabase/lib/urls";
import type { MetabaseProtocolEntityModel } from "metabase/metabot/utils/links";
import { useEntityData } from "metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode";
import { entityToUrlableModel } from "metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils";
import { Icon } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { modelToUrl } from "metabase/utils/urls";
import S from "../AIMarkdown.module.css";
diff --git a/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx
index 98b9016113f..f576f89b432 100644
--- a/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx
+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { useAnalyzeChartMutation } from "metabase/api";
import { CopyButton } from "metabase/common/components/CopyButton";
import { SidebarContent } from "metabase/common/components/SidebarContent";
-import { useSelector } from "metabase/lib/redux";
import { getIsLoadingComplete } from "metabase/query_builder/selectors";
import { Box } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import {
getChartImagePngDataUri,
getChartSelector,
diff --git a/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/utils.ts b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/utils.ts
index c045de6a40a..ae43d8e816d 100644
--- a/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/utils.ts
+++ b/frontend/src/metabase/metabot/components/AIQuestionAnalysisSidebar/utils.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { CollectionId, Timeline, TimelineEvent } from "metabase-types/api";
export const getTimelineEventsForAnalysis = (
diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
index 67354c7bca7..016edb27205 100644
--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
@@ -1,6 +1,5 @@
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import {
useMetabotAgent,
useMetabotName,
@@ -8,6 +7,7 @@ import {
} from "metabase/metabot/hooks";
import { setIsNativeEditorOpen } from "metabase/query_builder/actions";
import { Button } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import { trackQueryFixClicked } from "../../analytics";
diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx
index 96fd4bbd868..5d048d25183 100644
--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx
@@ -1,12 +1,12 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
-import { useDispatch } from "metabase/lib/redux";
import {
useMetabotAgent,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
import { setIsNativeEditorOpen } from "metabase/query_builder/actions";
+import { useDispatch } from "metabase/utils/redux";
import { trackQueryFixClicked } from "../../analytics";
@@ -20,8 +20,8 @@ jest.mock("../../analytics", () => ({
trackQueryFixClicked: jest.fn(),
}));
-jest.mock("metabase/lib/redux", () => ({
- ...jest.requireActual("metabase/lib/redux"),
+jest.mock("metabase/utils/redux", () => ({
+ ...jest.requireActual("metabase/utils/redux"),
useDispatch: jest.fn(),
}));
diff --git a/frontend/src/metabase/metabot/components/Metabot.tsx b/frontend/src/metabase/metabot/components/Metabot.tsx
index c425a2a686e..9d984f75800 100644
--- a/frontend/src/metabase/metabot/components/Metabot.tsx
+++ b/frontend/src/metabase/metabot/components/Metabot.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import MetabotFailure from "assets/img/metabot-failure.svg?component";
import ErrorBoundary from "metabase/ErrorBoundary";
-import { useSelector } from "metabase/lib/redux";
import {
useMetabotAgent,
useUserMetabotPermissions,
@@ -13,6 +12,7 @@ import { Sidebar } from "metabase/nav/containers/MainNavbar/MainNavbar.styled";
import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";
import { getUser } from "metabase/selectors/user";
import { Box, Button, Flex, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { trackMetabotChatOpened } from "../analytics";
import type { MetabotAgentId } from "../state";
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx
index 2ba8ead95d7..3cd306f5211 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx
@@ -13,7 +13,6 @@ import { PaginationControls } from "metabase/common/components/PaginationControl
import { Table } from "metabase/common/components/Table";
import { useToast } from "metabase/common/hooks";
import { usePagination } from "metabase/common/hooks/use-pagination";
-import * as Urls from "metabase/lib/urls";
import { FIXED_METABOT_IDS } from "metabase/metabot/constants";
import {
ActionIcon,
@@ -26,6 +25,7 @@ import {
Skeleton,
Tooltip,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { MetabotInfo, SuggestedMetabotPrompt } from "metabase-types/api";
export const PAGE_SIZE = 10;
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotConfig.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotConfig.tsx
index 5e6d5b904e8..e3df072ff13 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotConfig.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotConfig.tsx
@@ -18,8 +18,6 @@ import { canonicalCollectionId } from "metabase/collections/utils";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";
import { useSetting, useToast } from "metabase/common/hooks";
-import { getIcon } from "metabase/lib/icon";
-import { useDispatch } from "metabase/lib/redux";
import {
FIXED_METABOT_ENTITY_IDS,
FIXED_METABOT_IDS,
@@ -39,6 +37,8 @@ import {
Switch,
Text,
} from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { useDispatch } from "metabase/utils/redux";
import type {
Collection,
CollectionEssentials,
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx
index 045f4fce22c..4577778cddd 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/MetabotSlackSetup.tsx
@@ -22,8 +22,8 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Accordion, Button, Flex, Stack, Text } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { SlackAppInfo } from "metabase-types/api/slack";
import {
diff --git a/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts b/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts
index 1bff5589a20..7eb2e1e91e7 100644
--- a/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts
+++ b/frontend/src/metabase/metabot/components/MetabotAdmin/utils.ts
@@ -2,8 +2,8 @@ import type { FetchBaseQueryError } from "@reduxjs/toolkit/query";
import type { FormikErrors } from "formik";
import { P, isMatching } from "ts-pattern";
-import { useSelector } from "metabase/lib/redux";
import { getLocation } from "metabase/selectors/routing";
+import { useSelector } from "metabase/utils/redux";
import type { MetabotProvider } from "metabase-types/api";
type ApiKeylessProviders = "metabase";
diff --git a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
index c6cec87cd08..b600b134671 100644
--- a/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotAppBarButton.tsx
@@ -1,12 +1,12 @@
import { t } from "ttag";
-import { METAKEY } from "metabase/lib/browser";
import {
useMetabotAgent,
useMetabotName,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
import { ActionIcon, type ActionIconProps, Tooltip } from "metabase/ui";
+import { METAKEY } from "metabase/utils/browser";
import { trackMetabotChatOpened } from "../analytics";
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
index 779daf874b1..54c01e6e3c4 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx
@@ -11,8 +11,6 @@ import _ from "underscore";
import { useLazyGetTransformQuery } from "metabase/api";
import { CodeMirror } from "metabase/common/components/CodeMirror";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { MetabotContext } from "metabase/metabot/context";
import {
type MetabotAgentEditSuggestionChatMessage,
@@ -33,6 +31,8 @@ import {
Paper,
Text,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
index f6ac39c0073..b2a647094c3 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.tsx
@@ -5,7 +5,6 @@ import { t } from "ttag";
import EmptyDashboardBot from "assets/img/dashboard-empty.svg?component";
import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { MetabotResetLongChatButton } from "metabase/metabot/components/MetabotChat/MetabotResetLongChatButton";
import { getIsHosted } from "metabase/setup/selectors";
import {
@@ -19,6 +18,7 @@ import {
Text,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { useMetabotAgent, useMetabotName } from "../../hooks";
import type { MetabotConfig } from "../Metabot";
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
index d222df8696a..214309eeaca 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotFeedbackModal.tsx
@@ -6,13 +6,13 @@ import { useSetting } from "metabase/common/hooks";
import { Form, FormProvider } from "metabase/forms";
import { FormSelect } from "metabase/forms/components/FormSelect";
import { FormTextarea } from "metabase/forms/components/FormTextarea";
-import * as Errors from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
import { useMetabotName } from "metabase/metabot/hooks";
import { getMetabotId, getMetabotState } from "metabase/metabot/state";
import { getUserIsAdmin } from "metabase/selectors/user";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Button, Group, Modal, Stack, Text } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
import type { MetabotFeedback } from "metabase-types/api";
// Issue types that require free text feedback
diff --git a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx
index f1137c950cb..dc58fdbb915 100644
--- a/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioButton.tsx
@@ -1,8 +1,5 @@
import { t } from "ttag";
-import { METAKEY } from "metabase/lib/browser";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import {
useMetabotAgent,
useMetabotName,
@@ -10,6 +7,9 @@ import {
} from "metabase/metabot/hooks";
import { getLocation } from "metabase/selectors/routing";
import { ActionIcon, Tooltip } from "metabase/ui";
+import { METAKEY } from "metabase/utils/browser";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { trackMetabotChatOpened } from "../analytics";
diff --git a/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx b/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx
index da59de8bc1e..941b375dd50 100644
--- a/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotDataStudioSidebar.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getLocation } from "metabase/selectors/routing";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { Metabot } from "./Metabot";
diff --git a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx
index 95ca31db3cf..f4f4552e9cc 100644
--- a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.tsx
@@ -10,7 +10,6 @@ import cx from "classnames";
import { forwardRef, useEffect, useImperativeHandle, useRef } from "react";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import type { MetabotPromptInputRef } from "metabase/metabot";
import {
MetabotMentionExtension,
@@ -21,6 +20,8 @@ import { SmartLink } from "metabase/rich_text_editing/tiptap/extensions/SmartLin
import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";
import { createBareSuggestionRenderer } from "metabase/rich_text_editing/tiptap/extensions/suggestionRenderer";
import { getSetting } from "metabase/selectors/settings";
+import { getCspNonce } from "metabase/utils/csp";
+import { useSelector } from "metabase/utils/redux";
import type { DatabaseId } from "metabase-types/api";
import S from "./MetabotPromptInput.module.css";
@@ -90,7 +91,7 @@ export const MetabotPromptInput = forwardRef<
extensions,
content: parseMetabotMessageToTiptapDoc(value),
autofocus: autoFocus,
- injectNonce: window.MetabaseNonce,
+ injectNonce: getCspNonce(),
onUpdate: ({ editor }) => {
const jsonContent = editor.getJSON();
serializedRef.current = serializeTiptapToMetabotMessage(jsonContent);
diff --git a/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx
index b7cf224624c..f5008d0c66f 100644
--- a/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx
@@ -8,8 +8,6 @@ import _ from "underscore";
import { useGetSuggestedMetabotPromptsQuery } from "metabase/api";
import { MetabotLogo } from "metabase/common/components/MetabotLogo";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { MetabotPromptInput } from "metabase/metabot/components/MetabotPromptInput";
import { QueryBuilder } from "metabase/query_builder/containers/QueryBuilder";
import { useRouter } from "metabase/router";
@@ -22,6 +20,8 @@ import {
Text,
UnstyledButton,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { useMetabotAgent, useUserMetabotPermissions } from "../../hooks";
diff --git a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx
index fc4f1f7e857..b47d588977c 100644
--- a/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotQuickLinks.tsx
@@ -2,12 +2,12 @@ import { useEffect, useState } from "react";
import { Route } from "react-router";
import { replace } from "react-router-redux";
-import { useDispatch } from "metabase/lib/redux";
import {
useMetabotAgent,
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
import { Loader } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
export const getMetabotQuickLinks = () => {
return (
diff --git a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsx b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsx
index 1a0742a57c3..916ae6dff5a 100644
--- a/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsx
+++ b/frontend/src/metabase/metabot/components/NewMenuItemAIExploration.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import * as Urls from "metabase/lib/urls";
import { Icon, Menu } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { CollectionId } from "metabase-types/api";
export function getNewMenuItemAIExploration(
diff --git a/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx b/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx
index 8c9421183fb..0025b29eb45 100644
--- a/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx
+++ b/frontend/src/metabase/metabot/components/SlackConnectSuccess.tsx
@@ -2,8 +2,8 @@ import { replace } from "react-router-redux";
import { useMount } from "react-use";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
+import { useDispatch } from "metabase/utils/redux";
export const SlackConnectSuccess = () => {
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/metabot/context.tsx b/frontend/src/metabase/metabot/context.tsx
index c400421b681..3473b8c6d13 100644
--- a/frontend/src/metabase/metabot/context.tsx
+++ b/frontend/src/metabase/metabot/context.tsx
@@ -12,12 +12,12 @@ import {
} from "react";
import _ from "underscore";
-import { useStore } from "metabase/lib/redux";
import {
canUserCreateNativeQueries,
canUserCreateQueries,
getUserIsAdmin,
} from "metabase/selectors/user";
+import { useStore } from "metabase/utils/redux";
import type {
MetabotChatContext,
MetabotSuggestedTransform,
diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts b/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts
index 8429f3ed2ee..173846e3ae5 100644
--- a/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts
+++ b/frontend/src/metabase/metabot/hooks/use-metabot-agent.ts
@@ -1,8 +1,8 @@
import { isFulfilled } from "@reduxjs/toolkit";
import { useCallback } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useMetabotContext } from "metabase/metabot";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { trackMetabotRequestSent } from "../analytics";
import {
diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts b/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts
index 8985572c6ee..098bdccc5af 100644
--- a/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts
+++ b/frontend/src/metabase/metabot/hooks/use-metabot-agents-manager.ts
@@ -2,7 +2,7 @@ import { useCallback } from "react";
import { useMount } from "react-use";
import _ from "underscore";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import {
type MetabotAgentId,
diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts
index 0465f8f7fb8..6cb1a81e6ba 100644
--- a/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts
+++ b/frontend/src/metabase/metabot/hooks/use-metabot-embedding-aware-enabled.ts
@@ -1,6 +1,6 @@
import { useSetting } from "metabase/common/hooks";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { isWithinIframe } from "metabase/lib/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
/** Returns the value for `metabot-enabled?` or `embedded-metabot-enabled?` depending on the context
* only if the metabot token feature is enabled.
diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts b/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts
index 987e99b62ab..35e784d9847 100644
--- a/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts
+++ b/frontend/src/metabase/metabot/hooks/use-metabot-reactions.ts
@@ -1,10 +1,10 @@
import { useCallback } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
getNavigateToPath,
setNavigateToPath as setNavigateToPathAction,
} from "metabase/metabot/state";
+import { useDispatch, useSelector } from "metabase/utils/redux";
export const useMetabotReactions = () => {
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx
index 34acb548af3..4d2148eb169 100644
--- a/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx
+++ b/frontend/src/metabase/metabot/hooks/use-metabot-sql-suggestion.tsx
@@ -2,7 +2,6 @@ import { isFulfilled, isRejected } from "@reduxjs/toolkit";
import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { METABOT_PROFILE_OVERRIDES } from "metabase/metabot/constants";
import {
addDeveloperMessage,
@@ -11,6 +10,7 @@ import {
resetConversation,
} from "metabase/metabot/state";
import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { DatabaseId } from "metabase-types/api";
import { useMetabotAgent } from "./use-metabot-agent";
diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.ts
index 95ffe3a56e8..b10a14d3808 100644
--- a/frontend/src/metabase/metabot/state/actions.ts
+++ b/frontend/src/metabase/metabot/state/actions.ts
@@ -9,12 +9,12 @@ import {
} from "metabase/api/ai-streaming";
import type { ProcessedChatResponse } from "metabase/api/ai-streaming/process-stream";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { createAsyncThunk } from "metabase/lib/redux";
import { setIsNativeEditorOpen } from "metabase/query_builder/actions";
import { addUndo } from "metabase/redux/undo";
import { getIsWorkspace } from "metabase/selectors/routing";
import { getSetting } from "metabase/selectors/settings";
import { getUser } from "metabase/selectors/user";
+import { createAsyncThunk } from "metabase/utils/redux";
import type {
JSONValue,
MetabotAgentRequest,
diff --git a/frontend/src/metabase/metabot/state/reducer-utils.ts b/frontend/src/metabase/metabot/state/reducer-utils.ts
index e7f8c01855e..d39d58e5cde 100644
--- a/frontend/src/metabase/metabot/state/reducer-utils.ts
+++ b/frontend/src/metabase/metabot/state/reducer-utils.ts
@@ -3,7 +3,7 @@ import { merge } from "icepick";
import type { WritableDraft } from "immer";
import { match } from "ts-pattern";
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import type {
MetabotAgentId,
diff --git a/frontend/src/metabase/metabot/state/reducer.ts b/frontend/src/metabase/metabot/state/reducer.ts
index bcb87354146..ba8c415cfb4 100644
--- a/frontend/src/metabase/metabot/state/reducer.ts
+++ b/frontend/src/metabase/metabot/state/reducer.ts
@@ -3,7 +3,7 @@ import { castDraft } from "immer";
import _ from "underscore";
import { logout } from "metabase/auth/actions";
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import type {
MetabotCodeEdit,
MetabotHistory,
diff --git a/frontend/src/metabase/metabot/state/selectors.ts b/frontend/src/metabase/metabot/state/selectors.ts
index c7518b05ee7..f8c1a00eed9 100644
--- a/frontend/src/metabase/metabot/state/selectors.ts
+++ b/frontend/src/metabase/metabot/state/selectors.ts
@@ -3,8 +3,8 @@ import { match } from "ts-pattern";
import _ from "underscore";
import { isEmbedding } from "metabase/embedding/config";
-import * as Urls from "metabase/lib/urls";
import { getLocation } from "metabase/selectors/routing";
+import * as Urls from "metabase/utils/urls";
import type { TransformId } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
index 9b74d8a64b1..975a7ed961b 100644
--- a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
@@ -9,9 +9,9 @@ import {
aiStreamingQuery,
findMatchingInflightAiStreamingRequests,
} from "metabase/api/ai-streaming";
-import { checkNotNull } from "metabase/lib/types";
import { useInlineSQLPrompt } from "metabase/metabot/components/MetabotInlineSQLPrompt";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import {
diff --git a/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx
index e76dcc8d21a..705f97150cb 100644
--- a/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/tests/ui.unit.spec.tsx
@@ -4,10 +4,10 @@ import fetchMock from "fetch-mock";
import { screen, waitFor, within } from "__support__/ui";
import { logout } from "metabase/auth/actions";
-import * as domModule from "metabase/lib/dom";
import { useMetabotAgent } from "metabase/metabot/hooks";
import { metabotActions } from "metabase/metabot/state";
import { getMetabotInitialState } from "metabase/metabot/state/reducer-utils";
+import * as domModule from "metabase/utils/dom";
import { Metabot } from "../components/Metabot";
diff --git a/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsx b/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsx
index 18fc2437516..820ce193631 100644
--- a/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsx
+++ b/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsx
@@ -1,7 +1,6 @@
import type { FocusEvent } from "react";
import { t } from "ttag";
-import { currency } from "metabase/lib/formatting";
import {
Combobox,
Flex,
@@ -11,6 +10,7 @@ import {
type SelectProps,
Text,
} from "metabase/ui";
+import { currency } from "metabase/utils/formatting";
import S from "./CurrencyPicker.module.css";
diff --git a/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsx b/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsx
index 15181529cd0..d5892e6e9a2 100644
--- a/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsx
+++ b/frontend/src/metabase/metadata/components/FieldValuesModal/FieldValuesModal.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Modal, Stack, Text, rem } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { FieldId } from "metabase-types/api";
import { DiscardFieldValuesButton } from "../DiscardFieldValuesButton";
diff --git a/frontend/src/metabase/metadata/components/FieldValuesTypePicker/FieldValuesTypePicker.tsx b/frontend/src/metabase/metadata/components/FieldValuesTypePicker/FieldValuesTypePicker.tsx
index ae1ff2d445a..2fe57b98578 100644
--- a/frontend/src/metabase/metadata/components/FieldValuesTypePicker/FieldValuesTypePicker.tsx
+++ b/frontend/src/metabase/metadata/components/FieldValuesTypePicker/FieldValuesTypePicker.tsx
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { t } from "ttag";
-import { HAS_FIELD_VALUES_OPTIONS } from "metabase/lib/core";
+import { HAS_FIELD_VALUES_OPTIONS } from "metabase/common/utils/fields";
import { Select, type SelectProps } from "metabase/ui";
import type { FieldValuesType } from "metabase-types/api";
diff --git a/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx b/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx
index 10342fbea6b..3d64df4ee65 100644
--- a/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx
+++ b/frontend/src/metabase/metadata/components/FieldVisibilityPicker/FieldVisibilityPicker.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { FIELD_VISIBILITY_TYPES } from "metabase/lib/core";
+import { FIELD_VISIBILITY_TYPES } from "metabase/common/utils/fields";
import {
Flex,
Icon,
diff --git a/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx b/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx
index 978a1586f5d..8c440bb51e1 100644
--- a/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx
+++ b/frontend/src/metabase/metadata/components/PreviewSection/ObjectDetailPreview.tsx
@@ -6,9 +6,9 @@ import { getErrorMessage } from "metabase/api/utils";
import { EmptyState } from "metabase/common/components/EmptyState";
import { DetailsGroup, Header } from "metabase/detail-view/components";
import { getEntityIcon, getHeaderColumns } from "metabase/detail-view/utils";
-import { useSelector } from "metabase/lib/redux";
import { getMetadataUnfiltered } from "metabase/selectors/metadata";
import { Box, Repeat, Skeleton, Stack, rem } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { extractRemappedColumns } from "metabase/visualizations";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx b/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx
index e05f2cee755..fefff278104 100644
--- a/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx
+++ b/frontend/src/metabase/metadata/components/PreviewSection/TablePreview.tsx
@@ -5,9 +5,9 @@ import _ from "underscore";
import { skipToken, useGetAdhocQueryQuery } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { EmptyState } from "metabase/common/components/EmptyState";
-import { useSelector } from "metabase/lib/redux";
import { getMetadataUnfiltered } from "metabase/selectors/metadata";
import { Repeat, Skeleton, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import Visualization from "metabase/visualizations/components/Visualization";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/metadata/components/SemanticTypePicker/SemanticTypePicker.unit.spec.tsx b/frontend/src/metabase/metadata/components/SemanticTypePicker/SemanticTypePicker.unit.spec.tsx
index 857e51ae17a..fd3efd572b2 100644
--- a/frontend/src/metabase/metadata/components/SemanticTypePicker/SemanticTypePicker.unit.spec.tsx
+++ b/frontend/src/metabase/metadata/components/SemanticTypePicker/SemanticTypePicker.unit.spec.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
import { renderWithProviders, screen, within } from "__support__/ui";
import { getNextId } from "__support__/utils";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { TYPE } from "metabase-lib/v1/types/constants";
import type { Field, FieldId, FieldReference } from "metabase-types/api";
import { createMockField } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/metadata/components/SemanticTypePicker/utils.ts b/frontend/src/metabase/metadata/components/SemanticTypePicker/utils.ts
index a7c875b5f0e..80b52eaa7f1 100644
--- a/frontend/src/metabase/metadata/components/SemanticTypePicker/utils.ts
+++ b/frontend/src/metabase/metadata/components/SemanticTypePicker/utils.ts
@@ -1,4 +1,4 @@
-import { FIELD_SEMANTIC_TYPES } from "metabase/lib/core";
+import { FIELD_SEMANTIC_TYPES } from "metabase/common/utils/fields";
import { LEVEL_ONE_TYPES, TYPE } from "metabase-lib/v1/types/constants";
import { isTypeFK, isTypePK, isa } from "metabase-lib/v1/types/utils/isa";
import type { Field } from "metabase-types/api";
diff --git a/frontend/src/metabase/metadata/components/TableBreadcrumbs/TableBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/metadata/components/TableBreadcrumbs/TableBreadcrumbs.unit.spec.tsx
index a1c4b211ace..3cea026e3ca 100644
--- a/frontend/src/metabase/metadata/components/TableBreadcrumbs/TableBreadcrumbs.unit.spec.tsx
+++ b/frontend/src/metabase/metadata/components/TableBreadcrumbs/TableBreadcrumbs.unit.spec.tsx
@@ -3,7 +3,7 @@ import {
setupTablesEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Table } from "metabase-types/api";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
index 77a68104540..65f760c89db 100644
--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx
@@ -7,7 +7,6 @@ import {
useUpdateTableMutation,
} from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import {
@@ -20,6 +19,7 @@ import {
Text,
Tooltip,
} from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { FieldId, Table, TableFieldOrder } from "metabase-types/api";
import { FieldOrderPicker } from "../FieldOrderPicker";
diff --git a/frontend/src/metabase/metadata/components/UserInput.tsx b/frontend/src/metabase/metadata/components/UserInput.tsx
index 59283ae900f..e2140f252c4 100644
--- a/frontend/src/metabase/metadata/components/UserInput.tsx
+++ b/frontend/src/metabase/metadata/components/UserInput.tsx
@@ -2,9 +2,9 @@ import { type FocusEvent, useMemo, useState } from "react";
import { t } from "ttag";
import { useListUsersQuery } from "metabase/api";
-import { isEmail } from "metabase/lib/email";
import { Ellipsified } from "metabase/ui";
import { Avatar, Flex, Icon, Select, type SelectProps } from "metabase/ui";
+import { isEmail } from "metabase/utils/email";
import type { User, UserId } from "metabase-types/api";
interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {
email: string | null;
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
index e067eeb04ed..33492d27104 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx
@@ -9,9 +9,9 @@ import {
useListDatabasesQuery,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
import { Box, Flex, Stack, rem } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import {
FieldEmptyState,
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
index e0eddcbd335..ecba6208fac 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.unit.spec.tsx
@@ -21,9 +21,9 @@ import {
within,
} from "__support__/ui";
import { getNextId } from "__support__/utils";
-import { checkNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import { getRawTableFieldId } from "metabase/metadata/utils/field";
+import { checkNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import registerVisualizations from "metabase/visualizations/register";
import type {
Database,
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx
index ce344ee78f9..a5e183c6997 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx
@@ -9,8 +9,8 @@ import {
} from "react";
import { ForwardRefLink } from "metabase/common/components/Link";
-import * as Urls from "metabase/lib/urls";
import { Box, Flex, Icon, Skeleton, rem } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TYPE_ICONS } from "../constants";
import type { FlatItem, TreePath } from "../types";
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useSearch.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useSearch.ts
index 832e2da0d2b..11f63b9c2d3 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useSearch.ts
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useSearch.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { skipToken, useSearchQuery } from "metabase/api";
-import { isSyncCompleted } from "metabase/lib/syncing";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { DatabaseNode, SchemaNode, TableNode, TreeNode } from "../types";
import { node, rootNode } from "../utils";
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useTableLoader.ts b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useTableLoader.ts
index e45ed38a58c..b06a9081fce 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useTableLoader.ts
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/hooks/useTableLoader.ts
@@ -7,7 +7,7 @@ import {
useLazyListDatabaseSchemasQuery,
useLazyListDatabasesQuery,
} from "metabase/api";
-import { isSyncCompleted } from "metabase/lib/syncing";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { DatabaseId, SchemaName } from "metabase-types/api";
import { UNNAMED_SCHEMA_NAME } from "../constants";
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx
index aee5bb33d9c..4aa56fce91b 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/wrappers.tsx
@@ -1,9 +1,9 @@
import { useCallback, useEffect, useState } from "react";
import { push, replace } from "react-router-redux";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getLocation } from "metabase/selectors/routing";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { TablePicker } from "./components";
import type { ChangeOptions, TreePath } from "./types";
diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts b/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts
index 7647db7e6a3..588a6f9ce83 100644
--- a/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts
+++ b/frontend/src/metabase/metadata/pages/DataModelV1/utils.ts
@@ -1,6 +1,6 @@
import { skipToken } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
+import * as Urls from "metabase/utils/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import type { GetTableQueryMetadataRequest, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/metadata/pages/shared/analytics.ts b/frontend/src/metabase/metadata/pages/shared/analytics.ts
index 096ed2dc9e0..09cceb02b8f 100644
--- a/frontend/src/metabase/metadata/pages/shared/analytics.ts
+++ b/frontend/src/metabase/metadata/pages/shared/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export type MetadataEditEventDetail =
| "type_casting"
diff --git a/frontend/src/metabase/metadata/pages/shared/utils.ts b/frontend/src/metabase/metadata/pages/shared/utils.ts
index 7fec852f6b1..eac1039829b 100644
--- a/frontend/src/metabase/metadata/pages/shared/utils.ts
+++ b/frontend/src/metabase/metadata/pages/shared/utils.ts
@@ -1,6 +1,6 @@
import { skipToken } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
+import * as Urls from "metabase/utils/urls";
import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";
import type { GetTableQueryMetadataRequest, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/metadata/utils/field.ts b/frontend/src/metabase/metadata/utils/field.ts
index c050d83304f..7cc7737d956 100644
--- a/frontend/src/metabase/metadata/utils/field.ts
+++ b/frontend/src/metabase/metadata/utils/field.ts
@@ -1,5 +1,5 @@
import { is_coerceable } from "cljs/metabase.types.core";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import { getGlobalSettingsForColumn } from "metabase/visualizations/lib/settings/column";
import { TYPE } from "metabase-lib/v1/types/constants";
import { isTypeFK, isa } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/metadata/utils/field.unit.spec.ts b/frontend/src/metabase/metadata/utils/field.unit.spec.ts
index 0ec325b9238..0c517b443d1 100644
--- a/frontend/src/metabase/metadata/utils/field.unit.spec.ts
+++ b/frontend/src/metabase/metadata/utils/field.unit.spec.ts
@@ -1,5 +1,5 @@
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import MetabaseSettings from "metabase/lib/settings";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import MetabaseSettings from "metabase/utils/settings";
import {
createMockDatabase,
createMockField,
diff --git a/frontend/src/metabase/metadata/utils/schema.ts b/frontend/src/metabase/metadata/utils/schema.ts
index 2414746edb0..c4fae9b2344 100644
--- a/frontend/src/metabase/metadata/utils/schema.ts
+++ b/frontend/src/metabase/metadata/utils/schema.ts
@@ -1,4 +1,4 @@
-import { humanize, titleize } from "metabase/lib/formatting";
+import { humanize, titleize } from "metabase/utils/formatting";
import type { SchemaName } from "metabase-types/api";
export function getSchemaDisplayName(schema: SchemaName): string {
diff --git a/frontend/src/metabase/metrics-viewer/analytics.ts b/frontend/src/metabase/metrics-viewer/analytics.ts
index e61a8e60200..270b575b4e6 100644
--- a/frontend/src/metabase/metrics-viewer/analytics.ts
+++ b/frontend/src/metabase/metrics-viewer/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackMetricsViewerMetricAdded = (
targetId: number | null,
diff --git a/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx b/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx
index b4cd4b2dfb8..b94b3bc7e66 100644
--- a/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/EmptyState/MetricViewerEmptyState.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { getSubpathSafeUrl } from "metabase/lib/urls";
import { Box, Center, Stack, Text, Title } from "metabase/ui";
+import { getSubpathSafeUrl } from "metabase/utils/urls";
function MetricsViewerEmptyStateLayout({
title,
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
index f944cdd8bef..9b6d2675517 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { SourceColorIndicator } from "metabase/common/components/SourceColorIndicator";
-import * as Urls from "metabase/lib/urls";
import { Box, Flex, Icon, Menu, Pill, Popover, Skeleton } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { ProjectionClause } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx
index 91c6f30aed9..9cec789d9e4 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchResults/MetricSearchResults.tsx
@@ -1,8 +1,8 @@
import type React from "react";
import { t } from "ttag";
-import { getIcon } from "metabase/lib/icon";
import { Box, Repeat, Skeleton, Stack, Text } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
import type { MetricOrMeasureResult } from "../../../hooks/use-metric-measure-search";
import { MetricResultItem } from "../MetricResultItem";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx
index 8d7f383ae7e..59f909e9ebc 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx
@@ -2,9 +2,9 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { getObjectKeys, getObjectValues } from "metabase/lib/objects";
-import { isNotNull } from "metabase/lib/types";
import { Center, Flex, Stack } from "metabase/ui";
+import { getObjectKeys } from "metabase/utils/objects";
+import { isNotNull } from "metabase/utils/types";
import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
import { isMetric } from "metabase-lib/v1/types/utils/isa";
@@ -203,7 +203,7 @@ export function MetricsViewerTabContent({
DISPLAY_TYPE_REGISTRY[tab.display].supportsStacking && rawSeries.length > 1;
const isTimeTab = tab.type === "time";
- const mappedDimensionCount = getObjectValues(tab.dimensionMapping).filter(
+ const mappedDimensionCount = Object.values(tab.dimensionMapping).filter(
isNotNull,
).length;
const dimensionRemoveHandler =
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts b/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts
index 6ae72aaa08b..a3b1ea5827a 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-definition-queries.ts
@@ -2,7 +2,7 @@ import { useEffect, useMemo } from "react";
import { metricApi } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils/errors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { MetricDefinition } from "metabase-lib/metric";
import type { Dataset, MetricBreakoutValuesResponse } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
index 78c77b70523..cffca8ccb26 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from "react";
-import { getObjectEntries, objectFromEntries } from "metabase/lib/objects";
-import { isNotNull } from "metabase/lib/types";
+import { getObjectEntries, objectFromEntries } from "metabase/utils/objects";
+import { isNotNull } from "metabase/utils/types";
import type {
DimensionMetadata,
MetricDefinition,
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
index d36f03e2d26..e9766702638 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
@@ -1,10 +1,10 @@
import { useCallback, useRef, useState } from "react";
import { measureApi, metricApi } from "metabase/api";
-import { getObjectEntries, objectFromEntries } from "metabase/lib/objects";
-import { useDispatch, useStore } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { getObjectEntries, objectFromEntries } from "metabase/utils/objects";
+import { useDispatch, useStore } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import type {
DimensionMetadata,
MetricDefinition,
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
index 5d2fc365df6..0bd707577fe 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
@@ -2,8 +2,8 @@ import type { Location } from "history";
import { useEffect, useRef } from "react";
import { push, replace } from "react-router-redux";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { MeasureId, TemporalUnit } from "metabase-types/api";
import type { MetricId } from "metabase-types/api/metric";
diff --git a/frontend/src/metabase/metrics-viewer/utils/tabs.ts b/frontend/src/metabase/metrics-viewer/utils/tabs.ts
index 37d10c1c6e5..5e3781c6ae4 100644
--- a/frontend/src/metabase/metrics-viewer/utils/tabs.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/tabs.ts
@@ -1,8 +1,8 @@
-import { getObjectEntries } from "metabase/lib/objects";
import type { DimensionDescriptor } from "metabase/metrics/common/utils/dimension-descriptors";
import { getDimensionDescriptors } from "metabase/metrics/common/utils/dimension-descriptors";
import { GEO_SUBTYPE_PRIORITY } from "metabase/metrics/common/utils/dimension-types";
import type { IconName } from "metabase/ui";
+import { getObjectEntries } from "metabase/utils/objects";
import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts b/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
index 7fe30bc1c68..8b25e1a0530 100644
--- a/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
@@ -1,5 +1,5 @@
-import { b64url_to_utf8, utf8_to_b64url } from "metabase/lib/encoding";
-import { getObjectEntries } from "metabase/lib/objects";
+import { b64url_to_utf8, utf8_to_b64url } from "metabase/utils/encoding";
+import { getObjectEntries } from "metabase/utils/objects";
import type { MetricDefinition } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
import type { TemporalUnit, VisualizationSettings } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts
index 2032af074f7..539c0371bb5 100644
--- a/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts
+++ b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts
@@ -1,8 +1,8 @@
import { useMemo } from "react";
import { useGetMetricQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import type { MetricDefinition } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
import type { MetricId } from "metabase-types/api/metric";
diff --git a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
index 4b9f8cb9084..bfaeae68ac1 100644
--- a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
+++ b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
@@ -3,8 +3,8 @@ import cx from "classnames";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import * as Urls from "metabase/lib/urls";
import { Breadcrumbs, Icon } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Card } from "metabase-types/api";
interface CollectionBreadcrumbsProps {
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
index 3831a1e09e4..36b9ac5d7cb 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateDimensionPicker/CoordinateDimensionPicker.tsx
@@ -1,7 +1,7 @@
import { useMemo, useState } from "react";
-import { checkNotNull } from "metabase/lib/types";
import { Select, Stack } from "metabase/ui";
+import { checkNotNull } from "metabase/utils/types";
import type * as LibMetric from "metabase-lib/metric";
import {
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
index 6ef43f99679..3d94612e765 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
@@ -2,9 +2,9 @@ import type { FormEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
import { Box, Flex, Stack, Text } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
index cf4b9c84b90..c8901b41031 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
+++ b/frontend/src/metabase/metrics/components/FilterPicker/CoordinateFilterPicker/utils.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
index 18ab4c19cee..5cff44e794c 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
+++ b/frontend/src/metabase/metrics/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
@@ -9,7 +9,6 @@ import {
useSearchMeasureDimensionValuesQuery,
useSearchMetricDimensionValuesQuery,
} from "metabase/api";
-import { parseNumber } from "metabase/lib/number";
import {
FieldValuePicker,
type UseGetFieldValuesArgs,
@@ -20,6 +19,7 @@ import {
type UseSearchFieldValuesResult,
} from "metabase/querying/common/components/FieldValuePicker";
import type { ComboboxProps } from "metabase/ui";
+import { parseNumber } from "metabase/utils/number";
import type * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
index 1e85c6d237b..0d3af8719d7 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
+++ b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
@@ -2,9 +2,9 @@ import type { FormEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
import { Box, Flex, Text } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
index 3d99870c6cf..17a6c433217 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
+++ b/frontend/src/metabase/metrics/components/FilterPicker/NumberFilterPicker/utils.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
index cd2b854502f..3c9cc091047 100644
--- a/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
+++ b/frontend/src/metabase/metrics/components/FilterPicker/TimeFilterPicker/utils.ts
@@ -1,7 +1,7 @@
import dayjs from "dayjs";
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import * as LibMetric from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx
index 610bedc9fc6..6dc7a23bd7e 100644
--- a/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx
+++ b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx
@@ -4,9 +4,9 @@ import { useListRevisionsQuery, useRevertRevisionMutation } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import type { Card } from "metabase-types/api";
interface MetricActivityTimelineProps {
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
index 3225feef827..31789231d48 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
@@ -4,8 +4,6 @@ import { t } from "ttag";
import _ from "underscore";
import { trackMetricPageShowMoreClicked } from "metabase/browse/metrics/analytics";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetricDimensionQuery } from "metabase/metrics/common/hooks";
import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";
import {
@@ -17,6 +15,8 @@ import {
Stack,
Text,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import Visualization from "metabase/visualizations/components/Visualization";
import ChartSkeleton from "metabase/visualizations/components/skeletons/ChartSkeleton";
import type { MetricDefinition } from "metabase-lib/metric";
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
index 7197d3b2e6c..60d7c50d2da 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
@@ -6,10 +6,10 @@ import {
type PaneHeaderTab,
PaneHeaderTabs,
} from "metabase/data-studio/common/components/PaneHeader";
-import { useSelector } from "metabase/lib/redux";
import { isNumericMetric } from "metabase/metrics/utils/validation";
import { PLUGIN_CACHING, PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
index f6d4c1a2488..e282a9b7742 100644
--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
@@ -11,8 +11,6 @@ import {
import { ForwardRefLink } from "metabase/common/components/Link";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { getLibraryCollectionType } from "metabase/data-studio/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { isNumericMetric } from "metabase/metrics/utils/validation";
import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";
import { PLUGIN_AUDIT, PLUGIN_MODERATION } from "metabase/plugins";
@@ -24,6 +22,8 @@ import { openUrl } from "metabase/redux/app";
import { getMetadata } from "metabase/selectors/metadata";
import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";
import { Button, Group, Icon, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
index 274cc57e6de..96ba99e384b 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
@@ -9,10 +9,10 @@ import { DateTime } from "metabase/common/components/DateTime";
import { EditableText } from "metabase/common/components/EditableText";
import { Link } from "metabase/common/components/Link/Link";
import { Markdown } from "metabase/common/components/Markdown";
-import { getUserName } from "metabase/lib/user";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Box, Card, Flex, Group, Icon, Stack, Text, rem } from "metabase/ui";
+import { getUserName } from "metabase/utils/user";
import type { Card as CardApiType, CardType } from "metabase-types/api";
import type { MetricUrls } from "../../../../types";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
index 589ee3ce262..ce247d57f2b 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
@@ -2,10 +2,10 @@ import { useCallback, useMemo } from "react";
import { push } from "react-router-redux";
import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetricDefinition } from "metabase/metrics/common/hooks";
import { Box, Flex, Stack } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as LibMetric from "metabase-lib/metric";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
index dbc2f7f7ee0..e36f89e364d 100644
--- a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { MetricPageShell } from "../../components/MetricPageShell";
import type { MetricPageProps } from "../../types";
diff --git a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
index 2ae865db6b3..8712d7e0285 100644
--- a/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
@@ -3,9 +3,9 @@ import type { ReactNode } from "react";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { MetricPageShell } from "../../components/MetricPageShell";
import type { MetricPageProps } from "../../types";
diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
index 120746b4619..816b7e60df7 100644
--- a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
-import * as Urls from "metabase/lib/urls";
import { Box, Card, Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { MetricActivityTimeline } from "../../components/MetricActivityTimeline";
import { MetricPageShell } from "../../components/MetricPageShell";
diff --git a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
index 543a8552780..2c44d5f772d 100644
--- a/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
@@ -5,9 +5,9 @@ import { useGetMetricQuery } from "metabase/api/metric";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { MetricDimensionGrid } from "../../components/MetricDimensionGrid";
import { MetricPageShell } from "../../components/MetricPageShell";
diff --git a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
index 256e6ba11a3..c911c3bf530 100644
--- a/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
@@ -10,13 +10,13 @@ import { PageContainer } from "metabase/data-studio/common/components/PageContai
import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
import { getResultMetadata } from "metabase/data-studio/common/utils";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
import { Card, Center } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { Card as CardApiType } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
index ba6f40d6d03..09004a4566b 100644
--- a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
@@ -13,8 +13,8 @@ import {
FormTextInput,
FormTextarea,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Box, Button, Group, Modal, Stack } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import * as Lib from "metabase-lib";
import type { Card, CreateCardRequest } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
index 5f21637d4a9..52bb4266ca9 100644
--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -15,13 +15,13 @@ import {
PaneHeaderInput,
} from "metabase/data-studio/common/components/PaneHeader";
import { getResultMetadata } from "metabase/data-studio/common/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { MetricQueryEditor } from "metabase/metrics/components/MetricQueryEditor";
import { NAME_MAX_LENGTH } from "metabase/metrics/constants";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
import { Breadcrumbs, Card, Icon } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type { Card as CardApiType } from "metabase-types/api";
diff --git a/frontend/src/metabase/metrics/urls.ts b/frontend/src/metabase/metrics/urls.ts
index 0133f8d717e..6a654b051dd 100644
--- a/frontend/src/metabase/metrics/urls.ts
+++ b/frontend/src/metabase/metrics/urls.ts
@@ -1,4 +1,4 @@
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { MetricUrls } from "./types";
diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx
index a29d8ca6e3c..1605e1883cb 100644
--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx
+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx
@@ -7,9 +7,9 @@ import { Link } from "metabase/common/components/Link";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import { Actions } from "metabase/entities/actions";
import { Databases } from "metabase/entities/databases";
-import { connect } from "metabase/lib/redux";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import * as Urls from "metabase/lib/urls";
+import { connect } from "metabase/utils/redux";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import {
canArchiveAction,
diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActions.tsx
index 4351d4741c7..5056dcd21b4 100644
--- a/frontend/src/metabase/models/components/ModelActions/ModelActions.tsx
+++ b/frontend/src/metabase/models/components/ModelActions/ModelActions.tsx
@@ -1,8 +1,8 @@
import { jt, t } from "ttag";
import { Link } from "metabase/common/components/Link";
-import * as Urls from "metabase/lib/urls";
import { Group, Icon, Paper, Stack, Title } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import ModelActionDetails from "./ModelActionDetails";
diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx
index 26f7d1b1282..f0bd76982fc 100644
--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx
+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx
@@ -10,10 +10,10 @@ import { Databases } from "metabase/entities/databases";
import { Questions } from "metabase/entities/questions";
import { Tables } from "metabase/entities/tables";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import ModelActionsView from "metabase/models/components/ModelActions";
import { loadMetadataForCard } from "metabase/questions/actions";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type Table from "metabase-lib/v1/metadata/Table";
diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
index 5b2935f2e0d..6eac937b03d 100644
--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx
@@ -21,7 +21,7 @@ import {
import ActionCreator from "metabase/actions/containers/ActionCreatorModal";
import { Questions as Models } from "metabase/entities/questions";
import { ModalRoute } from "metabase/hoc/ModalRoute";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { TYPE } from "metabase-lib/v1/types/constants";
import * as ML_Urls from "metabase-lib/v1/urls";
import type {
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
index c1d60be5a08..0ca62ab1748 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
@@ -3,8 +3,6 @@ import type { Location } from "history";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import NewModelOption from "metabase/models/components/NewModelOption";
import { NoDatabasesEmptyState } from "metabase/reference/databases/NoDatabasesEmptyState";
import { getLearnUrl, getSetting } from "metabase/selectors/settings";
@@ -14,6 +12,8 @@ import {
} from "metabase/selectors/user";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Group } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { EducationalButton, OptionsRoot } from "./NewModelOptions.styled";
diff --git a/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx b/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx
index 434a7f14461..58214561d4a 100644
--- a/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx
+++ b/frontend/src/metabase/nav/components/AboutModal/AboutModal.tsx
@@ -3,8 +3,6 @@ import _ from "underscore";
import { LogoIcon } from "metabase/common/components/LogoIcon";
import { useSetting } from "metabase/common/hooks";
-import { capitalize } from "metabase/lib/formatting";
-import { useSelector } from "metabase/lib/redux";
import {
getApplicationName,
getIsWhiteLabeling,
@@ -19,6 +17,8 @@ import {
Text,
Title,
} from "metabase/ui";
+import { capitalize } from "metabase/utils/formatting";
+import { useSelector } from "metabase/utils/redux";
import type { MetabaseInfo } from "metabase-types/api";
export const AboutModal = ({
diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
index 7e4dced1e50..0f305333ec8 100644
--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.tsx
@@ -4,11 +4,11 @@ import { push } from "react-router-redux";
import { t } from "ttag";
import { LogoIcon } from "metabase/common/components/LogoIcon";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Button, Icon } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { AdminPath } from "metabase-types/store";
import { AppSwitcher } from "../AppSwitcher";
diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarToggle.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarToggle.tsx
index 980174aca84..62172c3671d 100644
--- a/frontend/src/metabase/nav/components/AppBar/AppBarToggle.tsx
+++ b/frontend/src/metabase/nav/components/AppBar/AppBarToggle.tsx
@@ -3,9 +3,9 @@ import type React from "react";
import { useEffect, useState } from "react";
import { t } from "ttag";
-import { isMac } from "metabase/lib/browser";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { Tooltip } from "metabase/ui";
+import { isMac } from "metabase/utils/browser";
import { SidebarButton, SidebarIcon } from "./AppBarToggle.styled";
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
index 73ef08a11b8..47fb6f299ca 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
+++ b/frontend/src/metabase/nav/components/AppSwitcher/AppSwitcher.tsx
@@ -14,8 +14,6 @@ import {
getCanAccessOnboardingPage,
getIsNewInstance,
} from "metabase/home/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { openDiagnostics } from "metabase/redux/app";
import { setOpenModal } from "metabase/redux/ui";
import { getUser } from "metabase/selectors/user";
@@ -33,6 +31,8 @@ import {
Text,
} from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { AboutModal } from "../AboutModal/AboutModal";
diff --git a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts
index d3dc9c397a3..b2797c4159c 100644
--- a/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts
+++ b/frontend/src/metabase/nav/components/AppSwitcher/useHelpLink.ts
@@ -2,9 +2,9 @@ import { useEffect, useState } from "react";
import { useSetting } from "metabase/common/hooks";
import { getHelpUrl } from "metabase/common/utils/help-url";
-import { useSelector } from "metabase/lib/redux";
import { getIsPaidPlan } from "metabase/selectors/settings";
import { UtilApi } from "metabase/services";
+import { useSelector } from "metabase/utils/redux";
import { getUser } from "../../../selectors/user";
diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
index 65c3523efc4..c6134f10d20 100644
--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { Badge } from "metabase/common/components/Badge";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { useTranslateContent } from "metabase/i18n/hooks";
-import * as Urls from "metabase/lib/urls";
import { CollectionBadge } from "metabase/questions/components/CollectionBadge";
import { ActionIcon, Box, Flex, Icon } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type {
Collection,
CollectionEssentials,
diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx
index e9bb8aca660..c2c08ca30de 100644
--- a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx
+++ b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx
@@ -2,8 +2,8 @@ import { t } from "ttag";
import { Banner } from "metabase/common/components/Banner";
import { Link } from "metabase/common/components/Link";
-import { adminLicense } from "metabase/lib/urls";
import { Flex, Text } from "metabase/ui";
+import { adminLicense } from "metabase/utils/urls";
import styles from "./LicenseTokenMissingBanner.module.css";
diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts
index 6db3043b39f..0223b8eee17 100644
--- a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts
+++ b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts
@@ -3,7 +3,7 @@ import utc from "dayjs/plugin/utc";
import { useUpdateSettingMutation } from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import { isEEBuild } from "metabase/lib/utils";
+import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";
import type { TokenStatus } from "metabase-types/api";
dayjs.extend(utc);
@@ -76,7 +76,7 @@ export function useLicenseTokenMissingBanner(isAdmin: boolean = false) {
const shouldShowLicenseTokenMissingBanner = shouldShowBanner({
tokenStatus,
lastDismissed,
- isEEBuild: isEEBuild(),
+ isEEBuild: PLUGIN_IS_EE_BUILD.isEEBuild(),
isAdmin,
});
diff --git a/frontend/src/metabase/nav/components/NewItemButton/analytics.ts b/frontend/src/metabase/nav/components/NewItemButton/analytics.ts
index f778e99f3c7..81d890b6364 100644
--- a/frontend/src/metabase/nav/components/NewItemButton/analytics.ts
+++ b/frontend/src/metabase/nav/components/NewItemButton/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackAppNewButtonClicked = () =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx
index 8895a3d0ed6..0554b7e31cf 100644
--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx
+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx
@@ -4,12 +4,12 @@ import { t } from "ttag";
import { useGetVersionInfoQuery } from "metabase/api";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
import { useSetting } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { updateSetting } from "metabase/redux/settings";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { getIsWhiteLabeling } from "metabase/selectors/whitelabel";
import { Anchor, Flex, Icon, Paper, Stack, Text } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import S from "./WhatsNewNotification.module.css";
import Sparkles from "./sparkles.svg?component";
diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx
index 7b9588a35dd..62a330046cc 100644
--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import * as domUtils from "metabase/lib/dom";
+import * as iframeUtils from "metabase/utils/iframe";
import type { VersionInfo, VersionInfoRecord } from "metabase-types/api"; // Add VersionInfo
import {
createMockSettings,
@@ -52,7 +52,7 @@ const setup = ({
versions?: VersionInfoRecord[];
} = {}) => {
// Added default empty object
- jest.spyOn(domUtils, "isWithinIframe").mockReturnValue(isEmbedded);
+ jest.spyOn(iframeUtils, "isWithinIframe").mockReturnValue(isEmbedded);
const versionMock = createMockVersion({ tag: currentVersionTag });
const [latest, ...older] = versions;
diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/utils.ts b/frontend/src/metabase/nav/components/WhatsNewNotification/utils.ts
index 0ce8358780e..07529d5d9a5 100644
--- a/frontend/src/metabase/nav/components/WhatsNewNotification/utils.ts
+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/utils.ts
@@ -1,5 +1,5 @@
-import { isNotFalsy } from "metabase/lib/types";
-import { compareVersions } from "metabase/lib/utils";
+import { isNotFalsy } from "metabase/utils/types";
+import { compareVersions } from "metabase/utils/version";
import type { VersionInfoRecord } from "metabase-types/api";
import type { VersionInfo } from "metabase-types/api/settings";
/**
diff --git a/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx b/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx
index 1e02adc599e..3632c69dd6c 100644
--- a/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx
+++ b/frontend/src/metabase/nav/components/search/RecentsList/RecentsList.tsx
@@ -1,10 +1,10 @@
import { push } from "react-router-redux";
import { useListRecentsQuery } from "metabase/api";
-import { getName } from "metabase/lib/name";
-import { useDispatch } from "metabase/lib/redux";
import { RecentsListContent } from "metabase/nav/components/search/RecentsList/RecentsListContent";
import { Paper } from "metabase/ui";
+import { getName } from "metabase/utils/name";
+import { useDispatch } from "metabase/utils/redux";
import type {
RecentContexts,
RecentItem,
diff --git a/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsx b/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsx
index a81ff358b89..0d340d51318 100644
--- a/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsx
+++ b/frontend/src/metabase/nav/components/search/RecentsList/RecentsListContent.tsx
@@ -3,8 +3,6 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";
import { getTranslatedEntityName } from "metabase/common/utils/model-names";
-import { getName } from "metabase/lib/name";
-import { isSyncCompleted } from "metabase/lib/syncing";
import {
EmptyStateContainer,
SearchLoadingSpinner,
@@ -19,6 +17,8 @@ import {
} from "metabase/search/components/SearchResult";
import { SearchResultLink } from "metabase/search/components/SearchResultLink";
import { Group, Loader, Stack, Title } from "metabase/ui";
+import { getName } from "metabase/utils/name";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type { RecentItem } from "metabase-types/api";
import { getItemUrl, isItemActive } from "./util";
diff --git a/frontend/src/metabase/nav/components/search/RecentsList/util.ts b/frontend/src/metabase/nav/components/search/RecentsList/util.ts
index 4479a62731a..4de8de01b87 100644
--- a/frontend/src/metabase/nav/components/search/RecentsList/util.ts
+++ b/frontend/src/metabase/nav/components/search/RecentsList/util.ts
@@ -1,5 +1,5 @@
-import { isSyncCompleted } from "metabase/lib/syncing";
-import * as Urls from "metabase/lib/urls";
+import { isSyncCompleted } from "metabase/utils/syncing";
+import * as Urls from "metabase/utils/urls";
import type { RecentItem } from "metabase-types/api";
export const isItemActive = (item: RecentItem) => {
diff --git a/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx b/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx
index 7acc42a291c..ff91960b933 100644
--- a/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx
@@ -1,9 +1,9 @@
import type React from "react";
import { t } from "ttag";
-import { METAKEY } from "metabase/lib/browser";
import { Button, Tooltip } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
+import { METAKEY } from "metabase/utils/browser";
export const CommandPaletteTrigger = ({
onClick,
diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx
index 868f666f68e..16ad8d50610 100644
--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.tsx
@@ -14,9 +14,6 @@ import { t } from "ttag";
import { useKeyboardShortcut } from "metabase/common/hooks/use-keyboard-shortcut";
import { useOnClickOutside } from "metabase/common/hooks/use-on-click-outside";
import { useToggle } from "metabase/common/hooks/use-toggle";
-import { isSmallScreen, isWithinIframe } from "metabase/lib/dom";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { modelToUrl } from "metabase/lib/urls";
import { RecentsList } from "metabase/nav/components/search/RecentsList";
import { SearchResultsDropdown } from "metabase/nav/components/search/SearchResultsDropdown";
import { zoomInRow } from "metabase/query_builder/actions";
@@ -28,6 +25,10 @@ import {
} from "metabase/search/utils";
import { getSetting } from "metabase/selectors/settings";
import { Icon } from "metabase/ui";
+import { isSmallScreen } from "metabase/utils/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { modelToUrl } from "metabase/utils/urls";
import { CommandPaletteTrigger } from "./CommandPaletteTrigger";
import {
diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx
index 7ef9618cf37..b3564d7317b 100644
--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx
@@ -14,8 +14,8 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { SearchBar } from "metabase/nav/components/search/SearchBar";
+import { checkNotNull } from "metabase/utils/types";
import type { CollectionItem, RecentItem } from "metabase-types/api";
import {
createMockCollectionItem,
diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
index 25d584de189..62cb31cded5 100644
--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx
@@ -3,9 +3,9 @@ import { useCallback } from "react";
import { t } from "ttag";
import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";
-import { METAKEY } from "metabase/lib/browser";
import S from "metabase/nav/components/search/SearchButton/SearchButton.module.css";
import { Button, type ButtonProps, Flex, Icon } from "metabase/ui";
+import { METAKEY } from "metabase/utils/browser";
export const SearchButton = (props: ButtonProps) => {
const kbar = useKBar();
diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx
index 0d2f92323ff..9812746554b 100644
--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx
@@ -7,12 +7,6 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import { useSearchListQuery } from "metabase/common/hooks";
import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";
import { Search } from "metabase/entities/search";
-import {
- DEFAULT_SEARCH_LIMIT,
- SEARCH_DEBOUNCE_DURATION,
-} from "metabase/lib/constants";
-import { useDispatch } from "metabase/lib/redux";
-import { modelToUrl } from "metabase/lib/urls";
import {
EmptyStateContainer,
ResultsContainer,
@@ -23,6 +17,12 @@ import { SearchResult } from "metabase/search/components/SearchResult/SearchResu
import { SearchContextTypes } from "metabase/search/constants";
import type { SearchFilters } from "metabase/search/types";
import { Loader } from "metabase/ui";
+import {
+ DEFAULT_SEARCH_LIMIT,
+ SEARCH_DEBOUNCE_DURATION,
+} from "metabase/utils/constants";
+import { useDispatch } from "metabase/utils/redux";
+import { modelToUrl } from "metabase/utils/urls";
import type {
CollectionItem,
SearchModel,
diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx
index 1842f3d5714..4eaf33ef863 100644
--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.unit.spec.tsx
@@ -12,9 +12,9 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import type { SearchResultsFooter } from "metabase/nav/components/search/SearchResults";
import { SearchResults } from "metabase/nav/components/search/SearchResults";
+import { checkNotNull } from "metabase/utils/types";
import type { SearchResult } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsx
index fe97e11deed..9144e6bc198 100644
--- a/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsx
+++ b/frontend/src/metabase/nav/components/search/SearchResultsDropdown/SearchResultsDropdown.unit.spec.tsx
@@ -11,7 +11,7 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { SearchResult } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
index c3f5bce7699..95d537b33b9 100644
--- a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
+++ b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx
@@ -6,7 +6,6 @@ import {
getSidebarOpen,
} from "metabase/documents/selectors";
import { Collections } from "metabase/entities/collections";
-import { connect } from "metabase/lib/redux";
import { getMetabotVisible } from "metabase/metabot/state";
import { closeNavbar, toggleNavbar } from "metabase/redux/app";
import type { RouterProps } from "metabase/selectors/app";
@@ -23,6 +22,7 @@ import {
} from "metabase/selectors/app";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import AppBar from "../../components/AppBar";
diff --git a/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
index 0822a140b11..7c7e04f0956 100644
--- a/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
+++ b/frontend/src/metabase/nav/containers/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
@@ -1,9 +1,9 @@
import { useLocation } from "react-use";
import { useGetCollectionQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getQuestion } from "metabase/query_builder/selectors";
import { getCollectionId } from "metabase/selectors/app";
+import { useSelector } from "metabase/utils/redux";
import type { CollectionId } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx
index c27e5818ae6..5d7298e0d42 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.tsx
@@ -9,9 +9,9 @@ import {
useGetCollectionQuery,
} from "metabase/api";
import { getDashboard } from "metabase/dashboard/selectors";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { closeNavbar, openNavbar } from "metabase/redux/app";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import Question from "metabase-lib/v1/Question";
import type { CollectionId, Dashboard } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx
index 54cffe749da..d52a4eb910b 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx
@@ -3,8 +3,6 @@ import { Link } from "react-router";
import { match } from "ts-pattern";
import { c, t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
-import { getSubpathSafeUrl } from "metabase/lib/urls";
import { getSetting } from "metabase/selectors/settings";
import {
Alert,
@@ -17,6 +15,8 @@ import {
Title,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { getSubpathSafeUrl } from "metabase/utils/urls";
import IconCSV from "./illustrations/csv.svg?component";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx
index fc479c2dce2..50959d628a4 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVPanel.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { UpsellStorage } from "metabase/common/components/upsells/UpsellStorage";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import { CSVPanelEmptyState } from "./AddDataModalEmptyStates";
import { CSVUpload } from "./CSVUpload";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
index 51b20f3e20f..c66632b4e89 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx
@@ -19,13 +19,13 @@ import {
type OmniPickerItem,
} from "metabase/common/components/Pickers";
import { UploadInput } from "metabase/common/components/upload";
-import { useDispatch } from "metabase/lib/redux";
import {
MAX_UPLOAD_SIZE,
MAX_UPLOAD_STRING,
uploadFile,
} from "metabase/redux/uploads";
import { Box, Button, Center, Group, Icon, Stack, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import { UploadMode } from "metabase-types/store/upload";
import S from "../AddDataModal.module.css";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx
index 97f3e72262d..ef14e6de473 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/DatabasesPanel.tsx
@@ -2,7 +2,7 @@ import { push } from "react-router-redux";
import { DatabaseEngineList } from "metabase/databases/components/DatabaseEngineList";
import { RETURN_TO_SETUP_GUIDE_PARAM } from "metabase/embedding/embedding-hub/constants";
-import { useDispatch } from "metabase/lib/redux";
+import { useDispatch } from "metabase/utils/redux";
import { trackDatabaseSelect } from "../analytics";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx
index 2f2a08684e7..f4aac5834de 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/PanelsHeader.tsx
@@ -1,8 +1,8 @@
import { Link } from "react-router";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
import { Box, Group, Modal } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import S from "../AddDataModal.module.css";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.ts
index 2b696f8af27..ccb924b3eed 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.ts
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { Engine } from "metabase-types/api";
export const trackAddDataEvent = (
event: "csv_tab_clicked" | "sheets_tab_clicked" | "database_tab_clicked",
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.ts
index f3ac720ca39..d4663d69eee 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.ts
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-permission.ts
@@ -1,7 +1,7 @@
import { useListDatabasesQuery } from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { canAccessSettings, getUserIsAdmin } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
export function useAddDataPermissions() {
const { data: databasesResponse } = useListDatabasesQuery();
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx
index 0c368672f29..0b883cb9ee7 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx
@@ -15,11 +15,11 @@ import { CollapseSection } from "metabase/common/components/CollapseSection";
import { Sortable } from "metabase/common/components/Sortable";
import GrabberS from "metabase/css/components/grabber.module.css";
import { Bookmarks } from "metabase/entities/bookmarks";
-import { getIcon } from "metabase/lib/icon";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import { Icon, Tooltip } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Bookmark } from "metabase-types/api";
import { SidebarHeading } from "../../MainNavbar.styled";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
index 75dd2604c70..df0ddfd52fa 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx
@@ -2,10 +2,10 @@ import { c, t } from "ttag";
import { CollapseSection } from "metabase/common/components/CollapseSection";
import { useUserSetting } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import { getEntityTypes } from "metabase/redux/embedding-data-picker";
import { getIsEmbeddingIframe } from "metabase/selectors/embed";
import { ActionIcon, Icon, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { PaddedSidebarLink, SidebarHeading } from "../MainNavbar.styled";
import { trackAddDataModalOpened } from "../analytics";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
index f986b4509d2..57478ed1c2e 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.unit.spec.tsx
@@ -11,7 +11,7 @@ import {
waitFor,
within,
} from "__support__/ui";
-import * as domUtils from "metabase/lib/dom";
+import * as iframeUtils from "metabase/utils/iframe";
import { createMockDatabase, createMockUser } from "metabase-types/api/mocks";
import type { EmbeddingEntityType } from "metabase-types/store/embedding-data-picker";
import { createMockState } from "metabase-types/store/mocks";
@@ -196,7 +196,7 @@ async function setup({
setupUpdateSettingEndpoint();
if (isEmbeddingIframe) {
- jest.spyOn(domUtils, "isWithinIframe").mockReturnValue(true);
+ jest.spyOn(iframeUtils, "isWithinIframe").mockReturnValue(true);
}
const embeddingDataPickerState = entityTypes
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
index f44316786f3..dae4e625030 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
@@ -22,14 +22,14 @@ import {
getCollectionIcon,
} from "metabase/entities/collections";
import { Databases } from "metabase/entities/databases";
-import { connect, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_TENANTS } from "metabase/plugins";
import {
getIsTenantUser,
getUser,
getUserCanWriteToCollections,
} from "metabase/selectors/user";
+import { connect, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type Database from "metabase-lib/v1/metadata/Database";
import type { Bookmark, Collection, User } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
index 9070d7b87cc..33cd4768e2e 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx
@@ -21,9 +21,6 @@ import {
getCanAccessOnboardingPage,
getIsNewInstance,
} from "metabase/home/selectors";
-import { isSmallScreen } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { WhatsNewNotification } from "metabase/nav/components/WhatsNewNotification";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TENANTS } from "metabase/plugins";
import {
@@ -32,6 +29,9 @@ import {
getUserCanWriteToCollections,
} from "metabase/selectors/user";
import { ActionIcon, Icon, Tooltip } from "metabase/ui";
+import { isSmallScreen } from "metabase/utils/dom";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Bookmark, Collection } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx
index 77680d19df7..51c93731a32 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx
@@ -9,10 +9,10 @@ import type {
TreeNodeProps,
} from "metabase/common/components/tree/types";
import { getCollectionIcon } from "metabase/entities/collections/utils";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import { getIsTenantUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/analytics.ts b/frontend/src/metabase/nav/containers/MainNavbar/analytics.ts
index 27891f43098..5c3c1f0477e 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/analytics.ts
+++ b/frontend/src/metabase/nav/containers/MainNavbar/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackOnboardingChecklistOpened = () => {
trackSimpleEvent({
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts b/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts
index eb97ee29c10..243ae8a8f9c 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts
+++ b/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts
@@ -1,5 +1,5 @@
import { coerceCollectionId } from "metabase/collections/utils";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import type { Collection, Dashboard } from "metabase-types/api";
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.tsx
index 2cb8e7786fb..d800a00a478 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
@@ -4,7 +4,7 @@ import dayjs from "dayjs";
import { screen, within } from "__support__/ui";
import { createMockModelResult } from "metabase/browse/models/test-utils";
import { ROOT_COLLECTION } from "metabase/entities/collections";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import {
createMockCard,
createMockDashboard,
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
index 25c92c1ddbe..d824d6ad414 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx
@@ -21,7 +21,7 @@ import {
} from "__support__/ui";
import type { ModelResult } from "metabase/browse/models";
import { ROOT_COLLECTION } from "metabase/entities/collections";
-import * as domUtils from "metabase/lib/dom";
+import * as iframeUtils from "metabase/utils/iframe";
import type { Card, Dashboard, DashboardId, User } from "metabase-types/api";
import {
createMockCollection,
@@ -91,7 +91,7 @@ export async function setup({
applicationName = "Metabase",
}: SetupOpts = {}) {
if (isEmbeddingIframe) {
- jest.spyOn(domUtils, "isWithinIframe").mockReturnValue(true);
+ jest.spyOn(iframeUtils, "isWithinIframe").mockReturnValue(true);
}
const SAMPLE_DATABASE = createMockDatabase({
diff --git a/frontend/src/metabase/nav/containers/Navbar.tsx b/frontend/src/metabase/nav/containers/Navbar.tsx
index d0bf4a12a2a..0172c74a09e 100644
--- a/frontend/src/metabase/nav/containers/Navbar.tsx
+++ b/frontend/src/metabase/nav/containers/Navbar.tsx
@@ -5,9 +5,9 @@ import _ from "underscore";
import { getAdminPaths } from "metabase/admin/app/selectors";
import { Databases } from "metabase/entities/databases";
-import { connect } from "metabase/lib/redux";
import { getIsNavbarOpen } from "metabase/selectors/app";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
import type { User } from "metabase-types/api";
import type { AdminPath, State } from "metabase-types/store";
diff --git a/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx b/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx
index a0e0230e73e..2f8d15f3d87 100644
--- a/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx
+++ b/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx
@@ -16,12 +16,12 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/entities/collections";
-import * as dom from "metabase/lib/dom";
import {
CLOSE_NAVBAR,
OPEN_NAVBAR,
isNavbarOpenForPathname,
} from "metabase/redux/app";
+import * as iframeUtils from "metabase/utils/iframe";
import type { User } from "metabase-types/api";
import {
createMockCollection,
@@ -177,7 +177,7 @@ describe("nav > containers > Navbar > Core App", () => {
let isWithinIframeSpy: jest.SpyInstance;
beforeAll(() => {
- isWithinIframeSpy = jest.spyOn(dom, "isWithinIframe");
+ isWithinIframeSpy = jest.spyOn(iframeUtils, "isWithinIframe");
isWithinIframeSpy.mockReturnValue(true);
});
diff --git a/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsx b/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsx
index 431355feeb5..cb8a2236663 100644
--- a/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsx
+++ b/frontend/src/metabase/nav/containers/QuestionLineage/QuestionLineage.tsx
@@ -1,8 +1,8 @@
-import { connect } from "metabase/lib/redux";
import {
getOriginalQuestion,
getQuestion,
} from "metabase/query_builder/selectors";
+import { connect } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import QuestionLineage from "../../components/QuestionLineage";
diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsx
index 526137859f4..2e2ff9b3f51 100644
--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx
+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx
@@ -16,13 +16,13 @@ import {
} from "metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal";
import { SdkIframeEmbedSetupModal } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal";
import { Collections } from "metabase/entities/collections/collections";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PaletteShortcutsModal } from "metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";
import { closeModal, setOpenModal } from "metabase/redux/ui";
import { getCurrentOpenModalState } from "metabase/selectors/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { WritebackAction } from "metabase-types/api";
export const NewModals = withRouter((props: WithRouterProps) => {
diff --git a/frontend/src/metabase/notifications/AddEditSidebar/AddEditEmailSidebar.tsx b/frontend/src/metabase/notifications/AddEditSidebar/AddEditEmailSidebar.tsx
index b99065e0633..08e1ee55aad 100644
--- a/frontend/src/metabase/notifications/AddEditSidebar/AddEditEmailSidebar.tsx
+++ b/frontend/src/metabase/notifications/AddEditSidebar/AddEditEmailSidebar.tsx
@@ -13,13 +13,13 @@ import { Sidebar } from "metabase/common/components/Sidebar";
import { Toggle } from "metabase/common/components/Toggle";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { dashboardPulseIsValid } from "metabase/lib/pulse";
-import { useSelector } from "metabase/lib/redux";
import { EmailAttachmentPicker } from "metabase/notifications/EmailAttachmentPicker";
import { RecipientPicker } from "metabase/notifications/channels/RecipientPicker";
import { PLUGIN_DASHBOARD_SUBSCRIPTION_PARAMETERS_SECTION_OVERRIDE } from "metabase/plugins";
import { canAccessSettings, getUser } from "metabase/selectors/user";
import { Icon, Title } from "metabase/ui";
+import { dashboardPulseIsValid } from "metabase/utils/pulse";
+import { useSelector } from "metabase/utils/redux";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
Channel,
diff --git a/frontend/src/metabase/notifications/AddEditSidebar/AddEditSidebar.tsx b/frontend/src/metabase/notifications/AddEditSidebar/AddEditSidebar.tsx
index 0a5ed35c32e..9c9dfc316bf 100644
--- a/frontend/src/metabase/notifications/AddEditSidebar/AddEditSidebar.tsx
+++ b/frontend/src/metabase/notifications/AddEditSidebar/AddEditSidebar.tsx
@@ -2,7 +2,7 @@ import {
getParameters,
getTabHiddenParameterSlugs,
} from "metabase/dashboard/selectors";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import { AddEditEmailSidebar as AddEditEmailSidebarComponent } from "./AddEditEmailSidebar";
diff --git a/frontend/src/metabase/notifications/AddEditSidebar/AddEditSlackSidebar.tsx b/frontend/src/metabase/notifications/AddEditSidebar/AddEditSlackSidebar.tsx
index ea389d939ac..804e05337b9 100644
--- a/frontend/src/metabase/notifications/AddEditSidebar/AddEditSlackSidebar.tsx
+++ b/frontend/src/metabase/notifications/AddEditSidebar/AddEditSlackSidebar.tsx
@@ -10,10 +10,10 @@ import { SendTestPulse } from "metabase/common/components/SendTestPulse";
import { Sidebar } from "metabase/common/components/Sidebar";
import { Toggle } from "metabase/common/components/Toggle";
import CS from "metabase/css/core/index.css";
-import { dashboardPulseIsValid } from "metabase/lib/pulse";
import { SlackChannelField } from "metabase/notifications/channels/SlackChannelField";
import { PLUGIN_DASHBOARD_SUBSCRIPTION_PARAMETERS_SECTION_OVERRIDE } from "metabase/plugins";
import { Icon, Title } from "metabase/ui";
+import { dashboardPulseIsValid } from "metabase/utils/pulse";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
Channel,
diff --git a/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.tsx b/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.tsx
index 7d1f9850ed3..887125a6851 100644
--- a/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.tsx
+++ b/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { Badge } from "metabase/common/components/Badge";
import CS from "metabase/css/core/index.css";
-import { conjunct } from "metabase/lib/formatting";
-import { isNotNull } from "metabase/lib/types";
import { formatDateValue } from "metabase/parameters/utils/date-formatting";
import { Icon, Title } from "metabase/ui";
+import { conjunct } from "metabase/utils/formatting";
+import { isNotNull } from "metabase/utils/types";
import type { Parameter, ParameterValueOrArray } from "metabase-types/api";
interface FormattedParam {
diff --git a/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx b/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx
index 148989f0ea0..875c2f36358 100644
--- a/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx
+++ b/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.tsx
@@ -7,12 +7,6 @@ import { Sidebar } from "metabase/common/components/Sidebar";
import { useDashboardContext } from "metabase/dashboard/context";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { Pulses } from "metabase/entities/pulses";
-import {
- NEW_PULSE_TEMPLATE,
- cleanPulse,
- createChannel,
-} from "metabase/lib/pulse";
-import { connect } from "metabase/lib/redux";
import {
AddEditEmailSidebar,
AddEditSlackSidebar,
@@ -32,6 +26,12 @@ import {
} from "metabase/notifications/pulse/selectors";
import { getUser, getUserIsAdmin } from "metabase/selectors/user";
import { UserApi } from "metabase/services";
+import {
+ NEW_PULSE_TEMPLATE,
+ cleanPulse,
+ createChannel,
+} from "metabase/utils/pulse";
+import { connect } from "metabase/utils/redux";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
Channel,
diff --git a/frontend/src/metabase/notifications/NewPulseSidebar.tsx b/frontend/src/metabase/notifications/NewPulseSidebar.tsx
index 8785608174f..974e827e1fd 100644
--- a/frontend/src/metabase/notifications/NewPulseSidebar.tsx
+++ b/frontend/src/metabase/notifications/NewPulseSidebar.tsx
@@ -2,10 +2,10 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
import { Sidebar } from "metabase/common/components/Sidebar";
-import { useSelector } from "metabase/lib/redux";
import { ChannelCard } from "metabase/notifications/pulse/components/ChannelCard";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Box, Stack, Text, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
interface NewPulseSidebarProps {
emailConfigured: boolean;
diff --git a/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsx b/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsx
index d3358d130cf..be3795768f8 100644
--- a/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsx
+++ b/frontend/src/metabase/notifications/NotificationsActionsMenu/DashboardSubscriptionMenuItem.tsx
@@ -1,12 +1,12 @@
import { t } from "ttag";
import { useHasEmailSetup, useHasSlackSetup } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import {
canManageSubscriptions as canManageSubscriptionsSelector,
getUserIsAdmin,
} from "metabase/selectors/user";
import { Icon, Menu, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Dashboard } from "metabase-types/api";
export function DashboardSubscriptionMenuItem({
diff --git a/frontend/src/metabase/notifications/PulsesListSidebar.tsx b/frontend/src/metabase/notifications/PulsesListSidebar.tsx
index a8b3d9dfead..303cedf633d 100644
--- a/frontend/src/metabase/notifications/PulsesListSidebar.tsx
+++ b/frontend/src/metabase/notifications/PulsesListSidebar.tsx
@@ -7,16 +7,16 @@ import { Label } from "metabase/common/components/type/Label";
import { Subhead } from "metabase/common/components/type/Subhead";
import CS from "metabase/css/core/index.css";
import { getParameters } from "metabase/dashboard/selectors";
+import { formatDateValue } from "metabase/parameters/utils/date-formatting";
+import { Button, Icon, Tooltip } from "metabase/ui";
import {
conjunct,
formatDateTimeWithUnit,
formatTimeWithUnit,
-} from "metabase/lib/formatting";
-import { getActivePulseParameters } from "metabase/lib/pulse";
-import { connect } from "metabase/lib/redux";
-import { formatFrame } from "metabase/lib/time-dayjs";
-import { formatDateValue } from "metabase/parameters/utils/date-formatting";
-import { Button, Icon, Tooltip } from "metabase/ui";
+} from "metabase/utils/formatting";
+import { getActivePulseParameters } from "metabase/utils/pulse";
+import { connect } from "metabase/utils/redux";
+import { formatFrame } from "metabase/utils/time-dayjs";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type {
Channel,
diff --git a/frontend/src/metabase/notifications/channels/EmailChannelEdit.tsx b/frontend/src/metabase/notifications/channels/EmailChannelEdit.tsx
index f44b9808632..ec47f941de2 100644
--- a/frontend/src/metabase/notifications/channels/EmailChannelEdit.tsx
+++ b/frontend/src/metabase/notifications/channels/EmailChannelEdit.tsx
@@ -1,5 +1,5 @@
-import type { RecipientPickerValue } from "metabase/lib/pulse";
-import { isNotNull } from "metabase/lib/types";
+import type { RecipientPickerValue } from "metabase/utils/pulse";
+import { isNotNull } from "metabase/utils/types";
import type {
NotificationHandlerEmail,
NotificationRecipient,
diff --git a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx b/frontend/src/metabase/notifications/channels/RecipientPicker.tsx
index aea29ba0ad8..beaa9561eeb 100644
--- a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx
+++ b/frontend/src/metabase/notifications/channels/RecipientPicker.tsx
@@ -5,12 +5,12 @@ import { TokenField } from "metabase/common/components/TokenField";
import { UserAvatar } from "metabase/common/components/UserAvatar";
import { useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { isEmail } from "metabase/lib/email";
+import { Text } from "metabase/ui";
+import { isEmail } from "metabase/utils/email";
import {
type RecipientPickerValue,
recipientIsValid,
-} from "metabase/lib/pulse";
-import { Text } from "metabase/ui";
+} from "metabase/utils/pulse";
import type { User } from "metabase-types/api";
import S from "./RecipientPicker.module.css";
diff --git a/frontend/src/metabase/notifications/channels/SlackChannelField.tsx b/frontend/src/metabase/notifications/channels/SlackChannelField.tsx
index fef8772ad04..a83f4b80ae1 100644
--- a/frontend/src/metabase/notifications/channels/SlackChannelField.tsx
+++ b/frontend/src/metabase/notifications/channels/SlackChannelField.tsx
@@ -3,9 +3,9 @@ import { useState } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Autocomplete } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Channel, ChannelSpec } from "metabase-types/api";
const CHANNEL_FIELD_NAME = "channel";
diff --git a/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsx b/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsx
index b9f22443e6f..2922ddce954 100644
--- a/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsx
+++ b/frontend/src/metabase/notifications/channels/SlackChannelFieldNew.tsx
@@ -2,9 +2,9 @@ import { useState } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Autocomplete } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { ChannelSpec, NotificationHandlerSlack } from "metabase-types/api";
const CHANNEL_FIELD_NAME = "channel";
diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
index 21eecce96b3..d23f4fb8eb4 100644
--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
@@ -12,16 +12,6 @@ import {
import { ActionButton } from "metabase/common/components/ActionButton";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { getResponseErrorMessage } from "metabase/lib/errors";
-import {
- alertIsValid,
- getAlertTriggerOptions,
-} from "metabase/lib/notifications";
-import {
- getHasConfiguredAnyChannel,
- getHasConfiguredEmailOrSlackChannel,
-} from "metabase/lib/pulse";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getDefaultQuestionAlertRequest } from "metabase/notifications/utils";
import { updateUrl } from "metabase/query_builder/actions/url";
import {
@@ -41,6 +31,16 @@ import {
Text,
rem,
} from "metabase/ui";
+import { getResponseErrorMessage } from "metabase/utils/errors";
+import {
+ alertIsValid,
+ getAlertTriggerOptions,
+} from "metabase/utils/notifications";
+import {
+ getHasConfiguredAnyChannel,
+ getHasConfiguredEmailOrSlackChannel,
+} from "metabase/utils/pulse";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type {
CreateAlertNotificationRequest,
diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx
index 8f4db63e522..54960a19d15 100644
--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx
+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx
@@ -7,9 +7,6 @@ import {
cronUnitToNumber,
isRepeatingEvery,
} from "metabase/common/components/Schedule/cron";
-import { getScheduleExplanation } from "metabase/lib/cron";
-import { formatNotificationScheduleDescription } from "metabase/lib/notifications";
-import { useSelector } from "metabase/lib/redux";
import {
DEFAULT_ALERT_CRON_SCHEDULE,
DEFAULT_ALERT_SCHEDULE,
@@ -17,6 +14,9 @@ import {
import { getSetting } from "metabase/selectors/settings";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Box, type BoxProps, Flex, Text } from "metabase/ui";
+import { getScheduleExplanation } from "metabase/utils/cron";
+import { formatNotificationScheduleDescription } from "metabase/utils/notifications";
+import { useSelector } from "metabase/utils/redux";
import type {
NotificationCronSubscription,
ScheduleSettings,
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx
index 0e019d13a70..8e63c912cdf 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx
@@ -4,14 +4,14 @@ import { msgid, ngettext, t } from "ttag";
import _ from "underscore";
import { formatCreatorMessage } from "metabase/account/notifications/components/NotificationCard/utils";
+import { getUser } from "metabase/selectors/user";
+import { Box, FixedSizeIcon, Group, Stack, Text } from "metabase/ui";
import {
formatNotificationSchedule,
getNotificationHandlersGroupedByTypes,
-} from "metabase/lib/notifications";
-import { useSelector } from "metabase/lib/redux";
-import { isNotFalsy } from "metabase/lib/types";
-import { getUser } from "metabase/selectors/user";
-import { Box, FixedSizeIcon, Group, Stack, Text } from "metabase/ui";
+} from "metabase/utils/notifications";
+import { useSelector } from "metabase/utils/redux";
+import { isNotFalsy } from "metabase/utils/types";
import type {
Notification,
NotificationCardSendCondition,
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx
index b0b7df14dd0..25302ca1a93 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListModal.tsx
@@ -2,12 +2,12 @@ import { t } from "ttag";
import _ from "underscore";
import { useListChannelsQuery, useListUserRecipientsQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import {
canManageSubscriptions as canManageSubscriptionsSelector,
getUser,
} from "metabase/selectors/user";
import { Button, Modal, Stack, rem } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Notification } from "metabase-types/api";
import { AlertListItem } from "./AlertListItem";
diff --git a/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx b/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx
index 18ecb24c4d2..b3de116a66f 100644
--- a/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx
+++ b/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
import CS from "metabase/css/core/index.css";
-import { getNotificationHandlersGroupedByTypes } from "metabase/lib/notifications";
import { Button, Menu, Text } from "metabase/ui";
+import { getNotificationHandlersGroupedByTypes } from "metabase/utils/notifications";
import type {
ChannelApiResponse,
NotificationChannel,
diff --git a/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx b/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx
index 7478dc1b7c1..c73599dc52c 100644
--- a/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx
+++ b/frontend/src/metabase/notifications/modals/components/NotificationChannelsPicker.tsx
@@ -1,8 +1,6 @@
import { t } from "ttag";
import { useListChannelsQuery, useListUserRecipientsQuery } from "metabase/api";
-import { getNotificationHandlersGroupedByTypes } from "metabase/lib/notifications";
-import { useSelector } from "metabase/lib/redux";
import { ChannelSettingsBlock } from "metabase/notifications/channels/ChannelSettingsBlock";
import { EmailChannelEdit } from "metabase/notifications/channels/EmailChannelEdit";
import { SlackChannelFieldNew } from "metabase/notifications/channels/SlackChannelFieldNew";
@@ -12,6 +10,8 @@ import {
} from "metabase/notifications/modals/components/NotificationChannelsAddMenu";
import { canAccessSettings, getUser } from "metabase/selectors/user";
import { Stack } from "metabase/ui";
+import { getNotificationHandlersGroupedByTypes } from "metabase/utils/notifications";
+import { useSelector } from "metabase/utils/redux";
import type {
ChannelApiResponse,
NotificationHandler,
diff --git a/frontend/src/metabase/notifications/pulse/actions.ts b/frontend/src/metabase/notifications/pulse/actions.ts
index 6c5b95862ef..0389ac31a3f 100644
--- a/frontend/src/metabase/notifications/pulse/actions.ts
+++ b/frontend/src/metabase/notifications/pulse/actions.ts
@@ -3,9 +3,9 @@ import { t } from "ttag";
import { getActionErrorMessage } from "metabase/actions/utils";
import { Pulses } from "metabase/entities/pulses";
-import { createThunkAction } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
import { PulseApi } from "metabase/services";
+import { createThunkAction } from "metabase/utils/redux";
import type {
ChannelApiResponse,
DashboardSubscription,
diff --git a/frontend/src/metabase/palette/components/Palette.stories.tsx b/frontend/src/metabase/palette/components/Palette.stories.tsx
index 2f3d3100455..5cfd8b03e8f 100644
--- a/frontend/src/metabase/palette/components/Palette.stories.tsx
+++ b/frontend/src/metabase/palette/components/Palette.stories.tsx
@@ -11,9 +11,9 @@ import { getStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { Api } from "metabase/api";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { commonReducers } from "metabase/reducers-common";
import { Box, Center } from "metabase/ui";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import { registerVisualization } from "metabase/visualizations";
import { ComboChart } from "metabase/visualizations/visualizations/ComboChart";
import { LineChart } from "metabase/visualizations/visualizations/LineChart";
diff --git a/frontend/src/metabase/palette/components/Palette.tsx b/frontend/src/metabase/palette/components/Palette.tsx
index 6bde71a8a45..782bd1fb322 100644
--- a/frontend/src/metabase/palette/components/Palette.tsx
+++ b/frontend/src/metabase/palette/components/Palette.tsx
@@ -5,10 +5,10 @@ import { type PlainRoute, withRouter } from "react-router";
import { t } from "ttag";
import { useOnClickOutside } from "metabase/common/hooks/use-on-click-outside";
-import { isWithinIframe } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import { Box, Card, Center, Icon, Overlay, Stack, rem } from "metabase/ui";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { useSelector } from "metabase/utils/redux";
import { useCommandPalette } from "../hooks/useCommandPalette";
import { useCommandPaletteBasicActions } from "../hooks/useCommandPaletteBasicActions";
diff --git a/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx b/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx
index ae65055f6c6..4cbffdca9ad 100644
--- a/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx
+++ b/frontend/src/metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import _ from "underscore";
import Styles from "metabase/css/core/index.css";
-import { ALTKEY, METAKEY } from "metabase/lib/browser";
import { shortcuts as ALL_SHORTCUTS } from "metabase/palette/shortcuts";
import type { ShortcutDef, ShortcutGroup } from "metabase/palette/types";
import {
@@ -16,6 +15,7 @@ import {
Tabs,
Text,
} from "metabase/ui";
+import { ALTKEY, METAKEY } from "metabase/utils/browser";
import { ELLIPSIS, GROUP_LABELS } from "../../constants";
diff --git a/frontend/src/metabase/palette/hooks/analytics.ts b/frontend/src/metabase/palette/hooks/analytics.ts
index 3b73e184304..8b968544307 100644
--- a/frontend/src/metabase/palette/hooks/analytics.ts
+++ b/frontend/src/metabase/palette/hooks/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { KeyboardShortcutId } from "../shortcuts";
diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx
index 988788e188e..765dfa71c88 100644
--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx
+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx
@@ -10,12 +10,6 @@ import { useListRecentsQuery, useSearchQuery } from "metabase/api";
import { useSetting } from "metabase/common/hooks";
import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
import { Search } from "metabase/entities/search";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
-import { getIcon } from "metabase/lib/icon";
-import { getName } from "metabase/lib/name";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { modelToUrl } from "metabase/lib/urls";
import { PLUGIN_CACHING } from "metabase/plugins";
import { trackSearchClick } from "metabase/search/analytics";
import {
@@ -26,6 +20,12 @@ import {
import { canAccessSettings, getUserIsAdmin } from "metabase/selectors/user";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Icon, Text } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
+import { getIcon } from "metabase/utils/icon";
+import { getName } from "metabase/utils/name";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
+import { modelToUrl } from "metabase/utils/urls";
import {
type RecentItem,
isRecentCollectionItem,
diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
index 145d87d7018..c9e678e45ea 100644
--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
@@ -12,8 +12,6 @@ import {
import { trackMetricCreateStarted } from "metabase/data-studio/analytics";
import { canAccessDataStudio } from "metabase/data-studio/selectors";
import { Collections } from "metabase/entities/collections/collections";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { openDiagnostics } from "metabase/redux/app";
import {
closeModal,
@@ -28,6 +26,8 @@ import {
getUserPersonalCollectionId,
} from "metabase/selectors/user";
import { useColorScheme } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { ModalName } from "metabase-types/store/modal";
import {
diff --git a/frontend/src/metabase/parameters/actions.ts b/frontend/src/metabase/parameters/actions.ts
index e0c4dc519fb..d5a5f2a7a51 100644
--- a/frontend/src/metabase/parameters/actions.ts
+++ b/frontend/src/metabase/parameters/actions.ts
@@ -1,5 +1,5 @@
-import { stableStringify } from "metabase/lib/objects";
import { CardApi, DashboardApi, ParameterApi } from "metabase/services";
+import { stableStringify } from "metabase/utils/objects";
import { getNonVirtualFields } from "metabase-lib/v1/parameters/utils/parameter-fields";
import { normalizeParameter } from "metabase-lib/v1/parameters/utils/parameter-values";
import type {
diff --git a/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx b/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx
index aaf55ac00cc..25db03f9025 100644
--- a/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx
+++ b/frontend/src/metabase/parameters/components/FilterApplyToast/FilterApplyToast.tsx
@@ -10,8 +10,8 @@ import {
getIsAutoApplyFilters,
getParameterValues,
} from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { setParameterValues } from "metabase/redux/dashboard";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getFilterChangeDescription } from "./utils";
diff --git a/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx b/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx
index a08cbd47b89..b2515124d52 100644
--- a/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/FormattedParameterValue/FormattedParameterValue.unit.spec.tsx
@@ -1,5 +1,5 @@
import { renderWithProviders, screen } from "__support__/ui";
-import { setLocalization } from "metabase/lib/i18n";
+import { setLocalization } from "metabase/utils/i18n";
import { createMockParameter } from "metabase-types/api/mocks";
import type { State } from "metabase-types/store";
import {
diff --git a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
index 3fda67e4cbf..d95733ec9a6 100644
--- a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx
@@ -9,7 +9,6 @@ import {
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useDocsUrl, useLearnUrl } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
import { showAddParameterPopover } from "metabase/redux/dashboard";
import {
Box,
@@ -23,6 +22,7 @@ import {
Switch,
Text,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type { FieldId, ParameterId } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx
index 7538aa9fced..1d4dc145533 100644
--- a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import { setupValidFilterFieldsEndpoint } from "__support__/server-mocks";
import { getIcon, renderWithProviders, screen, within } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import * as dashboardActions from "metabase/redux/dashboard";
+import { checkNotNull } from "metabase/utils/types";
import { SAMPLE_METADATA } from "metabase-lib/test-helpers";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
diff --git a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/utils.unit.spec.ts b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/utils.unit.spec.ts
index 4015be2fe03..660d3337808 100644
--- a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/utils.unit.spec.ts
+++ b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/utils.unit.spec.ts
@@ -1,4 +1,4 @@
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { SAMPLE_METADATA } from "metabase-lib/test-helpers";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { FieldId } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx
index 03dca069708..a1591b1aed7 100644
--- a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.tsx
@@ -10,9 +10,9 @@ import {
findDashCardForInlineParameter,
isHeadingDashCard,
} from "metabase/dashboard/utils";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Flex, Group, Icon, type IconName, Select, Text } from "metabase/ui";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import visualizations from "metabase/visualizations";
import type { BaseDashboardCard, ParameterId } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.tsx b/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.tsx
index 9d6a0e11f72..1427eb57b02 100644
--- a/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.tsx
@@ -8,8 +8,6 @@ import {
import { t } from "ttag";
import { resetParameterMapping } from "metabase/dashboard/actions";
-import { isQuestionDashCard } from "metabase/lib/dashboard";
-import { useDispatch } from "metabase/lib/redux";
import {
getDashboardParameterSections,
getDefaultOptionForParameterSectionMap,
@@ -25,6 +23,8 @@ import {
Text,
TextInput,
} from "metabase/ui";
+import { isQuestionDashCard } from "metabase/utils/dashboard";
+import { useDispatch } from "metabase/utils/redux";
import type { ParameterSectionId } from "metabase-lib/v1/parameters/utils/operators";
import { canUseCustomSource } from "metabase-lib/v1/parameters/utils/parameter-source";
import { isTemporalUnitParameter } from "metabase-lib/v1/parameters/utils/parameter-type";
diff --git a/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsx b/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsx
index 017c9262464..87ab2e21ea6 100644
--- a/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsx
+++ b/frontend/src/metabase/parameters/components/ParameterSidebar/ParameterSidebar.tsx
@@ -8,11 +8,11 @@ import {
getEditingParameterInlineDashcard,
getEmbeddedParameterVisibility,
} from "metabase/dashboard/selectors";
-import { slugify } from "metabase/lib/formatting";
-import { useSelector } from "metabase/lib/redux";
import { hasMapping } from "metabase/parameters/utils/dashboards";
import type { IconName } from "metabase/ui";
import { Tabs } from "metabase/ui";
+import { slugify } from "metabase/utils/formatting";
+import { useSelector } from "metabase/utils/redux";
import { isFilterParameter } from "metabase-lib/v1/parameters/utils/parameter-type";
import { parameterHasNoDisplayValue } from "metabase-lib/v1/parameters/utils/parameter-values";
import type {
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
index 378d71c978d..4b9b1b6801d 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
@@ -24,7 +24,7 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { ROOT_COLLECTION } from "metabase/entities/collections";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type { Card, ParameterValues } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx
index 6b833f6d045..d86b18a567b 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx
@@ -14,10 +14,10 @@ import { Option, Select } from "metabase/common/components/Select";
import { SelectButton } from "metabase/common/components/SelectButton";
import { Questions } from "metabase/entities/questions";
import { Tables } from "metabase/entities/tables";
-import { connect, useSelector } from "metabase/lib/redux";
import { getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Box, Flex, Icon } from "metabase/ui";
+import { connect, useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx
index 283ece9350b..ab0e6a3c4a0 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
import { createMockMetadata } from "__support__/metadata";
import { screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import {
createMockCard,
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/premium.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/premium.unit.spec.tsx
index 5fc5368bf82..0880a99eb69 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/premium.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/premium.unit.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
import { createMockMetadata } from "__support__/metadata";
import { screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import { createMockField } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/parameters/components/widgets/NumberInputWidget/NumberInputWidget.tsx b/frontend/src/metabase/parameters/components/widgets/NumberInputWidget/NumberInputWidget.tsx
index 8b51970d311..293cd375c9f 100644
--- a/frontend/src/metabase/parameters/components/widgets/NumberInputWidget/NumberInputWidget.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/NumberInputWidget/NumberInputWidget.tsx
@@ -4,8 +4,6 @@ import _ from "underscore";
import { NumericInput } from "metabase/common/components/NumericInput";
import CS from "metabase/css/core/index.css";
-import { parseNumber } from "metabase/lib/number";
-import { isNotNull } from "metabase/lib/types";
import { UpdateFilterButton } from "metabase/parameters/components/UpdateFilterButton";
import type { NumberFilterValue } from "metabase/querying/parameters/types";
import {
@@ -13,6 +11,8 @@ import {
serializeNumberParameterValue,
} from "metabase/querying/parameters/utils/parsing";
import { Box, type ComboboxItem, MultiAutocomplete } from "metabase/ui";
+import { parseNumber } from "metabase/utils/number";
+import { isNotNull } from "metabase/utils/types";
import { hasValue } from "metabase-lib/v1/parameters/utils/parameter-values";
import type {
Parameter,
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
index 3de3ce47abd..a5777e14e4a 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx
@@ -29,9 +29,6 @@ import { useEmbeddingEntityContext } from "metabase/embedding/context";
import { Fields } from "metabase/entities/fields";
import { useTranslateContent } from "metabase/i18n/hooks";
import type { ContentTranslationFunction } from "metabase/i18n/types";
-import { parseNumber } from "metabase/lib/number";
-import { connect, useDispatch } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import {
fetchCardParameterValues,
fetchDashboardParameterValues,
@@ -45,6 +42,9 @@ import {
MultiAutocompleteOption,
MultiAutocompleteValue,
} from "metabase/ui";
+import { parseNumber } from "metabase/utils/number";
+import { connect, useDispatch } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import Field from "metabase-lib/v1/metadata/Field";
import { getSourceType } from "metabase-lib/v1/parameters/utils/parameter-source";
import { normalizeParameter } from "metabase-lib/v1/parameters/utils/parameter-values";
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
index f65825c9228..a4e4fff31df 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/ListField/ListField.tsx
@@ -8,10 +8,10 @@ import { Input } from "metabase/common/components/Input";
import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { delay } from "metabase/lib/delay";
import { optionItemEqualsFilter } from "metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/utils";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { Checkbox, Flex, Text } from "metabase/ui";
+import { delay } from "metabase/utils/delay";
import type { RowValue } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
index c03b3dd1a8b..400013e79bd 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.tsx
@@ -8,9 +8,9 @@ import { Input } from "metabase/common/components/Input";
import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { delay } from "metabase/lib/delay";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { Flex } from "metabase/ui";
+import { delay } from "metabase/utils/delay";
import type { RowValue } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx
index cd3065bf27f..66288bc4539 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.unit.spec.tsx
@@ -2,7 +2,7 @@ import { waitForElementToBeRemoved } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { render, screen } from "__support__/ui";
-import type { OptionsType } from "metabase/lib/formatting";
+import type { OptionsType } from "metabase/utils/formatting";
import type Field from "metabase-lib/v1/metadata/Field";
import type { FieldValue, RowValue } from "metabase-types/api";
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.ts b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.ts
index 8baf9a9e243..a54d9e10d33 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.ts
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.ts
@@ -1,9 +1,9 @@
import { t } from "ttag";
import _ from "underscore";
-import { isTransientId } from "metabase/lib/dashboard";
-import { stripId } from "metabase/lib/formatting";
import type { ComboboxItem } from "metabase/ui";
+import { isTransientId } from "metabase/utils/dashboard";
+import { stripId } from "metabase/utils/formatting";
import type Field from "metabase-lib/v1/metadata/Field";
import {
canListFieldValues,
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.unit.spec.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.unit.spec.tsx
index 2df099ec331..587b2df36f8 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/utils.unit.spec.tsx
@@ -1,4 +1,4 @@
-import { asNotNull } from "metabase/lib/types";
+import { asNotNull } from "metabase/utils/types";
import type { FieldId } from "metabase-types/api";
import { ORDERS, PEOPLE, PRODUCTS } from "metabase-types/api/mocks/presets";
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsx
index 996e4df0115..3091d88e7e4 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/RemappedValue.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import CS from "metabase/css/core/index.css";
import AutoLoadRemapped from "metabase/hoc/Remapped";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import type Field from "metabase-lib/v1/metadata/Field";
type RenderNormal = (opts: { value?: unknown; column?: Field }) => ReactNode;
diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsx
index 6356c54fffb..4181662c8ea 100644
--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/Value/Value.tsx
@@ -2,8 +2,8 @@ import { isValidElement } from "react";
import { useEmbeddingEntityContext } from "metabase/embedding/context";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { formatValue } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
+import { formatValue } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
import type { DashboardId, Parameter } from "metabase-types/api";
import RemappedValue from "./RemappedValue";
diff --git a/frontend/src/metabase/parameters/components/widgets/TextWidget/TextWidget.tsx b/frontend/src/metabase/parameters/components/widgets/TextWidget/TextWidget.tsx
index 429a8b11868..7a70b0bfb7b 100644
--- a/frontend/src/metabase/parameters/components/widgets/TextWidget/TextWidget.tsx
+++ b/frontend/src/metabase/parameters/components/widgets/TextWidget/TextWidget.tsx
@@ -1,7 +1,7 @@
import { Component, createRef } from "react";
import { t } from "ttag";
-import { forceRedraw } from "metabase/lib/dom";
+import { forceRedraw } from "metabase/utils/dom";
export type TextWidgetProps = {
value: string | number;
diff --git a/frontend/src/metabase/parameters/utils/dashboards.ts b/frontend/src/metabase/parameters/utils/dashboards.ts
index 5a18f335c52..6b5776d6bbe 100644
--- a/frontend/src/metabase/parameters/utils/dashboards.ts
+++ b/frontend/src/metabase/parameters/utils/dashboards.ts
@@ -1,10 +1,10 @@
import _ from "underscore";
import { tag_names } from "cljs/metabase.parameters.shared";
-import { isQuestionCard, isQuestionDashCard } from "metabase/lib/dashboard";
-import { slugify } from "metabase/lib/formatting";
-import { isNotNull } from "metabase/lib/types";
import { generateParameterId } from "metabase/parameters/utils/parameter-id";
+import { isQuestionCard, isQuestionDashCard } from "metabase/utils/dashboard";
+import { slugify } from "metabase/utils/formatting";
+import { isNotNull } from "metabase/utils/types";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
diff --git a/frontend/src/metabase/parameters/utils/formatting.ts b/frontend/src/metabase/parameters/utils/formatting.ts
index 92116684c3e..79af287fe2c 100644
--- a/frontend/src/metabase/parameters/utils/formatting.ts
+++ b/frontend/src/metabase/parameters/utils/formatting.ts
@@ -1,6 +1,6 @@
import { msgid, ngettext } from "ttag";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import * as Lib from "metabase-lib";
import Field from "metabase-lib/v1/metadata/Field";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
diff --git a/frontend/src/metabase/parameters/utils/formatting.unit.spec.ts b/frontend/src/metabase/parameters/utils/formatting.unit.spec.ts
index b12a428a8a6..431505584a1 100644
--- a/frontend/src/metabase/parameters/utils/formatting.unit.spec.ts
+++ b/frontend/src/metabase/parameters/utils/formatting.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";
import {
createMockField,
diff --git a/frontend/src/metabase/parameters/utils/mapping-options.ts b/frontend/src/metabase/parameters/utils/mapping-options.ts
index b818d145cc7..54495954251 100644
--- a/frontend/src/metabase/parameters/utils/mapping-options.ts
+++ b/frontend/src/metabase/parameters/utils/mapping-options.ts
@@ -4,12 +4,12 @@ import _ from "underscore";
import { tag_names } from "cljs/metabase.parameters.shared";
import { getColumnIcon } from "metabase/common/utils/columns";
import { getAllowedIframeAttributes } from "metabase/dashboard/visualizations/IFrameViz/utils";
+import { getGroupName } from "metabase/querying/filters/utils/groups";
import {
isActionDashCard,
isQuestionDashCard,
isVirtualDashCard,
-} from "metabase/lib/dashboard";
-import { getGroupName } from "metabase/querying/filters/utils/groups";
+} from "metabase/utils/dashboard";
import * as Lib from "metabase-lib";
import { TemplateTagDimension } from "metabase-lib/v1/Dimension";
import type { DimensionOptionsSection } from "metabase-lib/v1/DimensionOptions/types";
diff --git a/frontend/src/metabase/parameters/utils/mapping-options.unit.spec.tsx b/frontend/src/metabase/parameters/utils/mapping-options.unit.spec.tsx
index fbf0b7f80f1..0bca50eb561 100644
--- a/frontend/src/metabase/parameters/utils/mapping-options.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/utils/mapping-options.unit.spec.tsx
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
SAMPLE_METADATA,
diff --git a/frontend/src/metabase/plugins/builtin/auth/google.ts b/frontend/src/metabase/plugins/builtin/auth/google.ts
index 59cb5211426..e5d50895e73 100644
--- a/frontend/src/metabase/plugins/builtin/auth/google.ts
+++ b/frontend/src/metabase/plugins/builtin/auth/google.ts
@@ -1,8 +1,8 @@
-import MetabaseSettings from "metabase/lib/settings";
import {
PLUGIN_AUTH_PROVIDERS,
PLUGIN_IS_PASSWORD_USER,
} from "metabase/plugins";
+import MetabaseSettings from "metabase/utils/settings";
PLUGIN_AUTH_PROVIDERS.providers.push((providers) => {
const googleProvider = {
diff --git a/frontend/src/metabase/plugins/oss/collections.ts b/frontend/src/metabase/plugins/oss/collections.ts
index b82d64d6085..cf9129b3b0c 100644
--- a/frontend/src/metabase/plugins/oss/collections.ts
+++ b/frontend/src/metabase/plugins/oss/collections.ts
@@ -7,9 +7,9 @@ import type {
CollectionAuthorityLevelConfig,
CollectionInstanceAnaltyicsConfig,
} from "metabase/collections/types";
-import { getIconBase } from "metabase/lib/icon";
import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
import type { IconProps } from "metabase/ui";
+import { getIconBase } from "metabase/utils/icon";
import type {
BaseEntityId,
Bookmark,
diff --git a/frontend/src/metabase/public/LocaleProvider.tsx b/frontend/src/metabase/public/LocaleProvider.tsx
index d321f923d45..367d0cd1d4e 100644
--- a/frontend/src/metabase/public/LocaleProvider.tsx
+++ b/frontend/src/metabase/public/LocaleProvider.tsx
@@ -7,9 +7,9 @@ import {
} from "react";
import { useSetting } from "metabase/common/hooks";
-import { setLocaleHeader } from "metabase/lib/api";
-import { loadLocalization, setUserLocale } from "metabase/lib/i18n";
import { DatesProvider } from "metabase/ui/components/theme/DatesProvider/DatesProvider";
+import { setLocaleHeader } from "metabase/utils/api";
+import { loadLocalization, setUserLocale } from "metabase/utils/i18n";
interface LocaleProviderProps {
locale?: string | null;
diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx
index 569a4a849a2..06874915387 100644
--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx
+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx
@@ -16,9 +16,6 @@ import {
import { useIsParameterPanelSticky } from "metabase/dashboard/hooks/use-is-parameter-panel-sticky";
import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/EmbeddingFooter";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { getDashboardType } from "metabase/lib/dashboard";
-import { initializeIframeResizer, isSmallScreen } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
import { FilterApplyToast } from "metabase/parameters/components/FilterApplyToast";
import { ParametersList } from "metabase/parameters/components/ParametersList";
import { getVisibleParameters } from "metabase/parameters/utils/ui";
@@ -27,6 +24,9 @@ import { useSyncUrlParameters } from "metabase/query_builder/hooks/use-sync-url-
import { getSetting } from "metabase/selectors/settings";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
import { Box } from "metabase/ui";
+import { getDashboardType } from "metabase/utils/dashboard";
+import { initializeIframeResizer, isSmallScreen } from "metabase/utils/dom";
+import { useSelector } from "metabase/utils/redux";
import { SAVING_DOM_IMAGE_DISPLAY_NONE_CLASS } from "metabase/visualizations/lib/image-exports";
import type Question from "metabase-lib/v1/Question";
import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx
index 6922ae02f8f..1a96d9b90d7 100644
--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx
+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/LookAndFeelSettings.tsx
@@ -4,7 +4,6 @@ import { jt, t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { UpsellMetabaseBanner } from "metabase/common/components/upsells/UpsellMetabaseBanner";
import { useDocsUrl } from "metabase/common/hooks";
-import { useSelector } from "metabase/lib/redux";
import type {
DisplayTheme,
EmbedResourceType,
@@ -20,6 +19,7 @@ import {
Switch,
Text,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import {
DashboardDownloadSettings,
diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx
index 8b78520a7d6..7bc3be2cbce 100644
--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx
+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ServerEmbedCodePane.tsx
@@ -1,7 +1,6 @@
import { t } from "ttag";
import _ from "underscore";
-import { useSelector } from "metabase/lib/redux";
import { getEmbedServerCodeExampleOptions } from "metabase/public/lib/code";
import type {
EmbedResource,
@@ -11,6 +10,7 @@ import type {
ServerCodeSampleConfig,
} from "metabase/public/lib/types";
import { getCanWhitelabel } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
import { CodeSample } from "./CodeSample";
import { getDefaultDisplayOptions } from "./config";
diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx
index 76f645a48cc..29f05008996 100644
--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx
+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.tsx
@@ -5,8 +5,6 @@ import { t } from "ttag";
import { useSetting } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getPreviewParamsBySlug } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-preview-params-by-slug";
import { getStaticEmbedSetupPublishHandlers } from "metabase/public/components/EmbedModal/StaticEmbedSetupPane/lib/get-static-embed-setup-publish-handlers";
import { trackStaticEmbedCodeCopied } from "metabase/public/lib/analytics";
@@ -23,6 +21,8 @@ import type {
} from "metabase/public/lib/types";
import { getCanWhitelabel } from "metabase/selectors/whitelabel";
import { Paper, Stack, Tabs } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import { EmbedModalContentStatusBar } from "./EmbedModalContentStatusBar";
import { LookAndFeelSettings } from "./LookAndFeelSettings";
diff --git a/frontend/src/metabase/public/components/PublicError.tsx b/frontend/src/metabase/public/components/PublicError.tsx
index f5f3d7fc2fd..20251213f6f 100644
--- a/frontend/src/metabase/public/components/PublicError.tsx
+++ b/frontend/src/metabase/public/components/PublicError.tsx
@@ -3,9 +3,9 @@ import { t } from "ttag";
import { NoDataError } from "metabase/common/components/errors/NoDataError";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { SyncedEmbedFrame } from "metabase/public/components/EmbedFrame";
import { getErrorMessage } from "metabase/selectors/app";
+import { useSelector } from "metabase/utils/redux";
export const PublicError = () => {
const message = useSelector(getErrorMessage) ?? t`An error occurred`;
diff --git a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx
index 6e5ccc474d9..01ec3b2e139 100644
--- a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx
+++ b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx
@@ -1,10 +1,10 @@
import { jt, t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { useDispatch } from "metabase/lib/redux";
import { LegaleseStepDetailsContainer } from "metabase/public/components/widgets/LegaleseStep/LegaleseStep.styled";
import { updateSetting } from "metabase/redux/settings";
import { Button, Center, Stack, Text, Title } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
export const LegaleseStep = ({
goToNextStep,
diff --git a/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsx b/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsx
index f4972c0d163..c5d8d6f6dc4 100644
--- a/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsx
+++ b/frontend/src/metabase/public/containers/PublicAction/PublicActionLoader.tsx
@@ -1,10 +1,10 @@
import { useCallback, useEffect } from "react";
import { useAsyncFn, useMount } from "react-use";
-import { connect } from "metabase/lib/redux";
import { SyncedEmbedFrame } from "metabase/public/components/EmbedFrame";
import { setErrorPage } from "metabase/redux/app";
import { PublicApi } from "metabase/services";
+import { connect } from "metabase/utils/redux";
import PublicAction from "./PublicAction";
import {
diff --git a/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx b/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx
index 3bdf303e1be..03ef489edb4 100644
--- a/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx
+++ b/frontend/src/metabase/public/containers/PublicApp/PublicApp.tsx
@@ -1,13 +1,13 @@
import { useLayoutEffect } from "react";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { isWithinIframe } from "metabase/lib/dom";
-import { connect, useSelector } from "metabase/lib/redux";
import { PublicError } from "metabase/public/components/PublicError";
import { PublicNotFound } from "metabase/public/components/PublicNotFound";
import { getErrorPage } from "metabase/selectors/app";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { PublicStatusListing } from "metabase/status/components/PublicStatusListing";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { connect, useSelector } from "metabase/utils/redux";
import type { AppErrorDescriptor, State } from "metabase-types/store";
interface OwnProps {
diff --git a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx
index 5b5f87d4c3b..9903313c986 100644
--- a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx
+++ b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.tsx
@@ -8,8 +8,6 @@ import { useAsync, useMount } from "react-use";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { initializeIframeResizer } from "metabase/lib/dom";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { EmbedFrame } from "metabase/public/components/EmbedFrame";
import { PublicDocumentProvider } from "metabase/public/contexts/PublicDocumentContext";
import { useEmbedFrameOptions } from "metabase/public/hooks";
@@ -25,6 +23,8 @@ import { DROP_ZONE_COLOR } from "metabase/rich_text_editing/tiptap/extensions/sh
import { getSetting } from "metabase/selectors/settings";
import { PublicApi } from "metabase/services";
import { Box } from "metabase/ui";
+import { initializeIframeResizer } from "metabase/utils/dom";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Document } from "metabase-types/api";
import S from "./PublicDocument.module.css";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboard.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboard.tsx
index c48f0f08b0a..c78f309a336 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboard.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboard.tsx
@@ -5,8 +5,8 @@ import {
type DashboardContextProps,
DashboardContextProvider,
} from "metabase/dashboard/context";
-import { isActionDashCard, isQuestionCard } from "metabase/lib/dashboard";
import type { EmbeddingAdditionalHashOptions } from "metabase/public/lib/types";
+import { isActionDashCard, isQuestionCard } from "metabase/utils/dashboard";
import { PublicOrEmbeddedDashboardView } from "./PublicOrEmbeddedDashboardView";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx
index d682f59f039..b49337a5172 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.tsx
@@ -6,12 +6,12 @@ import { useDashboardLocationSync } from "metabase/dashboard/containers/Dashboar
import { DashboardContextProvider } from "metabase/dashboard/context";
import { useDashboardUrlQuery } from "metabase/dashboard/hooks/use-dashboard-url-query";
import { EmbeddingEntityContextProvider } from "metabase/embedding/context";
-import { isActionDashCard, isQuestionCard } from "metabase/lib/dashboard";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { LocaleProvider } from "metabase/public/LocaleProvider";
import { useEmbedFrameOptions, useSetEmbedFont } from "metabase/public/hooks";
import { setErrorPage } from "metabase/redux/app";
import { getCanWhitelabel } from "metabase/selectors/whitelabel";
+import { isActionDashCard, isQuestionCard } from "metabase/utils/dashboard";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { Mode } from "metabase/visualizations/click-actions/Mode";
import { PublicMode } from "metabase/visualizations/click-actions/modes/PublicMode";
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.tsx
index 8df09cc1da8..ca1d4b2610a 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
@@ -8,12 +8,12 @@ import { getNextId } from "__support__/utils";
import { NumberColumn, StringColumn } from "__support__/visualizations";
import { Api } from "metabase/api";
import { Heading } from "metabase/dashboard/visualizations/Heading";
-import { MetabaseReduxProvider } from "metabase/lib/redux/custom-context";
import {
MockDashboardContext,
type MockDashboardContextProps,
} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";
import { publicReducers } from "metabase/reducers-public";
+import { MetabaseReduxProvider } from "metabase/utils/redux/custom-context";
import { registerVisualization } from "metabase/visualizations";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import type { Dashboard } from "metabase-types/api";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
index 27ef83f2ab8..066dc84f40b 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView-filters.stories.tsx
@@ -10,13 +10,13 @@ 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 { stableStringify } from "metabase/lib/objects";
-import { MetabaseReduxProvider } from "metabase/lib/redux/custom-context";
import {
MockDashboardContext,
type MockDashboardContextProps,
} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";
import { publicReducers } from "metabase/reducers-public";
+import { stableStringify } from "metabase/utils/objects";
+import { MetabaseReduxProvider } from "metabase/utils/redux/custom-context";
import { registerVisualization } from "metabase/visualizations";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { Table } from "metabase/visualizations/visualizations/Table/Table";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx
index 0a810cfa74b..e81351390b1 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx
@@ -11,13 +11,13 @@ 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 { MetabaseReduxProvider } from "metabase/lib/redux";
import {
MockDashboardContext,
type MockDashboardContextProps,
} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";
import { publicReducers } from "metabase/reducers-public";
import { Box, Card, Popover, Text, Tooltip } from "metabase/ui";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import { registerVisualization } from "metabase/visualizations";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { ObjectDetail } from "metabase/visualizations/visualizations/ObjectDetail";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsx
index 77f2e91ede1..eef2fbae880 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.tsx
@@ -7,10 +7,10 @@ import { Dashboard } from "metabase/dashboard/components/Dashboard";
import { DashboardHeaderButtonRow } from "metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow";
import { useDashboardContext } from "metabase/dashboard/context";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { isWithinIframe } from "metabase/lib/dom";
import { getTabHiddenParameterSlugs } from "metabase/public/lib/tab-parameters";
import type { DisplayTheme } from "metabase/public/lib/types";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
+import { isWithinIframe } from "metabase/utils/iframe";
import { EmbedFrame } from "../../components/EmbedFrame";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx
index 44dabe74cc1..76788aa624d 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/mock-context.tsx
@@ -10,7 +10,7 @@ import {
mapDispatchToProps,
mapStateToProps,
} from "metabase/dashboard/context/context.redux";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
export type MockDashboardContextProps = Partial<
Omit<PropsWithChildren<DashboardContextReturned>, "dashboardActions"> & {
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx
index e18ccf7d91b..64d8f62ad5d 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.tsx
@@ -4,7 +4,6 @@ import { useLatest, useMount } from "react-use";
import { fetchDataOrError } from "metabase/dashboard/utils";
import { EmbeddingEntityContextProvider } from "metabase/embedding/context";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { LocaleProvider } from "metabase/public/LocaleProvider";
import { useEmbedFrameOptions } from "metabase/public/hooks";
import { usePublicEndpoints } from "metabase/public/hooks/use-public-endpoints";
@@ -14,6 +13,7 @@ import { addFields } from "metabase/redux/metadata";
import { getMetadata } from "metabase/selectors/metadata";
import { getCanWhitelabel } from "metabase/selectors/whitelabel";
import { EmbedApi, PublicApi, maybeUsePivotEndpoint } from "metabase/services";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";
import { getParameterValuesByIdFromQueryParams } from "metabase-lib/v1/parameters/utils/parameter-parsing";
import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";
diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
index 76321a71b2e..6cc5037e874 100644
--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx
@@ -15,9 +15,9 @@ import {
StringColumn,
} from "__support__/visualizations";
import { Api } from "metabase/api";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { publicReducers } from "metabase/reducers-public";
import { Box } from "metabase/ui";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import { registerVisualization } from "metabase/visualizations";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { PivotTable } from "metabase/visualizations/visualizations/PivotTable";
diff --git a/frontend/src/metabase/public/hooks/use-embed-frame-options.ts b/frontend/src/metabase/public/hooks/use-embed-frame-options.ts
index c46662fb2a9..a32da20d106 100644
--- a/frontend/src/metabase/public/hooks/use-embed-frame-options.ts
+++ b/frontend/src/metabase/public/hooks/use-embed-frame-options.ts
@@ -2,9 +2,9 @@ import type { Location } from "history";
import { useEffect } from "react";
import { useDocsUrl } from "metabase/common/hooks";
-import { parseHashOptions } from "metabase/lib/browser";
-import { isWithinIframe } from "metabase/lib/dom";
import { PLUGIN_RESOURCE_DOWNLOADS } from "metabase/plugins";
+import { parseHashOptions } from "metabase/utils/browser";
+import { isWithinIframe } from "metabase/utils/iframe";
import { DEFAULT_EMBED_DISPLAY_PARAMS } from "../constants";
import type { EmbeddingHashOptions } from "../lib/types";
diff --git a/frontend/src/metabase/public/hooks/use-public-document-card-data.ts b/frontend/src/metabase/public/hooks/use-public-document-card-data.ts
index e9138716ed1..5534ce35854 100644
--- a/frontend/src/metabase/public/hooks/use-public-document-card-data.ts
+++ b/frontend/src/metabase/public/hooks/use-public-document-card-data.ts
@@ -1,10 +1,10 @@
import { useMemo } from "react";
import { useAsync } from "react-use";
-import { useSelector } from "metabase/lib/redux";
import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";
import { getMetadata } from "metabase/selectors/metadata";
import { PublicApi } from "metabase/services";
+import { useSelector } from "metabase/utils/redux";
import Question from "metabase-lib/v1/Question";
import type { Card, Dataset, RawSeries } from "metabase-types/api";
diff --git a/frontend/src/metabase/public/hooks/use-set-embed-font.ts b/frontend/src/metabase/public/hooks/use-set-embed-font.ts
index 103b7a0bbdf..dddfe2a9776 100644
--- a/frontend/src/metabase/public/hooks/use-set-embed-font.ts
+++ b/frontend/src/metabase/public/hooks/use-set-embed-font.ts
@@ -1,10 +1,10 @@
import type { Location } from "history";
import { useEffect } from "react";
-import { parseHashOptions } from "metabase/lib/browser";
-import { useDispatch } from "metabase/lib/redux";
import type { EmbeddingHashOptions } from "metabase/public/lib/types";
import { setOptions } from "metabase/redux/embed";
+import { parseHashOptions } from "metabase/utils/browser";
+import { useDispatch } from "metabase/utils/redux";
export const useSetEmbedFont = ({ location }: { location: Location }) => {
const dispatch = useDispatch();
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.tsx
index f8080c958b2..b5ef982d5f4 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,9 +2,9 @@ import { renderHook } from "@testing-library/react";
import type { Location } from "history";
import type { PropsWithChildren } from "react";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { mainReducers } from "metabase/reducers-main";
import { getStore } from "metabase/store";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import type { EmbedState } from "metabase-types/store";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/public/lib/analytics.ts b/frontend/src/metabase/public/lib/analytics.ts
index 2f283aa9cf2..00159041796 100644
--- a/frontend/src/metabase/public/lib/analytics.ts
+++ b/frontend/src/metabase/public/lib/analytics.ts
@@ -1,5 +1,5 @@
import type { ExportFormatType } from "metabase/embedding/components/PublicLinkPopover/types";
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
import type {
DisplayTheme,
diff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.ts
index b54a65a388b..78ddc67868a 100644
--- a/frontend/src/metabase/query_builder/actions/core/core.ts
+++ b/frontend/src/metabase/query_builder/actions/core/core.ts
@@ -4,12 +4,6 @@ import { invalidateNotificationsApiCache, revisionApi } from "metabase/api";
import { Databases } from "metabase/entities/databases";
import { updateModelIndexes } from "metabase/entities/model-indexes/actions";
import { Questions } from "metabase/entities/questions";
-import { shouldOpenInBlankWindow } from "metabase/lib/dom";
-import { entityCompatibleQuery } from "metabase/lib/entities";
-import { createThunkAction } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
-import { copy } from "metabase/lib/utils";
import { loadMetadataForCard } from "metabase/questions/actions";
import { openUrl } from "metabase/redux/app";
import {
@@ -21,6 +15,12 @@ import {
setParameterValue,
} from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
+import { clone } from "metabase/utils/clone";
+import { shouldOpenInBlankWindow } from "metabase/utils/dom";
+import { entityCompatibleQuery } from "metabase/utils/entities";
+import { createThunkAction } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import { getCardAfterVisualizationClick } from "metabase/visualizations/lib/utils";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
@@ -107,7 +107,7 @@ export const setCardAndRun = (
) => {
return async (dispatch: Dispatch, getState: GetState) => {
// clone
- const card = copy(nextCard);
+ const card = clone(nextCard);
const originalCard = card.original_card_id
? // If the original card id is present, dynamically load its information for showing lineage
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
index 00b2c7abea9..425789b9195 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
@@ -3,9 +3,6 @@ import { replace } from "react-router-redux";
import { Questions } from "metabase/entities/questions";
import { Snippets } from "metabase/entities/snippets";
-import { deserializeCard, parseHash } from "metabase/lib/card";
-import { isNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import {
getIsEditingInDashboard,
getNotebookNativePreviewSidebarWidth,
@@ -16,6 +13,9 @@ import { addFields } from "metabase/redux/metadata";
import { INITIALIZE_QB, resetQB } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import { canUserCreateQueries, getUser } from "metabase/selectors/user";
+import { deserializeCard, parseHash } from "metabase/utils/card";
+import { isNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
index 57e4a57f27a..4342f302a24 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
@@ -4,13 +4,13 @@ import type { LocationDescriptorObject } from "history";
import { createMockEntitiesState } from "__support__/store";
import { Databases } from "metabase/entities/databases";
import { Snippets } from "metabase/entities/snippets";
-import * as CardLib from "metabase/lib/card";
-import { checkNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import * as questionActions from "metabase/questions/actions";
import { setErrorPage } from "metabase/redux/app";
import * as sharedQB from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
+import * as CardLib from "metabase/utils/card";
+import { checkNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
index 407dae0666f..9b11a13d364 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.ts
@@ -1,11 +1,11 @@
import _ from "underscore";
-import { createThunkAction } from "metabase/lib/redux";
import { loadMetadataForCard } from "metabase/questions/actions";
import {
onCloseQuestionInfo,
setUIControls,
} from "metabase/redux/query-builder";
+import { createThunkAction } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
index b7c72af5efc..adc39fa599d 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
@@ -1,8 +1,8 @@
import { createMockEntitiesState } from "__support__/store";
-import { checkNotNull } from "metabase/lib/types";
import * as questionActions from "metabase/questions/actions";
import * as sharedQB from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import registerVisualizations from "metabase/visualizations/register";
import Question from "metabase-lib/v1/Question";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
diff --git a/frontend/src/metabase/query_builder/actions/modal.ts b/frontend/src/metabase/query_builder/actions/modal.ts
index e69de29bb2d..95f231199b6 100644
--- a/frontend/src/metabase/query_builder/actions/modal.ts
+++ b/frontend/src/metabase/query_builder/actions/modal.ts
@@ -0,0 +1,12 @@
+import { UserApi } from "metabase/services";
+import { createThunkAction } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
+
+export const CLOSE_QB_NEWB_MODAL = "metabase/qb/CLOSE_QB_NEWB_MODAL";
+export const closeQbNewbModal = createThunkAction(CLOSE_QB_NEWB_MODAL, () => {
+ return async (_dispatch, getState) => {
+ // persist the fact that this user has seen the NewbModal
+ const { currentUser } = getState();
+ await UserApi.update_qbnewb({ id: checkNotNull(currentUser).id });
+ };
+});
diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.ts
index 1207284a271..e28bc17e54d 100644
--- a/frontend/src/metabase/query_builder/actions/native.ts
+++ b/frontend/src/metabase/query_builder/actions/native.ts
@@ -1,9 +1,9 @@
import { createAction } from "redux-actions";
import { Questions } from "metabase/entities/questions";
-import { createThunkAction } from "metabase/lib/redux";
import { setUIControls } from "metabase/redux/query-builder";
import { updateUserSetting } from "metabase/redux/settings";
+import { createThunkAction } from "metabase/utils/redux";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import type {
CardId,
diff --git a/frontend/src/metabase/query_builder/actions/navigation.ts b/frontend/src/metabase/query_builder/actions/navigation.ts
index 47c2f23e439..b254ae386f5 100644
--- a/frontend/src/metabase/query_builder/actions/navigation.ts
+++ b/frontend/src/metabase/query_builder/actions/navigation.ts
@@ -1,9 +1,9 @@
import type { Location } from "history";
+import _ from "underscore";
-import { createThunkAction } from "metabase/lib/redux";
-import { equals } from "metabase/lib/utils";
import { resetUIControls } from "metabase/redux/query-builder";
import { getLocation } from "metabase/selectors/routing";
+import { createThunkAction } from "metabase/utils/redux";
import type { Dispatch } from "metabase-types/store";
import {
@@ -46,7 +46,7 @@ export const popState = createThunkAction(
const card = getCard(getState());
if (location.state && location.state.card) {
- if (!equals(card, location.state.card)) {
+ if (!_.isEqual(card, location.state.card)) {
const isEmptyQuery = !location.state.card.dataset_query.database;
if (isEmptyQuery) {
diff --git a/frontend/src/metabase/query_builder/actions/object-detail.ts b/frontend/src/metabase/query_builder/actions/object-detail.ts
index f1b95c47a1c..2dad3ec10a0 100644
--- a/frontend/src/metabase/query_builder/actions/object-detail.ts
+++ b/frontend/src/metabase/query_builder/actions/object-detail.ts
@@ -1,9 +1,9 @@
import _ from "underscore";
-import { createThunkAction } from "metabase/lib/redux";
import { RESET_ROW_ZOOM } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import { MetabaseApi } from "metabase/services";
+import { createThunkAction } from "metabase/utils/redux";
import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/actions/querying.ts b/frontend/src/metabase/query_builder/actions/querying.ts
index 8cae59f915a..46efe4a6aca 100644
--- a/frontend/src/metabase/query_builder/actions/querying.ts
+++ b/frontend/src/metabase/query_builder/actions/querying.ts
@@ -1,8 +1,6 @@
import { createAction } from "redux-actions";
import { t } from "ttag";
-import { defer } from "metabase/lib/promise";
-import { createThunkAction } from "metabase/lib/redux";
import { syncVizSettingsWithSeries } from "metabase/querying/viz-settings/utils/sync-viz-settings";
import {
CANCEL_QUERY,
@@ -15,6 +13,8 @@ import {
} from "metabase/redux/query-builder";
import { getWhiteLabeledLoadingMessageFactory } from "metabase/selectors/whitelabel";
import { runQuestionQuery as apiRunQuestionQuery } from "metabase/services";
+import { defer } from "metabase/utils/promise";
+import { createThunkAction } from "metabase/utils/redux";
import { getSensibleDisplays } from "metabase/visualizations";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/actions/url.ts b/frontend/src/metabase/query_builder/actions/url.ts
index ec520ca2a74..b79b442a9d0 100644
--- a/frontend/src/metabase/query_builder/actions/url.ts
+++ b/frontend/src/metabase/query_builder/actions/url.ts
@@ -3,8 +3,8 @@ import { parse as parseUrl } from "url";
import type { LocationDescriptor } from "history";
import { push, replace } from "react-router-redux";
-import { isEqualCard } from "metabase/lib/card";
-import { createThunkAction } from "metabase/lib/redux";
+import { isEqualCard } from "metabase/utils/card";
+import { createThunkAction } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import { isAdHocModelOrMetricQuestion } from "metabase-lib/v1/metadata/utils/models";
diff --git a/frontend/src/metabase/query_builder/analytics.js b/frontend/src/metabase/query_builder/analytics.js
index 19fa96247a3..f3d95afb548 100644
--- a/frontend/src/metabase/query_builder/analytics.js
+++ b/frontend/src/metabase/query_builder/analytics.js
@@ -1,4 +1,4 @@
-import { trackSchemaEvent, trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";
export const trackNewQuestionSaved = (
draftQuestion,
diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
index 103955c4e97..87dac20fad7 100644
--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
+++ b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
@@ -9,9 +9,9 @@ import { DashboardPickerModal } from "metabase/common/components/Pickers/Dashboa
import { getCollectionType } from "metabase/common/components/Pickers/EntityPicker/utils";
import { canPlaceEntityInCollectionOrDescendants } from "metabase/data-studio/utils";
import { ROOT_COLLECTION } from "metabase/entities/collections";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getUserPersonalCollectionId } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Card, Dashboard } from "metabase-types/api";
import { useMostRecentlyViewedDashboard } from "./hooks";
diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx
index cfb09fc176e..6edc1640f56 100644
--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx
@@ -20,7 +20,7 @@ import {
} from "__support__/ui";
import { getNextId } from "__support__/utils";
import { ROOT_COLLECTION as ROOT } from "metabase/entities/collections";
-import { checkNotNull, isNotNull } from "metabase/lib/types";
+import { checkNotNull, isNotNull } from "metabase/utils/types";
import type {
BaseEntityId,
Card,
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx
index 6a00a345996..fa039f1b5a4 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx
@@ -13,11 +13,11 @@ import { Questions } from "metabase/entities/questions";
import { Schemas } from "metabase/entities/schemas";
import { Search } from "metabase/entities/search";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { canUserCreateQueries } from "metabase/selectors/user";
import { Box, Popover } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import {
SAVED_QUESTIONS_VIRTUAL_DB_ID,
getQuestionIdFromVirtualTableId,
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
index 75b04d8e771..fb921c8ec6c 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabasePicker/DataSelectorDatabasePicker.unit.spec.tsx
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import { createMockDatabase } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
index 0221f4a5926..14420b2c988 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
@@ -6,8 +6,8 @@ import {
type Section as BaseSection,
} from "metabase/common/components/AccordionList";
import CS from "metabase/css/core/index.css";
-import { isSyncCompleted } from "metabase/lib/syncing";
import { Icon } from "metabase/ui";
+import { isSyncCompleted } from "metabase/utils/syncing";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
index 09f90c95f78..11ea430c9ca 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { render, renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import { createMockDatabase, createMockSchema } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
index fe4a219ade7..248984f9f2a 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
@@ -1,6 +1,6 @@
import { createMockMetadata } from "__support__/metadata";
import { fireEvent, render, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type Table from "metabase-lib/v1/metadata/Table";
import { ORDERS, createSampleDatabase } from "metabase-types/api/mocks/presets";
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
index 73a1a40ebad..294a5807ed0 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
@@ -13,9 +13,9 @@ import {
} from "metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { isSyncCompleted } from "metabase/lib/syncing";
-import { isNotNull } from "metabase/lib/types";
import { Box, DelayGroup, Flex, Icon, rem } from "metabase/ui";
+import { isSyncCompleted } from "metabase/utils/syncing";
+import { isNotNull } from "metabase/utils/types";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type Table from "metabase-lib/v1/metadata/Table";
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
index 6169809b0ca..fe0c6f68a3d 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Database, InitialSyncStatus } from "metabase-types/api";
import { createMockDatabase, createMockTable } from "metabase-types/api/mocks";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
index 28197962fc6..ed88fac1903 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
@@ -15,8 +15,8 @@ import {
PERSONAL_COLLECTIONS,
buildCollectionTree,
} from "metabase/entities/collections";
-import { connect } from "metabase/lib/redux";
import { Box, Icon } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import { SavedEntityList } from "./SavedEntityList";
import SavedEntityPickerS from "./SavedEntityPicker.module.css";
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
index 23dd143f4f8..3114595c7e0 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
@@ -22,10 +22,9 @@ import { Button } from "metabase/common/components/Button";
import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
import { EditBar } from "metabase/common/components/EditBar";
import { LeaveConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { getSemanticTypeIcon } from "metabase/common/utils/fields";
import ButtonsS from "metabase/css/components/buttons.module.css";
import CS from "metabase/css/core/index.css";
-import { connect, useDispatch } from "metabase/lib/redux";
-import { getSemanticTypeIcon } from "metabase/lib/schema_metadata";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import {
setDatasetEditorTab,
@@ -52,6 +51,7 @@ import { MODAL_TYPES } from "metabase/querying/constants";
import { setUIControls } from "metabase/redux/query-builder";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Flex, Icon, Tooltip } from "metabase/ui";
+import { connect, useDispatch } from "metabase/utils/redux";
import {
extractRemappings,
getVisualizationTransformed,
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
index ecf134d9129..49d21473195 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/DatasetEditorSettingsSidebar.tsx
@@ -1,12 +1,12 @@
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
getIsListViewConfigurationShown,
getTransformedSeries,
} from "metabase/query_builder/selectors";
import { setUIControls } from "metabase/redux/query-builder";
import { Button, Group, SegmentedControl, Stack, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { CardDisplayType } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx
index a596aee410d..bfd34e76c18 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx
@@ -4,6 +4,7 @@ import { t } from "ttag";
import _ from "underscore";
import { SidebarContent } from "metabase/common/components/SidebarContent";
+import { FIELD_VISIBILITY_TYPES } from "metabase/common/utils/fields";
import {
canIndexField,
fieldHasIndex,
@@ -16,7 +17,6 @@ import {
FormTextInput,
FormTextarea,
} from "metabase/forms";
-import { FIELD_VISIBILITY_TYPES } from "metabase/lib/core";
import { Box, Radio, Stack, Tabs } from "metabase/ui";
import { color } from "metabase/ui/colors";
import {
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.jsx
index f4661a68347..d864447eed8 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.jsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.jsx
@@ -2,9 +2,9 @@ import cx from "classnames";
import PropTypes from "prop-types";
import { memo, useMemo, useState } from "react";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";
import { Box } from "metabase/ui";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
import * as Lib from "metabase-lib";
import { DatasetNotebook } from "./DatasetNotebook";
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
index ff2f1c717aa..c58e538e14d 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Card } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsx b/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsx
index 50764f36e87..13283d35c7f 100644
--- a/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsx
+++ b/frontend/src/metabase/query_builder/components/ImpossibleToCreateModelModal/ImpossibleToCreateModelModal.tsx
@@ -5,9 +5,9 @@ import { Button } from "metabase/common/components/Button";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { ModalContent } from "metabase/common/components/ModalContent";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
type Props = {
onClose: () => void;
diff --git a/frontend/src/metabase/query_builder/components/LimitPopover.tsx b/frontend/src/metabase/query_builder/components/LimitPopover.tsx
index d96d81eea30..1eab8d25297 100644
--- a/frontend/src/metabase/query_builder/components/LimitPopover.tsx
+++ b/frontend/src/metabase/query_builder/components/LimitPopover.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { Radio } from "metabase/common/components/Radio";
import CS from "metabase/css/core/index.css";
-import { formatNumber } from "metabase/lib/formatting";
import { LimitInput } from "metabase/querying/components/LimitInput";
+import { formatNumber } from "metabase/utils/formatting";
import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";
interface CustomRowLimitProps {
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
index a01302451df..f8a6f4f86b8 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import CS from "metabase/css/core/index.css";
import QueryBuilderS from "metabase/css/query_builder.module.css";
-import { getNativeQueryLanguage } from "metabase/lib/engine";
+import { getNativeQueryLanguage } from "metabase/databases/utils/engine";
import {
DatabaseDataSelector,
SchemaAndTableDataSelector,
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
index 18462605a77..dc815661dad 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
@@ -12,7 +12,6 @@ import { useMount } from "react-use";
import { t } from "ttag";
import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getMetabotVisible } from "metabase/metabot/state";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { SnippetFormModal } from "metabase/query_builder/components/template_tags/SnippetFormModal";
@@ -28,6 +27,7 @@ import type {
SidebarFeatures,
} from "metabase/querying/editor/types";
import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type Database from "metabase-lib/v1/metadata/Database";
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx
index 31cdf87662f..570eabc8864 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
-import { METAKEY } from "metabase/lib/browser";
import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";
+import { METAKEY } from "metabase/utils/browser";
import type * as Lib from "metabase-lib";
import S from "./NativeQueryEditorRunButton.module.css";
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx
index e70e0c76825..6c82d813a0c 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx
@@ -1,10 +1,10 @@
import { type PropsWithChildren, forwardRef } from "react";
-import { useDispatch } from "metabase/lib/redux";
import { updateQuestion } from "metabase/query_builder/actions/core";
import type { QueryModalType } from "metabase/querying/constants";
import type { SidebarFeatures } from "metabase/querying/editor/types";
import { Flex } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type Database from "metabase-lib/v1/metadata/Database";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.ts b/frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.ts
index 2ecd6f1d004..4cceb69221f 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.ts
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.ts
@@ -1,6 +1,6 @@
import type { FormatOptionsWithLanguage, SqlLanguage } from "sql-formatter";
-import { getEngineNativeType } from "metabase/lib/engine";
+import { getEngineNativeType } from "metabase/databases/utils/engine";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import { MIN_HEIGHT_LINES, SCROLL_MARGIN } from "./constants";
diff --git a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx
index b916c1372bb..5040a4126f2 100644
--- a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx
+++ b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.tsx
@@ -3,9 +3,9 @@ import { t } from "ttag";
import { ModalContent } from "metabase/common/components/ModalContent";
import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";
-import { useDispatch } from "metabase/lib/redux";
import { turnQuestionIntoModel } from "metabase/query_builder/actions";
import { Box, Button, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import NewDatasetModalS from "./NewDatasetModal.module.css";
diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
index 370410258c2..bf63b6b882a 100644
--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
@@ -9,8 +9,6 @@ import { Modal } from "metabase/common/components/Modal";
import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";
import { type ToastArgs, useToast } from "metabase/common/hooks";
import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { QuestionAlertListModal } from "metabase/notifications/modals";
import { setArchivedQuestion } from "metabase/query_builder/actions";
import { ImpossibleToCreateModelModal } from "metabase/query_builder/components/ImpossibleToCreateModelModal";
@@ -25,6 +23,8 @@ import EditEventModal from "metabase/timelines/questions/containers/EditEventMod
import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";
import NewEventModal from "metabase/timelines/questions/containers/NewEventModal";
import { Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import Question from "metabase-lib/v1/Question";
import type { Card, DashboardTabId } from "metabase-types/api";
import type { QueryBuilderMode } from "metabase-types/store";
diff --git a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx
index df2c988a4cf..a1bb459a490 100644
--- a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx
@@ -4,10 +4,10 @@ import { useListRevisionsQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { revertToRevision } from "metabase/query_builder/actions";
import { getUser } from "metabase/selectors/user";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
const { getModerationTimelineEvents } = PLUGIN_MODERATION;
diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx
index 08b092b145e..2978d82dff6 100644
--- a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.tsx
@@ -8,8 +8,8 @@ import {
type UseDownloadDataParams,
useDownloadData,
} from "metabase/common/components/QuestionDownloadWidget";
+import { canDownloadResults } from "metabase/common/utils/dataset";
import { useEmbeddingEntityContext } from "metabase/embedding/context";
-import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import {
ActionIcon,
type ActionIconProps,
@@ -118,11 +118,7 @@ interface ShouldRenderDownloadPopoverProps {
}
const shouldRender = ({ result }: ShouldRenderDownloadPopoverProps) => {
- return (
- result &&
- !result.error &&
- PLUGIN_FEATURE_LEVEL_PERMISSIONS.canDownloadResults(result)
- );
+ return canDownloadResults(result);
};
QuestionDownloadPopover.shouldRender = shouldRender;
diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx
index 9a64249a944..567d7e3fd02 100644
--- a/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadPopover/QuestionDownloadPopover.unit.spec.tsx
@@ -6,8 +6,8 @@ import {
} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { getIcon, renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Card, Dataset } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
index 1cd9f437dd4..e885fa13d73 100644
--- a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.unit.spec.tsx
@@ -8,8 +8,8 @@ import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { act, renderWithProviders, screen } from "__support__/ui";
import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import registerVisualizations from "metabase/visualizations/register";
import type { Card, Dataset } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx b/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx
index 68a1c32e4d8..f078ef6c7ae 100644
--- a/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionEmbedWidget/QuestionEmbedWidget.tsx
@@ -3,9 +3,9 @@ import {
useUpdateCardEnableEmbeddingMutation,
} from "metabase/api";
import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";
-import { useSelector } from "metabase/lib/redux";
import { EmbedModal } from "metabase/public/components/EmbedModal";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import { getCardUiParameters } from "metabase-lib/v1/parameters/utils/cards";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx b/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx
index 542cf90076b..eb50e13b425 100644
--- a/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx
+++ b/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx
@@ -1,10 +1,10 @@
import { useCallback } from "react";
-import { useDispatch } from "metabase/lib/redux";
import {
ParametersList,
type ParametersListProps,
} from "metabase/parameters/components/ParametersList";
+import { useDispatch } from "metabase/utils/redux";
import type { ParameterId } from "metabase-types/api";
import { setParameterValueToDefault } from "../actions";
diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx
index bcef7a46ee9..42c022f6dc0 100644
--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeList/ChartTypeList.unit.spec.tsx
@@ -1,5 +1,5 @@
import { renderWithProviders, screen, within } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import visualizations from "metabase/visualizations";
import registerVisualizations from "metabase/visualizations/register";
diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx
index b403e33a27f..b7fc1af6f8e 100644
--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx
+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx
@@ -1,7 +1,7 @@
import cx from "classnames";
-import { checkNotNull } from "metabase/lib/types";
import { ActionIcon, Center, Icon, Stack, Text } from "metabase/ui";
+import { checkNotNull } from "metabase/utils/types";
import visualizations from "metabase/visualizations";
import type { CardDisplayType } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx
index d2704faa68d..2b2226c46e4 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx
@@ -11,8 +11,8 @@ import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { FormTextArea } from "metabase/common/components/FormTextArea";
import { SnippetCollections } from "metabase/entities/snippet-collections";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Flex } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { Collection, NativeQuerySnippet } from "metabase-types/api";
import S from "./SnippetForm.module.css";
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx
index da67f0c2e98..788821b133e 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx
@@ -2,9 +2,9 @@ import { useCallback, useState } from "react";
import { t } from "ttag";
import { Snippets } from "metabase/entities/snippets";
-import { useDispatch } from "metabase/lib/redux";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Flex, Modal } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type {
CreateSnippetRequest,
NativeQuerySnippet,
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
index b363d20d8ba..d3a42fbd517 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
@@ -5,8 +5,8 @@ import { Button } from "metabase/common/components/Button";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { uuid } from "metabase/lib/uuid";
import { Code } from "metabase/ui";
+import { uuid } from "metabase/utils/uuid";
import type Database from "metabase-lib/v1/metadata/Database";
import type { DatabaseId, NativeDatasetQuery } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx
index f77127796e0..279ebd36470 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx
@@ -2,7 +2,6 @@ import { Component } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { type DispatchFn, connect } from "metabase/lib/redux";
import { TemporalUnitSettings } from "metabase/parameters/components/ParameterSettings/TemporalUnitSettings";
import { ValuesSourceSettings } from "metabase/parameters/components/ValuesSourceSettings";
import { isSingleOrMultiSelectable } from "metabase/parameters/utils/parameter-type";
@@ -12,6 +11,7 @@ import { getOriginalQuestion } from "metabase/query_builder/selectors";
import { fetchField } from "metabase/redux/metadata";
import { getMetadata } from "metabase/selectors/metadata";
import { Box } from "metabase/ui";
+import { type DispatchFn, connect } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type Database from "metabase-lib/v1/metadata/Database";
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.unit.spec.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.unit.spec.tsx
index 7e4fb7a332e..77b51e8ed8b 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.unit.spec.tsx
@@ -7,8 +7,8 @@ import {
} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import { getTemplateTagParameter } from "metabase-lib/v1/parameters/utils/template-tags";
import type { Card, TemplateTag, TemplateTagType } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx b/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx
index a01a4859ab1..9b93ff83e51 100644
--- a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx
@@ -1,9 +1,9 @@
import cx from "classnames";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { toggleDataReference } from "metabase/query_builder/actions";
import { Box, Icon, Tooltip } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import DataReferenceButtonS from "./DataReferenceButton.module.css";
diff --git a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx b/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx
index 0a29261f909..dcd5056cd80 100644
--- a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx
@@ -1,9 +1,9 @@
import cx from "classnames";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { toggleTemplateTagsEditor } from "metabase/query_builder/actions";
import { Box, Icon, Tooltip } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import NativeVariablesButtonS from "./NativeVariablesButton.module.css";
diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsx b/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsx
index b119c1ef000..fe46893db65 100644
--- a/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsx
+++ b/frontend/src/metabase/query_builder/components/view/PreviewQueryModal/PreviewQueryModal.tsx
@@ -1,13 +1,13 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import {
getNextRunParameters,
getQuestion,
} from "metabase/query_builder/selectors";
import { NativeQueryPreview } from "metabase/querying/notebook/components/NativeQueryPreview";
import { Modal } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
export const PreviewQueryModal = ({
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx
index 50f52f8baee..f3e2a5f6eb3 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx
@@ -12,7 +12,6 @@ import { formatRowCount } from "metabase/common/utils/format-row-count";
import { getRowCountMessage } from "metabase/common/utils/get-row-count-message";
import CS from "metabase/css/core/index.css";
import { Databases } from "metabase/entities/databases";
-import { connect } from "metabase/lib/redux";
import { setLimit } from "metabase/query_builder/actions";
import { LimitPopover } from "metabase/query_builder/components/LimitPopover";
import {
@@ -21,6 +20,7 @@ import {
getQuestion,
} from "metabase/query_builder/selectors";
import { Box, Popover, UnstyledButton } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import type { Limit } from "metabase-lib";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx
index a46c80a61b9..0b0cbc90f0b 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.unit.spec.tsx
@@ -12,8 +12,8 @@ import {
screen,
waitFor,
} from "__support__/ui";
-import { formatNumber } from "metabase/lib/formatting";
-import { checkNotNull } from "metabase/lib/types";
+import { formatNumber } from "metabase/utils/formatting";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
index 55a51fe583b..a227ebfd1ac 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
@@ -2,13 +2,13 @@ import { t } from "ttag";
import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen";
import { ViewFooterButton } from "metabase/common/components/ViewFooterButton";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getUiControls } from "metabase/query_builder/selectors";
import {
onCloseTimelines,
onOpenTimelines,
} from "metabase/redux/query-builder";
import { Indicator } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { trackEventsClicked } from "./analytics";
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.ts b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.ts
index 85cc28d1277..4839f94b61f 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.ts
+++ b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackEventsClicked = () =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx
index 8895dad53d1..b224a4713c4 100644
--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx
@@ -5,7 +5,6 @@ import { ResizableBox } from "react-resizable";
import { useWindowSize } from "react-use";
import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { setNotebookNativePreviewSidebarWidth } from "metabase/query_builder/actions";
import { getUiControls } from "metabase/query_builder/selectors";
import {
@@ -14,6 +13,7 @@ import {
} from "metabase/querying/notebook/components/Notebook";
import { setUIControls } from "metabase/redux/query-builder";
import { Box, Flex, rem } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { canShowNativePreview } from "../../ViewHeader/utils";
diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
index 3089ea0b6f0..9db7086e5db 100644
--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookNativePreview.tsx
@@ -1,11 +1,11 @@
import { useCallback } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { updateQuestion } from "metabase/query_builder/actions";
import { getQuestion } from "metabase/query_builder/selectors";
import { NotebookNativePreview as ControlledNotebookNativePreview } from "metabase/querying/notebook/components/NotebookNativePreview";
import { setUIControls } from "metabase/redux/query-builder";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
export const NotebookNativePreview = () => {
diff --git a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx b/frontend/src/metabase/query_builder/components/view/View/View/View.jsx
index 31a5cc7ab26..770fa1fa8fa 100644
--- a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx
+++ b/frontend/src/metabase/query_builder/components/view/View/View/View.jsx
@@ -14,7 +14,6 @@ import CS from "metabase/css/core/index.css";
import QueryBuilderS from "metabase/css/query_builder.module.css";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Questions } from "metabase/entities/questions";
-import { connect } from "metabase/lib/redux";
import {
rememberLastUsedDatabase,
runOrCancelQuestionOrSelectedQuery,
@@ -23,6 +22,7 @@ import {
import { SIDEBAR_SIZES } from "metabase/query_builder/constants";
import { MetricEditor } from "metabase/querying/metrics/components/MetricEditor";
import { Flex } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { DatasetEditor } from "../../../DatasetEditor";
diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx
index 3de06fc388a..5deab1437b2 100644
--- a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx
@@ -1,6 +1,5 @@
import type { ResizableBoxProps } from "react-resizable";
-import { useSelector } from "metabase/lib/redux";
import { useInlineSQLPrompt } from "metabase/metabot/components/MetabotInlineSQLPrompt";
import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";
import { getHighlightedNativeQueryLineNumbers } from "metabase/query_builder/selectors";
@@ -10,6 +9,7 @@ import type {
SidebarFeatures,
} from "metabase/querying/editor/types";
import { Box } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx
index 41d0b766d35..6e2aacf7569 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/CenterViewFooterButtonGroup.tsx
@@ -1,7 +1,7 @@
import CS from "metabase/css/core/index.css";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getUiControls } from "metabase/query_builder/selectors";
import { setUIControls } from "metabase/redux/query-builder";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { QuestionDisplayToggle } from "../QuestionDisplayToggle/QuestionDisplayToggle";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
index 4143988b411..41ddc97af40 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import { ButtonGroup } from "metabase/common/components/ButtonGroup";
import { ViewButton } from "metabase/common/components/ViewButton";
import CS from "metabase/css/core/index.css";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { getQuestion, getUiControls } from "metabase/query_builder/selectors";
import {
@@ -14,6 +13,7 @@ import {
onOpenChartType,
} from "metabase/redux/query-builder";
import { Group } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { QueryBuilderUIControls } from "metabase-types/store";
import S from "./LeftViewFooterButtonGroup.module.css";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx
index 6faa08de9cd..561a556f87a 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/RightViewFooterButtonGroup.tsx
@@ -1,7 +1,6 @@
import cx from "classnames";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { ViewFooterDownloadWidget } from "metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget";
import {
getFirstQueryResult,
@@ -9,6 +8,7 @@ import {
} from "metabase/query_builder/selectors";
import { getIsObjectDetail } from "metabase/query_builder/selectors/mode";
import { Group } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { ExecutionTime } from "../ExecutionTime";
import { QuestionLastUpdated } from "../QuestionLastUpdated/QuestionLastUpdated";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsx
index c57e0fcb32a..4da8ed09949 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooter.tsx
@@ -1,13 +1,13 @@
import cx from "classnames";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import {
getFirstQueryResult,
getIsVisualized,
getQuestion,
} from "metabase/query_builder/selectors";
import { Box, Group } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { ViewSection } from "../ViewSection";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
index 81f19374ef7..f3c465d017c 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/ViewFooterDownloadWidget.tsx
@@ -1,13 +1,13 @@
import cx from "classnames";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { QuestionDownloadPopover } from "metabase/query_builder/components/QuestionDownloadPopover";
import {
getFirstQueryResult,
getQuestion,
getVisualizationSettings,
} from "metabase/query_builder/selectors";
+import { useSelector } from "metabase/utils/redux";
export const ViewFooterDownloadWidget = () => {
const question = useSelector(getQuestion);
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js
index fd2f56723b8..89ddafd8f1b 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.unit.spec.js
@@ -7,8 +7,8 @@ import { setupTableEndpoints } from "__support__/server-mocks";
import { setupGetUserKeyValueEndpoint } from "__support__/server-mocks/user-key-value";
import { createMockEntitiesState } from "__support__/store";
import { fireEvent, renderWithProviders, screen } from "__support__/ui";
-import MetabaseSettings from "metabase/lib/settings";
import { getMetadata } from "metabase/selectors/metadata";
+import MetabaseSettings from "metabase/utils/settings";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import { COMMON_DATABASE_FEATURES } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
index 6b61459676e..d872f5ee85e 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/FilterHeaderButton.tsx
@@ -3,13 +3,13 @@ import cx from "classnames";
import { useMemo } from "react";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { updateQuestion } from "metabase/query_builder/actions";
import { getFilterItems } from "metabase/querying/filters/components/FilterPanel/utils";
import { MultiStageFilterPicker } from "metabase/querying/filters/components/FilterPicker/MultiStageFilterPicker";
import type { FilterChangeOpts } from "metabase/querying/filters/components/FilterPicker/types";
import { Button, Icon, Popover, Tooltip } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { QueryBuilderMode } from "metabase-types/store";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx
index 0ea8c7f3f9f..6056ee38166 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderCollectionBadge/HeaderCollectionBadge.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
index d85b2efc14d..934c0ac9943 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
@@ -3,11 +3,11 @@ import { Link } from "react-router";
import { t } from "ttag";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getParentEntity } from "metabase/query_builder/selectors";
import { navigateBackToDashboard } from "metabase/redux/query-builder";
import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { CollectionItemModel, DashboardId } from "metabase-types/api";
import S from "./QueryBuilderBackButton.module.css";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
index 57d0df8b15a..8ddfd2fdb27 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
@@ -5,13 +5,13 @@ import { t } from "ttag";
import { BookmarkToggle } from "metabase/common/components/BookmarkToggle";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { UploadInput } from "metabase/common/components/upload";
-import { useDispatch } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { runQuestionQuery } from "metabase/query_builder/actions";
import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";
import type { QueryModalType } from "metabase/querying/constants";
import { uploadFile } from "metabase/redux/uploads";
import { Box, Divider, Icon, Menu } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type { DatasetEditorTab, QueryBuilderMode } from "metabase-types/store";
import { UploadMode } from "metabase-types/store/upload";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
index a572bede92f..2b89cba3f10 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
@@ -5,7 +5,6 @@ import _ from "underscore";
import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { PLUGIN_MODERATION } from "metabase/plugins";
import {
@@ -21,6 +20,7 @@ import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
import { onOpenQuestionSettings } from "metabase/redux/query-builder";
import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";
import { Icon, Menu } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import { checkCanBeModel } from "metabase-lib/v1/metadata/utils/models";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.js b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.js
index 4100b0a713f..d77f8c792b7 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.js
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.unit.spec.js
@@ -7,8 +7,8 @@ import {
setupTableEndpoints,
} from "__support__/server-mocks";
import { getIcon, renderWithProviders, screen } from "__support__/ui";
-import { deserializeCardFromUrl } from "metabase/lib/card";
-import * as Urls from "metabase/lib/urls";
+import { deserializeCardFromUrl } from "metabase/utils/card";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import { SAMPLE_METADATA } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx
index e426345948f..ee3f0f080a2 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx
@@ -2,8 +2,8 @@ import type { ReactElement } from "react";
import { t } from "ttag";
import { skipToken, useGetCollectionQuery } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { Tooltip } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import { HeadBreadcrumbs } from "../HeaderBreadcrumbs/HeaderBreadcrumbs";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx
index c593a04a9a9..94e462ce86e 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceQuestionBreadcrumbs.tsx
@@ -1,8 +1,8 @@
import { type ReactElement, useMemo } from "react";
import { skipToken, useGetCardQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx
index 2c1084d02f9..4c6a5efd127 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx
@@ -2,7 +2,7 @@ import type { ReactElement } from "react";
import { skipToken, useGetTableQuery } from "metabase/api";
import { TableInfoIcon } from "metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx
index aff55e75bea..55ea130a24b 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx
@@ -1,10 +1,10 @@
import { type ReactElement, isValidElement } from "react";
import { TableInfoIcon } from "metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon";
-import { getIcon } from "metabase/lib/icon";
-import { isNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { isNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type Table from "metabase-lib/v1/metadata/Table";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.unit.spec.tsx
index 8b21525eab3..b9a768ff425 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionFiltersHeader/QuestionFiltersHeader.unit.spec.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
import { createMockMetadata } from "__support__/metadata";
import { setupFieldValuesEndpoint } from "__support__/server-mocks";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts
index e8ac997d5fd..bfc12c8227d 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/hooks.ts
@@ -1,5 +1,5 @@
-import { useSelector } from "metabase/lib/redux";
import { getMetadataUnfiltered } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
index ebe913605c4..a53d60a33da 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ToggleNativeQueryPreview/ToggleNativeQueryPreview.tsx
@@ -1,11 +1,11 @@
import { t } from "ttag";
-import { getEngineNativeType } from "metabase/lib/engine";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { getEngineNativeType } from "metabase/databases/utils/engine";
import { trackNotebookNativePreviewShown } from "metabase/query_builder/analytics";
import { getUiControls } from "metabase/query_builder/selectors";
import { setUIControls } from "metabase/redux/query-builder";
import { ActionIcon, Icon, Tooltip } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import { canShowNativePreview } from "../../utils";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
index 8cc27d68e71..34183985d00 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
@@ -4,9 +4,6 @@ import { useCallback } from "react";
import { t } from "ttag";
import { QuestionSharingMenu } from "metabase/embedding/components/SharingMenu";
-import { SERVER_ERROR_TYPES } from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
import { AIQuestionAnalysisButton } from "metabase/metabot/components/AIQuestionAnalysisButton";
import { canAnalyzeQuestion } from "metabase/metabot/utils/chart-analysis";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
@@ -15,6 +12,9 @@ import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualiz
import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
import { getUserCanWriteToCollections } from "metabase/selectors/user";
import { Box, Button, Flex, Tooltip } from "metabase/ui";
+import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
index e09b4d8c63f..a029e7ae9ed 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import CS from "metabase/css/core/index.css";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { onReplaceAllVisualizationSettings } from "metabase/query_builder/actions";
import {
getUiControls,
@@ -14,6 +13,7 @@ import {
onCloseChartSettings,
onOpenChartType,
} from "metabase/redux/query-builder";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import visualizations from "metabase/visualizations";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx
index 7bfd253745d..75de821c33f 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
import { updateQuestion } from "metabase/query_builder/actions";
import {
ChartTypeSettings,
@@ -18,6 +17,7 @@ import {
onOpenChartSettings,
setUIControls,
} from "metabase/redux/query-builder";
+import { useDispatch } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { CardDisplayType } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.unit.spec.tsx
index 15f64f770a6..fd0dd24ebd5 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.unit.spec.tsx
@@ -9,7 +9,7 @@ import {
screen,
waitFor,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { ModelCacheRefreshStatus } from "metabase-types/api";
import { getMockModelCacheInfo } from "metabase-types/api/mocks";
import {
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx
index 2f79976b30b..2c754afe62b 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx
@@ -9,9 +9,9 @@ import { Link } from "metabase/common/components/Link";
import { SidesheetCardSection } from "metabase/common/components/Sidesheet";
import Styles from "metabase/css/core/index.css";
import { QuestionPublicLinkPopover } from "metabase/embedding/components/PublicLinkPopover";
-import * as Urls from "metabase/lib/urls";
-import { getUserName } from "metabase/lib/user";
import { Box, Flex, FixedSizeIcon as Icon, Loader, Text } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
+import { getUserName } from "metabase/utils/user";
import type Question from "metabase-lib/v1/Question";
import SidebarStyles from "./QuestionInfoSidebar.module.css";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
index f36a4217be8..96efd9813c9 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx
@@ -16,12 +16,12 @@ import { InsightsTabOrLink } from "metabase/common/components/Sidesheet/componen
import { SidesheetEditableDescription } from "metabase/common/components/Sidesheet/components/SidesheetEditableDescription";
import SidesheetStyles from "metabase/common/components/Sidesheet/sidesheet.module.css";
import { InsightsUpsellTab } from "metabase/common/components/upsells/InsightsUpsellTab";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { QuestionActivityTimeline } from "metabase/query_builder/components/QuestionActivityTimeline";
import { onCloseQuestionInfo } from "metabase/redux/query-builder";
import { Flex, Icon, Stack, Tabs } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import { QuestionDetails } from "./QuestionDetails";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx
index a5ada2124c5..1a6f38321dc 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { useListCardsQuery } from "metabase/api";
import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { getIcon } from "metabase/lib/icon";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
import { Group, Icon, Repeat, Skeleton, Stack, Text } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import * as Urls from "metabase/utils/urls";
import type Question from "metabase-lib/v1/Question";
import { ToggleFullList } from "./ToggleFullList";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
index 2431f7c9291..40ea0bae426 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.unit.spec.tsx
@@ -14,7 +14,7 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { TYPE } from "metabase-lib/v1/types/constants";
import * as ML_Urls from "metabase-lib/v1/urls";
import type { Card, Collection, Database, Settings } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx
index 28df2bc9d40..d2e97d0ca0c 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx
@@ -3,10 +3,10 @@ import { c } from "ttag";
import { Link } from "metabase/common/components/Link";
import { SidesheetCardSection } from "metabase/common/components/Sidesheet";
-import { getIcon } from "metabase/lib/icon";
-import { useSelector } from "metabase/lib/redux";
import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";
import { Flex, FixedSizeIcon as Icon } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
+import { useSelector } from "metabase/utils/redux";
import { getDataSourceParts } from "../../../ViewHeader/components/QuestionDataSource/utils";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
index 1a51a18852f..5eb3cbd77f3 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.unit.spec.tsx
@@ -4,7 +4,7 @@ import _ from "underscore";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { modelIconMap } from "metabase/lib/icon";
+import { modelIconMap } from "metabase/utils/icon";
import { convertSavedQuestionToVirtualTable } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { Card, NormalizedTable } from "metabase-types/api";
import { createMockCard, createMockSettings } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx
index f4fe562d034..214440619ca 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx
@@ -2,9 +2,9 @@ import { useMemo } from "react";
import { t } from "ttag";
import { Link } from "metabase/common/components/Link";
-import { useSelector } from "metabase/lib/redux";
import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";
import { Flex, Icon, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { ToggleFullList } from "./ToggleFullList";
import { useExpandableList } from "./hooks";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.ts b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.ts
index d32437646fb..0e5bb494d83 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.ts
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/types.ts
@@ -1,4 +1,4 @@
-import type { IconData } from "metabase/lib/icon";
+import type { IconData } from "metabase/utils/icon";
import type { SearchModel } from "metabase-types/api";
export interface QuestionSource {
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsx
index ab5739f13fb..dc5697ced5d 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/utils.tsx
@@ -1,5 +1,5 @@
-import { getIcon } from "metabase/lib/icon";
import { getUrl } from "metabase/querying/notebook/components/NotebookDataPicker/utils";
+import { getIcon } from "metabase/utils/icon";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx
index b397966c776..e813c8c8024 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/common.unit.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
import { testDataset } from "__support__/testDataset";
import { screen, within } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import type { BaseEntityId } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
index 1628d3fc6ee..8f4bfacafb0 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/tests/setup.tsx
@@ -13,8 +13,8 @@ import { setupPerformanceEndpoints } from "__support__/server-mocks/performance"
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getQuestion } from "metabase/query_builder/selectors";
+import { checkNotNull } from "metabase/utils/types";
import type { Card, Settings, User } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx
index 85cea0672cc..a124ec97fca 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx
@@ -4,10 +4,10 @@ import { t } from "ttag";
import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";
-import { useDispatch } from "metabase/lib/redux";
import { PLUGIN_CACHING, PLUGIN_MODEL_PERSISTENCE } from "metabase/plugins";
import { onCloseQuestionSettings } from "metabase/redux/query-builder";
import { Stack, useModalsStack } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import { ModelCacheManagementSection } from "../ModelCacheManagementSection";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx
index 3d2c116e6ef..e0b3b7f95a1 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/tests/setup.tsx
@@ -10,8 +10,8 @@ import { setupModelPersistenceEndpoints } from "__support__/server-mocks/persist
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import type { Card, Settings } from "metabase-types/api";
import {
COMMON_DATABASE_FEATURES,
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx
index a5925f0a268..cc7ec3de664 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx
@@ -4,13 +4,13 @@ import { t } from "ttag";
import { Input } from "metabase/common/components/Input";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
-import { isNotNull } from "metabase/lib/types";
import {
type UpdateQueryHookProps,
useBreakoutQueryHandlers,
} from "metabase/query_builder/hooks";
import { Box, DelayGroup } from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import BreakoutColumnListS from "./BreakoutColumnList.module.css";
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
index cc93ebd5cb0..6b1d39ba694 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx
@@ -18,7 +18,6 @@ import { useWebNotification } from "metabase/common/hooks/use-web-notification";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Timelines } from "metabase/entities/timelines";
import { usePageTitleWithLoadingTime } from "metabase/hooks/use-page-title";
-import { connect, useSelector } from "metabase/lib/redux";
import { VISUALIZATION_SLOW_TIMEOUT } from "metabase/querying/constants";
import {
getDatabasesList,
@@ -55,6 +54,7 @@ import {
getUser,
getUserIsAdmin,
} from "metabase/selectors/user";
+import { connect, useSelector } from "metabase/utils/redux";
import type {
BookmarkId,
Bookmark as BookmarkType,
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.tsx
index dc9a35d282b..9d148ddd733 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
@@ -15,7 +15,7 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { serializeCardForUrl } from "metabase/lib/card";
+import { serializeCardForUrl } from "metabase/utils/card";
import registerVisualizations from "metabase/visualizations/register";
import {
createMockCardQueryMetadata,
diff --git a/frontend/src/metabase/query_builder/containers/test-utils.tsx b/frontend/src/metabase/query_builder/containers/test-utils.tsx
index ee2594459e3..7cdd95710be 100644
--- a/frontend/src/metabase/query_builder/containers/test-utils.tsx
+++ b/frontend/src/metabase/query_builder/containers/test-utils.tsx
@@ -35,9 +35,9 @@ import {
} from "__support__/ui";
import { NewItemMenu } from "metabase/common/components/NewItemMenu";
import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";
-import { serializeCardForUrl } from "metabase/lib/card";
-import { checkNotNull } from "metabase/lib/types";
import NewModelOptions from "metabase/models/containers/NewModelOptions";
+import { serializeCardForUrl } from "metabase/utils/card";
+import { checkNotNull } from "metabase/utils/types";
import type { Card, Dataset, UnsavedCard } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/query_builder/containers/use-create-question.ts b/frontend/src/metabase/query_builder/containers/use-create-question.ts
index 5ca5ba0fda2..64e9e4e8f58 100644
--- a/frontend/src/metabase/query_builder/containers/use-create-question.ts
+++ b/frontend/src/metabase/query_builder/containers/use-create-question.ts
@@ -1,9 +1,9 @@
import { useCallback } from "react";
import type { ScheduleCallback } from "metabase/common/hooks/use-callback-effect";
-import { useDispatch } from "metabase/lib/redux";
import { apiCreateQuestion } from "metabase/query_builder/actions";
import { setUIControls } from "metabase/redux/query-builder";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type { DashboardTabId } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/containers/use-save-question.ts b/frontend/src/metabase/query_builder/containers/use-save-question.ts
index 00e14310a13..c4b860321cf 100644
--- a/frontend/src/metabase/query_builder/containers/use-save-question.ts
+++ b/frontend/src/metabase/query_builder/containers/use-save-question.ts
@@ -1,8 +1,8 @@
import { useCallback } from "react";
import type { ScheduleCallback } from "metabase/common/hooks/use-callback-effect";
-import { useDispatch } from "metabase/lib/redux";
import { setUIControls } from "metabase/redux/query-builder";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import { apiUpdateQuestion } from "../actions/core/core";
diff --git a/frontend/src/metabase/query_builder/hooks/use-sync-url-parameters.ts b/frontend/src/metabase/query_builder/hooks/use-sync-url-parameters.ts
index 633754c968f..c11c96f90d5 100644
--- a/frontend/src/metabase/query_builder/hooks/use-sync-url-parameters.ts
+++ b/frontend/src/metabase/query_builder/hooks/use-sync-url-parameters.ts
@@ -2,7 +2,7 @@ import querystring from "querystring";
import { useEffect, useMemo } from "react";
-import { IS_EMBED_PREVIEW } from "metabase/lib/embed";
+import { IS_EMBED_PREVIEW } from "metabase/utils/embed";
import { getParameterValuesBySlug } from "metabase-lib/v1/parameters/utils/parameter-values";
import type { Parameter } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/reducers.ts b/frontend/src/metabase/query_builder/reducers.ts
index 367a81384df..9a5afd56175 100644
--- a/frontend/src/metabase/query_builder/reducers.ts
+++ b/frontend/src/metabase/query_builder/reducers.ts
@@ -9,8 +9,6 @@ import {
updateCardEnableEmbedding,
} from "metabase/api";
import { TimelineEvents } from "metabase/entities/timeline-events";
-import type { Deferred } from "metabase/lib/promise";
-import { copy } from "metabase/lib/utils";
import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";
import {
API_UPDATE_QUESTION,
@@ -50,6 +48,8 @@ import {
SOFT_RELOAD_CARD,
ZOOM_IN_ROW,
} from "metabase/redux/query-builder";
+import { clone } from "metabase/utils/clone";
+import type { Deferred } from "metabase/utils/promise";
import type {
Card,
CollectionItemModel,
@@ -409,24 +409,24 @@ export const originalCard = createReducer<Card | null>(null, (builder) => {
.addCase<string, { type: string; payload: { originalCard?: Card } }>(
INITIALIZE_QB,
(_state, action) =>
- action.payload.originalCard ? copy(action.payload.originalCard) : null,
+ action.payload.originalCard ? clone(action.payload.originalCard) : null,
)
.addCase<string, { type: string; payload: Card }>(
RELOAD_CARD,
- (_state, action) => (action.payload.id ? copy(action.payload) : null),
+ (_state, action) => (action.payload.id ? clone(action.payload) : null),
)
.addCase<string, { type: string; payload: { originalCard?: Card } }>(
SET_CARD_AND_RUN,
(_state, action) =>
- action.payload.originalCard ? copy(action.payload.originalCard) : null,
+ action.payload.originalCard ? clone(action.payload.originalCard) : null,
)
.addCase<string, { type: string; payload: Card }>(
API_CREATE_QUESTION,
- (_state, action) => copy(action.payload),
+ (_state, action) => clone(action.payload),
)
.addCase<string, { type: string; payload: Card }>(
API_UPDATE_QUESTION,
- (_state, action) => copy(action.payload),
+ (_state, action) => clone(action.payload),
);
});
diff --git a/frontend/src/metabase/query_builder/selectors.ts b/frontend/src/metabase/query_builder/selectors.ts
index ace265807ea..6f3db2d47d2 100644
--- a/frontend/src/metabase/query_builder/selectors.ts
+++ b/frontend/src/metabase/query_builder/selectors.ts
@@ -6,11 +6,9 @@ import { merge, updateIn } from "icepick";
import _ from "underscore";
import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";
+import { getSortedTimelines } from "metabase/common/utils/timelines";
import { cleanIndexFlags } from "metabase/entities/model-indexes/actions";
import { Timelines } from "metabase/entities/timelines";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import { getSortedTimelines } from "metabase/lib/timelines";
-import { isNotNull } from "metabase/lib/types";
import {
isQuestionDirty,
isQuestionRunnable,
@@ -22,6 +20,8 @@ import {
} from "metabase/selectors/embed";
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
+import { isNotNull } from "metabase/utils/types";
import {
extractRemappings,
getVisualizationTransformed,
diff --git a/frontend/src/metabase/query_builder/utils/index.ts b/frontend/src/metabase/query_builder/utils/index.ts
index 89c8589ef48..f8c6dcb8a3f 100644
--- a/frontend/src/metabase/query_builder/utils/index.ts
+++ b/frontend/src/metabase/query_builder/utils/index.ts
@@ -3,8 +3,8 @@ import querystring from "querystring";
import type { Location } from "history";
import _ from "underscore";
-import { serializeCardForUrl } from "metabase/lib/card";
-import * as Urls from "metabase/lib/urls";
+import { serializeCardForUrl } from "metabase/utils/card";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { Card, Field, Series } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts b/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts
index 9473ce4799c..bd3e93e6e78 100644
--- a/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/utils/utils.unit.spec.ts
@@ -1,7 +1,7 @@
import { createMockMetadata } from "__support__/metadata";
import { getNextId } from "__support__/utils";
-import { serializeCardForUrl } from "metabase/lib/card";
-import { checkNotNull } from "metabase/lib/types";
+import { serializeCardForUrl } from "metabase/utils/card";
+import { checkNotNull } from "metabase/utils/types";
import type Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/querying/analytics.ts b/frontend/src/metabase/querying/analytics.ts
index 56d22e12d9a..92a8e9097a0 100644
--- a/frontend/src/metabase/querying/analytics.ts
+++ b/frontend/src/metabase/querying/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.tsx b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.tsx
index c87c7793800..7c7f02c9f9e 100644
--- a/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.tsx
+++ b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.tsx
@@ -1,8 +1,8 @@
import type { ChangeEvent, FocusEvent, Ref } from "react";
import { forwardRef, useLayoutEffect, useState } from "react";
-import { type NumberValue, parseNumber } from "metabase/lib/number";
import { TextInput, type TextInputProps } from "metabase/ui";
+import { type NumberValue, parseNumber } from "metabase/utils/number";
type BigIntNumberInputProps = Omit<TextInputProps, "value" | "onChange"> & {
value: NumberValue | null;
diff --git a/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.unit.spec.tsx b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.unit.spec.tsx
index 4a0744063ed..0427223d3b4 100644
--- a/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
-import type { NumberValue } from "metabase/lib/number";
+import type { NumberValue } from "metabase/utils/number";
import { BigIntNumberInput } from "./BigIntNumberInput";
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx
index df138a394c8..ee4028102a3 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsx
@@ -8,9 +8,9 @@ import { type ComponentProps, useEffect } from "react";
import { getStore } from "__support__/entities-store";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { publicReducers } from "metabase/reducers-public";
import { Box, Popover } from "metabase/ui";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx
index 50457f28188..6f218ef0c0f 100644
--- a/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { render, screen } from "__support__/ui";
-import { setLocalization } from "metabase/lib/i18n";
+import { setLocalization } from "metabase/utils/i18n";
import { DateRangePickerBody } from "./DateRangePickerBody";
diff --git a/frontend/src/metabase/querying/common/utils/dates.ts b/frontend/src/metabase/querying/common/utils/dates.ts
index c45de1f45f5..b9a53066181 100644
--- a/frontend/src/metabase/querying/common/utils/dates.ts
+++ b/frontend/src/metabase/querying/common/utils/dates.ts
@@ -2,11 +2,11 @@ import dayjs from "dayjs";
import { match } from "ts-pattern";
import { c, msgid, ngettext, t } from "ttag";
-import { DEFAULT_TIME_STYLE } from "metabase/lib/formatting/datetime-utils";
import type {
DateFilterDisplayOpts,
DateFilterValue,
} from "metabase/querying/common/types";
+import { DEFAULT_TIME_STYLE } from "metabase/utils/formatting/datetime-utils";
import type { ExcludeDateFilterUnit } from "metabase-lib";
import * as Lib from "metabase-lib";
import type { DateFormattingSettings } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.tsx
index e3b59e30b93..7db61d6504e 100644
--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.tsx
+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.tsx
@@ -14,8 +14,8 @@ import {
CodeMirror,
type CodeMirrorRef,
} from "metabase/common/components/CodeMirror";
-import { isEventOverElement } from "metabase/lib/dom";
import { useUserMetabotPermissions } from "metabase/metabot/hooks";
+import { isEventOverElement } from "metabase/utils/dom";
import * as Lib from "metabase-lib";
import type { CardId } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsx
index d8d41f0bbc3..36d4215032f 100644
--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsx
+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsx
@@ -10,7 +10,7 @@ import {
useListSnippetsQuery,
} from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { Card, CardId, DatabaseId, Field } from "metabase-types/api";
import { source } from "./language";
diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx
index a2b9ccf974b..4d57a62a2d6 100644
--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx
@@ -7,7 +7,7 @@ import fetchMock from "fetch-mock";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, waitFor } from "__support__/ui";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type {
AutocompleteMatchStyle,
AutocompleteSuggestion,
diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/extensions.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/extensions.tsx
index 4e02357f30a..afc06dfadd0 100644
--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/extensions.tsx
+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/extensions.tsx
@@ -10,7 +10,7 @@ import {
import cx from "classnames";
import { useMemo } from "react";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import S from "./CodeMirrorEditor.module.css";
diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/util.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/util.tsx
index 008cf1b8c2e..e06529f44d6 100644
--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/util.tsx
+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/util.tsx
@@ -3,9 +3,9 @@ import { createSelector } from "@reduxjs/toolkit";
import { shallowEqual } from "react-redux";
import { t } from "ttag";
-import { METAKEY } from "metabase/lib/browser";
-import { getEngineNativeType } from "metabase/lib/engine";
-import { isNotNull } from "metabase/lib/types";
+import { getEngineNativeType } from "metabase/databases/utils/engine";
+import { METAKEY } from "metabase/utils/browser";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type { CardId, CardType } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/components/DataReference/DatabasePane.unit.spec.tsx b/frontend/src/metabase/querying/components/DataReference/DatabasePane.unit.spec.tsx
index 938b23c199c..d59b0603623 100644
--- a/frontend/src/metabase/querying/components/DataReference/DatabasePane.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/DatabasePane.unit.spec.tsx
@@ -11,7 +11,7 @@ import {
waitForLoaderToBeRemoved,
} from "__support__/ui";
import { getNextId } from "__support__/utils";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import {
createMockCollection,
createMockDatabase,
diff --git a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx
index cb0948fe494..3b054aca139 100644
--- a/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx
@@ -14,9 +14,9 @@ import {
EmptyDescription,
} from "metabase/common/components/MetadataInfo/MetadataInfo";
import { SidebarContent } from "metabase/common/components/SidebarContent";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Flex, Icon, type IconName } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import * as ML_Urls from "metabase-lib/v1/urls";
diff --git a/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsx b/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsx
index 2612ed472e1..b937b396fef 100644
--- a/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { useAsyncFn } from "react-use";
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type Table from "metabase-lib/v1/metadata/Table";
type OwnProps = {
diff --git a/frontend/src/metabase/querying/components/DataReference/TablePane.tsx b/frontend/src/metabase/querying/components/DataReference/TablePane.tsx
index 21c29f7144c..6ecbcf033b3 100644
--- a/frontend/src/metabase/querying/components/DataReference/TablePane.tsx
+++ b/frontend/src/metabase/querying/components/DataReference/TablePane.tsx
@@ -8,8 +8,8 @@ import {
} from "metabase/common/components/MetadataInfo/MetadataInfo";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import { isConcreteTableId } from "metabase-types/api";
import { ConnectedTableList } from "./ConnectedTableList";
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx
index afdb8565e35..5fb41424294 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx
@@ -9,11 +9,11 @@ import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { Warnings } from "metabase/common/components/Warnings";
import CS from "metabase/css/core/index.css";
import QueryBuilderS from "metabase/css/query_builder.module.css";
-import { isMac } from "metabase/lib/browser";
-import { SERVER_ERROR_TYPES } from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
import { getWhiteLabeledLoadingMessageFactory } from "metabase/selectors/whitelabel";
import { Box, Flex, Stack, Text, Title } from "metabase/ui";
+import { isMac } from "metabase/utils/browser";
+import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/RunButtonWithTooltip.jsx b/frontend/src/metabase/querying/components/QueryVisualization/RunButtonWithTooltip.jsx
index e885d9ca196..b5401c3be5a 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/RunButtonWithTooltip.jsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/RunButtonWithTooltip.jsx
@@ -1,8 +1,8 @@
/* eslint-disable react/prop-types */
import { t } from "ttag";
-import { duration } from "metabase/lib/formatting";
import { Tooltip } from "metabase/ui";
+import { duration } from "metabase/utils/formatting";
import { RunButton } from "./RunButton";
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx
index 82d948a8dca..2ed404d2520 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx
@@ -8,12 +8,12 @@ import { ErrorMessage } from "metabase/common/components/ErrorMessage";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import CS from "metabase/css/core/index.css";
import QueryBuilderS from "metabase/css/query_builder.module.css";
-import { getEngineNativeType } from "metabase/lib/engine";
-import { useSelector } from "metabase/lib/redux";
+import { getEngineNativeType } from "metabase/databases/utils/engine";
import { FixSqlQueryButton } from "metabase/metabot/components/FixSqlQueryButton";
import { getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Box, Center, Flex, Icon } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { DatasetError, DatasetErrorType } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx
index bdbe0f13424..15d2c74bd1c 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsx
@@ -4,7 +4,7 @@ import { setupUserMetabotPermissionsEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Card, Database, TokenFeatures } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx
index d6f2200c411..1486a6c5fd0 100644
--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx
+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx
@@ -11,7 +11,6 @@ import CS from "metabase/css/core/index.css";
import { Search } from "metabase/entities/search";
import { SnippetCollections } from "metabase/entities/snippet-collections";
import { Snippets } from "metabase/entities/snippets";
-import { connect } from "metabase/lib/redux";
import {
PLUGIN_REMOTE_SYNC,
PLUGIN_SNIPPET_SIDEBAR_HEADER_BUTTONS,
@@ -20,6 +19,7 @@ import {
PLUGIN_SNIPPET_SIDEBAR_ROW_RENDERERS,
} from "metabase/plugins";
import { Box, Button, Flex, Icon, Menu } from "metabase/ui";
+import { connect } from "metabase/utils/redux";
import { SnippetRow } from "./SnippetRow";
import S from "./SnippetSidebar.module.css";
diff --git a/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx
index 660746e35df..2d3cd15bc85 100644
--- a/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx
+++ b/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsx
@@ -2,8 +2,8 @@ import type { FormEventHandler } from "react";
import { useState } from "react";
import { jt, t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
import { Box, Button, Flex, Icon, Stack } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { ExpressionWidgetHeader } from "../ExpressionWidget/ExpressionWidgetHeader";
diff --git a/frontend/src/metabase/querying/components/expressions/CombineColumns/util.ts b/frontend/src/metabase/querying/components/expressions/CombineColumns/util.ts
index c70355a468b..960a3f0e569 100644
--- a/frontend/src/metabase/querying/components/expressions/CombineColumns/util.ts
+++ b/frontend/src/metabase/querying/components/expressions/CombineColumns/util.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
export type ColumnAndSeparator = {
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
index 9333a06cbd5..fda8112aee6 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsx
@@ -11,7 +11,6 @@ import {
CodeMirror,
type CodeMirrorRef,
} from "metabase/common/components/CodeMirror";
-import { useSelector } from "metabase/lib/redux";
import {
type DefinedClauseName,
type ExpressionError,
@@ -23,6 +22,7 @@ import { tokenAtPos } from "metabase/querying/expressions";
import { COMMA, GROUP } from "metabase/querying/expressions/pratt";
import { getMetadata } from "metabase/selectors/metadata";
import { Button, Tooltip as ButtonTooltip, Flex, Icon } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx
index 6e930096428..b268e100338 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx
+++ b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx
@@ -2,8 +2,8 @@ import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { createMockMetadata } from "__support__/metadata";
import { mockSettings } from "__support__/settings";
import { renderWithProviders } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getHelpText } from "metabase/querying/expressions";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
DEFAULT_TEST_QUERY,
diff --git a/frontend/src/metabase/querying/components/expressions/Editor/extensions.ts b/frontend/src/metabase/querying/components/expressions/Editor/extensions.ts
index fe31cf91b15..2abfc09030b 100644
--- a/frontend/src/metabase/querying/components/expressions/Editor/extensions.ts
+++ b/frontend/src/metabase/querying/components/expressions/Editor/extensions.ts
@@ -2,8 +2,8 @@ import type { Extension } from "@codemirror/state";
import { EditorView, tooltips } from "@codemirror/view";
import { useMemo } from "react";
-import { isNotNull } from "metabase/lib/types";
import { suggestions } from "metabase/querying/expressions";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx
index fe4129bbe75..654f5080688 100644
--- a/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx
+++ b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsx
@@ -2,12 +2,12 @@ import type { ReactNode } from "react";
import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
import type {
DefinedClauseName,
ExpressionError,
} from "metabase/querying/expressions";
import { Box, Button, Flex } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsx b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsx
index 7e814c2d3ec..d9b43d79d3b 100644
--- a/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsx
+++ b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsx
@@ -11,10 +11,10 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { Markdown } from "metabase/common/components/Markdown";
-import { useSelector } from "metabase/lib/redux";
import type { HelpText } from "metabase/querying/expressions";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Flex, Icon, Input, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type * as Lib from "metabase-lib";
import { HighlightExpressionSource } from "../HighlightExpression";
diff --git a/frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.ts b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.ts
index 63094ab9bc7..842e96136d5 100644
--- a/frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.ts
+++ b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.ts
@@ -1,11 +1,11 @@
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
import {
type HelpText,
getHelpText,
getSupportedClauses,
} from "metabase/querying/expressions";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type Database from "metabase-lib/v1/metadata/Database";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx
index 2823e5e172d..36e01d6ff3e 100644
--- a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx
+++ b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx
@@ -1,7 +1,7 @@
import { c } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { setUIControls } from "metabase/redux/query-builder";
+import { useDispatch } from "metabase/utils/redux";
import { ClickActionsView } from "metabase/visualizations/components/ClickActions";
import type {
ClickActionPopoverProps,
diff --git a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx
index f5ebd56c94a..1edd935c667 100644
--- a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx
+++ b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
import { setUIControls } from "metabase/redux/query-builder";
import { Box, Title } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type {
ClickActionPopoverProps,
Drill,
diff --git a/frontend/src/metabase/querying/drills/utils/fk-filter-drill.ts b/frontend/src/metabase/querying/drills/utils/fk-filter-drill.ts
index 77daf020227..540f1e14a9a 100644
--- a/frontend/src/metabase/querying/drills/utils/fk-filter-drill.ts
+++ b/frontend/src/metabase/querying/drills/utils/fk-filter-drill.ts
@@ -5,7 +5,7 @@ import {
pluralize,
singularize,
stripId,
-} from "metabase/lib/formatting/strings";
+} from "metabase/utils/formatting/strings";
import type { Drill } from "metabase/visualizations/types/click-actions";
import type * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/drills/utils/query-drill.ts b/frontend/src/metabase/querying/drills/utils/query-drill.ts
index 3aebe135886..379eef403eb 100644
--- a/frontend/src/metabase/querying/drills/utils/query-drill.ts
+++ b/frontend/src/metabase/querying/drills/utils/query-drill.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { ClickAction } from "metabase/visualizations/types";
import type { DrillThruDisplayInfo } from "metabase-lib";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/drills/utils/underlying-records-drill.ts b/frontend/src/metabase/querying/drills/utils/underlying-records-drill.ts
index 9970930dabd..ab621c97691 100644
--- a/frontend/src/metabase/querying/drills/utils/underlying-records-drill.ts
+++ b/frontend/src/metabase/querying/drills/utils/underlying-records-drill.ts
@@ -1,7 +1,7 @@
import dayjs from "dayjs";
import { msgid, ngettext } from "ttag";
-import { inflect } from "metabase/lib/formatting/strings";
+import { inflect } from "metabase/utils/formatting/strings";
import type {
Drill,
QuestionChangeClickAction,
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
index b7709492bcd..fec6791dc81 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
@@ -2,9 +2,9 @@ import { useState } from "react";
import { useMount } from "react-use";
import { match } from "ts-pattern";
-import { useSelector } from "metabase/lib/redux";
import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";
import { Box } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { NativeQuerySnippet, RowValue } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
index b490290a7e5..2c83ab6ae18 100644
--- a/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-question/use-query-question.ts
@@ -1,7 +1,7 @@
import { useMemo, useState } from "react";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { VisualizationSettings } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/expressions/clause.ts b/frontend/src/metabase/querying/expressions/clause.ts
index a9592f4b70a..5beea8cd284 100644
--- a/frontend/src/metabase/querying/expressions/clause.ts
+++ b/frontend/src/metabase/querying/expressions/clause.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import type Database from "metabase-lib/v1/metadata/Database";
diff --git a/frontend/src/metabase/querying/expressions/formatter/formatter.ts b/frontend/src/metabase/querying/expressions/formatter/formatter.ts
index 43a443a5e27..412cd4ed3af 100644
--- a/frontend/src/metabase/querying/expressions/formatter/formatter.ts
+++ b/frontend/src/metabase/querying/expressions/formatter/formatter.ts
@@ -2,7 +2,7 @@ import type { AstPath, Doc, ParserOptions, Plugin } from "prettier";
import { builders } from "prettier/doc";
import { format as pformat } from "prettier/standalone";
-import { parseNumber } from "metabase/lib/number";
+import { parseNumber } from "metabase/utils/number";
import * as Lib from "metabase-lib";
import { isa } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/querying/expressions/help-text.ts b/frontend/src/metabase/querying/expressions/help-text.ts
index e1a0858788a..bec1248f06b 100644
--- a/frontend/src/metabase/querying/expressions/help-text.ts
+++ b/frontend/src/metabase/querying/expressions/help-text.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import type Database from "metabase-lib/v1/metadata/Database";
diff --git a/frontend/src/metabase/querying/expressions/help-text.unit.spec.ts b/frontend/src/metabase/querying/expressions/help-text.unit.spec.ts
index c29edd3c9be..9b341369621 100644
--- a/frontend/src/metabase/querying/expressions/help-text.unit.spec.ts
+++ b/frontend/src/metabase/querying/expressions/help-text.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Database } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks/database";
diff --git a/frontend/src/metabase/querying/expressions/identifier.ts b/frontend/src/metabase/querying/expressions/identifier.ts
index 3cc928fe277..1d9750c0188 100644
--- a/frontend/src/metabase/querying/expressions/identifier.ts
+++ b/frontend/src/metabase/querying/expressions/identifier.ts
@@ -1,4 +1,4 @@
-import { FK_SYMBOL } from "metabase/lib/formatting/constants";
+import { FK_SYMBOL } from "metabase/utils/formatting/constants";
import { quoteString } from "./string";
diff --git a/frontend/src/metabase/querying/expressions/pratt/compiler.ts b/frontend/src/metabase/querying/expressions/pratt/compiler.ts
index 5abcfee6518..73c956ff596 100644
--- a/frontend/src/metabase/querying/expressions/pratt/compiler.ts
+++ b/frontend/src/metabase/querying/expressions/pratt/compiler.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { type NumberValue, parseNumber } from "metabase/lib/number";
+import { type NumberValue, parseNumber } from "metabase/utils/number";
import * as Lib from "metabase-lib";
import { getClauseDefinition, getMBQLName, isDefinedClause } from "../clause";
diff --git a/frontend/src/metabase/querying/expressions/suggestions/suggest.ts b/frontend/src/metabase/querying/expressions/suggestions/suggest.ts
index 1968fbba593..269a33e8579 100644
--- a/frontend/src/metabase/querying/expressions/suggestions/suggest.ts
+++ b/frontend/src/metabase/querying/expressions/suggestions/suggest.ts
@@ -1,6 +1,6 @@
import { autocompletion } from "@codemirror/autocomplete";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.unit.spec.tsx
index 475e5c8b2c6..26a7a0a5f4f 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateColumnPicker/CoordinateColumnPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateColumnPicker/CoordinateColumnPicker.tsx
index dc312fcb4df..8b4bcbb7c25 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateColumnPicker/CoordinateColumnPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateColumnPicker/CoordinateColumnPicker.tsx
@@ -1,7 +1,7 @@
import { useMemo, useState } from "react";
-import { checkNotNull } from "metabase/lib/types";
import { Select, Stack } from "metabase/ui";
+import { checkNotNull } from "metabase/utils/types";
import type * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
index 331fd4b69dc..4ba280a3a69 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx
@@ -2,9 +2,9 @@ import type { FormEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
import { Box, Flex, Stack, Text } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { FilterOperatorPicker } from "../FilterOperatorPicker";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.unit.spec.tsx
index 8f6c992608c..eba96fb01c7 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/utils.ts
index 5307e2a1491..5720bf82695 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/utils.ts
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/utils.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { OPERATORS } from "./constants";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.unit.spec.tsx
index cd55bc388b5..f8b45a28332 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { columnFinder } from "metabase-lib/test-helpers";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
index b2bcbe171cd..78e6f07a864 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
@@ -13,7 +13,6 @@ import {
import { useLocale } from "metabase/common/hooks";
import { getColumnGroupIcon } from "metabase/common/utils/column-groups";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { isNotNull } from "metabase/lib/types";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import {
type DefinedClauseName,
@@ -22,6 +21,7 @@ import {
} from "metabase/querying/expressions";
import { getGroupName } from "metabase/querying/filters/utils/groups";
import { DelayGroup, Icon } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { WIDTH } from "../constants";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsx
index ee8b5853868..f7f15b9f81e 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
PRODUCT_CATEGORY_VALUES,
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerBody/FilterPickerBody.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerBody/FilterPickerBody.unit.spec.tsx
index 1bf9c80f823..2a816270067 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerBody/FilterPickerBody.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerBody/FilterPickerBody.unit.spec.tsx
@@ -1,6 +1,6 @@
import { createMockMetadata } from "__support__/metadata";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { columnFinder } from "metabase-lib/test-helpers";
import {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
index ef37768c7f0..c04b100c343 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx
@@ -6,7 +6,6 @@ import {
useGetRemappedFieldValueQuery,
useSearchFieldValuesQuery,
} from "metabase/api";
-import { parseNumber } from "metabase/lib/number";
import {
FieldValuePicker,
type UseGetFieldValuesArgs,
@@ -14,6 +13,7 @@ import {
type UseSearchFieldValuesArgs,
} from "metabase/querying/common/components/FieldValuePicker";
import type { ComboboxProps } from "metabase/ui";
+import { parseNumber } from "metabase/utils/number";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
index d31a0e89e78..b1558d418b2 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx
@@ -2,9 +2,9 @@ import type { FormEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
-import { isNotNull } from "metabase/lib/types";
import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";
import { Box, Flex, Text } from "metabase/ui";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { FilterOperatorPicker } from "../FilterOperatorPicker";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.unit.spec.tsx
index 9186cf95ef6..bd675411628 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { columnFinder } from "metabase-lib/test-helpers";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/utils.ts
index a92201de4ba..684ca7e5531 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/utils.ts
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/utils.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { OPERATORS } from "./constants";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx
index c9869e70e54..82e818d1051 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.unit.spec.tsx
@@ -11,7 +11,7 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
PEOPLE,
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx
index 884deda638e..82338970f4d 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx
@@ -2,7 +2,7 @@ import _userEvent from "@testing-library/user-event";
import dayjs from "dayjs";
import { renderWithProviders, screen, within } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/utils.ts
index c798584996c..eded5c80298 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/utils.ts
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/utils.ts
@@ -1,6 +1,6 @@
import dayjs from "dayjs";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { OPERATORS } from "./constants";
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts
index ff34c7e9879..1ce0250cae3 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/test-utils.ts
@@ -2,8 +2,8 @@
import dayjs from "dayjs";
import { createMockEntitiesState } from "__support__/store";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
DEFAULT_TEST_QUERY,
diff --git a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.unit.spec.tsx
index a45f96b9765..ff544e5dd3e 100644
--- a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.unit.spec.tsx
@@ -1,7 +1,7 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import type { TemporalUnit, TestColumnSpec } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/filters/utils/dates.unit.spec.ts b/frontend/src/metabase/querying/filters/utils/dates.unit.spec.ts
index abf2e6dba35..cc05ac2d7ff 100644
--- a/frontend/src/metabase/querying/filters/utils/dates.unit.spec.ts
+++ b/frontend/src/metabase/querying/filters/utils/dates.unit.spec.ts
@@ -1,5 +1,5 @@
-import { setLocalization } from "metabase/lib/i18n";
import type { DateFilterValue } from "metabase/querying/common/types";
+import { setLocalization } from "metabase/utils/i18n";
import * as Lib from "metabase-lib";
import {
DEFAULT_TEST_QUERY,
diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsx
index b0dc2bfea56..fba4946b552 100644
--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsx
+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorBody/MetricEditorSidebar/MetricEditorSidebar.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Box, Button, Icon } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export function MetricEditorSidebar() {
const showMetabaseLinks = useSelector(getShowMetabaseLinks);
diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx
index aa4b6856891..a77c4779854 100644
--- a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
import { isEmbedding } from "metabase/embedding/config";
-import { METAKEY } from "metabase/lib/browser";
import { Icon, Popover, Tooltip } from "metabase/ui";
+import { METAKEY } from "metabase/utils/browser";
import * as Lib from "metabase-lib";
import type { NotebookStepProps } from "../../types";
diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx
index f5ea50bfbf0..2c580778d61 100644
--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx
@@ -2,9 +2,9 @@ import userEvent from "@testing-library/user-event";
import { createMockMetadata } from "__support__/metadata";
import { fireEvent, getIcon, screen } from "__support__/ui";
-import { METAKEY } from "metabase/lib/browser";
-import { checkNotNull } from "metabase/lib/types";
import type { IconName } from "metabase/ui";
+import { METAKEY } from "metabase/utils/browser";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
DEFAULT_TEST_QUERY,
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
index 597b463716f..c3f27efdc37 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx
@@ -19,7 +19,7 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { METAKEY } from "metabase/lib/browser";
+import { METAKEY } from "metabase/utils/browser";
import * as Lib from "metabase-lib";
import { createMetadataProvider } from "metabase-lib/test-helpers";
import type {
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx
index 2db7d9c7cf6..93ad6c2b31a 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
import { isEmbedding } from "metabase/embedding/config";
-import { METAKEY } from "metabase/lib/browser";
import { Box, Icon, Popover, Tooltip } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
+import { METAKEY } from "metabase/utils/browser";
import type * as Lib from "metabase-lib";
import { NotebookCellItem } from "../../NotebookCell";
diff --git a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx
index d685e430d79..29f230be059 100644
--- a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx
@@ -5,11 +5,11 @@ import { getErrorMessage } from "metabase/api/utils";
import { CodeEditor } from "metabase/common/components/CodeEditor";
import { CopyButton } from "metabase/common/components/CopyButton";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { formatNativeQuery } from "metabase/lib/engine";
-import { useSelector } from "metabase/lib/redux";
+import { formatNativeQuery } from "metabase/databases/utils/engine";
import { getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Box, Flex, Icon, Loader, Stack } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { UiParameter } from "metabase-lib/v1/parameters/types";
import type { NativeDatasetResponse } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx
index 4c262b60b4b..b409a5d392f 100644
--- a/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx
+++ b/frontend/src/metabase/querying/notebook/components/Notebook/Notebook.tsx
@@ -1,7 +1,7 @@
import type { DataPickerValue } from "metabase/common/components/Pickers/DataPicker";
-import { useDispatch } from "metabase/lib/redux";
import { setUIControls } from "metabase/redux/query-builder";
import { Box } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type Question from "metabase-lib/v1/Question";
import type { NotebookDataPickerOptions } from "../../types";
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.tsx
index 26d56643c0b..5a032cf6134 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
@@ -27,7 +27,7 @@ import {
createMockRecentModel,
} from "metabase/browse/models/test-utils";
import type { DataPickerValue } from "metabase/common/components/Pickers/DataPicker";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { SAMPLE_METADATA, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
index e2e131b30e6..286c9d9d697 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { isEmbedding } from "metabase/embedding/config";
import { useTranslateContent } from "metabase/i18n/hooks";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
import { Flex, Icon, UnstyledButton } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import { NotebookCell } from "../NotebookCell";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx
index c0845734b6a..255455ad6a9 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/EmbeddingDataPicker.tsx
@@ -1,7 +1,6 @@
import { useContext } from "react";
import { skipToken, useGetCardQuery, useSearchQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_EMBEDDING } from "metabase/plugins";
import { EmbeddingDataPickerContext } from "metabase/querying/notebook/components/NotebookDataPicker/EmbeddingDataPicker/context";
import {
@@ -10,6 +9,7 @@ import {
getEntityTypes,
} from "metabase/redux/embedding-data-picker";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { CardType, TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
index c8a612a20bc..1a6c1980ac5 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx
@@ -14,12 +14,12 @@ import type {
MiniPickerPickableItem,
} from "metabase/common/components/Pickers/MiniPicker/types";
import { isEmbedding } from "metabase/embedding/config";
-import { useDispatch, useSelector, useStore } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { loadMetadataForTable } from "metabase/questions/actions";
import { getMetadata } from "metabase/selectors/metadata";
import { getIsTenantUser } from "metabase/selectors/user";
import { Icon, TextInput } from "metabase/ui";
+import { useDispatch, useSelector, useStore } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts
index bfc3dc4e61e..faee82f1ef6 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/utils.ts
@@ -1,4 +1,4 @@
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
type Props = {
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
index e9523d9d1ca..3334e1d0a6f 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { useGetNativeDatasetQuery } from "metabase/api";
import { DelayedLoadingSpinner } from "metabase/common/components/Pickers/EntityPicker/components/LoadingSpinner";
-import { getEngineNativeType } from "metabase/lib/engine";
+import { getEngineNativeType } from "metabase/databases/utils/engine";
import { Box, Button, Flex, Icon, rem } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/utils.ts b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/utils.ts
index 1119d29cdd0..2cc03b39acc 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/utils.ts
+++ b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/utils.ts
@@ -1,4 +1,4 @@
-import { formatNativeQuery } from "metabase/lib/engine";
+import { formatNativeQuery } from "metabase/databases/utils/engine";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { NativeDatasetResponse } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/notebook/test-utils.ts b/frontend/src/metabase/querying/notebook/test-utils.ts
index 211a2d11025..921739f272e 100644
--- a/frontend/src/metabase/querying/notebook/test-utils.ts
+++ b/frontend/src/metabase/querying/notebook/test-utils.ts
@@ -1,7 +1,7 @@
/* istanbul ignore file */
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import {
createSampleDatabase,
createSavedStructuredCard,
diff --git a/frontend/src/metabase/querying/notebook/utils/steps.unit.spec.ts b/frontend/src/metabase/querying/notebook/utils/steps.unit.spec.ts
index fcfb399f1c3..0e3467382b2 100644
--- a/frontend/src/metabase/querying/notebook/utils/steps.unit.spec.ts
+++ b/frontend/src/metabase/querying/notebook/utils/steps.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/querying/parameters/types.ts b/frontend/src/metabase/querying/parameters/types.ts
index 098bea3cd46..f37e09e80d4 100644
--- a/frontend/src/metabase/querying/parameters/types.ts
+++ b/frontend/src/metabase/querying/parameters/types.ts
@@ -1,3 +1,3 @@
-import type { NumberValue } from "metabase/lib/number";
+import type { NumberValue } from "metabase/utils/number";
export type NumberFilterValue = NumberValue | null;
diff --git a/frontend/src/metabase/querying/parameters/utils/parsing.ts b/frontend/src/metabase/querying/parameters/utils/parsing.ts
index 779160c6322..9f38bba3856 100644
--- a/frontend/src/metabase/querying/parameters/utils/parsing.ts
+++ b/frontend/src/metabase/querying/parameters/utils/parsing.ts
@@ -1,9 +1,9 @@
import dayjs from "dayjs";
-import { parseNumber } from "metabase/lib/number";
-import { isNotNull } from "metabase/lib/types";
import type { DateFilterValue } from "metabase/querying/common/types";
import { isDatePickerTruncationUnit } from "metabase/querying/filters/utils/dates";
+import { parseNumber } from "metabase/utils/number";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type {
ParameterType,
diff --git a/frontend/src/metabase/querying/parameters/utils/query.ts b/frontend/src/metabase/querying/parameters/utils/query.ts
index 956b439d596..5ad57a0c98a 100644
--- a/frontend/src/metabase/querying/parameters/utils/query.ts
+++ b/frontend/src/metabase/querying/parameters/utils/query.ts
@@ -1,7 +1,7 @@
import { P, match } from "ts-pattern";
-import { isNotNull } from "metabase/lib/types";
import { getDateFilterClause } from "metabase/querying/filters/utils/dates";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import { isTemporalUnitParameter } from "metabase-lib/v1/parameters/utils/parameter-type";
import type {
diff --git a/frontend/src/metabase/querying/parameters/utils/query.unit.spec.ts b/frontend/src/metabase/querying/parameters/utils/query.unit.spec.ts
index c93e13b6eed..3f5781c0b09 100644
--- a/frontend/src/metabase/querying/parameters/utils/query.unit.spec.ts
+++ b/frontend/src/metabase/querying/parameters/utils/query.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import {
DEFAULT_TEST_QUERY,
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
index 2aeed67c02a..700b1d99af9 100644
--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx
@@ -6,11 +6,11 @@ import {
getDataPickerValue,
} from "metabase/common/components/Pickers/DataPicker";
import { Tables } from "metabase/entities/tables";
-import { useDispatch, useStore } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { TableBreadcrumbs } from "metabase/metadata/components";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Button, Flex, Icon, Text } from "metabase/ui";
+import { useDispatch, useStore } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import * as Lib from "metabase-lib";
import type { TableId } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx
index 3ef542bfada..1b3656ea968 100644
--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx
+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/PreviewStep/PreviewStep.tsx
@@ -4,8 +4,8 @@ import { P, match } from "ts-pattern";
import { t } from "ttag";
import { useGetAdhocQueryQuery } from "metabase/api";
-import * as Urls from "metabase/lib/urls";
import { Button, Flex, Loader, Text } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import { ClauseStep } from "../ClauseStep";
diff --git a/frontend/src/metabase/questions/actions.ts b/frontend/src/metabase/questions/actions.ts
index 7cc496ce9ff..9d60a9e6f00 100644
--- a/frontend/src/metabase/questions/actions.ts
+++ b/frontend/src/metabase/questions/actions.ts
@@ -1,6 +1,6 @@
import { cardApi, datasetApi } from "metabase/api";
import { Tables } from "metabase/entities/tables";
-import { entityCompatibleQuery } from "metabase/lib/entities";
+import { entityCompatibleQuery } from "metabase/utils/entities";
import type { Card, TableId, UnsavedCard } from "metabase-types/api";
import type { EntityToken } from "metabase-types/api/entity";
import { isSavedCard } from "metabase-types/guards";
diff --git a/frontend/src/metabase/questions/components/CollectionBadge.tsx b/frontend/src/metabase/questions/components/CollectionBadge.tsx
index cf36e78028e..be1a136f833 100644
--- a/frontend/src/metabase/questions/components/CollectionBadge.tsx
+++ b/frontend/src/metabase/questions/components/CollectionBadge.tsx
@@ -3,9 +3,9 @@ import type { ComponentType, PropsWithChildren } from "react";
import { Badge } from "metabase/common/components/Badge";
import { Collections } from "metabase/entities/collections";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { getIcon } from "metabase/lib/icon";
-import { modelToUrl } from "metabase/lib/urls/modelToUrl";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
+import { getIcon } from "metabase/utils/icon";
+import { modelToUrl } from "metabase/utils/urls/modelToUrl";
import type {
CollectionId,
Collection as CollectionType,
diff --git a/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx
index fc916a8bf69..9bc78dde647 100644
--- a/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx
+++ b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx
@@ -16,9 +16,9 @@ import {
FormTextInput,
FormTextarea,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { QUESTION_NAME_MAX_LENGTH } from "metabase/questions/constants";
import { Button, Stack } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type {
Card,
CardType,
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
index 2b88a7c0068..98e50c5dfcf 100644
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
@@ -16,11 +16,11 @@ import type { OmniPickerCollectionItem } from "metabase/common/components/Picker
import { MoveModal } from "metabase/common/components/Pickers";
import { Dashboards } from "metabase/entities/dashboards";
import { INJECT_RTK_QUERY_QUESTION_VALUE } from "metabase/entities/questions";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { API_UPDATE_QUESTION } from "metabase/redux/query-builder";
import { addUndo } from "metabase/redux/undo";
import { Box, Icon, Radio, Title } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Card } from "metabase-types/api";
import MoveCardToast from "./MoveCardToast";
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
index 96e0f19e6b8..5d0dfa6110c 100644
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
@@ -8,7 +8,7 @@ import {
} from "metabase/api";
import type { MoveDestination } from "metabase/collections/types";
import { coerceCollectionId } from "metabase/collections/utils";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Card, CollectionId, DashboardId } from "metabase-types/api";
import { DestinationLink, StyledIcon, ToastRoot } from "./MoveCardToast.styled";
diff --git a/frontend/src/metabase/redux/analytics.ts b/frontend/src/metabase/redux/analytics.ts
index 5be9ffb6e13..61f6f5afd49 100644
--- a/frontend/src/metabase/redux/analytics.ts
+++ b/frontend/src/metabase/redux/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
import type { ResourceAccessedVia, ResourceType } from "./downloads";
diff --git a/frontend/src/metabase/redux/app.ts b/frontend/src/metabase/redux/app.ts
index 887f0ef4878..6be3a1dfc89 100644
--- a/frontend/src/metabase/redux/app.ts
+++ b/frontend/src/metabase/redux/app.ts
@@ -9,8 +9,8 @@ import {
isSmallScreen,
openInBlankWindow,
shouldOpenInBlankWindow,
-} from "metabase/lib/dom";
-import { combineReducers, handleActions } from "metabase/lib/redux";
+} from "metabase/utils/dom";
+import { combineReducers, handleActions } from "metabase/utils/redux";
import type {
DetailViewState,
Dispatch,
diff --git a/frontend/src/metabase/redux/dashboard.ts b/frontend/src/metabase/redux/dashboard.ts
index f29427ce6c8..be84abed78a 100644
--- a/frontend/src/metabase/redux/dashboard.ts
+++ b/frontend/src/metabase/redux/dashboard.ts
@@ -1,6 +1,6 @@
import { createAction } from "@reduxjs/toolkit";
-import { createAction as createLegacyAction } from "metabase/lib/redux";
+import { createAction as createLegacyAction } from "metabase/utils/redux";
import type { DashboardTabId } from "metabase-types/api";
export const INITIALIZE = "metabase/dashboard/INITIALIZE";
diff --git a/frontend/src/metabase/redux/downloads.ts b/frontend/src/metabase/redux/downloads.ts
index cdd0cf71607..8982ec1b13d 100644
--- a/frontend/src/metabase/redux/downloads.ts
+++ b/frontend/src/metabase/redux/downloads.ts
@@ -12,14 +12,15 @@ import { waitUntilNextFramePainted } from "metabase/common/utils/wait-until-next
import { trackExportDashboardToPDF } from "metabase/dashboard/analytics";
import { DASHBOARD_PDF_EXPORT_ROOT_ID } from "metabase/dashboard/constants";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import api, { GET, POST } from "metabase/lib/api";
-import { isWithinIframe, openSaveDialog } from "metabase/lib/dom";
-import { isJWT } from "metabase/lib/jwt";
-import { createAsyncThunk } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
-import * as Urls from "metabase/lib/urls";
-import { isUuid } from "metabase/lib/uuid";
import { getTokenFeature } from "metabase/setup/selectors";
+import api, { GET, POST } from "metabase/utils/api";
+import { openSaveDialog } from "metabase/utils/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { isJWT } from "metabase/utils/jwt";
+import { createAsyncThunk } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
+import * as Urls from "metabase/utils/urls";
+import { isUuid } from "metabase/utils/uuid";
import { saveChartImage } from "metabase/visualizations/lib/save-chart-image";
import { saveDashboardPdf } from "metabase/visualizations/lib/save-dashboard-pdf";
import { getCardKey } from "metabase/visualizations/lib/utils";
diff --git a/frontend/src/metabase/redux/downloads.unit.spec.ts b/frontend/src/metabase/redux/downloads.unit.spec.ts
index c1a2d262dc0..1fc1c1f73ef 100644
--- a/frontend/src/metabase/redux/downloads.unit.spec.ts
+++ b/frontend/src/metabase/redux/downloads.unit.spec.ts
@@ -1,4 +1,4 @@
-import api from "metabase/lib/api";
+import api from "metabase/utils/api";
import Question from "metabase-lib/v1/Question";
import { createMockCard } from "metabase-types/api/mocks";
@@ -26,7 +26,7 @@ describe("getDatasetResponse", () => {
describe("subpath deployment", () => {
/**
* We will assert that the result is a relative path without subpath.
- * Because this URL will be pass to `frontend/src/metabase/lib/api.js`
+ * Because this URL will be pass to `frontend/src/metabase/utils/api.js`
* which already takes care of the subpath (api.basename)
*/
const origin = "http://localhost";
diff --git a/frontend/src/metabase/redux/embed/embed.ts b/frontend/src/metabase/redux/embed/embed.ts
index 255e05a561c..459125ced40 100644
--- a/frontend/src/metabase/redux/embed/embed.ts
+++ b/frontend/src/metabase/redux/embed/embed.ts
@@ -5,12 +5,12 @@ import {
} from "@reduxjs/toolkit";
import { compose, pick } from "underscore";
-import { parseSearchOptions } from "metabase/lib/browser";
import {
DEFAULT_EMBEDDING_ENTITY_TYPES,
setDataPicker,
setEntityTypes,
} from "metabase/redux/embedding-data-picker";
+import { parseSearchOptions } from "metabase/utils/browser";
import type {
InteractiveEmbeddingOptions,
InteractiveEmbeddingOptionsState,
diff --git a/frontend/src/metabase/redux/entities.js b/frontend/src/metabase/redux/entities.js
index 2f0fcaae6d7..25a287b2caf 100644
--- a/frontend/src/metabase/redux/entities.js
+++ b/frontend/src/metabase/redux/entities.js
@@ -1,6 +1,6 @@
import * as entitiesMap from "metabase/entities";
-import { combineEntities } from "metabase/lib/entities";
import { PLUGIN_ENTITIES } from "metabase/plugins";
+import { combineEntities } from "metabase/utils/entities";
const entitiesArray = Object.values({
...entitiesMap,
diff --git a/frontend/src/metabase/redux/metadata.js b/frontend/src/metabase/redux/metadata.js
index 18d028132f3..69a087846a3 100644
--- a/frontend/src/metabase/redux/metadata.js
+++ b/frontend/src/metabase/redux/metadata.js
@@ -7,9 +7,9 @@ import { Fields } from "metabase/entities/fields";
import { Segments } from "metabase/entities/segments";
import { Tables } from "metabase/entities/tables";
import { isProduction } from "metabase/env";
-import { entityCompatibleQuery } from "metabase/lib/entities";
-import { createThunkAction, fetchData } from "metabase/lib/redux";
import { RevisionsApi } from "metabase/services";
+import { entityCompatibleQuery } from "metabase/utils/entities";
+import { createThunkAction, fetchData } from "metabase/utils/redux";
import { normalizeParameter } from "metabase-lib/v1/parameters/utils/parameter-values";
// NOTE: All of these actions are deprecated. Use metadata entities directly.
diff --git a/frontend/src/metabase/redux/query-builder.ts b/frontend/src/metabase/redux/query-builder.ts
index e56f4c08dfe..6c93b5ec516 100644
--- a/frontend/src/metabase/redux/query-builder.ts
+++ b/frontend/src/metabase/redux/query-builder.ts
@@ -1,8 +1,8 @@
import { createAction } from "redux-actions";
-import { createThunkAction } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { UserApi } from "metabase/services";
+import { createThunkAction } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { ParameterId, ParameterValueOrArray } from "metabase-types/api";
export const SET_UI_CONTROLS = "metabase/qb/SET_UI_CONTROLS";
diff --git a/frontend/src/metabase/redux/settings.ts b/frontend/src/metabase/redux/settings.ts
index d60eb4169bc..9e82bc33141 100644
--- a/frontend/src/metabase/redux/settings.ts
+++ b/frontend/src/metabase/redux/settings.ts
@@ -1,8 +1,8 @@
import { createAction, createReducer } from "@reduxjs/toolkit";
import { sessionApi } from "metabase/api";
-import { createAsyncThunk, createThunkAction } from "metabase/lib/redux";
import { SettingsApi } from "metabase/services";
+import { createAsyncThunk, createThunkAction } from "metabase/utils/redux";
import type { Settings, UserSettings } from "metabase-types/api";
export const REFRESH_SITE_SETTINGS = "metabase/settings/REFRESH_SITE_SETTINGS";
diff --git a/frontend/src/metabase/redux/settings.unit.spec.tsx b/frontend/src/metabase/redux/settings.unit.spec.tsx
index bda908c23bd..2d94d8c961e 100644
--- a/frontend/src/metabase/redux/settings.unit.spec.tsx
+++ b/frontend/src/metabase/redux/settings.unit.spec.tsx
@@ -9,8 +9,8 @@ import {
useGetSettingsQuery,
} from "metabase/api";
import { useSetting } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { createMockSettings } from "metabase-types/api/mocks";
import type { State } from "metabase-types/store";
import { createMockSettingsState } from "metabase-types/store/mocks";
diff --git a/frontend/src/metabase/redux/ui.ts b/frontend/src/metabase/redux/ui.ts
index cf708c88b82..a91a784ce08 100644
--- a/frontend/src/metabase/redux/ui.ts
+++ b/frontend/src/metabase/redux/ui.ts
@@ -1,7 +1,7 @@
import { type PayloadAction, createSlice } from "@reduxjs/toolkit";
import { isProduction } from "metabase/env";
-import { isSerializable } from "metabase/lib/objects";
+import { isSerializable } from "metabase/utils/objects";
import type { ModalState } from "metabase-types/store/modal";
type SetOpenModalPayload = ModalState["id"];
diff --git a/frontend/src/metabase/redux/undo.ts b/frontend/src/metabase/redux/undo.ts
index 8c8746e63b7..f3035296a62 100644
--- a/frontend/src/metabase/redux/undo.ts
+++ b/frontend/src/metabase/redux/undo.ts
@@ -3,7 +3,7 @@ import { createRef } from "react";
import type { Action } from "redux-actions";
import _ from "underscore";
-import { createAction, createThunkAction } from "metabase/lib/redux";
+import { createAction, createThunkAction } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import type { Undo } from "metabase-types/store/undo";
diff --git a/frontend/src/metabase/redux/uploads.ts b/frontend/src/metabase/redux/uploads.ts
index 38e8bee113a..f9a1113402b 100644
--- a/frontend/src/metabase/redux/uploads.ts
+++ b/frontend/src/metabase/redux/uploads.ts
@@ -3,13 +3,13 @@ import { t } from "ttag";
import { cardApi } from "metabase/api";
import { Collections } from "metabase/entities/collections";
-import { entityCompatibleQuery } from "metabase/lib/entities";
+import { MetabaseApi } from "metabase/services";
+import { entityCompatibleQuery } from "metabase/utils/entities";
import {
createAction,
createThunkAction,
handleActions,
-} from "metabase/lib/redux";
-import { MetabaseApi } from "metabase/services";
+} from "metabase/utils/redux";
import type { CardId, CollectionId, TableId } from "metabase-types/api";
import type { Dispatch, State } from "metabase-types/store";
import type { FileUploadState } from "metabase-types/store/upload";
diff --git a/frontend/src/metabase/redux/user.ts b/frontend/src/metabase/redux/user.ts
index 069827b45bd..aaebcc07a2c 100644
--- a/frontend/src/metabase/redux/user.ts
+++ b/frontend/src/metabase/redux/user.ts
@@ -1,9 +1,9 @@
import { createAction, createReducer } from "@reduxjs/toolkit";
import { Dashboards } from "metabase/entities/dashboards";
-import { createAsyncThunk } from "metabase/lib/redux";
import { CLOSE_QB_NEWB_MODAL } from "metabase/redux/query-builder";
import { UserApi } from "metabase/services";
+import { createAsyncThunk } from "metabase/utils/redux";
import type { User } from "metabase-types/api";
export const refreshCurrentUser = createAsyncThunk(
diff --git a/frontend/src/metabase/reference/analytics.ts b/frontend/src/metabase/reference/analytics.ts
index a3769d14b37..540e8952b1a 100644
--- a/frontend/src/metabase/reference/analytics.ts
+++ b/frontend/src/metabase/reference/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackReferenceXRayClicked = (
source: "table" | "field" | "segment",
diff --git a/frontend/src/metabase/reference/components/Field.jsx b/frontend/src/metabase/reference/components/Field.jsx
index abd793c2e64..fc4d6df9cfb 100644
--- a/frontend/src/metabase/reference/components/Field.jsx
+++ b/frontend/src/metabase/reference/components/Field.jsx
@@ -8,8 +8,8 @@ import { P, match } from "ts-pattern";
import { t } from "ttag";
import S from "metabase/common/components/List/List.module.css";
+import { FIELD_SEMANTIC_TYPES_MAP } from "metabase/common/utils/fields";
import CS from "metabase/css/core/index.css";
-import { FIELD_SEMANTIC_TYPES_MAP } from "metabase/lib/core";
import {
CurrencyPicker,
SemanticTypePicker,
diff --git a/frontend/src/metabase/reference/components/FieldTypeDetail.jsx b/frontend/src/metabase/reference/components/FieldTypeDetail.jsx
index 1450b2f3349..59f957bebda 100644
--- a/frontend/src/metabase/reference/components/FieldTypeDetail.jsx
+++ b/frontend/src/metabase/reference/components/FieldTypeDetail.jsx
@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
import { memo } from "react";
import { t } from "ttag";
-import { FIELD_SEMANTIC_TYPES_MAP } from "metabase/lib/core";
+import { FIELD_SEMANTIC_TYPES_MAP } from "metabase/common/utils/fields";
import {
CurrencyPicker,
SemanticTypePicker,
diff --git a/frontend/src/metabase/reference/databases/DatabaseDetail.jsx b/frontend/src/metabase/reference/databases/DatabaseDetail.jsx
index f8e9797efdd..86de4bdb5b5 100644
--- a/frontend/src/metabase/reference/databases/DatabaseDetail.jsx
+++ b/frontend/src/metabase/reference/databases/DatabaseDetail.jsx
@@ -7,13 +7,13 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import Detail from "metabase/reference/components/Detail";
import { EditHeader } from "metabase/reference/components/EditHeader";
import EditableReferenceHeader from "metabase/reference/components/EditableReferenceHeader";
import * as actions from "metabase/reference/reference";
import { getShallowFields as getFields } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import {
getDatabase,
diff --git a/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsx b/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsx
index 7469eaa4489..90f0c9f69a5 100644
--- a/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsx
+++ b/frontend/src/metabase/reference/databases/DatabaseDetailContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import DatabaseDetail from "metabase/reference/databases/DatabaseDetail";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import { getDatabase, getDatabaseId, getIsEditing } from "../selectors";
diff --git a/frontend/src/metabase/reference/databases/DatabaseList.jsx b/frontend/src/metabase/reference/databases/DatabaseList.jsx
index 1095cffe2f4..98df4b90464 100644
--- a/frontend/src/metabase/reference/databases/DatabaseList.jsx
+++ b/frontend/src/metabase/reference/databases/DatabaseList.jsx
@@ -9,10 +9,10 @@ import S from "metabase/common/components/List/List.module.css";
import { ListItem } from "metabase/common/components/ListItem";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import { NoDatabasesEmptyState } from "metabase/reference/databases/NoDatabasesEmptyState";
import { getShallowDatabases as getDatabases } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import ReferenceHeader from "../components/ReferenceHeader";
import { getError, getLoading } from "../selectors";
diff --git a/frontend/src/metabase/reference/databases/DatabaseListContainer.jsx b/frontend/src/metabase/reference/databases/DatabaseListContainer.jsx
index 1642fa7b047..9a28fd57cfc 100644
--- a/frontend/src/metabase/reference/databases/DatabaseListContainer.jsx
+++ b/frontend/src/metabase/reference/databases/DatabaseListContainer.jsx
@@ -5,11 +5,11 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import DatabaseList from "metabase/reference/databases/DatabaseList";
import BaseSidebar from "metabase/reference/guide/BaseSidebar";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import { getDatabaseId, getIsEditing } from "../selectors";
diff --git a/frontend/src/metabase/reference/databases/FieldDetail.jsx b/frontend/src/metabase/reference/databases/FieldDetail.jsx
index c7b2488d1af..6b0daa08911 100644
--- a/frontend/src/metabase/reference/databases/FieldDetail.jsx
+++ b/frontend/src/metabase/reference/databases/FieldDetail.jsx
@@ -7,7 +7,6 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import S from "metabase/reference/Reference.module.css";
import Detail from "metabase/reference/components/Detail";
@@ -16,6 +15,7 @@ import EditableReferenceHeader from "metabase/reference/components/EditableRefer
import FieldTypeDetail from "metabase/reference/components/FieldTypeDetail";
import UsefulQuestions from "metabase/reference/components/UsefulQuestions";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import {
getDatabase,
diff --git a/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx b/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx
index b9a6a6ec75f..1371aa9e579 100644
--- a/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx
+++ b/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx
@@ -5,11 +5,11 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import FieldDetail from "metabase/reference/databases/FieldDetail";
import * as actions from "metabase/reference/reference";
import { getMetadata } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import {
getDatabase,
diff --git a/frontend/src/metabase/reference/databases/FieldList.jsx b/frontend/src/metabase/reference/databases/FieldList.jsx
index a8abe7f5f7a..f435e782f09 100644
--- a/frontend/src/metabase/reference/databases/FieldList.jsx
+++ b/frontend/src/metabase/reference/databases/FieldList.jsx
@@ -9,7 +9,6 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import S from "metabase/common/components/List/List.module.css";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import R from "metabase/reference/Reference.module.css";
import { EditHeader } from "metabase/reference/components/EditHeader";
@@ -17,6 +16,7 @@ import EditableReferenceHeader from "metabase/reference/components/EditableRefer
import Field from "metabase/reference/components/Field";
import F from "metabase/reference/components/Field.module.css";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";
import {
diff --git a/frontend/src/metabase/reference/databases/FieldListContainer.jsx b/frontend/src/metabase/reference/databases/FieldListContainer.jsx
index ad850c8c6de..4f447fd4b75 100644
--- a/frontend/src/metabase/reference/databases/FieldListContainer.jsx
+++ b/frontend/src/metabase/reference/databases/FieldListContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import FieldList from "metabase/reference/databases/FieldList";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import {
getDatabase,
diff --git a/frontend/src/metabase/reference/databases/FieldSidebar.tsx b/frontend/src/metabase/reference/databases/FieldSidebar.tsx
index 322ac8a5c40..77eba1a2215 100644
--- a/frontend/src/metabase/reference/databases/FieldSidebar.tsx
+++ b/frontend/src/metabase/reference/databases/FieldSidebar.tsx
@@ -6,7 +6,7 @@ import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
import S from "metabase/common/components/Sidebar.module.css";
import { SidebarItem } from "metabase/common/components/SidebarItem";
import CS from "metabase/css/core/index.css";
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { Database, Field, Table } from "metabase-types/api";
import { trackReferenceXRayClicked } from "../analytics";
diff --git a/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsx b/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsx
index f5c276e687c..ebb9fa42cf0 100644
--- a/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsx
+++ b/frontend/src/metabase/reference/databases/NoDatabasesEmptyState.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { AdminAwareEmptyState } from "metabase/common/components/AdminAwareEmptyState";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
export const NoDatabasesEmptyState = () => {
const applicationName = useSelector(getApplicationName);
diff --git a/frontend/src/metabase/reference/databases/TableDetail.jsx b/frontend/src/metabase/reference/databases/TableDetail.jsx
index 7c776c3322f..773c9ecdd41 100644
--- a/frontend/src/metabase/reference/databases/TableDetail.jsx
+++ b/frontend/src/metabase/reference/databases/TableDetail.jsx
@@ -7,7 +7,6 @@ import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import S from "metabase/reference/Reference.module.css";
import Detail from "metabase/reference/components/Detail";
@@ -19,6 +18,7 @@ import {
getShallowFields as getFields,
getMetadata,
} from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import {
getError,
diff --git a/frontend/src/metabase/reference/databases/TableDetailContainer.jsx b/frontend/src/metabase/reference/databases/TableDetailContainer.jsx
index 97ea03852c0..64f5533f6e4 100644
--- a/frontend/src/metabase/reference/databases/TableDetailContainer.jsx
+++ b/frontend/src/metabase/reference/databases/TableDetailContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import TableDetail from "metabase/reference/databases/TableDetail";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import {
getDatabase,
diff --git a/frontend/src/metabase/reference/databases/TableList.jsx b/frontend/src/metabase/reference/databases/TableList.jsx
index cfe2a80a058..10a185698e6 100644
--- a/frontend/src/metabase/reference/databases/TableList.jsx
+++ b/frontend/src/metabase/reference/databases/TableList.jsx
@@ -11,9 +11,9 @@ import S from "metabase/common/components/List/List.module.css";
import { ListItem } from "metabase/common/components/ListItem";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import R from "metabase/reference/Reference.module.css";
+import { connect } from "metabase/utils/redux";
import ReferenceHeader from "../components/ReferenceHeader";
import {
diff --git a/frontend/src/metabase/reference/databases/TableListContainer.jsx b/frontend/src/metabase/reference/databases/TableListContainer.jsx
index a75139297e1..5a1fc9c22e0 100644
--- a/frontend/src/metabase/reference/databases/TableListContainer.jsx
+++ b/frontend/src/metabase/reference/databases/TableListContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import TableList from "metabase/reference/databases/TableList";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import { getDatabase, getDatabaseId, getIsEditing } from "../selectors";
diff --git a/frontend/src/metabase/reference/databases/TableQuestions.jsx b/frontend/src/metabase/reference/databases/TableQuestions.jsx
index 187201f8542..3cd8ef82b74 100644
--- a/frontend/src/metabase/reference/databases/TableQuestions.jsx
+++ b/frontend/src/metabase/reference/databases/TableQuestions.jsx
@@ -11,10 +11,10 @@ import S from "metabase/common/components/List/List.module.css";
import { ListItem } from "metabase/common/components/ListItem";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import * as metadataActions from "metabase/redux/metadata";
import { getMetadata } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import visualizations from "metabase/visualizations";
import ReferenceHeader from "../components/ReferenceHeader";
diff --git a/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx b/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx
index 69a113c8a48..8f33c99e853 100644
--- a/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx
+++ b/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx
@@ -6,10 +6,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
import { Questions } from "metabase/entities/questions";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import TableQuestions from "metabase/reference/databases/TableQuestions";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import {
getDatabase,
diff --git a/frontend/src/metabase/reference/databases/TableSidebar.tsx b/frontend/src/metabase/reference/databases/TableSidebar.tsx
index 40bdcabdd16..ac2e22b3cd8 100644
--- a/frontend/src/metabase/reference/databases/TableSidebar.tsx
+++ b/frontend/src/metabase/reference/databases/TableSidebar.tsx
@@ -6,7 +6,7 @@ import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
import S from "metabase/common/components/Sidebar.module.css";
import { SidebarItem } from "metabase/common/components/SidebarItem";
import CS from "metabase/css/core/index.css";
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { Database, Table } from "metabase-types/api";
import { trackReferenceXRayClicked } from "../analytics";
diff --git a/frontend/src/metabase/reference/reference.js b/frontend/src/metabase/reference/reference.js
index c917cbbf345..588ddc20c18 100644
--- a/frontend/src/metabase/reference/reference.js
+++ b/frontend/src/metabase/reference/reference.js
@@ -1,6 +1,6 @@
import { assoc } from "icepick";
-import { createAction, handleActions } from "metabase/lib/redux";
+import { createAction, handleActions } from "metabase/utils/redux";
import { filterUntouchedFields, isEmptyObject } from "./utils.js";
diff --git a/frontend/src/metabase/reference/segments/SegmentDetail.jsx b/frontend/src/metabase/reference/segments/SegmentDetail.jsx
index ddee8f29a99..b9f737b1ebe 100644
--- a/frontend/src/metabase/reference/segments/SegmentDetail.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentDetail.jsx
@@ -8,7 +8,6 @@ import { Link } from "metabase/common/components/Link";
import { List } from "metabase/common/components/List";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import Detail from "metabase/reference/components/Detail";
import { EditHeader } from "metabase/reference/components/EditHeader";
@@ -20,6 +19,7 @@ import {
getShallowFields as getFields,
getMetadata,
} from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import S from "../components/Detail.module.css";
import {
diff --git a/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsx b/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsx
index 3a1f89f09c7..20879912817 100644
--- a/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentDetailContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import * as actions from "metabase/reference/reference";
import SegmentDetail from "metabase/reference/segments/SegmentDetail";
+import { connect } from "metabase/utils/redux";
import {
getDatabaseId,
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsx b/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsx
index fb828324adf..d3ee260787e 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldDetail.jsx
@@ -7,7 +7,6 @@ import { t } from "ttag";
import { List } from "metabase/common/components/List";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import S from "metabase/reference/Reference.module.css";
import Detail from "metabase/reference/components/Detail";
@@ -17,6 +16,7 @@ import FieldTypeDetail from "metabase/reference/components/FieldTypeDetail";
import UsefulQuestions from "metabase/reference/components/UsefulQuestions";
import * as actions from "metabase/reference/reference";
import { getMetadata } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
import {
getError,
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsx b/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsx
index bb77518c22a..d3ef20b5f86 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldDetailContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import * as actions from "metabase/reference/reference";
import SegmentFieldDetail from "metabase/reference/segments/SegmentFieldDetail";
+import { connect } from "metabase/utils/redux";
import { getField, getIsEditing, getSegment, getSegmentId } from "../selectors";
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldList.jsx b/frontend/src/metabase/reference/segments/SegmentFieldList.jsx
index 402960f76b0..52b119f195d 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldList.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldList.jsx
@@ -9,7 +9,6 @@ import { List } from "metabase/common/components/List";
import S from "metabase/common/components/List/List.module.css";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import R from "metabase/reference/Reference.module.css";
import { EditHeader } from "metabase/reference/components/EditHeader";
@@ -17,6 +16,7 @@ import EditableReferenceHeader from "metabase/reference/components/EditableRefer
import Field from "metabase/reference/components/Field";
import F from "metabase/reference/components/Field.module.css";
import * as actions from "metabase/reference/reference";
+import { connect } from "metabase/utils/redux";
import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";
import {
diff --git a/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsx b/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsx
index ce05f0d226d..3fce2b5ff91 100644
--- a/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentFieldListContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import * as actions from "metabase/reference/reference";
import SegmentFieldList from "metabase/reference/segments/SegmentFieldList";
+import { connect } from "metabase/utils/redux";
import {
getIsEditing,
diff --git a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx
index 3cf186b2d18..0377d4bf166 100644
--- a/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentList/SegmentList.tsx
@@ -8,10 +8,10 @@ import S from "metabase/common/components/List/List.module.css";
import { ListItem } from "metabase/common/components/ListItem";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
import { getShallowSegments } from "metabase/selectors/metadata";
import { getDocsUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { useSelector } from "metabase/utils/redux";
import ReferenceHeader from "../../components/ReferenceHeader";
import { getError, getLoading } from "../../selectors";
diff --git a/frontend/src/metabase/reference/segments/SegmentListContainer.jsx b/frontend/src/metabase/reference/segments/SegmentListContainer.jsx
index 9e9669bc33b..b7929a3b410 100644
--- a/frontend/src/metabase/reference/segments/SegmentListContainer.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentListContainer.jsx
@@ -5,11 +5,11 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import BaseSidebar from "metabase/reference/guide/BaseSidebar";
import * as actions from "metabase/reference/reference";
import { SegmentList } from "metabase/reference/segments/SegmentList";
+import { connect } from "metabase/utils/redux";
import { getDatabaseId, getIsEditing } from "../selectors";
diff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx b/frontend/src/metabase/reference/segments/SegmentQuestions.jsx
index f4a8ceda688..78a4063b69c 100644
--- a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.jsx
@@ -10,10 +10,10 @@ import { ListItem } from "metabase/common/components/ListItem";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useQuestionListQuery } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import * as metadataActions from "metabase/redux/metadata";
import { getMetadata } from "metabase/selectors/metadata";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import visualizations from "metabase/visualizations";
import ReferenceHeader from "../components/ReferenceHeader";
diff --git a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx
index 3a7f1802f86..e873c09ed03 100644
--- a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx
@@ -6,10 +6,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
import { Questions } from "metabase/entities/questions";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import * as actions from "metabase/reference/reference";
import { SegmentQuestions } from "metabase/reference/segments/SegmentQuestions";
+import { connect } from "metabase/utils/redux";
import {
getDatabaseId,
diff --git a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx b/frontend/src/metabase/reference/segments/SegmentRevisions.jsx
index 42a0afcc7de..ce085b10b8f 100644
--- a/frontend/src/metabase/reference/segments/SegmentRevisions.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentRevisions.jsx
@@ -9,10 +9,10 @@ import { EmptyState } from "metabase/common/components/EmptyState";
import S from "metabase/common/components/List/List.module.css";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import { getShallowTables as getTables } from "metabase/selectors/metadata";
import { assignUserColors } from "metabase/ui/colors/formatting-colors";
+import { connect } from "metabase/utils/redux";
import ReferenceHeader from "../components/ReferenceHeader";
import {
diff --git a/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsx b/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsx
index b5f0c841960..11efed84e90 100644
--- a/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsx
+++ b/frontend/src/metabase/reference/segments/SegmentRevisionsContainer.jsx
@@ -5,10 +5,10 @@ import { Component } from "react";
import { SidebarLayout } from "metabase/common/components/SidebarLayout";
import CS from "metabase/css/core/index.css";
-import { connect } from "metabase/lib/redux";
import * as metadataActions from "metabase/redux/metadata";
import * as actions from "metabase/reference/reference";
import SegmentRevisions from "metabase/reference/segments/SegmentRevisions";
+import { connect } from "metabase/utils/redux";
import {
getDatabaseId,
diff --git a/frontend/src/metabase/reference/segments/SegmentSidebar.tsx b/frontend/src/metabase/reference/segments/SegmentSidebar.tsx
index ac12b981e6a..88dbe6e80dd 100644
--- a/frontend/src/metabase/reference/segments/SegmentSidebar.tsx
+++ b/frontend/src/metabase/reference/segments/SegmentSidebar.tsx
@@ -6,7 +6,7 @@ import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
import S from "metabase/common/components/Sidebar.module.css";
import { SidebarItem } from "metabase/common/components/SidebarItem";
import CS from "metabase/css/core/index.css";
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { Segment, User } from "metabase-types/api";
import { trackReferenceXRayClicked } from "../analytics";
diff --git a/frontend/src/metabase/reference/selectors.js b/frontend/src/metabase/reference/selectors.js
index fdbe4610c0b..98bf4892bb5 100644
--- a/frontend/src/metabase/reference/selectors.js
+++ b/frontend/src/metabase/reference/selectors.js
@@ -2,13 +2,13 @@ import { createSelector } from "@reduxjs/toolkit";
import { getIn } from "icepick";
import { Dashboards } from "metabase/entities/dashboards";
-import { resourceListToMap } from "metabase/lib/redux";
import {
getShallowDatabases as getDatabases,
getShallowFields as getFields,
getShallowSegments as getSegments,
getShallowTables as getTables,
} from "metabase/selectors/metadata";
+import { resourceListToMap } from "metabase/utils/redux";
import { idsToObjectMap } from "./utils";
diff --git a/frontend/src/metabase/reference/utils.js b/frontend/src/metabase/reference/utils.js
index fe60f162b4a..b4bf892015c 100644
--- a/frontend/src/metabase/reference/utils.js
+++ b/frontend/src/metabase/reference/utils.js
@@ -1,7 +1,7 @@
import dayjs from "dayjs";
import { t } from "ttag";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsx
index a103ce416a8..b1b0f7a3e7b 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedMenuDropdown.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";
-import { isWithinIframe } from "metabase/lib/dom";
-import { canDownloadResults } from "metabase/lib/downloads";
+import { canDownloadResults } from "metabase/common/utils/dataset";
import { Icon, Menu } from "metabase/ui";
+import { isWithinIframe } from "metabase/utils/iframe";
import type Question from "metabase-lib/v1/Question";
import type { Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx
index 53a8e847dcb..6fcfbedabf7 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx
@@ -36,7 +36,6 @@ import {
getHasUnsavedChanges,
getHoveredChildTargetId,
} from "metabase/documents/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";
import { usePublicDocumentCardData } from "metabase/public/hooks/use-public-document-card-data";
import { DropZone } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/DropZone";
@@ -51,6 +50,7 @@ import {
Text,
TextInput,
} from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { DocumentMode } from "metabase/visualizations/click-actions/modes/DocumentMode";
import Visualization from "metabase/visualizations/components/Visualization";
import { ErrorView } from "metabase/visualizations/components/Visualization/ErrorView/ErrorView";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx
index 4a1a1cf8202..ff35f4f4bfd 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/PublicDocumentCardMenu.tsx
@@ -5,11 +5,11 @@ import { t } from "ttag";
import { QuestionDownloadWidget } from "metabase/common/components/QuestionDownloadWidget";
import { useDownloadData } from "metabase/common/components/QuestionDownloadWidget/use-download-data";
-import { useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { usePublicDocumentContext } from "metabase/public/contexts/PublicDocumentContext";
import { getMetadata } from "metabase/selectors/metadata";
import { ActionIcon, Icon, Menu } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import { SAVING_DOM_IMAGE_HIDDEN_CLASS } from "metabase/visualizations/lib/save-chart-image";
import Question from "metabase-lib/v1/Question";
import type { Card, Dataset } from "metabase-types/api";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx
index 4637576d86e..a453103554c 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx
@@ -7,11 +7,11 @@ import {
generateDraftCardId,
loadMetadataForDocumentCard,
} from "metabase/documents/documents.slice";
-import { useDispatch, useSelector, useStore } from "metabase/lib/redux";
import { Notebook } from "metabase/querying/notebook/components/Notebook";
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { Box, Button, Flex, Modal, Text } from "metabase/ui";
+import { useDispatch, useSelector, useStore } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { Card } from "metabase-types/api";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts
index 039b83b2c79..c26da08349f 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/use-update-card-operations.ts
@@ -5,8 +5,8 @@ import { navigateToCardFromDocument } from "metabase/documents/actions";
import { updateVizSettings } from "metabase/documents/documents.slice";
import type { UseCardDataResult } from "metabase/documents/hooks/use-card-data";
import { useDraftCardOperations } from "metabase/documents/hooks/use-draft-card-operations";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import Question from "metabase-lib/v1/Question";
import { getUrl } from "metabase-lib/v1/urls";
import type { Card, Document, VisualizationSettings } from "metabase-types/api";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx
index 72b196fef0e..703ed6b7c8d 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx
@@ -21,7 +21,6 @@ import {
SuggestionPaper,
} from "metabase/documents/components/Editor/shared/SuggestionPaper";
import { getCurrentDocument } from "metabase/documents/selectors";
-import { useSelector } from "metabase/lib/redux";
import {
useMetabotName,
useUserMetabotPermissions,
@@ -37,6 +36,7 @@ import {
Text,
UnstyledButton,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { SearchResult } from "metabase-types/api";
import { EntitySearchSection } from "../shared/EntitySearchSection";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx
index 4498b7cc9ef..670c81e6156 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx
@@ -7,11 +7,11 @@ import {
generateDraftCardId,
loadMetadataForDocumentCard,
} from "metabase/documents/documents.slice";
-import { useDispatch, useSelector, useStore } from "metabase/lib/redux";
import { Notebook } from "metabase/querying/notebook/components/Notebook";
import { getMetadata } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { Box, Button, Flex, Modal } from "metabase/ui";
+import { useDispatch, useSelector, useStore } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts
index d1b2dba0306..e34ce162964 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts
@@ -2,12 +2,12 @@ import { useMemo } from "react";
import { t } from "ttag";
import { useListDatabasesQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getHasDatabaseWithJsonEngine } from "metabase/selectors/data";
import {
canUserCreateNativeQueries,
canUserCreateQueries,
} from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import type { NewQuestionMenuItem } from "./types";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsx
index 8b1e083dd68..f9ec70a0ad2 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.tsx
@@ -7,7 +7,7 @@ import {
SuggestionPaper,
} from "metabase/documents/components/Editor/shared/SuggestionPaper";
import { getCurrentDocument } from "metabase/documents/selectors";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import type { SearchResult } from "metabase-types/api";
import { EntitySearchSection } from "../shared/EntitySearchSection";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx
index bad7d9db976..4a0679e76c1 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Mention/MentionSuggestion.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
setupSearchEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import {
createMockRecentCollectionItem,
createMockSearchResult,
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx
index 2564a2585c5..2d9e9fe578f 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx
@@ -20,7 +20,6 @@ import {
loadMetadataForDocumentCard,
} from "metabase/documents/documents.slice";
import { getCurrentDocument } from "metabase/documents/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import MetabotThinkingStyles from "metabase/metabot/components/MetabotChat/MetabotThinking.module.css";
import { MetabotIcon } from "metabase/metabot/components/MetabotIcon";
import {
@@ -28,6 +27,7 @@ import {
useUserMetabotPermissions,
} from "metabase/metabot/hooks";
import { Box, Button, Flex, Icon, Text, Tooltip } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Card, MetabotGenerateContentRequest } from "metabase-types/api";
import { wrapCardEmbed } from "../shared/layout";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/NodeIds/utils.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/NodeIds/utils.ts
index c01c1b6e35c..7bd5b2176cc 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/NodeIds/utils.ts
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/NodeIds/utils.ts
@@ -1,7 +1,7 @@
import type { Attribute } from "@tiptap/core";
import { Plugin } from "prosemirror-state";
-import { uuid } from "metabase/lib/uuid";
+import { uuid } from "metabase/utils/uuid";
import { ID_ATTRIBUTE_NAME } from "./constants";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
index 0bdb68db939..80250bb5b5d 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SmartLink/SmartLinkNode.tsx
@@ -22,20 +22,20 @@ import {
} from "metabase/api";
import { Link } from "metabase/common/components/Link";
import { updateMentionsCache } from "metabase/documents/documents.slice";
-import {
- type IconModel,
- type ObjectWithModel,
- getIcon,
-} from "metabase/lib/icon";
-import { useDispatch } from "metabase/lib/redux";
-import { modelToUrl } from "metabase/lib/urls/modelToUrl";
-import { extractEntityId } from "metabase/lib/urls/utils";
import {
METABSE_PROTOCOL_MD_LINK,
parseMetabaseProtocolMarkdownLink,
} from "metabase/metabot/utils/links";
import { PLUGIN_TRANSFORMS } from "metabase/plugins";
import { Icon } from "metabase/ui";
+import {
+ type IconModel,
+ type ObjectWithModel,
+ getIcon,
+} from "metabase/utils/icon";
+import { useDispatch } from "metabase/utils/redux";
+import { modelToUrl } from "metabase/utils/urls/modelToUrl";
+import { extractEntityId } from "metabase/utils/urls/utils";
import type {
Card,
CardDisplayType,
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx
index f16251e6b1e..be769cfba90 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.tsx
@@ -19,11 +19,11 @@ import {
getChildTargetId,
getCurrentDocument,
} from "metabase/documents/selectors";
-import { isWithinIframe } from "metabase/lib/dom";
-import { useDispatch, useSelector } from "metabase/lib/redux/hooks";
import { DropZone } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/DropZone";
import { useDndHelpers } from "metabase/rich_text_editing/tiptap/extensions/shared/dnd/use-dnd-helpers";
import { Box } from "metabase/ui";
+import { isWithinIframe } from "metabase/utils/iframe";
+import { useDispatch, useSelector } from "metabase/utils/redux/hooks";
import { CommentsButton } from "../../components/CommentsButton";
import { cleanupFlexContainerNodes } from "../HandleEditorDrop/utils";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx
index bfa918eef49..6b785da4180 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx
@@ -10,14 +10,14 @@ import {
generateDraftCardId,
loadMetadataForDocumentCard,
} from "metabase/documents/documents.slice";
-import { isMac } from "metabase/lib/browser";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";
import { createRawSeries } from "metabase/query_builder/utils";
import { DataReference } from "metabase/querying/components/DataReference/DataReference";
import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Button, Flex, Loader, Modal, Stack, Text } from "metabase/ui";
+import { isMac } from "metabase/utils/browser";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import Visualization from "metabase/visualizations/components/Visualization";
import NoResultsView from "metabase/visualizations/components/Visualization/NoResultsView/NoResultsView";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts
index 3e031440ac9..731f6f45dad 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts
@@ -2,10 +2,10 @@ import { match } from "ts-pattern";
import { getTranslatedEntityName } from "metabase/common/utils/model-names";
import type { MenuItem } from "metabase/documents/components/Editor/shared/MenuComponents";
-import { getIcon } from "metabase/lib/icon";
-import { getName } from "metabase/lib/name";
-import { type UrlableModel, modelToUrl } from "metabase/lib/urls/modelToUrl";
import type { MetabaseProtocolEntityModel } from "metabase/metabot/utils/links";
+import { getIcon } from "metabase/utils/icon";
+import { getName } from "metabase/utils/name";
+import { type UrlableModel, modelToUrl } from "metabase/utils/urls/modelToUrl";
import type {
Database,
MentionableUser,
diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts
index 8766d4206b7..fa288ae6865 100644
--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts
+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts
@@ -3,8 +3,8 @@ import { useCallback, useEffect, useMemo, useState } from "react";
import type { OmniPickerItem } from "metabase/common/components/Pickers";
import { getTranslatedEntityName } from "metabase/common/utils/model-names";
-import { modelToUrl } from "metabase/lib/urls/modelToUrl";
import type { DocumentLinkedEntityPickerItemValue } from "metabase/rich_text_editing/tiptap/extensions/shared/LinkedEntityPickerModal/types";
+import { modelToUrl } from "metabase/utils/urls/modelToUrl";
import type {
MentionableUser,
RecentItem,
diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsx
index 69336a4a261..19c04b7f6c2 100644
--- a/frontend/src/metabase/route-guards.tsx
+++ b/frontend/src/metabase/route-guards.tsx
@@ -3,10 +3,10 @@ import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
import { getAdminPaths } from "metabase/admin/app/selectors";
import { canAccessDataStudio } from "metabase/data-studio/selectors";
-import { isSameOrSiteUrlOrigin } from "metabase/lib/dom";
-import { MetabaseReduxContext } from "metabase/lib/redux";
import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
+import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
+import { MetabaseReduxContext } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import { getCanAccessOnboardingPage } from "./home/selectors";
diff --git a/frontend/src/metabase/route-guards.unit.spec.tsx b/frontend/src/metabase/route-guards.unit.spec.tsx
index 9cf212cf3a5..135eeb1d563 100644
--- a/frontend/src/metabase/route-guards.unit.spec.tsx
+++ b/frontend/src/metabase/route-guards.unit.spec.tsx
@@ -5,8 +5,8 @@ import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
import { renderWithProviders, screen } from "__support__/ui";
import { createMockState } from "metabase-types/store/mocks";
-import { MetabaseReduxContext } from "./lib/redux";
import { isBackendOnlyPath } from "./route-guards";
+import { MetabaseReduxContext } from "./utils/redux";
describe("route-guards", () => {
describe("patched redux-auth-wrapper", () => {
diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.js
index 06ad4a67fee..c23900cdf42 100644
--- a/frontend/src/metabase/schema.js
+++ b/frontend/src/metabase/schema.js
@@ -2,7 +2,7 @@
import { schema } from "normalizr";
-import { entityTypeForObject } from "metabase/lib/schema";
+import { entityTypeForObject } from "metabase/entities/utils";
import { getUniqueFieldId } from "metabase-lib/v1/metadata/utils/fields";
import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";
import { generateSchemaId } from "metabase-lib/v1/metadata/utils/schema";
diff --git a/frontend/src/metabase/search/analytics.ts b/frontend/src/metabase/search/analytics.ts
index 9932714871c..c935dcd2ceb 100644
--- a/frontend/src/metabase/search/analytics.ts
+++ b/frontend/src/metabase/search/analytics.ts
@@ -1,5 +1,5 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
-import { hashSearchTerm, shouldReportSearchTerm } from "metabase/lib/search";
+import { trackSchemaEvent } from "metabase/utils/analytics";
+import { hashSearchTerm, shouldReportSearchTerm } from "metabase/utils/search";
import type { SearchRequest } from "metabase-types/api";
type TrackSearchClickParams = {
diff --git a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
index d8a6f571871..c6fe0105364 100644
--- a/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
+++ b/frontend/src/metabase/search/components/DropdownSidebarFilter/DropdownSidebarFilter.tsx
@@ -4,8 +4,6 @@ import { isEmpty } from "underscore";
import { useCaptureEvent } from "metabase/common/hooks";
import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";
-import { useSelector } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import type {
FilterTypeKeys,
SearchFilterComponentProps,
@@ -15,6 +13,8 @@ import type {
import { getIsNavbarOpen } from "metabase/selectors/app";
import type { IconName } from "metabase/ui";
import { Box, Button, Center, Icon, Popover, Stack, Text } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import {
DropdownFieldSet,
diff --git a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx b/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx
index 6585d611e82..9075c587712 100644
--- a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx
+++ b/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx
@@ -1,14 +1,14 @@
import { t } from "ttag";
import { useDatabaseQuery, useTableQuery } from "metabase/common/hooks";
+import { SearchResultLink } from "metabase/search/components/SearchResultLink";
+import type { WrappedResult } from "metabase/search/types";
+import { Box, Icon, Text } from "metabase/ui";
import {
browseDatabase,
browseSchema,
tableRowsQuery,
-} from "metabase/lib/urls";
-import { SearchResultLink } from "metabase/search/components/SearchResultLink";
-import type { WrappedResult } from "metabase/search/types";
-import { Box, Icon, Text } from "metabase/ui";
+} from "metabase/utils/urls";
import type Database from "metabase-lib/v1/metadata/Database";
import type { InfoTextData } from "./get-info-text";
diff --git a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx b/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx
index 4a4cc3e5033..2f3ae38adb1 100644
--- a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx
+++ b/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { isNull } from "underscore";
import { useListUserRecipientsQuery } from "metabase/api";
-import { getRelativeTime } from "metabase/lib/time-dayjs";
-import { isNotNull } from "metabase/lib/types";
import type { WrappedResult } from "metabase/search/types";
import { Text, Tooltip } from "metabase/ui";
+import { getRelativeTime } from "metabase/utils/time-dayjs";
+import { isNotNull } from "metabase/utils/types";
import type { UserListResult } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/search/components/InfoText/get-info-text.tsx b/frontend/src/metabase/search/components/InfoText/get-info-text.tsx
index bfb26cfecfe..6a7000c6a12 100644
--- a/frontend/src/metabase/search/components/InfoText/get-info-text.tsx
+++ b/frontend/src/metabase/search/components/InfoText/get-info-text.tsx
@@ -1,15 +1,15 @@
import { t } from "ttag";
-import {
- collection as collectionUrl,
- dashboard as dashboardUrl,
-} from "metabase/lib/urls";
import {
PLUGIN_COLLECTIONS,
PLUGIN_COLLECTION_COMPONENTS,
} from "metabase/plugins";
import type { WrappedResult } from "metabase/search/types";
import { Box, Icon } from "metabase/ui";
+import {
+ collection as collectionUrl,
+ dashboard as dashboardUrl,
+} from "metabase/utils/urls";
import type { Collection } from "metabase-types/api";
export type InfoTextData = {
diff --git a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx b/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx
index df0b9cd0dcc..ae3f4ce24a7 100644
--- a/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx
+++ b/frontend/src/metabase/search/components/SearchResult/SearchResult.tsx
@@ -3,13 +3,13 @@ import type { MouseEvent } from "react";
import { useCallback } from "react";
import { push } from "react-router-redux";
-import { useDispatch } from "metabase/lib/redux";
-import { isSyncCompleted } from "metabase/lib/syncing";
-import { modelToUrl } from "metabase/lib/urls";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { trackSearchClick } from "metabase/search/analytics";
import type { WrappedResult } from "metabase/search/types";
import { Group, Icon, Loader } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import { isSyncCompleted } from "metabase/utils/syncing";
+import { modelToUrl } from "metabase/utils/urls";
import type { SearchContext } from "metabase-types/api";
import { InfoText } from "../InfoText";
diff --git a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx b/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx
index ac348577af7..c6ede1299a0 100644
--- a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx
+++ b/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx
@@ -1,9 +1,9 @@
-import { getIcon } from "metabase/lib/icon";
import {
DEFAULT_ICON_SIZE,
LARGE_ICON_SIZE,
} from "metabase/search/components/SearchResult/components";
import { Icon } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
import type { IconComponentProps } from "./ItemIcon";
diff --git a/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx b/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx
index 2902912eaf5..aec718a8652 100644
--- a/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx
+++ b/frontend/src/metabase/search/components/SearchResult/components/DefaultIcon.tsx
@@ -1,5 +1,5 @@
-import { getIcon } from "metabase/lib/icon";
import { Icon } from "metabase/ui";
+import { getIcon } from "metabase/utils/icon";
import type { IconComponentProps } from "./ItemIcon";
import { DEFAULT_ICON_SIZE } from "./constants";
diff --git a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx b/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx
index 83930329bc2..eaaa57b87b2 100644
--- a/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx
+++ b/frontend/src/metabase/search/components/SearchResult/tests/SearchResult.unit.spec.tsx
@@ -7,10 +7,10 @@ import {
setupUsersEndpoints,
} from "__support__/server-mocks";
import { getIcon, renderWithProviders, screen } from "__support__/ui";
-import { modelToUrl } from "metabase/lib/urls";
import { SearchResult } from "metabase/search/components/SearchResult/SearchResult";
import { createWrappedSearchResult } from "metabase/search/components/SearchResult/tests/util";
import type { WrappedResult } from "metabase/search/types";
+import { modelToUrl } from "metabase/utils/urls";
import { createMockCollection, createMockUser } from "metabase-types/api/mocks";
const TEST_REGULAR_COLLECTION = createMockCollection({
diff --git a/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx b/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx
index 6a9e8cd008b..3d660db7cf1 100644
--- a/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx
+++ b/frontend/src/metabase/search/components/filters/NativeQueryFilter/NativeQueryLabel.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { canUserCreateNativeQueries } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
export const NativeQueryLabel = () => {
const hasNativeWrite = useSelector(canUserCreateNativeQueries);
diff --git a/frontend/src/metabase/search/containers/SearchApp.jsx b/frontend/src/metabase/search/containers/SearchApp.jsx
index b8e16020f41..b30c59cca8a 100644
--- a/frontend/src/metabase/search/containers/SearchApp.jsx
+++ b/frontend/src/metabase/search/containers/SearchApp.jsx
@@ -11,7 +11,6 @@ import { PaginationControls } from "metabase/common/components/PaginationControl
import { NoObjectError } from "metabase/common/components/errors/NoObjectError";
import { Search } from "metabase/entities/search";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useDispatch } from "metabase/lib/redux";
import { SearchSidebar } from "metabase/search/components/SearchSidebar";
import {
SearchContextTypes,
@@ -30,6 +29,7 @@ import {
getSearchTextFromLocation,
} from "metabase/search/utils";
import { Box, Group, Paper, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
const getPageFromLocation = (location) => {
const maybePage = location.query?.page
diff --git a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx
index bf801425e04..2470588d4bd 100644
--- a/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx
+++ b/frontend/src/metabase/search/containers/SearchApp.unit.spec.tsx
@@ -14,9 +14,9 @@ import {
waitForLoaderToBeRemoved,
within,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import SearchApp from "metabase/search/containers/SearchApp";
import type { SearchFilters } from "metabase/search/types";
+import { checkNotNull } from "metabase/utils/types";
import type { EnabledSearchModel, SearchResult } from "metabase-types/api";
import {
createMockCollection,
diff --git a/frontend/src/metabase/search/utils/user-search-params/user-search-params.ts b/frontend/src/metabase/search/utils/user-search-params/user-search-params.ts
index 408d117f292..4581d0d3b1e 100644
--- a/frontend/src/metabase/search/utils/user-search-params/user-search-params.ts
+++ b/frontend/src/metabase/search/utils/user-search-params/user-search-params.ts
@@ -1,5 +1,5 @@
-import { isNotNull } from "metabase/lib/types";
import type { SearchQueryParamValue } from "metabase/search/types";
+import { isNotNull } from "metabase/utils/types";
import type { UserId } from "metabase-types/api";
export const parseUserIdArray = (value: SearchQueryParamValue): UserId[] => {
diff --git a/frontend/src/metabase/selectors/data.ts b/frontend/src/metabase/selectors/data.ts
index fe92409d755..9cae056fc5b 100644
--- a/frontend/src/metabase/selectors/data.ts
+++ b/frontend/src/metabase/selectors/data.ts
@@ -1,4 +1,4 @@
-import { getEngineNativeType } from "metabase/lib/engine";
+import { getEngineNativeType } from "metabase/databases/utils/engine";
import type DatabaseEntity from "metabase-lib/v1/metadata/Database";
import type { Database } from "metabase-types/api";
diff --git a/frontend/src/metabase/selectors/data.unit.spec.ts b/frontend/src/metabase/selectors/data.unit.spec.ts
index ca819927c3d..d47fff158bb 100644
--- a/frontend/src/metabase/selectors/data.unit.spec.ts
+++ b/frontend/src/metabase/selectors/data.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockMetadata } from "__support__/metadata";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { Database } from "metabase-types/api";
import { createMockDatabase } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/selectors/embed.ts b/frontend/src/metabase/selectors/embed.ts
index cb491881152..05ec0ec72ba 100644
--- a/frontend/src/metabase/selectors/embed.ts
+++ b/frontend/src/metabase/selectors/embed.ts
@@ -1,4 +1,4 @@
-import { isWithinIframe } from "metabase/lib/dom";
+import { isWithinIframe } from "metabase/utils/iframe";
import type {
InteractiveEmbeddingOptionsState,
State,
diff --git a/frontend/src/metabase/selectors/metadata.unit.spec.ts b/frontend/src/metabase/selectors/metadata.unit.spec.ts
index 95ca6b15ba7..e21ac4a5e48 100644
--- a/frontend/src/metabase/selectors/metadata.unit.spec.ts
+++ b/frontend/src/metabase/selectors/metadata.unit.spec.ts
@@ -1,6 +1,6 @@
import { createMockEntitiesState } from "__support__/store";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import Metadata from "metabase-lib/v1/metadata/Metadata";
import {
createMockDatabase,
diff --git a/frontend/src/metabase/selectors/settings.ts b/frontend/src/metabase/selectors/settings.ts
index 49bc8596c16..0f4d0693b9c 100644
--- a/frontend/src/metabase/selectors/settings.ts
+++ b/frontend/src/metabase/selectors/settings.ts
@@ -161,7 +161,7 @@ export const getDocsUrlForVersion = (
anchor = `#${anchor}`;
}
- // eslint-disable-next-line metabase/no-unconditional-metabase-links-render -- This function is only used by this file and "metabase/lib/settings"
+ // eslint-disable-next-line metabase/no-unconditional-metabase-links-render -- This function is only used by this file and "metabase/utils/settings"
return `https://www.metabase.com/docs/${tag}/${page}${anchor}`;
};
diff --git a/frontend/src/metabase/services.js b/frontend/src/metabase/services.js
index f47c9d5ea64..4ee88fbfb28 100644
--- a/frontend/src/metabase/services.js
+++ b/frontend/src/metabase/services.js
@@ -1,4 +1,4 @@
-import api, { DELETE, GET, POST, PUT } from "metabase/lib/api";
+import api, { DELETE, GET, POST, PUT } from "metabase/utils/api";
import Question from "metabase-lib/v1/Question";
import { normalizeParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
import { isNative } from "metabase-lib/v1/queries/utils/card";
diff --git a/frontend/src/metabase/services.unit.spec.ts b/frontend/src/metabase/services.unit.spec.ts
index daa95a7b402..ce47db3478b 100644
--- a/frontend/src/metabase/services.unit.spec.ts
+++ b/frontend/src/metabase/services.unit.spec.ts
@@ -1,8 +1,8 @@
import fetchMock from "fetch-mock";
import { createMockEntitiesState } from "__support__/store";
-import { defer } from "metabase/lib/promise";
import { getMetadata } from "metabase/selectors/metadata";
+import { defer } from "metabase/utils/promise";
import Question from "metabase-lib/v1/Question";
import type {
Card,
diff --git a/frontend/src/metabase/setup/actions.ts b/frontend/src/metabase/setup/actions.ts
index 36f96d53b46..985aee2f80a 100644
--- a/frontend/src/metabase/setup/actions.ts
+++ b/frontend/src/metabase/setup/actions.ts
@@ -7,12 +7,12 @@ import {
updateSettings,
} from "metabase/admin/settings/settings";
import { userApi } from "metabase/api";
-import { loadLocalization } from "metabase/lib/i18n";
-import { createAsyncThunk } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
import { updateSetting } from "metabase/redux/settings";
import { getSetting } from "metabase/selectors/settings";
import { SetupApi } from "metabase/services";
+import { loadLocalization } from "metabase/utils/i18n";
+import { createAsyncThunk } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import type { DatabaseData, Settings, UsageReason } from "metabase-types/api";
import type { InviteInfo, Locale, State, UserInfo } from "metabase-types/store";
diff --git a/frontend/src/metabase/setup/actions.unit.spec.ts b/frontend/src/metabase/setup/actions.unit.spec.ts
index d4ea613bd58..7f0bea07d11 100644
--- a/frontend/src/metabase/setup/actions.unit.spec.ts
+++ b/frontend/src/metabase/setup/actions.unit.spec.ts
@@ -1,5 +1,5 @@
import { userApi } from "metabase/api";
-import type { DispatchFn } from "metabase/lib/redux";
+import type { DispatchFn } from "metabase/utils/redux";
import type { InviteInfo, State } from "metabase-types/store";
import { submitUserInvite } from "./actions";
diff --git a/frontend/src/metabase/setup/analytics.ts b/frontend/src/metabase/setup/analytics.ts
index 25be1497411..55e1462d15c 100644
--- a/frontend/src/metabase/setup/analytics.ts
+++ b/frontend/src/metabase/setup/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
import type { SetupVersion } from "metabase-types/analytics/setup";
import type { UsageReason } from "metabase-types/api";
diff --git a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx
index 067bb707ccc..ba550aa2851 100644
--- a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx
+++ b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx
@@ -1,7 +1,7 @@
import type { ReactNode } from "react";
-import { useSelector } from "metabase/lib/redux";
import { getShouldShowStepNumber } from "metabase/setup";
+import { useSelector } from "metabase/utils/redux";
import {
StepLabel,
diff --git a/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx b/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx
index 5a3eb645b67..33163bc613c 100644
--- a/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx
+++ b/frontend/src/metabase/setup/components/CloudMigrationHelp/CloudMigrationHelp.tsx
@@ -1,8 +1,8 @@
import { t } from "ttag";
import { HelpCard } from "metabase/common/components/HelpCard";
-import { useSelector } from "metabase/lib/redux";
import { migrateToCloudGuideUrl } from "metabase/selectors/settings";
+import { useSelector } from "metabase/utils/redux";
import { getIsHosted } from "../../selectors";
import { useStep } from "../../useStep";
diff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx
index 02d704d060a..153dcd4ecaf 100644
--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx
+++ b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx
@@ -3,9 +3,9 @@ import { type ChangeEvent, useState } from "react";
import { t } from "ttag";
import ButtonsS from "metabase/css/components/buttons.module.css";
-import { useSelector } from "metabase/lib/redux";
import { subscribeToNewsletter } from "metabase/setup/utils";
import { Switch, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { getIsStepActive, getUserEmail } from "../../selectors";
diff --git a/frontend/src/metabase/setup/components/CompletedStep/analytics.ts b/frontend/src/metabase/setup/components/CompletedStep/analytics.ts
index 4e3224cfc83..1409698347e 100644
--- a/frontend/src/metabase/setup/components/CompletedStep/analytics.ts
+++ b/frontend/src/metabase/setup/components/CompletedStep/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
export const trackNewsletterToggleClicked = (optedIn: boolean) =>
trackSimpleEvent({
diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx
index da26421fd87..11c17f2e192 100644
--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx
+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx
@@ -5,7 +5,7 @@ import { jt, t } from "ttag";
import { ActionButton } from "metabase/common/components/ActionButton";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { goToNextStep, updateTracking } from "../../actions";
import { getIsTrackingAllowed } from "../../selectors";
diff --git a/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsx b/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsx
index f924c9af254..ce2139b23cc 100644
--- a/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsx
+++ b/frontend/src/metabase/setup/components/DatabaseHelp/DatabaseHelp.tsx
@@ -1,5 +1,5 @@
import { DatabaseHelpCard } from "metabase/databases/components/DatabaseHelpCard";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { getDatabaseEngine, getIsStepActive } from "../../selectors";
import { SetupCardContainer } from "../SetupCardContainer";
diff --git a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx
index 81d18a61c69..c10d464750a 100644
--- a/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx
+++ b/frontend/src/metabase/setup/components/DatabaseStep/DatabaseStep.tsx
@@ -3,7 +3,6 @@ import { c, t } from "ttag";
import { useToast } from "metabase/common/hooks";
import { DatabaseForm } from "metabase/databases/components/DatabaseForm";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
getDatabase,
getDatabaseEngine,
@@ -12,6 +11,7 @@ import {
getUser,
} from "metabase/setup";
import { Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { DatabaseData } from "metabase-types/api";
import type { InviteInfo } from "metabase-types/store";
diff --git a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx
index e388e58e86a..7316caaf76e 100644
--- a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx
+++ b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx
@@ -5,7 +5,7 @@ import * as Yup from "yup";
import { FormInput } from "metabase/common/components/FormInput";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import type { InviteInfo, UserInfo } from "metabase-types/store";
import S from "./InviteUserForm.module.css";
diff --git a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx
index f9d5a34e2cc..9599ce4bc39 100644
--- a/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx
+++ b/frontend/src/metabase/setup/components/LanguageSelector/LanguageSelector.tsx
@@ -3,13 +3,13 @@ import { t } from "ttag";
import { findWhere } from "underscore";
import { useUpdateSettingsMutation } from "metabase/api";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
getAvailableLocales,
getLocale,
getUser,
} from "metabase/setup/selectors";
import { Select } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { updateLocale } from "../../actions";
import { getLocales } from "../../utils";
diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx
index e275387cbb7..acdaef3e75f 100644
--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx
+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx
@@ -4,8 +4,8 @@ import _ from "underscore";
import { Button } from "metabase/common/components/Button";
import { CommunityLocalizationNotice } from "metabase/common/components/CommunityLocalizationNotice";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Stack } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Locale } from "metabase-types/store";
import { useStep } from "../..//useStep";
diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx
index 7e26363cc11..1cfc14e92d9 100644
--- a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx
+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import { useToast } from "metabase/common/hooks/use-toast";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { useStep } from "metabase/setup/useStep";
import { Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { submitLicenseToken } from "../../actions";
import { ActiveStep } from "../ActiveStep";
diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx
index 256bbd24952..5caf72455c8 100644
--- a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx
+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.tsx
@@ -1,6 +1,6 @@
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
export const LICENSE_TOKEN_SCHEMA = Yup.object({
license_token: Yup.string()
diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx
index b9539a285cb..d7597abbaa7 100644
--- a/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx
+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/constants.unit.spec.tsx
@@ -1,4 +1,4 @@
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import { LICENSE_TOKEN_SCHEMA } from "./constants";
diff --git a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
index 6872db02beb..f08df37e957 100644
--- a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
+++ b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
@@ -1,9 +1,9 @@
import { getLocalizationNoticeText } from "metabase/common/components/CommunityLocalizationNotice";
import { LogoIcon } from "metabase/common/components/LogoIcon";
-import { useSelector } from "metabase/lib/redux";
import { getSteps } from "metabase/setup/selectors";
import type { SetupStep } from "metabase/setup/types";
import { Box, Flex, Icon, Text, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { CloudMigrationHelp } from "../CloudMigrationHelp";
import { CompletedStep } from "../CompletedStep";
diff --git a/frontend/src/metabase/setup/components/Setup/Setup.tsx b/frontend/src/metabase/setup/components/Setup/Setup.tsx
index f22dcb8c747..dee85dcc0c5 100644
--- a/frontend/src/metabase/setup/components/Setup/Setup.tsx
+++ b/frontend/src/metabase/setup/components/Setup/Setup.tsx
@@ -1,7 +1,7 @@
import { useEffect } from "react";
import { useUpdate } from "react-use";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { trackStepSeen } from "../../analytics";
import { getIsLocaleLoaded, getStep, getSteps } from "../../selectors";
diff --git a/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx b/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx
index e6f5c5423e3..979f2bb6bcf 100644
--- a/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx
+++ b/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx
@@ -2,8 +2,8 @@ import { useState } from "react";
import { t } from "ttag";
import { Button } from "metabase/common/components/Button";
-import { useDispatch } from "metabase/lib/redux";
import { Divider, Radio, Stack, Text } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import type { UsageReason } from "metabase-types/api";
import { submitUsageReason } from "../../actions";
diff --git a/frontend/src/metabase/setup/components/UserForm/UserForm.tsx b/frontend/src/metabase/setup/components/UserForm/UserForm.tsx
index 6247bd5b815..722fa01c8e7 100644
--- a/frontend/src/metabase/setup/components/UserForm/UserForm.tsx
+++ b/frontend/src/metabase/setup/components/UserForm/UserForm.tsx
@@ -6,9 +6,9 @@ import * as Yup from "yup";
import { FormInput } from "metabase/common/components/FormInput";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { Form, FormProvider, useFormSubmitButton } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { validatePassword } from "metabase/setup/utils";
import { Flex } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { UserInfo } from "metabase-types/store";
import { UserFieldGroup } from "./UserForm.styled";
diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.tsx
index 8a457712ad7..f9bc3e82ffc 100644
--- a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx
+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { UserInfo } from "metabase-types/store";
import { submitUser } from "../../actions";
diff --git a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsx b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsx
index 280019b68ee..68ade3b4f2a 100644
--- a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsx
+++ b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.tsx
@@ -3,7 +3,7 @@ import { useTimeout } from "react-use";
import { t } from "ttag";
import { DefaultLogoIcon } from "metabase/common/components/LogoIcon";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { goToNextStep, loadDefaults } from "../../actions";
import { LOCALE_TIMEOUT } from "../../constants";
diff --git a/frontend/src/metabase/setup/selectors.ts b/frontend/src/metabase/setup/selectors.ts
index e4307487778..4988cb9c918 100644
--- a/frontend/src/metabase/setup/selectors.ts
+++ b/frontend/src/metabase/setup/selectors.ts
@@ -1,6 +1,6 @@
import { createSelector } from "@reduxjs/toolkit";
-import { isEEBuild } from "metabase/lib/utils";
+import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
import type {
DatabaseData,
@@ -116,7 +116,8 @@ export const getSteps = createSelector(
const shouldShowDBConnectionStep = usageReason !== "embedding";
const shouldShowLicenseStep =
- isEEBuild() && (!isPaidPlan || hasAddedPaidPlanInPreviousStep);
+ PLUGIN_IS_EE_BUILD.isEEBuild() &&
+ (!isPaidPlan || hasAddedPaidPlanInPreviousStep);
// note: when hosting is true, we should be on cloud and therefore not show
// the token step. There is an edge case that it's probably not possible in
diff --git a/frontend/src/metabase/setup/useStep.ts b/frontend/src/metabase/setup/useStep.ts
index 887367f510e..a7b0de86d11 100644
--- a/frontend/src/metabase/setup/useStep.ts
+++ b/frontend/src/metabase/setup/useStep.ts
@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { selectStep } from "./actions";
import {
diff --git a/frontend/src/metabase/setup/utils.ts b/frontend/src/metabase/setup/utils.ts
index 06b66fdd53f..313d1888997 100644
--- a/frontend/src/metabase/setup/utils.ts
+++ b/frontend/src/metabase/setup/utils.ts
@@ -1,8 +1,8 @@
import { getIn } from "icepick";
import _ from "underscore";
-import MetabaseSettings from "metabase/lib/settings";
import { UtilApi } from "metabase/services";
+import { passwordComplexityDescription } from "metabase/utils/password";
import type { LocaleData } from "metabase-types/api";
import type { Locale } from "metabase-types/store";
@@ -31,7 +31,7 @@ export const getDefaultLocale = (
};
export const validatePassword = async (password: string) => {
- const error = MetabaseSettings.passwordComplexityDescription(password);
+ const error = passwordComplexityDescription(password);
if (error) {
return error;
}
diff --git a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
index f790682a716..c47e596b6f9 100644
--- a/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
+++ b/frontend/src/metabase/static-viz/components/FunnelChart/utils/funnel.ts
@@ -1,9 +1,9 @@
import type { PolygonProps } from "@visx/shape/lib/shapes/Polygon";
-import { isNotNull } from "metabase/lib/types";
import { CHAR_SIZES_FONT_WEIGHT } from "metabase/static-viz/constants/char-sizes";
import { formatNumber, formatPercent } from "metabase/static-viz/lib/numbers";
import { measureTextWidth } from "metabase/static-viz/lib/text";
+import { isNotNull } from "metabase/utils/types";
import { truncateText } from "metabase/visualizations/lib/text";
import type { TextWidthMeasurer } from "metabase/visualizations/shared/types/measure-text";
diff --git a/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsx b/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsx
index 4869265573e..5991af18315 100644
--- a/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsx
+++ b/frontend/src/metabase/static-viz/components/ProgressBar/ProgressBar.tsx
@@ -4,7 +4,7 @@ import { scaleLinear } from "@visx/scale";
import { useMemo } from "react";
import { c } from "ttag";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import {
calculateProgressMetrics,
extractProgressValue,
diff --git a/frontend/src/metabase/static-viz/index.js b/frontend/src/metabase/static-viz/index.js
index 2449c87351b..db5f33aa416 100644
--- a/frontend/src/metabase/static-viz/index.js
+++ b/frontend/src/metabase/static-viz/index.js
@@ -6,13 +6,13 @@ import ReactDOMServer from "react-dom/server";
// eslint-disable-next-line import/order
import enterpriseOverrides from "ee-overrides";
-import "metabase/lib/dayjs";
+import "metabase/utils/dayjs";
-import { updateStartOfWeek } from "metabase/lib/i18n";
-import MetabaseSettings from "metabase/lib/settings";
import { StaticVisualization } from "metabase/static-viz/components/StaticVisualization";
import { createStaticRenderingContext } from "metabase/static-viz/lib/rendering-context";
import { measureTextEChartsAdapter } from "metabase/static-viz/lib/text";
+import { updateStartOfWeek } from "metabase/utils/i18n";
+import MetabaseSettings from "metabase/utils/settings";
import { extractRemappings, isCartesianChart } from "metabase/visualizations";
import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";
import {
diff --git a/frontend/src/metabase/static-viz/lib/numbers.ts b/frontend/src/metabase/static-viz/lib/numbers.ts
index 5ca80ba6c39..beb2d1b46d8 100644
--- a/frontend/src/metabase/static-viz/lib/numbers.ts
+++ b/frontend/src/metabase/static-viz/lib/numbers.ts
@@ -1,5 +1,5 @@
-import type { CurrencyStyle } from "metabase/lib/formatting";
-import { formatNumber as appFormatNumber } from "metabase/lib/formatting/numbers";
+import type { CurrencyStyle } from "metabase/utils/formatting";
+import { formatNumber as appFormatNumber } from "metabase/utils/formatting/numbers";
export type NumberStyle = "currency" | "decimal" | "scientific" | "percentage";
diff --git a/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsx b/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsx
index 68745de0aa5..37f70fad924 100644
--- a/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsx
+++ b/frontend/src/metabase/status/components/AnalyticsExportStatus/AnalyticsExportStatus.tsx
@@ -1,11 +1,11 @@
import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
clearExport,
getAnalyticsExport,
} from "metabase/redux/analytics-export";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import useStatusVisibility from "../../hooks/use-status-visibility";
import StatusLarge from "../StatusLarge";
diff --git a/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx b/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx
index f94083e8b90..f3b166b7346 100644
--- a/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx
+++ b/frontend/src/metabase/status/components/DatabaseStatus/DatabaseStatus.tsx
@@ -1,9 +1,9 @@
import { useEffect, useState } from "react";
import { useListDatabasesQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
-import { isSyncInProgress } from "metabase/lib/syncing";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
+import { isSyncInProgress } from "metabase/utils/syncing";
import type { Database, User } from "metabase-types/api";
import useStatusVisibility from "../../hooks/use-status-visibility";
diff --git a/frontend/src/metabase/status/components/DatabaseStatusLarge/DatabaseStatusLarge.tsx b/frontend/src/metabase/status/components/DatabaseStatusLarge/DatabaseStatusLarge.tsx
index 6c64c8d5fd9..a0fe051fc08 100644
--- a/frontend/src/metabase/status/components/DatabaseStatusLarge/DatabaseStatusLarge.tsx
+++ b/frontend/src/metabase/status/components/DatabaseStatusLarge/DatabaseStatusLarge.tsx
@@ -4,7 +4,7 @@ import {
isSyncAborted,
isSyncCompleted,
isSyncInProgress,
-} from "metabase/lib/syncing";
+} from "metabase/utils/syncing";
import type { Database } from "metabase-types/api";
import StatusLarge from "../StatusLarge";
diff --git a/frontend/src/metabase/status/components/DatabaseStatusSmall/DatabaseStatusSmall.tsx b/frontend/src/metabase/status/components/DatabaseStatusSmall/DatabaseStatusSmall.tsx
index 57c65d048e7..3095be3c5e8 100644
--- a/frontend/src/metabase/status/components/DatabaseStatusSmall/DatabaseStatusSmall.tsx
+++ b/frontend/src/metabase/status/components/DatabaseStatusSmall/DatabaseStatusSmall.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { isSyncAborted, isSyncInProgress } from "metabase/lib/syncing";
+import { isSyncAborted, isSyncInProgress } from "metabase/utils/syncing";
import type { Database, InitialSyncStatus } from "metabase-types/api";
import StatusSmall from "../StatusSmall";
diff --git a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsx b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsx
index 867f4047735..b9e76e1a675 100644
--- a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsx
+++ b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.tsx
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useState } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { clearAll, getDownloads } from "metabase/redux/downloads";
import useStatusVisibility from "metabase/status/hooks/use-status-visibility";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { DownloadsStatusLarge } from "../DownloadsStatusLarge";
import { DownloadsStatusSmall } from "../DownloadsStatusSmall";
diff --git a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx
index ffbc782cb70..0a36e3799e3 100644
--- a/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx
+++ b/frontend/src/metabase/status/components/DownloadsStatus/DownloadsStatus.unit.spec.tsx
@@ -11,12 +11,16 @@ import { createMockState } from "metabase-types/store/mocks";
import { DownloadsStatus } from "./DownloadsStatus";
-jest.mock("metabase/lib/dom", () => ({
- ...jest.requireActual("metabase/lib/dom"),
+jest.mock("metabase/utils/dom", () => ({
+ ...jest.requireActual("metabase/utils/dom"),
+ openSaveDialog: jest.fn(),
+}));
+
+jest.mock("metabase/utils/iframe", () => ({
+ ...jest.requireActual("metabase/utils/iframe"),
// For some reason, this is undefined. I think it's because we're requiring while mocking, but
// It's unclear.
isWithinIframe: () => false,
- openSaveDialog: jest.fn(),
}));
const getDownloadDatasetAction = () =>
diff --git a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx
index 2a445be737b..49a5f6c8e99 100644
--- a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx
+++ b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.tsx
@@ -2,10 +2,10 @@ import _ from "underscore";
import ErrorBoundary from "metabase/ErrorBoundary";
import { useCollectionQuery, useTableQuery } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { isUploadAborted, isUploadInProgress } from "metabase/lib/uploads";
-import { isEmpty } from "metabase/lib/validate";
import { clearAllUploads, getAllUploads } from "metabase/redux/uploads";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { isUploadAborted, isUploadInProgress } from "metabase/utils/uploads";
+import { isEmpty } from "metabase/utils/validate";
import type { CollectionId, TableId } from "metabase-types/api";
import type { FileUpload } from "metabase-types/store/upload";
diff --git a/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx b/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx
index d68e51e7bcc..705b91a4ed2 100644
--- a/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx
+++ b/frontend/src/metabase/status/components/FileUploadStatusLarge/FileUploadStatusLarge.tsx
@@ -4,13 +4,13 @@ import { t } from "ttag";
import { Button } from "metabase/common/components/Button";
import { Link } from "metabase/common/components/Link";
+import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";
+import { Box, Stack } from "metabase/ui";
import {
isUploadAborted,
isUploadCompleted,
isUploadInProgress,
-} from "metabase/lib/uploads";
-import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";
-import { Box, Stack } from "metabase/ui";
+} from "metabase/utils/uploads";
import type Table from "metabase-lib/v1/metadata/Table";
import type { Collection } from "metabase-types/api";
import { type FileUpload, UploadMode } from "metabase-types/store/upload";
diff --git a/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx b/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx
index d5ae12a83d4..26067710567 100644
--- a/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx
+++ b/frontend/src/metabase/status/components/StatusListing/StatusListing.tsx
@@ -1,7 +1,6 @@
import { useBeforeUnload } from "react-use";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import {
PLUGIN_REMOTE_SYNC,
PLUGIN_REPLACEMENT,
@@ -10,6 +9,7 @@ import {
import { hasActiveUploads } from "metabase/redux/uploads";
import { getUserIsAdmin } from "metabase/selectors/user";
import { useCheckActiveDownloadsBeforeUnload } from "metabase/status/hooks/use-check-active-downloads-before-unload";
+import { useSelector } from "metabase/utils/redux";
import { AnalyticsExportStatus } from "../AnalyticsExportStatus";
import { DatabaseStatus } from "../DatabaseStatus";
diff --git a/frontend/src/metabase/status/components/utils/status.ts b/frontend/src/metabase/status/components/utils/status.ts
index 62f9563bdc4..17583ec3cb7 100644
--- a/frontend/src/metabase/status/components/utils/status.ts
+++ b/frontend/src/metabase/status/components/utils/status.ts
@@ -1,5 +1,5 @@
-import { isReducedMotionPreferred } from "metabase/lib/dom";
import type { IconName } from "metabase/ui";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
import type { LongTaskStatus } from "metabase-types/api";
export const getIconName = (status: LongTaskStatus): IconName => {
diff --git a/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.ts b/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.ts
index a1d9d99351f..4b6c4c44591 100644
--- a/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.ts
+++ b/frontend/src/metabase/status/hooks/use-check-active-downloads-before-unload.ts
@@ -1,8 +1,8 @@
import { useBeforeUnload } from "react-use";
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { hasActiveDownloads } from "metabase/redux/downloads";
+import { useSelector } from "metabase/utils/redux";
export const useCheckActiveDownloadsBeforeUnload = () => {
const downloadInProgress = useSelector(hasActiveDownloads);
diff --git a/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx b/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx
index ccaceaf4cf6..ca6cf8cf698 100644
--- a/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx
+++ b/frontend/src/metabase/styled-components/containers/GlobalStyles/GlobalStyles.tsx
@@ -9,10 +9,10 @@ import {
isPublicEmbedding,
isStaticEmbedding,
} from "metabase/embedding/config";
-import { getSitePath } from "metabase/lib/dom";
-import { useSelector } from "metabase/lib/redux";
import { getMetabaseCssVariables } from "metabase/styled-components/theme/css-variables";
import { useMantineTheme } from "metabase/ui";
+import { getSitePath } from "metabase/utils/dom";
+import { useSelector } from "metabase/utils/redux";
import { saveDomImageStyles } from "metabase/visualizations/lib/image-exports";
import { getFont, getFontFiles } from "../../selectors";
diff --git a/frontend/src/metabase/styled-components/theme/css-variables.ts b/frontend/src/metabase/styled-components/theme/css-variables.ts
index 044ebfdc30d..ca1cc8612a1 100644
--- a/frontend/src/metabase/styled-components/theme/css-variables.ts
+++ b/frontend/src/metabase/styled-components/theme/css-variables.ts
@@ -12,10 +12,10 @@ import {
SDK_TO_MAIN_APP_TOOLTIP_COLORS_MAPPING,
SDK_UNCHANGEABLE_COLORS,
} from "metabase/embedding-sdk/theme/embedding-color-palette";
-import type { ResolvedColorScheme } from "metabase/lib/color-scheme";
import type { MantineTheme } from "metabase/ui";
import { deriveFullMetabaseTheme } from "metabase/ui/colors";
import type { ColorName } from "metabase/ui/colors/types";
+import type { ResolvedColorScheme } from "metabase/utils/color-scheme";
import type { ColorSettings } from "metabase-types/api";
const createColorVars = (
diff --git a/frontend/src/metabase/timelines/collections/actions.ts b/frontend/src/metabase/timelines/collections/actions.ts
index 3e799c7d626..cf12d4f44df 100644
--- a/frontend/src/metabase/timelines/collections/actions.ts
+++ b/frontend/src/metabase/timelines/collections/actions.ts
@@ -1,7 +1,7 @@
import { push } from "react-router-redux";
import { Timelines } from "metabase/entities/timelines";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { Timeline } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx
index f6ae50014e7..3d3363fac40 100644
--- a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx
+++ b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.tsx
@@ -3,10 +3,10 @@ import { t } from "ttag";
import { EntityMenu } from "metabase/common/components/EntityMenu";
import { Link } from "metabase/common/components/Link";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting";
-import Settings from "metabase/lib/settings";
-import * as Urls from "metabase/lib/urls";
import type { IconName } from "metabase/ui";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting";
+import Settings from "metabase/utils/settings";
+import * as Urls from "metabase/utils/urls";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx
index b20e16cb604..663deb271d7 100644
--- a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx
+++ b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.tsx
@@ -2,9 +2,12 @@ import { memo } from "react";
import { msgid, ngettext, t } from "ttag";
import { EntityMenu } from "metabase/common/components/EntityMenu";
-import { getEventCount, getTimelineName } from "metabase/lib/timelines";
-import * as Urls from "metabase/lib/urls";
+import {
+ getEventCount,
+ getTimelineName,
+} from "metabase/common/utils/timelines";
import type { IconName } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { Timeline } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx
index bc1ccaddc71..186ce6a64bb 100644
--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx
+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx
@@ -5,12 +5,12 @@ import _ from "underscore";
import { EntityMenu } from "metabase/common/components/EntityMenu";
import type { InputProps } from "metabase/common/components/Input";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
+import { getTimelineName } from "metabase/common/utils/timelines";
import ButtonsS from "metabase/css/components/buttons.module.css";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import { getTimelineName } from "metabase/lib/timelines";
-import * as Urls from "metabase/lib/urls";
import ModalHeader from "metabase/timelines/common/components/ModalHeader";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
+import * as Urls from "metabase/utils/urls";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { MenuItem } from "../../types";
diff --git a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx
index 9e81209cb38..1387caeca90 100644
--- a/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx
+++ b/frontend/src/metabase/timelines/collections/components/TimelineEmptyState/TimelineEmptyState.tsx
@@ -2,10 +2,10 @@ import { c, t } from "ttag";
import EmptyEvent from "assets/img/empty-states/event.svg";
import { Link } from "metabase/common/components/Link";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Box, Button, Stack, Text, Title, Tooltip } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection, Timeline } from "metabase-types/api";
export interface TimelineEmptyStateProps {
diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx
index d3f24ed0344..f4b6277410d 100644
--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx
+++ b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx
@@ -5,9 +5,9 @@ import { EntityMenu } from "metabase/common/components/EntityMenu";
import {
getDefaultTimelineName,
getSortedTimelines,
-} from "metabase/lib/timelines";
-import * as Urls from "metabase/lib/urls";
+} from "metabase/common/utils/timelines";
import ModalHeader from "metabase/timelines/common/components/ModalHeader";
+import * as Urls from "metabase/utils/urls";
import type { Collection, Timeline } from "metabase-types/api";
import SearchEmptyState from "../SearchEmptyState";
diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx
index 200bbd0b14f..5b687dc93bd 100644
--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx
@@ -3,9 +3,9 @@ import _ from "underscore";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import DeleteEventModal from "metabase/timelines/common/components/DeleteEventModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx
index 6f823170bcd..be20931bbb0 100644
--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx
@@ -2,9 +2,9 @@ import { push } from "react-router-redux";
import _ from "underscore";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import DeleteTimelineModal from "metabase/timelines/common/components/DeleteTimelineModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx
index eebfe920048..397f349ba0d 100644
--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx
@@ -3,9 +3,9 @@ import _ from "underscore";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import EditEventModal from "metabase/timelines/common/components/EditEventModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx
index 5a89b547848..c2ae75769fa 100644
--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx
@@ -2,9 +2,9 @@ import { push } from "react-router-redux";
import _ from "underscore";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import EditTimelineModal from "metabase/timelines/common/components/EditTimelineModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
index 320e0b65662..241a23ca899 100644
--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
@@ -4,9 +4,9 @@ import _ from "underscore";
import { Collections } from "metabase/entities/collections";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import MoveEventModal from "metabase/timelines/common/components/MoveEventModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx
index 4ada3074a33..733bac46855 100644
--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx
@@ -1,9 +1,9 @@
import _ from "underscore";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import MoveTimelineModal from "metabase/timelines/common/components/MoveTimelineModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx
index bee0c54f2df..71f63d96679 100644
--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx
@@ -3,9 +3,9 @@ import _ from "underscore";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import NewEventModal from "metabase/timelines/common/components/NewEventModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx
index 27050a1baf5..a8580693e52 100644
--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx
@@ -3,9 +3,9 @@ import _ from "underscore";
import { Collections } from "metabase/entities/collections";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import NewEventModal from "metabase/timelines/common/components/NewEventModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx
index 773c5d5c24c..b33446c6d18 100644
--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx
@@ -3,9 +3,9 @@ import _ from "underscore";
import { Collections } from "metabase/entities/collections";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx
index 6ae3f9f9155..297f021f940 100644
--- a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx
@@ -3,8 +3,8 @@ import _ from "underscore";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx
index 72ed56e5783..4b88b0e4b6d 100644
--- a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx
@@ -3,8 +3,8 @@ import _ from "underscore";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx
index 7e6ba276236..15818842520 100644
--- a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx
@@ -1,5 +1,5 @@
import { Timelines } from "metabase/entities/timelines";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { State } from "metabase-types/store";
import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";
diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx
index b011cb56899..92c9028b305 100644
--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx
@@ -3,8 +3,8 @@ import _ from "underscore";
import { Collections } from "metabase/entities/collections";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
+import { connect } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Collection, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx
index 3b8cb7c78d9..be14a01ca15 100644
--- a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx
@@ -2,7 +2,7 @@ import _ from "underscore";
import { Collections } from "metabase/entities/collections";
import { Timelines } from "metabase/entities/timelines";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { State } from "metabase-types/store";
import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";
diff --git a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
index 863295e9831..0970891e5d5 100644
--- a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
+++ b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
@@ -3,6 +3,10 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import * as Yup from "yup";
+import {
+ getTimelineIcons,
+ getTimelineName,
+} from "metabase/common/utils/timelines";
import {
Form,
FormDateInput,
@@ -13,9 +17,6 @@ import {
FormTextInput,
FormTextarea,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import { getTimelineIcons, getTimelineName } from "metabase/lib/timelines";
import {
Button,
Flex,
@@ -25,6 +26,8 @@ import {
Stack,
TimeInput,
} from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
import type {
FormattingSettings,
Timeline,
diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx
index 5ec41d5b061..65ab108bc70 100644
--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx
@@ -2,7 +2,7 @@ import { useCallback, useMemo, useState } from "react";
import { t } from "ttag";
import { Button } from "metabase/common/components/Button/Button";
-import { getSortedTimelines } from "metabase/lib/timelines";
+import { getSortedTimelines } from "metabase/common/utils/timelines";
import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";
import ModalFooter from "../ModalFooter";
diff --git a/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsx
index df06524c068..cf489c2be39 100644
--- a/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import type { OmniPickerItem } from "metabase/common/components/Pickers";
import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";
-import { getTimelineName } from "metabase/lib/timelines";
+import { getTimelineName } from "metabase/common/utils/timelines";
import type { CollectionId, Timeline } from "metabase-types/api";
export interface MoveTimelineModalProps {
diff --git a/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx
index c4b69c51e3c..37aa957fd80 100644
--- a/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx
@@ -3,7 +3,7 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import { ModalContent } from "metabase/common/components/ModalContent";
-import { getDefaultTimelineIcon } from "metabase/lib/timelines";
+import { getDefaultTimelineIcon } from "metabase/common/utils/timelines";
import type {
Collection,
Timeline,
diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx
index 21c192a544f..5339737d3a2 100644
--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { canonicalCollectionId } from "metabase/collections/utils";
import { ModalContent } from "metabase/common/components/ModalContent";
-import { getDefaultTimelineIcon } from "metabase/lib/timelines";
+import { getDefaultTimelineIcon } from "metabase/common/utils/timelines";
import type { Collection, TimelineData } from "metabase-types/api";
import TimelineForm from "../TimelineForm";
diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx
index 97679d4eea4..d5faa87769a 100644
--- a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx
+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx
@@ -7,9 +7,9 @@ import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormInput } from "metabase/common/components/FormInput";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { FormTextArea } from "metabase/common/components/FormTextArea";
+import { getTimelineIcons } from "metabase/common/utils/timelines";
import { Form, FormProvider } from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { getTimelineIcons } from "metabase/lib/timelines";
+import * as Errors from "metabase/utils/errors";
import type { TimelineData } from "metabase-types/api";
import FormArchiveButton from "../FormArchiveButton";
diff --git a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsx b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsx
index 08ed6bd1170..4fac7bf5922 100644
--- a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsx
+++ b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.tsx
@@ -1,7 +1,7 @@
import { useCallback } from "react";
import { msgid, ngettext } from "ttag";
-import { getEventCount } from "metabase/lib/timelines";
+import { getEventCount } from "metabase/common/utils/timelines";
import type { IconName } from "metabase/ui";
import type { Timeline } from "metabase-types/api";
diff --git a/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx
index 5740655f85a..055ac990c88 100644
--- a/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx
+++ b/frontend/src/metabase/timelines/common/containers/EventForm/EventForm.tsx
@@ -1,5 +1,5 @@
-import { connect } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
+import { connect } from "metabase/utils/redux";
import type { State } from "metabase-types/store";
import type {
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx
index de3208e676f..f214ea86227 100644
--- a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx
+++ b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { CheckBox as Checkbox } from "metabase/common/components/CheckBox/CheckBox";
import { EntityMenu } from "metabase/common/components/EntityMenu";
import { useScrollOnMount } from "metabase/common/hooks/use-scroll-on-mount";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting";
-import Settings from "metabase/lib/settings";
import type { IconName } from "metabase/ui";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting";
+import Settings from "metabase/utils/settings";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx
index 34197966aa6..b16ce39ba5b 100644
--- a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx
+++ b/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx
@@ -3,7 +3,7 @@ import { memo, useCallback, useEffect, useMemo, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { getTimelineName } from "metabase/lib/timelines";
+import { getTimelineName } from "metabase/common/utils/timelines";
import { Ellipsified } from "metabase/ui";
import type { Timeline, TimelineEvent } from "metabase-types/api";
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx
index 7f9839318ae..37e8ab82e4a 100644
--- a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx
+++ b/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
import EmptyEvent from "assets/img/empty-states/event.svg";
-import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
import { Box, Button, Stack, Text, Title } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import type { Collection, Timeline } from "metabase-types/api";
export interface TimelineEmptyStateProps {
diff --git a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx
index 0305da20def..b71098a302e 100644
--- a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx
@@ -2,9 +2,9 @@ import { t } from "ttag";
import _ from "underscore";
import { TimelineEvents } from "metabase/entities/timeline-events";
-import { connect } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
import EditEventModal from "metabase/timelines/common/components/EditEventModal";
+import { connect } from "metabase/utils/redux";
import type { TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
index 894e124ccd0..15682793274 100644
--- a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
@@ -3,8 +3,8 @@ import _ from "underscore";
import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
import MoveEventModal from "metabase/timelines/common/components/MoveEventModal";
+import { connect } from "metabase/utils/redux";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
index 93d3c70d3cb..e479b2f4c20 100644
--- a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
@@ -4,9 +4,9 @@ import _ from "underscore";
import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
import NewEventModal from "metabase/timelines/common/components/NewEventModal";
+import { connect } from "metabase/utils/redux";
import type { Collection, TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx
index 1002ad592cf..6cd8da24b76 100644
--- a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx
@@ -2,7 +2,7 @@ import _ from "underscore";
import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
import { TimelineEvents } from "metabase/entities/timeline-events";
-import { connect } from "metabase/lib/redux";
+import { connect } from "metabase/utils/redux";
import type { TimelineEvent } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/transforms/analytics.ts b/frontend/src/metabase/transforms/analytics.ts
index 781ec830a0b..ae421c2f0b8 100644
--- a/frontend/src/metabase/transforms/analytics.ts
+++ b/frontend/src/metabase/transforms/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type {
InspectorCardId,
InspectorLensId,
diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
index 82b3db5862c..11f8fcb7f18 100644
--- a/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/IncrementalTransformSettings.tsx
@@ -3,7 +3,6 @@ import { t } from "ttag";
import { useDocsUrl } from "metabase/common/hooks";
import { FormSelect } from "metabase/forms";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
import { TitleSection } from "metabase/transforms/components/TitleSection";
@@ -22,6 +21,7 @@ import {
Text,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { TransformSource } from "metabase-types/api";
import type { TransformType } from "metabase-types/api/transform";
diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx
index 828971cf4b5..e3057aa8f27 100644
--- a/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/KeysetColumnSelect/PythonKeysetColumnSelect.tsx
@@ -2,9 +2,9 @@ import { skipToken } from "@reduxjs/toolkit/query";
import { useMemo } from "react";
import { useGetTableQueryMetadataQuery } from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import type { DataAttributes, InputDescriptionProps } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { PythonTransformTableAliases } from "metabase-types/api";
diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/form.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/form.ts
index a6e2c2a31cb..2b7a9be0e55 100644
--- a/frontend/src/metabase/transforms/components/IncrementalTransform/form.ts
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/form.ts
@@ -1,6 +1,6 @@
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
+import * as Errors from "metabase/utils/errors";
import type {
Transform,
TransformSource,
diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts
index 3ef5d024a1f..059675659d8 100644
--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useHasCheckpointOptions.ts
@@ -5,9 +5,9 @@ import {
useGetAdhocQueryMetadataQuery,
useGetTableQueryMetadataQuery,
} from "metabase/api";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { getLibQuery, isMbqlQuery } from "metabase/transforms/utils";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { TransformSource } from "metabase-types/api";
import { isConcreteTableId } from "metabase-types/api/table";
diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts
index a23834b79ce..e8ea968a8b8 100644
--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useNativeCheckpointFieldOptions.ts
@@ -1,8 +1,8 @@
import { useMemo } from "react";
-import { useSelector } from "metabase/lib/redux";
import { getMetadata } from "metabase/selectors/metadata";
import type { SelectOption } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { isConcreteTableId } from "metabase-types/api/table";
diff --git a/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.ts b/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.ts
index 02222efe574..c75afcfeabf 100644
--- a/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.ts
+++ b/frontend/src/metabase/transforms/components/IncrementalTransform/useTableQueryMetadataResults.ts
@@ -1,7 +1,7 @@
import { useEffect, useMemo } from "react";
import { tableApi } from "metabase/api";
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { Table } from "metabase-types/api";
const selectTableQueryMetadata =
diff --git a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
index 59e96fee661..a22297cf341 100644
--- a/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/JobEditor.tsx
@@ -8,8 +8,8 @@ import {
PaneHeader,
PaneHeaderInput,
} from "metabase/data-studio/common/components/PaneHeader";
-import * as Urls from "metabase/lib/urls";
import { Stack } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
import { NAME_MAX_LENGTH } from "../../constants";
diff --git a/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
index 1e655a17bc9..2d6ac6dabeb 100644
--- a/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/ScheduleSection/ScheduleSection.tsx
@@ -3,9 +3,9 @@ import { c, t } from "ttag";
import { useRunTransformJobMutation } from "metabase/api";
import { Schedule } from "metabase/common/components/Schedule";
import { useSetting } from "metabase/common/hooks";
-import { getScheduleExplanation } from "metabase/lib/cron";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Divider, Group, Tooltip } from "metabase/ui";
+import { getScheduleExplanation } from "metabase/utils/cron";
import type {
ScheduleDisplayType,
ScheduleSettings,
diff --git a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
index a675df5a23d..1d8f3693a4b 100644
--- a/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
+++ b/frontend/src/metabase/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
@@ -7,9 +7,9 @@ import { useListTransformJobTransformsQuery } from "metabase/api";
import { ListEmptyState } from "metabase/common/components/ListEmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Transform, TransformJobId } from "metabase-types/api";
import { TitleSection } from "../../TitleSection";
diff --git a/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx b/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
index 81b042455ff..4e1c357251a 100644
--- a/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
+++ b/frontend/src/metabase/transforms/components/RunCancelButton/RunCancelButton.tsx
@@ -6,9 +6,9 @@ import {
useLazyGetTransformQuery,
} from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { isResourceNotFoundError } from "metabase/lib/errors";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { ActionIcon, Icon, Tooltip } from "metabase/ui";
+import { isResourceNotFoundError } from "metabase/utils/errors";
import type { Transform, TransformRunStatus } from "metabase-types/api";
export function RunCancelButton({
diff --git a/frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx b/frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
index 79459e826ba..689573ddb39 100644
--- a/frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
+++ b/frontend/src/metabase/transforms/components/TagMultiSelect/UpdateTagModal/UpdateTagModal.tsx
@@ -10,8 +10,8 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { Box, Button, FocusTrap, Group, Modal, Stack } from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { TransformTag } from "metabase-types/api";
type UpdateTagModalProps = {
diff --git a/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsx b/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsx
index 344caa38751..22c74b2c495 100644
--- a/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsx
+++ b/frontend/src/metabase/transforms/components/TargetNameInput/TargetNameInput.tsx
@@ -3,7 +3,7 @@ import { useEffect, useRef } from "react";
import { t } from "ttag";
import { FormTextInput } from "metabase/forms";
-import { slugify } from "metabase/lib/formatting/url";
+import { slugify } from "metabase/utils/formatting/url";
type TargetNameInputProps = {
description?: string;
diff --git a/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx b/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx
index 44ffe025709..28be121e3d2 100644
--- a/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx
+++ b/frontend/src/metabase/transforms/components/TransformEditor/EditDefinitionButton.tsx
@@ -1,8 +1,8 @@
import { Link } from "react-router";
import { t } from "ttag";
-import { transformEdit } from "metabase/lib/urls";
import { Button, type ButtonProps } from "metabase/ui";
+import { transformEdit } from "metabase/utils/urls";
import type { TransformId } from "metabase-types/api";
type EditDefinitionButtonProps = {
diff --git a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
index b5f5ea1a389..5def6066b94 100644
--- a/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
+++ b/frontend/src/metabase/transforms/components/TransformEditor/TransformEditor.tsx
@@ -1,6 +1,5 @@
import { useMemo } from "react";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_REMOTE_SYNC, PLUGIN_WORKSPACES } from "metabase/plugins";
import {
QueryEditor,
@@ -8,6 +7,7 @@ import {
type QueryEditorUiState,
} from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type {
Database,
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
index e7085e4fb40..bb8d69990d9 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.tsx
@@ -5,10 +5,10 @@ import { Link } from "metabase/common/components/Link/Link";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import type { StackProps } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Transform } from "metabase-types/api";
import { TransformMoreMenu } from "./TransformMoreMenu";
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
index e928bf4538f..bc3cab1a739 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/TransformMoreMenu.tsx
@@ -2,10 +2,10 @@ import { type MouseEvent, useState } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { ActionIcon, Icon, Menu } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Transform } from "metabase-types/api";
import { TransformRevisionHistorySidebar } from "../../TransformRevisionHistorySidebar";
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
index 26e0ce7825e..4f271efbff7 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformTabs.tsx
@@ -4,11 +4,11 @@ import {
type PaneHeaderTab,
PaneHeaderTabs,
} from "metabase/data-studio/common/components/PaneHeader";
-import * as Urls from "metabase/lib/urls";
import {
PLUGIN_DEPENDENCIES,
PLUGIN_TRANSFORMS_PYTHON,
} from "metabase/plugins";
+import * as Urls from "metabase/utils/urls";
import type { Transform, TransformId } from "metabase-types/api";
type TransformTabsProps = {
diff --git a/frontend/src/metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx b/frontend/src/metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx
index 89752fe3433..ec6ce91f097 100644
--- a/frontend/src/metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx
+++ b/frontend/src/metabase/transforms/components/TransformOwnerAvatar/TransformOwnerAvatar.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
-import { getUserName } from "metabase/lib/user";
import { Avatar, Ellipsified, Flex, Icon } from "metabase/ui";
+import { getUserName } from "metabase/utils/user";
import type { Transform } from "metabase-types/api";
export const TransformOwnerAvatar = ({
diff --git a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
index 4cd81b74a5c..81eb6a271fd 100644
--- a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
+++ b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
@@ -12,8 +12,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";
-import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
+import { useSelector } from "metabase/utils/redux";
import type { Transform } from "metabase-types/api";
interface TransformRevisionHistorySidebarProps {
diff --git a/frontend/src/metabase/transforms/hooks/use-source-state.ts b/frontend/src/metabase/transforms/hooks/use-source-state.ts
index a840d5dc253..0ad993fe2df 100644
--- a/frontend/src/metabase/transforms/hooks/use-source-state.ts
+++ b/frontend/src/metabase/transforms/hooks/use-source-state.ts
@@ -1,11 +1,11 @@
import { useMemo, useState } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
deactivateSuggestedTransform,
getMetabotSuggestedTransform,
} from "metabase/metabot/state";
import { getMetadata } from "metabase/selectors/metadata";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
diff --git a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx
index 5f9f10235c3..daaa2730298 100644
--- a/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx
+++ b/frontend/src/metabase/transforms/pages/EnableTransformsPage/EnableTransformsPage.tsx
@@ -4,7 +4,6 @@ import { useUpdateSettingMutation } from "metabase/api";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
-import { useSelector } from "metabase/lib/redux";
import { getUserIsAdmin } from "metabase/selectors/user";
import {
Button,
@@ -18,6 +17,7 @@ import {
Text,
Title,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
export const EnableTransformsPage = () => {
const isAdmin = useSelector(getUserIsAdmin);
diff --git a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
index b3ff6b41fa3..6be1a9d115f 100644
--- a/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobListPage/JobListPage.tsx
@@ -10,8 +10,6 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import type { TreeTableColumnDef } from "metabase/ui";
import {
Button,
@@ -25,6 +23,8 @@ import {
TreeTableSkeleton,
useTreeTableInstance,
} from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { TransformJob } from "metabase-types/api";
export const JobListPage = () => {
diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
index 68e82795ef2..5987ac9af97 100644
--- a/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
+++ b/frontend/src/metabase/transforms/pages/JobPage/JobMoreMenu/JobMoreMenu.tsx
@@ -2,10 +2,10 @@ import { type MouseEvent, useState } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { ActionIcon, Icon, Menu } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { TransformJob } from "metabase-types/api";
import { DeleteJobModal } from "./DeleteJobModal";
diff --git a/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
index af3793fcbb4..ded67e612c5 100644
--- a/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
+++ b/frontend/src/metabase/transforms/pages/JobPage/JobPage.tsx
@@ -8,13 +8,13 @@ import {
useUpdateTransformJobMutation,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
canEditTransform,
useTransformPermissions,
} from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type {
ScheduleDisplayType,
TransformJob,
diff --git a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
index fe0a0d7b61a..277f2310128 100644
--- a/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewJobPage/NewJobPage.tsx
@@ -10,9 +10,9 @@ import {
} from "metabase/api";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
import { trackTransformJobCreated } from "../../analytics";
diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts
index d9ed80c95c3..8e3e2e3f476 100644
--- a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts
+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/form.ts
@@ -1,7 +1,7 @@
import * as Yup from "yup";
-import * as Errors from "metabase/lib/errors";
-import { slugify } from "metabase/lib/formatting/url";
+import * as Errors from "metabase/utils/errors";
+import { slugify } from "metabase/utils/formatting/url";
import type {
CreateTransformRequest,
TransformSource,
diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
index 045e7f2ed40..b632e8f4242 100644
--- a/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/NewTransformPage.tsx
@@ -15,13 +15,13 @@ import {
PaneHeaderActions,
PaneHeaderInput,
} from "metabase/data-studio/common/components/PaneHeader";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { getMetadata } from "metabase/selectors/metadata";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Box, Center } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import * as Lib from "metabase-lib";
import type {
Database,
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
index 96d704e5549..75afbf07a03 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.tsx
@@ -14,10 +14,10 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErr
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
import { usePageTitle } from "metabase/hooks/use-page-title";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { POLLING_INTERVAL } from "metabase/transforms/constants";
import { Center, Flex, Stack } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { TransformRun, TransformRunId } from "metabase-types/api";
import { RunFilterBar } from "./RunFilterBar";
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
index 5034557d5e1..4c0aec16660 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
@@ -13,7 +13,7 @@ import {
screen,
within,
} from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type { TransformRun } from "metabase-types/api";
import {
createMockListTransformRunsResponse,
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
index 22f3be6035a..387d46ed60c 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
@@ -2,8 +2,8 @@ import { Link } from "react-router";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import * as Urls from "metabase/lib/urls";
import { Anchor, Breadcrumbs, FixedSizeIcon, Group } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { TransformRun } from "metabase-types/api";
type LocationSectionProps = {
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
index 7898f5a9112..428a31667f7 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/frontend/src/metabase/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
import { trackDependencyEntitySelected } from "metabase/data-studio/analytics";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import type { TransformRun } from "metabase-types/api";
import { getTransformRunName } from "../../../../utils";
diff --git a/frontend/src/metabase/transforms/pages/RunListPage/utils.ts b/frontend/src/metabase/transforms/pages/RunListPage/utils.ts
index 9f66d3d7637..3f04f2d1973 100644
--- a/frontend/src/metabase/transforms/pages/RunListPage/utils.ts
+++ b/frontend/src/metabase/transforms/pages/RunListPage/utils.ts
@@ -1,6 +1,6 @@
import type { Location } from "history";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import {
SORT_DIRECTIONS,
TRANSFORM_RUN_METHODS,
diff --git a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
index 5cbb267cbad..7b66ffb6a9a 100644
--- a/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformDependenciesPage/TransformDependenciesPage.tsx
@@ -3,10 +3,10 @@ import type { ReactNode } from "react";
import { skipToken, useGetTransformQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Card, Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TransformHeader } from "../../components/TransformHeader";
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx
index ce4d9e41902..d31e90baef6 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx
@@ -3,10 +3,10 @@ import { msgid, ngettext, t } from "ttag";
import { useUpdateCollectionMutation } from "metabase/api";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
-import { useDispatch } from "metabase/lib/redux";
import { addUndo } from "metabase/redux/undo";
import { EditTransformCollectionModal } from "metabase/transforms/components/EditTransformCollectionModal";
import { ActionIcon, Box, Icon, Menu } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
type CollectionRowMenuProps = {
collectionId: number;
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
index 64f359609f2..89b7196eae9 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CreateTransformMenu/CreateTransformMenu.tsx
@@ -6,11 +6,11 @@ import { useListDatabasesQuery } from "metabase/api";
import { QuestionPickerModal } from "metabase/common/components/Pickers";
import { UpsellGem } from "metabase/common/components/upsells/components/UpsellGem";
import { useHasTokenFeature } from "metabase/common/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { getShouldShowPythonTransformsUpsell } from "metabase/transforms/selectors";
import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import { trackTransformCreate } from "../../../analytics";
import { CreateTransformCollectionModal } from "../../../components/CreateTransformCollectionModal";
diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
index 853edde37d9..4f77ac94b91 100644
--- a/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformListPage/TransformListPage.tsx
@@ -25,9 +25,6 @@ import CS from "metabase/css/core/index.css";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { PaneHeader } from "metabase/data-studio/common/components/PaneHeader";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { type NamedUser, getUserName } from "metabase/lib/user";
import { PLUGIN_REPLACEMENT, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
@@ -47,6 +44,9 @@ import {
useTreeTableInstance,
} from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
+import { type NamedUser, getUserName } from "metabase/utils/user";
import { CollectionRowMenu } from "./CollectionRowMenu";
import { CreateTransformMenu } from "./CreateTransformMenu";
diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
index 044677409d5..642a9d8132a 100644
--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformPaneHeaderActions.tsx
@@ -1,11 +1,11 @@
import { useMemo } from "react";
import { PaneHeaderActions } from "metabase/data-studio/common/components/PaneHeader";
-import { useSelector } from "metabase/lib/redux";
import { PLUGIN_REMOTE_SYNC, PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";
import { getValidationResult } from "metabase/transforms/utils";
+import { useSelector } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import type { DraftTransformSource, Transform } from "metabase-types/api";
diff --git a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
index ae8d3b8a4c8..80350550d1b 100644
--- a/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformQueryPage/TransformQueryPage.tsx
@@ -14,8 +14,6 @@ import { EmptyState } from "metabase/common/components/EmptyState/EmptyState";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import {
PLUGIN_DEPENDENCIES,
@@ -25,6 +23,8 @@ import {
import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Box, Center, Group, Icon } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type {
Database,
DatasetQuery,
diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
index 30bae62d951..5f32c63549b 100644
--- a/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/RunSection/RunSection.tsx
@@ -9,12 +9,12 @@ import {
useUpdateTransformMutation,
} from "metabase/api";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { isResourceNotFoundError } from "metabase/lib/errors";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
import { Anchor, Box, Card, Divider, Group, Stack } from "metabase/ui";
+import { isResourceNotFoundError } from "metabase/utils/errors";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Transform, TransformTagId } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
index 10fa3f3cde4..f3c2db83d3d 100644
--- a/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformRunPage/TransformRunPage.tsx
@@ -1,9 +1,9 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import * as Urls from "metabase/lib/urls";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { useTransformWithPolling } from "metabase/transforms/hooks/use-transform-with-polling";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TransformHeader } from "../../components/TransformHeader";
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
index d255221ed5e..6e4b41c834c 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsPage.tsx
@@ -1,8 +1,8 @@
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import * as Urls from "metabase/lib/urls";
import { useTransformPermissions } from "metabase/transforms/hooks/use-transform-permissions";
import { Center } from "metabase/ui";
+import * as Urls from "metabase/utils/urls";
import { TransformHeader } from "../../components/TransformHeader";
import { useTransformWithPolling } from "../../hooks/use-transform-with-polling";
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx
index d3b729d48ed..2d69ef5e96f 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TargetSection.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type {
EnterpriseSettings,
TokenFeatures,
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
index d7311c6a4cb..fbef3fd9a0b 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.tsx
@@ -9,8 +9,6 @@ import {
} from "metabase/api";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { UserInput } from "metabase/metadata/components";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
@@ -25,6 +23,8 @@ import {
Stack,
Text,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
+import * as Urls from "metabase/utils/urls";
import type { Transform, UserId } from "metabase-types/api";
import { TitleSection } from "../../../components/TitleSection";
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
index 0ce20d285e5..15b52ebe926 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/TransformSettingsSection.unit.spec.tsx
@@ -8,7 +8,7 @@ import {
} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import * as Urls from "metabase/lib/urls";
+import * as Urls from "metabase/utils/urls";
import type {
EnterpriseSettings,
TokenFeatures,
diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
index f35c0560792..9d1d9766fea 100644
--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx
@@ -18,7 +18,6 @@ import {
FormSubmitButton,
FormTextInput,
} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
import { SchemaFormSelect } from "metabase/transforms/components/SchemaFormSelect";
import { sourceDatabaseId } from "metabase/transforms/utils";
import {
@@ -30,6 +29,7 @@ import {
Radio,
Stack,
} from "metabase/ui";
+import * as Errors from "metabase/utils/errors";
import type { Transform, UpdateTransformRequest } from "metabase-types/api";
type UpdateTargetModalProps = {
diff --git a/frontend/src/metabase/transforms/utils.ts b/frontend/src/metabase/transforms/utils.ts
index 5dba8c57d02..141d7970a8e 100644
--- a/frontend/src/metabase/transforms/utils.ts
+++ b/frontend/src/metabase/transforms/utils.ts
@@ -3,7 +3,7 @@ import _ from "underscore";
import { hasFeature } from "metabase/admin/databases/utils";
import type { OmniPickerCollectionItem } from "metabase/common/components/Pickers/EntityPicker/types";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
diff --git a/frontend/src/metabase/ui/colors/derive-theme.ts b/frontend/src/metabase/ui/colors/derive-theme.ts
index d6e62949cf0..bda81f9eed8 100644
--- a/frontend/src/metabase/ui/colors/derive-theme.ts
+++ b/frontend/src/metabase/ui/colors/derive-theme.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import type { ResolvedColorScheme } from "metabase/lib/color-scheme";
+import type { ResolvedColorScheme } from "metabase/utils/color-scheme";
import type { ColorSettings } from "metabase-types/api";
import { deriveAllAccentColors, mapChartColorsToAccents } from "./accents";
diff --git a/frontend/src/metabase/ui/colors/theme-from-color-scheme.ts b/frontend/src/metabase/ui/colors/theme-from-color-scheme.ts
index 6baef31b9e3..44c6a1a1af5 100644
--- a/frontend/src/metabase/ui/colors/theme-from-color-scheme.ts
+++ b/frontend/src/metabase/ui/colors/theme-from-color-scheme.ts
@@ -1,4 +1,4 @@
-import type { ResolvedColorScheme } from "metabase/lib/color-scheme";
+import type { ResolvedColorScheme } from "metabase/utils/color-scheme";
import { METABASE_DARK_THEME } from "./constants/themes/dark";
import { METABASE_LIGHT_THEME } from "./constants/themes/light";
diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsx
index 88a23abeca6..f26aac3de34 100644
--- a/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsx
+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/hooks/useColumnSizing.tsx
@@ -2,13 +2,13 @@ import { type Row, type Table, flexRender } from "@tanstack/react-table";
import { useCallback, useLayoutEffect, useMemo, useRef, useState } from "react";
import type { Root } from "react-dom/client";
+import { SortableHeaderPill } from "metabase/ui";
+import { MeasurementProviders } from "metabase/ui/components/theme/MeasurementProviders";
import {
createMeasurementContainer,
removeMeasurementContainer,
-} from "metabase/lib/measure-container";
-import { renderRoot } from "metabase/lib/react-compat";
-import { SortableHeaderPill } from "metabase/ui";
-import { MeasurementProviders } from "metabase/ui/components/theme/MeasurementProviders";
+} from "metabase/utils/measure-container";
+import { renderRoot } from "metabase/utils/react-compat";
import {
CELL_HORIZONTAL_PADDING,
diff --git a/frontend/src/metabase/ui/components/theme/ColorSchemeProvider/ColorSchemeContext.tsx b/frontend/src/metabase/ui/components/theme/ColorSchemeProvider/ColorSchemeContext.tsx
index 7034a4a6f14..3e202de9d56 100644
--- a/frontend/src/metabase/ui/components/theme/ColorSchemeProvider/ColorSchemeContext.tsx
+++ b/frontend/src/metabase/ui/components/theme/ColorSchemeProvider/ColorSchemeContext.tsx
@@ -4,7 +4,7 @@ import { noop } from "underscore";
import type {
ColorScheme,
ResolvedColorScheme,
-} from "metabase/lib/color-scheme";
+} from "metabase/utils/color-scheme";
export interface ColorSchemeContextType {
colorScheme: ColorScheme;
diff --git a/frontend/src/metabase/ui/components/theme/EmotionCacheProvider/EmotionCacheProvider.tsx b/frontend/src/metabase/ui/components/theme/EmotionCacheProvider/EmotionCacheProvider.tsx
index f57c8a771aa..36787d30a47 100644
--- a/frontend/src/metabase/ui/components/theme/EmotionCacheProvider/EmotionCacheProvider.tsx
+++ b/frontend/src/metabase/ui/components/theme/EmotionCacheProvider/EmotionCacheProvider.tsx
@@ -5,6 +5,7 @@ import type { ReactNode } from "react";
import { useMemo } from "react";
import { isCypressActive } from "metabase/env";
+import { getCspNonce } from "metabase/utils/csp";
interface EmotionCacheProviderProps {
children?: ReactNode;
@@ -16,7 +17,7 @@ export const EmotionCacheProvider = ({
const emotionCache = useMemo(() => {
const cache = createCache({
key: "emotion",
- nonce: window.MetabaseNonce,
+ nonce: getCspNonce(),
...(isCypressActive && { speedy: true }),
});
// This disables :first-child not working in SSR warnings
diff --git a/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsx b/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsx
index e3d833191ad..a43d7165147 100644
--- a/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsx
+++ b/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.tsx
@@ -5,8 +5,9 @@ import { MantineProvider } from "@mantine/core";
import { merge } from "icepick";
import { type ReactNode, useContext, useMemo } from "react";
-import type { ResolvedColorScheme } from "metabase/lib/color-scheme";
import type { ColorName } from "metabase/ui/colors/types";
+import type { ResolvedColorScheme } from "metabase/utils/color-scheme";
+import { getCspNonce } from "metabase/utils/csp";
import type { ColorSettings } from "metabase-types/api";
import { getThemeOverrides } from "../../../theme";
@@ -98,7 +99,7 @@ export const ThemeProvider = ({
<MantineProvider
theme={theme}
forceColorScheme={resolvedColorScheme}
- getStyleNonce={() => window.MetabaseNonce ?? "metabase"}
+ getStyleNonce={() => getCspNonce() ?? "metabase"}
classNamesPrefix="mb-mantine"
cssVariablesSelector={cssVariablesSelector}
withCssVariables={withCssVariables}
diff --git a/frontend/src/metabase/ui/hooks/use-is-truncated.ts b/frontend/src/metabase/ui/hooks/use-is-truncated.ts
index 6b15b894712..97268515577 100644
--- a/frontend/src/metabase/ui/hooks/use-is-truncated.ts
+++ b/frontend/src/metabase/ui/hooks/use-is-truncated.ts
@@ -1,7 +1,7 @@
import { useLayoutEffect, useRef, useState } from "react";
import _ from "underscore";
-import resizeObserver from "metabase/lib/resize-observer";
+import resizeObserver from "metabase/utils/resize-observer";
type UseIsTruncatedProps = {
disabled?: boolean;
diff --git a/frontend/src/metabase/ui/utils/colors.ts b/frontend/src/metabase/ui/utils/colors.ts
index 8c4ed84fecd..ecbf63a8d7d 100644
--- a/frontend/src/metabase/ui/utils/colors.ts
+++ b/frontend/src/metabase/ui/utils/colors.ts
@@ -1,8 +1,8 @@
import type { MantineColorsTuple } from "@mantine/core";
-import type { ResolvedColorScheme } from "metabase/lib/color-scheme";
import { ALL_COLOR_NAMES, deriveFullMetabaseTheme } from "metabase/ui/colors";
import type { ColorName, MetabaseColorKey } from "metabase/ui/colors/types";
+import type { ResolvedColorScheme } from "metabase/utils/color-scheme";
import type { ColorSettings } from "metabase-types/api";
const ORIGINAL_COLORS = [
diff --git a/frontend/src/metabase/lib/analytics-untyped.js b/frontend/src/metabase/utils/analytics-untyped.js
similarity index 97%
rename from frontend/src/metabase/lib/analytics-untyped.js
rename to frontend/src/metabase/utils/analytics-untyped.js
index b9741be6f23..a48a777d07b 100644
--- a/frontend/src/metabase/lib/analytics-untyped.js
+++ b/frontend/src/metabase/utils/analytics-untyped.js
@@ -1,7 +1,7 @@
import * as Snowplow from "@snowplow/browser-tracker";
-import Settings from "metabase/lib/settings";
import { getUserId } from "metabase/selectors/user";
+import Settings from "metabase/utils/settings";
export const trackPageView = (url) => {
if (!url || !Settings.trackingEnabled()) {
diff --git a/frontend/src/metabase/lib/analytics.ts b/frontend/src/metabase/utils/analytics.ts
similarity index 97%
rename from frontend/src/metabase/lib/analytics.ts
rename to frontend/src/metabase/utils/analytics.ts
index dae34d3e01e..30e230f960f 100644
--- a/frontend/src/metabase/lib/analytics.ts
+++ b/frontend/src/metabase/utils/analytics.ts
@@ -1,7 +1,7 @@
import * as Snowplow from "@snowplow/browser-tracker";
import { shouldLogAnalytics } from "metabase/env";
-import Settings from "metabase/lib/settings";
+import Settings from "metabase/utils/settings";
import type { SchemaEventMap, SchemaType } from "metabase-types/analytics";
import type { SimpleEventSchema } from "metabase-types/analytics/event";
diff --git a/frontend/src/metabase/lib/api.js b/frontend/src/metabase/utils/api.js
similarity index 98%
rename from frontend/src/metabase/lib/api.js
rename to frontend/src/metabase/utils/api.js
index 636c99af80b..dfed455a2fc 100644
--- a/frontend/src/metabase/lib/api.js
+++ b/frontend/src/metabase/utils/api.js
@@ -4,11 +4,10 @@ import querystring from "querystring";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { isTest } from "metabase/env";
-import { isWithinIframe } from "metabase/lib/dom";
-import { IFRAMED_IN_SELF } from "metabase/lib/iframe";
-import { getTraceparentHeader } from "metabase/lib/otel";
-import { delay } from "metabase/lib/promise";
import { PLUGIN_API, PLUGIN_EMBEDDING_SDK } from "metabase/plugins";
+import { IFRAMED_IN_SELF, isWithinIframe } from "metabase/utils/iframe";
+import { getTraceparentHeader } from "metabase/utils/otel";
+import { delay } from "metabase/utils/promise";
const ONE_SECOND = 1000;
const MAX_RETRIES = 10;
diff --git a/frontend/test/metabase/lib/api.unit.spec.js b/frontend/src/metabase/utils/api.unit.spec.js
similarity index 98%
rename from frontend/test/metabase/lib/api.unit.spec.js
rename to frontend/src/metabase/utils/api.unit.spec.js
index a574ffe71d4..81db063c04d 100644
--- a/frontend/test/metabase/lib/api.unit.spec.js
+++ b/frontend/src/metabase/utils/api.unit.spec.js
@@ -1,6 +1,6 @@
import fetchMock from "fetch-mock";
-import api, { GET, POST, PUT } from "metabase/lib/api";
+import api, { GET, POST, PUT } from "metabase/utils/api";
api.basename = "";
describe("api", () => {
diff --git a/frontend/src/metabase/lib/api.unit.spec.ts b/frontend/src/metabase/utils/api.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/api.unit.spec.ts
rename to frontend/src/metabase/utils/api.unit.spec.ts
diff --git a/frontend/src/metabase/lib/arrays.ts b/frontend/src/metabase/utils/arrays.ts
similarity index 100%
rename from frontend/src/metabase/lib/arrays.ts
rename to frontend/src/metabase/utils/arrays.ts
diff --git a/frontend/src/metabase/lib/auth.ts b/frontend/src/metabase/utils/auth.ts
similarity index 86%
rename from frontend/src/metabase/lib/auth.ts
rename to frontend/src/metabase/utils/auth.ts
index 6d8e2c9a553..ef32ca9d395 100644
--- a/frontend/src/metabase/lib/auth.ts
+++ b/frontend/src/metabase/utils/auth.ts
@@ -1,5 +1,5 @@
-import { isResourceNotFoundError } from "metabase/lib/errors/messages";
import { SessionApi } from "metabase/services";
+import { isResourceNotFoundError } from "metabase/utils/errors/messages";
export const deleteSession = async () => {
try {
diff --git a/frontend/src/metabase/lib/browser.ts b/frontend/src/metabase/utils/browser.ts
similarity index 96%
rename from frontend/src/metabase/lib/browser.ts
rename to frontend/src/metabase/utils/browser.ts
index 66dd7cc47ac..12cc44b6211 100644
--- a/frontend/src/metabase/lib/browser.ts
+++ b/frontend/src/metabase/utils/browser.ts
@@ -1,6 +1,6 @@
import querystring from "querystring";
-import { safeJsonParse } from "metabase/lib/json-parse";
+import { safeJsonParse } from "metabase/utils/json-parse";
function parseQueryStringOptions(s: string) {
const options: Record<string, string | string[] | boolean | undefined> =
diff --git a/frontend/test/metabase/lib/browser.unit.spec.ts b/frontend/src/metabase/utils/browser.unit.spec.ts
similarity index 99%
rename from frontend/test/metabase/lib/browser.unit.spec.ts
rename to frontend/src/metabase/utils/browser.unit.spec.ts
index 940df707d5e..d6b97c07e87 100644
--- a/frontend/test/metabase/lib/browser.unit.spec.ts
+++ b/frontend/src/metabase/utils/browser.unit.spec.ts
@@ -1,4 +1,4 @@
-import { parseHashOptions, stringifyHashOptions } from "metabase/lib/browser";
+import { parseHashOptions, stringifyHashOptions } from "metabase/utils/browser";
describe("browser", () => {
describe("parseHashOptions", () => {
diff --git a/frontend/src/metabase/lib/card.ts b/frontend/src/metabase/utils/card.ts
similarity index 92%
rename from frontend/src/metabase/lib/card.ts
rename to frontend/src/metabase/utils/card.ts
index b59589be1a5..067fc73415a 100644
--- a/frontend/src/metabase/lib/card.ts
+++ b/frontend/src/metabase/utils/card.ts
@@ -1,8 +1,9 @@
import querystring from "querystring";
-import { b64hash_to_utf8, utf8_to_b64url } from "metabase/lib/encoding";
-import { stableStringify } from "metabase/lib/objects";
-import { equals } from "metabase/lib/utils";
+import _ from "underscore";
+
+import { b64hash_to_utf8, utf8_to_b64url } from "metabase/utils/encoding";
+import { stableStringify } from "metabase/utils/objects";
import { normalize } from "metabase-lib/v1/queries/utils/normalize";
import type { Card, ParameterValuesMap, UnsavedCard } from "metabase-types/api";
@@ -67,7 +68,7 @@ function getCleanCard(
export function isEqualCard(card1?: Card | null, card2?: Card | null) {
if (card1 && card2) {
- return equals(getCleanCard(card1), getCleanCard(card2));
+ return _.isEqual(getCleanCard(card1), getCleanCard(card2));
} else {
return false;
}
diff --git a/frontend/test/metabase/lib/card.unit.spec.js b/frontend/src/metabase/utils/card.unit.spec.js
similarity index 94%
rename from frontend/test/metabase/lib/card.unit.spec.js
rename to frontend/src/metabase/utils/card.unit.spec.js
index 553687fed6a..6628c626583 100644
--- a/frontend/test/metabase/lib/card.unit.spec.js
+++ b/frontend/src/metabase/utils/card.unit.spec.js
@@ -1,10 +1,13 @@
-import { deserializeCardFromUrl, serializeCardForUrl } from "metabase/lib/card";
+import {
+ deserializeCardFromUrl,
+ serializeCardForUrl,
+} from "metabase/utils/card";
import {
b64_to_utf8,
b64url_to_utf8,
utf8_to_b64,
utf8_to_b64url,
-} from "metabase/lib/encoding";
+} from "metabase/utils/encoding";
const CARD_ID = 31;
diff --git a/frontend/src/metabase/lib/click-behavior.js b/frontend/src/metabase/utils/click-behavior.js
similarity index 100%
rename from frontend/src/metabase/lib/click-behavior.js
rename to frontend/src/metabase/utils/click-behavior.js
diff --git a/frontend/src/metabase/utils/clone.ts b/frontend/src/metabase/utils/clone.ts
new file mode 100644
index 00000000000..a5e1f5322be
--- /dev/null
+++ b/frontend/src/metabase/utils/clone.ts
@@ -0,0 +1,8 @@
+/**
+ * Implements `structuredClone` in browsers that don't support it.
+ *
+ * TODO: remove this when Cypress and Jest support native `structuredClone`.
+ */
+export function clone<T>(value: T): T {
+ return JSON.parse(JSON.stringify(value)) as T;
+}
diff --git a/frontend/src/metabase/lib/color-scheme.ts b/frontend/src/metabase/utils/color-scheme.ts
similarity index 100%
rename from frontend/src/metabase/lib/color-scheme.ts
rename to frontend/src/metabase/utils/color-scheme.ts
diff --git a/frontend/src/metabase/lib/constants.ts b/frontend/src/metabase/utils/constants.ts
similarity index 100%
rename from frontend/src/metabase/lib/constants.ts
rename to frontend/src/metabase/utils/constants.ts
diff --git a/frontend/src/metabase/lib/cron.ts b/frontend/src/metabase/utils/cron.ts
similarity index 97%
rename from frontend/src/metabase/lib/cron.ts
rename to frontend/src/metabase/utils/cron.ts
index f25d53f2315..46d0a0f24b3 100644
--- a/frontend/src/metabase/lib/cron.ts
+++ b/frontend/src/metabase/utils/cron.ts
@@ -3,8 +3,8 @@ import cronstrue from "cronstrue";
import { t } from "ttag";
import { memoize } from "underscore";
-import MetabaseSettings from "metabase/lib/settings";
-import { has24HourModeSetting } from "metabase/lib/time-dayjs";
+import MetabaseSettings from "metabase/utils/settings";
+import { has24HourModeSetting } from "metabase/utils/time-dayjs";
function translateErrorMessage(message: string) {
const errorMessageMap: Record<string, string> = {
diff --git a/frontend/src/metabase/lib/csp.ts b/frontend/src/metabase/utils/csp.ts
similarity index 71%
rename from frontend/src/metabase/lib/csp.ts
rename to frontend/src/metabase/utils/csp.ts
index a29e41a5dde..37cfc544ca8 100644
--- a/frontend/src/metabase/lib/csp.ts
+++ b/frontend/src/metabase/utils/csp.ts
@@ -3,6 +3,10 @@
* can read it when injecting dynamic styles. The nonce is generated server-side
* and placed on the window by the HTML template.
*/
-import { setNonce } from "get-nonce";
+import { getNonce, setNonce } from "get-nonce";
setNonce(window.MetabaseNonce ?? "");
+
+export function getCspNonce() {
+ return getNonce();
+}
diff --git a/frontend/src/metabase/lib/dashboard.ts b/frontend/src/metabase/utils/dashboard.ts
similarity index 94%
rename from frontend/src/metabase/lib/dashboard.ts
rename to frontend/src/metabase/utils/dashboard.ts
index d04e13b7ec3..5ed03f99121 100644
--- a/frontend/src/metabase/lib/dashboard.ts
+++ b/frontend/src/metabase/utils/dashboard.ts
@@ -1,7 +1,7 @@
import _ from "underscore";
-import { isJWT } from "metabase/lib/jwt";
-import { isUuid } from "metabase/lib/uuid";
+import { isJWT } from "metabase/utils/jwt";
+import { isUuid } from "metabase/utils/uuid";
import type {
ActionDashboardCard,
BaseDashboardCard,
diff --git a/frontend/src/metabase/lib/dashboard_grid.js b/frontend/src/metabase/utils/dashboard_grid.js
similarity index 100%
rename from frontend/src/metabase/lib/dashboard_grid.js
rename to frontend/src/metabase/utils/dashboard_grid.js
diff --git a/frontend/test/metabase/lib/dashboard_grid.unit.spec.js b/frontend/src/metabase/utils/dashboard_grid.unit.spec.js
similarity index 94%
rename from frontend/test/metabase/lib/dashboard_grid.unit.spec.js
rename to frontend/src/metabase/utils/dashboard_grid.unit.spec.js
index 4297f3d0261..f8a1a498819 100644
--- a/frontend/test/metabase/lib/dashboard_grid.unit.spec.js
+++ b/frontend/src/metabase/utils/dashboard_grid.unit.spec.js
@@ -1,4 +1,4 @@
-import { getPositionForNewDashCard } from "metabase/lib/dashboard_grid";
+import { getPositionForNewDashCard } from "metabase/utils/dashboard_grid";
const getPos = (cards) => getPositionForNewDashCard(cards, 2, 2, 6);
diff --git a/frontend/src/metabase/utils/data-url.ts b/frontend/src/metabase/utils/data-url.ts
new file mode 100644
index 00000000000..30e37c9e800
--- /dev/null
+++ b/frontend/src/metabase/utils/data-url.ts
@@ -0,0 +1,27 @@
+interface ParsedDataUri {
+ mimeType: string | undefined;
+ charset: string | undefined;
+ data: string;
+}
+
+export function parseDataUri(
+ url: string | null | undefined,
+): ParsedDataUri | null {
+ // https://regexr.com/8e8gt
+ const match =
+ url &&
+ url.match(/^data:(?:([^;]+)(?:;([^;]+))?)?(;base64)?,((?:(?!\1|,).)*)$/);
+ if (match) {
+ let [, mimeType, charset, base64, data]: (string | undefined)[] = match;
+ if (charset === "base64" && !base64) {
+ base64 = charset;
+ charset = undefined;
+ }
+ return {
+ mimeType,
+ charset,
+ data: base64 ? atob(data) : data,
+ };
+ }
+ return null;
+}
diff --git a/frontend/src/metabase/utils/data-url.unit.spec.ts b/frontend/src/metabase/utils/data-url.unit.spec.ts
new file mode 100644
index 00000000000..53a59d507a1
--- /dev/null
+++ b/frontend/src/metabase/utils/data-url.unit.spec.ts
@@ -0,0 +1,29 @@
+import { parseDataUri } from "./data-url";
+
+describe("parseDataUri", () => {
+ it("parses a valid text data URI", () => {
+ const dataUri = "data:text/plain;base64,SGVsbG8sIFdvcmxkIQ==";
+ const result = parseDataUri(dataUri);
+ expect(result).toEqual({
+ mimeType: "text/plain",
+ charset: undefined,
+ data: "Hello, World!",
+ });
+ });
+
+ it("returns null for an invalid data URI", () => {
+ const invalidDataUri = "d4ta:text/plain;base64,SGVsbG8sIFdvcmxkIQ==";
+ const result = parseDataUri(invalidDataUri);
+ expect(result).toBeNull();
+ });
+
+ it("does not hang or crash on malicious DOS input", () => {
+ // Regex DOS vulnerability test vector
+ const malicious = "data:\u0000" + "\u0000,".repeat(100000) + "\n1\n";
+ const start = Date.now();
+ const result = parseDataUri(malicious);
+ const duration = Date.now() - start;
+ expect(result).toBeNull();
+ expect(duration).toBeLessThan(1000);
+ });
+});
diff --git a/frontend/test/metabase/lib/data_grid.unit.spec.js b/frontend/src/metabase/utils/data_grid.unit.spec.js
similarity index 100%
rename from frontend/test/metabase/lib/data_grid.unit.spec.js
rename to frontend/src/metabase/utils/data_grid.unit.spec.js
diff --git a/frontend/src/metabase/lib/date-time.ts b/frontend/src/metabase/utils/date-time.ts
similarity index 100%
rename from frontend/src/metabase/lib/date-time.ts
rename to frontend/src/metabase/utils/date-time.ts
diff --git a/frontend/src/metabase/lib/dayjs-parse-zone-plugin.js b/frontend/src/metabase/utils/dayjs-parse-zone-plugin.js
similarity index 100%
rename from frontend/src/metabase/lib/dayjs-parse-zone-plugin.js
rename to frontend/src/metabase/utils/dayjs-parse-zone-plugin.js
diff --git a/frontend/src/metabase/lib/dayjs-parse-zone-plugin.unit.spec.ts b/frontend/src/metabase/utils/dayjs-parse-zone-plugin.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/dayjs-parse-zone-plugin.unit.spec.ts
rename to frontend/src/metabase/utils/dayjs-parse-zone-plugin.unit.spec.ts
diff --git a/frontend/src/metabase/lib/dayjs.ts b/frontend/src/metabase/utils/dayjs.ts
similarity index 100%
rename from frontend/src/metabase/lib/dayjs.ts
rename to frontend/src/metabase/utils/dayjs.ts
diff --git a/frontend/src/metabase/lib/delay.ts b/frontend/src/metabase/utils/delay.ts
similarity index 100%
rename from frontend/src/metabase/lib/delay.ts
rename to frontend/src/metabase/utils/delay.ts
diff --git a/frontend/src/metabase/lib/dom.ts b/frontend/src/metabase/utils/dom.ts
similarity index 87%
rename from frontend/src/metabase/lib/dom.ts
rename to frontend/src/metabase/utils/dom.ts
index f62a5336383..83e68fb245e 100644
--- a/frontend/src/metabase/lib/dom.ts
+++ b/frontend/src/metabase/utils/dom.ts
@@ -5,35 +5,12 @@ import _ from "underscore";
import { handleLinkSdkPlugin } from "embedding-sdk-shared/lib/sdk-global-plugins";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { isCypressActive, isStorybookActive } from "metabase/env";
-import MetabaseSettings from "metabase/lib/settings";
+import { isWithinIframe } from "metabase/utils/iframe";
+import MetabaseSettings from "metabase/utils/settings";
import { isObject } from "metabase-types/guards";
import { checkNotNull } from "./types";
-// denotes whether the current page is loaded in an iframe or not
-// Cypress renders the whole app within an iframe, but we want to exclude it from this check to avoid certain components (like Nav bar) not rendering
-// Storybook also uses an iframe to display story content, so we want to ignore it
-export const isWithinIframe = function (): boolean {
- try {
- // Mock that we're embedding, so we could test embed components
- if (window.overrideIsWithinIframe) {
- return true;
- }
-
- if (isCypressActive || isStorybookActive) {
- return false;
- }
-
- return window.self !== window.top;
- } catch (e) {
- return true;
- }
-};
-
-// add a global so we can check if the parent iframe is Metabase
-window.METABASE = true;
-
// check whether scrollbars are visible to the user,
// this is off by default on Macs, but can be changed
// Always on on most other non mobile platforms
@@ -55,7 +32,7 @@ export const getScrollBarSize = _.memoize((): number => {
// check if we have access to localStorage to avoid handling "access denied"
// exceptions
-export const HAS_LOCAL_STORAGE = (function () {
+export function localStorageIsSupported() {
try {
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
window.localStorage; // This will trigger an exception if access is denied.
@@ -64,7 +41,7 @@ export const HAS_LOCAL_STORAGE = (function () {
console.warn("localStorage not available:", e);
return false;
}
-})();
+}
export function isObscured(
element: HTMLElement,
@@ -336,46 +313,6 @@ export function getUrlTarget(
return url == null || isSameOrSiteUrlOrigin(url) ? "_self" : "_blank";
}
-export function removeAllChildren(element: HTMLElement | null): void {
- if (!element) {
- return;
- }
-
- while (element.firstChild) {
- element.removeChild(element.firstChild);
- }
-}
-
-interface ParsedDataUri {
- mimeType: string | undefined;
- charset: string | undefined;
- data: string;
- base64: string;
-}
-
-export function parseDataUri(
- url: string | null | undefined,
-): ParsedDataUri | null {
- // https://regexr.com/8e8gt
- const match =
- url &&
- url.match(/^data:(?:([^;]+)(?:;([^;]+))?)?(;base64)?,((?:(?!\1|,).)*)$/);
- if (match) {
- let [, mimeType, charset, base64, data]: (string | undefined)[] = match;
- if (charset === "base64" && !base64) {
- base64 = charset;
- charset = undefined;
- }
- return {
- mimeType,
- charset,
- data: base64 ? atob(data) : data,
- base64: base64 ? data : btoa(data),
- };
- }
- return null;
-}
-
export function initializeIframeResizer(onReady = () => {}): void {
if (!isWithinIframe()) {
return;
diff --git a/frontend/test/metabase/lib/dom.unit.spec.js b/frontend/src/metabase/utils/dom.unit.spec.js
similarity index 81%
rename from frontend/test/metabase/lib/dom.unit.spec.js
rename to frontend/src/metabase/utils/dom.unit.spec.js
index 7ef765164fc..876952d49bc 100644
--- a/frontend/test/metabase/lib/dom.unit.spec.js
+++ b/frontend/src/metabase/utils/dom.unit.spec.js
@@ -5,40 +5,10 @@ import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";
import {
getUrlTarget,
open,
- parseDataUri,
shouldOpenInBlankWindow,
-} from "metabase/lib/dom";
+} from "metabase/utils/dom";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
-describe("parseDataUri", () => {
- it("parses a valid text data URI", () => {
- const dataUri = "data:text/plain;base64,SGVsbG8sIFdvcmxkIQ==";
- const result = parseDataUri(dataUri);
- expect(result).toEqual({
- mimeType: "text/plain",
- charset: undefined,
- data: "Hello, World!",
- base64: "SGVsbG8sIFdvcmxkIQ==",
- });
- });
-
- it("returns null for an invalid data URI", () => {
- const invalidDataUri = "d4ta:text/plain;base64,SGVsbG8sIFdvcmxkIQ==";
- const result = parseDataUri(invalidDataUri);
- expect(result).toBeNull();
- });
-
- it("does not hang or crash on malicious DOS input", () => {
- // Regex DOS vulnerability test vector
- const malicious = "data:\u0000" + "\u0000,".repeat(100000) + "\n1\n";
- const start = Date.now();
- const result = parseDataUri(malicious);
- const duration = Date.now() - start;
- expect(result).toBeNull();
- expect(duration).toBeLessThan(1000);
- });
-});
-
describe("shouldOpenInBlankWindow", () => {
afterEach(() => {
jest.restoreAllMocks();
diff --git a/frontend/src/metabase/lib/download.ts b/frontend/src/metabase/utils/download.ts
similarity index 100%
rename from frontend/src/metabase/lib/download.ts
rename to frontend/src/metabase/utils/download.ts
diff --git a/frontend/src/metabase/lib/email.ts b/frontend/src/metabase/utils/email.ts
similarity index 100%
rename from frontend/src/metabase/lib/email.ts
rename to frontend/src/metabase/utils/email.ts
diff --git a/frontend/src/metabase/lib/email.unit.spec.ts b/frontend/src/metabase/utils/email.unit.spec.ts
similarity index 96%
rename from frontend/src/metabase/lib/email.unit.spec.ts
rename to frontend/src/metabase/utils/email.unit.spec.ts
index aaf647061d9..41deee0d2d8 100644
--- a/frontend/src/metabase/lib/email.unit.spec.ts
+++ b/frontend/src/metabase/utils/email.unit.spec.ts
@@ -1,4 +1,4 @@
-import { isEmail } from "metabase/lib/email";
+import { isEmail } from "metabase/utils/email";
describe("isEmail", () => {
it("should work with email addresses containing ASCII special characters", () => {
diff --git a/frontend/src/metabase/lib/embed.js b/frontend/src/metabase/utils/embed.js
similarity index 96%
rename from frontend/src/metabase/lib/embed.js
rename to frontend/src/metabase/utils/embed.js
index a3b1d85a8c0..958972cc0be 100644
--- a/frontend/src/metabase/lib/embed.js
+++ b/frontend/src/metabase/utils/embed.js
@@ -2,9 +2,8 @@ import { push } from "react-router-redux";
import _ from "underscore";
import CS from "metabase/css/core/index.css";
-import { isWithinIframe } from "metabase/lib/dom";
-import { IFRAMED_IN_SELF } from "metabase/lib/iframe";
import { setInitialUrlOptions } from "metabase/redux/embed";
+import { IFRAMED_IN_SELF, isWithinIframe } from "metabase/utils/iframe";
// detect if this page is embedded in itself, i.e. it's a embed preview
// will need to do something different if we ever embed metabase in itself for another reason
diff --git a/frontend/src/metabase/lib/encoding.ts b/frontend/src/metabase/utils/encoding.ts
similarity index 100%
rename from frontend/src/metabase/lib/encoding.ts
rename to frontend/src/metabase/utils/encoding.ts
diff --git a/frontend/src/metabase/lib/entities.js b/frontend/src/metabase/utils/entities.js
similarity index 99%
rename from frontend/src/metabase/lib/entities.js
rename to frontend/src/metabase/utils/entities.js
index 5ec432ab8d2..92a17450f68 100644
--- a/frontend/src/metabase/lib/entities.js
+++ b/frontend/src/metabase/utils/entities.js
@@ -44,7 +44,7 @@
*
* Add the following to it:
*
- * import { createEntity } from "metabase/lib/entities";
+ * import { createEntity } from "metabase/utils/entities";
* const Books = createEntity({
* name: "books",
@@ -75,7 +75,9 @@ import { denormalize, normalize, schema } from "normalizr";
import createCachedSelector from "re-reselect";
import _ from "underscore";
-import { DELETE, GET, POST, PUT } from "metabase/lib/api";
+import requestsReducer, { setRequestUnloaded } from "metabase/redux/requests";
+import { addUndo } from "metabase/redux/undo";
+import { DELETE, GET, POST, PUT } from "metabase/utils/api";
import {
combineReducers,
compose,
@@ -83,9 +85,7 @@ import {
withAction,
withCachedDataAndRequestState,
withRequestState,
-} from "metabase/lib/redux";
-import requestsReducer, { setRequestUnloaded } from "metabase/redux/requests";
-import { addUndo } from "metabase/redux/undo";
+} from "metabase/utils/redux";
const EMPTY_ENTITY_QUERY = {};
diff --git a/frontend/src/metabase/lib/entities.unit.spec.js b/frontend/src/metabase/utils/entities.unit.spec.js
similarity index 97%
rename from frontend/src/metabase/lib/entities.unit.spec.js
rename to frontend/src/metabase/utils/entities.unit.spec.js
index 9228b115844..67c1398b3db 100644
--- a/frontend/src/metabase/lib/entities.unit.spec.js
+++ b/frontend/src/metabase/utils/entities.unit.spec.js
@@ -1,7 +1,7 @@
import { combineReducers, configureStore } from "@reduxjs/toolkit";
-import { combineEntities, createEntity } from "metabase/lib/entities";
import requestsReducer from "metabase/redux/requests";
+import { combineEntities, createEntity } from "metabase/utils/entities";
function getObject(id) {
return { id: id, name: `object${id}` };
diff --git a/frontend/src/metabase/lib/errors/console.ts b/frontend/src/metabase/utils/errors/console.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/console.ts
rename to frontend/src/metabase/utils/errors/console.ts
diff --git a/frontend/src/metabase/lib/errors/console.unit.spec.ts b/frontend/src/metabase/utils/errors/console.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/console.unit.spec.ts
rename to frontend/src/metabase/utils/errors/console.unit.spec.ts
diff --git a/frontend/src/metabase/lib/errors/index.ts b/frontend/src/metabase/utils/errors/index.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/index.ts
rename to frontend/src/metabase/utils/errors/index.ts
diff --git a/frontend/src/metabase/lib/errors/is-static-embedding-entity-loading-error.ts b/frontend/src/metabase/utils/errors/is-static-embedding-entity-loading-error.ts
similarity index 81%
rename from frontend/src/metabase/lib/errors/is-static-embedding-entity-loading-error.ts
rename to frontend/src/metabase/utils/errors/is-static-embedding-entity-loading-error.ts
index a37d9791593..527bc55e673 100644
--- a/frontend/src/metabase/lib/errors/is-static-embedding-entity-loading-error.ts
+++ b/frontend/src/metabase/utils/errors/is-static-embedding-entity-loading-error.ts
@@ -1,4 +1,4 @@
-import type { StaticEmbeddingEntityError } from "metabase/lib/errors/types";
+import type { StaticEmbeddingEntityError } from "metabase/utils/errors/types";
export const isStaticEmbeddingEntityLoadingError = (
error: unknown,
diff --git a/frontend/src/metabase/lib/errors/messages.ts b/frontend/src/metabase/utils/errors/messages.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/messages.ts
rename to frontend/src/metabase/utils/errors/messages.ts
diff --git a/frontend/src/metabase/lib/errors/messages.unit.spec.ts b/frontend/src/metabase/utils/errors/messages.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/messages.unit.spec.ts
rename to frontend/src/metabase/utils/errors/messages.unit.spec.ts
diff --git a/frontend/src/metabase/lib/errors/server-error-types.ts b/frontend/src/metabase/utils/errors/server-error-types.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/server-error-types.ts
rename to frontend/src/metabase/utils/errors/server-error-types.ts
diff --git a/frontend/src/metabase/lib/errors/types.ts b/frontend/src/metabase/utils/errors/types.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/types.ts
rename to frontend/src/metabase/utils/errors/types.ts
diff --git a/frontend/src/metabase/lib/errors/validation.ts b/frontend/src/metabase/utils/errors/validation.ts
similarity index 100%
rename from frontend/src/metabase/lib/errors/validation.ts
rename to frontend/src/metabase/utils/errors/validation.ts
diff --git a/frontend/src/metabase/utils/fetchWithTimeout.ts b/frontend/src/metabase/utils/fetchWithTimeout.ts
new file mode 100644
index 00000000000..aa290f9bc83
--- /dev/null
+++ b/frontend/src/metabase/utils/fetchWithTimeout.ts
@@ -0,0 +1,38 @@
+const DEFAULT_TIMEOUT = 7000;
+
+type RequestInitWithTimeout = Omit<RequestInit, "signal"> & {
+ timeout?: number;
+};
+
+/**
+ * Fetches a URL with a timeout.
+ *
+ * TODO(romeovs): should use AbortSignal.timeout instead?
+ */
+export async function fetchWithTimeout(
+ url: string,
+ options: RequestInitWithTimeout,
+) {
+ const controller = new AbortController();
+ const timeout = setTimeout(() => {
+ controller.abort();
+ }, options?.timeout || DEFAULT_TIMEOUT);
+
+ try {
+ const response = await fetch(url, {
+ ...options,
+ signal: controller.signal,
+ });
+ return response;
+ } catch (err) {
+ if (err instanceof Error) {
+ if (err.name === "AbortError") {
+ throw new Error(`Request tp ${url} timed out`);
+ }
+ throw new Error(err.message);
+ }
+ throw new Error("error fetching");
+ } finally {
+ clearTimeout(timeout);
+ }
+}
diff --git a/frontend/src/metabase/lib/formatting/column.ts b/frontend/src/metabase/utils/formatting/column.ts
similarity index 80%
rename from frontend/src/metabase/lib/formatting/column.ts
rename to frontend/src/metabase/utils/formatting/column.ts
index b8077f90333..1e7ff3a2030 100644
--- a/frontend/src/metabase/lib/formatting/column.ts
+++ b/frontend/src/metabase/utils/formatting/column.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import type { DatasetColumn } from "metabase-types/api/dataset";
export function displayNameForColumn(column: DatasetColumn): string {
diff --git a/frontend/src/metabase/lib/formatting/constants.ts b/frontend/src/metabase/utils/formatting/constants.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/constants.ts
rename to frontend/src/metabase/utils/formatting/constants.ts
diff --git a/frontend/src/metabase/lib/formatting/currency.ts b/frontend/src/metabase/utils/formatting/currency.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/currency.ts
rename to frontend/src/metabase/utils/formatting/currency.ts
diff --git a/frontend/src/metabase/lib/formatting/currency.unit.spec.ts b/frontend/src/metabase/utils/formatting/currency.unit.spec.ts
similarity index 70%
rename from frontend/src/metabase/lib/formatting/currency.unit.spec.ts
rename to frontend/src/metabase/utils/formatting/currency.unit.spec.ts
index bb06ca5d897..ae9aaaf02b8 100644
--- a/frontend/src/metabase/lib/formatting/currency.unit.spec.ts
+++ b/frontend/src/metabase/utils/formatting/currency.unit.spec.ts
@@ -1,4 +1,4 @@
-import { getCurrencyStyleOptions } from "./currency";
+import { getCurrencyStyleOptions, getCurrencySymbol } from "./currency";
describe("getCurrencyStyleOptions", () => {
it("should get currency options - USD", () => {
@@ -38,3 +38,25 @@ describe("getCurrencyStyleOptions", () => {
]);
});
});
+
+describe("getCurrencySymbol", () => {
+ const currencySymbols = [
+ ["USD", "$"],
+ ["EUR", "€"],
+ ["GBP", "£"],
+ ["JPY", "¥"],
+ ["CNY", "CN¥"],
+ ["CAD", "CA$"],
+ ["AUD", "AU$"],
+ ["NZD", "NZ$"],
+ ["HKD", "HK$"],
+ ["BTC", "₿"],
+ ["OOPS", "OOPS"],
+ ];
+
+ currencySymbols.forEach(([currency, symbol]) => {
+ it(`should get a ${symbol} for ${currency}`, () => {
+ expect(getCurrencySymbol(currency)).toEqual(symbol);
+ });
+ });
+});
diff --git a/frontend/src/metabase/lib/formatting/date.tsx b/frontend/src/metabase/utils/formatting/date.tsx
similarity index 100%
rename from frontend/src/metabase/lib/formatting/date.tsx
rename to frontend/src/metabase/utils/formatting/date.tsx
diff --git a/frontend/src/metabase/utils/formatting/date.unit.spec.tsx b/frontend/src/metabase/utils/formatting/date.unit.spec.tsx
new file mode 100644
index 00000000000..806594b0b17
--- /dev/null
+++ b/frontend/src/metabase/utils/formatting/date.unit.spec.tsx
@@ -0,0 +1,371 @@
+import dayjs from "dayjs";
+
+import {
+ DATE_RANGE_FORMAT_SPECS,
+ SPECIFIC_DATE_TIME_UNITS,
+ formatDateTimeForParameter,
+ formatDateTimeRangeWithUnit,
+ formatDateTimeWithUnit,
+} from "metabase/utils/formatting/date";
+
+import "dayjs/locale/es";
+import "dayjs/locale/fr";
+
+describe("formatDateTimeRangeWithUnit", () => {
+ afterEach(() => {
+ dayjs.locale("en");
+ });
+
+ for (const unit of SPECIFIC_DATE_TIME_UNITS) {
+ describe(`formats for unit ${unit}`, () => {
+ const specs = DATE_RANGE_FORMAT_SPECS[unit];
+
+ it("should have a default spec", () => {
+ const defaultSpec = specs.find((spec) => spec.same === null);
+ expect(defaultSpec).toBeDefined();
+ });
+
+ for (const spec of specs) {
+ const {
+ same,
+ tests: { verbose, compact, removedYear, removedDay },
+ } = spec;
+
+ const inside = same
+ ? `inside the same ${same}`
+ : "with no units in common";
+
+ if (verbose) {
+ const { output, verboseOutput, input } = verbose;
+
+ it(`should correctly format a ${unit} range ${inside}`, () => {
+ const options = { type: "tooltip" };
+
+ expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
+ output,
+ );
+
+ if (verboseOutput) {
+ // eslint-disable-next-line jest/no-conditional-expect
+ expect(formatDateTimeRangeWithUnit(input, unit)).toBe(
+ verboseOutput,
+ );
+ }
+ });
+ }
+
+ if (compact) {
+ const { output, input } = compact;
+
+ it(`(options.compact) should correctly compact format a ${unit} range ${inside}`, () => {
+ const options = { compact: true };
+
+ expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
+ output,
+ );
+ });
+ }
+
+ if (removedYear) {
+ const { output, input } = removedYear;
+
+ it(`(options.removeYear) should correctly format a ${unit} range ${inside} with the year removed`, () => {
+ const options = { type: "tooltip", removeYear: true };
+
+ expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
+ output,
+ );
+ });
+ }
+
+ if (removedDay) {
+ const { output, input } = removedDay;
+
+ it(`(options.removeDay) should correctly format a ${unit} range ${inside} with the day removed`, () => {
+ const options = { type: "tooltip", removeDay: true };
+
+ expect(formatDateTimeRangeWithUnit(input, unit, options)).toBe(
+ output,
+ );
+ });
+ }
+ }
+ });
+ }
+});
+
+describe("formatDateTimeRangeWithUnit with date_style", () => {
+ it("should format M/D/YYYY style in cells", () => {
+ const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
+ const options = { type: "cell" as const, date_style: "M/D/YYYY" };
+
+ expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
+ "1/1/2017 – 1/7/2017",
+ );
+ });
+
+ it("should format D/M/YYYY style in cells", () => {
+ const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
+ const options = { type: "cell" as const, date_style: "D/M/YYYY" };
+
+ expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
+ "1/1/2017 – 7/1/2017",
+ );
+ });
+
+ it("should format YYYY/M/D style in cells", () => {
+ const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
+ const options = { type: "cell" as const, date_style: "YYYY/M/D" };
+
+ expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
+ "2017/1/1 – 2017/1/7",
+ );
+ });
+
+ it("should format D MMMM, YYYY style in cells", () => {
+ const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
+ const options = { type: "cell" as const, date_style: "D MMMM, YYYY" };
+
+ expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
+ "1 January, 2017 – 7 January, 2017",
+ );
+ });
+
+ it("should format week across months with M/D/YYYY in cells", () => {
+ const input: [string] = ["2017-01-29"]; // Week: 2017-01-29 to 2017-02-04
+ const options = { type: "cell" as const, date_style: "M/D/YYYY" };
+
+ expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
+ "1/29/2017 – 2/4/2017",
+ );
+ });
+
+ it("should format week across years with M/D/YYYY in cells", () => {
+ const input: [string] = ["2017-12-31"]; // Week: 2017-12-31 to 2018-01-06
+ const options = { type: "cell" as const, date_style: "M/D/YYYY" };
+
+ expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
+ "12/31/2017 – 1/6/2018",
+ );
+ });
+
+ it("should respect custom separator with M/D/YYYY style", () => {
+ const input: [string] = ["2017-01-01"]; // Week: 2017-01-01 to 2017-01-07
+ const options = {
+ type: "cell" as const,
+ date_style: "M/D/YYYY",
+ date_separator: "-",
+ };
+
+ expect(formatDateTimeRangeWithUnit(input, "week", options)).toBe(
+ "1-1-2017 – 1-7-2017",
+ );
+ });
+});
+
+describe("formatDateTimeForParameter", () => {
+ const value = "2020-01-01T06:00:00+05:00";
+
+ it("should format year", () => {
+ expect(formatDateTimeForParameter(value, "year")).toBe(
+ "2020-01-01~2020-12-31",
+ );
+ });
+
+ it("should format quarter", () => {
+ expect(formatDateTimeForParameter(value, "quarter")).toBe("Q1-2020");
+ });
+
+ it("should format month", () => {
+ expect(formatDateTimeForParameter(value, "month")).toBe("2020-01");
+ });
+
+ it("should format week", () => {
+ expect(formatDateTimeForParameter(value, "week")).toBe(
+ "2019-12-29~2020-01-04",
+ );
+ });
+
+ it("should format day", () => {
+ expect(formatDateTimeForParameter(value, "day")).toBe("2020-01-01");
+ });
+
+ it("should format hour", () => {
+ expect(formatDateTimeForParameter(value, "hour")).toBe("2020-01-01T06:00");
+ });
+
+ it("should format minute", () => {
+ expect(formatDateTimeForParameter(value, "minute")).toBe(
+ "2020-01-01T06:00",
+ );
+ });
+
+ it("should format quarter-of-year as a day", () => {
+ expect(formatDateTimeForParameter(value, "quarter-of-year")).toBe(
+ "2020-01-01",
+ );
+ });
+
+ describe("formatDateTimeWithUnit", () => {
+ afterEach(() => {
+ dayjs.locale("en");
+ });
+
+ it("should format week ranges", () => {
+ expect(
+ formatDateTimeWithUnit("2019-07-07T00:00:00.000Z", "week", {
+ type: "cell",
+ }),
+ ).toEqual("July 7, 2019 – July 13, 2019");
+ });
+
+ it("should always format week ranges according to returned data", () => {
+ dayjs.locale("es");
+ dayjs.updateLocale(dayjs.locale(), { weekStart: 0 });
+
+ expect(
+ formatDateTimeWithUnit("2019-07-07T00:00:00.000Z", "week", {
+ type: "cell",
+ }),
+ ).toEqual("julio 7, 2019 – julio 13, 2019");
+ });
+
+ it("should format days of week with default options", () => {
+ expect(formatDateTimeWithUnit("mon", "day-of-week")).toEqual("Monday");
+ });
+
+ it("should format days of week with compact option", () => {
+ const options = {
+ compact: true,
+ };
+
+ expect(formatDateTimeWithUnit("sun", "day-of-week", options)).toEqual(
+ "Sun",
+ );
+ });
+
+ it("should format days of week with exclude option", () => {
+ const options = {
+ isExclude: true,
+ };
+
+ expect(
+ formatDateTimeWithUnit("2022-04-25", "day-of-week", options),
+ ).toEqual("Monday");
+ });
+
+ it("should format hours of day with exclude option", () => {
+ const options = {
+ isExclude: true,
+ };
+
+ expect(
+ formatDateTimeWithUnit(
+ "2022-04-27T06:00:00.000Z",
+ "hour-of-day",
+ options,
+ ),
+ ).toEqual("6 AM");
+ });
+
+ test.each([
+ ["minute", "Wed, April 27, 2022, 6:00 AM"],
+ ["hour", "Wed, April 27, 2022, 6:00 AM"],
+ ["day", "Wed, April 27, 2022"],
+ ["week", "Wed, April 27, 2022"],
+ ["month", "April 2022"],
+ ["year", "2022"],
+ ] as const)(
+ "should include weekday when date unit is smaller than or equal to a week",
+ (unit, formatted) => {
+ const dateString = "2022-04-27T06:00:00.000Z";
+
+ expect(
+ formatDateTimeWithUnit(dateString, unit, {
+ weekday_enabled: true,
+ }),
+ ).toEqual(formatted);
+ },
+ );
+
+ describe("day-of-year formatting", () => {
+ it("should format day-of-year as plain number", () => {
+ expect(formatDateTimeWithUnit(1, "day-of-year")).toEqual(1);
+ expect(formatDateTimeWithUnit(100, "day-of-year")).toEqual(100);
+ expect(formatDateTimeWithUnit(365, "day-of-year")).toEqual(365);
+ });
+
+ it("should format day-of-year from date strings", () => {
+ // January 1st = day 1
+ expect(formatDateTimeWithUnit("2023-01-01", "day-of-year")).toEqual(1);
+ // February 1st = day 32 (31 days in January + 1)
+ expect(formatDateTimeWithUnit("2023-02-01", "day-of-year")).toEqual(32);
+ // December 31st = day 365 (non-leap year)
+ expect(formatDateTimeWithUnit("2023-12-31", "day-of-year")).toEqual(
+ 365,
+ );
+ });
+
+ it("should handle leap year correctly", () => {
+ // December 31st in a leap year = day 366
+ expect(formatDateTimeWithUnit("2020-12-31", "day-of-year")).toEqual(
+ 366,
+ );
+ // February 29th in a leap year = day 60
+ expect(formatDateTimeWithUnit("2020-02-29", "day-of-year")).toEqual(60);
+ });
+ });
+
+ describe("week-of-year formatting", () => {
+ it("should format week numbers with ordinal suffixes", () => {
+ expect(formatDateTimeWithUnit(1, "week-of-year")).toEqual("1st");
+ expect(formatDateTimeWithUnit(2, "week-of-year")).toEqual("2nd");
+ expect(formatDateTimeWithUnit(3, "week-of-year")).toEqual("3rd");
+ expect(formatDateTimeWithUnit(4, "week-of-year")).toEqual("4th");
+ expect(formatDateTimeWithUnit(21, "week-of-year")).toEqual("21st");
+ expect(formatDateTimeWithUnit(22, "week-of-year")).toEqual("22nd");
+ expect(formatDateTimeWithUnit(23, "week-of-year")).toEqual("23rd");
+ expect(formatDateTimeWithUnit(24, "week-of-year")).toEqual("24th");
+ expect(formatDateTimeWithUnit(53, "week-of-year")).toEqual("53rd");
+ });
+
+ it("should handle edge cases for ordinal suffixes", () => {
+ expect(formatDateTimeWithUnit(11, "week-of-year")).toEqual("11th");
+ expect(formatDateTimeWithUnit(12, "week-of-year")).toEqual("12th");
+ expect(formatDateTimeWithUnit(13, "week-of-year")).toEqual("13th");
+ });
+
+ it("should format week-of-year from date strings", () => {
+ // January 1st, 2023 (Sunday) is in week 52 of 2022 (ISO week)
+ const week1 = formatDateTimeWithUnit("2023-01-02", "week-of-year"); // Monday Jan 2 is week 1
+ expect(week1).toMatch(/^1[a-z]+$/);
+
+ // Mid-year dates
+ const midYear = formatDateTimeWithUnit("2023-06-15", "week-of-year");
+ expect(midYear).toMatch(/^2[0-9][a-z]+$/);
+
+ // End of year
+ const endYear = formatDateTimeWithUnit("2023-12-25", "week-of-year");
+ expect(endYear).toMatch(/^5[0-3][a-z]+$/);
+ });
+
+ it("should remove square brackets from English ordinals", () => {
+ expect(formatDateTimeWithUnit(1, "week-of-year")).toEqual("1st");
+ expect(formatDateTimeWithUnit(2, "week-of-year")).toEqual("2nd");
+ expect(formatDateTimeWithUnit(3, "week-of-year")).toEqual("3rd");
+ });
+
+ it("should handle non-English locales where ordinals are not wrapped in brackets (#66658)", () => {
+ const originalLocale = dayjs.locale();
+ try {
+ dayjs.locale("fr");
+ expect(formatDateTimeWithUnit(1, "week-of-year")).toEqual("1er");
+ expect(formatDateTimeWithUnit(2, "week-of-year")).toEqual("2");
+ expect(formatDateTimeWithUnit(3, "week-of-year")).toEqual("3");
+ } finally {
+ dayjs.locale(originalLocale);
+ }
+ });
+ });
+ });
+});
diff --git a/frontend/src/metabase/lib/formatting/datetime-utils.ts b/frontend/src/metabase/utils/formatting/datetime-utils.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/datetime-utils.ts
rename to frontend/src/metabase/utils/formatting/datetime-utils.ts
diff --git a/frontend/src/metabase/lib/formatting/email.tsx b/frontend/src/metabase/utils/formatting/email.tsx
similarity index 95%
rename from frontend/src/metabase/lib/formatting/email.tsx
rename to frontend/src/metabase/utils/formatting/email.tsx
index 72852a4ae09..6e3ac09983c 100644
--- a/frontend/src/metabase/lib/formatting/email.tsx
+++ b/frontend/src/metabase/utils/formatting/email.tsx
@@ -1,5 +1,5 @@
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { isEmail } from "metabase/lib/email";
+import { isEmail } from "metabase/utils/email";
import { getDataFromClicked } from "metabase-lib/v1/parameters/utils/click-behavior";
import { renderLinkTextForClick } from "./link";
diff --git a/frontend/src/metabase/lib/formatting/email.unit.spec.tsx b/frontend/src/metabase/utils/formatting/email.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/lib/formatting/email.unit.spec.tsx
rename to frontend/src/metabase/utils/formatting/email.unit.spec.tsx
diff --git a/frontend/src/metabase/lib/formatting/field.ts b/frontend/src/metabase/utils/formatting/field.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/field.ts
rename to frontend/src/metabase/utils/formatting/field.ts
diff --git a/frontend/src/metabase/lib/formatting/geography.ts b/frontend/src/metabase/utils/formatting/geography.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/geography.ts
rename to frontend/src/metabase/utils/formatting/geography.ts
diff --git a/frontend/src/metabase/lib/formatting/image.tsx b/frontend/src/metabase/utils/formatting/image.tsx
similarity index 100%
rename from frontend/src/metabase/lib/formatting/image.tsx
rename to frontend/src/metabase/utils/formatting/image.tsx
diff --git a/frontend/src/metabase/utils/formatting/index.ts b/frontend/src/metabase/utils/formatting/index.ts
new file mode 100644
index 00000000000..40623ac9960
--- /dev/null
+++ b/frontend/src/metabase/utils/formatting/index.ts
@@ -0,0 +1,13 @@
+export * from "./column";
+export * from "./currency";
+export * from "./date";
+export * from "./email";
+export * from "./field";
+export * from "./geography";
+export * from "./image";
+export * from "./numbers";
+export * from "./strings";
+export * from "./time";
+export * from "./types";
+export * from "./url";
+export * from "./value";
diff --git a/frontend/src/metabase/lib/formatting/link.ts b/frontend/src/metabase/utils/formatting/link.ts
similarity index 98%
rename from frontend/src/metabase/lib/formatting/link.ts
rename to frontend/src/metabase/utils/formatting/link.ts
index 4fcaeacae4e..cb404eaf483 100644
--- a/frontend/src/metabase/lib/formatting/link.ts
+++ b/frontend/src/metabase/utils/formatting/link.ts
@@ -1,9 +1,9 @@
-import { isSameOrSiteUrlOrigin } from "metabase/lib/dom";
+import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
import {
formatValue,
getUrlProtocol,
isDefaultLinkProtocol,
-} from "metabase/lib/formatting";
+} from "metabase/utils/formatting";
import { isDate } from "metabase-lib/v1/types/utils/isa";
import type { ParameterValueOrArray } from "metabase-types/api";
import type { DatasetColumn, RowValue } from "metabase-types/api/dataset";
diff --git a/frontend/src/metabase/lib/formatting/link.unit.spec.tsx b/frontend/src/metabase/utils/formatting/link.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/lib/formatting/link.unit.spec.tsx
rename to frontend/src/metabase/utils/formatting/link.unit.spec.tsx
diff --git a/frontend/src/metabase/lib/formatting/nullable.ts b/frontend/src/metabase/utils/formatting/nullable.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/nullable.ts
rename to frontend/src/metabase/utils/formatting/nullable.ts
diff --git a/frontend/src/metabase/lib/formatting/numbers.tsx b/frontend/src/metabase/utils/formatting/numbers.tsx
similarity index 100%
rename from frontend/src/metabase/lib/formatting/numbers.tsx
rename to frontend/src/metabase/utils/formatting/numbers.tsx
diff --git a/frontend/src/metabase/utils/formatting/numbers.unit.spec.ts b/frontend/src/metabase/utils/formatting/numbers.unit.spec.ts
new file mode 100644
index 00000000000..7e8f62ff42c
--- /dev/null
+++ b/frontend/src/metabase/utils/formatting/numbers.unit.spec.ts
@@ -0,0 +1,406 @@
+import { formatNumber, numberFormatterForOptions } from "./numbers";
+
+describe("formatNumber", () => {
+ it("should respect the decimals setting even when compact is true (metabase#54063)", () => {
+ const result = formatNumber(4.271250189320243, {
+ compact: true,
+ decimals: 0,
+ });
+
+ expect(result).toEqual("4");
+ });
+
+ it("should show the correct currency format (metabase#34242)", () => {
+ const numberFormatter = numberFormatterForOptions({
+ number_style: "currency",
+ currency: "USD",
+ currency_style: "symbol",
+ maximumFractionDigits: 2,
+ });
+
+ const compactResult = formatNumber(-500000, {
+ currency: "USD",
+ number_style: "currency",
+ currency_style: "symbol",
+ currency_in_header: true,
+ number_separators: ".,",
+ _numberFormatter: numberFormatter,
+ compact: true,
+ });
+ expect(compactResult).toEqual("-$500.0k");
+
+ const fullResult = formatNumber(-500000, {
+ compact: false,
+ maximumFractionDigits: 2,
+ currency: "USD",
+ number_style: "currency",
+ currency_style: "symbol",
+ currency_in_header: true,
+ number_separators: ".,",
+ _numberFormatter: numberFormatter,
+ });
+ expect(fullResult).toEqual("-$500,000.00");
+ });
+
+ it("should work with scientific notation (metabase#25222)", () => {
+ expect(
+ formatNumber(0.000000000015, {
+ number_style: "scientific",
+ }),
+ ).toEqual("1.5e-11");
+
+ expect(
+ formatNumber(1.000000015, {
+ number_style: "scientific",
+ }),
+ ).toEqual("1.000000015e+0");
+
+ expect(
+ formatNumber(1.000015, {
+ number_style: "scientific",
+ }),
+ ).toEqual("1.000015e+0");
+ });
+
+ describe("compact mode with decimals setting", () => {
+ it("should respect various decimal settings in compact mode (metabase#63145)", () => {
+ const value = 1234567;
+
+ expect(
+ formatNumber(value, {
+ compact: true,
+ decimals: 0,
+ }),
+ ).toBe("1M");
+
+ expect(
+ formatNumber(value, {
+ compact: true,
+ decimals: 1,
+ }),
+ ).toBe("1.2M");
+
+ expect(
+ formatNumber(value, {
+ compact: true,
+ decimals: 2,
+ }),
+ ).toBe("1.23M");
+
+ expect(
+ formatNumber(value, {
+ compact: true,
+ decimals: 3,
+ }),
+ ).toBe("1.235M");
+
+ expect(
+ formatNumber(value, {
+ compact: true,
+ decimals: 4,
+ }),
+ ).toBe("1.2346M");
+ });
+ });
+
+ describe("formatNumber – compact rounding (metabase#59454)", () => {
+ it("rounds billions with 0 decimals", () => {
+ expect(
+ formatNumber(1_499_999_999, {
+ compact: true,
+ maximumFractionDigits: 0,
+ }),
+ ).toBe("1B");
+ expect(
+ formatNumber(1_500_000_000, {
+ compact: true,
+ maximumFractionDigits: 0,
+ }),
+ ).toBe("2B");
+ expect(
+ formatNumber(1_949_999_999, {
+ compact: true,
+ maximumFractionDigits: 0,
+ }),
+ ).toBe("2B");
+ });
+
+ it("carries to the next unit at 999.5M (0 decimals)", () => {
+ expect(
+ formatNumber(999_499_999, { compact: true, maximumFractionDigits: 0 }),
+ ).toBe("999M");
+ expect(
+ formatNumber(999_500_000, { compact: true, maximumFractionDigits: 0 }),
+ ).toBe("1B");
+ });
+
+ it("keeps sign with rounding", () => {
+ expect(
+ formatNumber(-1_950_000_000, {
+ compact: true,
+ maximumFractionDigits: 0,
+ }),
+ ).toBe("-2B");
+ });
+
+ it("respects explicit decimals when provided", () => {
+ expect(
+ formatNumber(1_950_000_000, {
+ compact: true,
+ minimumFractionDigits: 1,
+ maximumFractionDigits: 1,
+ }),
+ ).toBe("2.0B");
+ });
+ });
+
+ it("should format 0 correctly", () => {
+ expect(formatNumber(0)).toEqual("0");
+ });
+
+ it("should format 1 and -1 correctly", () => {
+ expect(formatNumber(1)).toEqual("1");
+ expect(formatNumber(-1)).toEqual("-1");
+ });
+
+ it("should format large positive and negative numbers correctly", () => {
+ expect(formatNumber(10)).toEqual("10");
+ expect(formatNumber(99999999)).toEqual("99,999,999");
+ expect(formatNumber(-10)).toEqual("-10");
+ expect(formatNumber(-99999999)).toEqual("-99,999,999");
+ });
+
+ it("should format large numbers correctly with non-default number separator", () => {
+ const options = { number_separators: ",." };
+ expect(formatNumber(10.1, options)).toEqual("10,1");
+ expect(formatNumber(99999999.9, options)).toEqual("99.999.999,9");
+ expect(formatNumber(-10.1, options)).toEqual("-10,1");
+ expect(formatNumber(-99999999.9, options)).toEqual("-99.999.999,9");
+ });
+
+ it("should format to 2 significant digits", () => {
+ expect(formatNumber(1 / 3)).toEqual("0.33");
+ expect(formatNumber(-1 / 3)).toEqual("-0.33");
+ expect(formatNumber(0.0001 / 3)).toEqual("0.000033");
+ });
+
+ describe("in enclosing negative mode", () => {
+ it("should format -4 as (4)", () => {
+ expect(formatNumber(-4, { negativeInParentheses: true })).toEqual("(4)");
+ });
+
+ it("should format 7 as 7", () => {
+ expect(formatNumber(7, { negativeInParentheses: true })).toEqual("7");
+ });
+
+ it("should format 0 as 0", () => {
+ expect(formatNumber(0, { negativeInParentheses: true })).toEqual("0");
+ });
+ });
+
+ describe("in compact mode", () => {
+ it("should format 0 as 0", () => {
+ expect(formatNumber(0, { compact: true })).toEqual("0");
+ });
+
+ it("shouldn't display small numbers as 0", () => {
+ expect(formatNumber(0.1, { compact: true })).toEqual("0.1");
+ expect(formatNumber(-0.1, { compact: true })).toEqual("-0.1");
+ expect(formatNumber(0.01, { compact: true })).toEqual("0.01");
+ expect(formatNumber(-0.01, { compact: true })).toEqual("-0.01");
+ });
+
+ it("should round up and down", () => {
+ expect(formatNumber(1.01, { compact: true })).toEqual("1.01");
+ expect(formatNumber(-1.01, { compact: true })).toEqual("-1.01");
+ expect(formatNumber(1.9, { compact: true })).toEqual("1.9");
+ expect(formatNumber(-1.9, { compact: true })).toEqual("-1.9");
+ });
+
+ it("should format large numbers with metric units", () => {
+ expect(formatNumber(1, { compact: true })).toEqual("1");
+ expect(formatNumber(1000, { compact: true })).toEqual("1.0k");
+ expect(formatNumber(1111, { compact: true })).toEqual("1.1k");
+ });
+
+ it("should format large numbers correctly with non-default number separator", () => {
+ const options = { compact: true, number_separators: ",." };
+ expect(formatNumber(10.1, options)).toEqual("10,1");
+ expect(formatNumber(99999999.9, options)).toEqual("100,0M");
+ expect(formatNumber(-10.1, options)).toEqual("-10,1");
+ expect(formatNumber(-99999999.9, options)).toEqual("-100,0M");
+ });
+
+ it("should format big integers", () => {
+ expect(formatNumber(9223372036854775807n, {})).toEqual(
+ "9,223,372,036,854,775,807",
+ );
+ });
+
+ it("should format big integers correctly with non-default number separators", () => {
+ const options = { number_separators: ",." };
+ expect(formatNumber(1000n, options)).toEqual("1.000");
+ });
+
+ it("should format big integers with scale options", () => {
+ const options = { scale: 10 };
+ expect(formatNumber(1000n, options)).toEqual("10,000");
+ });
+
+ it("should respect 'decimals' setting", () => {
+ expect(formatNumber(500000, { compact: true, decimals: 0 })).toBe("500k");
+ expect(formatNumber(500000, { compact: true })).toBe("500.0k");
+ expect(formatNumber(10.1, { compact: true })).toBe("10.1");
+ expect(formatNumber(10.1, { compact: true, decimals: 0 })).toBe("10");
+ expect(formatNumber(99999999.9, { compact: true })).toBe("100.0M");
+ expect(formatNumber(99999999.9, { compact: true, decimals: 0 })).toBe(
+ "100M",
+ );
+ });
+
+ it("should format percentages", () => {
+ const options = { compact: true, number_style: "percent" };
+ expect(formatNumber(0.867, { number_style: "percent" })).toEqual("86.7%");
+ expect(formatNumber(1.2345, { number_style: "percent" })).toEqual(
+ "123.45%",
+ );
+ expect(formatNumber(0, options)).toEqual("0%");
+ expect(formatNumber(0.001, options)).toEqual("0.1%");
+ expect(formatNumber(0.0001, options)).toEqual("0.01%");
+ expect(formatNumber(0.001234, options)).toEqual("0.12%");
+ expect(formatNumber(0.1, options)).toEqual("10%");
+ expect(formatNumber(0.1234, options)).toEqual("12.34%");
+ expect(formatNumber(0.019, options)).toEqual("1.9%");
+ expect(formatNumber(0.021, options)).toEqual("2.1%");
+ expect(formatNumber(11.11, options)).toEqual("1.1k%");
+ expect(formatNumber(-0.22, options)).toEqual("-22%");
+ });
+
+ it("should format scientific notation", () => {
+ const options = { compact: true, number_style: "scientific" };
+ expect(formatNumber(0, options)).toEqual("0.0e+0");
+ expect(formatNumber(0.0001, options)).toEqual("1.0e-4");
+ expect(formatNumber(0.01, options)).toEqual("1.0e-2");
+ expect(formatNumber(0.5, options)).toEqual("5.0e-1");
+ expect(formatNumber(123456.78, options)).toEqual("1.2e+5");
+ expect(formatNumber(-123456.78, options)).toEqual("-1.2e+5");
+ });
+
+ it("should obey custom separators in scientific notiation", () => {
+ const options = {
+ compact: true,
+ number_style: "scientific",
+ number_separators: ",.",
+ };
+ expect(formatNumber(0, options)).toEqual("0,0e+0");
+ expect(formatNumber(0.0001, options)).toEqual("1,0e-4");
+ expect(formatNumber(0.01, options)).toEqual("1,0e-2");
+ expect(formatNumber(0.5, options)).toEqual("5,0e-1");
+ expect(formatNumber(123456.78, options)).toEqual("1,2e+5");
+ expect(formatNumber(-123456.78, options)).toEqual("-1,2e+5");
+ });
+
+ it("should format currency values", () => {
+ const options = {
+ compact: true,
+ number_style: "currency",
+ currency: "USD",
+ };
+ expect(formatNumber(0, options)).toEqual("$0.00");
+ expect(formatNumber(0.001, options)).toEqual("$0.00");
+ expect(formatNumber(7.24, options)).toEqual("$7.24");
+ expect(formatNumber(7.249, options)).toEqual("$7.25");
+ expect(formatNumber(724.9, options)).toEqual("$724.90");
+ expect(formatNumber(1234.56, options)).toEqual("$1.2k");
+ expect(formatNumber(1234567.89, options)).toEqual("$1.2M");
+ expect(formatNumber(-1234567.89, options)).toEqual("-$1.2M");
+ expect(formatNumber(1234567.89, { ...options, currency: "CNY" })).toEqual(
+ "CN¥1.2M",
+ );
+ expect(
+ formatNumber(1234567.89, { ...options, currency_style: "name" }),
+ ).toEqual("$1.2M");
+ });
+ });
+
+ it("should format to correct number of decimal places", () => {
+ expect(formatNumber(0.1)).toEqual("0.1");
+ expect(formatNumber(0.11)).toEqual("0.11");
+ expect(formatNumber(0.111)).toEqual("0.11");
+ expect(formatNumber(0.01)).toEqual("0.01");
+ expect(formatNumber(0.011)).toEqual("0.011");
+ expect(formatNumber(0.0111)).toEqual("0.011");
+ expect(formatNumber(1.1)).toEqual("1.1");
+ expect(formatNumber(1.11)).toEqual("1.11");
+ expect(formatNumber(1.111)).toEqual("1.11");
+ expect(formatNumber(111.111)).toEqual("111.11");
+ });
+
+ describe("number_style = currency", () => {
+ it("should handle positive currency", () => {
+ expect(
+ formatNumber(1.23, { number_style: "currency", currency: "USD" }),
+ ).toBe("$1.23");
+ });
+
+ it("should handle negative currency", () => {
+ expect(
+ formatNumber(-1.23, { number_style: "currency", currency: "USD" }),
+ ).toBe("-$1.23");
+ });
+
+ describe("with currency_in_header = true and type = cell", () => {
+ it("should handle positive currency", () => {
+ expect(
+ formatNumber(1.23, {
+ number_style: "currency",
+ currency: "USD",
+ currency_in_header: true,
+ type: "cell",
+ }),
+ ).toBe("1.23");
+ });
+
+ it("should handle negative currency", () => {
+ expect(
+ formatNumber(-1.23, {
+ number_style: "currency",
+ currency: "USD",
+ currency_in_header: true,
+ type: "cell",
+ }),
+ ).toBe("-1.23");
+ });
+ });
+ });
+});
+
+describe("formatNumber with scale (multiply function)", () => {
+ it("should multiply regular numbers with scale", () => {
+ expect(formatNumber(5, { scale: 3 })).toBe("15");
+ expect(formatNumber(2.5, { scale: 4 })).toBe("10");
+ });
+
+ it("should multiply bigint with integer scale", () => {
+ expect(formatNumber(BigInt(5), { scale: 3 })).toBe("15");
+ expect(formatNumber(BigInt(100), { scale: 7 })).toBe("700");
+ });
+
+ it("should convert bigint to number when scaling with float", () => {
+ expect(formatNumber(BigInt(5), { scale: 2.5 })).toBe("12.5");
+ expect(formatNumber(BigInt(10), { scale: 1.5 })).toBe("15");
+ });
+
+ it("should handle edge cases with scale", () => {
+ expect(formatNumber(0, { scale: 5 })).toBe("0");
+ expect(formatNumber(BigInt(0), { scale: 3 })).toBe("0");
+ expect(formatNumber(BigInt(5), { scale: 0 })).toBe("0");
+ expect(formatNumber(BigInt(5), { scale: 0.5 })).toBe("2.5");
+ });
+
+ it("should handle negative numbers with scale", () => {
+ expect(formatNumber(-5, { scale: 3 })).toBe("-15");
+ expect(formatNumber(BigInt(-5), { scale: 3 })).toBe("-15");
+ expect(formatNumber(BigInt(-5), { scale: 2.5 })).toBe("-12.5");
+ });
+});
diff --git a/frontend/src/metabase/lib/formatting/round-float.unit.spec.ts b/frontend/src/metabase/utils/formatting/round-float.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/round-float.unit.spec.ts
rename to frontend/src/metabase/utils/formatting/round-float.unit.spec.ts
diff --git a/frontend/src/metabase/lib/formatting/strings.ts b/frontend/src/metabase/utils/formatting/strings.ts
similarity index 100%
rename from frontend/src/metabase/lib/formatting/strings.ts
rename to frontend/src/metabase/utils/formatting/strings.ts
diff --git a/frontend/src/metabase/utils/formatting/strings.util.spec.ts b/frontend/src/metabase/utils/formatting/strings.util.spec.ts
new file mode 100644
index 00000000000..10f3c2c46c3
--- /dev/null
+++ b/frontend/src/metabase/utils/formatting/strings.util.spec.ts
@@ -0,0 +1,30 @@
+import { capitalize } from "./strings";
+
+describe("formatting", () => {
+ describe("strings", () => {
+ describe("capitalize", () => {
+ it("capitalizes a single word", () => {
+ expect(capitalize("hello")).toBe("Hello");
+ });
+
+ it("capitalizes only the first char of a string", () => {
+ expect(capitalize("hello world")).toBe("Hello world");
+ });
+
+ it("converts a string to lowercase by default", () => {
+ expect(capitalize("heLLo")).toBe("Hello");
+ });
+
+ it("doesn't lowercase the string if option provided", () => {
+ expect(capitalize("hellO WoRlD", { lowercase: false })).toBe(
+ "HellO WoRlD",
+ );
+ });
+
+ it("doesn't break on an empty string", () => {
+ expect(capitalize("")).toBe("");
+ expect(capitalize("", { lowercase: false })).toBe("");
+ });
+ });
+ });
+});
diff --git a/frontend/src/metabase/lib/formatting/time.ts b/frontend/src/metabase/utils/formatting/time.ts
similarity index 92%
rename from frontend/src/metabase/lib/formatting/time.ts
rename to frontend/src/metabase/utils/formatting/time.ts
index 6ae47da613e..f5641054eab 100644
--- a/frontend/src/metabase/lib/formatting/time.ts
+++ b/frontend/src/metabase/utils/formatting/time.ts
@@ -1,8 +1,8 @@
import type { Dayjs } from "dayjs";
import { msgid, ngettext } from "ttag";
-import type { TimeOnlyOptions } from "metabase/lib/formatting/types";
-import { parseTime, parseTimestamp } from "metabase/lib/time-dayjs";
+import type { TimeOnlyOptions } from "metabase/utils/formatting/types";
+import { parseTime, parseTimestamp } from "metabase/utils/time-dayjs";
import type { DatetimeUnit } from "metabase-types/api/query";
import {
@@ -64,7 +64,7 @@ export function formatTimeWithUnit(
}
export function formatTime(
- time: Dayjs,
+ time: Dayjs | string,
unit: DatetimeUnit = "default",
options: TimeOnlyOptions = {},
) {
diff --git a/frontend/src/metabase/utils/formatting/time.unit.spec.ts b/frontend/src/metabase/utils/formatting/time.unit.spec.ts
new file mode 100644
index 00000000000..3061d25223f
--- /dev/null
+++ b/frontend/src/metabase/utils/formatting/time.unit.spec.ts
@@ -0,0 +1,77 @@
+import { formatTime, formatTimeWithUnit } from "./time";
+
+describe("time", () => {
+ describe("formatTime", () => {
+ const FORMAT_TIME_TESTS = [
+ ["01:02:03.456+07:00", "1:02 AM"],
+ ["01:02", "1:02 AM"],
+ ["22:29:59.26816+01:00", "10:29 PM"],
+ ["22:29:59.412459+01:00", "10:29 PM"],
+ ["19:14:42.926221+01:00", "7:14 PM"],
+ ["19:14:42.13202+01:00", "7:14 PM"],
+ ["13:38:58.987352+01:00", "1:38 PM"],
+ ["13:38:58.001001+01:00", "1:38 PM"],
+ ["17:01:23+01:00", "5:01 PM"],
+ ] as const;
+
+ test.each(FORMAT_TIME_TESTS)(
+ `formatTime(%p) to be %p`,
+ (value, resultStr) => {
+ const result = formatTime(value);
+ expect(result).toBe(resultStr);
+ },
+ );
+
+ it("should use options when formatting times", () => {
+ const value = "20:34:56";
+ const t12 = formatTime(value, "default", {});
+ expect(t12).toBe("8:34 PM");
+ const t24 = formatTime(value, "default", {
+ time_enabled: "minutes",
+ time_style: "HH:mm",
+ });
+ expect(t24).toBe("20:34");
+ });
+ });
+
+ describe("formatTimeWithUnit", () => {
+ it("should format hour-of day with default options", () => {
+ expect(formatTimeWithUnit(8, "hour-of-day")).toEqual("8:00 AM");
+ });
+
+ it("should format hour-of-day with 12 hour clock", () => {
+ const options = {
+ time_style: "h:mm A",
+ };
+
+ expect(formatTimeWithUnit(14, "hour-of-day", options)).toEqual("2:00 PM");
+ });
+
+ it("should format hour-of-day with 24 hour clock", () => {
+ const options = {
+ time_style: "HH:mm",
+ };
+
+ expect(formatTimeWithUnit(14, "hour-of-day", options)).toEqual("14:00");
+ });
+
+ it("should format hour-of-day with custom precision", () => {
+ const options = {
+ time_style: "HH:mm",
+ time_enabled: "seconds" as const,
+ };
+
+ expect(formatTimeWithUnit(14.4, "hour-of-day", options)).toEqual(
+ "14:00:00",
+ );
+ });
+
+ it("should format hour-of-day with a custom format", () => {
+ const options = {
+ time_format: "HH",
+ };
+
+ expect(formatTimeWithUnit(14.4, "hour-of-day", options)).toEqual("14");
+ });
+ });
+});
diff --git a/frontend/src/metabase/lib/formatting/types.ts b/frontend/src/metabase/utils/formatting/types.ts
similarity index 97%
rename from frontend/src/metabase/lib/formatting/types.ts
rename to frontend/src/metabase/utils/formatting/types.ts
index f0585d175ce..25bc782b30b 100644
--- a/frontend/src/metabase/lib/formatting/types.ts
+++ b/frontend/src/metabase/utils/formatting/types.ts
@@ -21,7 +21,7 @@ export interface OptionsType extends TimeOnlyOptions {
date_abbreviate?: boolean;
date_format?: string;
date_separator?: string;
- date_style?: string;
+ date_style?: string | null;
decimals?: number;
isExclude?: boolean;
jsx?: boolean;
diff --git a/frontend/src/metabase/lib/formatting/url.tsx b/frontend/src/metabase/utils/formatting/url.tsx
similarity index 98%
rename from frontend/src/metabase/lib/formatting/url.tsx
rename to frontend/src/metabase/utils/formatting/url.tsx
index b0385c58ea6..b1ee35258f6 100644
--- a/frontend/src/metabase/lib/formatting/url.tsx
+++ b/frontend/src/metabase/utils/formatting/url.tsx
@@ -5,7 +5,7 @@ import { ExternalLink } from "metabase/common/components/ExternalLink";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { isSameOrSiteUrlOrigin } from "metabase/lib/dom";
+import { isSameOrSiteUrlOrigin } from "metabase/utils/dom";
import { getDataFromClicked } from "metabase-lib/v1/parameters/utils/click-behavior";
import { isURL } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/utils/formatting/url.unit.spec.tsx b/frontend/src/metabase/utils/formatting/url.unit.spec.tsx
new file mode 100644
index 00000000000..4988039681d
--- /dev/null
+++ b/frontend/src/metabase/utils/formatting/url.unit.spec.tsx
@@ -0,0 +1,284 @@
+import type { ReactElement } from "react";
+import { isElementOfType } from "react-dom/test-utils";
+
+import { setupSdkPlugins } from "__support__/enterprise";
+import { mockSettings } from "__support__/settings";
+import { render, screen } from "__support__/ui";
+import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
+import { ExternalLink } from "metabase/common/components/ExternalLink";
+import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";
+import { TYPE } from "metabase-lib/v1/types/constants";
+import { createMockTokenFeatures } from "metabase-types/api/mocks";
+
+import { formatUrl, slugify } from "./url";
+import { formatValue } from "./value";
+
+const SITE_URL = "http://localhost:3000";
+
+describe("formatUrl", () => {
+ beforeAll(() => {
+ mockSettings({ "site-url": SITE_URL });
+ });
+
+ afterEach(() => {
+ ensureMetabaseProviderPropsStore().cleanup();
+ jest.restoreAllMocks();
+ });
+
+ it("calls handleLinkSdkPlugin and prevents default in SDK", async () => {
+ mockSettings({
+ "token-features": createMockTokenFeatures({ embedding_sdk: true }),
+ });
+ setupSdkPlugins();
+ await mockIsEmbeddingSdk(true);
+
+ const url = "https://example.com/dashboard/1";
+ const handleLink = jest.fn().mockReturnValue({ handled: true });
+
+ ensureMetabaseProviderPropsStore().setProps({
+ pluginsConfig: { handleLink },
+ });
+
+ const node = formatUrl(url, {
+ jsx: true,
+ rich: true,
+ view_as: "link",
+ }) as ReactElement;
+ render(node);
+
+ const link = screen.getByRole("link");
+ // Manually creating the event instead of using fireEvent.click because we need to inspect
+ // the defaultPrevented property of the event.
+ const event = new MouseEvent("click", { bubbles: true, cancelable: true });
+ link.dispatchEvent(event);
+
+ expect(handleLink).toHaveBeenCalledWith(url);
+ expect(event.defaultPrevented).toBe(true);
+ });
+
+ it("does not call handleLinkSdkPlugin in core app", async () => {
+ await mockIsEmbeddingSdk(false);
+
+ const url = "https://example.com/dashboard/2";
+ const handleLink = jest.fn();
+
+ ensureMetabaseProviderPropsStore().setProps({
+ pluginsConfig: { handleLink },
+ });
+
+ const node = formatUrl(url, {
+ jsx: true,
+ rich: true,
+ view_as: "link",
+ }) as ReactElement;
+ render(node);
+
+ const link = screen.getByRole("link");
+ // Manually creating the event instead of using fireEvent.click because we need to inspect
+ // the defaultPrevented property of the event.
+ const event = new MouseEvent("click", { bubbles: true, cancelable: true });
+ link.dispatchEvent(event);
+
+ expect(handleLink).not.toHaveBeenCalled();
+ expect(event.defaultPrevented).toBe(false);
+ });
+
+ it("should return a string when not in jsx mode", () => {
+ expect(formatUrl("http://metabase.com/")).toEqual("http://metabase.com/");
+ });
+
+ it("should return a component for http:, https:, and mailto: links in jsx mode", () => {
+ expect(
+ isElementOfType(
+ formatUrl("http://metabase.com/", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ExternalLink,
+ ),
+ ).toEqual(true);
+ expect(
+ isElementOfType(
+ formatUrl("https://metabase.com/", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ExternalLink,
+ ),
+ ).toEqual(true);
+ expect(
+ isElementOfType(
+ formatUrl("mailto:[email protected]", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ExternalLink,
+ ),
+ ).toEqual(true);
+ });
+
+ it("should return a component for custom protocols if the column type is URL", () => {
+ expect(
+ isElementOfType(
+ formatUrl("myproto:some-custom-thing", {
+ jsx: true,
+ rich: true,
+ column: { semantic_type: TYPE.URL },
+ }) as ReactElement,
+ ExternalLink,
+ ),
+ ).toEqual(true);
+ });
+
+ it("should not return a component for bad urls if the column type is URL", () => {
+ expect(
+ formatUrl("invalid-blah-blah-blah", {
+ jsx: true,
+ rich: true,
+ column: { semantic_type: TYPE.URL },
+ }) as ReactElement,
+ ).toEqual("invalid-blah-blah-blah");
+ });
+
+ it("should not return a component for custom protocols if the column type isn't URL", () => {
+ expect(
+ formatUrl("myproto:some-custom-thing", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ).toEqual("myproto:some-custom-thing");
+ });
+
+ it("should not return a link component for unrecognized links in jsx mode", () => {
+ expect(
+ isElementOfType(
+ formatUrl("metabase.com", { jsx: true, rich: true }) as ReactElement,
+ ExternalLink,
+ ),
+ ).toEqual(false);
+ });
+
+ it("should return a string for javascript:, data:, and other links in jsx mode", () => {
+ expect(
+ formatUrl("javascript:alert('pwnd')", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ).toEqual("javascript:alert('pwnd')");
+ expect(
+ formatUrl("data:text/plain;charset=utf-8,hello%20world", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ).toEqual("data:text/plain;charset=utf-8,hello%20world");
+ });
+
+ describe("when view_as = link", () => {
+ it("should return link component for type/URL and view_as = link", () => {
+ const formatted = formatUrl("http://whatever", {
+ jsx: true,
+ rich: true,
+ column: { semantic_type: TYPE.URL },
+ view_as: "link",
+ }) as ReactElement;
+ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
+ });
+
+ it("should return link component using link_url and link_text when specified", () => {
+ const formatted = formatUrl("http://not.metabase.com", {
+ jsx: true,
+ rich: true,
+ link_text: "metabase link",
+ link_url: "http://metabase.com",
+ view_as: "link",
+ clicked: {},
+ }) as ReactElement;
+
+ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
+ expect(formatted.props.children).toEqual("metabase link");
+ expect(formatted.props.href).toEqual("http://metabase.com");
+ });
+
+ it("should return link component using link_text and the value as url when link_url is empty", () => {
+ const formatted = formatUrl("http://metabase.com", {
+ jsx: true,
+ rich: true,
+ link_text: "metabase link",
+ link_url: "",
+ view_as: "link",
+ clicked: {},
+ }) as ReactElement;
+
+ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
+ expect(formatted.props.children).toEqual("metabase link");
+ expect(formatted.props.href).toEqual("http://metabase.com");
+ });
+
+ it("should return link component using link_url and the value as text when link_text is empty", () => {
+ const formatted = formatUrl("metabase link", {
+ jsx: true,
+ rich: true,
+ link_text: "",
+ link_url: "http://metabase.com",
+ view_as: "link",
+ clicked: {},
+ }) as ReactElement;
+
+ expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
+ expect(formatted.props.children).toEqual("metabase link");
+ expect(formatted.props.href).toEqual("http://metabase.com");
+ });
+
+ it("should not return an ExternalLink in jsx + rich mode if there's click behavior", () => {
+ const formatted = formatValue("http://metabase.com/", {
+ jsx: true,
+ rich: true,
+ click_behavior: {
+ linkTemplate: "foo",
+ linkTextTemplate: "bar",
+ linkType: "url",
+ type: "link",
+ },
+ link_text: "metabase link",
+ link_url: "http://metabase.com",
+ view_as: "link",
+ clicked: {},
+ }) as ReactElement;
+
+ // it is not a link set on the question level
+ expect(isElementOfType(formatted, ExternalLink)).toEqual(false);
+ // expect the text to be in a div (which has link formatting) rather than ExternalLink
+ expect(formatted.props["data-testid"]).toEqual("link-formatted-text");
+ });
+ });
+
+ it("should not crash if column is null", () => {
+ expect(
+ formatUrl("foobar", {
+ jsx: true,
+ rich: true,
+ column: null,
+ }),
+ ).toEqual("foobar");
+ });
+
+ describe("slugify", () => {
+ it("should slugify Chinese", () => {
+ expect(slugify("類型")).toEqual("%E9%A1%9E%E5%9E%8B");
+ });
+
+ it("should slugify multiple words", () => {
+ expect(slugify("Test Parameter")).toEqual("test_parameter");
+ });
+
+ it("should slugify Russian", () => {
+ expect(slugify("русский язык")).toEqual(
+ "%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA",
+ );
+ });
+
+ it("should slugify diacritics", () => {
+ expect(slugify("än umlaut")).toEqual("%C3%A4n_umlaut");
+ });
+ });
+});
diff --git a/frontend/src/metabase/lib/formatting/value.tsx b/frontend/src/metabase/utils/formatting/value.tsx
similarity index 97%
rename from frontend/src/metabase/lib/formatting/value.tsx
rename to frontend/src/metabase/utils/formatting/value.tsx
index 8197402abac..8bb215b9a7c 100644
--- a/frontend/src/metabase/lib/formatting/value.tsx
+++ b/frontend/src/metabase/utils/formatting/value.tsx
@@ -5,9 +5,9 @@ import ReactMarkdown from "react-markdown";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import CS from "metabase/css/core/index.css";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { renderLinkTextForClick } from "metabase/lib/formatting/link";
-import { parseNumber } from "metabase/lib/number";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { renderLinkTextForClick } from "metabase/utils/formatting/link";
+import { parseNumber } from "metabase/utils/number";
import {
clickBehaviorIsValid,
getDataFromClicked,
diff --git a/frontend/src/metabase/lib/formatting/value.unit.spec.tsx b/frontend/src/metabase/utils/formatting/value.unit.spec.tsx
similarity index 59%
rename from frontend/src/metabase/lib/formatting/value.unit.spec.tsx
rename to frontend/src/metabase/utils/formatting/value.unit.spec.tsx
index 1d032bb9a6e..65c86960d31 100644
--- a/frontend/src/metabase/lib/formatting/value.unit.spec.tsx
+++ b/frontend/src/metabase/utils/formatting/value.unit.spec.tsx
@@ -1,10 +1,18 @@
+import type { ReactElement } from "react";
+import { isElementOfType } from "react-dom/test-utils";
+
import { mockSettings } from "__support__/settings";
import { render, screen } from "__support__/ui";
+import { ExternalLink } from "metabase/common/components/ExternalLink";
+import { Link } from "metabase/common/components/Link";
+import { TYPE } from "metabase-lib/v1/types/constants";
import { createMockColumn } from "metabase-types/api/mocks";
import type { OptionsType } from "./types";
import { formatValue } from "./value";
+const SITE_URL = "http://localhost:3000";
+
describe("formatValue", () => {
const setup = (value: any, overrides: Partial<OptionsType> = {}) => {
mockSettings();
@@ -308,4 +316,215 @@ describe("formatValue", () => {
);
});
});
+
+ it("should return null on nullish values by default", () => {
+ expect(formatValue(null)).toEqual(null);
+ expect(formatValue(undefined)).toEqual(null);
+ });
+
+ it("should format null as (empty) when stringifyNull option is true", () => {
+ expect(formatValue(null, { stringifyNull: true })).toEqual("(empty)");
+ expect(formatValue(undefined, { stringifyNull: true })).toEqual("(empty)");
+ });
+
+ it("should format numbers with null column", () => {
+ expect(formatValue(12345)).toEqual("12345");
+ });
+
+ it("should format numbers with commas", () => {
+ expect(
+ formatValue(12345, {
+ column: { base_type: TYPE.Number, semantic_type: TYPE.Number },
+ }),
+ ).toEqual("12,345");
+ });
+
+ it("should format big integers", () => {
+ const options = {
+ column: { base_type: TYPE.Number, semantic_type: TYPE.Number },
+ };
+
+ expect(formatValue(9223372036854775807n, options)).toEqual(
+ "9,223,372,036,854,775,807",
+ );
+ expect(formatValue("9223372036854775807", options)).toEqual(
+ "9,223,372,036,854,775,807",
+ );
+ });
+
+ it("should format zip codes without commas", () => {
+ expect(
+ formatValue(12345, {
+ column: { base_type: TYPE.Number, semantic_type: TYPE.ZipCode },
+ }),
+ ).toEqual("12345");
+ });
+
+ it("should format latitude and longitude columns correctly", () => {
+ expect(
+ formatValue(37.7749, {
+ column: { base_type: TYPE.Number, semantic_type: TYPE.Latitude },
+ }),
+ ).toEqual("37.77490000° N");
+ expect(
+ formatValue(-122.4194, {
+ column: { base_type: TYPE.Number, semantic_type: TYPE.Longitude },
+ }),
+ ).toEqual("122.41940000° W");
+ });
+
+ it("should return the component for external links in jsx + rich mode", () => {
+ expect(
+ isElementOfType(
+ formatValue("http://metabase.com/", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ExternalLink,
+ ),
+ ).toEqual(true);
+ });
+
+ it("should return a component for internal links in jsx + rich mode", () => {
+ expect(
+ isElementOfType(
+ formatValue(SITE_URL, { jsx: true, rich: true }) as ReactElement,
+ Link,
+ ),
+ ).toBe(true);
+ });
+
+ it("should return a component for relative links in jsx + rich mode", () => {
+ const column = createMockColumn({
+ name: "column_name",
+ base_type: "type/Text",
+ effective_type: "type/Text",
+ semantic_type: "type/URL",
+ });
+ expect(
+ isElementOfType(
+ formatValue("/question/12", {
+ jsx: true,
+ rich: true,
+ view_as: "link",
+ link_url: "{{column_name}}",
+ clicked: {
+ value: "/question/12",
+ column: column,
+ data: [{ value: "question/12", col: column }],
+ },
+ }) as ReactElement,
+ Link,
+ ),
+ ).toEqual(true);
+ });
+
+ it("should not return an ExternalLink for links in jsx + rich mode if there's click behavior", () => {
+ const formatted = formatValue("http://metabase.com/", {
+ jsx: true,
+ rich: true,
+ click_behavior: {
+ linkTemplate: "foo",
+ linkTextTemplate: "foo",
+ linkType: "url",
+ type: "link",
+ },
+ clicked: {},
+ }) as ReactElement;
+ // it's not actually a link
+ expect(isElementOfType(formatted, ExternalLink)).toEqual(false);
+ // expect the text to be in a div (which has link formatting) rather than ExternalLink
+ expect(formatted.props["data-testid"]).toEqual("link-formatted-text");
+ });
+
+ it("should render image", () => {
+ const formatted = formatValue("http://metabase.com/logo.png", {
+ jsx: true,
+ rich: true,
+ view_as: "image",
+ column: { semantic_type: "type/ImageURL" },
+ }) as ReactElement;
+ expect(formatted.type).toEqual("img");
+ expect(formatted.props.src).toEqual("http://metabase.com/logo.png");
+ });
+
+ it("should render image with a click behavior in jsx + rich mode (metabase#17161)", () => {
+ const formatted = formatValue("http://metabase.com/logo.png", {
+ jsx: true,
+ rich: true,
+ view_as: "image",
+ click_behavior: {
+ linkTemplate: "foo",
+ linkType: "url",
+ type: "link",
+ },
+ clicked: {},
+ }) as ReactElement;
+ expect(formatted.type).toEqual("img");
+ expect(formatted.props.src).toEqual("http://metabase.com/logo.png");
+ });
+
+ it("should return a component for email addresses in jsx + rich mode", () => {
+ expect(
+ isElementOfType(
+ formatValue("[email protected]", {
+ jsx: true,
+ rich: true,
+ }) as ReactElement,
+ ExternalLink,
+ ),
+ ).toEqual(true);
+ });
+
+ it("should not add mailto prefix if there's a different semantic type", () => {
+ expect(
+ formatValue("[email protected]", {
+ jsx: true,
+ rich: true,
+ column: { semantic_type: "type/PK" },
+ }),
+ ).toEqual("[email protected]");
+ });
+
+ it("should display hour-of-day with 12 hour clock", () => {
+ expect(
+ formatValue(24, {
+ date_style: null,
+ time_enabled: "minutes",
+ time_style: "h:mm A",
+ column: {
+ base_type: "type/DateTime",
+ unit: "hour-of-day",
+ },
+ }),
+ ).toEqual("12:00 AM");
+ });
+
+ it("should display hour-of-day with 24 hour clock", () => {
+ expect(
+ formatValue(24, {
+ date_style: null,
+ time_enabled: "minutes",
+ time_style: "HH:mm",
+ column: {
+ base_type: "type/DateTime",
+ unit: "hour-of-day",
+ },
+ }),
+ ).toEqual("00:00");
+ });
+
+ it("should not include time for type/Date type (metabase#7494)", () => {
+ expect(
+ formatValue("2019-07-07T00:00:00.000Z", {
+ date_style: "M/D/YYYY",
+ time_enabled: "minutes",
+ time_style: "HH:mm",
+ column: {
+ base_type: "type/Date",
+ unit: "hour-of-day",
+ },
+ }),
+ ).toEqual("7/7/2019");
+ });
});
diff --git a/frontend/src/metabase/lib/groups.ts b/frontend/src/metabase/utils/groups.ts
similarity index 70%
rename from frontend/src/metabase/lib/groups.ts
rename to frontend/src/metabase/utils/groups.ts
index 79cf10b306e..d8231c019db 100644
--- a/frontend/src/metabase/lib/groups.ts
+++ b/frontend/src/metabase/utils/groups.ts
@@ -4,16 +4,12 @@ import type { SpecialGroupType } from "metabase/admin/permissions/types";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { GroupInfo } from "metabase-types/api";
-const SPECIAL_GROUP_NAMES = new Map([
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- ["All Users", t`All Users`],
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- ["Administrators", t`Administrators`],
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- ["All tenant users", t`All tenant users`],
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- ["Data Analysts", t`Data Analysts`],
-]);
+const SPECIAL_GROUP_NAMES: Record<string, () => string> = {
+ "All Users": () => t`All Users`,
+ Administrators: () => t`Administrators`,
+ "All tenant users": () => t`All tenant users`,
+ "Data Analysts": () => t`Data Analysts`,
+};
export function isDefaultGroup(group: Pick<GroupInfo, "magic_group_type">) {
return group.magic_group_type === "all-internal-users";
@@ -48,7 +44,8 @@ export function canEditMembership(group: Pick<GroupInfo, "magic_group_type">) {
}
export function getGroupNameLocalized(group: Pick<GroupInfo, "name">) {
- return SPECIAL_GROUP_NAMES.get(group.name) ?? group.name;
+ const specialName = SPECIAL_GROUP_NAMES[group.name];
+ return specialName ? specialName() : group.name;
}
export function getGroupSortOrder(group: Pick<GroupInfo, "magic_group_type">) {
diff --git a/frontend/src/metabase/lib/i18n.js b/frontend/src/metabase/utils/i18n.js
similarity index 97%
rename from frontend/src/metabase/lib/i18n.js
rename to frontend/src/metabase/utils/i18n.js
index 0600d595420..dcbd29718f6 100644
--- a/frontend/src/metabase/lib/i18n.js
+++ b/frontend/src/metabase/utils/i18n.js
@@ -2,9 +2,9 @@ import dayjs from "dayjs";
import { addLocale, useLocale } from "ttag";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import api from "metabase/lib/api";
-import { DAY_OF_WEEK_OPTIONS } from "metabase/lib/date-time";
-import MetabaseSettings from "metabase/lib/settings";
+import api from "metabase/utils/api";
+import { DAY_OF_WEEK_OPTIONS } from "metabase/utils/date-time";
+import MetabaseSettings from "metabase/utils/settings";
// note this won't refresh strings that are evaluated at load time
export async function loadLocalization(locale) {
diff --git a/frontend/src/metabase/lib/i18n.unit.spec.ts b/frontend/src/metabase/utils/i18n.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/i18n.unit.spec.ts
rename to frontend/src/metabase/utils/i18n.unit.spec.ts
diff --git a/frontend/src/metabase/lib/icon.ts b/frontend/src/metabase/utils/icon.ts
similarity index 100%
rename from frontend/src/metabase/lib/icon.ts
rename to frontend/src/metabase/utils/icon.ts
diff --git a/frontend/src/metabase/lib/icon.unit.spec.ts b/frontend/src/metabase/utils/icon.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/icon.unit.spec.ts
rename to frontend/src/metabase/utils/icon.unit.spec.ts
diff --git a/frontend/src/metabase/utils/iframe.ts b/frontend/src/metabase/utils/iframe.ts
new file mode 100644
index 00000000000..d3745381c91
--- /dev/null
+++ b/frontend/src/metabase/utils/iframe.ts
@@ -0,0 +1,34 @@
+import { isCypressActive, isStorybookActive } from "metabase/env";
+
+// denotes whether the current page is loaded in an iframe or not
+// Cypress renders the whole app within an iframe, but we want to exclude it from this check to avoid certain components (like Nav bar) not rendering
+// Storybook also uses an iframe to display story content, so we want to ignore it
+export const isWithinIframe = function (): boolean {
+ try {
+ // Mock that we're embedding, so we could test embed components
+ if (window.overrideIsWithinIframe) {
+ return true;
+ }
+
+ if (isCypressActive || isStorybookActive) {
+ return false;
+ }
+
+ return window.self !== window.top;
+ } catch (e) {
+ return true;
+ }
+};
+
+// add a global so we can check if the parent iframe is Metabase
+window.METABASE = true;
+
+// check that we're both iframed, and the parent is a Metabase instance
+// used for detecting if we're previewing an embed
+export const IFRAMED_IN_SELF = (function () {
+ try {
+ return window.self !== window.parent && Boolean(window.parent.METABASE);
+ } catch (e) {
+ return false;
+ }
+})();
diff --git a/frontend/src/metabase/lib/json-parse.ts b/frontend/src/metabase/utils/json-parse.ts
similarity index 100%
rename from frontend/src/metabase/lib/json-parse.ts
rename to frontend/src/metabase/utils/json-parse.ts
diff --git a/frontend/src/metabase/lib/jwt.ts b/frontend/src/metabase/utils/jwt.ts
similarity index 100%
rename from frontend/src/metabase/lib/jwt.ts
rename to frontend/src/metabase/utils/jwt.ts
diff --git a/frontend/src/metabase/lib/jwt.unit.spec.ts b/frontend/src/metabase/utils/jwt.unit.spec.ts
similarity index 97%
rename from frontend/src/metabase/lib/jwt.unit.spec.ts
rename to frontend/src/metabase/utils/jwt.unit.spec.ts
index 8d45e3f511d..41cd69e3550 100644
--- a/frontend/src/metabase/lib/jwt.unit.spec.ts
+++ b/frontend/src/metabase/utils/jwt.unit.spec.ts
@@ -1,6 +1,6 @@
import { SignJWT } from "jose";
-import { extractResourceIdFromJwtToken } from "metabase/lib/jwt";
+import { extractResourceIdFromJwtToken } from "./jwt";
const SECRET = new TextEncoder().encode("test-secret-key-for-jwt-signing");
diff --git a/frontend/src/metabase/lib/keyboard.ts b/frontend/src/metabase/utils/keyboard.ts
similarity index 100%
rename from frontend/src/metabase/lib/keyboard.ts
rename to frontend/src/metabase/utils/keyboard.ts
diff --git a/frontend/src/metabase/lib/loki-utils.ts b/frontend/src/metabase/utils/loki-utils.ts
similarity index 100%
rename from frontend/src/metabase/lib/loki-utils.ts
rename to frontend/src/metabase/utils/loki-utils.ts
diff --git a/frontend/src/metabase/lib/measure-container.ts b/frontend/src/metabase/utils/measure-container.ts
similarity index 94%
rename from frontend/src/metabase/lib/measure-container.ts
rename to frontend/src/metabase/utils/measure-container.ts
index 194f5ca048d..23c0f2ef35b 100644
--- a/frontend/src/metabase/lib/measure-container.ts
+++ b/frontend/src/metabase/utils/measure-container.ts
@@ -1,6 +1,6 @@
import type { Root } from "react-dom/client";
-import { unmountRoot } from "metabase/lib/react-compat";
+import { unmountRoot } from "metabase/utils/react-compat";
interface MeasurementContainerOptions {
fontSize?: string;
diff --git a/frontend/src/metabase/lib/measure-text.ts b/frontend/src/metabase/utils/measure-text.ts
similarity index 100%
rename from frontend/src/metabase/lib/measure-text.ts
rename to frontend/src/metabase/utils/measure-text.ts
diff --git a/frontend/src/metabase/lib/name.ts b/frontend/src/metabase/utils/name.ts
similarity index 100%
rename from frontend/src/metabase/lib/name.ts
rename to frontend/src/metabase/utils/name.ts
diff --git a/frontend/src/metabase/lib/noop.ts b/frontend/src/metabase/utils/noop.ts
similarity index 100%
rename from frontend/src/metabase/lib/noop.ts
rename to frontend/src/metabase/utils/noop.ts
diff --git a/frontend/src/metabase/lib/notifications.ts b/frontend/src/metabase/utils/notifications.ts
similarity index 96%
rename from frontend/src/metabase/lib/notifications.ts
rename to frontend/src/metabase/utils/notifications.ts
index 49d4797eb0b..bc7fc8fb94c 100644
--- a/frontend/src/metabase/lib/notifications.ts
+++ b/frontend/src/metabase/utils/notifications.ts
@@ -3,11 +3,11 @@ import _ from "underscore";
import type { NotificationListItem } from "metabase/account/notifications/types";
import { cronToScheduleSettings } from "metabase/common/components/Schedule/cron";
-import { getEmailDomain, isEmail } from "metabase/lib/email";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting/date";
-import { formatTimeWithUnit } from "metabase/lib/formatting/time";
-import MetabaseSettings from "metabase/lib/settings";
-import { formatFrame } from "metabase/lib/time-dayjs";
+import { getEmailDomain, isEmail } from "metabase/utils/email";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting/date";
+import { formatTimeWithUnit } from "metabase/utils/formatting/time";
+import MetabaseSettings from "metabase/utils/settings";
+import { formatFrame } from "metabase/utils/time-dayjs";
import {
ALERT_TYPE_PROGRESS_BAR_GOAL,
ALERT_TYPE_TIMESERIES_GOAL,
diff --git a/frontend/src/metabase/lib/number.ts b/frontend/src/metabase/utils/number.ts
similarity index 100%
rename from frontend/src/metabase/lib/number.ts
rename to frontend/src/metabase/utils/number.ts
diff --git a/frontend/src/metabase/lib/number.unit.spec.ts b/frontend/src/metabase/utils/number.unit.spec.ts
similarity index 97%
rename from frontend/src/metabase/lib/number.unit.spec.ts
rename to frontend/src/metabase/utils/number.unit.spec.ts
index e82b775274c..7f83579c3cc 100644
--- a/frontend/src/metabase/lib/number.unit.spec.ts
+++ b/frontend/src/metabase/utils/number.unit.spec.ts
@@ -1,6 +1,6 @@
import { parseNumber, parseNumberValue } from "./number";
-describe("metabase/lib/number", () => {
+describe("metabase/utils/number", () => {
describe("parseNumberValue", () => {
it("should return null for non-number values", () => {
expect(parseNumberValue("")).toBeNull();
diff --git a/frontend/src/metabase/lib/objects.ts b/frontend/src/metabase/utils/objects.ts
similarity index 65%
rename from frontend/src/metabase/lib/objects.ts
rename to frontend/src/metabase/utils/objects.ts
index a76cc42d6c1..4e2a2f94efc 100644
--- a/frontend/src/metabase/lib/objects.ts
+++ b/frontend/src/metabase/utils/objects.ts
@@ -1,5 +1,3 @@
-import { sortObject } from "metabase-lib/v1/utils";
-
export const getObjectEntries = <K extends string, V>(
obj: Record<K, V>,
): [K, V][] => {
@@ -12,16 +10,38 @@ export const getObjectKeys = <K extends string>(
return Object.keys(obj) as K[];
};
-export const getObjectValues = <V>(obj: Record<string, V>): V[] => {
- return Object.values(obj) as V[];
-};
-
export const objectFromEntries = <K extends string, V>(
entries: readonly (readonly [K, V])[],
): Record<K, V> => {
return Object.fromEntries(entries) as Record<K, V>;
};
+// `sortObject` copies objects for deterministic serialization.
+// Objects that have equal keys and values don't necessarily serialize to the
+// same string. JSON.stringify prints properties in inserted order. This function
+// sorts keys before adding them to the duplicated object to ensure consistent
+// serialization.
+export function sortObject(obj: any | any[]): any | any[] {
+ if (obj === null || typeof obj !== "object") {
+ return obj;
+ }
+
+ if (Array.isArray(obj)) {
+ return obj.map(sortObject);
+ }
+
+ const sortedKeyValues = Object.entries(obj).sort(([keyA], [keyB]) =>
+ keyA.localeCompare(keyB),
+ );
+ const o: Record<string, any> = {};
+
+ for (const [k, v] of sortedKeyValues) {
+ o[k] = sortObject(v);
+ }
+
+ return o;
+}
+
// Stringify with sorted keys to ensure stable orders.
export const stableStringify = <T>(obj: T): string =>
JSON.stringify(sortObject(obj));
diff --git a/frontend/src/metabase/lib/objects.unit.spec.ts b/frontend/src/metabase/utils/objects.unit.spec.ts
similarity index 88%
rename from frontend/src/metabase/lib/objects.unit.spec.ts
rename to frontend/src/metabase/utils/objects.unit.spec.ts
index 9b6b014f169..b2d3a904e92 100644
--- a/frontend/src/metabase/lib/objects.unit.spec.ts
+++ b/frontend/src/metabase/utils/objects.unit.spec.ts
@@ -1,4 +1,4 @@
-import { isSerializable } from "./objects";
+import { isSerializable, sortObject } from "./objects";
describe("isSerializable", () => {
describe("primitive values", () => {
@@ -247,3 +247,35 @@ describe("isSerializable", () => {
});
});
});
+
+describe("sortObject", () => {
+ it("should serialize identically regardless of property creation order", () => {
+ const o1: Record<string, number> = {};
+ o1.a = 1;
+ o1.b = 2;
+ const o2: Record<string, number> = {};
+ o2.b = 2;
+ o2.a = 1;
+
+ expect(JSON.stringify(sortObject(o1))).toEqual(
+ JSON.stringify(sortObject(o2)),
+ );
+ });
+
+ it("should not sort arrays", () => {
+ expect(sortObject(["a", "c", "b"])).toEqual(["a", "c", "b"]);
+ });
+
+ it("should sort keys recursively", () => {
+ const o1 = { o: {} as Record<string, number> };
+ o1.o.a = 1;
+ o1.o.b = 2;
+ const o2 = { o: {} as Record<string, number> };
+ o2.o.b = 2;
+ o2.o.a = 1;
+
+ expect(JSON.stringify(sortObject(o1))).toEqual(
+ JSON.stringify(sortObject(o2)),
+ );
+ });
+});
diff --git a/frontend/src/metabase/lib/otel.ts b/frontend/src/metabase/utils/otel.ts
similarity index 100%
rename from frontend/src/metabase/lib/otel.ts
rename to frontend/src/metabase/utils/otel.ts
diff --git a/frontend/src/metabase/lib/otel.unit.spec.ts b/frontend/src/metabase/utils/otel.unit.spec.ts
similarity index 99%
rename from frontend/src/metabase/lib/otel.unit.spec.ts
rename to frontend/src/metabase/utils/otel.unit.spec.ts
index c7f785f87b0..b10c28ee2fd 100644
--- a/frontend/src/metabase/lib/otel.unit.spec.ts
+++ b/frontend/src/metabase/utils/otel.unit.spec.ts
@@ -3,7 +3,7 @@ import {
getTraceparentHeader,
initTracing,
rotateTraceId,
-} from "metabase/lib/otel";
+} from "metabase/utils/otel";
// W3C traceparent: 00-{32 hex}-{16 hex}-01
const TRACEPARENT_REGEX = /^00-[0-9a-f]{32}-[0-9a-f]{16}-01$/;
diff --git a/frontend/src/metabase/utils/password.ts b/frontend/src/metabase/utils/password.ts
new file mode 100644
index 00000000000..f1d03542afd
--- /dev/null
+++ b/frontend/src/metabase/utils/password.ts
@@ -0,0 +1,167 @@
+import { msgid, ngettext, t } from "ttag";
+
+import MetabaseSettings from "metabase/utils/settings";
+import type { PasswordComplexity } from "metabase-types/api";
+
+const LOWER = "abcdefghijklmnopqrstuvwxyz";
+const UPPER = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+const DIGITS = "0123456789";
+const SPECIAL = "!@#$%^&*()-_+=";
+const ALL = LOWER + UPPER + DIGITS + SPECIAL;
+
+function randomIndex(max: number): number {
+ const array = new Uint32Array(1);
+ crypto.getRandomValues(array);
+ return array[0] % max;
+}
+
+function randomChar(charset: string): string {
+ return charset[randomIndex(charset.length)];
+}
+
+// generate a password that satisfies `complexity` requirements, by default the ones that come back in the
+// `password-complexity` Setting; must be a map like {total: 6, digit: 1}
+export const generatePassword = (
+ complexityParam?: PasswordComplexity,
+): string => {
+ const complexity =
+ complexityParam || MetabaseSettings.passwordComplexityRequirements() || {};
+
+ // generated password must be at least `complexity.total`, but can be longer
+ // so hard code a minimum of 14
+ const len = Math.max(complexity.total || 0, 14);
+
+ const chars: string[] = [];
+
+ // seed required characters from each category to guarantee requirements are met
+ for (let i = 0; i < (complexity.lower || 0); i++) {
+ chars.push(randomChar(LOWER));
+ }
+ for (let i = 0; i < (complexity.upper || 0); i++) {
+ chars.push(randomChar(UPPER));
+ }
+ for (let i = 0; i < (complexity.digit || 0); i++) {
+ chars.push(randomChar(DIGITS));
+ }
+ for (let i = 0; i < (complexity.special || 0); i++) {
+ chars.push(randomChar(SPECIAL));
+ }
+
+ // fill remaining length with random characters from full charset
+ while (chars.length < len) {
+ chars.push(randomChar(ALL));
+ }
+
+ // Fisher-Yates shuffle to avoid required chars clustering at the start
+ for (let i = chars.length - 1; i > 0; i--) {
+ const j = randomIndex(i + 1);
+ [chars[i], chars[j]] = [chars[j], chars[i]];
+ }
+
+ return chars.join("");
+};
+
+// pretty limited. just does 0-9 for right now.
+export function numberToWord(num: number) {
+ const names = [
+ t`zero`,
+ t`one`,
+ t`two`,
+ t`three`,
+ t`four`,
+ t`five`,
+ t`six`,
+ t`seven`,
+ t`eight`,
+ t`nine`,
+ ];
+
+ if (num >= 0 && num <= 9) {
+ return names[num];
+ } else {
+ return "" + num;
+ }
+}
+
+function makeRegexTest(property: string, regex: RegExp) {
+ return (requirements: Record<string, any>, password = "") =>
+ (password.match(regex) || []).length >= (requirements[property] || 0);
+}
+
+const PASSWORD_COMPLEXITY_CLAUSES = {
+ total: {
+ test: ({ total = 0 }, password = "") => password.length >= total,
+ description: ({ total = 0 }) =>
+ ngettext(
+ msgid`at least ${numberToWord(total)} character long`,
+ `at least ${numberToWord(total)} characters long`,
+ total,
+ ),
+ },
+ lower: {
+ test: makeRegexTest("lower", /[a-z]/g),
+ description: ({ lower = 0 }) =>
+ ngettext(
+ msgid`${numberToWord(lower)} lower case letter`,
+ `${numberToWord(lower)} lower case letters`,
+ lower,
+ ),
+ },
+ upper: {
+ test: makeRegexTest("upper", /[A-Z]/g),
+ description: ({ upper = 0 }) =>
+ ngettext(
+ msgid`${numberToWord(upper)} upper case letter`,
+ `${numberToWord(upper)} upper case letters`,
+ upper,
+ ),
+ },
+ digit: {
+ test: makeRegexTest("digit", /[0-9]/g),
+ description: ({ digit = 0 }) =>
+ ngettext(
+ msgid`${numberToWord(digit)} number`,
+ `${numberToWord(digit)} numbers`,
+ digit,
+ ),
+ },
+ special: {
+ test: makeRegexTest("special", /[^a-zA-Z0-9]/g),
+ description: ({ special = 0 }) =>
+ ngettext(
+ msgid`${numberToWord(special)} special character`,
+ `${numberToWord(special)} special characters`,
+ special,
+ ),
+ },
+};
+
+/**
+ * Returns a description of password complexity requirements.
+ * Optionally takes a password and returns a description only including the requirements not met.
+ */
+export function passwordComplexityDescription(
+ password = "",
+ requirements: PasswordComplexity = MetabaseSettings.passwordComplexityRequirements(),
+) {
+ const descriptions: Record<string, string> = {};
+
+ for (const [name, clause] of Object.entries(PASSWORD_COMPLEXITY_CLAUSES)) {
+ if (!clause.test(requirements, password)) {
+ descriptions[name] = clause.description(requirements);
+ }
+ }
+
+ const { total, ...rest } = descriptions;
+ const includes = Object.values(rest).join(", ");
+
+ if (total && includes) {
+ return t`must be ${total} and include ${includes}.`;
+ } else if (total) {
+ return t`must be ${total}.`;
+ } else if (includes) {
+ return t`must include ${includes}.`;
+ } else {
+ return null;
+ }
+}
diff --git a/frontend/src/metabase/lib/security.unit.spec.ts b/frontend/src/metabase/utils/password.unit.spec.ts
similarity index 95%
rename from frontend/src/metabase/lib/security.unit.spec.ts
rename to frontend/src/metabase/utils/password.unit.spec.ts
index b76faf4954d..4796e9834ee 100644
--- a/frontend/src/metabase/lib/security.unit.spec.ts
+++ b/frontend/src/metabase/utils/password.unit.spec.ts
@@ -1,6 +1,6 @@
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
-import { generatePassword } from "./security";
+import { generatePassword } from "./password";
describe("generatePassword", () => {
it("defaults to at least 14 characters even if password-complexity requirements are lower", () => {
diff --git a/frontend/src/metabase/lib/promise.ts b/frontend/src/metabase/utils/promise.ts
similarity index 73%
rename from frontend/src/metabase/lib/promise.ts
rename to frontend/src/metabase/utils/promise.ts
index d4ab152e081..74eeb912fec 100644
--- a/frontend/src/metabase/lib/promise.ts
+++ b/frontend/src/metabase/utils/promise.ts
@@ -1,9 +1,6 @@
import { noop } from "underscore";
-// returns a promise that resolves after a given duration
-export function delay(duration: number) {
- return new Promise((resolve) => setTimeout(resolve, duration));
-}
+import { delay as duration } from "metabase/utils/delay";
export interface Deferred<T = unknown> {
promise: Promise<T>;
@@ -26,3 +23,7 @@ export function defer<T>(): Deferred<T> {
reject,
};
}
+
+export function delay(ms: number): Promise<void> {
+ return new Promise((resolve) => setTimeout(resolve, duration(ms)));
+}
diff --git a/frontend/src/metabase/lib/pulse.ts b/frontend/src/metabase/utils/pulse.ts
similarity index 96%
rename from frontend/src/metabase/lib/pulse.ts
rename to frontend/src/metabase/utils/pulse.ts
index e7f2b0ef6c9..4fd7e72c5fe 100644
--- a/frontend/src/metabase/lib/pulse.ts
+++ b/frontend/src/metabase/utils/pulse.ts
@@ -1,11 +1,11 @@
import { msgid, ngettext, t } from "ttag";
import _ from "underscore";
-import { getEmailDomain } from "metabase/lib/email";
-import { formatDateTimeWithUnit } from "metabase/lib/formatting/date";
-import { formatTimeWithUnit } from "metabase/lib/formatting/time";
-import MetabaseSettings from "metabase/lib/settings";
-import { formatFrame } from "metabase/lib/time-dayjs";
+import { getEmailDomain } from "metabase/utils/email";
+import { formatDateTimeWithUnit } from "metabase/utils/formatting/date";
+import { formatTimeWithUnit } from "metabase/utils/formatting/time";
+import MetabaseSettings from "metabase/utils/settings";
+import { formatFrame } from "metabase/utils/time-dayjs";
import {
getDefaultValuePopulatedParameters,
normalizeParameterValue,
diff --git a/frontend/test/metabase/lib/pulse.unit.spec.js b/frontend/src/metabase/utils/pulse.unit.spec.js
similarity index 97%
rename from frontend/test/metabase/lib/pulse.unit.spec.js
rename to frontend/src/metabase/utils/pulse.unit.spec.js
index 359d6e908c5..83c62440a6c 100644
--- a/frontend/test/metabase/lib/pulse.unit.spec.js
+++ b/frontend/src/metabase/utils/pulse.unit.spec.js
@@ -2,8 +2,8 @@ import {
getActivePulseParameters,
getPulseParameters,
recipientIsValid,
-} from "metabase/lib/pulse";
-import MetabaseSettings from "metabase/lib/settings";
+} from "metabase/utils/pulse";
+import MetabaseSettings from "metabase/utils/settings";
describe("recipientIsValid", () => {
let originalDomains;
diff --git a/frontend/src/metabase/lib/react-compat.ts b/frontend/src/metabase/utils/react-compat.ts
similarity index 84%
rename from frontend/src/metabase/lib/react-compat.ts
rename to frontend/src/metabase/utils/react-compat.ts
index d9f05c15165..fe813226d3f 100644
--- a/frontend/src/metabase/lib/react-compat.ts
+++ b/frontend/src/metabase/utils/react-compat.ts
@@ -1,10 +1,8 @@
// Support React 17 backwards compatibility for the Embedding SDK
-import type React from "react";
+import React from "react";
import ReactDOM from "react-dom";
import { type Root, createRoot } from "react-dom/client";
-import { getMajorReactVersion } from "./compat/check-version";
-
export function renderRoot(
content: React.JSX.Element,
element: Element,
@@ -36,3 +34,9 @@ export function unmountRoot(root?: Root, element?: Element) {
root.unmount();
}
}
+
+export const getMajorReactVersion = () => {
+ const versionParts = React.version.split(".").map(Number);
+
+ return versionParts[0];
+};
diff --git a/frontend/src/metabase/lib/compat/check-version.unit.spec.ts b/frontend/src/metabase/utils/react-compat.unit.ts
similarity index 94%
rename from frontend/src/metabase/lib/compat/check-version.unit.spec.ts
rename to frontend/src/metabase/utils/react-compat.unit.ts
index 1197d4ceddf..817a620fde1 100644
--- a/frontend/src/metabase/lib/compat/check-version.unit.spec.ts
+++ b/frontend/src/metabase/utils/react-compat.unit.ts
@@ -1,6 +1,6 @@
import React from "react";
-import { getMajorReactVersion } from "./check-version";
+import { getMajorReactVersion } from "./react-compat";
describe("getMajorReactVersion", () => {
const versions = [
diff --git a/frontend/src/metabase/lib/react-to-html.tsx b/frontend/src/metabase/utils/react-to-html.tsx
similarity index 100%
rename from frontend/src/metabase/lib/react-to-html.tsx
rename to frontend/src/metabase/utils/react-to-html.tsx
diff --git a/frontend/src/metabase/lib/react-to-html.unit.spec.tsx b/frontend/src/metabase/utils/react-to-html.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/lib/react-to-html.unit.spec.tsx
rename to frontend/src/metabase/utils/react-to-html.unit.spec.tsx
diff --git a/frontend/src/metabase/lib/redux/custom-context.tsx b/frontend/src/metabase/utils/redux/custom-context.tsx
similarity index 100%
rename from frontend/src/metabase/lib/redux/custom-context.tsx
rename to frontend/src/metabase/utils/redux/custom-context.tsx
diff --git a/frontend/src/metabase/lib/redux/hooks.ts b/frontend/src/metabase/utils/redux/hooks.ts
similarity index 100%
rename from frontend/src/metabase/lib/redux/hooks.ts
rename to frontend/src/metabase/utils/redux/hooks.ts
diff --git a/frontend/src/metabase/lib/redux/hooks.unit.spec.tsx b/frontend/src/metabase/utils/redux/hooks.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/lib/redux/hooks.unit.spec.tsx
rename to frontend/src/metabase/utils/redux/hooks.unit.spec.tsx
diff --git a/frontend/src/metabase/lib/redux/index.ts b/frontend/src/metabase/utils/redux/index.ts
similarity index 100%
rename from frontend/src/metabase/lib/redux/index.ts
rename to frontend/src/metabase/utils/redux/index.ts
diff --git a/frontend/src/metabase/lib/redux/metadata.ts b/frontend/src/metabase/utils/redux/metadata.ts
similarity index 86%
rename from frontend/src/metabase/lib/redux/metadata.ts
rename to frontend/src/metabase/utils/redux/metadata.ts
index c49777709bc..dd4adeadcfe 100644
--- a/frontend/src/metabase/lib/redux/metadata.ts
+++ b/frontend/src/metabase/utils/redux/metadata.ts
@@ -1,7 +1,7 @@
import { type Schema, normalize } from "normalizr";
// this action is handled by entity reducers in `handleEntities` in
-// `frontend/src/metabase/lib/redux/utils.js`
+// `frontend/src/metabase/utils/redux/utils.js`
const UPDATE = "metabase/entities/UPDATE";
export function updateMetadata(data: unknown, schema: Schema) {
diff --git a/frontend/src/metabase/lib/redux/typed-utils.ts b/frontend/src/metabase/utils/redux/typed-utils.ts
similarity index 100%
rename from frontend/src/metabase/lib/redux/typed-utils.ts
rename to frontend/src/metabase/utils/redux/typed-utils.ts
diff --git a/frontend/src/metabase/lib/redux/utils.js b/frontend/src/metabase/utils/redux/utils.js
similarity index 99%
rename from frontend/src/metabase/lib/redux/utils.js
rename to frontend/src/metabase/utils/redux/utils.js
index aa68ba7cb14..c41b33a075b 100644
--- a/frontend/src/metabase/lib/redux/utils.js
+++ b/frontend/src/metabase/utils/redux/utils.js
@@ -3,7 +3,6 @@ import { getIn } from "icepick";
import { normalize } from "normalizr";
import _ from "underscore";
-import { delay } from "metabase/lib/promise";
import {
setRequestError,
setRequestLoaded,
@@ -11,6 +10,7 @@ import {
setRequestPromise,
setRequestUnloaded,
} from "metabase/redux/requests";
+import { delay } from "metabase/utils/promise";
// convenience
export { combineReducers, compose } from "@reduxjs/toolkit";
diff --git a/frontend/src/metabase/lib/redux/utils.unit.spec.js b/frontend/src/metabase/utils/redux/utils.unit.spec.js
similarity index 100%
rename from frontend/src/metabase/lib/redux/utils.unit.spec.js
rename to frontend/src/metabase/utils/redux/utils.unit.spec.js
diff --git a/frontend/src/metabase/lib/resize-observer.ts b/frontend/src/metabase/utils/resize-observer.ts
similarity index 100%
rename from frontend/src/metabase/lib/resize-observer.ts
rename to frontend/src/metabase/utils/resize-observer.ts
diff --git a/frontend/src/metabase/lib/search.ts b/frontend/src/metabase/utils/search.ts
similarity index 93%
rename from frontend/src/metabase/lib/search.ts
rename to frontend/src/metabase/utils/search.ts
index 9016c555501..7d27676eb94 100644
--- a/frontend/src/metabase/lib/search.ts
+++ b/frontend/src/metabase/utils/search.ts
@@ -1,4 +1,4 @@
-import Settings from "metabase/lib/settings";
+import Settings from "metabase/utils/settings";
const MB_STATS_ANALYTICS_UUID = "d97541bd-59b0-4656-b437-d659ac48eae1";
diff --git a/frontend/src/metabase/lib/settings.ts b/frontend/src/metabase/utils/settings.ts
similarity index 67%
rename from frontend/src/metabase/lib/settings.ts
rename to frontend/src/metabase/utils/settings.ts
index ea88b6a7947..53b8799ef8e 100644
--- a/frontend/src/metabase/lib/settings.ts
+++ b/frontend/src/metabase/utils/settings.ts
@@ -1,7 +1,5 @@
-import { msgid, ngettext, t } from "ttag";
import _ from "underscore";
-import { numberToWord } from "metabase/lib/utils";
import type {
ColorSettings,
PasswordComplexity,
@@ -9,52 +7,6 @@ import type {
Settings,
} from "metabase-types/api";
-const n2w = (n: number) => numberToWord(n);
-
-const PASSWORD_COMPLEXITY_CLAUSES = {
- total: {
- test: ({ total = 0 }, password = "") => password.length >= total,
- description: ({ total = 0 }) =>
- ngettext(
- msgid`at least ${n2w(total)} character long`,
- `at least ${n2w(total)} characters long`,
- total,
- ),
- },
- lower: {
- test: makeRegexTest("lower", /[a-z]/g),
- description: ({ lower = 0 }) =>
- ngettext(
- msgid`${n2w(lower)} lower case letter`,
- `${n2w(lower)} lower case letters`,
- lower,
- ),
- },
- upper: {
- test: makeRegexTest("upper", /[A-Z]/g),
- description: ({ upper = 0 }) =>
- ngettext(
- msgid`${n2w(upper)} upper case letter`,
- `${n2w(upper)} upper case letters`,
- upper,
- ),
- },
- digit: {
- test: makeRegexTest("digit", /[0-9]/g),
- description: ({ digit = 0 }) =>
- ngettext(msgid`${n2w(digit)} number`, `${n2w(digit)} numbers`, digit),
- },
- special: {
- test: makeRegexTest("special", /[^a-zA-Z0-9]/g),
- description: ({ special = 0 }) =>
- ngettext(
- msgid`${n2w(special)} special character`,
- `${n2w(special)} special characters`,
- special,
- ),
- },
-};
-
type SettingListener = (value: any) => void;
class MetabaseSettings {
@@ -244,34 +196,6 @@ class MetabaseSettings {
return this.get("password-complexity") || {};
}
- /**
- * Returns a description of password complexity requirements.
- * Optionally takes a password and returns a description only including the requirements not met.
- */
- passwordComplexityDescription(password = "") {
- const requirements = this.passwordComplexityRequirements();
- const descriptions: Record<string, string> = {};
-
- for (const [name, clause] of Object.entries(PASSWORD_COMPLEXITY_CLAUSES)) {
- if (!clause.test(requirements, password)) {
- descriptions[name] = clause.description(requirements);
- }
- }
-
- const { total, ...rest } = descriptions;
- const includes = Object.values(rest).join(", ");
-
- if (total && includes) {
- return t`must be ${total} and include ${includes}.`;
- } else if (total) {
- return t`must be ${total}.`;
- } else if (includes) {
- return t`must include ${includes}.`;
- } else {
- return null;
- }
- }
-
/**
* @deprecated use getSetting(state, "subscription-allowed-domains")
*/
@@ -290,11 +214,6 @@ class MetabaseSettings {
}
}
-function makeRegexTest(property: string, regex: RegExp) {
- return (requirements: Record<string, any>, password = "") =>
- (password.match(regex) || []).length >= (requirements[property] || 0);
-}
-
// window is not defined for static charts SSR
const initValues =
typeof window !== "undefined" ? _.clone(window.MetabaseBootstrap) : null;
diff --git a/frontend/src/metabase/lib/syncing.ts b/frontend/src/metabase/utils/syncing.ts
similarity index 100%
rename from frontend/src/metabase/lib/syncing.ts
rename to frontend/src/metabase/utils/syncing.ts
diff --git a/frontend/src/metabase/lib/time-dayjs.ts b/frontend/src/metabase/utils/time-dayjs.ts
similarity index 98%
rename from frontend/src/metabase/lib/time-dayjs.ts
rename to frontend/src/metabase/utils/time-dayjs.ts
index 3bff6113bf2..17e710bea80 100644
--- a/frontend/src/metabase/lib/time-dayjs.ts
+++ b/frontend/src/metabase/utils/time-dayjs.ts
@@ -2,7 +2,7 @@ import type { Dayjs } from "dayjs";
import dayjs from "dayjs";
import { t } from "ttag";
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { DatetimeUnit } from "metabase-types/api/query";
const DAYLIGHT_SAVINGS_CHANGE_TOLERANCE: Record<string, number> = {
diff --git a/frontend/test/metabase/lib/time.unit.spec.js b/frontend/src/metabase/utils/time-dayjs.unit.spec.ts
similarity index 71%
rename from frontend/test/metabase/lib/time.unit.spec.js
rename to frontend/src/metabase/utils/time-dayjs.unit.spec.ts
index 2dd22cbd16e..5a2d298f40e 100644
--- a/frontend/test/metabase/lib/time.unit.spec.js
+++ b/frontend/src/metabase/utils/time-dayjs.unit.spec.ts
@@ -1,13 +1,17 @@
import dayjs from "dayjs";
-import { parseTime, parseTimestamp } from "metabase/lib/time-dayjs";
-
-describe("time", () => {
- afterEach(() => {
- dayjs.updateLocale(dayjs.locale(), { week: { dow: 0 } });
- });
+import {
+ parseTime,
+ parseTimestamp,
+ timezoneToUTCOffset,
+} from "metabase/utils/time-dayjs";
+describe("time-dayjs", () => {
describe("parseTimestamp", () => {
+ afterEach(() => {
+ dayjs.updateLocale(dayjs.locale(), { weekStart: 0 });
+ });
+
const NY15_TOKYO = dayjs(1420038000000); // 2014-12-31 15:00 UTC
const NY15_UTC = dayjs(1420070400000); // 2015-01-01 00:00 UTC
const NY15_LA = dayjs(1420099200000); // 2015-01-01 00:00 UTC
@@ -29,7 +33,7 @@ describe("time", () => {
["2015-01-01T00:00:00.000-0800", -480, NY15_LA],
["2015-01-01T00:00:00-08:00", -480, NY15_LA],
["2015-01-01T00:00:00-0800", -480, NY15_LA],
- ];
+ ] as const;
TEST_CASES.map(([str, expectedOffset, expectedDate]) => {
it(
@@ -55,6 +59,16 @@ describe("time", () => {
expect(result.unix()).toEqual(NY15_UTC.unix());
});
+ it("should not parse small numbers as timestamps when non-timestamp unit is provided", () => {
+ // When unit="month", small numbers should return an invalid date
+ // rather than being interpreted as milliseconds since epoch
+ const result = parseTimestamp(1, "month");
+
+ // Small numbers with units like "month", "quarter", "year" don't make sense
+ // as timestamps, so parseTimestamp should return an invalid date
+ expect(result.isValid()).toBe(false);
+ });
+
it("should parse week of year correctly", () => {
const daysOfWeek = [0, 1, 2, 3, 4, 5, 6];
daysOfWeek.forEach((dayOfWeek) => {
@@ -67,6 +81,22 @@ describe("time", () => {
});
});
+ describe("timezoneToUTCOffset", () => {
+ it.each([
+ ["UTC", "+00:00"],
+ ["America/New_York", "-04:00"],
+ ["America/Los_Angeles", "-07:00"],
+ ["Europe/London", "+01:00"],
+ ["Asia/Tokyo", "+09:00"],
+ ["Pacific/Auckland", "+12:00"],
+ ])(
+ "should return the correct UTC offset for %s",
+ (timezone, expectedOffset) => {
+ expect(timezoneToUTCOffset(timezone)).toBe(expectedOffset);
+ },
+ );
+ });
+
describe("parseTime", () => {
const PARSE_TIME_TESTS = [
["01:02:03.456+07:00", "1:02 AM"],
@@ -84,7 +114,6 @@ describe("time", () => {
`parseTime(%p) to be %p`,
(value, resultStr) => {
const result = parseTime(value);
- expect(dayjs.isDayjs(result)).toBe(true);
expect(result.format("h:mm A")).toBe(resultStr);
},
);
diff --git a/frontend/src/metabase/lib/types.ts b/frontend/src/metabase/utils/types.ts
similarity index 100%
rename from frontend/src/metabase/lib/types.ts
rename to frontend/src/metabase/utils/types.ts
diff --git a/frontend/src/metabase/lib/types.unit.spec.ts b/frontend/src/metabase/utils/types.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/types.unit.spec.ts
rename to frontend/src/metabase/utils/types.unit.spec.ts
diff --git a/frontend/src/metabase/lib/uploads.ts b/frontend/src/metabase/utils/uploads.ts
similarity index 100%
rename from frontend/src/metabase/lib/uploads.ts
rename to frontend/src/metabase/utils/uploads.ts
diff --git a/frontend/test/metabase/lib/urls.unit.spec.js b/frontend/src/metabase/utils/urls.unit.spec.js
similarity index 99%
rename from frontend/test/metabase/lib/urls.unit.spec.js
rename to frontend/src/metabase/utils/urls.unit.spec.js
index ccdb97e070c..93b2e1a86d1 100644
--- a/frontend/test/metabase/lib/urls.unit.spec.js
+++ b/frontend/src/metabase/utils/urls.unit.spec.js
@@ -11,7 +11,7 @@ import {
modelDetail,
modelEditor,
question,
-} from "metabase/lib/urls";
+} from "metabase/utils/urls";
describe("urls", () => {
describe("question", () => {
diff --git a/frontend/src/metabase/lib/urls/actions.ts b/frontend/src/metabase/utils/urls/actions.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/actions.ts
rename to frontend/src/metabase/utils/urls/actions.ts
diff --git a/frontend/src/metabase/lib/urls/admin.ts b/frontend/src/metabase/utils/urls/admin.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/admin.ts
rename to frontend/src/metabase/utils/urls/admin.ts
diff --git a/frontend/src/metabase/lib/urls/auth.ts b/frontend/src/metabase/utils/urls/auth.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/auth.ts
rename to frontend/src/metabase/utils/urls/auth.ts
diff --git a/frontend/src/metabase/lib/urls/bookmarks.ts b/frontend/src/metabase/utils/urls/bookmarks.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/bookmarks.ts
rename to frontend/src/metabase/utils/urls/bookmarks.ts
diff --git a/frontend/src/metabase/lib/urls/browse.ts b/frontend/src/metabase/utils/urls/browse.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/browse.ts
rename to frontend/src/metabase/utils/urls/browse.ts
diff --git a/frontend/src/metabase/lib/urls/collections.ts b/frontend/src/metabase/utils/urls/collections.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/collections.ts
rename to frontend/src/metabase/utils/urls/collections.ts
diff --git a/frontend/src/metabase/lib/urls/dashboards.ts b/frontend/src/metabase/utils/urls/dashboards.ts
similarity index 91%
rename from frontend/src/metabase/lib/urls/dashboards.ts
rename to frontend/src/metabase/utils/urls/dashboards.ts
index 3a389286273..c7e5dde91aa 100644
--- a/frontend/src/metabase/lib/urls/dashboards.ts
+++ b/frontend/src/metabase/utils/urls/dashboards.ts
@@ -1,7 +1,7 @@
import slugg from "slugg";
-import { stringifyHashOptions } from "metabase/lib/browser";
-import MetabaseSettings from "metabase/lib/settings";
+import { stringifyHashOptions } from "metabase/utils/browser";
+import MetabaseSettings from "metabase/utils/settings";
import type {
DashCardId,
DashboardId,
diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/utils/urls/data-studio.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/data-studio.ts
rename to frontend/src/metabase/utils/urls/data-studio.ts
diff --git a/frontend/src/metabase/lib/urls/data-studio.unit.spec.ts b/frontend/src/metabase/utils/urls/data-studio.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/data-studio.unit.spec.ts
rename to frontend/src/metabase/utils/urls/data-studio.unit.spec.ts
diff --git a/frontend/src/metabase/lib/urls/dependencies.ts b/frontend/src/metabase/utils/urls/dependencies.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/dependencies.ts
rename to frontend/src/metabase/utils/urls/dependencies.ts
diff --git a/frontend/src/metabase/lib/urls/documents.ts b/frontend/src/metabase/utils/urls/documents.ts
similarity index 91%
rename from frontend/src/metabase/lib/urls/documents.ts
rename to frontend/src/metabase/utils/urls/documents.ts
index 3bea6405c9b..59ab6516172 100644
--- a/frontend/src/metabase/lib/urls/documents.ts
+++ b/frontend/src/metabase/utils/urls/documents.ts
@@ -1,4 +1,4 @@
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { Document } from "metabase-types/api";
export function newDocument() {
diff --git a/frontend/src/metabase/lib/urls/documents.unit.spec.ts b/frontend/src/metabase/utils/urls/documents.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/documents.unit.spec.ts
rename to frontend/src/metabase/utils/urls/documents.unit.spec.ts
diff --git a/frontend/src/metabase/lib/urls/index.ts b/frontend/src/metabase/utils/urls/index.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/index.ts
rename to frontend/src/metabase/utils/urls/index.ts
diff --git a/frontend/src/metabase/lib/urls/indexed-entities.ts b/frontend/src/metabase/utils/urls/indexed-entities.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/indexed-entities.ts
rename to frontend/src/metabase/utils/urls/indexed-entities.ts
diff --git a/frontend/src/metabase/lib/urls/metabot.ts b/frontend/src/metabase/utils/urls/metabot.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/metabot.ts
rename to frontend/src/metabase/utils/urls/metabot.ts
diff --git a/frontend/src/metabase/lib/urls/metrics.ts b/frontend/src/metabase/utils/urls/metrics.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/metrics.ts
rename to frontend/src/metabase/utils/urls/metrics.ts
diff --git a/frontend/src/metabase/lib/urls/misc.ts b/frontend/src/metabase/utils/urls/misc.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/misc.ts
rename to frontend/src/metabase/utils/urls/misc.ts
diff --git a/frontend/src/metabase/lib/urls/modelToUrl.ts b/frontend/src/metabase/utils/urls/modelToUrl.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/modelToUrl.ts
rename to frontend/src/metabase/utils/urls/modelToUrl.ts
diff --git a/frontend/src/metabase/lib/urls/modelToUrl.unit.spec.ts b/frontend/src/metabase/utils/urls/modelToUrl.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/modelToUrl.unit.spec.ts
rename to frontend/src/metabase/utils/urls/modelToUrl.unit.spec.ts
diff --git a/frontend/src/metabase/lib/urls/models.ts b/frontend/src/metabase/utils/urls/models.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/models.ts
rename to frontend/src/metabase/utils/urls/models.ts
diff --git a/frontend/src/metabase/lib/urls/permissions.ts b/frontend/src/metabase/utils/urls/permissions.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/permissions.ts
rename to frontend/src/metabase/utils/urls/permissions.ts
diff --git a/frontend/src/metabase/lib/urls/questions.ts b/frontend/src/metabase/utils/urls/questions.ts
similarity index 97%
rename from frontend/src/metabase/lib/urls/questions.ts
rename to frontend/src/metabase/utils/urls/questions.ts
index 674b81732cc..276671319df 100644
--- a/frontend/src/metabase/lib/urls/questions.ts
+++ b/frontend/src/metabase/utils/urls/questions.ts
@@ -1,7 +1,7 @@
import slugg from "slugg";
-import { serializeCardForUrl } from "metabase/lib/card";
-import MetabaseSettings from "metabase/lib/settings";
+import { serializeCardForUrl } from "metabase/utils/card";
+import MetabaseSettings from "metabase/utils/settings";
import type { QuestionCreatorOpts } from "metabase-lib/v1/Question";
import Question from "metabase-lib/v1/Question";
import * as ML_Urls from "metabase-lib/v1/urls";
diff --git a/frontend/src/metabase/lib/urls/timelines.ts b/frontend/src/metabase/utils/urls/timelines.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/timelines.ts
rename to frontend/src/metabase/utils/urls/timelines.ts
diff --git a/frontend/src/metabase/lib/urls/transforms.ts b/frontend/src/metabase/utils/urls/transforms.ts
similarity index 100%
rename from frontend/src/metabase/lib/urls/transforms.ts
rename to frontend/src/metabase/utils/urls/transforms.ts
diff --git a/frontend/src/metabase/lib/urls/utils.ts b/frontend/src/metabase/utils/urls/utils.ts
similarity index 98%
rename from frontend/src/metabase/lib/urls/utils.ts
rename to frontend/src/metabase/utils/urls/utils.ts
index 97abcd127b4..e502af5597c 100644
--- a/frontend/src/metabase/lib/urls/utils.ts
+++ b/frontend/src/metabase/utils/urls/utils.ts
@@ -1,4 +1,4 @@
-import api from "metabase/lib/api";
+import api from "metabase/utils/api";
export function appendSlug(path: string | number, slug?: string) {
return slug ? `${path}-${slug}` : String(path);
diff --git a/frontend/src/metabase/lib/urls/utils.unit.spec.ts b/frontend/src/metabase/utils/urls/utils.unit.spec.ts
similarity index 99%
rename from frontend/src/metabase/lib/urls/utils.unit.spec.ts
rename to frontend/src/metabase/utils/urls/utils.unit.spec.ts
index 5e97de53b15..0b632d0b36b 100644
--- a/frontend/src/metabase/lib/urls/utils.unit.spec.ts
+++ b/frontend/src/metabase/utils/urls/utils.unit.spec.ts
@@ -1,4 +1,4 @@
-import api from "metabase/lib/api";
+import api from "metabase/utils/api";
import {
getSubpathSafeUrl,
diff --git a/frontend/src/metabase/lib/user.ts b/frontend/src/metabase/utils/user.ts
similarity index 100%
rename from frontend/src/metabase/lib/user.ts
rename to frontend/src/metabase/utils/user.ts
diff --git a/frontend/test/metabase/lib/user.unit.spec.ts b/frontend/src/metabase/utils/user.unit.spec.ts
similarity index 94%
rename from frontend/test/metabase/lib/user.unit.spec.ts
rename to frontend/src/metabase/utils/user.unit.spec.ts
index 644f93cde70..d56fa85fd07 100644
--- a/frontend/test/metabase/lib/user.unit.spec.ts
+++ b/frontend/src/metabase/utils/user.unit.spec.ts
@@ -1,4 +1,4 @@
-import { getFullName } from "metabase/lib/user";
+import { getFullName } from "metabase/utils/user";
import { createMockUser } from "metabase-types/api/mocks";
describe("lib/user", () => {
diff --git a/frontend/src/metabase/lib/uuid.ts b/frontend/src/metabase/utils/uuid.ts
similarity index 70%
rename from frontend/src/metabase/lib/uuid.ts
rename to frontend/src/metabase/utils/uuid.ts
index c25bddf5925..319a3f2ceae 100644
--- a/frontend/src/metabase/lib/uuid.ts
+++ b/frontend/src/metabase/utils/uuid.ts
@@ -1,4 +1,15 @@
export function uuid() {
+ if (
+ typeof crypto !== "undefined" &&
+ typeof crypto.randomUUID === "function"
+ ) {
+ return crypto.randomUUID();
+ } else {
+ return uuidV4();
+ }
+}
+
+function uuidV4() {
return (
s4() +
s4() +
diff --git a/frontend/src/metabase/lib/validate.ts b/frontend/src/metabase/utils/validate.ts
similarity index 100%
rename from frontend/src/metabase/lib/validate.ts
rename to frontend/src/metabase/utils/validate.ts
diff --git a/frontend/src/metabase/lib/utils.ts b/frontend/src/metabase/utils/version.ts
similarity index 67%
rename from frontend/src/metabase/lib/utils.ts
rename to frontend/src/metabase/utils/version.ts
index 2ddb3e4185f..70b30303555 100644
--- a/frontend/src/metabase/lib/utils.ts
+++ b/frontend/src/metabase/utils/version.ts
@@ -1,46 +1,3 @@
-import { t } from "ttag";
-import _ from "underscore";
-
-import { PLUGIN_IS_EE_BUILD } from "metabase/plugins";
-
-export function isEmpty(str: string | null) {
- if (str != null) {
- str = String(str);
- } // make sure 'str' is actually a string
- return str == null || 0 === str.length || str.match(/^\s+$/) != null;
-}
-
-// pretty limited. just does 0-9 for right now.
-export function numberToWord(num: number) {
- const names = [
- t`zero`,
- t`one`,
- t`two`,
- t`three`,
- t`four`,
- t`five`,
- t`six`,
- t`seven`,
- t`eight`,
- t`nine`,
- ];
-
- if (num >= 0 && num <= 9) {
- return names[num];
- } else {
- return "" + num;
- }
-}
-
-export function equals(a: unknown, b: unknown) {
- return _.isEqual(a, b);
-}
-
-export function copy(a: unknown) {
- // FIXME: ugghhhhhhhhh
- return JSON.parse(JSON.stringify(a));
-}
-
/**
* Converts a metabase version to a list of numeric components, it converts pre-release
* components to numbers and pads the numeric part to 4 numbers to make comparison easier
@@ -139,11 +96,3 @@ export function versionIsLatest({
const result = compareVersions(currentVersion, latestVersion);
return result != null && result >= 0;
}
-
-/**
- * @deprecated
- * In most cases we want to use specific token features, not the type of build.
- * Use only we want to display something differently based on specifically the build,
- * ie: "Switch binary" vs "Put a valid token in the settings"
- */
-export const isEEBuild = () => PLUGIN_IS_EE_BUILD.isEEBuild();
diff --git a/frontend/src/metabase/visualizations/analytics.ts b/frontend/src/metabase/visualizations/analytics.ts
index ad1606b8912..1f023b14406 100644
--- a/frontend/src/metabase/visualizations/analytics.ts
+++ b/frontend/src/metabase/visualizations/analytics.ts
@@ -1,6 +1,6 @@
import { match } from "ts-pattern";
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
import type { RegularClickAction } from "./types";
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
index ceee1992180..028403d28e3 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx
@@ -1,7 +1,5 @@
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getQuestion } from "metabase/query_builder/selectors";
import { trackColumnCombineViaPlusModal } from "metabase/querying/analytics";
import {
@@ -9,6 +7,8 @@ import {
hasCombinations,
} from "metabase/querying/components/expressions";
import { setUIControls } from "metabase/redux/query-builder";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { LegacyDrill } from "metabase/visualizations/types";
import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
index 0e63e924882..21192dbc52a 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx
@@ -1,7 +1,5 @@
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { checkNotNull } from "metabase/lib/types";
import { getQuestion } from "metabase/query_builder/selectors";
import { trackColumnExtractViaPlusModal } from "metabase/querying/analytics";
import {
@@ -10,6 +8,8 @@ import {
} from "metabase/querying/components/expressions";
import { setUIControls } from "metabase/redux/query-builder";
import { Box, rem } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { checkNotNull } from "metabase/utils/types";
import type { LegacyDrill } from "metabase/visualizations/types";
import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx
index afbce80f8a9..809feb91a77 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx
@@ -1,9 +1,9 @@
import { c } from "ttag";
-import { isWithinIframe } from "metabase/lib/dom";
import { MODAL_TYPES } from "metabase/querying/constants";
import { setUIControls } from "metabase/redux/query-builder";
import { Button, Flex } from "metabase/ui";
+import { isWithinIframe } from "metabase/utils/iframe";
import type {
CustomClickActionWithCustomView,
LegacyDrill,
diff --git a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx
index f5e9df666d8..ff017df8e2e 100644
--- a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.unit.spec.tsx
@@ -1,7 +1,7 @@
-jest.doMock("metabase/lib/dom");
+jest.doMock("metabase/utils/dom");
import { createMockMetadata } from "__support__/metadata";
-import * as dom from "metabase/lib/dom";
+import * as iframeUtils from "metabase/utils/iframe";
import Question from "metabase-lib/v1/Question";
import {
createEmptyAdHocNativeCard,
@@ -21,7 +21,7 @@ describe("NativeQueryClickFallback", () => {
let isWithinIframeSpy: jest.SpyInstance;
beforeEach(() => {
- isWithinIframeSpy = jest.spyOn(dom, "isWithinIframe");
+ isWithinIframeSpy = jest.spyOn(iframeUtils, "isWithinIframe");
});
afterEach(() => {
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx
index aa8f6887ec7..f5250a1a9dc 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx
@@ -2,8 +2,8 @@ import { useMemo } from "react";
import _ from "underscore";
import { Tooltip } from "metabase/common/components/Tooltip";
-import { getEventTarget } from "metabase/lib/dom";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
+import { getEventTarget } from "metabase/utils/dom";
import type {
HoveredObject,
HoveredTimelineEvent,
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.tsx
index 09a8a76b8c0..485b86a48de 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.tsx
@@ -1,7 +1,7 @@
import cx from "classnames";
import type React from "react";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import TooltipStyles from "./EChartsTooltip.module.css";
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx
index b02e26c0ee3..f8c204463cb 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/KeyValuePairChartTooltip/KeyValuePairChartTooltip.tsx
@@ -2,7 +2,7 @@ import cx from "classnames";
import { isValidElement, useMemo } from "react";
import CS from "metabase/css/core/index.css";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import type {
ComputedVisualizationSettings,
DataPoint,
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/utils.ts b/frontend/src/metabase/visualizations/components/ChartTooltip/utils.ts
index 11bc261322f..71f3caec9f8 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/utils.ts
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/utils.ts
@@ -1,6 +1,6 @@
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { formatValue } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { formatValue } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
import type {
ComputedVisualizationSettings,
RemappingHydratedDatasetColumn,
diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
index 6d9f38671c5..83768863171 100644
--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
@@ -12,11 +12,11 @@ import { Link } from "metabase/common/components/Link";
import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import CS from "metabase/css/core/index.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { formatValue } from "metabase/lib/formatting";
-import { connect, useSelector } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import { Flex, Text } from "metabase/ui";
+import { formatValue } from "metabase/utils/formatting";
+import { connect, useSelector } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import { MinColumnsError } from "metabase/visualizations/lib/errors";
import {
computeMinimalBounds,
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
index f734519e4ec..1a7ddf6f469 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.tsx
@@ -1,5 +1,5 @@
-import { useDispatch } from "metabase/lib/redux";
import { Box, Button, Icon, Tooltip } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import {
type ClickAction,
isCustomClickAction,
diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx
index 629fda4d3a6..cfe1822599d 100644
--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx
+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsPopover.tsx
@@ -2,9 +2,9 @@ import type { LocationDescriptorObject } from "history";
import { Component } from "react";
import type * as tippy from "tippy.js";
-import { getEventTarget } from "metabase/lib/dom";
-import { connect } from "metabase/lib/redux";
import { PopoverWithRef } from "metabase/ui/components/overlays/Popover/PopoverWithRef";
+import { getEventTarget } from "metabase/utils/dom";
+import { connect } from "metabase/utils/redux";
import { performAction } from "metabase/visualizations/lib/action";
import type {
ClickObject,
diff --git a/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx b/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx
index 39c468946fe..1a830123373 100644
--- a/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx
+++ b/frontend/src/metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.tsx
@@ -1,7 +1,7 @@
import { forwardRef, useLayoutEffect } from "react";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
-import { isNumber } from "metabase/lib/types";
+import { isNumber } from "metabase/utils/types";
import type { EChartsRendererProps } from "metabase/visualizations/components/EChartsRenderer/EChartsRenderer";
import { EChartsRenderer } from "metabase/visualizations/components/EChartsRenderer/EChartsRenderer";
import { ResponsiveEChartsRendererStyled } from "metabase/visualizations/components/EChartsRenderer/ResponsiveEChartsRenderer.styled";
diff --git a/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts b/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts
index d71147653ed..3fba322c11f 100644
--- a/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts
+++ b/frontend/src/metabase/visualizations/components/EmptyVizState/utils.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { getSubpathSafeUrl } from "metabase/lib/urls";
+import { getSubpathSafeUrl } from "metabase/utils/urls";
import type { CardDisplayType } from "metabase-types/api";
/**
diff --git a/frontend/src/metabase/visualizations/components/FunnelNormal.styled.tsx b/frontend/src/metabase/visualizations/components/FunnelNormal.styled.tsx
index 19e000a716a..0db47f20cd3 100644
--- a/frontend/src/metabase/visualizations/components/FunnelNormal.styled.tsx
+++ b/frontend/src/metabase/visualizations/components/FunnelNormal.styled.tsx
@@ -3,7 +3,7 @@ import { css } from "@emotion/react";
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { isWebkit } from "metabase/lib/browser";
+import { isWebkit } from "metabase/utils/browser";
interface SharedProps {
isNarrow: boolean;
diff --git a/frontend/src/metabase/visualizations/components/FunnelNormal.tsx b/frontend/src/metabase/visualizations/components/FunnelNormal.tsx
index 04f3bc5075b..b256e531455 100644
--- a/frontend/src/metabase/visualizations/components/FunnelNormal.tsx
+++ b/frontend/src/metabase/visualizations/components/FunnelNormal.tsx
@@ -3,15 +3,15 @@ import Color from "color";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
+import { Ellipsified } from "metabase/ui";
+import { color } from "metabase/ui/colors";
import {
formatChangeWithSign,
formatNumber,
formatValue,
-} from "metabase/lib/formatting";
-import { formatNullable } from "metabase/lib/formatting/nullable";
-import { isNotNull } from "metabase/lib/types";
-import { Ellipsified } from "metabase/ui";
-import { color } from "metabase/ui/colors";
+} from "metabase/utils/formatting";
+import { formatNullable } from "metabase/utils/formatting/nullable";
+import { isNotNull } from "metabase/utils/types";
import {
FunnelNormalRoot,
FunnelStart,
diff --git a/frontend/src/metabase/visualizations/components/LeafletMap.tsx b/frontend/src/metabase/visualizations/components/LeafletMap.tsx
index 933cb2edf50..8b7c69c3a03 100644
--- a/frontend/src/metabase/visualizations/components/LeafletMap.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletMap.tsx
@@ -6,8 +6,8 @@ import L from "leaflet";
import { Component, createRef } from "react";
import _ from "underscore";
-import MetabaseSettings from "metabase/lib/settings";
-import { isNullOrUndefined } from "metabase/lib/types";
+import MetabaseSettings from "metabase/utils/settings";
+import { isNullOrUndefined } from "metabase/utils/types";
import type { OnChangeCardAndRun } from "metabase/visualizations/types";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx b/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx
index 3188e3e990b..2760a380992 100644
--- a/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletMap.unit.spec.tsx
@@ -2,7 +2,7 @@ import { render } from "@testing-library/react";
import L from "leaflet";
import { createRef } from "react";
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { Point } from "metabase-types/api/dataset";
import {
createMockCard,
diff --git a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsx b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsx
index c0a362873a8..32b80bc1026 100644
--- a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.tsx
@@ -1,7 +1,7 @@
import L from "leaflet";
import _ from "underscore";
-import { getSubpathSafeUrl } from "metabase/lib/urls";
+import { getSubpathSafeUrl } from "metabase/utils/urls";
import type { HoveredObject } from "metabase/visualizations/types";
import type { ClickObject } from "metabase-lib";
import { isPK } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx b/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx
index f309097dbfb..0b381cae00a 100644
--- a/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx
+++ b/frontend/src/metabase/visualizations/components/LeafletTilePinMap.tsx
@@ -3,8 +3,8 @@ import type { ContextType } from "react";
import { EmbeddingEntityContext } from "metabase/embedding/context";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
-import { GET } from "metabase/lib/api";
-import { isWithinIframe } from "metabase/lib/dom";
+import { GET } from "metabase/utils/api";
+import { isWithinIframe } from "metabase/utils/iframe";
import type { DashboardId } from "metabase-types/api";
import { getTileUrl } from "../lib/map";
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
index f468384490b..3c2bf2035db 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx
@@ -1,5 +1,4 @@
import { Tables } from "metabase/entities/tables";
-import { connect } from "metabase/lib/redux";
import {
closeObjectDetail,
followForeignKey,
@@ -19,6 +18,7 @@ import {
getZoomedObjectId,
} from "metabase/query_builder/selectors";
import { getUser } from "metabase/selectors/user";
+import { connect } from "metabase/utils/redux";
import type ForeignKey from "metabase-lib/v1/metadata/ForeignKey";
import type { State } from "metabase-types/store";
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
index 44be513be2a..a0d9dd17726 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx
@@ -14,7 +14,7 @@ import {
waitFor,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import registerVisualizations from "metabase/visualizations/register";
import type { Field } from "metabase-types/api";
import { createMockCard, createMockDataset } from "metabase-types/api/mocks";
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx
index 075c1684f40..f782d8ebafd 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx
@@ -8,10 +8,10 @@ import { skipToken, useListActionsQuery } from "metabase/api";
import { NotFound } from "metabase/common/components/ErrorPages";
import { LoadingSpinner } from "metabase/common/components/LoadingSpinner";
import { useDatabaseListQuery } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
import { runQuestionQuery } from "metabase/query_builder/actions";
import { ActionsApi, MetabaseApi } from "metabase/services";
import { Modal } from "metabase/ui";
+import { useDispatch } from "metabase/utils/redux";
import * as Lib from "metabase-lib";
import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";
import { isPK } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsx
index 4e6df02d5b2..524c77b5b0c 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsx
@@ -10,7 +10,7 @@ import {
import { testDataset } from "__support__/testDataset";
import { renderWithProviders, screen, waitFor, within } from "__support__/ui";
import { getNextId } from "__support__/utils";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { WritebackAction } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsx
index 7356c5826bc..c0a44b39b2a 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsx
@@ -8,8 +8,8 @@ import {
screen,
waitForLoaderToBeRemoved,
} from "__support__/ui";
-import { checkNotNull } from "metabase/lib/types";
import { getMetadata } from "metabase/selectors/metadata";
+import { checkNotNull } from "metabase/utils/types";
import { ObjectDetailWrapper } from "metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper";
import type { ObjectDetailProps } from "metabase/visualizations/components/ObjectDetail/types";
import registerVisualizations from "metabase/visualizations/register";
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
index 9daa107bbb4..16d79317960 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
@@ -6,8 +6,8 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import CS from "metabase/css/core/index.css";
import QueryBuilderS from "metabase/css/query_builder.module.css";
-import { displayNameForColumn, formatValue } from "metabase/lib/formatting";
import { Box, Ellipsified } from "metabase/ui";
+import { displayNameForColumn, formatValue } from "metabase/utils/formatting";
import type { ClickObject } from "metabase-lib";
import { findColumnIndexesForColumnSettings } from "metabase-lib/v1/queries/utils/dataset";
import { TYPE } from "metabase-lib/v1/types/constants";
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts b/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts
index 1c04ef76b83..7fb2ae8f4fb 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/utils.ts
@@ -4,7 +4,7 @@ import {
isImplicitDeleteAction,
isImplicitUpdateAction,
} from "metabase/actions/utils";
-import { formatValue, singularize } from "metabase/lib/formatting";
+import { formatValue, singularize } from "metabase/utils/formatting";
import type Question from "metabase-lib/v1/Question";
import { canRunAction } from "metabase-lib/v1/actions/utils";
import type Database from "metabase-lib/v1/metadata/Database";
diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/utils.ts b/frontend/src/metabase/visualizations/components/ScalarValue/utils.ts
index bf8ec39b723..6a1b55fbec6 100644
--- a/frontend/src/metabase/visualizations/components/ScalarValue/utils.ts
+++ b/frontend/src/metabase/visualizations/components/ScalarValue/utils.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_CARD_SIZE, GRID_WIDTH } from "metabase/lib/dashboard_grid";
-import { measureText } from "metabase/lib/measure-text";
+import { DEFAULT_CARD_SIZE, GRID_WIDTH } from "metabase/utils/dashboard_grid";
+import { measureText } from "metabase/utils/measure-text";
interface FindSizeInput {
text: string;
diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts b/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts
index ab498c010c7..e4a3235840c 100644
--- a/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/components/ScalarValue/utils.unit.spec.ts
@@ -1,9 +1,9 @@
-import * as measureText from "metabase/lib/measure-text";
+import * as measureText from "metabase/utils/measure-text";
import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import { findSize } from "./utils";
-jest.doMock("metabase/lib/measure-text", () => ({
+jest.doMock("metabase/utils/measure-text", () => ({
measureText: jest.fn(),
}));
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
index 7021e60be5c..f4741be1d7b 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx
@@ -43,11 +43,11 @@ import type {
} from "metabase/data-grid/types";
import { withMantineTheme } from "metabase/hoc/MantineTheme";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { getScrollBarSize } from "metabase/lib/dom";
-import { formatValue } from "metabase/lib/formatting";
-import { useDispatch } from "metabase/lib/redux";
import { setUIControls } from "metabase/redux/query-builder";
import { Flex, type MantineTheme } from "metabase/ui";
+import { getScrollBarSize } from "metabase/utils/dom";
+import { formatValue } from "metabase/utils/formatting";
+import { useDispatch } from "metabase/utils/redux";
import {
getTableCellClickedObject,
getTableClickedObjectRowData,
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.ts b/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.ts
index d3b52ec741a..f49959d79ea 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.ts
+++ b/frontend/src/metabase/visualizations/components/TableInteractive/hooks/use-object-detail.ts
@@ -1,11 +1,11 @@
import { useCallback, useMemo } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { resetRowZoom, zoomInRow } from "metabase/query_builder/actions";
import {
getRowIndexToPKMap,
getZoomedObjectId,
} from "metabase/query_builder/selectors";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import type { ObjectId } from "metabase/visualizations/components/ObjectDetail/types";
import type { ColumnDescriptor } from "metabase/visualizations/lib/graph/columns";
import { isPK } from "metabase-lib/v1/types/utils/isa";
diff --git a/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts b/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts
index 692229e7960..443cdc37dee 100644
--- a/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts
+++ b/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
-import { formatValue } from "metabase/lib/formatting";
-import { formatDateTimeRangeWithUnit } from "metabase/lib/formatting/date";
+import { formatValue } from "metabase/utils/formatting";
+import { formatDateTimeRangeWithUnit } from "metabase/utils/formatting/date";
import type { PreviousPeriodChange } from "metabase/visualizations/lib/trend-helpers";
import {
computePreviousPeriodChange,
diff --git a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
index 90e53738369..93059f9d9aa 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.tsx
@@ -1,7 +1,7 @@
import { jt, t } from "ttag";
import type { CardSlownessStatus } from "metabase/dashboard/components/DashCard/types";
-import { duration } from "metabase/lib/formatting";
+import { duration } from "metabase/utils/formatting";
import {
Duration,
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index f639a4fb8d3..abc57c18be7 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -21,9 +21,6 @@ import DashboardS from "metabase/css/dashboard.module.css";
import type { CardSlownessStatus } from "metabase/dashboard/components/DashCard/types";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import type { ContentTranslationFunction } from "metabase/i18n/types";
-import { formatNumber } from "metabase/lib/formatting";
-import { connect } from "metabase/lib/redux";
-import { equals } from "metabase/lib/utils";
import {
getIsShowingRawTable,
getUiControls,
@@ -32,6 +29,8 @@ import { getIsDownloadingToImage } from "metabase/redux/downloads";
import { getTokenFeature } from "metabase/setup/selectors";
import { getFont } from "metabase/styled-components/selectors";
import type { IconName, IconProps } from "metabase/ui";
+import { formatNumber } from "metabase/utils/formatting";
+import { connect } from "metabase/utils/redux";
import {
extractRemappings,
getVisualizationTransformed,
@@ -312,9 +311,9 @@ class Visualization extends PureComponent<
// getDerivedStateFromProps does not have access to the last props, so
if (
!isSameSeries(props.rawSeries, state._lastProps?.rawSeries) ||
- !equals(props.settings, state._lastProps?.settings) ||
- !equals(props.timelineEvents, state._lastProps?.timelineEvents) ||
- !equals(
+ !_.isEqual(props.settings, state._lastProps?.settings) ||
+ !_.isEqual(props.timelineEvents, state._lastProps?.timelineEvents) ||
+ !_.isEqual(
props.selectedTimelineEventIds,
state._lastProps?.selectedTimelineEventIds,
) ||
@@ -348,7 +347,9 @@ class Visualization extends PureComponent<
prevProps: VisualizationProps,
prevState: VisualizationState,
) {
- if (!equals(this.getWarnings(prevProps, prevState), this.getWarnings())) {
+ if (
+ !_.isEqual(this.getWarnings(prevProps, prevState), this.getWarnings())
+ ) {
this.updateWarnings();
}
}
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Watermark/Watermark.tsx b/frontend/src/metabase/visualizations/components/Visualization/Watermark/Watermark.tsx
index ac0178b4af7..4eb7ce28ef4 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Watermark/Watermark.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Watermark/Watermark.tsx
@@ -1,4 +1,4 @@
-import { isVirtualDashCard } from "metabase/lib/dashboard";
+import { isVirtualDashCard } from "metabase/utils/dashboard";
import type { BaseDashboardCard, Card } from "metabase-types/api";
import S from "./Watermark.module.css";
diff --git a/frontend/src/metabase/visualizations/components/legend/LegendLayout.tsx b/frontend/src/metabase/visualizations/components/legend/LegendLayout.tsx
index b8826fe1177..ceb4b4bf3a4 100644
--- a/frontend/src/metabase/visualizations/components/legend/LegendLayout.tsx
+++ b/frontend/src/metabase/visualizations/components/legend/LegendLayout.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { HoveredObject } from "metabase/visualizations/types";
import { Legend } from "./Legend";
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.jsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.jsx
index 2a7bb4edca8..76acb2f9a56 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.jsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPicker.jsx
@@ -7,7 +7,7 @@ import { t } from "ttag";
import { Sortable, SortableList } from "metabase/common/components/Sortable";
import { useDndSensors } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
-import { moveElement } from "metabase/lib/arrays";
+import { moveElement } from "metabase/utils/arrays";
import { ChartSettingFieldPicker } from "./ChartSettingFieldPicker";
import { AddAnotherContainer } from "./ChartSettingFieldsPicker.styled";
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx
index ac9db764dd3..a2968630c02 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingOrderedSimple.tsx
@@ -4,9 +4,9 @@ import { useCallback } from "react";
import { t } from "ttag";
import type { DragEndEvent } from "metabase/common/components/Sortable";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { isEmpty } from "metabase/lib/validate";
import { Box } from "metabase/ui";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { isEmpty } from "metabase/utils/validate";
import type { Series } from "metabase-types/api";
import { ChartSettingMessage } from "./ChartSettingMessage";
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
index 94a1bb4c0d4..74783762789 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx
@@ -6,13 +6,13 @@ import _ from "underscore";
import { ColorSelector } from "metabase/common/components/ColorSelector";
import type { DragEndEvent } from "metabase/common/components/Sortable";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { getEventTarget } from "metabase/lib/dom";
-import { isEmpty } from "metabase/lib/validate";
import { Box, Button, Flex, Group, Icon, Select, Text } from "metabase/ui";
import { color } from "metabase/ui/colors";
import { getAccentColors } from "metabase/ui/colors/groups";
import type { AccentColorOptions } from "metabase/ui/colors/types";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { getEventTarget } from "metabase/utils/dom";
+import { isEmpty } from "metabase/utils/validate";
import type { Series } from "metabase-types/api";
import { ChartSettingMessage } from "./ChartSettingMessage";
diff --git a/frontend/src/metabase/visualizations/echarts/boxplot/model/dataset.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/boxplot/model/dataset.unit.spec.ts
index 67f764a0cc5..07971918067 100644
--- a/frontend/src/metabase/visualizations/echarts/boxplot/model/dataset.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/boxplot/model/dataset.unit.spec.ts
@@ -1,5 +1,5 @@
import { createMockSeriesModel } from "__support__/echarts";
-import { checkNumber } from "metabase/lib/types";
+import { checkNumber } from "metabase/utils/types";
import {
INDEX_KEY,
X_AXIS_DATA_KEY,
diff --git a/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts b/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts
index cc3c8b7cfef..3fbe457772b 100644
--- a/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts
@@ -1,6 +1,6 @@
import { memoize } from "metabase/common/hooks/use-memoized-callback";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { formatValue } from "metabase/lib/formatting";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { formatValue } from "metabase/utils/formatting";
import {
ECHARTS_CATEGORY_AXIS_NULL_VALUE,
X_AXIS_DATA_KEY,
diff --git a/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx
index c2d361c407c..3c28b197843 100644
--- a/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx
+++ b/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx
@@ -1,6 +1,6 @@
import type { TooltipOption } from "echarts/types/dist/shared";
-import { reactNodeToHtmlString } from "metabase/lib/react-to-html";
+import { reactNodeToHtmlString } from "metabase/utils/react-to-html";
import { EChartsTooltip } from "metabase/visualizations/components/ChartTooltip/EChartsTooltip";
import {
GOAL_LINE_SERIES_ID,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts
index 58cf31763ec..88baf60fa0d 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { X_AXIS_DATA_KEY } from "metabase/visualizations/echarts/cartesian/constants/dataset";
import {
CHART_STYLE,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
index 679b14d1a9c..a09be4c7541 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
@@ -2,15 +2,11 @@ import * as d3 from "d3";
import dayjs from "dayjs";
import _ from "underscore";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { formatValue } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
-import {
- getObjectEntries,
- getObjectKeys,
- getObjectValues,
-} from "metabase/lib/objects";
-import { isNotNull, isNumber } from "metabase/lib/types";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { formatValue } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
+import { getObjectEntries, getObjectKeys } from "metabase/utils/objects";
+import { isNotNull, isNumber } from "metabase/utils/types";
import {
ECHARTS_CATEGORY_AXIS_NULL_VALUE,
X_AXIS_DATA_KEY,
@@ -938,7 +934,7 @@ function getTimeSeriesXAxisInfo(
// 2. count - how many intervals per tick?
// 3. timezone - what timezone are values in? days vary in length by timezone
const unit = minTimeseriesUnit(
- getObjectValues(dimensionModel.columnByCardId)
+ Object.values(dimensionModel.columnByCardId)
.map((column) =>
isAbsoluteDateTimeUnit(column.unit) ? column.unit : null,
)
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
index 48277dcec6b..640eacf7e95 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
@@ -1,9 +1,9 @@
import { t } from "ttag";
-import { getObjectKeys } from "metabase/lib/objects";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import { checkNumber, isNotNull } from "metabase/lib/types";
-import { isEmpty } from "metabase/lib/validate";
+import { getObjectKeys } from "metabase/utils/objects";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
+import { checkNumber, isNotNull } from "metabase/utils/types";
+import { isEmpty } from "metabase/utils/validate";
import {
ECHARTS_CATEGORY_AXIS_NULL_VALUE,
INDEX_KEY,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts
index 6cf0e60cef5..44b9d58213e 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts
@@ -1,7 +1,7 @@
import dayjs from "dayjs";
import { createMockSeriesModel } from "__support__/echarts";
-import { checkNumber } from "metabase/lib/types";
+import { checkNumber } from "metabase/utils/types";
import {
ECHARTS_CATEGORY_AXIS_NULL_VALUE,
INDEX_KEY,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/index.ts
index f07226ad0c6..176989f7b3d 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/index.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { OTHER_DATA_KEY } from "metabase/visualizations/echarts/cartesian/constants/dataset";
import {
getXAxisModel,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/other-series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/other-series.ts
index 7315140ff3f..7fd9070000e 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/other-series.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/other-series.ts
@@ -1,7 +1,7 @@
import { t } from "ttag";
-import { checkNumber } from "metabase/lib/types";
-import { isEmpty } from "metabase/lib/validate";
+import { checkNumber } from "metabase/utils/types";
+import { isEmpty } from "metabase/utils/validate";
import { SERIES_SETTING_KEY } from "metabase/visualizations/shared/settings/series";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { AggregationType, DatasetColumn } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts
index 3b55d591b49..675864175e4 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts
@@ -1,8 +1,8 @@
import { memoize } from "metabase/common/hooks/use-memoized-callback";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { formatValue } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
-import { isEmpty } from "metabase/lib/validate";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { formatValue } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
+import { isEmpty } from "metabase/utils/validate";
import { getDatasetKey } from "metabase/visualizations/echarts/cartesian/model/dataset";
import type {
ChartDataset,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/stack.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/stack.ts
index f4894e1dd22..aae6102e1ae 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/stack.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/stack.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { getObjectKeys } from "metabase/lib/objects";
+import { getObjectKeys } from "metabase/utils/objects";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { SeriesModel, StackModel } from "./types";
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/transforms.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/transforms.ts
index c3789b55a03..17d7c42bdb9 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/transforms.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/transforms.ts
@@ -1,4 +1,4 @@
-import { isNumber } from "metabase/lib/types";
+import { isNumber } from "metabase/utils/types";
import type { NumericScale } from "metabase-types/api";
import type { NumericAxisScaleTransforms } from "./types";
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/trend-line.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/trend-line.ts
index 4af2e53a052..ab91d8cb1be 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/trend-line.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/trend-line.ts
@@ -1,6 +1,6 @@
import Color from "color";
-import { checkNumber, isNotNull } from "metabase/lib/types";
+import { checkNumber, isNotNull } from "metabase/utils/types";
import { X_AXIS_DATA_KEY } from "metabase/visualizations/echarts/cartesian/constants/dataset";
import { getTrendLineFunction } from "metabase/visualizations/lib/trends";
import type {
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/util.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/util.ts
index 217d9a2f23c..3437724383f 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/util.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/util.ts
@@ -1,4 +1,4 @@
-import type { OptionsType } from "metabase/lib/formatting/types";
+import type { OptionsType } from "metabase/utils/formatting/types";
import type {
ComputedVisualizationSettings,
RemappingHydratedDatasetColumn,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
index 697d2c19109..8bc6c986096 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
@@ -1,7 +1,7 @@
import type { XAXisOption, YAXisOption } from "echarts/types/dist/shared";
import type { AxisBaseOptionCommon } from "echarts/types/src/coord/axisCommonTypes";
-import { parseNumberValue } from "metabase/lib/number";
+import { parseNumberValue } from "metabase/utils/number";
import { CHART_STYLE } from "metabase/visualizations/echarts/cartesian/constants/style";
import type {
AxisFormatter,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts
index f839513f16d..051a0cdb1f6 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts
@@ -7,9 +7,8 @@ import type {
} from "echarts/types/src/util/types";
import _ from "underscore";
-import { getObjectValues } from "metabase/lib/objects";
-import { isNotNull } from "metabase/lib/types";
import { getTextColorForBackground } from "metabase/ui/colors/palette";
+import { isNotNull } from "metabase/utils/types";
import {
INDEX_KEY,
NEGATIVE_STACK_TOTAL_DATA_KEY,
@@ -848,7 +847,7 @@ export const getStackTotalsSeries = (
"stack",
);
- return getObjectValues(seriesByStackName).flatMap((seriesOptions) => {
+ return Object.values(seriesByStackName).flatMap((seriesOptions) => {
const stackDataKeys = seriesOptions // we set string dataKeys as series IDs
.map((s) => s.id)
.filter(isNotNull) as string[];
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx
index 223e0ab71a3..fb7fa9220ef 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx
@@ -1,6 +1,6 @@
import type { TooltipOption } from "echarts/types/dist/shared";
-import { reactNodeToHtmlString } from "metabase/lib/react-to-html";
+import { reactNodeToHtmlString } from "metabase/utils/react-to-html";
import { EChartsTooltip } from "metabase/visualizations/components/ChartTooltip/EChartsTooltip";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import { getTooltipModel } from "metabase/visualizations/visualizations/CartesianChart/events";
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/model/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/model/index.ts
index eddb0c8f5b3..ab1d504635e 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/model/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/model/index.ts
@@ -1,5 +1,4 @@
-import { getObjectValues } from "metabase/lib/objects";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { ShowWarning } from "metabase/visualizations/echarts/types";
import type {
ComputedVisualizationSettings,
@@ -46,7 +45,7 @@ const getBubbleSizeDomain = (
return null;
}
- const bubbleSizeMaxValues = getObjectValues(
+ const bubbleSizeMaxValues = Object.values(
getDatasetExtents(bubbleSizeDataKeys, dataset),
).map((extent) => extent[1]);
const bubbleSizeDomainMax = Math.max(...bubbleSizeMaxValues);
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts
index 86e52499e0b..2b24f3fb291 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts
@@ -2,8 +2,8 @@ import type { Dayjs } from "dayjs";
import dayjs from "dayjs";
import _ from "underscore";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
-import { isNotNull } from "metabase/lib/types";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
+import { isNotNull } from "metabase/utils/types";
import type { TimeSeriesInterval } from "metabase/visualizations/echarts/cartesian/model/types";
import {
multipleTimezoneWarning,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/model/dataset.ts b/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/model/dataset.ts
index 09fa24427b2..b6c73b7dc65 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/model/dataset.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/model/dataset.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import {
INDEX_KEY,
IS_WATERFALL_TOTAL_DATA_KEY,
diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.ts
index 067c307ed98..53becc17753 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.ts
+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/formatters.ts
@@ -1,5 +1,5 @@
import { memoize } from "metabase/common/hooks/use-memoized-callback";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { SankeyChartColumns, SankeyFormatters, SankeyNode } from "./types";
diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx
index 292271fa0f8..1dc88a845ae 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx
+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx
@@ -1,8 +1,8 @@
import type { TooltipOption } from "echarts/types/dist/shared";
import { t } from "ttag";
-import { reactNodeToHtmlString } from "metabase/lib/react-to-html";
import { formatPercent } from "metabase/static-viz/lib/numbers";
+import { reactNodeToHtmlString } from "metabase/utils/react-to-html";
import {
EChartsTooltip,
type EChartsTooltipRow,
diff --git a/frontend/src/metabase/visualizations/echarts/pie/format.ts b/frontend/src/metabase/visualizations/echarts/pie/format.ts
index b3df6c71cad..abf469aee42 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/format.ts
+++ b/frontend/src/metabase/visualizations/echarts/pie/format.ts
@@ -1,5 +1,5 @@
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { formatValue } from "metabase/lib/formatting";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { formatValue } from "metabase/utils/formatting";
import { computeMaxDecimalsForValues } from "metabase/visualizations/lib/utils";
import type {
ComputedVisualizationSettings,
diff --git a/frontend/src/metabase/visualizations/echarts/pie/model/index.ts b/frontend/src/metabase/visualizations/echarts/pie/model/index.ts
index 9cd0da746cb..aba272a05b3 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/model/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/pie/model/index.ts
@@ -1,8 +1,8 @@
import { pie } from "d3";
import _ from "underscore";
-import { findWithIndex } from "metabase/lib/arrays";
-import { checkNotNull } from "metabase/lib/types";
+import { findWithIndex } from "metabase/utils/arrays";
+import { checkNotNull } from "metabase/utils/types";
import type { ColumnDescriptor } from "metabase/visualizations/lib/graph/columns";
import { getNumberOr } from "metabase/visualizations/lib/settings/row-values";
import {
diff --git a/frontend/src/metabase/visualizations/echarts/pie/option.ts b/frontend/src/metabase/visualizations/echarts/pie/option.ts
index 41f611bb0a0..7d33c28913a 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/option.ts
+++ b/frontend/src/metabase/visualizations/echarts/pie/option.ts
@@ -1,8 +1,8 @@
import Color from "color";
import type { EChartsOption, SunburstSeriesOption } from "echarts";
-import { checkNotNull } from "metabase/lib/types";
import { getTextColorForBackground } from "metabase/ui/colors";
+import { checkNotNull } from "metabase/utils/types";
import { CHAR_ELLIPSES, truncateText } from "metabase/visualizations/lib/text";
import type {
ComputedVisualizationSettings,
diff --git a/frontend/src/metabase/visualizations/echarts/pie/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/pie/tooltip.tsx
index b6f4de77bf6..79cd5f4385c 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/tooltip.tsx
+++ b/frontend/src/metabase/visualizations/echarts/pie/tooltip.tsx
@@ -1,6 +1,6 @@
import type { TooltipOption } from "echarts/types/dist/shared";
-import { reactNodeToHtmlString } from "metabase/lib/react-to-html";
+import { reactNodeToHtmlString } from "metabase/utils/react-to-html";
import { EChartsTooltip } from "metabase/visualizations/components/ChartTooltip/EChartsTooltip";
import { getTooltipModel } from "metabase/visualizations/visualizations/PieChart/use-chart-events";
diff --git a/frontend/src/metabase/visualizations/echarts/pie/util/colors.ts b/frontend/src/metabase/visualizations/echarts/pie/util/colors.ts
index ba5b607c823..8ccc123ddd3 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/util/colors.ts
+++ b/frontend/src/metabase/visualizations/echarts/pie/util/colors.ts
@@ -1,7 +1,7 @@
import { match } from "ts-pattern";
-import { isEmpty } from "metabase/lib/validate";
import { aliases, colors } from "metabase/ui/colors";
+import { isEmpty } from "metabase/utils/validate";
const ACCENT_KEY_PREFIX = "accent";
diff --git a/frontend/src/metabase/visualizations/echarts/pie/util/index.ts b/frontend/src/metabase/visualizations/echarts/pie/util/index.ts
index ab2a525ff8b..7fe0b14e001 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/util/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/pie/util/index.ts
@@ -1,4 +1,4 @@
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { OPTION_NAME_SEPERATOR } from "../constants";
import type { SliceTree, SliceTreeNode } from "../model/types";
diff --git a/frontend/src/metabase/visualizations/echarts/tooltip/index.tsx b/frontend/src/metabase/visualizations/echarts/tooltip/index.tsx
index 715510942b9..f704fb0e0e2 100644
--- a/frontend/src/metabase/visualizations/echarts/tooltip/index.tsx
+++ b/frontend/src/metabase/visualizations/echarts/tooltip/index.tsx
@@ -7,8 +7,8 @@ import {
EMBEDDING_SDK_PORTAL_ROOT_ELEMENT_ID,
isEmbeddingSdk,
} from "metabase/embedding-sdk/config";
-import { getObjectValues } from "metabase/lib/objects";
-import { isNotNull } from "metabase/lib/types";
+import { getCspNonce } from "metabase/utils/csp";
+import { isNotNull } from "metabase/utils/types";
import TooltipStyles from "metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.module.css";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type { ClickObject } from "metabase-lib";
@@ -134,7 +134,7 @@ export const useInjectSeriesColorsClasses = (hexColors: string[]) => {
const style = useMemo(
() =>
cssString !== null ? (
- <style nonce={window.MetabaseNonce}>{cssString}</style>
+ <style nonce={getCspNonce()}>{cssString}</style>
) : null,
[cssString],
);
@@ -178,7 +178,7 @@ export const useCartesianChartSeriesColorsClasses = (
export const useSankeyChartColorsClasses = (chartModel: SankeyChartModel) => {
const hexColors = useMemo(() => {
- return getObjectValues(chartModel.nodeColors).filter(isNotNull);
+ return Object.values(chartModel.nodeColors).filter(isNotNull);
}, [chartModel]);
return useInjectSeriesColorsClasses(hexColors);
diff --git a/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.ts b/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.ts
index b72e7107136..17bcc35eb57 100644
--- a/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.ts
+++ b/frontend/src/metabase/visualizations/hooks/use-browser-rendering-context.ts
@@ -1,9 +1,12 @@
import { useMemo } from "react";
import { usePalette } from "metabase/common/hooks/use-palette";
-import { measureTextHeight, measureTextWidth } from "metabase/lib/measure-text";
import { useMantineTheme } from "metabase/ui";
import { color } from "metabase/ui/colors";
+import {
+ measureTextHeight,
+ measureTextWidth,
+} from "metabase/utils/measure-text";
import { getVisualizationTheme } from "metabase/visualizations/shared/utils/theme";
import type { RenderingContext } from "metabase/visualizations/types";
diff --git a/frontend/src/metabase/visualizations/lib/action.ts b/frontend/src/metabase/visualizations/lib/action.ts
index ddaffe19955..76606987389 100644
--- a/frontend/src/metabase/visualizations/lib/action.ts
+++ b/frontend/src/metabase/visualizations/lib/action.ts
@@ -2,7 +2,7 @@ import type { LocationDescriptorObject } from "history";
import { push } from "react-router-redux";
import _ from "underscore";
-import { open } from "metabase/lib/dom";
+import { open } from "metabase/utils/dom";
import type Question from "metabase-lib/v1/Question";
import type { Dispatch } from "metabase-types/store";
diff --git a/frontend/src/metabase/visualizations/lib/action.unit.spec.ts b/frontend/src/metabase/visualizations/lib/action.unit.spec.ts
index 34cc3176af8..ec86006e8d5 100644
--- a/frontend/src/metabase/visualizations/lib/action.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/action.unit.spec.ts
@@ -1,4 +1,4 @@
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type {
QuestionChangeClickAction,
UrlClickAction,
diff --git a/frontend/src/metabase/visualizations/lib/data_grid.js b/frontend/src/metabase/visualizations/lib/data_grid.js
index fcac8cc420f..5989d5e640e 100644
--- a/frontend/src/metabase/visualizations/lib/data_grid.js
+++ b/frontend/src/metabase/visualizations/lib/data_grid.js
@@ -1,7 +1,7 @@
import _ from "underscore";
import * as Pivot from "cljs/metabase.pivot.js";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import { makeCellBackgroundGetter } from "metabase/visualizations/lib/table_format";
import { migratePivotColumnSplitSetting } from "metabase-lib/v1/queries/utils/pivot";
diff --git a/frontend/src/metabase/visualizations/lib/dataset.ts b/frontend/src/metabase/visualizations/lib/dataset.ts
index 8d298a8e2d2..01011612656 100644
--- a/frontend/src/metabase/visualizations/lib/dataset.ts
+++ b/frontend/src/metabase/visualizations/lib/dataset.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { isMetric } from "metabase-lib/v1/types/utils/isa";
import type {
DatasetData,
diff --git a/frontend/src/metabase/visualizations/lib/graph/columns.ts b/frontend/src/metabase/visualizations/lib/graph/columns.ts
index 141ba849b73..6fd0ea388ab 100644
--- a/frontend/src/metabase/visualizations/lib/graph/columns.ts
+++ b/frontend/src/metabase/visualizations/lib/graph/columns.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { RemappingHydratedDatasetColumn } from "metabase/visualizations/types";
import type {
DatasetColumn,
diff --git a/frontend/src/metabase/visualizations/lib/image-exports.ts b/frontend/src/metabase/visualizations/lib/image-exports.ts
index 989ee1a5bb2..1a8d86a5869 100644
--- a/frontend/src/metabase/visualizations/lib/image-exports.ts
+++ b/frontend/src/metabase/visualizations/lib/image-exports.ts
@@ -9,9 +9,9 @@ import {
} from "metabase/dashboard/constants";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { isStorybookActive } from "metabase/env";
-import { utf8_to_b64 } from "metabase/lib/encoding";
-import { openImageBlobOnStorybook } from "metabase/lib/loki-utils";
import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
+import { utf8_to_b64 } from "metabase/utils/encoding";
+import { openImageBlobOnStorybook } from "metabase/utils/loki-utils";
import { getCardKey } from "./utils";
diff --git a/frontend/src/metabase/visualizations/lib/map.ts b/frontend/src/metabase/visualizations/lib/map.ts
index 27a30c4befe..b142b2b7285 100644
--- a/frontend/src/metabase/visualizations/lib/map.ts
+++ b/frontend/src/metabase/visualizations/lib/map.ts
@@ -1,6 +1,6 @@
-import { IS_EMBED_PREVIEW } from "metabase/lib/embed";
-import { isJWT } from "metabase/lib/jwt";
-import { isUuid } from "metabase/lib/uuid";
+import { IS_EMBED_PREVIEW } from "metabase/utils/embed";
+import { isJWT } from "metabase/utils/jwt";
+import { isUuid } from "metabase/utils/uuid";
import type { DashboardId, JsonQuery, Parameter } from "metabase-types/api";
import type { EntityToken } from "metabase-types/api/entity";
diff --git a/frontend/src/metabase/visualizations/lib/renderer_utils.ts b/frontend/src/metabase/visualizations/lib/renderer_utils.ts
index fab1e54ecd0..fac757362a8 100644
--- a/frontend/src/metabase/visualizations/lib/renderer_utils.ts
+++ b/frontend/src/metabase/visualizations/lib/renderer_utils.ts
@@ -2,8 +2,8 @@ import type { Dayjs } from "dayjs";
import { getIn } from "icepick";
import _ from "underscore";
-import { formatNullable } from "metabase/lib/formatting/nullable";
-import { parseTimestamp } from "metabase/lib/time-dayjs";
+import { formatNullable } from "metabase/utils/formatting/nullable";
+import { parseTimestamp } from "metabase/utils/time-dayjs";
import { datasetContainsNoResults } from "metabase-lib/v1/queries/utils/dataset";
import type {
DatasetData,
diff --git a/frontend/src/metabase/visualizations/lib/save-chart-image.ts b/frontend/src/metabase/visualizations/lib/save-chart-image.ts
index 2a8038de1fd..813e793e2ed 100644
--- a/frontend/src/metabase/visualizations/lib/save-chart-image.ts
+++ b/frontend/src/metabase/visualizations/lib/save-chart-image.ts
@@ -1,6 +1,6 @@
import { isStorybookActive } from "metabase/env";
-import { openImageBlobOnStorybook } from "metabase/lib/loki-utils";
import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
+import { openImageBlobOnStorybook } from "metabase/utils/loki-utils";
import {
createBrandingElement,
diff --git a/frontend/src/metabase/visualizations/lib/save-dashboard-pdf.ts b/frontend/src/metabase/visualizations/lib/save-dashboard-pdf.ts
index 6d3600e858e..e9c81c5a169 100644
--- a/frontend/src/metabase/visualizations/lib/save-dashboard-pdf.ts
+++ b/frontend/src/metabase/visualizations/lib/save-dashboard-pdf.ts
@@ -3,7 +3,8 @@ import { t } from "ttag";
import { DASHBOARD_HEADER_PARAMETERS_PDF_EXPORT_NODE_ID } from "metabase/dashboard/constants";
import { isStorybookActive } from "metabase/env";
-import { openImageBlobOnStorybook } from "metabase/lib/loki-utils";
+import { getCspNonce } from "metabase/utils/csp";
+import { openImageBlobOnStorybook } from "metabase/utils/loki-utils";
import type { Dashboard } from "metabase-types/api";
import {
@@ -236,7 +237,7 @@ export const saveDashboardPdf = async ({
scale: Math.min(window.devicePixelRatio || 1, 2),
// We have patched html2canvas so that we can use our Nonce token. Without the patch, it complains
// that the token is not long enough
- cspNonce: window.MetabaseNonce,
+ cspNonce: getCspNonce(),
onclone: (_doc: Document, node: HTMLElement) => {
node.classList.add(SAVING_DOM_IMAGE_CLASS);
node.style.height = `${contentHeight}px`;
diff --git a/frontend/src/metabase/visualizations/lib/scalar_utils.tsx b/frontend/src/metabase/visualizations/lib/scalar_utils.tsx
index d18de975209..3a7f701d84c 100644
--- a/frontend/src/metabase/visualizations/lib/scalar_utils.tsx
+++ b/frontend/src/metabase/visualizations/lib/scalar_utils.tsx
@@ -1,8 +1,8 @@
import { ColorPill } from "metabase/common/components/ColorPill";
-import { formatValue } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
import { Text } from "metabase/ui";
import { color } from "metabase/ui/utils/colors";
+import { formatValue } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
import type { RowValue, ScalarSegment } from "metabase-types/api";
export const COMPACT_MAX_WIDTH = 250;
diff --git a/frontend/src/metabase/visualizations/lib/settings/analytics.ts b/frontend/src/metabase/visualizations/lib/settings/analytics.ts
index 1bc56d36d06..d47f7acf1d7 100644
--- a/frontend/src/metabase/visualizations/lib/settings/analytics.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSchemaEvent } from "metabase/lib/analytics";
+import { trackSchemaEvent } from "metabase/utils/analytics";
import type { DashboardId } from "metabase-types/api";
export const trackCardSetToHideWhenNoResults = (dashboardId: DashboardId) => {
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.ts b/frontend/src/metabase/visualizations/lib/settings/column.ts
index ea1e8f09a8a..b662bf2e4d4 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/column.ts
@@ -13,9 +13,9 @@ import {
getDateStyleOptionsForUnit,
getTimeStyleOptions,
numberFormatterForOptions,
-} from "metabase/lib/formatting";
-import { hasHour } from "metabase/lib/formatting/datetime-utils";
-import MetabaseSettings from "metabase/lib/settings";
+} from "metabase/utils/formatting";
+import { hasHour } from "metabase/utils/formatting/datetime-utils";
+import MetabaseSettings from "metabase/utils/settings";
import { getVisualizationRaw } from "metabase/visualizations";
import { ChartNestedSettingColumns } from "metabase/visualizations/components/settings/ChartNestedSettingColumns";
import { ChartSettingTableColumns } from "metabase/visualizations/components/settings/ChartSettingTableColumns";
@@ -156,7 +156,9 @@ export const DATE_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {
},
isValid: ({ unit }, settings) => {
const options = getDateStyleOptionsForUnit(unit ?? "default");
- return !!_.findWhere(options, { value: settings.date_style });
+ return !!_.findWhere(options, {
+ value: settings.date_style ?? undefined,
+ });
},
getProps: ({ unit }, settings) => ({
options: getDateStyleOptionsForUnit(
@@ -202,7 +204,7 @@ export const DATE_COLUMN_SETTINGS: VisualizationSettingsDefinitions = {
inline: true,
getHidden: ({ unit }, settings) => {
const format = getDateFormatFromStyle(
- settings.date_style,
+ settings.date_style ?? undefined,
unit ?? "default",
);
return !format || !format.match(/MMMM|dddd/);
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts
index d78990c99ef..9a5811dd668 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/column.unit.spec.ts
@@ -1,4 +1,4 @@
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { getComputedSettings } from "metabase/visualizations/lib/settings";
import registerVisualizations from "metabase/visualizations/register";
import type { DatasetColumn, Series } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.unit.spec.ts b/frontend/src/metabase/visualizations/lib/settings/graph.unit.spec.ts
index 9741994ce4b..4ff7dd45c05 100644
--- a/frontend/src/metabase/visualizations/lib/settings/graph.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/graph.unit.spec.ts
@@ -1,4 +1,4 @@
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { VisualizationDisplay } from "metabase-types/api";
import {
createMockCard,
diff --git a/frontend/src/metabase/visualizations/lib/settings/nested.ts b/frontend/src/metabase/visualizations/lib/settings/nested.ts
index 05830bdeb13..6c103219438 100644
--- a/frontend/src/metabase/visualizations/lib/settings/nested.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/nested.ts
@@ -2,7 +2,7 @@ import type { ComponentType } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import type { ChartNestedSettingSeriesProps } from "metabase/visualizations/components/settings/ChartNestedSettingSeries";
import { chartSettingNestedSettings } from "metabase/visualizations/components/settings/ChartSettingNestedSettings";
import type {
diff --git a/frontend/src/metabase/visualizations/lib/settings/validation.ts b/frontend/src/metabase/visualizations/lib/settings/validation.ts
index a8586bdc97f..645f79fe864 100644
--- a/frontend/src/metabase/visualizations/lib/settings/validation.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/validation.ts
@@ -1,7 +1,7 @@
import { t } from "ttag";
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import {
ChartSettingsError,
MinRowsError,
diff --git a/frontend/src/metabase/visualizations/lib/settings/visualization.ts b/frontend/src/metabase/visualizations/lib/settings/visualization.ts
index b453472c123..2a4001ead4e 100644
--- a/frontend/src/metabase/visualizations/lib/settings/visualization.ts
+++ b/frontend/src/metabase/visualizations/lib/settings/visualization.ts
@@ -1,7 +1,7 @@
import { assocIn } from "icepick";
import { t } from "ttag";
-import { isVirtualDashCard } from "metabase/lib/dashboard";
+import { isVirtualDashCard } from "metabase/utils/dashboard";
import { getVisualizationRaw } from "metabase/visualizations";
import { trackCardSetToHideWhenNoResults } from "metabase/visualizations/lib/settings/analytics";
import type {
diff --git a/frontend/src/metabase/visualizations/lib/table_format.ts b/frontend/src/metabase/visualizations/lib/table_format.ts
index 8145decb968..aa0a512cd39 100644
--- a/frontend/src/metabase/visualizations/lib/table_format.ts
+++ b/frontend/src/metabase/visualizations/lib/table_format.ts
@@ -3,9 +3,9 @@
import Color from "color";
-import { isNumber } from "metabase/lib/types";
import { alpha } from "metabase/ui/colors";
import { getSafeColor } from "metabase/ui/colors/safe-color";
+import { isNumber } from "metabase/utils/types";
import type {
ColumnFormattingOperator,
ColumnFormattingSetting,
diff --git a/frontend/src/metabase/visualizations/lib/text.unit.spec.ts b/frontend/src/metabase/visualizations/lib/text.unit.spec.ts
index 5597cbf34ba..a108b41e5c4 100644
--- a/frontend/src/metabase/visualizations/lib/text.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/text.unit.spec.ts
@@ -1,5 +1,5 @@
-import { measureTextWidth as measureDynamic } from "metabase/lib/measure-text";
import { measureTextWidth as measureStatic } from "metabase/static-viz/lib/text";
+import { measureTextWidth as measureDynamic } from "metabase/utils/measure-text";
import type { TextWidthMeasurer } from "../shared/types/measure-text";
diff --git a/frontend/src/metabase/visualizations/lib/tooltip.ts b/frontend/src/metabase/visualizations/lib/tooltip.ts
index 7ed8abb9cae..cbb686aa444 100644
--- a/frontend/src/metabase/visualizations/lib/tooltip.ts
+++ b/frontend/src/metabase/visualizations/lib/tooltip.ts
@@ -1,5 +1,5 @@
-import { formatValue } from "metabase/lib/formatting";
-import { formatNullable } from "metabase/lib/formatting/nullable";
+import { formatValue } from "metabase/utils/formatting";
+import { formatNullable } from "metabase/utils/formatting/nullable";
import type { DatasetColumn, VisualizationSettings } from "metabase-types/api";
import { getFormattingOptionsWithoutScaling } from "../echarts/cartesian/model/util";
diff --git a/frontend/src/metabase/visualizations/lib/trend-helpers.ts b/frontend/src/metabase/visualizations/lib/trend-helpers.ts
index 73ddefb5e67..4af7f01ac67 100644
--- a/frontend/src/metabase/visualizations/lib/trend-helpers.ts
+++ b/frontend/src/metabase/visualizations/lib/trend-helpers.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { isEmpty } from "metabase/lib/validate";
+import { isEmpty } from "metabase/utils/validate";
import { computeChange } from "metabase/visualizations/lib/numeric";
import { formatPreviousPeriodOptionName } from "metabase/visualizations/visualizations/SmartScalar/utils";
import type { RowValues } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizations/lib/utils.ts b/frontend/src/metabase/visualizations/lib/utils.ts
index 4fd4921d26d..d24f3ee9366 100644
--- a/frontend/src/metabase/visualizations/lib/utils.ts
+++ b/frontend/src/metabase/visualizations/lib/utils.ts
@@ -2,7 +2,7 @@ import crossfilter from "crossfilter";
import * as d3 from "d3";
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import {
isCoordinate,
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsx b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsx
index ef5869c92f2..7cf375018d9 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsx
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.stories.tsx
@@ -1,10 +1,10 @@
import type { StoryFn } from "@storybook/react";
import { SdkVisualizationWrapper } from "__support__/storybook";
-import { measureTextWidth } from "metabase/lib/measure-text";
import { getStaticChartTheme } from "metabase/static-viz/components/RowChart/theme";
import { Box } from "metabase/ui";
import { color } from "metabase/ui/colors";
+import { measureTextWidth } from "metabase/utils/measure-text";
import { useRowChartTheme } from "metabase/visualizations/visualizations/RowChart/utils/theme";
import { RowChart, type RowChartProps } from "./RowChart";
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.unit.spec.tsx b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.unit.spec.tsx
index 091b2e15662..4b5841a8f7d 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/RowChart.unit.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
import type { NumberValue } from "d3-scale";
import { render, screen } from "__support__/ui";
-import { measureTextWidth } from "metabase/lib/measure-text";
+import { measureTextWidth } from "metabase/utils/measure-text";
import type { ChartFont } from "../../types/style";
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.ts b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.ts
index 9e41f100084..fa7377f1568 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.ts
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/data.ts
@@ -3,7 +3,7 @@ import * as d3 from "d3";
import { stack, stackOffsetDiverging, stackOffsetExpand } from "d3";
import _ from "underscore";
-import { formatNullable } from "metabase/lib/formatting/nullable";
+import { formatNullable } from "metabase/utils/formatting/nullable";
import type { SeriesInfo } from "metabase/visualizations/shared/types/data";
import type { ContinuousScaleType } from "metabase/visualizations/shared/types/scale";
diff --git a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/domain.ts b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/domain.ts
index 5d740e3bd70..0b24b70e15e 100644
--- a/frontend/src/metabase/visualizations/shared/components/RowChart/utils/domain.ts
+++ b/frontend/src/metabase/visualizations/shared/components/RowChart/utils/domain.ts
@@ -1,6 +1,6 @@
import { extent } from "d3";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type {
ContinuousDomain,
ContinuousScaleType,
diff --git a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts
index 138a8ce8d9d..5032d50871d 100644
--- a/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/cartesian-chart.ts
@@ -1,7 +1,7 @@
import { t } from "ttag";
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import {
getMaxDimensionsSupported,
getMaxMetricsSupported,
diff --git a/frontend/src/metabase/visualizations/shared/settings/pie.ts b/frontend/src/metabase/visualizations/shared/settings/pie.ts
index 3b3e6f7d43e..861cdfe21d3 100644
--- a/frontend/src/metabase/visualizations/shared/settings/pie.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/pie.ts
@@ -1,8 +1,8 @@
import _ from "underscore";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { checkNotNull, checkNumber, isNumber } from "metabase/lib/types";
import { getColorsForValues } from "metabase/ui/colors/charts";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { checkNotNull, checkNumber, isNumber } from "metabase/utils/types";
import { SLICE_THRESHOLD } from "metabase/visualizations/echarts/pie/constants";
import { getPieColumns } from "metabase/visualizations/echarts/pie/model";
import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
diff --git a/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts b/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts
index ea35af433ba..6d46769d535 100644
--- a/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/pie.unit.spec.ts
@@ -1,4 +1,4 @@
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
import type { PieRow } from "metabase/visualizations/echarts/pie/model/types";
import type { RawSeries } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/visualizations/shared/utils/data.ts b/frontend/src/metabase/visualizations/shared/utils/data.ts
index 78034b7177f..1d251d3ad30 100644
--- a/frontend/src/metabase/visualizations/shared/utils/data.ts
+++ b/frontend/src/metabase/visualizations/shared/utils/data.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { formatNullable } from "metabase/lib/formatting/nullable";
+import { formatNullable } from "metabase/utils/formatting/nullable";
import { getColumnScaling } from "metabase/visualizations/echarts/cartesian/model/util";
import { sumMetric } from "metabase/visualizations/lib/dataset";
import type {
diff --git a/frontend/src/metabase/visualizations/shared/utils/parameter-substitution.ts b/frontend/src/metabase/visualizations/shared/utils/parameter-substitution.ts
index 6cc087d256b..3d2f5e48140 100644
--- a/frontend/src/metabase/visualizations/shared/utils/parameter-substitution.ts
+++ b/frontend/src/metabase/visualizations/shared/utils/parameter-substitution.ts
@@ -1,7 +1,7 @@
import _ from "underscore";
import { substitute_tags } from "cljs/metabase.parameters.shared";
-import { siteLocale, withInstanceLanguage } from "metabase/lib/i18n";
+import { siteLocale, withInstanceLanguage } from "metabase/utils/i18n";
import { isTextTagTarget } from "metabase-lib/v1/parameters/utils/targets";
import type {
Dashboard,
diff --git a/frontend/src/metabase/visualizations/shared/utils/sizes.ts b/frontend/src/metabase/visualizations/shared/utils/sizes.ts
index 091ca708126..4d2ffa81dbf 100644
--- a/frontend/src/metabase/visualizations/shared/utils/sizes.ts
+++ b/frontend/src/metabase/visualizations/shared/utils/sizes.ts
@@ -1,7 +1,7 @@
import _ from "underscore";
import { CARD_SIZE_DEFAULTS_JSON } from "cljs/metabase.dashboards.constants";
-import { DEFAULT_CARD_SIZE } from "metabase/lib/dashboard_grid";
+import { DEFAULT_CARD_SIZE } from "metabase/utils/dashboard_grid";
import type { VisualizationDisplay } from "metabase-types/api";
type VisualizationSize = { width: number; height: number };
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 0c1004bcaf1..abee6857ad4 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -1,8 +1,8 @@
import type { CSSProperties, ComponentType, ReactNode } from "react";
-import type { OptionsType } from "metabase/lib/formatting/types";
import type { IconName, IconProps } from "metabase/ui";
import type { ColorGetter } from "metabase/ui/colors/types";
+import type { OptionsType } from "metabase/utils/formatting/types";
import type {
TextHeightMeasurer,
TextWidthMeasurer,
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
index 67c4bcb27bb..9669648002c 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
@@ -2,7 +2,7 @@ import type { EChartsType } from "echarts/core";
import { type MouseEvent, useCallback, useMemo, useRef, useState } from "react";
import { useSet } from "react-use";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
import { extractRemappings } from "metabase/visualizations";
import { ChartRenderingErrorBoundary } from "metabase/visualizations/components/ChartRenderingErrorBoundary";
import { ResponsiveEChartsRenderer } from "metabase/visualizations/components/EChartsRenderer";
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
index b9e3b3ab24a..bc1be34bc07 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
@@ -3,7 +3,7 @@ import { type MouseEvent, useCallback, useMemo, useRef, useState } from "react";
import React from "react";
import { useSet } from "react-use";
-import { isWebkit } from "metabase/lib/browser";
+import { isWebkit } from "metabase/utils/browser";
import { ChartRenderingErrorBoundary } from "metabase/visualizations/components/ChartRenderingErrorBoundary";
import { DataPointsVisiblePopover } from "metabase/visualizations/components/DataPointsVisiblePopover/DataPointsVisiblePopover";
import { ResponsiveEChartsRenderer } from "metabase/visualizations/components/EChartsRenderer";
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
index e5fffc78b8f..f147ea193d6 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
@@ -1,15 +1,15 @@
import { t } from "ttag";
import _ from "underscore";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { formatChangeWithSign } from "metabase/lib/formatting";
-import { getObjectKeys } from "metabase/lib/objects";
+import { formatPercent } from "metabase/static-viz/lib/numbers";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { formatChangeWithSign } from "metabase/utils/formatting";
+import { getObjectKeys } from "metabase/utils/objects";
import {
getDaylightSavingsChangeTolerance,
parseTimestamp,
-} from "metabase/lib/time-dayjs";
-import { checkNumber, isNotNull } from "metabase/lib/types";
-import { formatPercent } from "metabase/static-viz/lib/numbers";
+} from "metabase/utils/time-dayjs";
+import { checkNumber, isNotNull } from "metabase/utils/types";
import type {
EChartsTooltipModel,
EChartsTooltipRow,
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.ts
index 1a5e5b1b93b..37d17c8393a 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.ts
@@ -8,7 +8,7 @@ import {
useState,
} from "react";
-import { isTouchDevice } from "metabase/lib/browser";
+import { isTouchDevice } from "metabase/utils/browser";
const LONG_PRESS_DURATION_MS = 500;
const TOUCH_MOVE_THRESHOLD_PX = 10;
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.unit.spec.ts
index f4472a5409e..a1c430324e4 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-brush.unit.spec.ts
@@ -2,7 +2,7 @@ import { act, renderHook } from "@testing-library/react";
import type { EChartsType } from "echarts/core";
import type { MutableRefObject, RefObject } from "react";
-import { isTouchDevice } from "metabase/lib/browser";
+import { isTouchDevice } from "metabase/utils/browser";
import {
createZrenderMousedownEvent,
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts
index b57a9c63aa9..8c3a41cf5ff 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from "react";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { isReducedMotionPreferred } from "metabase/lib/dom";
+import { isReducedMotionPreferred } from "metabase/utils/dom";
import { extractRemappings } from "metabase/visualizations";
import { getChartLayout } from "metabase/visualizations/echarts/cartesian/layout";
import { getCartesianChartModel } from "metabase/visualizations/echarts/cartesian/model";
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts
index db2b8c4c015..e85fa707df5 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/utils.ts
@@ -1,6 +1,6 @@
import type { EChartsCoreOption } from "echarts/core";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type {
DataKey,
SeriesModel,
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
index bae277af28b..d013825c043 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
@@ -4,7 +4,7 @@ import { t } from "ttag";
import _ from "underscore";
import CS from "metabase/css/core/index.css";
-import { formatNullable } from "metabase/lib/formatting/nullable";
+import { formatNullable } from "metabase/utils/formatting/nullable";
import ChartCaption from "metabase/visualizations/components/ChartCaption";
import { TransformedVisualization } from "metabase/visualizations/components/TransformedVisualization";
import { ChartSettingOrderedSimple } from "metabase/visualizations/components/settings/ChartSettingOrderedSimple";
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.ts b/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.ts
index 21d812bfbf5..1a73f966fd5 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.ts
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/funnel-bar-transform.ts
@@ -1,5 +1,5 @@
-import { formatValue } from "metabase/lib/formatting";
-import { isNotNull } from "metabase/lib/types";
+import { formatValue } from "metabase/utils/formatting";
+import { isNotNull } from "metabase/utils/types";
import type { TransformSeries } from "metabase/visualizations/components/TransformedVisualization";
import type { RowValue } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx
index f0f14026617..8b067425d1a 100644
--- a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.tsx
@@ -4,7 +4,7 @@ import * as d3 from "d3";
import { useCallback, useEffect, useRef } from "react";
import CS from "metabase/css/core/index.css";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import { segmentIsValid } from "metabase/visualizations/lib/utils";
import type { VisualizationProps } from "metabase/visualizations/types";
diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsx b/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsx
index 50f1b28811c..025ccfdbe3b 100644
--- a/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/GaugeArc.tsx
@@ -1,7 +1,7 @@
import * as d3 from "d3";
import type { MouseEvent } from "react";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import type {
ClickObject,
ComputedVisualizationSettings,
diff --git a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx
index 3df03804ab2..19285fc2363 100644
--- a/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Map/CustomMapFooter/CustomMapFooter.tsx
@@ -2,11 +2,11 @@ import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { Link } from "metabase/common/components/Link";
-import { useSelector } from "metabase/lib/redux";
import { getDocsUrl } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
import { Icon } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { CustomMapContent } from "../Maps.styled";
diff --git a/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx
index 89f54b85ec0..5cb38a89d35 100644
--- a/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Map/GridMapPdfExport.stories.tsx
@@ -9,14 +9,14 @@ 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 { MetabaseReduxProvider } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
import { PublicOrEmbeddedDashboardView } from "metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView";
import {
MockDashboardContext,
type MockDashboardContextProps,
} from "metabase/public/containers/PublicOrEmbeddedDashboard/mock-context";
import { publicReducers } from "metabase/reducers-public";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import { registerVisualization } from "metabase/visualizations";
import type { Dashboard } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
index fe2def1276a..60f04c8d400 100644
--- a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import _ from "underscore";
import { ColorRangeSelector } from "metabase/common/components/ColorRangeSelector";
-import MetabaseSettings from "metabase/lib/settings";
import { getAccentColors, getPreferredColor } from "metabase/ui/colors/groups";
+import MetabaseSettings from "metabase/utils/settings";
import { ChartSettingsError } from "metabase/visualizations/lib/errors";
import { columnSettings } from "metabase/visualizations/lib/settings/column";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsx b/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsx
index b5724c630c6..89f92b66909 100644
--- a/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/ObjectDetail.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { displayNameForColumn } from "metabase/lib/formatting";
+import { displayNameForColumn } from "metabase/utils/formatting";
import { ObjectDetail } from "metabase/visualizations/components/ObjectDetail";
import {
columnSettings,
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx b/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx
index 8a0ca11045c..e8a0cf4ff50 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/PieChart.tsx
@@ -2,7 +2,7 @@ import type { EChartsType } from "echarts/core";
import { type MouseEvent, useCallback, useMemo, useRef, useState } from "react";
import { useSet } from "react-use";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { extractRemappings } from "metabase/visualizations";
import { ChartWithLegend } from "metabase/visualizations/components/ChartWithLegend";
import { ResponsiveEChartsRenderer } from "metabase/visualizations/components/EChartsRenderer";
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts b/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts
index f7a37be1ad1..ffd556fcfc9 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/chart-definition.ts
@@ -1,7 +1,7 @@
import { t } from "ttag";
import _ from "underscore";
-import { formatValue } from "metabase/lib/formatting";
+import { formatValue } from "metabase/utils/formatting";
import {
ChartSettingsError,
MinRowsError,
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.ts b/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.ts
index 5f22ecf8dab..21f95b19b0d 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart/use-chart-events.ts
@@ -2,8 +2,8 @@ import type { EChartsType } from "echarts/core";
import { type MutableRefObject, useEffect, useMemo } from "react";
import { t } from "ttag";
-import { checkNotNull } from "metabase/lib/types";
import { formatPercent } from "metabase/static-viz/lib/numbers";
+import { checkNotNull } from "metabase/utils/types";
import type {
EChartsTooltipModel,
EChartsTooltipRow,
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx
index b558cc2ca5b..58e1716cef6 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.tsx
@@ -19,11 +19,12 @@ import _ from "underscore";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import CS from "metabase/css/core/index.css";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { sumArray } from "metabase/lib/arrays";
-import { getScrollBarSize } from "metabase/lib/dom";
-import { connect } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
import { useMantineTheme } from "metabase/ui";
+import { sumArray } from "metabase/utils/arrays";
+import { getCspNonce } from "metabase/utils/csp";
+import { getScrollBarSize } from "metabase/utils/dom";
+import { connect } from "metabase/utils/redux";
import {
COLUMN_SHOW_TOTALS,
isPivotGroupColumn,
@@ -505,7 +506,7 @@ const PivotTableInner = forwardRef<HTMLDivElement, VisualizationProps>(
<div className={cx(CS.flex, CS.flexFull)}>
{/* left header */}
<div style={{ width: leftHeaderWidth }}>
- <AutoSizer disableWidth nonce={window.MetabaseNonce}>
+ <AutoSizer disableWidth nonce={getCspNonce()}>
{() => (
<Collection
ref={leftHeaderRef}
@@ -543,7 +544,7 @@ const PivotTableInner = forwardRef<HTMLDivElement, VisualizationProps>(
</div>
{/* pivot table body */}
<div>
- <AutoSizer disableWidth nonce={window.MetabaseNonce}>
+ <AutoSizer disableWidth nonce={getCspNonce()}>
{() => (
<Grid
aria-label={PIVOT_TABLE_BODY_LABEL}
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx
index 8903922d710..1355d65654d 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.unit.spec.tsx
@@ -6,7 +6,7 @@ import { useState } from "react";
import { createMockMetadata } from "__support__/metadata";
import { renderWithProviders } from "__support__/ui";
-import * as domUtils from "metabase/lib/dom";
+import * as domUtils from "metabase/utils/dom";
import { QuestionChartSettings } from "metabase/visualizations/components/ChartSettings";
import registerVisualizations from "metabase/visualizations/register";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
index 404a67c512c..96a1d76611c 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/settings.ts
@@ -2,7 +2,7 @@ import { getIn } from "icepick";
import { t } from "ttag";
import _ from "underscore";
-import { displayNameForColumn } from "metabase/lib/formatting";
+import { displayNameForColumn } from "metabase/utils/formatting";
import { ChartSettingIconRadio } from "metabase/visualizations/components/settings/ChartSettingIconRadio";
import { ChartSettingsTableFormatting } from "metabase/visualizations/components/settings/ChartSettingsTableFormatting";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts b/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
index 89f2d7ed034..980ef2a80ed 100644
--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/utils.ts
@@ -2,8 +2,8 @@ import { t } from "ttag";
import _ from "underscore";
import { DEFAULT_METABASE_COMPONENT_THEME } from "metabase/embedding-sdk/theme";
-import { sumArray } from "metabase/lib/arrays";
-import { measureText } from "metabase/lib/measure-text";
+import { sumArray } from "metabase/utils/arrays";
+import { measureText } from "metabase/utils/measure-text";
import { isPivotGroupColumn } from "metabase/visualizations/lib/data_grid";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import { migratePivotColumnSplitSetting } from "metabase-lib/v1/queries/utils/pivot";
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
index a306c52f8f6..7d53cd5b8bc 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Progress/Progress.tsx
@@ -3,9 +3,9 @@ import { type MouseEvent, useCallback, useEffect, useRef } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
-import { formatValue } from "metabase/lib/formatting";
-import { checkNotNull } from "metabase/lib/types";
import { Flex, Icon } from "metabase/ui";
+import { formatValue } from "metabase/utils/formatting";
+import { checkNotNull } from "metabase/utils/types";
import type { VisualizationProps } from "metabase/visualizations/types";
import { PROGRESS_CHART_DEFINITION } from "./chart-definition";
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
index 87540a8b0a0..6eaffe2d54a 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { ExplicitSize } from "metabase/common/components/ExplicitSize";
import CS from "metabase/css/core/index.css";
-import { measureTextWidth } from "metabase/lib/measure-text";
+import { measureTextWidth } from "metabase/utils/measure-text";
import { extractRemappedColumns } from "metabase/visualizations";
import {
getCartesianChartColumns,
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts
index 023d1ba4b88..b4beb52963c 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts
@@ -1,8 +1,8 @@
import { getIn } from "icepick";
import _ from "underscore";
-import { formatNullable } from "metabase/lib/formatting/nullable";
-import { isNotNull } from "metabase/lib/types";
+import { formatNullable } from "metabase/utils/formatting/nullable";
+import { isNotNull } from "metabase/utils/types";
import { sumMetric } from "metabase/visualizations/lib/dataset";
import type {
CartesianChartColumns,
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts
index 167a372a276..98eee834332 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/format.ts
@@ -1,8 +1,8 @@
import type { NumberLike, StringLike } from "@visx/scale";
-import { NULL_DISPLAY_VALUE } from "metabase/lib/constants";
-import { formatValue } from "metabase/lib/formatting";
-import { isEmpty } from "metabase/lib/validate";
+import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";
+import { formatValue } from "metabase/utils/formatting";
+import { isEmpty } from "metabase/utils/validate";
import { getFormattingOptionsWithoutScaling } from "metabase/visualizations/echarts/cartesian/model/util";
import type { CartesianChartColumns } from "metabase/visualizations/lib/graph/columns";
import { getStackOffset } from "metabase/visualizations/lib/settings/stacking";
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.unit.spec.ts
index cecf2562ccd..57be891d66a 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/chart-definition.unit.spec.ts
@@ -1,4 +1,4 @@
-import { checkNotNull } from "metabase/lib/types";
+import { checkNotNull } from "metabase/utils/types";
import { ChartSettingsError } from "metabase/visualizations/lib/errors";
import { createMockCard } from "metabase-types/api/mocks/card";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx
index 93026919215..5ac2576383f 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx
@@ -1,8 +1,8 @@
import { jt } from "ttag";
-import { isEmpty } from "metabase/lib/validate";
import { Text } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
+import { isEmpty } from "metabase/utils/validate";
import type { ComparisonResult } from "../compute";
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx
index be64073ba28..53246b49f94 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx
@@ -1,9 +1,9 @@
import innerText from "react-innertext";
import DashboardS from "metabase/css/dashboard.module.css";
-import { formatValue } from "metabase/lib/formatting/value";
-import { measureTextWidth } from "metabase/lib/measure-text";
import { Badge, Flex, Group, Icon, Stack, Tooltip } from "metabase/ui";
+import { formatValue } from "metabase/utils/formatting/value";
+import { measureTextWidth } from "metabase/utils/measure-text";
import type { ColumnSettings } from "metabase/visualizations/types";
import { CHANGE_TYPE_OPTIONS, type ComparisonResult } from "../compute";
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsx
index abeea7cca0e..5ed701fcf43 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparisonTooltip.tsx
@@ -1,5 +1,5 @@
-import { formatValue } from "metabase/lib/formatting/value";
import { Flex } from "metabase/ui";
+import { formatValue } from "metabase/utils/formatting/value";
import type { ColumnSettings } from "metabase/visualizations/types";
import { CHANGE_TYPE_OPTIONS, type ComparisonResult } from "../compute";
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
index 0b8e721ec47..abf8b4da70b 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
@@ -1,12 +1,12 @@
import dayjs from "dayjs";
import { t } from "ttag";
-import { formatValue } from "metabase/lib/formatting";
-import { formatDateTimeRangeWithUnit } from "metabase/lib/formatting/date";
-import type { OptionsType } from "metabase/lib/formatting/types";
-import { isNumber } from "metabase/lib/types";
-import { isEmpty } from "metabase/lib/validate";
import type { ColorGetter } from "metabase/ui/colors/types";
+import { formatValue } from "metabase/utils/formatting";
+import { formatDateTimeRangeWithUnit } from "metabase/utils/formatting/date";
+import type { OptionsType } from "metabase/utils/formatting/types";
+import { isNumber } from "metabase/utils/types";
+import { isEmpty } from "metabase/utils/validate";
import { computeChange } from "metabase/visualizations/lib/numeric";
import { findPreviousNonEmptyRowIndex } from "metabase/visualizations/lib/trend-helpers";
import type { ColumnSettings } from "metabase/visualizations/types";
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts
index a63e639fadc..b20afc6acdd 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.unit.spec.ts
@@ -1,6 +1,6 @@
-import { formatValue } from "metabase/lib/formatting/value";
-import { isNumber } from "metabase/lib/types";
import { color, colors } from "metabase/ui/colors";
+import { formatValue } from "metabase/utils/formatting/value";
+import { isNumber } from "metabase/utils/types";
import { computeChange } from "metabase/visualizations/lib/numeric";
import {
CHANGE_ARROW_ICONS,
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts
index 3b9bdf9a06f..cb4bf7de458 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.ts
@@ -2,10 +2,10 @@ import dayjs from "dayjs";
import { t } from "ttag";
import _ from "underscore";
-import { formatNumber } from "metabase/lib/formatting/numbers";
-import { measureText } from "metabase/lib/measure-text";
-import { uuid } from "metabase/lib/uuid";
-import { isEmpty } from "metabase/lib/validate";
+import { formatNumber } from "metabase/utils/formatting/numbers";
+import { measureText } from "metabase/utils/measure-text";
+import { uuid } from "metabase/utils/uuid";
+import { isEmpty } from "metabase/utils/validate";
import { isDate, isNumeric } from "metabase-lib/v1/types/utils/isa";
import type {
DateTimeAbsoluteUnit,
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts
index 3b41f7b4511..c180eb2ed86 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/utils.unit.spec.ts
@@ -1,5 +1,5 @@
import { DateTimeColumn, NumberColumn } from "__support__/visualizations";
-import * as measureText from "metabase/lib/measure-text";
+import * as measureText from "metabase/utils/measure-text";
import type { FontStyle } from "metabase/visualizations/shared/types/measure-text";
import type {
DatasetColumn,
@@ -28,7 +28,7 @@ import {
isComparisonValid,
} from "./utils";
-jest.doMock("metabase/lib/measure-text", () => ({
+jest.doMock("metabase/utils/measure-text", () => ({
measureText: jest.fn(),
}));
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
index a5d055dbfa3..a4226b049ed 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
@@ -12,10 +12,10 @@ import {
} from "__support__/storybook";
import { Api } from "metabase/api";
import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { commonReducers } from "metabase/reducers-common";
import { Box } from "metabase/ui";
import type { ColorName } from "metabase/ui/colors/types";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import { registerVisualization } from "metabase/visualizations";
import Visualization from "metabase/visualizations/components/Visualization";
import { Table } from "metabase/visualizations/visualizations/Table/Table";
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
index e070f6c9bbf..0654e81798e 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import _ from "underscore";
import CS from "metabase/css/core/index.css";
-import { displayNameForColumn } from "metabase/lib/formatting";
-import type { OptionsType } from "metabase/lib/formatting/types";
-import { getSubpathSafeUrl } from "metabase/lib/urls";
+import { displayNameForColumn } from "metabase/utils/formatting";
+import type { OptionsType } from "metabase/utils/formatting/types";
+import { getSubpathSafeUrl } from "metabase/utils/urls";
import ChartSettingLinkUrlInput from "metabase/visualizations/components/settings/ChartSettingLinkUrlInput";
import { ChartSettingNumberInput } from "metabase/visualizations/components/settings/ChartSettingNumberInput";
import {
diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
index 097071566f8..6ee51fee501 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.tsx
@@ -13,8 +13,8 @@ import CS from "metabase/css/core/index.css";
import { updateParameterMappingsForDashcardText } from "metabase/dashboard/actions";
import { getParameterValues } from "metabase/dashboard/selectors";
import { useTranslateContent } from "metabase/i18n/hooks";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { isEmpty } from "metabase/lib/validate";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { isEmpty } from "metabase/utils/validate";
import { DATA_IMAGE_URI_PATTERN } from "metabase/visualizations/lib/utils";
import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type { VisualizationGridSize } from "metabase/visualizations/types";
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx
index a6cc05f998a..c96d6ecdd60 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx
+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx
@@ -2,8 +2,8 @@ import { useDraggable } from "@dnd-kit/core";
import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Box, Flex, Icon, Loader, Menu, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { isPivotGroupColumn } from "metabase/visualizations/lib/data_grid";
import { DRAGGABLE_ID } from "metabase/visualizer/constants";
import { useIsCardPristine } from "metabase/visualizer/hooks/use-is-card-pristine";
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx
index c2c6a78b6ef..a1e08d03806 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx
+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx
@@ -6,7 +6,6 @@ import {
} from "react";
import { t } from "ttag";
-import { displayNameForColumn } from "metabase/lib/formatting";
import { Ellipsified } from "metabase/ui";
import {
ActionIcon,
@@ -15,6 +14,7 @@ import {
Icon,
type IconName,
} from "metabase/ui";
+import { displayNameForColumn } from "metabase/utils/formatting";
import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";
import type { DatasetColumn } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx
index d66dfd9ccc7..d1ef2221b49 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx
+++ b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx
@@ -3,8 +3,6 @@ import { useCallback, useState } from "react";
import { t } from "ttag";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
-import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import {
Box,
Button,
@@ -15,6 +13,8 @@ import {
TextInput,
Title,
} from "metabase/ui";
+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { useBooleanMap } from "metabase/visualizer/hooks/use-boolean-map";
import { getDataSources } from "metabase/visualizer/selectors";
import {
diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsx
index e8a38009335..b2489c0f3bd 100644
--- a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsx
+++ b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsList.tsx
@@ -4,9 +4,9 @@ import { t } from "ttag";
import { useListRecentsQuery, useSearchQuery } from "metabase/api";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { getDashboard } from "metabase/dashboard/selectors";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import { Box, Flex, Skeleton } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import { isCartesianChart } from "metabase/visualizations";
import {
getDataSources,
diff --git a/frontend/src/metabase/visualizer/components/Footer/Footer.tsx b/frontend/src/metabase/visualizer/components/Footer/Footer.tsx
index af42d0e3779..83c689bfcdc 100644
--- a/frontend/src/metabase/visualizer/components/Footer/Footer.tsx
+++ b/frontend/src/metabase/visualizer/components/Footer/Footer.tsx
@@ -1,8 +1,8 @@
import { useCallback } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Button, Flex } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import {
getDatasets,
getIsLoading,
diff --git a/frontend/src/metabase/visualizer/components/Header/Header.tsx b/frontend/src/metabase/visualizer/components/Header/Header.tsx
index b760d209725..d1da03ad6bf 100644
--- a/frontend/src/metabase/visualizer/components/Header/Header.tsx
+++ b/frontend/src/metabase/visualizer/components/Header/Header.tsx
@@ -3,8 +3,8 @@ import { t } from "ttag";
import _ from "underscore";
import { EditableText } from "metabase/common/components/EditableText";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { ActionIcon, Button, Flex, Icon, Tooltip } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { useVisualizerHistory } from "metabase/visualizer/hooks/use-visualizer-history";
import {
getCurrentVisualizerState,
diff --git a/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsx b/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsx
index e40b62148b4..3bed0d579cb 100644
--- a/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsx
+++ b/frontend/src/metabase/visualizer/components/TabularPreviewModal/TabularPreviewModal.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
-import { useSelector } from "metabase/lib/redux";
import { Box, Modal } from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import Visualization from "metabase/visualizations/components/Visualization";
import { getTabularPreviewSeries } from "metabase/visualizer/selectors";
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
index caeb116456d..759d59d802b 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx
@@ -3,7 +3,6 @@ import { useState } from "react";
import { t } from "ttag";
import metabot from "assets/img/metabot-96x96.svg";
-import { useSelector } from "metabase/lib/redux";
import {
ActionIcon,
Box,
@@ -17,6 +16,7 @@ import {
Title,
Tooltip,
} from "metabase/ui";
+import { useSelector } from "metabase/utils/redux";
import { isCartesianChart } from "metabase/visualizations";
import Visualization from "metabase/visualizations/components/Visualization";
import {
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsx
index cdef590f3ac..d08cb169295 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/CartesianHorizontallWell.tsx
@@ -2,9 +2,9 @@ import { useDraggable, useDroppable } from "@dnd-kit/core";
import cx from "classnames";
import { useMemo } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import { Flex, type FlexProps, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import { getDefaultDimensionFilter } from "metabase/visualizations/shared/settings/cartesian-chart";
import { DRAGGABLE_ID, DROPPABLE_ID } from "metabase/visualizer/constants";
import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx
index c6c449127bd..a58df2fb6e0 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx
@@ -17,8 +17,8 @@ import {
import cx from "classnames";
import { Sortable } from "metabase/common/components/Sortable";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Box, Flex, type FlexProps, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { DROPPABLE_ID } from "metabase/visualizer/constants";
import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";
import {
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx
index 5adf24cb5ea..b5e298537ef 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx
@@ -3,8 +3,8 @@ import cx from "classnames";
import { useCallback } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Box, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { DROPPABLE_ID } from "metabase/visualizer/constants";
import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";
import {
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsx
index f19cd9e12df..2040eaf416a 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/CartesianVerticalWell.tsx
@@ -1,9 +1,9 @@
import { useDraggable, useDroppable } from "@dnd-kit/core";
import { useMemo } from "react";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import { isNotNull } from "metabase/lib/types";
import { Flex, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
+import { isNotNull } from "metabase/utils/types";
import { getDefaultMetricFilter } from "metabase/visualizations/shared/settings/cartesian-chart";
import { DRAGGABLE_ID, DROPPABLE_ID } from "metabase/visualizer/constants";
import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsx
index 33c34764f08..953139cf694 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/FunnelVerticalWell.tsx
@@ -1,7 +1,7 @@
import { useDroppable } from "@dnd-kit/core";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Flex, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { DROPPABLE_ID } from "metabase/visualizer/constants";
import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";
import {
diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsx
index 786591c8847..6abe8792dee 100644
--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/VerticalWell/PieVerticalWell.tsx
@@ -3,8 +3,8 @@ import cx from "classnames";
import { type ReactNode, forwardRef } from "react";
import { t } from "ttag";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Box, Ellipsified, Stack, Text } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { DROPPABLE_ID } from "metabase/visualizer/constants";
import { useCanHandleActiveItem } from "metabase/visualizer/hooks/use-can-handle-active-item";
import {
diff --git a/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsx b/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsx
index 7bed61fb870..ff94aa638df 100644
--- a/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsx
+++ b/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.tsx
@@ -10,8 +10,8 @@ import { useCallback, useEffect } from "react";
import { createPortal } from "react-dom";
import { useUnmount } from "react-use";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Box } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { DROPPABLE_ID } from "metabase/visualizer/constants";
import { useVisualizerHistory } from "metabase/visualizer/hooks/use-visualizer-history";
import { getDraggedItem } from "metabase/visualizer/selectors";
diff --git a/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsx b/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsx
index 96a3eccfb36..b63407ea36b 100644
--- a/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizerModal/VisualizerModal.tsx
@@ -4,8 +4,8 @@ import { t } from "ttag";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import { useModalOpen } from "metabase/common/hooks/use-modal-open";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Modal } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getIsDirty } from "metabase/visualizer/selectors";
import { initializeVisualizer } from "metabase/visualizer/visualizer.slice";
import type { CardId, VisualizerVizDefinition } from "metabase-types/api";
diff --git a/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsx b/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsx
index b7a1af17997..3cba9bf1b3c 100644
--- a/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsx
+++ b/frontend/src/metabase/visualizer/components/VisualizerUiContext/VisualizerUiContext.tsx
@@ -11,7 +11,7 @@ import {
import { usePrevious } from "react-use";
import _ from "underscore";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import { getDatasets } from "metabase/visualizer/selectors";
type VisualizerUiState = {
diff --git a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
index 0e56524d435..ebd329d1068 100644
--- a/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
+++ b/frontend/src/metabase/visualizer/components/VizSettingsSidebar/VizSettingsSidebar.tsx
@@ -1,8 +1,8 @@
import { forwardRef, useCallback, useMemo, useState } from "react";
import ErrorBoundary from "metabase/ErrorBoundary";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import { Center } from "metabase/ui";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { BaseChartSettings } from "metabase/visualizations/components/ChartSettings";
import { ErrorView } from "metabase/visualizations/components/Visualization/ErrorView";
import { getSettingsWidgetsForSeries } from "metabase/visualizations/lib/settings/visualization";
diff --git a/frontend/src/metabase/visualizer/components/analytics.ts b/frontend/src/metabase/visualizer/components/analytics.ts
index c07035ecca4..cd09ca01504 100644
--- a/frontend/src/metabase/visualizer/components/analytics.ts
+++ b/frontend/src/metabase/visualizer/components/analytics.ts
@@ -1,4 +1,4 @@
-import { trackSimpleEvent } from "metabase/lib/analytics";
+import { trackSimpleEvent } from "metabase/utils/analytics";
type VisualizerDataChangedDetail =
| "visualizer_viz_type_changed"
diff --git a/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.ts b/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.ts
index 1553ee7c87e..fdd7835c760 100644
--- a/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.ts
+++ b/frontend/src/metabase/visualizer/hooks/use-can-handle-active-item.ts
@@ -1,7 +1,7 @@
import type { Active } from "@dnd-kit/core";
import { useMemo } from "react";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import {
getHoveredItems,
getReferencedColumns,
diff --git a/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.ts b/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.ts
index 7a88927953e..5850b2497bc 100644
--- a/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.ts
+++ b/frontend/src/metabase/visualizer/hooks/use-is-card-pristine.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import _ from "underscore";
-import { useSelector } from "metabase/lib/redux";
+import { useSelector } from "metabase/utils/redux";
import type { VisualizerDataSource } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/visualizer/hooks/use-visualizer-history.ts b/frontend/src/metabase/visualizer/hooks/use-visualizer-history.ts
index 8957351d397..42bdfbf87be 100644
--- a/frontend/src/metabase/visualizer/hooks/use-visualizer-history.ts
+++ b/frontend/src/metabase/visualizer/hooks/use-visualizer-history.ts
@@ -1,4 +1,4 @@
-import { useDispatch, useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/utils/redux";
import { getCanRedo, getCanUndo } from "../selectors";
import { redo, undo } from "../visualizer.slice";
diff --git a/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.ts b/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.ts
index 33ae8353841..44ea5b4ad8a 100644
--- a/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.ts
+++ b/frontend/src/metabase/visualizer/utils/get-initial-state-for-card-data-source.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { isCartesianChart } from "metabase/visualizations";
import { isPivotGroupColumn } from "metabase/visualizations/lib/data_grid";
import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
diff --git a/frontend/src/metabase/visualizer/utils/get-initial-state-for-multiple-series.ts b/frontend/src/metabase/visualizer/utils/get-initial-state-for-multiple-series.ts
index 2445a3e52df..eba564df82b 100644
--- a/frontend/src/metabase/visualizer/utils/get-initial-state-for-multiple-series.ts
+++ b/frontend/src/metabase/visualizer/utils/get-initial-state-for-multiple-series.ts
@@ -1,4 +1,4 @@
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type {
Card,
Dataset,
diff --git a/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.ts b/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.ts
index 8c43763a421..df74eb39b93 100644
--- a/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.ts
+++ b/frontend/src/metabase/visualizer/utils/get-updated-settings-for-display.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import {
getMaxDimensionsSupported,
isCartesianChart,
diff --git a/frontend/src/metabase/visualizer/utils/split-series.ts b/frontend/src/metabase/visualizer/utils/split-series.ts
index be8a8d5dfa0..78711fb449c 100644
--- a/frontend/src/metabase/visualizer/utils/split-series.ts
+++ b/frontend/src/metabase/visualizer/utils/split-series.ts
@@ -1,6 +1,6 @@
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { isCartesianChart } from "metabase/visualizations";
import type {
RawSeries,
diff --git a/frontend/src/metabase/visualizer/visualizations/cartesian.ts b/frontend/src/metabase/visualizer/visualizations/cartesian.ts
index b5efee92eff..595fe9c5c3d 100644
--- a/frontend/src/metabase/visualizer/visualizations/cartesian.ts
+++ b/frontend/src/metabase/visualizer/visualizations/cartesian.ts
@@ -2,7 +2,7 @@ import type { DragEndEvent } from "@dnd-kit/core";
import type { Draft } from "immer";
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import { isCartesianChart } from "metabase/visualizations";
import {
getDefaultDimensionFilter,
diff --git a/frontend/src/metabase/visualizer/visualizations/pie.ts b/frontend/src/metabase/visualizer/visualizations/pie.ts
index 7526c22df48..28a3a59d739 100644
--- a/frontend/src/metabase/visualizer/visualizations/pie.ts
+++ b/frontend/src/metabase/visualizer/visualizations/pie.ts
@@ -1,7 +1,7 @@
import type { DragEndEvent } from "@dnd-kit/core";
import _ from "underscore";
-import { isNotNull } from "metabase/lib/types";
+import { isNotNull } from "metabase/utils/types";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import { DROPPABLE_ID } from "metabase/visualizer/constants";
import {
diff --git a/frontend/src/metabase/visualizer/visualizer.slice.ts b/frontend/src/metabase/visualizer/visualizer.slice.ts
index 00ecdde21fd..8f0ec399a0c 100644
--- a/frontend/src/metabase/visualizer/visualizer.slice.ts
+++ b/frontend/src/metabase/visualizer/visualizer.slice.ts
@@ -9,8 +9,8 @@ import undoable, { combineFilters, includeAction } from "redux-undo";
import _ from "underscore";
import { cardApi } from "metabase/api";
-import { createAsyncThunk, createThunkAction } from "metabase/lib/redux";
-import { copy } from "metabase/lib/utils";
+import { clone } from "metabase/utils/clone";
+import { createAsyncThunk, createThunkAction } from "metabase/utils/redux";
import { isCartesianChart } from "metabase/visualizations";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import type {
@@ -146,7 +146,7 @@ const initializeFromState = async (
})
.flat(),
);
- return copy(initialState);
+ return clone(initialState);
};
export const initializeFromCard = async (
@@ -222,7 +222,7 @@ export const addDataSource = createAsyncThunk(
return maybeCombineDataset(
{
- ...copy(state),
+ ...clone(state),
settings,
},
settings,
@@ -581,9 +581,9 @@ const visualizerSlice = createSlice({
const nextState = action.payload;
if (nextState) {
state.display = nextState.display;
- state.columns = copy(nextState.columns);
- state.columnValuesMapping = copy(nextState.columnValuesMapping);
- state.settings = copy(nextState.settings);
+ state.columns = clone(nextState.columns);
+ state.columnValuesMapping = clone(nextState.columnValuesMapping);
+ state.settings = clone(nextState.settings);
}
})
.addCase(fetchCard.pending, (state, action) => {
diff --git a/frontend/src/types/global.d.ts b/frontend/src/types/global.d.ts
index f7cc776f1b1..725c84c7fac 100644
--- a/frontend/src/types/global.d.ts
+++ b/frontend/src/types/global.d.ts
@@ -1,6 +1,9 @@
interface Window {
MetabaseBootstrap: any;
MetabaseRoot?: string;
+ /**
+ * @deprecated - use getCspNonce() from metabase/utils/csp instead
+ */
MetabaseNonce?: string;
MetabaseUserColorScheme?: string;
diff --git a/frontend/test/__support__/mocks.js b/frontend/test/__support__/mocks.js
index 379e17285e2..d72e10399df 100644
--- a/frontend/test/__support__/mocks.js
+++ b/frontend/test/__support__/mocks.js
@@ -26,7 +26,7 @@ global.window.ResizeObserver = class ResizeObserver {
disconnect() {}
};
-jest.mock("metabase/lib/analytics");
+jest.mock("metabase/utils/analytics");
jest.mock("@uiw/react-codemirror", () => {
const { forwardRef } = jest.requireActual("react");
diff --git a/frontend/test/__support__/settings.ts b/frontend/test/__support__/settings.ts
index f6c17838293..3b860502e2c 100644
--- a/frontend/test/__support__/settings.ts
+++ b/frontend/test/__support__/settings.ts
@@ -1,4 +1,4 @@
-import MetabaseSettings from "metabase/lib/settings";
+import MetabaseSettings from "metabase/utils/settings";
import type { EnterpriseSettings, Settings } from "metabase-types/api";
import { createMockSettings } from "metabase-types/api/mocks";
import { createMockSettingsState } from "metabase-types/store/mocks";
diff --git a/frontend/test/__support__/storybook.tsx b/frontend/test/__support__/storybook.tsx
index 963f87b1d9a..919d32b50a2 100644
--- a/frontend/test/__support__/storybook.tsx
+++ b/frontend/test/__support__/storybook.tsx
@@ -6,12 +6,12 @@ import { useEffect, useMemo } from "react";
import { SdkThemeProvider } from "embedding-sdk-bundle/components/private/SdkThemeProvider";
import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
import { mainReducers } from "metabase/reducers-main";
import { StaticVisualization } from "metabase/static-viz/components/StaticVisualization";
import { createStaticRenderingContext } from "metabase/static-viz/lib/rendering-context";
import type { MantineThemeOverride } from "metabase/ui";
import { Box } from "metabase/ui";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
import Visualization from "metabase/visualizations/components/Visualization";
import type { RawSeries } from "metabase-types/api";
import type { State } from "metabase-types/store";
diff --git a/frontend/test/__support__/ui.tsx b/frontend/test/__support__/ui.tsx
index eda7fd6e61c..2a9867912a4 100644
--- a/frontend/test/__support__/ui.tsx
+++ b/frontend/test/__support__/ui.tsx
@@ -23,9 +23,6 @@ import { Api } from "metabase/api";
import { UndoListing } from "metabase/common/components/UndoListing";
import { baseStyle } from "metabase/css/core/base.styled";
import { HistoryProvider } from "metabase/history";
-import { PUT } from "metabase/lib/api";
-import { MetabaseReduxProvider } from "metabase/lib/redux";
-import MetabaseSettings from "metabase/lib/settings";
import { makeMainReducers } from "metabase/reducers-main";
import { publicReducers } from "metabase/reducers-public";
import { RouterProvider } from "metabase/router";
@@ -34,6 +31,9 @@ import type { MantineThemeOverride } from "metabase/ui";
import { ThemeProvider, useMantineTheme } from "metabase/ui";
import { mutateColors } from "metabase/ui/colors/colors";
import { ThemeProviderContext } from "metabase/ui/components/theme/ThemeProvider/context";
+import { PUT } from "metabase/utils/api";
+import { MetabaseReduxProvider } from "metabase/utils/redux";
+import MetabaseSettings from "metabase/utils/settings";
import type { State } from "metabase-types/store";
import { createMockState } from "metabase-types/store/mocks";
diff --git a/frontend/test/jest-setup.js b/frontend/test/jest-setup.js
index 1e240226477..1df1d158132 100644
--- a/frontend/test/jest-setup.js
+++ b/frontend/test/jest-setup.js
@@ -5,7 +5,7 @@ import { ReadableStream } from "web-streams-polyfill";
import "cross-fetch/polyfill";
import "raf/polyfill";
import "jest-canvas-mock";
-import "metabase/lib/dayjs";
+import "metabase/utils/dayjs";
import "__support__/mocks";
// NOTE: this is needed because sometimes asynchronous code tries to access
diff --git a/frontend/test/metabase-lib/lib/Question.unit.spec.js b/frontend/test/metabase-lib/lib/Question.unit.spec.js
index 14ea9737f15..213224af596 100644
--- a/frontend/test/metabase-lib/lib/Question.unit.spec.js
+++ b/frontend/test/metabase-lib/lib/Question.unit.spec.js
@@ -3,7 +3,7 @@ import { parse } from "url";
import { assoc, dissoc } from "icepick";
import { createMockMetadata } from "__support__/metadata";
-import { deserializeCardFromUrl } from "metabase/lib/card";
+import { deserializeCardFromUrl } from "metabase/utils/card";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/test/metabase-lib/lib/utils.unit.spec.js b/frontend/test/metabase-lib/lib/utils.unit.spec.js
index 92379d8e2db..7edc0dc49dd 100644
--- a/frontend/test/metabase-lib/lib/utils.unit.spec.js
+++ b/frontend/test/metabase-lib/lib/utils.unit.spec.js
@@ -1,36 +1,4 @@
-import { memoizeClass, sortObject } from "metabase-lib/v1/utils";
-
-describe("sortObject", () => {
- it("should serialize identically regardless of property creation order", () => {
- const o1 = {};
- o1.a = 1;
- o1.b = 2;
- const o2 = {};
- o2.b = 2;
- o2.a = 1;
-
- expect(JSON.stringify(sortObject(o1))).toEqual(
- JSON.stringify(sortObject(o2)),
- );
- });
-
- it("should not sort arrays", () => {
- expect(sortObject(["a", "c", "b"])).toEqual(["a", "c", "b"]);
- });
-
- it("should sort keys recursively", () => {
- const o1 = { o: {} };
- o1.o.a = 1;
- o1.o.b = 2;
- const o2 = { o: {} };
- o2.o.b = 2;
- o2.o.a = 1;
-
- expect(JSON.stringify(sortObject(o1))).toEqual(
- JSON.stringify(sortObject(o2)),
- );
- });
-});
+import { memoizeClass } from "metabase-lib/v1/utils";
describe("memoize", () => {
it("should memoize method", () => {
diff --git a/frontend/test/metabase/lib/formatting.unit.spec.js b/frontend/test/metabase/lib/formatting.unit.spec.js
deleted file mode 100644
index 225e35651a7..00000000000
--- a/frontend/test/metabase/lib/formatting.unit.spec.js
+++ /dev/null
@@ -1,940 +0,0 @@
-import dayjs from "dayjs";
-import { isElementOfType } from "react-dom/test-utils";
-
-import { mockSettings } from "__support__/settings";
-import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { Link } from "metabase/common/components/Link";
-import {
- capitalize,
- formatDateTimeWithUnit,
- formatNumber,
- formatTime,
- formatTimeWithUnit,
- formatUrl,
- formatValue,
- getCurrencySymbol,
- slugify,
-} from "metabase/lib/formatting";
-import { TYPE } from "metabase-lib/v1/types/constants";
-import { createMockColumn } from "metabase-types/api/mocks";
-
-const SITE_URL = "http://localhost:3000";
-
-describe("formatting", () => {
- beforeAll(() => {
- mockSettings({ site_url: SITE_URL });
- });
-
- describe("capitalize", () => {
- it("capitalizes a single word", () => {
- expect(capitalize("hello")).toBe("Hello");
- });
-
- it("capitalizes only the first char of a string", () => {
- expect(capitalize("hello world")).toBe("Hello world");
- });
-
- it("converts a string to lowercase by default", () => {
- expect(capitalize("heLLo")).toBe("Hello");
- });
-
- it("doesn't lowercase the string if option provided", () => {
- expect(capitalize("hellO WoRlD", { lowercase: false })).toBe(
- "HellO WoRlD",
- );
- });
-
- it("doesn't break on an empty string", () => {
- expect(capitalize("")).toBe("");
- expect(capitalize("", { lowercase: false })).toBe("");
- });
- });
-
- describe("formatNumber", () => {
- it("should format 0 correctly", () => {
- expect(formatNumber(0)).toEqual("0");
- });
-
- it("should format 1 and -1 correctly", () => {
- expect(formatNumber(1)).toEqual("1");
- expect(formatNumber(-1)).toEqual("-1");
- });
-
- it("should format large positive and negative numbers correctly", () => {
- expect(formatNumber(10)).toEqual("10");
- expect(formatNumber(99999999)).toEqual("99,999,999");
- expect(formatNumber(-10)).toEqual("-10");
- expect(formatNumber(-99999999)).toEqual("-99,999,999");
- });
-
- it("should format large numbers correctly with non-default number separator", () => {
- const options = { number_separators: ",." };
- expect(formatNumber(10.1, options)).toEqual("10,1");
- expect(formatNumber(99999999.9, options)).toEqual("99.999.999,9");
- expect(formatNumber(-10.1, options)).toEqual("-10,1");
- expect(formatNumber(-99999999.9, options)).toEqual("-99.999.999,9");
- });
-
- it("should format to 2 significant digits", () => {
- expect(formatNumber(1 / 3)).toEqual("0.33");
- expect(formatNumber(-1 / 3)).toEqual("-0.33");
- expect(formatNumber(0.0001 / 3)).toEqual("0.000033");
- });
-
- describe("in enclosing negative mode", () => {
- it("should format -4 as (4)", () => {
- expect(formatNumber(-4, { negativeInParentheses: true })).toEqual(
- "(4)",
- );
- });
-
- it("should format 7 as 7", () => {
- expect(formatNumber(7, { negativeInParentheses: true })).toEqual("7");
- });
-
- it("should format 0 as 0", () => {
- expect(formatNumber(0, { negativeInParentheses: true })).toEqual("0");
- });
- });
-
- describe("in compact mode", () => {
- it("should format 0 as 0", () => {
- expect(formatNumber(0, { compact: true })).toEqual("0");
- });
-
- it("shouldn't display small numbers as 0", () => {
- expect(formatNumber(0.1, { compact: true })).toEqual("0.1");
- expect(formatNumber(-0.1, { compact: true })).toEqual("-0.1");
- expect(formatNumber(0.01, { compact: true })).toEqual("0.01");
- expect(formatNumber(-0.01, { compact: true })).toEqual("-0.01");
- });
-
- it("should round up and down", () => {
- expect(formatNumber(1.01, { compact: true })).toEqual("1.01");
- expect(formatNumber(-1.01, { compact: true })).toEqual("-1.01");
- expect(formatNumber(1.9, { compact: true })).toEqual("1.9");
- expect(formatNumber(-1.9, { compact: true })).toEqual("-1.9");
- });
-
- it("should format large numbers with metric units", () => {
- expect(formatNumber(1, { compact: true })).toEqual("1");
- expect(formatNumber(1000, { compact: true })).toEqual("1.0k");
- expect(formatNumber(1111, { compact: true })).toEqual("1.1k");
- });
-
- it("should format large numbers correctly with non-default number separator", () => {
- const options = { compact: true, number_separators: ",." };
- expect(formatNumber(10.1, options)).toEqual("10,1");
- expect(formatNumber(99999999.9, options)).toEqual("100,0M");
- expect(formatNumber(-10.1, options)).toEqual("-10,1");
- expect(formatNumber(-99999999.9, options)).toEqual("-100,0M");
- });
-
- it("should format big integers", () => {
- expect(formatNumber(9223372036854775807n, {})).toEqual(
- "9,223,372,036,854,775,807",
- );
- });
-
- it("should format big integers correctly with non-default number separators", () => {
- const options = { number_separators: ",." };
- expect(formatNumber(1000n, options)).toEqual("1.000");
- });
-
- it("should format big integers with scale options", () => {
- const options = { scale: 10 };
- expect(formatNumber(1000n, options)).toEqual("10,000");
- });
-
- it("should respect 'decimals' setting", () => {
- expect(formatNumber(500000, { compact: true, decimals: 0 })).toBe(
- "500k",
- );
- expect(formatNumber(500000, { compact: true })).toBe("500.0k");
- expect(formatNumber(10.1, { compact: true })).toBe("10.1");
- expect(formatNumber(10.1, { compact: true, decimals: 0 })).toBe("10");
- expect(formatNumber(99999999.9, { compact: true })).toBe("100.0M");
- expect(formatNumber(99999999.9, { compact: true, decimals: 0 })).toBe(
- "100M",
- );
- });
-
- it("should format percentages", () => {
- const options = { compact: true, number_style: "percent" };
- expect(formatNumber(0.867, { number_style: "percent" })).toEqual(
- "86.7%",
- );
- expect(formatNumber(1.2345, { number_style: "percent" })).toEqual(
- "123.45%",
- );
- expect(formatNumber(0, options)).toEqual("0%");
- expect(formatNumber(0.001, options)).toEqual("0.1%");
- expect(formatNumber(0.0001, options)).toEqual("0.01%");
- expect(formatNumber(0.001234, options)).toEqual("0.12%");
- expect(formatNumber(0.1, options)).toEqual("10%");
- expect(formatNumber(0.1234, options)).toEqual("12.34%");
- expect(formatNumber(0.019, options)).toEqual("1.9%");
- expect(formatNumber(0.021, options)).toEqual("2.1%");
- expect(formatNumber(11.11, options)).toEqual("1.1k%");
- expect(formatNumber(-0.22, options)).toEqual("-22%");
- });
-
- it("should format scientific notation", () => {
- const options = { compact: true, number_style: "scientific" };
- expect(formatNumber(0, options)).toEqual("0.0e+0");
- expect(formatNumber(0.0001, options)).toEqual("1.0e-4");
- expect(formatNumber(0.01, options)).toEqual("1.0e-2");
- expect(formatNumber(0.5, options)).toEqual("5.0e-1");
- expect(formatNumber(123456.78, options)).toEqual("1.2e+5");
- expect(formatNumber(-123456.78, options)).toEqual("-1.2e+5");
- });
-
- it("should obey custom separators in scientific notiation", () => {
- const options = {
- compact: true,
- number_style: "scientific",
- number_separators: ",.",
- };
- expect(formatNumber(0, options)).toEqual("0,0e+0");
- expect(formatNumber(0.0001, options)).toEqual("1,0e-4");
- expect(formatNumber(0.01, options)).toEqual("1,0e-2");
- expect(formatNumber(0.5, options)).toEqual("5,0e-1");
- expect(formatNumber(123456.78, options)).toEqual("1,2e+5");
- expect(formatNumber(-123456.78, options)).toEqual("-1,2e+5");
- });
-
- it("should format currency values", () => {
- const options = {
- compact: true,
- number_style: "currency",
- currency: "USD",
- };
- expect(formatNumber(0, options)).toEqual("$0.00");
- expect(formatNumber(0.001, options)).toEqual("$0.00");
- expect(formatNumber(7.24, options)).toEqual("$7.24");
- expect(formatNumber(7.249, options)).toEqual("$7.25");
- expect(formatNumber(724.9, options)).toEqual("$724.90");
- expect(formatNumber(1234.56, options)).toEqual("$1.2k");
- expect(formatNumber(1234567.89, options)).toEqual("$1.2M");
- expect(formatNumber(-1234567.89, options)).toEqual("-$1.2M");
- expect(
- formatNumber(1234567.89, { ...options, currency: "CNY" }),
- ).toEqual("CN¥1.2M");
- expect(
- formatNumber(1234567.89, { ...options, currency_style: "name" }),
- ).toEqual("$1.2M");
- });
- });
-
- it("should format to correct number of decimal places", () => {
- expect(formatNumber(0.1)).toEqual("0.1");
- expect(formatNumber(0.11)).toEqual("0.11");
- expect(formatNumber(0.111)).toEqual("0.11");
- expect(formatNumber(0.01)).toEqual("0.01");
- expect(formatNumber(0.011)).toEqual("0.011");
- expect(formatNumber(0.0111)).toEqual("0.011");
- expect(formatNumber(1.1)).toEqual("1.1");
- expect(formatNumber(1.11)).toEqual("1.11");
- expect(formatNumber(1.111)).toEqual("1.11");
- expect(formatNumber(111.111)).toEqual("111.11");
- });
-
- describe("number_style = currency", () => {
- it("should handle positive currency", () => {
- expect(
- formatNumber(1.23, { number_style: "currency", currency: "USD" }),
- ).toBe("$1.23");
- });
-
- it("should handle negative currency", () => {
- expect(
- formatNumber(-1.23, { number_style: "currency", currency: "USD" }),
- ).toBe("-$1.23");
- });
-
- describe("with currency_in_header = true and type = cell", () => {
- it("should handle positive currency", () => {
- expect(
- formatNumber(1.23, {
- number_style: "currency",
- currency: "USD",
- currency_in_header: true,
- type: "cell",
- }),
- ).toBe("1.23");
- });
-
- it("should handle negative currency", () => {
- expect(
- formatNumber(-1.23, {
- number_style: "currency",
- currency: "USD",
- currency_in_header: true,
- type: "cell",
- }),
- ).toBe("-1.23");
- });
- });
- });
- });
-
- describe("formatValue", () => {
- it("should return null on nullish values by default", () => {
- expect(formatValue(null)).toEqual(null);
- expect(formatValue(undefined)).toEqual(null);
- });
-
- it("should format null as (empty) when stringifyNull option is true", () => {
- expect(formatValue(null, { stringifyNull: true })).toEqual("(empty)");
- expect(formatValue(undefined, { stringifyNull: true })).toEqual(
- "(empty)",
- );
- });
-
- it("should format numbers with null column", () => {
- expect(formatValue(12345)).toEqual("12345");
- });
-
- it("should format numbers with commas", () => {
- expect(
- formatValue(12345, {
- column: { base_type: TYPE.Number, semantic_type: TYPE.Number },
- }),
- ).toEqual("12,345");
- });
-
- it("should format big integers", () => {
- const options = {
- column: { base_type: TYPE.Number, semantic_type: TYPE.Number },
- };
-
- expect(formatValue(9223372036854775807n, options)).toEqual(
- "9,223,372,036,854,775,807",
- );
- expect(formatValue("9223372036854775807", options)).toEqual(
- "9,223,372,036,854,775,807",
- );
- });
-
- it("should format zip codes without commas", () => {
- expect(
- formatValue(12345, {
- column: { base_type: TYPE.Number, semantic_type: TYPE.ZipCode },
- }),
- ).toEqual("12345");
- });
-
- it("should format latitude and longitude columns correctly", () => {
- expect(
- formatValue(37.7749, {
- column: { base_type: TYPE.Number, semantic_type: TYPE.Latitude },
- }),
- ).toEqual("37.77490000° N");
- expect(
- formatValue(-122.4194, {
- column: { base_type: TYPE.Number, semantic_type: TYPE.Longitude },
- }),
- ).toEqual("122.41940000° W");
- });
-
- it("should return the component for external links in jsx + rich mode", () => {
- expect(
- isElementOfType(
- formatValue("http://metabase.com/", { jsx: true, rich: true }),
- ExternalLink,
- ),
- ).toEqual(true);
- });
-
- it("should return a component for internal links in jsx + rich mode", () => {
- expect(
- isElementOfType(formatValue(SITE_URL, { jsx: true, rich: true }), Link),
- ).toBe(true);
- });
-
- it("should return a component for relative links in jsx + rich mode", () => {
- const column = createMockColumn({
- name: "column_name",
- base_type: "type/Text",
- effective_type: "type/Text",
- semantic_type: "type/URL",
- });
- expect(
- isElementOfType(
- formatValue("/question/12", {
- jsx: true,
- rich: true,
- view_as: "link",
- link_url: "{{column_name}}",
- clicked: {
- value: "/question/12",
- column: column,
- data: [{ value: "question/12", col: column }],
- },
- }),
- Link,
- ),
- ).toEqual(true);
- });
-
- it("should not return an ExternalLink for links in jsx + rich mode if there's click behavior", () => {
- const formatted = formatValue("http://metabase.com/", {
- jsx: true,
- rich: true,
- click_behavior: {
- linkTemplate: "foo",
- linkTextTemplate: "foo",
- linkType: "url",
- type: "link",
- },
- clicked: {},
- });
- // it's not actually a link
- expect(isElementOfType(formatted, ExternalLink)).toEqual(false);
- // expect the text to be in a div (which has link formatting) rather than ExternalLink
- expect(formatted.props["data-testid"]).toEqual("link-formatted-text");
- });
-
- it("should render image", () => {
- const formatted = formatValue("http://metabase.com/logo.png", {
- jsx: true,
- rich: true,
- view_as: "image",
- column: { semantic_type: "type/ImageURL" },
- });
- expect(formatted.type).toEqual("img");
- expect(formatted.props.src).toEqual("http://metabase.com/logo.png");
- });
-
- it("should render image with a click behavior in jsx + rich mode (metabase#17161)", () => {
- const formatted = formatValue("http://metabase.com/logo.png", {
- jsx: true,
- rich: true,
- view_as: "image",
- click_behavior: {
- linkTemplate: "foo",
- linkType: "url",
- type: "link",
- },
- clicked: {},
- });
- expect(formatted.type).toEqual("img");
- expect(formatted.props.src).toEqual("http://metabase.com/logo.png");
- });
-
- it("should return a component for email addresses in jsx + rich mode", () => {
- expect(
- isElementOfType(
- formatValue("[email protected]", { jsx: true, rich: true }),
- ExternalLink,
- ),
- ).toEqual(true);
- });
-
- it("should not add mailto prefix if there's a different semantic type", () => {
- expect(
- formatValue("[email protected]", {
- jsx: true,
- rich: true,
- column: { semantic_type: "type/PK" },
- }),
- ).toEqual("[email protected]");
- });
-
- it("should display hour-of-day with 12 hour clock", () => {
- expect(
- formatValue(24, {
- date_style: null,
- time_enabled: "minutes",
- time_style: "h:mm A",
- column: {
- base_type: "type/DateTime",
- unit: "hour-of-day",
- },
- }),
- ).toEqual("12:00 AM");
- });
-
- it("should display hour-of-day with 24 hour clock", () => {
- expect(
- formatValue(24, {
- date_style: null,
- time_enabled: "minutes",
- time_style: "HH:mm",
- column: {
- base_type: "type/DateTime",
- unit: "hour-of-day",
- },
- }),
- ).toEqual("00:00");
- });
-
- it("should not include time for type/Date type (metabase#7494)", () => {
- expect(
- formatValue("2019-07-07T00:00:00.000Z", {
- date_style: "M/D/YYYY",
- time_enabled: "minutes",
- time_style: "HH:mm",
- column: {
- base_type: "type/Date",
- unit: "hour-of-day",
- },
- }),
- ).toEqual("7/7/2019");
- });
- });
-
- describe("formatUrl", () => {
- it("should return a string when not in jsx mode", () => {
- expect(formatUrl("http://metabase.com/")).toEqual("http://metabase.com/");
- });
-
- it("should return a component for http:, https:, and mailto: links in jsx mode", () => {
- expect(
- isElementOfType(
- formatUrl("http://metabase.com/", { jsx: true, rich: true }),
- ExternalLink,
- ),
- ).toEqual(true);
- expect(
- isElementOfType(
- formatUrl("https://metabase.com/", { jsx: true, rich: true }),
- ExternalLink,
- ),
- ).toEqual(true);
- expect(
- isElementOfType(
- formatUrl("mailto:[email protected]", { jsx: true, rich: true }),
- ExternalLink,
- ),
- ).toEqual(true);
- });
-
- it("should return a component for custom protocols if the column type is URL", () => {
- expect(
- isElementOfType(
- formatUrl("myproto:some-custom-thing", {
- jsx: true,
- rich: true,
- column: { semantic_type: TYPE.URL },
- }),
- ExternalLink,
- ),
- ).toEqual(true);
- });
-
- it("should not return a component for bad urls if the column type is URL", () => {
- expect(
- formatUrl("invalid-blah-blah-blah", {
- jsx: true,
- rich: true,
- column: { semantic_type: TYPE.URL },
- }),
- ).toEqual("invalid-blah-blah-blah");
- });
-
- it("should not return a component for custom protocols if the column type isn't URL", () => {
- expect(
- formatUrl("myproto:some-custom-thing", { jsx: true, rich: true }),
- ).toEqual("myproto:some-custom-thing");
- });
-
- it("should not return a link component for unrecognized links in jsx mode", () => {
- expect(
- isElementOfType(
- formatUrl("metabase.com", { jsx: true, rich: true }),
- ExternalLink,
- ),
- ).toEqual(false);
- });
-
- it("should return a string for javascript:, data:, and other links in jsx mode", () => {
- expect(
- formatUrl("javascript:alert('pwnd')", { jsx: true, rich: true }),
- ).toEqual("javascript:alert('pwnd')");
- expect(
- formatUrl("data:text/plain;charset=utf-8,hello%20world", {
- jsx: true,
- rich: true,
- }),
- ).toEqual("data:text/plain;charset=utf-8,hello%20world");
- });
-
- describe("when view_as = link", () => {
- it("should return link component for type/URL and view_as = link", () => {
- const formatted = formatUrl("http://whatever", {
- jsx: true,
- rich: true,
- column: { semantic_type: TYPE.URL },
- view_as: "link",
- });
- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
- });
-
- it("should return link component using link_url and link_text when specified", () => {
- const formatted = formatUrl("http://not.metabase.com", {
- jsx: true,
- rich: true,
- link_text: "metabase link",
- link_url: "http://metabase.com",
- view_as: "link",
- clicked: {},
- });
-
- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
- expect(formatted.props.children).toEqual("metabase link");
- expect(formatted.props.href).toEqual("http://metabase.com");
- });
-
- it("should return link component using link_text and the value as url when link_url is empty", () => {
- const formatted = formatUrl("http://metabase.com", {
- jsx: true,
- rich: true,
- link_text: "metabase link",
- link_url: "",
- view_as: "link",
- clicked: {},
- });
-
- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
- expect(formatted.props.children).toEqual("metabase link");
- expect(formatted.props.href).toEqual("http://metabase.com");
- });
-
- it("should return link component using link_url and the value as text when link_text is empty", () => {
- const formatted = formatUrl("metabase link", {
- jsx: true,
- rich: true,
- link_text: "",
- link_url: "http://metabase.com",
- view_as: "link",
- clicked: {},
- });
-
- expect(isElementOfType(formatted, ExternalLink)).toEqual(true);
- expect(formatted.props.children).toEqual("metabase link");
- expect(formatted.props.href).toEqual("http://metabase.com");
- });
-
- it("should not return an ExternalLink in jsx + rich mode if there's click behavior", () => {
- const formatted = formatValue("http://metabase.com/", {
- jsx: true,
- rich: true,
- click_behavior: {
- linkTemplate: "foo",
- linkTextTemplate: "bar",
- linkType: "url",
- type: "link",
- },
- link_text: "metabase link",
- link_url: "http://metabase.com",
- view_as: "link",
- clicked: {},
- });
-
- // it is not a link set on the question level
- expect(isElementOfType(formatted, ExternalLink)).toEqual(false);
- // expect the text to be in a div (which has link formatting) rather than ExternalLink
- expect(formatted.props["data-testid"]).toEqual("link-formatted-text");
- });
- });
-
- it("should not crash if column is null", () => {
- expect(
- formatUrl("foobar", {
- jsx: true,
- rich: true,
- column: null,
- }),
- ).toEqual("foobar");
- });
- });
-
- describe("formatDateTimeWithUnit", () => {
- it("should format week ranges", () => {
- expect(
- formatDateTimeWithUnit("2019-07-07T00:00:00.000Z", "week", {
- type: "cell",
- }),
- ).toEqual("July 7, 2019 – July 13, 2019");
- });
-
- it("should always format week ranges according to returned data", () => {
- setSpanishLocale();
-
- expect(
- formatDateTimeWithUnit("2019-07-07T00:00:00.000Z", "week", {
- type: "cell",
- }),
- ).toEqual("julio 7, 2019 – julio 13, 2019");
-
- resetLocale();
- });
-
- it("should format days of week with default options", () => {
- expect(formatDateTimeWithUnit("mon", "day-of-week")).toEqual("Monday");
- });
-
- it("should format days of week with compact option", () => {
- const options = {
- compact: true,
- };
-
- expect(formatDateTimeWithUnit("sun", "day-of-week", options)).toEqual(
- "Sun",
- );
- });
-
- it("should format days of week with exclude option", () => {
- const options = {
- isExclude: true,
- };
-
- expect(
- formatDateTimeWithUnit("2022-04-25", "day-of-week", options),
- ).toEqual("Monday");
- });
-
- it("should format hours of day with exclude option", () => {
- const options = {
- isExclude: true,
- };
-
- expect(
- formatDateTimeWithUnit(
- "2022-04-27T06:00:00.000Z",
- "hour-of-day",
- options,
- ),
- ).toEqual("6 AM");
- });
-
- test.each([
- ["minute", "Wed, April 27, 2022, 6:00 AM"],
- ["hour", "Wed, April 27, 2022, 6:00 AM"],
- ["day", "Wed, April 27, 2022"],
- ["week", "Wed, April 27, 2022"],
- ["month", "April 2022"],
- ["year", "2022"],
- ])(
- "should include weekday when date unit is smaller than or equal to a week",
- (unit, formatted) => {
- const dateString = "2022-04-27T06:00:00.000Z";
-
- expect(
- formatDateTimeWithUnit(dateString, unit, {
- weekday_enabled: true,
- }),
- ).toEqual(formatted);
- },
- );
-
- describe("day-of-year formatting", () => {
- it("should format day-of-year as plain number", () => {
- expect(formatDateTimeWithUnit(1, "day-of-year")).toEqual(1);
- expect(formatDateTimeWithUnit(100, "day-of-year")).toEqual(100);
- expect(formatDateTimeWithUnit(365, "day-of-year")).toEqual(365);
- });
-
- it("should format day-of-year from date strings", () => {
- // January 1st = day 1
- expect(formatDateTimeWithUnit("2023-01-01", "day-of-year")).toEqual(1);
- // February 1st = day 32 (31 days in January + 1)
- expect(formatDateTimeWithUnit("2023-02-01", "day-of-year")).toEqual(32);
- // December 31st = day 365 (non-leap year)
- expect(formatDateTimeWithUnit("2023-12-31", "day-of-year")).toEqual(
- 365,
- );
- });
-
- it("should handle leap year correctly", () => {
- // December 31st in a leap year = day 366
- expect(formatDateTimeWithUnit("2020-12-31", "day-of-year")).toEqual(
- 366,
- );
- // February 29th in a leap year = day 60
- expect(formatDateTimeWithUnit("2020-02-29", "day-of-year")).toEqual(60);
- });
- });
-
- describe("week-of-year formatting", () => {
- it("should format week numbers with ordinal suffixes", () => {
- expect(formatDateTimeWithUnit(1, "week-of-year")).toEqual("1st");
- expect(formatDateTimeWithUnit(2, "week-of-year")).toEqual("2nd");
- expect(formatDateTimeWithUnit(3, "week-of-year")).toEqual("3rd");
- expect(formatDateTimeWithUnit(4, "week-of-year")).toEqual("4th");
- expect(formatDateTimeWithUnit(21, "week-of-year")).toEqual("21st");
- expect(formatDateTimeWithUnit(22, "week-of-year")).toEqual("22nd");
- expect(formatDateTimeWithUnit(23, "week-of-year")).toEqual("23rd");
- expect(formatDateTimeWithUnit(24, "week-of-year")).toEqual("24th");
- expect(formatDateTimeWithUnit(53, "week-of-year")).toEqual("53rd");
- });
-
- it("should handle edge cases for ordinal suffixes", () => {
- expect(formatDateTimeWithUnit(11, "week-of-year")).toEqual("11th");
- expect(formatDateTimeWithUnit(12, "week-of-year")).toEqual("12th");
- expect(formatDateTimeWithUnit(13, "week-of-year")).toEqual("13th");
- });
-
- it("should format week-of-year from date strings", () => {
- // January 1st, 2023 (Sunday) is in week 52 of 2022 (ISO week)
- const week1 = formatDateTimeWithUnit("2023-01-02", "week-of-year"); // Monday Jan 2 is week 1
- expect(week1).toMatch(/^1[a-z]+$/);
-
- // Mid-year dates
- const midYear = formatDateTimeWithUnit("2023-06-15", "week-of-year");
- expect(midYear).toMatch(/^2[0-9][a-z]+$/);
-
- // End of year
- const endYear = formatDateTimeWithUnit("2023-12-25", "week-of-year");
- expect(endYear).toMatch(/^5[0-3][a-z]+$/);
- });
-
- it("should remove square brackets from English ordinals", () => {
- expect(formatDateTimeWithUnit(1, "week-of-year")).toEqual("1st");
- expect(formatDateTimeWithUnit(2, "week-of-year")).toEqual("2nd");
- expect(formatDateTimeWithUnit(3, "week-of-year")).toEqual("3rd");
- });
-
- it("should handle non-English locales where ordinals are not wrapped in brackets (#66658)", () => {
- const originalLocale = dayjs.locale();
- try {
- require("dayjs/locale/fr");
- dayjs.locale("fr");
- expect(formatDateTimeWithUnit(1, "week-of-year")).toEqual("1er");
- expect(formatDateTimeWithUnit(2, "week-of-year")).toEqual("2");
- expect(formatDateTimeWithUnit(3, "week-of-year")).toEqual("3");
- } finally {
- dayjs.locale(originalLocale);
- }
- });
- });
- });
-
- describe("formatTime", () => {
- const FORMAT_TIME_TESTS = [
- ["01:02:03.456+07:00", "1:02 AM"],
- ["01:02", "1:02 AM"],
- ["22:29:59.26816+01:00", "10:29 PM"],
- ["22:29:59.412459+01:00", "10:29 PM"],
- ["19:14:42.926221+01:00", "7:14 PM"],
- ["19:14:42.13202+01:00", "7:14 PM"],
- ["13:38:58.987352+01:00", "1:38 PM"],
- ["13:38:58.001001+01:00", "1:38 PM"],
- ["17:01:23+01:00", "5:01 PM"],
- ];
-
- test.each(FORMAT_TIME_TESTS)(
- `formatTime(%p) to be %p`,
- (value, resultStr) => {
- const result = formatTime(value);
- expect(result).toBe(resultStr);
- },
- );
-
- it("should use options when formatting times", () => {
- const value = "20:34:56";
- const t12 = formatTime(value, "default", {});
- expect(t12).toBe("8:34 PM");
- const t24 = formatTime(value, "default", {
- time_enabled: "minutes",
- time_style: "HH:mm",
- });
- expect(t24).toBe("20:34");
- });
- });
-
- describe("formatTimeWithUnit", () => {
- it("should format hour-of day with default options", () => {
- expect(formatTimeWithUnit(8, "hour-of-day")).toEqual("8:00 AM");
- });
-
- it("should format hour-of-day with 12 hour clock", () => {
- const options = {
- time_style: "h:mm A",
- };
-
- expect(formatTimeWithUnit(14, "hour-of-day", options)).toEqual("2:00 PM");
- });
-
- it("should format hour-of-day with 24 hour clock", () => {
- const options = {
- time_style: "HH:mm",
- };
-
- expect(formatTimeWithUnit(14, "hour-of-day", options)).toEqual("14:00");
- });
-
- it("should format hour-of-day with custom precision", () => {
- const options = {
- time_style: "HH:mm",
- time_enabled: "seconds",
- };
-
- expect(formatTimeWithUnit(14.4, "hour-of-day", options)).toEqual(
- "14:00:00",
- );
- });
-
- it("should format hour-of-day with a custom format", () => {
- const options = {
- time_format: "HH",
- };
-
- expect(formatTimeWithUnit(14.4, "hour-of-day", options)).toEqual("14");
- });
- });
-
- describe("slugify", () => {
- it("should slugify Chinese", () => {
- expect(slugify("類型")).toEqual("%E9%A1%9E%E5%9E%8B");
- });
-
- it("should slugify multiple words", () => {
- expect(slugify("Test Parameter")).toEqual("test_parameter");
- });
-
- it("should slugify Russian", () => {
- expect(slugify("русский язык")).toEqual(
- "%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA",
- );
- });
-
- it("should slugify diacritics", () => {
- expect(slugify("än umlaut")).toEqual("%C3%A4n_umlaut");
- });
- });
-
- describe("getCurrencySymbol", () => {
- const currencySymbols = [
- ["USD", "$"],
- ["EUR", "€"],
- ["GBP", "£"],
- ["JPY", "¥"],
- ["CNY", "CN¥"],
- ["CAD", "CA$"],
- ["AUD", "AU$"],
- ["NZD", "NZ$"],
- ["HKD", "HK$"],
- ["BTC", "₿"],
- ["OOPS", "OOPS"],
- ];
-
- currencySymbols.forEach(([currency, symbol]) => {
- it(`should get a ${symbol} for ${currency}`, () => {
- expect(getCurrencySymbol(currency)).toEqual(symbol);
- });
- });
- });
-});
-
-function setSpanishLocale() {
- // globally set locale to es
- require("dayjs/locale/es");
- dayjs.locale("es");
- dayjs.updateLocale(dayjs.locale(), { weekStart: 0 });
-}
-
-function resetLocale() {
- dayjs.locale("en");
-}
diff --git a/frontend/test/metabase/lib/formatting/url.unit.spec.tsx b/frontend/test/metabase/lib/formatting/url.unit.spec.tsx
deleted file mode 100644
index 40bb227d0b9..00000000000
--- a/frontend/test/metabase/lib/formatting/url.unit.spec.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { setupSdkPlugins } from "__support__/enterprise";
-import { mockSettings } from "__support__/settings";
-import { render, screen } from "__support__/ui";
-import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
-import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";
-import { formatUrl } from "metabase/lib/formatting/url";
-import { createMockTokenFeatures } from "metabase-types/api/mocks";
-
-describe("formatUrl", () => {
- afterEach(() => {
- ensureMetabaseProviderPropsStore().cleanup();
- jest.restoreAllMocks();
- });
-
- it("calls handleLinkSdkPlugin and prevents default in SDK", async () => {
- mockSettings({
- "token-features": createMockTokenFeatures({ embedding_sdk: true }),
- });
- setupSdkPlugins();
- await mockIsEmbeddingSdk(true);
-
- const url = "https://example.com/dashboard/1";
- const handleLink = jest.fn().mockReturnValue({ handled: true });
-
- ensureMetabaseProviderPropsStore().setProps({
- pluginsConfig: { handleLink },
- });
-
- const node = formatUrl(url, { jsx: true, rich: true, view_as: "link" });
- render(node as unknown as JSX.Element);
-
- const link = screen.getByRole("link");
- // Manually creating the event instead of using fireEvent.click because we need to inspect
- // the defaultPrevented property of the event.
- const event = new MouseEvent("click", { bubbles: true, cancelable: true });
- link.dispatchEvent(event);
-
- expect(handleLink).toHaveBeenCalledWith(url);
- expect(event.defaultPrevented).toBe(true);
- });
-
- it("does not call handleLinkSdkPlugin in core app", async () => {
- await mockIsEmbeddingSdk(false);
-
- const url = "https://example.com/dashboard/2";
- const handleLink = jest.fn();
-
- ensureMetabaseProviderPropsStore().setProps({
- pluginsConfig: { handleLink },
- });
-
- const node = formatUrl(url, { jsx: true, rich: true, view_as: "link" });
- render(node as unknown as JSX.Element);
-
- const link = screen.getByRole("link");
- // Manually creating the event instead of using fireEvent.click because we need to inspect
- // the defaultPrevented property of the event.
- const event = new MouseEvent("click", { bubbles: true, cancelable: true });
- link.dispatchEvent(event);
-
- expect(handleLink).not.toHaveBeenCalled();
- expect(event.defaultPrevented).toBe(false);
- });
-});
diff --git a/jest.config.js b/jest.config.js
index c340a8ffd45..1a9004a0c9b 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -29,13 +29,13 @@ const baseConfig = {
* We want to exclude the SDK from the main app's bundle to reduce the bundle size.
*/
"sdk-iframe-embedding-ee-plugins":
- "<rootDir>/frontend/src/metabase/lib/noop.ts",
- "ee-plugins": "<rootDir>/frontend/src/metabase/lib/noop.ts",
+ "<rootDir>/frontend/src/metabase/utils/noop.ts",
+ "ee-plugins": "<rootDir>/frontend/src/metabase/utils/noop.ts",
/**
* Imports which are only applicable to the embedding sdk.
* As we use SDK components in new iframe embedding, we need to import them here.
**/
- "sdk-specific-imports": "<rootDir>/frontend/src/metabase/lib/noop.ts",
+ "sdk-specific-imports": "<rootDir>/frontend/src/metabase/utils/noop.ts",
/**
* Docs snippets are loaded as raw text (asset/source) in rspack.
* In Jest, mock them as plain strings.
diff --git a/package.json b/package.json
index c516190ab2e..a295e72ecf5 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
"js-cookie": "^2.1.2",
"js-yaml": "^4.1.1",
"json5": "2.2.2",
- "jspdf": "^4.2.1",
+ "jspdf": "^4.2.0",
"kbar": "0.1.0-beta.45",
"leaflet": "^1.2.0",
"leaflet-draw": "^0.4.9",
diff --git a/rspack.iframe-sdk-embed.config.js b/rspack.iframe-sdk-embed.config.js
index 04b322e4086..a1dfdf708b6 100644
--- a/rspack.iframe-sdk-embed.config.js
+++ b/rspack.iframe-sdk-embed.config.js
@@ -28,7 +28,7 @@ const DEV_PORT = process.env.MB_FRONTEND_DEV_PORT || 8080;
const resolveEnterprisePathOrNoop = (path) =>
process.env.MB_EDITION === "ee"
? ENTERPRISE_SRC_PATH + path
- : SRC_PATH + "/lib/noop";
+ : SRC_PATH + "/utils/noop";
module.exports = {
name: "iframe_sdk_embed_v1",
diff --git a/rspack.static-viz.config.js b/rspack.static-viz.config.js
index a3faf7cb57a..af723a406f7 100644
--- a/rspack.static-viz.config.js
+++ b/rspack.static-viz.config.js
@@ -127,7 +127,7 @@ module.exports = (env) => {
"ee-overrides":
process.env.MB_EDITION === "ee"
? ENTERPRISE_SRC_PATH + "/static-viz-overrides"
- : SRC_PATH + "/lib/noop",
+ : SRC_PATH + "/utils/noop",
},
fallback: {
crypto: require.resolve("crypto-browserify"),
diff --git a/src/metabase/dashboards/autoplace.clj b/src/metabase/dashboards/autoplace.clj
index cd32d0f57ec..f6ae534fcd1 100644
--- a/src/metabase/dashboards/autoplace.clj
+++ b/src/metabase/dashboards/autoplace.clj
@@ -1,7 +1,7 @@
(ns metabase.dashboards.autoplace
"NOTE: It's not SUPER high impact if it falls out of sync - hopefully both will place things in a reasonable spot - but
ideally this namespace should be kept in sync with
- [the frontend version](https://github.com/metabase/metabase/blob/master/frontend/src/metabase/lib/dashboard_grid.js)."
+ [the frontend version](https://github.com/metabase/metabase/blob/master/frontend/src/metabase/utils/dashboard_grid.js)."
(:require
[metabase.dashboards.constants :as dashboard.constants]))
@@ -23,7 +23,7 @@
"Where should a new card be placed on a tab, given the existing dashcards?
NOTE: almost identical in behavior to `getPositionForNewDashCard` in
- https://github.com/metabase/metabase/blob/master/frontend/src/metabase/lib/dashboard_grid.js
+ https://github.com/metabase/metabase/blob/master/frontend/src/metabase/utils/dashboard_grid.js
If you make changes here, we should keep the frontend version in sync.
diff --git a/src/metabase/pivot/core.cljc b/src/metabase/pivot/core.cljc
index 1a32686de35..d80a3827a8f 100644
--- a/src/metabase/pivot/core.cljc
+++ b/src/metabase/pivot/core.cljc
@@ -447,7 +447,7 @@
row-tree)))))
(defn display-name-for-col
- "Translated from frontend/src/metabase/lib/formatting/column.ts"
+ "Translated from frontend/src/metabase/utils/formatting/column.ts"
[column col-settings format-values?]
(or (if format-values?
(or