Skip to content

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

chore(modules): fix embedding violations and start enforcing most of the modules (#77517)

Nicolò Pretto5a024bd2ff9d
diff --git a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
index 94d3ac48c65..bc27ea18c4e 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
+++ b/enterprise/frontend/src/embedding-sdk-ee/auth/auth.ts
@@ -9,7 +9,6 @@ import {
openSamlLoginPopup,
validateSession,
} from "embedding/auth-common";
-import * as MetabaseError from "embedding-sdk-bundle/errors";
import { getIsLocalhost } from "embedding-sdk-bundle/lib/get-is-localhost";
import {
PLUGIN_EMBEDDING_SDK_AUTH,
@@ -23,9 +22,10 @@ import type {
SdkDispatch,
SdkStoreState,
} from "embedding-sdk-bundle/store/types";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
+import * as MetabaseError from "embedding-sdk-shared/errors";
import { getSdkPackageVersion } from "embedding-sdk-shared/lib/get-build-info";
import { getWindow } from "embedding-sdk-shared/lib/get-window";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import type { SdkAuthState } from "embedding-sdk-shared/types/auth-state";
import { SDK_AUTH_STATE_KEY } from "embedding-sdk-shared/types/auth-state";
import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils";
diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx b/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx
index 2582c773491..7941aae475a 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/DashboardSubscriptionsButton.tsx
@@ -1,10 +1,10 @@
import { t } from "ttag";
-import type { DashboardSubscriptionsButtonProps } from "embedding-sdk-bundle/components/public/notifications";
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 type { DashboardSubscriptionsButtonProps } from "metabase/plugins";
import { useDispatch } from "metabase/redux";
/**
diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsx b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsx
index b41b6565b52..b9bdd3cc36d 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.tsx
@@ -4,10 +4,10 @@ import { t } from "ttag";
import { SdkActionIcon } from "embedding-sdk-bundle/components/private/SdkQuestion/components/util/SdkActionIcon/SdkActionIcon";
import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";
import { useQuestionAlertModalContext } from "embedding-sdk-bundle/components/private/notifications/context/QuestionAlertModalProvider";
-import type { QuestionAlertsButtonProps } from "embedding-sdk-bundle/components/public/notifications";
import { useSdkSelector } from "embedding-sdk-bundle/store";
import { getIsGuestEmbed } from "embedding-sdk-bundle/store/selectors";
import { useHasEmailSetup } from "metabase/common/hooks";
+import type { QuestionAlertsButtonProps } from "metabase/plugins";
import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";
import { isInstanceAnalyticsCollection } from "metabase-enterprise/collections/utils";
diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx
index 2f14526eede..2238fcae1e3 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/QuestionAlertsButton.unit.spec.tsx
@@ -11,7 +11,11 @@ import {
createMockSdkState,
} from "embedding-sdk-bundle/test/mocks/state";
import { createMockState } from "metabase/redux/store/mocks";
-import { createMockSettings, createMockUser } from "metabase-types/api/mocks";
+import { createMockSettingsState } from "metabase/redux/store/mocks/settings";
+import {
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
import { QuestionAlertsButton } from "./QuestionAlertsButton";
@@ -50,15 +54,13 @@ function setup({ isGuestEmbed }: { isGuestEmbed: boolean }) {
is_superuser: true,
permissions: { can_access_subscription: true },
}),
- settings: {
- values: {
- ...createMockSettings({ "enable-embedding-sdk": true }),
- "token-features": {
- embedding_sdk: true,
- advanced_permissions: false,
- },
- } as any,
- },
+ settings: createMockSettingsState({
+ "enable-embedding-sdk": true,
+ "token-features": createMockTokenFeatures({
+ embedding_sdk: true,
+ advanced_permissions: false,
+ }),
+ }),
sdk: createMockSdkState({
isGuestEmbed,
initStatus: createMockLoginStatusState({ status: "success" }),
diff --git a/enterprise/frontend/src/embedding-sdk-ee/notifications/index.ts b/enterprise/frontend/src/embedding-sdk-ee/notifications/index.ts
index 963c6e9447f..a3863d81448 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/notifications/index.ts
+++ b/enterprise/frontend/src/embedding-sdk-ee/notifications/index.ts
@@ -1,5 +1,5 @@
-import { PLUGIN_NOTIFICATIONS_SDK } from "embedding-sdk-bundle/components/public/notifications";
import { EMBEDDING_SDK_CONFIG } from "metabase/embedding-sdk/config";
+import { PLUGIN_NOTIFICATIONS_SDK } from "metabase/plugins";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { DashboardSubscriptionsButton } from "./DashboardSubscriptionsButton";
diff --git a/frontend/src/embedding-sdk-shared/hooks/use-lazy-selector.ts b/enterprise/frontend/src/embedding-sdk-package/hooks/private/use-lazy-selector.ts
similarity index 90%
rename from frontend/src/embedding-sdk-shared/hooks/use-lazy-selector.ts
rename to enterprise/frontend/src/embedding-sdk-package/hooks/private/use-lazy-selector.ts
index 544a8e9d4a6..d728207133e 100644
--- a/frontend/src/embedding-sdk-shared/hooks/use-lazy-selector.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/private/use-lazy-selector.ts
@@ -1,8 +1,7 @@
import { useCallback, useSyncExternalStore } from "react";
import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
-
-import { useMetabaseProviderPropsStore } from "./use-metabase-provider-props-store";
+import { useMetabaseProviderPropsStore } from "embedding-sdk-shared/hooks/use-metabase-provider-props-store";
const noop = () => {};
diff --git a/frontend/src/embedding-sdk-shared/hooks/use-lazy-selector.unit.spec.tsx b/enterprise/frontend/src/embedding-sdk-package/hooks/private/use-lazy-selector.unit.spec.tsx
similarity index 98%
rename from frontend/src/embedding-sdk-shared/hooks/use-lazy-selector.unit.spec.tsx
rename to enterprise/frontend/src/embedding-sdk-package/hooks/private/use-lazy-selector.unit.spec.tsx
index 9cbaf21ea0b..a72a19ffbf5 100644
--- a/frontend/src/embedding-sdk-shared/hooks/use-lazy-selector.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/private/use-lazy-selector.unit.spec.tsx
@@ -19,8 +19,7 @@ import { fireEvent, render, screen } from "@testing-library/react";
import { StrictMode, useEffect, useState } from "react";
import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
-
-import { ensureMetabaseProviderPropsStore } from "../lib/ensure-metabase-provider-props-store";
+import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
import { useLazySelector } from "./use-lazy-selector";
diff --git a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-application-name.ts b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-application-name.ts
index b791c58cf49..f721f567ca4 100644
--- a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-application-name.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-application-name.ts
@@ -1,4 +1,4 @@
-import { useLazySelector } from "embedding-sdk-shared/hooks/use-lazy-selector";
+import { useLazySelector } from "embedding-sdk-package/hooks/private/use-lazy-selector";
import { getWindow } from "embedding-sdk-shared/lib/get-window";
/**
diff --git a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-available-fonts.ts b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-available-fonts.ts
index 1bdedfb2543..ec1caba0e8b 100644
--- a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-available-fonts.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-available-fonts.ts
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { useLazySelector } from "embedding-sdk-shared/hooks/use-lazy-selector";
+import { useLazySelector } from "embedding-sdk-package/hooks/private/use-lazy-selector";
import { getWindow } from "embedding-sdk-shared/lib/get-window";
/**
diff --git a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-create-dashboard-api/use-create-dashboard-api.ts b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-create-dashboard-api/use-create-dashboard-api.ts
index 2f75dd81cba..2ce171d3987 100644
--- a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-create-dashboard-api/use-create-dashboard-api.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-create-dashboard-api/use-create-dashboard-api.ts
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { useLazySelector } from "embedding-sdk-shared/hooks/use-lazy-selector";
+import { useLazySelector } from "embedding-sdk-package/hooks/private/use-lazy-selector";
import { useMetabaseProviderPropsStore } from "embedding-sdk-shared/hooks/use-metabase-provider-props-store";
import { getWindow } from "embedding-sdk-shared/lib/get-window";
diff --git a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-current-user.ts b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-current-user.ts
index 34dfb628095..cea4defbc5f 100644
--- a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-current-user.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-current-user.ts
@@ -1,5 +1,5 @@
import type { MetabaseUser } from "embedding-sdk-bundle/types/user";
-import { useLazySelector } from "embedding-sdk-shared/hooks/use-lazy-selector";
+import { useLazySelector } from "embedding-sdk-package/hooks/private/use-lazy-selector";
import { getWindow } from "embedding-sdk-shared/lib/get-window";
/**
diff --git a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-auth-status.ts b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-auth-status.ts
index ccf9e448342..b26e5133274 100644
--- a/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-auth-status.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/hooks/public/use-metabase-auth-status.ts
@@ -1,4 +1,4 @@
-import { useLazySelector } from "embedding-sdk-shared/hooks/use-lazy-selector";
+import { useLazySelector } from "embedding-sdk-package/hooks/private/use-lazy-selector";
import { getWindow } from "embedding-sdk-shared/lib/get-window";
/**
diff --git a/enterprise/frontend/src/embedding-sdk-package/index.ts b/enterprise/frontend/src/embedding-sdk-package/index.ts
index 9a21f49dad8..fc159305ca2 100644
--- a/enterprise/frontend/src/embedding-sdk-package/index.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/index.ts
@@ -90,9 +90,9 @@ export {
} from "embedding-sdk-bundle/components/public/StaticQuestion";
export { type MetabaseProviderProps } from "embedding-sdk-bundle/types/metabase-provider";
+export type { DashCardMenuItem } from "metabase/embedding-sdk/types/plugins";
export type {
CustomDashboardCardMenuItem,
- DashCardMenuItem,
DashboardCardCustomMenuItem,
DashboardCardMenuCustomElement,
DashboardCardMenu,
diff --git a/enterprise/frontend/src/embedding/auth-common/connect-to-instance-auth-sso.ts b/enterprise/frontend/src/embedding/auth-common/connect-to-instance-auth-sso.ts
index 7dddc55021d..bd1df82a9f7 100644
--- a/enterprise/frontend/src/embedding/auth-common/connect-to-instance-auth-sso.ts
+++ b/enterprise/frontend/src/embedding/auth-common/connect-to-instance-auth-sso.ts
@@ -1,5 +1,5 @@
-import * as MetabaseError from "embedding-sdk-bundle/errors";
-import type { MetabaseAuthMethod } from "embedding-sdk-bundle/types";
+import * as MetabaseError from "embedding-sdk-shared/errors";
+import type { MetabaseAuthMethod } from "embedding-sdk-shared/types/auth-config";
export async function connectToInstanceAuthSso(
url: string,
diff --git a/enterprise/frontend/src/embedding/auth-common/jwt.ts b/enterprise/frontend/src/embedding/auth-common/jwt.ts
index 8a02f0c0378..59e8840f3f4 100644
--- a/enterprise/frontend/src/embedding/auth-common/jwt.ts
+++ b/enterprise/frontend/src/embedding/auth-common/jwt.ts
@@ -1,4 +1,4 @@
-import * as MetabaseError from "embedding-sdk-bundle/errors";
+import * as MetabaseError from "embedding-sdk-shared/errors";
export async function jwtDefaultRefreshTokenFunction(
responseUrl: string,
diff --git a/enterprise/frontend/src/embedding/auth-common/saml.ts b/enterprise/frontend/src/embedding/auth-common/saml.ts
index 7c16be9a654..74d61b2171b 100644
--- a/enterprise/frontend/src/embedding/auth-common/saml.ts
+++ b/enterprise/frontend/src/embedding/auth-common/saml.ts
@@ -1,4 +1,4 @@
-import * as MetabaseError from "embedding-sdk-bundle/errors";
+import * as MetabaseError from "embedding-sdk-shared/errors";
// eslint-disable-next-line no-restricted-imports -- import type
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
diff --git a/enterprise/frontend/src/embedding/auth-common/validate-session-token.ts b/enterprise/frontend/src/embedding/auth-common/validate-session-token.ts
index a0657de1bc9..3558347ab49 100644
--- a/enterprise/frontend/src/embedding/auth-common/validate-session-token.ts
+++ b/enterprise/frontend/src/embedding/auth-common/validate-session-token.ts
@@ -1,4 +1,4 @@
-import * as MetabaseError from "embedding-sdk-bundle/errors";
+import * as MetabaseError from "embedding-sdk-shared/errors";
export function validateSession(session: any) {
if (!session || typeof session !== "object") {
diff --git a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.stories.tsx b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.stories.tsx
index a780d2abf00..a830baa90d6 100644
--- a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.stories.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.stories.tsx
@@ -1,7 +1,6 @@
import { action } from "@storybook/addon-actions";
import type { Meta, StoryObj } from "@storybook/react";
-import { CommonSdkStoryWrapper } from "embedding-sdk-bundle/test/CommonSdkStoryWrapper";
import { Popover } from "metabase/ui";
import { SimpleDataPickerView } from "./SimpleDataPickerView";
@@ -82,7 +81,6 @@ const meta: Meta<typeof SimpleDataPickerView> = {
</Popover>
);
},
- decorators: [CommonSdkStoryWrapper],
};
export default meta;
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 684bb197b04..a9b473ff224 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
@@ -5,7 +5,7 @@ import {
isAdminGroup,
isDefaultGroup,
isDefaultTenantGroup,
-} from "metabase/admin/utils/groups";
+} from "metabase/common/utils/groups";
import { Box, Card, TreeTable } from "metabase/ui";
import { AdvancedGroupModeButton } from "./AdvancedGroupMode";
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 c073f962fc9..6f1df523a6e 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,9 +2,9 @@ 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 { isDefaultGroup } from "metabase/common/utils/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { Tabs } from "metabase/ui";
import {
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 e380881d42a..aea9c08d7a0 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,8 +3,8 @@ 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 { isDefaultGroup } from "metabase/common/utils/groups";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { Box, Group, NumberInput, Stack, Text } from "metabase/ui";
import { useUpdateAIControlsGroupLimitMutation } from "metabase-enterprise/api";
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
index e5b84c58f6c..c13079104bd 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx
@@ -12,7 +12,7 @@ import {
import {
getGroupNameLocalized,
isAdminGroup,
-} from "metabase/admin/utils/groups";
+} from "metabase/common/utils/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { Group } from "metabase-types/api";
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 b63470e8a2f..b1c3acb5bdc 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
@@ -3,7 +3,6 @@ import { msgid, ngettext, t } from "ttag";
import _ from "underscore";
import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";
-import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
import {
skipToken,
useListPermissionsGroupsQuery,
@@ -15,6 +14,7 @@ import {
} from "metabase/common/components/Breadcrumbs";
import { DateTime } from "metabase/common/components/DateTime";
import { ForwardRefLink } from "metabase/common/components/Link";
+import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";
import { renderMetabotProfileLabel } from "metabase/metabot/constants";
import { PLUGIN_TENANTS } from "metabase/plugins";
import {
diff --git a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/auth-manager/AuthManager.ts b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/auth-manager/AuthManager.ts
index da5b7854ea4..54b92bcf26b 100644
--- a/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/auth-manager/AuthManager.ts
+++ b/enterprise/frontend/src/metabase-enterprise/embedding_iframe_sdk/auth-manager/AuthManager.ts
@@ -7,7 +7,7 @@ import {
import {
INVALID_AUTH_METHOD,
MetabaseError,
-} from "embedding-sdk-bundle/errors";
+} from "embedding-sdk-shared/errors";
import type { EmbedAuthManagerContext } from "metabase/embedding/embedding-iframe-sdk/types/auth-manager";
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
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 7c54faad847..73bf6e2931f 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
@@ -17,14 +17,14 @@ import {
DataPermissionType,
type PermissionEditorType,
} from "metabase/admin/permissions/types";
+import { collectionApi } from "metabase/api";
+import { ROOT_COLLECTION } from "metabase/common/collections/constants";
+import { getCollectionIcon } from "metabase/common/collections/utils";
import {
getGroupNameLocalized,
isAdminGroup,
isDefaultGroup,
-} from "metabase/admin/utils/groups";
-import { collectionApi } from "metabase/api";
-import { ROOT_COLLECTION } from "metabase/common/collections/constants";
-import { getCollectionIcon } from "metabase/common/collections/utils";
+} from "metabase/common/utils/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { ExpandedCollection, State } from "metabase/redux/store";
import { isNotNull } from "metabase/utils/types";
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 9c24583c313..cadc1d47f2b 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
@@ -16,15 +16,15 @@ import {
DataPermissionType,
type PermissionEditorType,
} from "metabase/admin/permissions/types";
-import {
- getGroupNameLocalized,
- isAdminGroup,
- isDefaultGroup,
-} from "metabase/admin/utils/groups";
import { collectionApi } from "metabase/api";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import { getCollectionIcon } from "metabase/common/collections/utils";
import { findCollectionById } from "metabase/common/utils/collections";
+import {
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/common/utils/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { ExpandedCollection, State } from "metabase/redux/store";
import { isNotNull } from "metabase/utils/types";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
index 18a606de65a..66114901216 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
@@ -6,7 +6,6 @@ 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,
@@ -17,6 +16,7 @@ import {
getCollectionIcon,
} from "metabase/common/collections/utils";
import { useSetting } from "metabase/common/hooks/use-setting";
+import { getGroupNameLocalized } from "metabase/common/utils/groups";
import { ModalRoute } from "metabase/hoc/ModalRoute";
import {
PLUGIN_ADMIN_PERMISSIONS_TABS,
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index da67af131d2..e20d099eec7 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -73,10 +73,9 @@ const elements = [
// shared/embedding: their patterns are subfolders of
// frontend/src/metabase/embedding/, and the first matching element wins.
createElement({
- type: "shared",
+ type: "app",
name: "embedding-iframe-sdk",
pattern: "frontend/src/metabase/embedding/embedding-iframe-sdk/**",
- enforceOutgoing: false,
}),
createElement({
type: "app",
@@ -95,17 +94,12 @@ const elements = [
].map((pattern) =>
createElement({ type: "app", name: "mcp-app", pattern, mode: "full" }),
),
- createElement({ type: "shared", name: "embedding", enforceOutgoing: false }),
+ createElement({ type: "shared", name: "embedding" }),
+ createElement({ type: "shared", name: "embedding-sdk" }),
createElement({
- type: "shared",
- name: "embedding-sdk",
- enforceOutgoing: false,
- }),
- createElement({
- type: "shared",
+ type: "app",
name: "embedding-sdk-bundle",
pattern: "frontend/src/embedding-sdk-bundle/**",
- enforceOutgoing: false,
}),
createElement({
type: "shared",
@@ -122,12 +116,25 @@ const elements = [
name: "embedding-sdk-package",
pattern: "enterprise/frontend/src/embedding-sdk-package/**",
}),
+ // Window-global bridges between the SDK bundle and the npm package. They
+ // stay shared tier (both artifacts compile them in), but their payload
+ // types are owned by the bundle, hence the type-only allow rule below.
...[
- "frontend/src/embedding-sdk-shared/**",
- "frontend/src/embedding-sdk-shared/.storybook/**",
+ "frontend/src/embedding-sdk-shared/lib/ensure-metabase-provider-props-store.ts",
+ "frontend/src/embedding-sdk-shared/lib/metabot-state-channel.ts",
].map((pattern) =>
- createElement({ type: "shared", name: "embedding-sdk-shared", pattern }),
+ createElement({
+ type: "shared",
+ name: "embedding-sdk-window-bridge",
+ pattern,
+ mode: "full",
+ }),
),
+ createElement({
+ type: "shared",
+ name: "embedding-sdk-shared",
+ pattern: "frontend/src/embedding-sdk-shared/**",
+ }),
createElement({ type: "shared", name: "forms" }),
createElement({ type: "shared", name: "history" }),
createElement({ type: "shared", name: "hoc" }),
@@ -177,6 +184,15 @@ const elements = [
createElement({ type: "shared", name: "visualizer" }),
// feature
+ // The theme editor preview renders the live embed via the app-tier EAJS
+ // runtime; the edge is whitelisted via the allow rules below.
+ createElement({
+ type: "feature",
+ name: "admin-theme-preview",
+ pattern:
+ "frontend/src/metabase/admin/embedding/components/ThemeEditor/ResourcePreview.tsx",
+ mode: "full",
+ }),
createElement({ type: "feature", name: "admin" }),
createElement({ type: "feature", name: "dashboard" }),
createElement({ type: "feature", name: "data-studio" }),
@@ -257,6 +273,9 @@ const elements = [
// Entry point for the static-viz bundle (server-side chart rendering in
// GraalJS) - like app.js, it composes OSS + EE code for a build artifact.
"frontend/src/metabase/static-viz/index.tsx",
+ // Storybook config is a composition root: preview wires app-tier decorators.
+ // Needs its own pattern because ** doesn't match dot-folders.
+ "frontend/src/embedding-sdk-shared/.storybook/**",
].map((path) =>
createElement({
type: "app",
@@ -360,6 +379,25 @@ const rules = [
from: ["shared/monitor"],
allow: ["lib/*", "basic/*", "shared/*", "feature/*", "app/*"],
},
+ // Whitelisted cross-tier edges. Keep this list short; every entry should
+ // eventually be removed.
+ // Window-bridge ABI: the payload shapes are owned by the bundle.
+ // TODO(embedding-modules): decouple with shared contracts.
+ {
+ from: ["shared/embedding-sdk-window-bridge"],
+ allow: ["app/embedding-sdk-bundle"],
+ importKind: "type",
+ },
+ // Admin theme preview drives the live embed through the EAJS runtime.
+ // Remove once the preview is lifted out of admin.
+ {
+ from: ["feature/admin-theme-preview"],
+ allow: ["feature/admin", "app/embedding-iframe-sdk"],
+ },
+ {
+ from: ["feature/admin"],
+ allow: ["feature/admin-theme-preview"],
+ },
];
/**
diff --git a/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts b/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts
index 1caf7c1e1e4..1b879189067 100644
--- a/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts
+++ b/frontend/src/embedding-sdk-bundle/analytics/snowplow.unit.spec.ts
@@ -1,3 +1,4 @@
+import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
import { createMockSdkState } from "embedding-sdk-bundle/test/mocks/state";
import { createMockSettingsState } from "metabase/redux/store/mocks/settings";
import { createMockState } from "metabase/redux/store/mocks/state";
@@ -22,14 +23,14 @@ const loadModule = () => import("./snowplow");
function makeStore(overrides: Partial<EnterpriseSettings> = {}) {
return {
- getState: () =>
- createMockState({
- sdk: createMockSdkState(),
- settings: createMockSettingsState({
- "anon-tracking-enabled": true,
- ...overrides,
- }),
+ getState: (): SdkStoreState => ({
+ ...createMockState(),
+ sdk: createMockSdkState(),
+ settings: createMockSettingsState({
+ "anon-tracking-enabled": true,
+ ...overrides,
}),
+ }),
};
}
diff --git a/frontend/src/embedding-sdk-bundle/analytics/tracker.ts b/frontend/src/embedding-sdk-bundle/analytics/tracker.ts
index 87d20559e64..8b749e10a08 100644
--- a/frontend/src/embedding-sdk-bundle/analytics/tracker.ts
+++ b/frontend/src/embedding-sdk-bundle/analytics/tracker.ts
@@ -10,8 +10,8 @@ import {
} from "embedding-sdk-bundle/analytics/snowplow";
import { setSdkTrackerReady } from "embedding-sdk-bundle/store/reducer";
import type { SdkStore } from "embedding-sdk-bundle/store/types";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
import { getSdkPackageVersion } from "embedding-sdk-shared/lib/get-build-info";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import { isEmbeddingEajs } from "metabase/embedding-sdk/config";
import { initMetaplow } from "metabase/utils/metaplow";
diff --git a/frontend/src/embedding-sdk-bundle/analytics/tracker.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/analytics/tracker.unit.spec.tsx
index c0c32c02d51..c31591852e7 100644
--- a/frontend/src/embedding-sdk-bundle/analytics/tracker.unit.spec.tsx
+++ b/frontend/src/embedding-sdk-bundle/analytics/tracker.unit.spec.tsx
@@ -22,7 +22,7 @@ import {
trackSdkSimpleEvent,
} from "embedding-sdk-bundle/analytics/snowplow";
import { setSdkTrackerReady } from "embedding-sdk-bundle/store/reducer";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";
import { deriveAuthMethod, useInitSdkTracker } from "./tracker";
diff --git a/frontend/src/embedding-sdk-bundle/bootstrap-auth.ts b/frontend/src/embedding-sdk-bundle/bootstrap-auth.ts
index 96059805096..e47d5f4fc92 100644
--- a/frontend/src/embedding-sdk-bundle/bootstrap-auth.ts
+++ b/frontend/src/embedding-sdk-bundle/bootstrap-auth.ts
@@ -14,7 +14,7 @@ import {
jwtDefaultRefreshTokenFunction,
validateSession,
} from "embedding/auth-common";
-import * as MetabaseError from "embedding-sdk-bundle/errors";
+import * as MetabaseError from "embedding-sdk-shared/errors";
type SdkAuthState = {
status: "idle" | "in-progress" | "completed" | "error" | "skipped";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx
index f62bf9ed436..7d8e08320fa 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx
@@ -2,11 +2,11 @@ import { useDisclosure } from "@mantine/hooks";
import { type PropsWithChildren, useMemo } from "react";
import { jt, t } from "ttag";
-import { ERROR_DOC_LINKS } from "embedding-sdk-bundle/errors";
-import type { MetabaseErrorCode } from "embedding-sdk-bundle/errors/error-code";
import { useSdkSelector } from "embedding-sdk-bundle/store";
import { getErrorComponent } from "embedding-sdk-bundle/store/selectors";
import type { SdkErrorComponentProps } from "embedding-sdk-bundle/types";
+import { ERROR_DOC_LINKS } from "embedding-sdk-shared/errors";
+import type { MetabaseErrorCode } from "embedding-sdk-shared/errors/error-code";
import { Alert } from "metabase/common/components/Alert";
import { EMBEDDING_SDK_PORTAL_ROOT_ELEMENT_ID } from "metabase/embedding-sdk/config";
import { Anchor, Box, Center, Code, Flex, Portal } from "metabase/ui";
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 2711307e718..2b3ec538260 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
@@ -22,6 +22,7 @@ import {
import { SdkAdHocQuestion } from "embedding-sdk-bundle/components/private/SdkAdHocQuestion";
import { useSdkInternalNavigationOptional } from "embedding-sdk-bundle/components/private/SdkInternalNavigation/context";
import { SdkQuestion } from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";
+import { DashboardSubscriptionsButton } from "embedding-sdk-bundle/components/public/notifications/DashboardSubscriptionsButton";
import { useDashboardLoadHandlers } from "embedding-sdk-bundle/hooks/private/use-dashboard-load-handlers";
import { useExtractResourceIdFromJwtToken } from "embedding-sdk-bundle/hooks/private/use-extract-resource-id-from-jwt-token";
import { useSdkBreadcrumbs } from "embedding-sdk-bundle/hooks/private/use-sdk-breadcrumb";
@@ -546,6 +547,7 @@ const SdkDashboardInner = ({
? navigateToNewCardFromDashboard
: onNavigateToNewCardFromDashboard
}
+ onEditQuestion={onEditQuestionWithNav}
onNewQuestion={() => {
if (isDashboardDirty) {
show({
@@ -621,10 +623,7 @@ const SdkDashboardInner = ({
</MaybeStyledWrapper>
))
.with({ finalRenderMode: "dashboard" }, () => (
- <SdkDashboardProvider
- plugins={plugins}
- onEditQuestion={onEditQuestionWithNav}
- >
+ <SdkDashboardProvider plugins={plugins}>
{children ?? (
<MaybeStyledWrapper
skip={skipStyledWrapper}
@@ -682,10 +681,11 @@ export const SdkDashboard = withPublicComponentWrapper(SdkDashboardInner, {
| "ParametersList"
| "FullscreenButton"
| "ExportAsPdfButton"
- | "SubscriptionsButton"
| "InfoButton"
| "RefreshPeriod"
- >;
+ > & {
+ SubscriptionsButton: typeof DashboardSubscriptionsButton;
+ };
SdkDashboard.Grid = Dashboard.Grid;
SdkDashboard.Header = Dashboard.Header;
@@ -694,7 +694,7 @@ SdkDashboard.Tabs = Dashboard.Tabs;
SdkDashboard.ParametersList = Dashboard.ParametersList;
SdkDashboard.FullscreenButton = Dashboard.FullscreenButton;
SdkDashboard.ExportAsPdfButton = Dashboard.ExportAsPdfButton;
-SdkDashboard.SubscriptionsButton = Dashboard.SubscriptionsButton;
+SdkDashboard.SubscriptionsButton = DashboardSubscriptionsButton;
SdkDashboard.InfoButton = Dashboard.InfoButton;
SdkDashboard.RefreshPeriod = Dashboard.RefreshPeriod;
diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/context.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/context.tsx
index 4102181da23..6ce7912a9aa 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/context.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/context.tsx
@@ -1,7 +1,6 @@
import {
type PropsWithChildren,
createContext,
- useCallback,
useContext,
useMemo,
} from "react";
@@ -10,18 +9,15 @@ import { addDefaultDashboardPluginValues } from "embedding-sdk-bundle/lib/plugin
import { useSdkSelector } from "embedding-sdk-bundle/store";
import { getPlugins } from "embedding-sdk-bundle/store/selectors";
import type { MetabasePluginsConfig } from "embedding-sdk-bundle/types/plugins";
-import type Question from "metabase-lib/v1/Question";
export type SdkDashboardContextType = Partial<{
plugins: MetabasePluginsConfig;
- onEditQuestion: (question: Question) => void;
}>;
const SdkDashboardContext = createContext<SdkDashboardContextType>({});
export const SdkDashboardProvider = ({
children,
plugins,
- onEditQuestion: initOnEditQuestion,
}: PropsWithChildren<SdkDashboardContextType>) => {
const globalPlugins = useSdkSelector(getPlugins);
@@ -31,17 +27,11 @@ export const SdkDashboardProvider = ({
return addDefaultDashboardPluginValues(combinedPlugins);
}, [globalPlugins, plugins]);
- const onEditQuestion = useCallback(
- (question: Question) => initOnEditQuestion?.(question),
- [initOnEditQuestion],
- );
-
const value = useMemo(
() => ({
plugins: initializedPlugins,
- onEditQuestion,
}),
- [initializedPlugins, onEditQuestion],
+ [initializedPlugins],
);
return (
<SdkDashboardContext.Provider value={value}>
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx b/frontend/src/embedding-sdk-bundle/components/public/notifications/DashboardSubscriptionsButton.tsx
similarity index 55%
rename from frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx
rename to frontend/src/embedding-sdk-bundle/components/public/notifications/DashboardSubscriptionsButton.tsx
index 68eb638b5d2..8bd0b388f01 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/DashboardSubscriptionsButton.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/notifications/DashboardSubscriptionsButton.tsx
@@ -1,4 +1,4 @@
-import { PLUGIN_NOTIFICATIONS_SDK } from "embedding-sdk-bundle/components/public/notifications";
+import { PLUGIN_NOTIFICATIONS_SDK } from "metabase/plugins";
export function DashboardSubscriptionsButton() {
return <PLUGIN_NOTIFICATIONS_SDK.DashboardSubscriptionsButton />;
diff --git a/frontend/src/embedding-sdk-bundle/components/public/notifications/QuestionAlertsButton.tsx b/frontend/src/embedding-sdk-bundle/components/public/notifications/QuestionAlertsButton.tsx
index 7d28c229fd7..c398fdbc698 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/notifications/QuestionAlertsButton.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/notifications/QuestionAlertsButton.tsx
@@ -1,4 +1,4 @@
-import { PLUGIN_NOTIFICATIONS_SDK } from "embedding-sdk-bundle/components/public/notifications";
+import { PLUGIN_NOTIFICATIONS_SDK } from "metabase/plugins";
export function QuestionAlertsButton() {
return <PLUGIN_NOTIFICATIONS_SDK.QuestionAlertsButton />;
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 1622a2c1489..487187cc723 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
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useSyncExternalStore } from "react";
import { useMount } from "react-use";
import _ from "underscore";
@@ -12,7 +12,6 @@ import {
import { getFetchRefreshTokenFn } from "embedding-sdk-bundle/store/selectors";
import type { SdkStore } from "embedding-sdk-bundle/store/types";
import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types";
-import { useLazySelector } from "embedding-sdk-shared/hooks/use-lazy-selector";
import { useMetabaseProviderPropsStore } from "embedding-sdk-shared/hooks/use-metabase-provider-props-store";
import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
import { getSdkPackageVersion } from "embedding-sdk-shared/lib/get-build-info";
@@ -118,7 +117,10 @@ export const useInitDataInternal = ({
const isDataUninitialized = () =>
reduxStore.getState().sdk.initStatus.status === "uninitialized";
- const fetchRefreshTokenFnFromStore = useLazySelector(getFetchRefreshTokenFn);
+ const fetchRefreshTokenFnFromStore = useSyncExternalStore(
+ reduxStore.subscribe,
+ () => getFetchRefreshTokenFn(reduxStore.getState()),
+ );
const sdkPackageVersion = getSdkPackageVersion();
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-log-version-info/use-log-version-info.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/hooks/private/use-log-version-info/use-log-version-info.unit.spec.tsx
index e24fc30d1fa..03d0db6f233 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-log-version-info/use-log-version-info.unit.spec.tsx
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-log-version-info/use-log-version-info.unit.spec.tsx
@@ -5,9 +5,6 @@ import { EMBEDDING_SDK_BUNDLE_UNKNOWN_VERSION } from "build-configs/embedding-sd
import { useLogVersionInfo } from "embedding-sdk-bundle/hooks/private/use-log-version-info";
import { getBuildInfo } from "embedding-sdk-shared/lib/get-build-info";
-jest.mock("embedding-sdk-shared/hooks/use-lazy-selector", () => ({
- useLazySelector: jest.fn((selector) => selector()),
-}));
jest.mock("embedding-sdk-shared/lib/get-build-info", () => ({
getBuildInfo: jest.fn(),
}));
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.ts
index 2863911ec88..faf3e163231 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-sdk-usage-problem.ts
@@ -9,7 +9,7 @@ import {
getIsGuestEmbedRaw,
getUsageProblem,
} from "embedding-sdk-bundle/store/selectors";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import { useSetting } from "metabase/common/hooks";
import { EMBEDDING_SDK_CONFIG } from "metabase/embedding-sdk/config";
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
diff --git a/frontend/src/embedding-sdk-bundle/store/auth/auth.ts b/frontend/src/embedding-sdk-bundle/store/auth/auth.ts
index fec4acc9028..f849d7328e8 100644
--- a/frontend/src/embedding-sdk-bundle/store/auth/auth.ts
+++ b/frontend/src/embedding-sdk-bundle/store/auth/auth.ts
@@ -1,6 +1,6 @@
import type { Dispatch } from "@reduxjs/toolkit";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
import { createAsyncThunk } from "metabase/redux/utils";
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 bb7bbb7a3ed..cbe64a84e7f 100644
--- a/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts
+++ b/frontend/src/embedding-sdk-bundle/store/guest-embed/auth.ts
@@ -3,7 +3,7 @@ import type { AsyncThunkAction, SerializedError } from "@reduxjs/toolkit";
import { createAction } from "@reduxjs/toolkit";
import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import { requestSessionTokenFromEmbedJs } from "metabase/embedding/embedding-iframe-sdk/utils/request-session-token";
import { isEmbeddingEajs } from "metabase/embedding-sdk/config";
import { createAsyncThunk } from "metabase/redux/utils";
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 3685bc33208..fbf5d890d00 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
@@ -1,6 +1,6 @@
import { merge } from "icepick";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import type { OnBeforeRequestHandlerConfig } from "metabase/api/client";
import { overrideRequestsForGuestEmbeds } from "metabase/embedding/lib/override-requests-for-embeds";
import { PLUGIN_EMBEDDING_SDK } from "metabase/plugins";
diff --git a/frontend/src/embedding-sdk-bundle/store/types.ts b/frontend/src/embedding-sdk-bundle/store/types.ts
index 2b23b7f99a9..8177e76a6af 100644
--- a/frontend/src/embedding-sdk-bundle/store/types.ts
+++ b/frontend/src/embedding-sdk-bundle/store/types.ts
@@ -6,7 +6,6 @@ import type {
ThunkDispatch,
} from "@reduxjs/toolkit";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
import type { SdkEventHandlersConfig } from "embedding-sdk-bundle/types/events";
import type { MetabasePluginsConfig } from "embedding-sdk-bundle/types/plugins";
import type {
@@ -15,9 +14,10 @@ import type {
SdkLoadingError,
} from "embedding-sdk-bundle/types/ui";
import type { SdkUsageProblem } from "embedding-sdk-bundle/types/usage-problem";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import type { MetabaseEmbeddingSessionToken } from "metabase/embedding-sdk/types/refresh-token";
+import type { SdkSharedState } from "metabase/embedding-sdk/types/store";
import type { State } from "metabase/redux/store";
-import type { DashboardTabId } from "metabase-types/api";
export type EmbeddingSessionTokenState = {
token: MetabaseEmbeddingSessionToken | null;
@@ -32,7 +32,7 @@ export type SdkStore = Omit<Store<SdkStoreState, Action>, "dispatch"> & {
export type SdkDispatch = ThunkDispatch<SdkStoreState, void, AnyAction>;
-export type SdkState = {
+export type SdkState = SdkSharedState & {
isGuestEmbed: boolean | null;
metabaseInstanceUrl: MetabaseAuthConfig["metabaseInstanceUrl"];
metabaseInstanceVersion: string | null;
@@ -45,14 +45,6 @@ export type SdkState = {
errorComponent: null | SdkErrorComponent;
fetchRefreshTokenFn: null | MetabaseAuthConfig["fetchRequestToken"];
pluginsReady: boolean;
- /**
- * Tab to apply when the next dashboard mounts via a cross-dashboard
- * click behavior. Not cleared after use: tab IDs are globally unique
- * PKs, so stale values can't match another dashboard's tabs, and the
- * selector falls back to the first tab via a `hasTab` guard. Every
- * cross-dashboard push overwrites this slot anyway.
- */
- initialDashboardTabId: DashboardTabId | null;
/**
* True once initSdkTracker has been called and the Snowplow SDK tracker
* is ready to accept events. Per-mount hooks depend on this flag so they
diff --git a/frontend/src/embedding-sdk-bundle/test/CommonSdkStoryWrapper.tsx b/frontend/src/embedding-sdk-bundle/test/CommonSdkStoryWrapper.tsx
index b9486e82a58..b20b8d57814 100644
--- a/frontend/src/embedding-sdk-bundle/test/CommonSdkStoryWrapper.tsx
+++ b/frontend/src/embedding-sdk-bundle/test/CommonSdkStoryWrapper.tsx
@@ -6,7 +6,7 @@ import { useMemo } from "react";
import "embedding-sdk-bundle";
import { ComponentProvider } from "embedding-sdk-bundle/components/public/ComponentProvider";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
import { USERS } from "../../../../e2e/support/cypress_data";
diff --git a/frontend/src/embedding-sdk-bundle/types/index.ts b/frontend/src/embedding-sdk-bundle/types/index.ts
index d60b4f0a9d0..a49a1e76a9a 100644
--- a/frontend/src/embedding-sdk-bundle/types/index.ts
+++ b/frontend/src/embedding-sdk-bundle/types/index.ts
@@ -1,5 +1,5 @@
export type * from "./action";
-export type * from "./auth-config";
+export type * from "embedding-sdk-shared/types/auth-config";
export type * from "./collection";
export type * from "./dashboard";
export type * from "./entity";
diff --git a/frontend/src/embedding-sdk-bundle/types/metabase-provider.ts b/frontend/src/embedding-sdk-bundle/types/metabase-provider.ts
index 2a844433bec..34fe0fe5741 100644
--- a/frontend/src/embedding-sdk-bundle/types/metabase-provider.ts
+++ b/frontend/src/embedding-sdk-bundle/types/metabase-provider.ts
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import type { MetabaseEmbeddingTheme } from "metabase/embedding-sdk/theme";
-import type { MetabaseAuthConfig } from "./auth-config";
import type { SdkEventHandlersConfig } from "./events";
import type { MetabaseGlobalPluginsConfig } from "./plugins";
import type { SdkErrorComponent } from "./ui";
diff --git a/frontend/src/embedding-sdk-bundle/errors/base.ts b/frontend/src/embedding-sdk-shared/errors/base.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/errors/base.ts
rename to frontend/src/embedding-sdk-shared/errors/base.ts
diff --git a/frontend/src/embedding-sdk-bundle/errors/error-code.ts b/frontend/src/embedding-sdk-shared/errors/error-code.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/errors/error-code.ts
rename to frontend/src/embedding-sdk-shared/errors/error-code.ts
diff --git a/frontend/src/embedding-sdk-bundle/errors/error-docs-links.ts b/frontend/src/embedding-sdk-shared/errors/error-docs-links.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/errors/error-docs-links.ts
rename to frontend/src/embedding-sdk-shared/errors/error-docs-links.ts
diff --git a/frontend/src/embedding-sdk-bundle/errors/generic.ts b/frontend/src/embedding-sdk-shared/errors/generic.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/errors/generic.ts
rename to frontend/src/embedding-sdk-shared/errors/generic.ts
diff --git a/frontend/src/embedding-sdk-bundle/errors/index.ts b/frontend/src/embedding-sdk-shared/errors/index.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/errors/index.ts
rename to frontend/src/embedding-sdk-shared/errors/index.ts
diff --git a/frontend/src/embedding-sdk-bundle/errors/jwt.ts b/frontend/src/embedding-sdk-shared/errors/jwt.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/errors/jwt.ts
rename to frontend/src/embedding-sdk-shared/errors/jwt.ts
diff --git a/frontend/src/embedding-sdk-bundle/errors/saml.ts b/frontend/src/embedding-sdk-shared/errors/saml.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/errors/saml.ts
rename to frontend/src/embedding-sdk-shared/errors/saml.ts
diff --git a/frontend/src/embedding-sdk-shared/lib/define-metabase-auth-config.ts b/frontend/src/embedding-sdk-shared/lib/define-metabase-auth-config.ts
index 749f0eb8b62..96a6f4abccd 100644
--- a/frontend/src/embedding-sdk-shared/lib/define-metabase-auth-config.ts
+++ b/frontend/src/embedding-sdk-shared/lib/define-metabase-auth-config.ts
@@ -1,4 +1,4 @@
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
export const defineMetabaseAuthConfig = (
config: MetabaseAuthConfig,
diff --git a/frontend/src/embedding-sdk-bundle/types/auth-config.ts b/frontend/src/embedding-sdk-shared/types/auth-config.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/types/auth-config.ts
rename to frontend/src/embedding-sdk-shared/types/auth-config.ts
diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
index 511ee054e79..aedd828189b 100644
--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
@@ -3,12 +3,6 @@ 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,
@@ -16,6 +10,12 @@ import {
} from "metabase/api";
import { useConfirmation } from "metabase/common/hooks/use-confirmation";
import { useToast } from "metabase/common/hooks/use-toast";
+import {
+ canEditMembership,
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/common/utils/groups";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import { useDispatch } from "metabase/redux";
import { Box, Button, Text } from "metabase/ui";
diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
index 114e7b7ae47..32491c943a2 100644
--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx
@@ -3,10 +3,10 @@ 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";
+import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getUser } from "metabase/selectors/user";
diff --git a/frontend/src/metabase/admin/people/components/GroupSummary.tsx b/frontend/src/metabase/admin/people/components/GroupSummary.tsx
index 8aa45a0ad6f..fb378b08237 100644
--- a/frontend/src/metabase/admin/people/components/GroupSummary.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupSummary.tsx
@@ -1,6 +1,6 @@
import { msgid, ngettext, t } from "ttag";
-import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
+import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";
import { Box, type BoxProps } from "metabase/ui";
import type { GroupInfo } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.tsx b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
index bc24921fc4b..e88f3db86a2 100644
--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx
@@ -5,17 +5,17 @@ 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";
import { Link } from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { UserAvatar } from "metabase/common/components/UserAvatar";
+import {
+ getGroupNameLocalized,
+ isAdminGroup,
+ isDefaultGroup,
+} from "metabase/common/utils/groups";
import CS from "metabase/css/core/index.css";
import { PLUGIN_TENANTS } from "metabase/plugins";
import {
diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
index 5016813c222..5c377389e1c 100644
--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
@@ -7,7 +7,7 @@ import {
isAdminGroup,
isDataAnalystGroup,
isDefaultGroup,
-} from "metabase/admin/utils/groups";
+} from "metabase/common/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";
diff --git a/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx b/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx
index 8907a958ef1..2a4c30bbeb5 100644
--- a/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx
@@ -7,11 +7,10 @@ import {
useUpdateUserMutation,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { UserForm } from "metabase/common/components/UserForm";
import { Modal } from "metabase/ui";
import type { User } from "metabase-types/api";
-import { UserForm } from "../../forms/UserForm";
-
interface EditUserModalProps {
onClose: () => void;
params: { userId?: string };
diff --git a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
index ba6524e2534..91c774f66d0 100644
--- a/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/NewUserModal.tsx
@@ -3,6 +3,7 @@ import { t } from "ttag";
import { useCreateUserMutation } from "metabase/api";
import { isEmailAlreadyInUse } from "metabase/api/utils/errors";
import { trackUserInvited } from "metabase/common/analytics";
+import { UserForm } from "metabase/common/components/UserForm";
import { PLUGIN_TENANTS } from "metabase/plugins";
import { useDispatch } from "metabase/redux";
import { push } from "metabase/router";
@@ -12,7 +13,6 @@ import { generatePassword } from "metabase/utils/password";
import MetabaseSettings from "metabase/utils/settings";
import type { User as UserType } from "metabase-types/api";
-import { UserForm } from "../forms/UserForm";
import { storeTemporaryPassword } from "../people";
interface NewUserModalProps {
diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
index 22b8f11a58c..c01d62289f7 100644
--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
@@ -1,13 +1,13 @@
import type { ReactNode } from "react";
import { useAsync } from "react-use";
-import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
import {
skipToken,
useGetDatabaseMetadataQuery,
useListDatabasesQuery,
useListPermissionsGroupsQuery,
} from "metabase/api";
+import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";
import { useDispatch, useSelector } from "metabase/redux";
import type { Route } from "metabase/router";
import { getMetadataUnfiltered } from "metabase/selectors/metadata";
diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
index 9af97d82df2..87f94a49f1a 100644
--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
@@ -3,12 +3,6 @@ import { getIn } from "icepick";
import { t } from "ttag";
import _ from "underscore";
-import {
- getGroupNameLocalized,
- getGroupSortOrder,
- getSpecialGroupType,
- isDefaultGroup,
-} from "metabase/admin/utils/groups";
import { collectionApi } from "metabase/api";
import { ROOT_COLLECTION } from "metabase/common/collections/constants";
import {
@@ -17,6 +11,12 @@ import {
isLibraryCollection,
nonPersonalOrArchivedCollection,
} from "metabase/common/collections/utils";
+import {
+ getGroupNameLocalized,
+ getGroupSortOrder,
+ getSpecialGroupType,
+ isDefaultGroup,
+} from "metabase/common/utils/groups";
import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";
import type {
CollectionTreeItem,
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 1374e1e4d46..101fcecc7c6 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/admin/utils/groups";
+import { getGroupNameLocalized } from "metabase/common/utils/groups";
import type { State } from "metabase/redux/store";
import type { Group } from "metabase-types/api";
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 4a5b3513150..5b2bdc94709 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts
@@ -1,13 +1,13 @@
import { createSelector } from "@reduxjs/toolkit";
import _ from "underscore";
+import { permissionApi } from "metabase/api";
import {
getGroupSortOrder,
isAdminGroup,
isDataAnalystGroup,
isDefaultGroup,
-} from "metabase/admin/utils/groups";
-import { permissionApi } from "metabase/api";
+} from "metabase/common/utils/groups";
import { PLUGIN_TENANTS } from "metabase/plugins";
import type { State } from "metabase/redux/store";
import type { Group, GroupId } from "metabase-types/api";
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 4149e878731..aeb098c1d5d 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,11 +3,11 @@ import { createSelector } from "@reduxjs/toolkit";
import { msgid, ngettext, t } from "ttag";
import _ from "underscore";
+import { databaseApi } from "metabase/api";
import {
getSpecialGroupType,
isDefaultGroup,
-} from "metabase/admin/utils/groups";
-import { databaseApi } from "metabase/api";
+} from "metabase/common/utils/groups";
import { getPlan } from "metabase/common/utils/plan";
import { getIsHosted } from "metabase/databases/selectors";
import {
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 d19bafd929e..f582d9d24d3 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
@@ -5,10 +5,10 @@ import _ from "underscore";
import NoResults from "assets/img/no_results.svg";
import { AdminContentTable } from "metabase/admin/components/AdminContentTable";
-import { isDefaultGroup } from "metabase/admin/utils/groups";
import { getErrorMessage } from "metabase/api/utils/errors";
import { EmptyState } from "metabase/common/components/EmptyState";
import { useToast } from "metabase/common/hooks";
+import { isDefaultGroup } from "metabase/common/utils/groups";
import { FormSwitch } from "metabase/forms";
import {
Box,
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 1a5b456f87a..589eec427b1 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
@@ -8,7 +8,7 @@ import {
getGroupNameLocalized,
isAdminGroup,
isDefaultGroup,
-} from "metabase/admin/utils/groups";
+} from "metabase/common/utils/groups";
import {
Box,
Checkbox,
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 abc624c7694..0f1b1c21621 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
@@ -6,9 +6,9 @@ import type {
DeleteMappingModalValueType,
GroupIds,
} from "metabase/admin/types";
-import { isAdminGroup } from "metabase/admin/utils/groups";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
+import { isAdminGroup } from "metabase/common/utils/groups";
import AdminS from "metabase/css/admin.module.css";
import { Flex, Icon, Tooltip } from "metabase/ui";
import type { GroupId, GroupInfo } from "metabase-types/api";
diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx
index f492edafd5c..62c84f12ce1 100644
--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx
+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx
@@ -2,7 +2,6 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import * as Yup from "yup";
-import type { SdkCollectionId } from "embedding-sdk-bundle/types";
import { useCreateDashboardMutation } from "metabase/api";
import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker";
import { useInitialCollectionId } from "metabase/common/collections/hooks";
@@ -54,7 +53,7 @@ export interface CreateDashboardProperties {
export interface CreateDashboardFormOwnProps {
collectionId?: CollectionId | null; // can be used by `getInitialCollectionId`
- targetCollection?: SdkCollectionId | null;
+ targetCollection?: CollectionId | null;
onCreate?: (dashboard: Dashboard) => void;
onCancel?: () => void;
}
@@ -67,7 +66,6 @@ export function CreateDashboardForm({
}: CreateDashboardFormOwnProps) {
const initialCollectionId = useInitialCollectionId({ collectionId });
- // When passing `"root"` it will be resolved to `null`
const hasTargetCollection = targetCollection !== undefined;
const [handleCreateDashboard] = useCreateDashboardMutation();
diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx
index 9f38e173fe0..f6756a3a723 100644
--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx
+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.tsx
@@ -1,7 +1,6 @@
import { useCallback } from "react";
import { t } from "ttag";
-import type { SdkCollectionId } from "embedding-sdk-bundle/types";
import { useDispatch } from "metabase/redux";
import { push } from "metabase/router";
import { Modal, type ModalProps } from "metabase/ui";
@@ -13,7 +12,7 @@ import { CreateDashboardForm } from "./CreateDashboardForm";
export interface CreateDashboardModalProps {
opened: boolean;
collectionId?: CollectionId | null; // can be used by `getInitialCollectionId`
- targetCollection?: SdkCollectionId | null;
+ targetCollection?: CollectionId | null;
onCreate?: (dashboard: Dashboard) => void;
onClose: () => void;
}
diff --git a/frontend/src/metabase/admin/people/components/GroupsMultiSelect/GroupsMultiSelect.module.css b/frontend/src/metabase/common/components/GroupsMultiSelect/GroupsMultiSelect.module.css
similarity index 100%
rename from frontend/src/metabase/admin/people/components/GroupsMultiSelect/GroupsMultiSelect.module.css
rename to frontend/src/metabase/common/components/GroupsMultiSelect/GroupsMultiSelect.module.css
diff --git a/frontend/src/metabase/admin/people/components/GroupsMultiSelect/GroupsMultiSelect.tsx b/frontend/src/metabase/common/components/GroupsMultiSelect/GroupsMultiSelect.tsx
similarity index 99%
rename from frontend/src/metabase/admin/people/components/GroupsMultiSelect/GroupsMultiSelect.tsx
rename to frontend/src/metabase/common/components/GroupsMultiSelect/GroupsMultiSelect.tsx
index 28099bfdeb2..1beafe81b28 100644
--- a/frontend/src/metabase/admin/people/components/GroupsMultiSelect/GroupsMultiSelect.tsx
+++ b/frontend/src/metabase/common/components/GroupsMultiSelect/GroupsMultiSelect.tsx
@@ -8,7 +8,7 @@ import {
isAdminGroup,
isDataAnalystGroup,
isDefaultGroup,
-} from "metabase/admin/utils/groups";
+} from "metabase/common/utils/groups";
import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import {
Box,
diff --git a/frontend/src/metabase/admin/people/components/GroupsMultiSelect/GroupsMultiSelect.unit.spec.tsx b/frontend/src/metabase/common/components/GroupsMultiSelect/GroupsMultiSelect.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/admin/people/components/GroupsMultiSelect/GroupsMultiSelect.unit.spec.tsx
rename to frontend/src/metabase/common/components/GroupsMultiSelect/GroupsMultiSelect.unit.spec.tsx
diff --git a/frontend/src/metabase/admin/people/components/GroupsMultiSelect/index.ts b/frontend/src/metabase/common/components/GroupsMultiSelect/index.ts
similarity index 100%
rename from frontend/src/metabase/admin/people/components/GroupsMultiSelect/index.ts
rename to frontend/src/metabase/common/components/GroupsMultiSelect/index.ts
diff --git a/frontend/src/metabase/admin/people/forms/UserForm.tsx b/frontend/src/metabase/common/components/UserForm.tsx
similarity index 97%
rename from frontend/src/metabase/admin/people/forms/UserForm.tsx
rename to frontend/src/metabase/common/components/UserForm.tsx
index 019af2a5cc8..dffca13f2db 100644
--- a/frontend/src/metabase/admin/people/forms/UserForm.tsx
+++ b/frontend/src/metabase/common/components/UserForm.tsx
@@ -4,11 +4,11 @@ import { t } from "ttag";
import _ from "underscore";
import * as Yup from "yup";
-import { GroupsMultiSelect } from "metabase/admin/people/components/GroupsMultiSelect";
-import { 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";
+import { GroupsMultiSelect } from "metabase/common/components/GroupsMultiSelect";
+import { isDefaultGroup } from "metabase/common/utils/groups";
import {
Form,
FormErrorMessage,
diff --git a/frontend/src/metabase/admin/people/forms/UserForm.unit.spec.tsx b/frontend/src/metabase/common/components/UserForm.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/admin/people/forms/UserForm.unit.spec.tsx
rename to frontend/src/metabase/common/components/UserForm.unit.spec.tsx
diff --git a/frontend/src/metabase/admin/utils/groups.ts b/frontend/src/metabase/common/utils/groups.ts
similarity index 100%
rename from frontend/src/metabase/admin/utils/groups.ts
rename to frontend/src/metabase/common/utils/groups.ts
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
index caf86d49c0b..e4f20ac6b11 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenuItems.tsx
@@ -1,18 +1,19 @@
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 type {
+ DashCardMenuItem,
+ DashboardCardCustomMenuItem,
+} from "metabase/embedding-sdk/types/plugins";
import { useDispatch } from "metabase/redux";
import { Icon, Menu } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
import type { DashCardId, Dataset } from "metabase-types/api";
-import type { DashCardMenuItem } from "./dashcard-menu";
import { canEditQuestion } from "./utils";
type DashCardMenuItemsProps = {
@@ -35,13 +36,12 @@ export const DashCardMenuItems = ({
const dispatch = useDispatch();
const {
+ dashcardMenu,
onEditQuestion = (
question: Question,
mode: "query" | "view" | "notebook" = "notebook",
) => dispatch(editQuestion(question, mode)),
- } = useSdkDashboardContext();
-
- const { dashcardMenu } = useDashboardContext();
+ } = useDashboardContext();
const dashcardMenuItems = dashcardMenu as
| DashboardCardCustomMenuItem
| undefined;
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/dashcard-menu.ts b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/dashcard-menu.ts
index 6c8816d165f..af8c011fa8d 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/dashcard-menu.ts
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/dashcard-menu.ts
@@ -1,10 +1,8 @@
-/* eslint-disable-next-line no-restricted-imports */
-import type { MantineColor } from "@mantine/core";
import type { ReactNode } from "react";
-import type { MetabaseQuestion } from "embedding-sdk-bundle/types";
import type { DashboardContextProps } from "metabase/dashboard/context";
-import type { IconName } from "metabase/embedding-sdk/types/icon";
+import type { DashCardMenuItem } from "metabase/embedding-sdk/types/plugins";
+import type { MetabaseQuestion } from "metabase/embedding-sdk/types/question";
import type { DashboardCard, Dataset } from "metabase-types/api";
export type DashboardCardMenuCustomElement = ({
@@ -35,50 +33,3 @@ export type DashboardCardCustomMenuItem = {
export type DashboardCardMenu =
| DashboardCardMenuCustomElement
| DashboardCardCustomMenuItem;
-
-export type DashCardMenuItem = {
- /**
- * Icon name
- */
- iconName: IconName;
-
- /**
- * Item label
- **/
- label: string;
-
- /**
- * Item children
- */
- children?: ReactNode;
-
- /**
- * Key of `theme.colors` or any valid CSS color
- **/
- color?: MantineColor;
-
- /**
- * Determines whether the menu should be closed when the item is clicked, overrides `closeOnItemClick` prop on the `Menu` component
- **/
- closeMenuOnClick?: boolean;
-
- /**
- * Section displayed on the left side of the label
- **/
- leftSection?: ReactNode;
-
- /**
- * Section displayed on the right side of the label
- **/
- rightSection?: ReactNode;
-
- /**
- * Disables item
- **/
- disabled?: boolean;
-
- /**
- * Click handler
- */
- onClick: () => void;
-};
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
index fc3bd1da208..65d3b2bac6e 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
@@ -2,7 +2,6 @@ import cx from "classnames";
import { useMemo } from "react";
import { t } from "ttag";
-import { PLUGIN_NOTIFICATIONS_SDK } from "embedding-sdk-bundle/components/public/notifications";
import DashboardS from "metabase/css/dashboard.module.css";
import { DashboardHeader } from "metabase/dashboard/components/DashboardHeader";
import { useDashboardContext } from "metabase/dashboard/context";
@@ -142,7 +141,6 @@ type DashboardComponentType = typeof DashboardDefaultView & {
ParametersList: typeof ParametersList;
FullscreenButton: typeof FullscreenToggle;
ExportAsPdfButton: typeof ExportAsPdfButton;
- SubscriptionsButton: typeof PLUGIN_NOTIFICATIONS_SDK.DashboardSubscriptionsButton;
InfoButton: typeof DashboardInfoButton;
RefreshPeriod: typeof RefreshWidget;
};
@@ -155,8 +153,6 @@ DashboardComponent.Tabs = DashboardTabs;
DashboardComponent.ParametersList = ParametersList;
DashboardComponent.FullscreenButton = FullscreenToggle;
DashboardComponent.ExportAsPdfButton = ExportAsPdfButton;
-DashboardComponent.SubscriptionsButton =
- PLUGIN_NOTIFICATIONS_SDK.DashboardSubscriptionsButton;
DashboardComponent.InfoButton = DashboardInfoButton;
DashboardComponent.RefreshPeriod = RefreshWidget;
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx
index 533a46c2ca6..107853a12f4 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx
@@ -1,3 +1,4 @@
+import { PLUGIN_NOTIFICATIONS_SDK } from "metabase/plugins";
import { Center, Divider } from "metabase/ui";
import { DashboardBookmark } from "../../DashboardBookmark";
@@ -18,7 +19,6 @@ import {
FullscreenToggle,
} from "../buttons";
import { AddLinkOrEmbedButton } from "../buttons/AddLinkOrEmbedButton";
-import { DashboardSubscriptionsButton } from "../buttons/DashboardSubscriptionsButton";
import { RefreshIndicator } from "../buttons/RefreshIndicator";
import { DashboardSharingMenu } from "./DashboardSharingMenu/DashboardSharingMenu";
@@ -134,7 +134,7 @@ export const dashboardActionButtons: Record<
// Modular embedding
[DASHBOARD_ACTION.DASHBOARD_SUBSCRIPTIONS]: {
enabled: ({ withSubscriptions }) => withSubscriptions,
- component: () => <DashboardSubscriptionsButton />,
+ component: () => <PLUGIN_NOTIFICATIONS_SDK.DashboardSubscriptionsButton />,
},
[DASHBOARD_ACTION.REFRESH_INDICATOR]: {
enabled: ({ refreshPeriod }) => refreshPeriod != null && refreshPeriod > 0,
diff --git a/frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx b/frontend/src/metabase/dashboard/components/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx
similarity index 100%
rename from frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx
rename to frontend/src/metabase/dashboard/components/DashboardSharingEmbeddingModal/DashboardSharingEmbeddingModal.tsx
diff --git a/frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/index.ts b/frontend/src/metabase/dashboard/components/DashboardSharingEmbeddingModal/index.ts
similarity index 100%
rename from frontend/src/metabase/embedding/components/DashboardSharingEmbeddingModal/index.ts
rename to frontend/src/metabase/dashboard/components/DashboardSharingEmbeddingModal/index.ts
diff --git a/frontend/src/metabase/dashboard/context/context.tsx b/frontend/src/metabase/dashboard/context/context.tsx
index 987d7d427d2..c1ef890b635 100644
--- a/frontend/src/metabase/dashboard/context/context.tsx
+++ b/frontend/src/metabase/dashboard/context/context.tsx
@@ -16,6 +16,7 @@ import { isEqual, noop } from "underscore";
import { isAbortError } from "metabase/api/client";
import { useEmbeddingEntityContext } from "metabase/embedding/context";
import { getTabHiddenParameterSlugs } from "metabase/embedding/lib/tab-parameters";
+import type Question from "metabase-lib/v1/Question";
import type {
Dashboard,
DashboardCard,
@@ -76,6 +77,12 @@ export type DashboardContextOwnProps = {
* Forcing passing it isn't ideal since we only need to do this in a couple of places
*/
onNewQuestion?: () => void;
+ // Lets a host override how "edit question" navigates from a dashcard.
+ // Defaults to the query builder route when unset (the SDK renders inline instead).
+ onEditQuestion?: (
+ question: Question,
+ mode?: "query" | "view" | "notebook",
+ ) => void;
/**
* When true, internal click behaviors (dashboard/question links) are preserved
* instead of being filtered out. Used by the SDK for internal navigation.
@@ -131,6 +138,7 @@ const DashboardContextProviderInner = forwardRef(
dashboardActions: initDashboardActions,
isDashcardVisible,
onNewQuestion,
+ onEditQuestion,
children,
@@ -412,6 +420,7 @@ const DashboardContextProviderInner = forwardRef(
dashcardMenu,
dashboardActions,
onNewQuestion,
+ onEditQuestion,
isEditableDashboard,
navigateToNewCardFromDashboard,
diff --git a/frontend/src/metabase/dashboard/selectors.ts b/frontend/src/metabase/dashboard/selectors.ts
index 69936cf1917..7849d36ece9 100644
--- a/frontend/src/metabase/dashboard/selectors.ts
+++ b/frontend/src/metabase/dashboard/selectors.ts
@@ -2,13 +2,13 @@ import { createSelector } from "@reduxjs/toolkit";
import { createCachedSelector } from "re-reselect";
import _ from "underscore";
-import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";
import {
DASHBOARD_SLOW_TIMEOUT,
SIDEBAR_NAME,
} from "metabase/dashboard/constants";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
+import type { SdkSharedStoreState } from "metabase/embedding-sdk/types/store";
import {
getDashboardQuestions,
getSavedDashboardUiParameters,
@@ -573,8 +573,8 @@ export const getSelectedTabId = createSelector(
(state) => getSetting(state, "site-url"),
getDashboard,
(state) => state.dashboard.selectedTabId,
- (state: State) =>
- (state as Partial<SdkStoreState>).sdk?.initialDashboardTabId,
+ (state: State & Partial<SdkSharedStoreState>) =>
+ state.sdk?.initialDashboardTabId,
],
(isWebApp, siteUrl, dashboard, selectedTabId, sdkInitialDashboardTabId) => {
if (dashboard && selectedTabId === null) {
diff --git a/frontend/src/metabase/embedding-sdk/types/plugins.ts b/frontend/src/metabase/embedding-sdk/types/plugins.ts
index f39be87a706..da398266dc6 100644
--- a/frontend/src/metabase/embedding-sdk/types/plugins.ts
+++ b/frontend/src/metabase/embedding-sdk/types/plugins.ts
@@ -1,8 +1,10 @@
+/* eslint-disable-next-line no-restricted-imports */
+import type { MantineColor } from "@mantine/core";
import type { ReactNode } from "react";
-import type { DashCardMenuItem } from "metabase/dashboard/components/DashCard/DashCardMenu/dashcard-menu";
import type { ClickAction } from "metabase/visualizations/types";
+import type { IconName } from "./icon";
import type { MetabaseQuestion } from "./question";
export type MetabaseDataPointObject = {
@@ -36,6 +38,53 @@ export type DashboardCardMenuCustomElement = ({
question: MetabaseQuestion;
}) => ReactNode;
+export type DashCardMenuItem = {
+ /**
+ * Icon name
+ */
+ iconName: IconName;
+
+ /**
+ * Item label
+ **/
+ label: string;
+
+ /**
+ * Item children
+ */
+ children?: ReactNode;
+
+ /**
+ * Key of `theme.colors` or any valid CSS color
+ **/
+ color?: MantineColor;
+
+ /**
+ * Determines whether the menu should be closed when the item is clicked, overrides `closeOnItemClick` prop on the `Menu` component
+ **/
+ closeMenuOnClick?: boolean;
+
+ /**
+ * Section displayed on the left side of the label
+ **/
+ leftSection?: ReactNode;
+
+ /**
+ * Section displayed on the right side of the label
+ **/
+ rightSection?: ReactNode;
+
+ /**
+ * Disables item
+ **/
+ disabled?: boolean;
+
+ /**
+ * Click handler
+ */
+ onClick: () => void;
+};
+
export type CustomDashboardCardMenuItem = ({
question,
}: {
diff --git a/frontend/src/metabase/embedding-sdk/types/store.ts b/frontend/src/metabase/embedding-sdk/types/store.ts
new file mode 100644
index 00000000000..b463e5c4ba4
--- /dev/null
+++ b/frontend/src/metabase/embedding-sdk/types/store.ts
@@ -0,0 +1,21 @@
+import type { DashboardTabId } from "metabase-types/api";
+
+/**
+ * SDK related state that's read in the SDK.
+ * This is probably something we should avoid adding to, to keep
+ * SDK code and core app code decoupled
+ */
+export interface SdkSharedState {
+ /**
+ * Tab to apply when the next dashboard mounts via a cross-dashboard
+ * click behavior. Not cleared after use: tab IDs are globally unique
+ * PKs, so stale values can't match another dashboard's tabs, and the
+ * selector falls back to the first tab via a `hasTab` guard. Every
+ * cross-dashboard push overwrites this slot anyway.
+ */
+ initialDashboardTabId: DashboardTabId | null;
+}
+
+export interface SdkSharedStoreState {
+ sdk: SdkSharedState;
+}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx
index b7b2f7263bc..35fbfbb43fb 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/InviteToViewModal.tsx
@@ -1,7 +1,6 @@
import { type ReactNode, useEffect, useState } from "react";
import { jt, t } from "ttag";
-import { UserForm } from "metabase/admin/people/forms/UserForm";
import { useCreateUserMutation } from "metabase/api";
import { isEmailAlreadyInUse } from "metabase/api/utils/errors";
import {
@@ -10,6 +9,7 @@ import {
} from "metabase/common/analytics";
import { CopyTextInput } from "metabase/common/components/CopyTextInput";
import { PasswordReveal } from "metabase/common/components/PasswordReveal";
+import { UserForm } from "metabase/common/components/UserForm";
import { useSetting, useToast } from "metabase/common/hooks";
import { useSelector } from "metabase/redux";
import { Link } from "metabase/router";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsx
index 340cfad3b27..60d8e983924 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal.tsx
@@ -1,7 +1,7 @@
import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { DashboardSharingEmbeddingModal } from "metabase/embedding/components/DashboardSharingEmbeddingModal";
+import { DashboardSharingEmbeddingModal } from "metabase/dashboard/components/DashboardSharingEmbeddingModal";
import { QuestionEmbedWidget } from "metabase/embedding/components/QuestionEmbedWidget";
import { useGetCurrentResource } from "metabase/embedding/embedding-iframe-sdk-setup/hooks";
import { useOpenEmbedJsWizard } from "metabase/embedding/hooks/use-open-embed-js-wizard";
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 f4f94eff826..f95f09979a7 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx
@@ -15,10 +15,10 @@ import {
} from "embedding-sdk-bundle/components/public/dashboard";
import { getSdkStore, useSdkSelector } from "embedding-sdk-bundle/store";
import { getLoginStatus } from "embedding-sdk-bundle/store/selectors";
-import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config";
import type { SdkDashboardEntityPublicProps } from "embedding-sdk-bundle/types/dashboard";
import type { SdkQuestionEntityPublicProps } from "embedding-sdk-bundle/types/question";
import { applyThemePreset } from "embedding-sdk-shared/lib/apply-theme-preset";
+import type { MetabaseAuthConfig } from "embedding-sdk-shared/types/auth-config";
import { createSnowplowTracker } from "metabase/analytics";
import type { OnBeforeRequestHandler } from "metabase/api/client";
import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/EmbeddingFooter";
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts
index 8f9deb2e158..e7b1d6863c9 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/embed.ts
@@ -1,6 +1,6 @@
-import { MetabaseError, SSO_NOT_ALLOWED } from "embedding-sdk-bundle/errors";
-import * as MetabaseErrors from "embedding-sdk-bundle/errors";
import type { SqlParameterValues } from "embedding-sdk-bundle/types";
+import { MetabaseError, SSO_NOT_ALLOWED } from "embedding-sdk-shared/errors";
+import * as MetabaseErrors from "embedding-sdk-shared/errors";
import { PLUGIN_EMBED_JS_EE } from "metabase/embedding/embedding-iframe-sdk/plugin";
import type {
EmbedAuthManager,
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts
index bc354b28fc4..edb3945f7ff 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/types/embed.ts
@@ -1,6 +1,4 @@
import type { CollectionBrowserListColumns } from "embedding-sdk-bundle/components/public/CollectionBrowser";
-import type { MetabaseError } from "embedding-sdk-bundle/errors";
-import type { MetabaseErrorCode } from "embedding-sdk-bundle/errors/error-code";
import type {
EntityTypeFilterKeys,
MetabaseAuthMethod,
@@ -9,6 +7,8 @@ import type {
} from "embedding-sdk-bundle/types";
import type { ParameterChangePayload } from "embedding-sdk-bundle/types/dashboard";
import type { SqlParameterChangePayload } from "embedding-sdk-bundle/types/question";
+import type { MetabaseError } from "embedding-sdk-shared/errors";
+import type { MetabaseErrorCode } from "embedding-sdk-shared/errors/error-code";
import type {
SdkIframeDashboardEmbedSettings,
SdkIframeQuestionEmbedSettings,
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 264b43d0a24..d1d9b755280 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,4 +1,4 @@
-import { AUTH_TIMEOUT } from "embedding-sdk-bundle/errors";
+import { AUTH_TIMEOUT } from "embedding-sdk-shared/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/utils/iframe";
diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.ts
index 0fb2629e41d..613011b1967 100644
--- a/frontend/src/metabase/plugins/index.ts
+++ b/frontend/src/metabase/plugins/index.ts
@@ -82,6 +82,11 @@ export {
type LegacyStaticEmbeddingModalProps,
} from "./oss/embedding-iframe-sdk-setup";
export { PLUGIN_EMBEDDING_SDK } from "./oss/embedding-sdk";
+export {
+ PLUGIN_NOTIFICATIONS_SDK,
+ type DashboardSubscriptionsButtonProps,
+ type QuestionAlertsButtonProps,
+} from "./oss/notifications-sdk";
export {
PLUGIN_LIBRARY,
type CollectionPermissionsModalProps,
@@ -180,8 +185,6 @@ export type {
} from "./types";
// Export a single reinitialize function that calls all individual reinitialize functions
-import { reinitialize as reinitializeNotificationsSdk } from "../../embedding-sdk-bundle/components/public/notifications";
-
import { reinitialize as reinitializeAiControls } from "./oss/ai-controls";
import { reinitialize as reinitializeApi } from "./oss/api";
import { reinitialize as reinitializeAudit } from "./oss/audit";
@@ -202,6 +205,7 @@ import { reinitialize as reinitializeLibrary } from "./oss/library";
import { reinitialize as reinitializeMetabot } from "./oss/metabot";
import { reinitialize as reinitializeModelPersistence } from "./oss/model-persistence";
import { reinitialize as reinitializeModeration } from "./oss/moderation";
+import { reinitialize as reinitializeNotificationsSdk } from "./oss/notifications-sdk";
import { reinitialize as reinitializePermissions } from "./oss/permissions";
import { reinitialize as reinitializeRemoteSync } from "./oss/remote-sync";
import { reinitialize as reinitializeReplacement } from "./oss/replacement";
diff --git a/frontend/src/embedding-sdk-bundle/components/public/notifications/index.tsx b/frontend/src/metabase/plugins/oss/notifications-sdk.ts
similarity index 100%
rename from frontend/src/embedding-sdk-bundle/components/public/notifications/index.tsx
rename to frontend/src/metabase/plugins/oss/notifications-sdk.ts
diff --git a/frontend/src/metabase/redux/store/mocks/state.ts b/frontend/src/metabase/redux/store/mocks/state.ts
index f5627eeafc8..80ec9657aa9 100644
--- a/frontend/src/metabase/redux/store/mocks/state.ts
+++ b/frontend/src/metabase/redux/store/mocks/state.ts
@@ -1,4 +1,4 @@
-import type { SdkStoreState } from "embedding-sdk-bundle/store/types";
+import type { SdkSharedStoreState } from "metabase/embedding-sdk/types/store";
import type { State } from "metabase/redux/store";
import { createMockUser } from "metabase-types/api/mocks";
@@ -19,9 +19,9 @@ import { createMockSetupState } from "./setup";
import { createMockUploadState } from "./upload";
import { createMockVisualizerState } from "./visualizer";
-export function createMockState<S extends Pick<SdkStoreState, "sdk">>(
- opts?: S,
-): SdkStoreState;
+export function createMockState(
+ opts: Partial<State> & SdkSharedStoreState,
+): State & SdkSharedStoreState;
export function createMockState(opts?: Partial<State>): State;
export function createMockState(opts: any) {
return {
diff --git a/rspack.iframe-sdk-embed.config.js b/rspack.iframe-sdk-embed.config.js
index cf8bc03f7c9..d1fb26bca38 100644
--- a/rspack.iframe-sdk-embed.config.js
+++ b/rspack.iframe-sdk-embed.config.js
@@ -23,6 +23,7 @@ const SCRIPT_TAG_PATH = path.resolve(
const BUILD_PATH = __dirname + "/resources/frontend_client";
const EMBEDDING_SRC_PATH = __dirname + "/enterprise/frontend/src/embedding";
const SDK_BUNDLE_SRC_PATH = __dirname + "/frontend/src/embedding-sdk-bundle";
+const SDK_SHARED_SRC_PATH = __dirname + "/frontend/src/embedding-sdk-shared";
const OUT_FILE_NAME = "embed.js";
const OUT_TEMP_PATH = path.resolve(BUILD_PATH, "tmp-embed-js");
@@ -89,6 +90,7 @@ module.exports = {
metabase: SRC_PATH,
embedding: EMBEDDING_SRC_PATH,
"embedding-sdk-bundle": SDK_BUNDLE_SRC_PATH,
+ "embedding-sdk-shared": SDK_SHARED_SRC_PATH,
"sdk-iframe-embedding-script-ee-plugins": resolveEnterprisePathOrNoop(
"/sdk-iframe-embedding-script-plugins",
),