Skip to content

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

Fix utils violations (#74038)

Fraser892e0db14a14
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AiFeatureAccessTable.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AiFeatureAccessTable.tsx
index b202a1462d0..684bb197b04 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AiFeatureAccessTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/components/AiFeatureAccessTable/AiFeatureAccessTable.tsx
@@ -1,12 +1,12 @@
import { useMemo } from "react";
import { c, t } from "ttag";
-import { Box, Card, TreeTable } from "metabase/ui";
import {
isAdminGroup,
isDefaultGroup,
isDefaultTenantGroup,
-} from "metabase/utils/groups";
+} from "metabase/admin/utils/groups";
+import { Box, Card, TreeTable } from "metabase/ui";
import { AdvancedGroupModeButton } from "./AdvancedGroupMode";
import S from "./AiFeatureAccessTable.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 c6d45da3e01..a829aaf8ea5 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
@@ -2,11 +2,11 @@ import { useMemo, useState } from "react";
import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
+import { isDefaultGroup } from "metabase/admin/utils/groups";
import { useListPermissionsGroupsQuery } from "metabase/api";
import { useSetting } from "metabase/common/hooks";
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 439fed5fe5f..e380881d42a 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
@@ -3,10 +3,10 @@ import { useEffect, useMemo, useState } from "react";
import { t } from "ttag";
import { isEmpty } from "underscore";
+import { isDefaultGroup } from "metabase/admin/utils/groups";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Group, NumberInput, Stack, Text } from "metabase/ui";
-import { isDefaultGroup } from "metabase/utils/groups";
import { useUpdateAIControlsGroupLimitMutation } from "metabase-enterprise/api";
import type { GroupInfo } from "metabase-types/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
index e7c760b56e9..e5b84c58f6c 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
@@ -9,8 +9,11 @@ import {
getDefaultGroup,
getOrderedGroups,
} from "metabase/admin/permissions/selectors/data-permissions/groups";
+import {
+ getGroupNameLocalized,
+ isAdminGroup,
+} from "metabase/admin/utils/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/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
index 9f7b11e6f6b..9f133b32923 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { msgid, ngettext, t } from "ttag";
import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";
+import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
import {
skipToken,
useListPermissionsGroupsQuery,
@@ -23,7 +24,6 @@ import {
Title,
} from "metabase/ui";
import * as Urls from "metabase/urls";
-import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
import { getUserName } from "metabase/utils/user";
import { useGetTenantQuery } from "metabase-enterprise/api";
import * as EnterpriseUrls from "metabase-enterprise/urls";
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 7a76c944483..61029920754 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
@@ -17,6 +17,11 @@ import {
DataPermissionType,
type PermissionEditorType,
} from "metabase/admin/permissions/types";
+import {
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/admin/utils/groups";
import {
Collections,
ROOT_COLLECTION,
@@ -24,11 +29,6 @@ import {
} from "metabase/entities/collections";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { ExpandedCollection, State } from "metabase/redux/store";
-import {
- getGroupNameLocalized,
- isAdminGroup,
- isDefaultGroup,
-} from "metabase/utils/groups";
import { isNotNull } from "metabase/utils/types";
import type {
Collection,
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 56963a555de..ba03a13024d 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
@@ -16,6 +16,11 @@ import {
DataPermissionType,
type PermissionEditorType,
} from "metabase/admin/permissions/types";
+import {
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/admin/utils/groups";
import { findCollectionById } from "metabase/common/utils/collections";
import {
Collections,
@@ -24,11 +29,6 @@ import {
} from "metabase/entities/collections";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { ExpandedCollection, State } from "metabase/redux/store";
-import {
- getGroupNameLocalized,
- isAdminGroup,
- isDefaultGroup,
-} from "metabase/utils/groups";
import { isNotNull } from "metabase/utils/types";
import type {
CollectionId,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
index 95be98f6c61..b09ea2a2716 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
@@ -7,6 +7,7 @@ import { NewUserModal } from "metabase/admin/people/containers/NewUserModal";
import { UserActivationModal } from "metabase/admin/people/containers/UserActivationModal";
import { UserPasswordResetModal } from "metabase/admin/people/containers/UserPasswordResetModal";
import { UserSuccessModal } from "metabase/admin/people/containers/UserSuccessModal";
+import { getGroupNameLocalized } from "metabase/admin/utils/groups";
import {
useGetCollectionQuery,
useListCollectionsTreeQuery,
@@ -27,7 +28,6 @@ import { useSelector } from "metabase/redux";
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 { useListTenantsQuery } from "metabase-enterprise/api";
import { hasPremiumFeature } from "metabase-enterprise/settings";
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index 25dc86ef4df..f9059494e2c 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -24,7 +24,7 @@ const elements = [
pattern: "frontend/src/metabase/schema.js",
mode: "full",
}),
- createElement({ type: "lib", name: "utils" }),
+ createElement({ type: "lib", name: "utils", enforceOutgoing: true }),
createElement({ type: "lib", name: "analytics", enforceOutgoing: true }),
createElement({ type: "lib", name: "css", enforceOutgoing: true }),
createElement({
diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
index d96c379f880..ea5bbcbfe5a 100644
--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
@@ -3,6 +3,12 @@ import { msgid, ngettext, t } from "ttag";
import { AdminPaneLayout } from "metabase/admin/components/AdminPaneLayout";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
+import {
+ canEditMembership,
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/admin/utils/groups";
import {
useCreateMembershipMutation,
useDeleteMembershipMutation,
@@ -13,12 +19,6 @@ import { useToast } from "metabase/common/hooks/use-toast";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import { useDispatch } from "metabase/redux";
import { Box, Button, Text } from "metabase/ui";
-import {
- canEditMembership,
- getGroupNameLocalized,
- isAdminGroup,
- isDefaultGroup,
-} from "metabase/utils/groups";
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 3f17c0f360d..ea8e7fc9c21 100644
--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
@@ -3,6 +3,7 @@ import { t } from "ttag";
import _ from "underscore";
import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
+import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
import { Link } from "metabase/common/components/Link";
import { PaginationControls } from "metabase/common/components/PaginationControls";
import { usePagination } from "metabase/common/hooks/use-pagination";
@@ -10,7 +11,6 @@ import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getUser } from "metabase/selectors/user";
import { Box, Flex, Icon, Text, Tooltip, UnstyledButton } from "metabase/ui";
-import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
import { getFullName } from "metabase/utils/user";
import type { Group, Member, Membership } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/people/components/GroupSummary.tsx b/frontend/src/metabase/admin/people/components/GroupSummary.tsx
index 9f3a5c89e00..d9687371456 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/admin/utils/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 f21b9d98f3e..147711705c8 100644
--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
@@ -5,6 +5,11 @@ import _ from "underscore";
import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
import { AdminPaneLayout } from "metabase/admin/components/AdminPaneLayout";
+import {
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/admin/utils/groups";
import { useListApiKeysQuery } from "metabase/api";
import { getErrorMessage } from "metabase/api/utils";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
@@ -22,11 +27,6 @@ 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";
diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
index 9f28527a5a6..c556be3038e 100644
--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
@@ -2,14 +2,14 @@ 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/utils/groups";
+} from "metabase/admin/utils/groups";
+import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
+import { Box, Divider, Flex, Icon, Popover } from "metabase/ui";
import { isNotNull } from "metabase/utils/types";
import type { GroupInfo, Member } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/people/forms/UserForm.tsx b/frontend/src/metabase/admin/people/forms/UserForm.tsx
index 66cea3b875a..bb76d4f4b9e 100644
--- a/frontend/src/metabase/admin/people/forms/UserForm.tsx
+++ b/frontend/src/metabase/admin/people/forms/UserForm.tsx
@@ -5,6 +5,7 @@ import _ from "underscore";
import * as Yup from "yup";
import { MembershipSelect } from "metabase/admin/people/components/MembershipSelect";
+import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
import { useListPermissionsGroupsQuery } from "metabase/api";
import { FormField } from "metabase/common/components/FormField";
import { FormFooter } from "metabase/common/components/FormFooter";
@@ -21,7 +22,6 @@ import {
} from "metabase/plugins";
import { Button } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
-import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
import type { GroupId, Member, User, UserId } from "metabase-types/api";
const localUserSchema = Yup.object({
diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
index 19e66edc0ba..4d6c542b954 100644
--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
@@ -2,6 +2,7 @@ import type { ReactNode } from "react";
import type { Route } from "react-router";
import { useAsync } from "react-use";
+import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
import {
skipToken,
useGetDatabaseMetadataQuery,
@@ -11,7 +12,6 @@ import { Databases } from "metabase/entities/databases";
import { useDispatch, useSelector } from "metabase/redux";
import { getSetting } from "metabase/selectors/settings";
import { Center, Loader } from "metabase/ui";
-import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";
import type Database from "metabase-lib/v1/metadata/Database";
import type { DatabaseId, GroupInfo } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
index c4d4d97c54b..327000adde6 100644
--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
@@ -3,6 +3,12 @@ import { getIn } from "icepick";
import { t } from "ttag";
import _ from "underscore";
+import {
+ getGroupNameLocalized,
+ getGroupSortOrder,
+ getSpecialGroupType,
+ isDefaultGroup,
+} from "metabase/admin/utils/groups";
import {
isInstanceAnalyticsCollection,
isLibraryCollection,
@@ -20,12 +26,6 @@ import type {
ExpandedCollection,
State,
} from "metabase/redux/store";
-import {
- getGroupNameLocalized,
- getGroupSortOrder,
- getSpecialGroupType,
- isDefaultGroup,
-} from "metabase/utils/groups";
import { isNotNull } from "metabase/utils/types";
import type {
Collection,
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 6171e35d03e..1374e1e4d46 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,8 +1,8 @@
import { createSelector } from "@reduxjs/toolkit";
import { t } from "ttag";
+import { getGroupNameLocalized } from "metabase/admin/utils/groups";
import type { State } from "metabase/redux/store";
-import { getGroupNameLocalized } from "metabase/utils/groups";
import type { Group } from "metabase-types/api";
import type { PermissionsSidebarContentProps } from "../../components/PermissionsSidebar/PermissionsSidebarContent";
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 c283de0429d..4a5b3513150 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts
@@ -1,15 +1,15 @@
import { createSelector } from "@reduxjs/toolkit";
import _ from "underscore";
-import { permissionApi } from "metabase/api";
-import { PLUGIN_TENANTS } from "metabase/plugins";
-import type { State } from "metabase/redux/store";
import {
getGroupSortOrder,
isAdminGroup,
isDataAnalystGroup,
isDefaultGroup,
-} from "metabase/utils/groups";
+} from "metabase/admin/utils/groups";
+import { permissionApi } from "metabase/api";
+import { PLUGIN_TENANTS } from "metabase/plugins";
+import type { State } from "metabase/redux/store";
import type { Group, GroupId } 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 b15c8eb478f..34cf896615a 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
@@ -3,6 +3,10 @@ import { createSelector } from "@reduxjs/toolkit";
import { msgid, ngettext, t } from "ttag";
import _ from "underscore";
+import {
+ getSpecialGroupType,
+ isDefaultGroup,
+} from "metabase/admin/utils/groups";
import { getPlan } from "metabase/common/utils/plan";
import { getIsHosted } from "metabase/databases/selectors";
import { Tables } from "metabase/entities/tables";
@@ -15,7 +19,6 @@ import type { State } from "metabase/redux/store";
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";
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 9364b1da6ee..afb32cb6e00 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
@@ -5,11 +5,11 @@ import { t } from "ttag";
import _ from "underscore";
import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
+import { isDefaultGroup } from "metabase/admin/utils/groups";
import { getErrorMessage } from "metabase/api/utils/errors";
import CS from "metabase/css/core/index.css";
import { FormSwitch } from "metabase/forms";
import { Icon, Tooltip } from "metabase/ui";
-import { isDefaultGroup } from "metabase/utils/groups";
import type { GroupId, GroupInfo } 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 9eefdc21af8..674d11bd274 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
@@ -3,16 +3,16 @@ import { t } from "ttag";
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/utils/groups";
+} from "metabase/admin/utils/groups";
+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 { isNotNull } from "metabase/utils/types";
import type { GroupInfo } from "metabase-types/api";
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 2f5a3ebf1ac..ff10978cc37 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
@@ -7,11 +7,11 @@ import type {
DeleteMappingModalValueType,
GroupIds,
} from "metabase/admin/types";
+import { isAdminGroup } from "metabase/admin/utils/groups";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
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/utils/groups.ts b/frontend/src/metabase/admin/utils/groups.ts
similarity index 100%
rename from frontend/src/metabase/utils/groups.ts
rename to frontend/src/metabase/admin/utils/groups.ts
diff --git a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx
index 50341510a96..cc7a4d43646 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/utils/dom";
+import { getUrlTarget } from "metabase/visualizations/lib/open-url";
import S from "./ExternalLink.module.css";
diff --git a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
index 41817309f0b..8d4a99c032a 100644
--- a/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
+++ b/frontend/src/metabase/dashboard/visualizations/LinkViz/LinkViz.tsx
@@ -8,7 +8,7 @@ import { getParameterValues } from "metabase/dashboard/selectors";
import { SearchResults } from "metabase/nav/components/search/SearchResults";
import { useSelector } from "metabase/redux";
import { modelToUrl } from "metabase/urls";
-import { getUrlTarget } from "metabase/utils/dom";
+import { getUrlTarget } from "metabase/visualizations/lib/open-url";
import { fillParametersInText } from "metabase/visualizations/shared/utils/parameter-substitution";
import type {
Dashboard,
diff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.ts
index 52cb16e8b20..88214a99c00 100644
--- a/frontend/src/metabase/query_builder/actions/core/core.ts
+++ b/frontend/src/metabase/query_builder/actions/core/core.ts
@@ -24,9 +24,9 @@ import type { Dispatch, GetState } from "metabase/redux/store";
import { getMetadata } from "metabase/selectors/metadata";
import * as Urls from "metabase/urls";
import { clone } from "metabase/utils/clone";
-import { shouldOpenInBlankWindow } from "metabase/utils/dom";
import { isNotNull } from "metabase/utils/types";
import { getDefaultSize } from "metabase/visualizations";
+import { shouldOpenInBlankWindow } from "metabase/visualizations/lib/open-url";
import { getCardAfterVisualizationClick } from "metabase/visualizations/lib/utils";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/redux/app.ts b/frontend/src/metabase/redux/app.ts
index 08cad945e7b..5bf4179832a 100644
--- a/frontend/src/metabase/redux/app.ts
+++ b/frontend/src/metabase/redux/app.ts
@@ -13,11 +13,8 @@ import type {
TempStorageKey,
TempStorageValue,
} from "metabase/redux/store";
-import {
- isSmallScreen,
- openInBlankWindow,
- shouldOpenInBlankWindow,
-} from "metabase/utils/dom";
+import { isSmallScreen, openInBlankWindow } from "metabase/utils/dom";
+import { shouldOpenInBlankWindow } from "metabase/visualizations/lib/open-url";
interface LocationChangeAction {
type: string; // "@@router/LOCATION_CHANGE"
diff --git a/frontend/src/metabase/utils/dom.ts b/frontend/src/metabase/utils/dom.ts
index 83e68fb245e..14c230edade 100644
--- a/frontend/src/metabase/utils/dom.ts
+++ b/frontend/src/metabase/utils/dom.ts
@@ -1,13 +1,7 @@
-import querystring from "querystring";
-
-import type { LocationDescriptor, LocationDescriptorObject } from "history";
import _ from "underscore";
-import { handleLinkSdkPlugin } from "embedding-sdk-shared/lib/sdk-global-plugins";
-import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { isWithinIframe } from "metabase/utils/iframe";
import MetabaseSettings from "metabase/utils/settings";
-import { isObject } from "metabase-types/guards";
import { checkNotNull } from "./types";
@@ -69,34 +63,7 @@ export function getSitePath(): string {
return new URL(siteUrl).pathname.toLowerCase();
}
-function isMetabaseUrl(url: string): boolean {
- const urlPath = new URL(url, window.location.origin).pathname.toLowerCase();
-
- if (!isAbsoluteUrl(url)) {
- return true;
- }
-
- const pathNameWithoutSubPath = getPathnameWithoutSubPath(urlPath);
- const isPublicLink = pathNameWithoutSubPath.startsWith("/public/");
- const isEmbedding = pathNameWithoutSubPath.startsWith("/embed/");
- /**
- * (metabase#38640) We don't want to use client-side navigation for public links or embedding
- * because public app, or embed app are built using separate routes.
- **/
- if (isPublicLink || isEmbedding) {
- return false;
- }
-
- return isSameOrSiteUrlOrigin(url) && urlPath.startsWith(getSitePath());
-}
-
-function isAbsoluteUrl(url: string): boolean {
- return ["/", "http:", "https:", "mailto:"].some((prefix) =>
- url.startsWith(prefix),
- );
-}
-
-function getWithSiteUrl(url: string): string {
+export function getWithSiteUrl(url: string): string {
const siteUrl = MetabaseSettings.get("site-url");
return url.startsWith("/") ? (siteUrl ?? "") + url : url;
}
@@ -110,79 +77,11 @@ export function forceRedraw(domNode: HTMLElement): void {
domNode.style.display = "";
}
-// need to keep track of the latest click's state because sometimes
-// `open` is called asynchronously, thus window.event isn't the click event
-let metaKey: boolean = false;
-let ctrlKey: boolean = false;
-window.addEventListener(
- "mouseup",
- (e: MouseEvent) => {
- metaKey = e.metaKey;
- ctrlKey = e.ctrlKey;
- },
- true,
-);
-
-type OpenOptions = {
- openInSameWindow?: (url: string) => void;
- openInBlankWindow?: (url: string) => void;
- openInSameOrigin?: (location: LocationDescriptorObject) => void;
- ignoreSiteUrl?: boolean;
-} & ShouldOpenInBlankWindowOptions;
-
-/**
- * helper for opening links in same or different window depending on origin and
- * meta key state
- */
-export async function open(
- url: string,
- {
- // custom function for opening in same window
- openInSameWindow = (url: string) => clickLink(url, false),
- // custom function for opening in new window
- openInBlankWindow = (url: string) => clickLink(url, true),
- // custom function for opening in same app instance
- openInSameOrigin,
- ignoreSiteUrl = false,
- ...options
- }: OpenOptions = {},
-): Promise<void> {
- url = ignoreSiteUrl ? url : getWithSiteUrl(url);
-
- // In the sdk, allow the host app to override how to open links
- if (isEmbeddingSdk()) {
- const result = await handleLinkSdkPlugin(url);
- if (result.handled) {
- // Plugin handled the link, don't continue with default behavior
- return;
- }
- }
-
- if (shouldOpenInBlankWindow(url, options)) {
- openInBlankWindow(url);
- } else if (isSameOrigin(url)) {
- if (!isMetabaseUrl(url)) {
- clickLink(url, false);
- } else if (openInSameOrigin) {
- const location = getLocation(url);
- if (isObject(location) && "pathname" in location) {
- openInSameOrigin(location);
- } else {
- openInSameWindow(url);
- }
- } else {
- openInSameWindow(url);
- }
- } else {
- openInSameWindow(url);
- }
-}
-
export function openInBlankWindow(url: string): void {
clickLink(getWithSiteUrl(url), true);
}
-function clickLink(url: string, blank = false): void {
+export function clickLink(url: string, blank = false): void {
const a = document.createElement("a");
a.style.display = "none";
document.body.appendChild(a);
@@ -198,44 +97,6 @@ function clickLink(url: string, blank = false): void {
}
}
-type ShouldOpenInBlankWindowOptions = {
- event?: MouseEvent | null;
- blank?: boolean;
- blankOnMetaOrCtrlKey?: boolean;
- blankOnDifferentOrigin?: boolean;
-};
-
-export function shouldOpenInBlankWindow(
- url: string,
- {
- event = (typeof window !== "undefined" ? window.event : undefined) as
- | MouseEvent
- | undefined,
- // always open in new window
- blank = false,
- // open in new window if command-click
- blankOnMetaOrCtrlKey = true,
- // open in new window for different origin
- blankOnDifferentOrigin = true,
- }: ShouldOpenInBlankWindowOptions = {},
-): boolean {
- if (isEmbeddingSdk()) {
- // always open in new window in modular embedding (react SDK + modular embedding)
- return true;
- }
- const isMetaKey = event && event.metaKey != null ? event.metaKey : metaKey;
- const isCtrlKey = event && event.ctrlKey != null ? event.ctrlKey : ctrlKey;
-
- if (blank) {
- return true;
- } else if (blankOnMetaOrCtrlKey && (isMetaKey || isCtrlKey)) {
- return true;
- } else if (blankOnDifferentOrigin && !isSameOrSiteUrlOrigin(url)) {
- return true;
- }
- return false;
-}
-
const getOrigin = (url: string): string | null => {
try {
return new URL(url, window.location.origin).origin;
@@ -244,21 +105,6 @@ const getOrigin = (url: string): string | null => {
}
};
-const getLocation = (url: string): LocationDescriptor => {
- try {
- const { pathname, search, hash } = new URL(url, window.location.origin);
- const query = querystring.parse(search.substring(1));
- return {
- pathname: getPathnameWithoutSubPath(pathname),
- search,
- query,
- hash,
- };
- } catch {
- return {};
- }
-};
-
export function getPathnameWithoutSubPath(pathname: string): string {
const pathnameSections = pathname.split("/");
const sitePathSections = getSitePath().split("/");
@@ -302,17 +148,6 @@ export function isSameOrSiteUrlOrigin(url: string): boolean {
return isSameOrigin(url) || isSiteUrlOrigin(url);
}
-export function getUrlTarget(
- url: string | undefined,
-): "_self" | "_blank" | undefined {
- if (isEmbeddingSdk()) {
- // always open in new window in modular embedding (react SDK + modular embedding)
- return "_blank";
- }
-
- return url == null || isSameOrSiteUrlOrigin(url) ? "_self" : "_blank";
-}
-
export function initializeIframeResizer(onReady = () => {}): void {
if (!isWithinIframe()) {
return;
diff --git a/frontend/src/metabase/visualizations/lib/action.ts b/frontend/src/metabase/visualizations/lib/action.ts
index 00576740f25..ff6c08d0f1b 100644
--- a/frontend/src/metabase/visualizations/lib/action.ts
+++ b/frontend/src/metabase/visualizations/lib/action.ts
@@ -3,7 +3,6 @@ import { push } from "react-router-redux";
import _ from "underscore";
import type { Dispatch } from "metabase/redux/store";
-import { open } from "metabase/utils/dom";
import type Question from "metabase-lib/v1/Question";
import type {
@@ -12,6 +11,8 @@ import type {
QuestionChangeClickAction,
} from "../types";
+import { openUrl } from "./open-url";
+
type ActionProps = {
dispatch: Dispatch;
onChangeCardAndRun?: OnChangeCardAndRun;
@@ -43,7 +44,7 @@ export function performAction(
const url = action.url();
const ignoreSiteUrl = action.ignoreSiteUrl;
if (url) {
- open(url, {
+ openUrl(url, {
openInSameOrigin: (location) => {
if (props.onSameOriginNavigation) {
props.onSameOriginNavigation(location);
diff --git a/frontend/src/metabase/visualizations/lib/open-url.ts b/frontend/src/metabase/visualizations/lib/open-url.ts
new file mode 100644
index 00000000000..6a0729dc62a
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/open-url.ts
@@ -0,0 +1,175 @@
+import querystring from "querystring";
+
+import type { LocationDescriptor, LocationDescriptorObject } from "history";
+
+import { handleLinkSdkPlugin } from "embedding-sdk-shared/lib/sdk-global-plugins";
+import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
+import {
+ clickLink,
+ getPathnameWithoutSubPath,
+ getSitePath,
+ getWithSiteUrl,
+ isSameOrSiteUrlOrigin,
+ isSameOrigin,
+} from "metabase/utils/dom";
+import { isObject } from "metabase-types/guards";
+
+// need to keep track of the latest click's state because sometimes
+// `openUrl` is called asynchronously, thus window.event isn't the click event
+let metaKey: boolean = false;
+let ctrlKey: boolean = false;
+window.addEventListener(
+ "mouseup",
+ (e: MouseEvent) => {
+ metaKey = e.metaKey;
+ ctrlKey = e.ctrlKey;
+ },
+ true,
+);
+
+type ShouldOpenInBlankWindowOptions = {
+ event?: MouseEvent | null;
+ blank?: boolean;
+ blankOnMetaOrCtrlKey?: boolean;
+ blankOnDifferentOrigin?: boolean;
+};
+
+export function shouldOpenInBlankWindow(
+ url: string,
+ {
+ event = (typeof window !== "undefined" ? window.event : undefined) as
+ | MouseEvent
+ | undefined,
+ // always open in new window
+ blank = false,
+ // open in new window if command-click
+ blankOnMetaOrCtrlKey = true,
+ // open in new window for different origin
+ blankOnDifferentOrigin = true,
+ }: ShouldOpenInBlankWindowOptions = {},
+): boolean {
+ if (isEmbeddingSdk()) {
+ // always open in new window in modular embedding (react SDK + modular embedding)
+ return true;
+ }
+ const isMetaKey = event && event.metaKey != null ? event.metaKey : metaKey;
+ const isCtrlKey = event && event.ctrlKey != null ? event.ctrlKey : ctrlKey;
+
+ if (blank) {
+ return true;
+ } else if (blankOnMetaOrCtrlKey && (isMetaKey || isCtrlKey)) {
+ return true;
+ } else if (blankOnDifferentOrigin && !isSameOrSiteUrlOrigin(url)) {
+ return true;
+ }
+ return false;
+}
+
+export function getUrlTarget(
+ url: string | undefined,
+): "_self" | "_blank" | undefined {
+ if (isEmbeddingSdk()) {
+ // always open in new window in modular embedding (react SDK + modular embedding)
+ return "_blank";
+ }
+
+ return url == null || isSameOrSiteUrlOrigin(url) ? "_self" : "_blank";
+}
+
+export type OpenUrlOptions = {
+ openInSameWindow?: (url: string) => void;
+ openInBlankWindow?: (url: string) => void;
+ openInSameOrigin?: (location: LocationDescriptorObject) => void;
+ ignoreSiteUrl?: boolean;
+} & ShouldOpenInBlankWindowOptions;
+
+/**
+ * Opens a URL using the most appropriate strategy: in the current window,
+ * a new tab, or via client-side navigation when it's an in-app Metabase URL.
+ * Honours the embedding SDK's `handleLink` plugin if installed.
+ */
+export async function openUrl(
+ url: string,
+ {
+ // custom function for opening in same window
+ openInSameWindow = (url: string) => clickLink(url, false),
+ // custom function for opening in new window
+ openInBlankWindow = (url: string) => clickLink(url, true),
+ // custom function for opening in same app instance
+ openInSameOrigin,
+ ignoreSiteUrl = false,
+ ...options
+ }: OpenUrlOptions = {},
+): Promise<void> {
+ url = ignoreSiteUrl ? url : getWithSiteUrl(url);
+
+ // In the sdk, allow the host app to override how to open links
+ if (isEmbeddingSdk()) {
+ const result = await handleLinkSdkPlugin(url);
+ if (result.handled) {
+ // Plugin handled the link, don't continue with default behavior
+ return;
+ }
+ }
+
+ if (shouldOpenInBlankWindow(url, options)) {
+ openInBlankWindow(url);
+ } else if (isSameOrigin(url)) {
+ if (!isMetabaseUrl(url)) {
+ clickLink(url, false);
+ } else if (openInSameOrigin) {
+ const location = getLocation(url);
+ if (isObject(location) && "pathname" in location) {
+ openInSameOrigin(location);
+ } else {
+ openInSameWindow(url);
+ }
+ } else {
+ openInSameWindow(url);
+ }
+ } else {
+ openInSameWindow(url);
+ }
+}
+
+function isMetabaseUrl(url: string): boolean {
+ const urlPath = new URL(url, window.location.origin).pathname.toLowerCase();
+
+ if (!isAbsoluteUrl(url)) {
+ return true;
+ }
+
+ const pathNameWithoutSubPath = getPathnameWithoutSubPath(urlPath);
+ const isPublicLink = pathNameWithoutSubPath.startsWith("/public/");
+ const isEmbedding = pathNameWithoutSubPath.startsWith("/embed/");
+ /**
+ * (metabase#38640) We don't want to use client-side navigation for public links or embedding
+ * because public app, or embed app are built using separate routes.
+ **/
+ if (isPublicLink || isEmbedding) {
+ return false;
+ }
+
+ return isSameOrSiteUrlOrigin(url) && urlPath.startsWith(getSitePath());
+}
+
+function isAbsoluteUrl(url: string): boolean {
+ return ["/", "http:", "https:", "mailto:"].some((prefix) =>
+ url.startsWith(prefix),
+ );
+}
+
+function getLocation(url: string): LocationDescriptor {
+ try {
+ const { pathname, search, hash } = new URL(url, window.location.origin);
+ const query = querystring.parse(search.substring(1));
+ return {
+ pathname: getPathnameWithoutSubPath(pathname),
+ search,
+ query,
+ hash,
+ };
+ } catch {
+ return {};
+ }
+}
diff --git a/frontend/src/metabase/utils/dom.unit.spec.ts b/frontend/src/metabase/visualizations/lib/open-url.unit.spec.ts
similarity index 95%
rename from frontend/src/metabase/utils/dom.unit.spec.ts
rename to frontend/src/metabase/visualizations/lib/open-url.unit.spec.ts
index 876952d49bc..b9f20ff1488 100644
--- a/frontend/src/metabase/utils/dom.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/open-url.unit.spec.ts
@@ -4,9 +4,9 @@ import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensur
import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";
import {
getUrlTarget,
- open,
+ openUrl,
shouldOpenInBlankWindow,
-} from "metabase/utils/dom";
+} from "metabase/visualizations/lib/open-url";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
describe("shouldOpenInBlankWindow", () => {
@@ -47,7 +47,7 @@ describe("getUrlTarget", () => {
});
});
-describe("open()", () => {
+describe("openUrl()", () => {
beforeEach(async () => {
await mockIsEmbeddingSdk();
// Ensure a clean store before each test
@@ -74,7 +74,7 @@ describe("open()", () => {
const openInBlankWindow = jest.fn();
const url = "https://example.com/dashboard/1";
- await open(url, {
+ await openUrl(url, {
openInSameWindow,
openInBlankWindow,
});
@@ -94,7 +94,7 @@ describe("open()", () => {
const openInBlankWindow = jest.fn();
const url = "https://example.com/dashboard/1";
- await open(url, {
+ await openUrl(url, {
openInSameWindow,
openInBlankWindow,
});
@@ -114,7 +114,7 @@ describe("open()", () => {
const url = "https://example.com/dashboard/1";
await expect(
- open(url, {
+ openUrl(url, {
openInSameWindow,
openInBlankWindow,
}),
@@ -136,7 +136,7 @@ describe("open()", () => {
const openInBlankWindow = jest.fn();
const url = "https://example.com/dashboard/1";
- await open(url, {
+ await openUrl(url, {
openInSameWindow,
openInBlankWindow,
});