The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Move the storage setup provider slot beside its context (#82243)
Fraser19df422bbd26
diff --git a/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.tsx b/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.tsxindex 02a6c6921c6..c0116853ff6 100644--- a/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.tsx+++ b/enterprise/frontend/src/metabase-enterprise/storage/StorageSetupProvider.tsx@@ -12,9 +12,6 @@ import { usePurchaseStorageAddOn } from "./use-purchase-storage-add-on";import { useStorageAddOn } from "./use-storage-add-on";/**- * The real storage setup provider, injected into the OSS Add data modal via- * `PLUGIN_UPLOAD_MANAGEMENT.StorageSetupProvider` on hosted instances.- ** Must be mounted outside the modal's `Modal.Root`, so its polling survives the* modal closing and its purchase modal replaces the host modal rather than* stacking on it.diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/index.ts b/enterprise/frontend/src/metabase-enterprise/upload_management/index.tsindex bdb9c042af2..c09c713625d 100644--- a/enterprise/frontend/src/metabase-enterprise/upload_management/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/index.ts@@ -1,3 +1,4 @@+import { PLUGIN_STORAGE_SETUP } from "metabase/common/components/upsells/StoragePurchaseModal";import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";import { hasPremiumFeature } from "metabase-enterprise/settings";import { StorageSetupProvider } from "metabase-enterprise/storage/StorageSetupProvider";@@ -26,7 +27,7 @@ export function initializePlugin() {PLUGIN_UPLOAD_MANAGEMENT.GdriveAddDataPanel = GdriveAddDataPanel;// The real storage-setup provider owns the cloud-add-ons purchase// endpoints, so it only activates on hosted instances.- PLUGIN_UPLOAD_MANAGEMENT.StorageSetupProvider = StorageSetupProvider;+ PLUGIN_STORAGE_SETUP.StorageSetupProvider = StorageSetupProvider;}if (hasPremiumFeature("hosting") && hasPremiumFeature("attached_dwh")) {diff --git a/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/index.ts b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/index.tsindex c30c2c8dd22..cc65ac4703f 100644--- a/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/index.ts+++ b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/index.ts@@ -1,3 +1,4 @@+export { PLUGIN_STORAGE_SETUP } from "./plugins";export {StorageSetupContext,StorageSetupProvider,diff --git a/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/plugins.ts b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/plugins.tsnew file mode 100644index 00000000000..3648a704875--- /dev/null+++ b/frontend/src/metabase/common/components/upsells/StoragePurchaseModal/plugins.ts@@ -0,0 +1,7 @@+import { definePluginSlot } from "metabase/plugins";++import { StorageSetupProvider } from "./storage-setup-context";++export const PLUGIN_STORAGE_SETUP = definePluginSlot(() => ({+ StorageSetupProvider,+}));diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsxindex 77b9234d861..1fc60186a48 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.tsx@@ -1,7 +1,10 @@import { useEffect, useMemo, useState } from "react";import { t } from "ttag";-import { useStorageSetup } from "metabase/common/components/upsells/StoragePurchaseModal";+import {+ PLUGIN_STORAGE_SETUP,+ useStorageSetup,+} from "metabase/common/components/upsells/StoragePurchaseModal";import CS from "metabase/css/core/index.css";import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";import { useSetting } from "metabase/settings";@@ -42,9 +45,9 @@ export const AddDataModal = (props: AddDataModalProps) => (// Outside `Modal.Root` so setup state and its polling survive the modal// closing, and so the purchase modal it hosts replaces this one rather than// stacking. `enabled` defers the add-ons fetch until the modal is shown.- <PLUGIN_UPLOAD_MANAGEMENT.StorageSetupProvider enabled={props.opened}>+ <PLUGIN_STORAGE_SETUP.StorageSetupProvider enabled={props.opened}><AddDataModalContent {...props} />- </PLUGIN_UPLOAD_MANAGEMENT.StorageSetupProvider>+ </PLUGIN_STORAGE_SETUP.StorageSetupProvider>);const AddDataModalContent = ({diff --git a/frontend/src/metabase/plugins/oss/upload-management.ts b/frontend/src/metabase/plugins/oss/upload-management.tsindex 86f934b87d9..5889f1e1031 100644--- a/frontend/src/metabase/plugins/oss/upload-management.ts+++ b/frontend/src/metabase/plugins/oss/upload-management.ts@@ -1,6 +1,5 @@import type { ComponentType } from "react";-import { StorageSetupProvider } from "metabase/common/components/upsells/StoragePurchaseModal/storage-setup-context";import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";import { _FileUploadErrorModal } from "metabase/status/components/FileUploadStatusLarge/FileUploadErrorModal";@@ -27,7 +26,6 @@ const getDefaultPluginUploadManagement = () => ({GdriveAddDataPanel:// Unjustified type cast. FIXMEPluginPlaceholder as ComponentType<GdriveAddDataPanelProps>,- StorageSetupProvider,});export const PLUGIN_UPLOAD_MANAGEMENT = definePluginSlot(