The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Move database utils into shared (#73353)
Fraser732860d361c3
diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsxindex 075ea69f07a..666a97f0ea3 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/DatabaseRoutingSection.tsx@@ -10,7 +10,6 @@ import {DatabaseInfoSection,DatabaseInfoSectionDivider,} from "metabase/admin/databases/components/DatabaseInfoSection";-import { hasDbRoutingEnabled } from "metabase/admin/databases/utils";import {skipToken,useListTransformsQuery,@@ -19,6 +18,7 @@ import {import { getErrorMessage } from "metabase/api/utils";import { useSetting } from "metabase/common/hooks";import { useToast } from "metabase/common/hooks/use-toast";+import { hasDbRoutingEnabled } from "metabase/common/utils/database";import { useSelector } from "metabase/redux";import { getUserIsAdmin } from "metabase/selectors/user";import {diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsxindex c34dc31f74b..bfeb2ed37a8 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DatabaseRoutingSection/utils.tsx@@ -7,7 +7,7 @@ import {hasFeature,hasTableEditingEnabled,hasWritableConnectionDetails,-} from "metabase/admin/databases/utils";+} from "metabase/common/utils/database";import { Text } from "metabase/ui";import type { Database } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/model_persistence/components/ModelCacheControl/ModelCacheControl.tsx b/enterprise/frontend/src/metabase-enterprise/model_persistence/components/ModelCacheControl/ModelCacheControl.tsxindex 89ecf4816a8..fc3f8f1117d 100644--- a/enterprise/frontend/src/metabase-enterprise/model_persistence/components/ModelCacheControl/ModelCacheControl.tsx+++ b/enterprise/frontend/src/metabase-enterprise/model_persistence/components/ModelCacheControl/ModelCacheControl.tsx@@ -1,6 +1,5 @@import { t } from "ttag";-import { hasFeature } from "metabase/admin/databases/utils";import {skipToken,useGetDatabaseQuery,@@ -8,6 +7,7 @@ import {useUnpersistModelMutation,} from "metabase/api";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";+import { hasFeature } from "metabase/common/utils/database";import { Switch, Tooltip } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type { ModelCacheRefreshStatus } from "metabase-types/api";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.tsxindex eeab9ccfe4b..c9b1936fd9e 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@@ -2,7 +2,6 @@ import { useMemo } from "react";import { t } from "ttag";import * as Yup from "yup";-import { hasFeature } from "metabase/admin/databases/utils";import {skipToken,useGetDatabaseQuery,@@ -10,6 +9,7 @@ import {} from "metabase/api";import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";+import { hasFeature } from "metabase/common/utils/database";import {Form,FormErrorMessage,diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsxindex 9d050e4c7b9..14c4c3fea3c 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/AdminDatabaseTableEditingSection.tsx@@ -7,8 +7,8 @@ import {Label,} from "metabase/admin/databases/components/DatabaseFeatureComponents";import { DatabaseInfoSection } from "metabase/admin/databases/components/DatabaseInfoSection";-import { hasDbRoutingEnabled } from "metabase/admin/databases/utils";import { Toggle } from "metabase/common/components/Toggle";+import { hasDbRoutingEnabled } from "metabase/common/utils/database";import { ALLOWED_ENGINES_FOR_TABLE_EDITING } from "metabase/databases/constants";import { Alert, Box, Flex, Icon } from "metabase/ui";import { getResponseErrorMessage } from "metabase/utils/errors";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.tsxindex daec01c573e..93cfd1ab063 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@@ -1,9 +1,9 @@-import { hasFeature } from "metabase/admin/databases/utils";import {skipToken,useGetDatabaseQuery,useListDatabasesQuery,} from "metabase/api";+import { hasFeature } from "metabase/common/utils/database";import { DatabaseDataSelector } from "metabase/querying/common/components/DataSelector";import { useSelector } from "metabase/redux";import { EditDefinitionButton } from "metabase/transforms/components/TransformEditor/EditDefinitionButton";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.tsxindex 55e97922c23..ffcb48bbc56 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@@ -6,12 +6,12 @@ import {DatabaseInfoSection,DatabaseInfoSectionDivider,} from "metabase/admin/databases/components/DatabaseInfoSection";+import { useUpdateDatabaseMutation } from "metabase/api";+import { useConfirmation } from "metabase/common/hooks/use-confirmation";import {hasDbRoutingEnabled,isDbModifiable,-} from "metabase/admin/databases/utils";-import { useUpdateDatabaseMutation } from "metabase/api";-import { useConfirmation } from "metabase/common/hooks/use-confirmation";+} from "metabase/common/utils/database";import type { WritableConnectionInfoSectionProps } from "metabase/plugins/oss/writable-connection";import { Alert, Button, Group, Icon } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsxindex da87c2fc9d8..4239577a830 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx@@ -8,13 +8,13 @@ import {useSyncDatabaseSchemaMutation,} from "metabase/api";import { ActionButton } from "metabase/common/components/ActionButton";+import { isDbModifiable } from "metabase/common/utils/database";import { Tables } from "metabase/entities/tables";import { useDispatch } from "metabase/redux";import { Button, Flex, Tooltip } from "metabase/ui";import { isSyncCompleted } from "metabase/utils/syncing";import type { Database } from "metabase-types/api";-import { isDbModifiable } from "../../utils";import { DatabaseConnectionHealthInfo } from "../DatabaseConnectionHealthInfo";import {DatabaseInfoSection,diff --git a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsxindex 7bbb8052b20..7995e2bc52d 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseEditConnectionForm.tsx@@ -10,6 +10,7 @@ import { GenericError } from "metabase/common/components/ErrorPages";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";+import { isDbModifiable } from "metabase/common/utils/database";import { DatabaseForm } from "metabase/databases/components/DatabaseForm";import type {DatabaseFormConfig,@@ -25,7 +26,6 @@ import type {} from "metabase-types/api";import { saveDatabase } from "../database";-import { isDbModifiable } from "../utils";const makeDefaultSaveDbFn =(dispatch: Dispatch) =>diff --git a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.tsxindex 72fa592020f..eba5ad1e015 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/DatabaseModelFeaturesSection.tsx@@ -1,14 +1,14 @@import { useCallback } from "react";import { t } from "ttag";-import { Flex } from "metabase/ui";-import type { Database, DatabaseData, DatabaseId } from "metabase-types/api";-import {hasActionsEnabled,hasDbRoutingEnabled,hasFeature,-} from "../../utils";+} from "metabase/common/utils/database";+import { Flex } from "metabase/ui";+import type { Database, DatabaseData, DatabaseId } from "metabase-types/api";+import { DatabaseInfoSection } from "../DatabaseInfoSection";import { ModelActionsSection } from "./ModelActionsSection";diff --git a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsx b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsxindex cce7dca4ffd..31a175ba982 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseModelFeaturesSection/ModelCachingControl/ModelCachingControl.tsx@@ -1,13 +1,13 @@import { useState } from "react";import { jt, t } from "ttag";-import { hasFeature } from "metabase/admin/databases/utils";import {usePersistDatabaseMutation,useUnpersistDatabaseMutation,} from "metabase/api";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl, useSetting } from "metabase/common/hooks";+import { hasFeature } from "metabase/common/utils/database";import { Alert, Box, Flex, Icon, Switch } from "metabase/ui";import { getModelCacheSchemaName } from "metabase-lib/v1/metadata/utils/models";import type { Database } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/databases/utils.ts b/frontend/src/metabase/common/utils/database.tssimilarity index 100%rename from frontend/src/metabase/admin/databases/utils.tsrename to frontend/src/metabase/common/utils/database.tsdiff --git a/frontend/src/metabase/admin/databases/utils.unit.spec.ts b/frontend/src/metabase/common/utils/database.unit.spec.tssimilarity index 99%rename from frontend/src/metabase/admin/databases/utils.unit.spec.tsrename to frontend/src/metabase/common/utils/database.unit.spec.tsindex df060337dfc..8bf3a4fbb63 100644--- a/frontend/src/metabase/admin/databases/utils.unit.spec.ts+++ b/frontend/src/metabase/common/utils/database.unit.spec.ts@@ -4,7 +4,7 @@ import {dashboardUsesRoutingEnabledDatabases,hasDbRoutingEnabled,questionUsesRoutingEnabledDatabase,-} from "./utils";+} from "./database";describe("database routing utility functions", () => {const mockDatabases: Pick<Database, "id" | "router_user_attribute">[] = [diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/utils.ts b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/utils.tsindex 7123e293749..e9108267eaf 100644--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/utils.ts+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/utils.ts@@ -4,7 +4,7 @@ import {isImplicitDeleteAction,isImplicitUpdateAction,} from "metabase/actions/utils";-import { hasActionsEnabled } from "metabase/admin/databases/utils";+import { hasActionsEnabled } from "metabase/common/utils/database";import { extractRemappedColumns } from "metabase/visualizations";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import { findColumnIndexesForColumnSettings } from "metabase-lib/v1/queries/utils/dataset";diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsxindex 4804cd902b1..c925f9459fe 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Authentication/DatabaseRoutingWarning.tsx@@ -1,11 +1,11 @@import { useMemo } from "react";import { t } from "ttag";+import { useListDatabasesQuery } from "metabase/api";import {dashboardUsesRoutingEnabledDatabases,questionUsesRoutingEnabledDatabase,-} from "metabase/admin/databases/utils";-import { useListDatabasesQuery } from "metabase/api";+} from "metabase/common/utils/database";import type {EmbedResource,GuestEmbedResourceType,diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsxindex 96eb0e116db..ae6caaf43bf 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx@@ -4,7 +4,6 @@ import { t } from "ttag";import _ from "underscore";import type * as Yup from "yup";-import { hasFeature } from "metabase/admin/databases/utils";import {skipToken,useGetDatabaseQuery,@@ -12,6 +11,7 @@ import {} from "metabase/api";import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { hasFeature } from "metabase/common/utils/database";import {Form,FormErrorMessage,diff --git a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsxindex a691f3e993b..c796385d29e 100644--- a/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx+++ b/frontend/src/metabase/transforms/pages/TransformSettingsPage/TransformSettingsSection/UpdateTargetModal/UpdateTargetModal.tsx@@ -2,7 +2,6 @@ import { useMemo, useState } from "react";import { jt, t } from "ttag";import * as Yup from "yup";-import { hasFeature } from "metabase/admin/databases/utils";import {skipToken,useDeleteTransformTargetMutation,@@ -11,6 +10,7 @@ import {useUpdateTransformMutation,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { hasFeature } from "metabase/common/utils/database";import {Form,FormErrorMessage,diff --git a/frontend/src/metabase/transforms/utils.ts b/frontend/src/metabase/transforms/utils.tsindex 141d7970a8e..959e37f80fd 100644--- a/frontend/src/metabase/transforms/utils.ts+++ b/frontend/src/metabase/transforms/utils.ts@@ -1,8 +1,8 @@import { t } from "ttag";import _ from "underscore";-import { hasFeature } from "metabase/admin/databases/utils";import type { OmniPickerCollectionItem } from "metabase/common/components/Pickers/EntityPicker/types";+import { hasFeature } from "metabase/common/utils/database";import { parseTimestamp } from "metabase/utils/time-dayjs";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";