Skip to content

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

Consolidate app banners into AppBanner (#77255)

Fraser837a4546209d
diff --git a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
index be49a083485..d0f6593cb98 100644
--- a/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
+++ b/frontend/src/metabase/common/components/AppBanner/AppBanner.tsx
@@ -1,20 +1,20 @@
import dayjs from "dayjs";
import { useSetting, useUserSetting } from "metabase/common/hooks";
-import { DevModeBanner } from "metabase/nav/components/DevModeBanner";
-import {
- LicenseTokenMissingBanner,
- useLicenseTokenMissingBanner,
-} from "metabase/nav/components/LicenseTokenMissingBanner";
-import { PaymentBanner } from "metabase/nav/components/PaymentBanner/PaymentBanner";
-import { ReadOnlyBanner } from "metabase/nav/components/ReadOnlyBanner";
-import { TrialBanner } from "metabase/nav/components/TrialBanner";
import { PLUGIN_SECURITY_CENTER } from "metabase/plugins";
import { useSelector } from "metabase/redux";
import { getIsHosted } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
import { isWithinIframe } from "metabase/utils/iframe";
+import { DevModeBanner } from "./DevModeBanner";
+import {
+ LicenseTokenMissingBanner,
+ useLicenseTokenMissingBanner,
+} from "./LicenseTokenMissingBanner";
+import { PaymentBanner } from "./PaymentBanner/PaymentBanner";
+import { ReadOnlyBanner } from "./ReadOnlyBanner";
+import { TrialBanner } from "./TrialBanner";
import { getCurrentUTCTimestamp, shouldShowTrialBanner } from "./utils";
export const AppBanner = () => {
diff --git a/frontend/src/metabase/nav/components/DevModeBanner/DevModeBanner.tsx b/frontend/src/metabase/common/components/AppBanner/DevModeBanner/DevModeBanner.tsx
similarity index 100%
rename from frontend/src/metabase/nav/components/DevModeBanner/DevModeBanner.tsx
rename to frontend/src/metabase/common/components/AppBanner/DevModeBanner/DevModeBanner.tsx
diff --git a/frontend/src/metabase/nav/components/DevModeBanner/index.ts b/frontend/src/metabase/common/components/AppBanner/DevModeBanner/index.ts
similarity index 100%
rename from frontend/src/metabase/nav/components/DevModeBanner/index.ts
rename to frontend/src/metabase/common/components/AppBanner/DevModeBanner/index.ts
diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.module.css b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/LicenseTokenMissingBanner.module.css
similarity index 100%
rename from frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.module.css
rename to frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/LicenseTokenMissingBanner.module.css
diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx
similarity index 100%
rename from frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx
rename to frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx
diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/index.ts b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/index.ts
similarity index 100%
rename from frontend/src/metabase/nav/components/LicenseTokenMissingBanner/index.ts
rename to frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/index.ts
diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts
similarity index 100%
rename from frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts
rename to frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.ts
diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts b/frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/nav/components/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts
rename to frontend/src/metabase/common/components/AppBanner/LicenseTokenMissingBanner/useLicenseTokenMissingBanner.unit.spec.ts
diff --git a/frontend/src/metabase/nav/components/PaymentBanner/PaymentBanner.tsx b/frontend/src/metabase/common/components/AppBanner/PaymentBanner/PaymentBanner.tsx
similarity index 100%
rename from frontend/src/metabase/nav/components/PaymentBanner/PaymentBanner.tsx
rename to frontend/src/metabase/common/components/AppBanner/PaymentBanner/PaymentBanner.tsx
diff --git a/frontend/src/metabase/nav/components/ReadOnlyBanner/ReadOnlyBanner.tsx b/frontend/src/metabase/common/components/AppBanner/ReadOnlyBanner/ReadOnlyBanner.tsx
similarity index 100%
rename from frontend/src/metabase/nav/components/ReadOnlyBanner/ReadOnlyBanner.tsx
rename to frontend/src/metabase/common/components/AppBanner/ReadOnlyBanner/ReadOnlyBanner.tsx
diff --git a/frontend/src/metabase/nav/components/ReadOnlyBanner/index.ts b/frontend/src/metabase/common/components/AppBanner/ReadOnlyBanner/index.ts
similarity index 100%
rename from frontend/src/metabase/nav/components/ReadOnlyBanner/index.ts
rename to frontend/src/metabase/common/components/AppBanner/ReadOnlyBanner/index.ts
diff --git a/frontend/src/metabase/nav/components/TrialBanner/TrialBanner.tsx b/frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.tsx
similarity index 100%
rename from frontend/src/metabase/nav/components/TrialBanner/TrialBanner.tsx
rename to frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.tsx
diff --git a/frontend/src/metabase/nav/components/TrialBanner/TrialBanner.unit.spec.tsx b/frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/nav/components/TrialBanner/TrialBanner.unit.spec.tsx
rename to frontend/src/metabase/common/components/AppBanner/TrialBanner/TrialBanner.unit.spec.tsx
diff --git a/frontend/src/metabase/nav/components/TrialBanner/index.ts b/frontend/src/metabase/common/components/AppBanner/TrialBanner/index.ts
similarity index 100%
rename from frontend/src/metabase/nav/components/TrialBanner/index.ts
rename to frontend/src/metabase/common/components/AppBanner/TrialBanner/index.ts