fix(admin-ui): Wraps invite route correctly with analytics (#5118)

This commit is contained in:
Oli Juhl authored and GitHub committed 2023-09-18 18:07:54 +02:00
1 parent a52d5ed786
commit 299b98c401
3 files changed
+20 -17

No files matched your search

+18 -2
View File
@@ -6,6 +6,8 @@ import {
RouterProvider,
} from "react-router-dom"
import Spinner from "./components/atoms/spinner"
import { AnalyticsProvider } from "./providers/analytics-provider"
import { WRITE_KEY } from "./constants/analytics"
const NotFound = lazy(() => import("./pages/404"))
const Dashboard = lazy(() => import("./pages/a"))
@@ -18,8 +20,22 @@ const router = createBrowserRouter(
createRoutesFromElements(
<>
<Route path="/" element={<IndexPage />} />
<Route path="a/*" element={<Dashboard />} />
<Route path="invite" element={<InvitePage />} />
<Route
path="a/*"
element={
<AnalyticsProvider writeKey={WRITE_KEY}>
<Dashboard />
</AnalyticsProvider>
}
/>
<Route
path="invite"
element={
<AnalyticsProvider writeKey={WRITE_KEY}>
<InvitePage />
</AnalyticsProvider>
}
/>
<Route path="login" element={<LoginPage />} />
<Route path="reset-password" element={<ResetPasswordPage />} />
<Route path="*" element={<NotFound />} />
+1 -8
View File
@@ -7,7 +7,6 @@ import RouteErrorElement from "../components/extensions/route-container/route-er
import PrivateRoute from "../components/private-route"
import SEO from "../components/seo"
import Layout from "../components/templates/layout"
import { WRITE_KEY } from "../constants/analytics"
import Collections from "../domain/collections"
import Customers from "../domain/customers"
import Discounts from "../domain/discounts"
@@ -22,7 +21,6 @@ import ProductsRoute from "../domain/products"
import PublishableApiKeys from "../domain/publishable-api-keys"
import SalesChannels from "../domain/sales-channels"
import Settings from "../domain/settings"
import { AnalyticsProvider } from "../providers/analytics-provider"
import { useRoutes } from "../providers/route-provider"
import { isRoute } from "../utils/extensions"
@@ -44,17 +42,13 @@ const DashboardRoutes = () => {
const injectedRoutes = getTopLevelRoutes() || []
return (
<AnalyticsProvider writeKey={WRITE_KEY}>
<DndProvider backend={HTML5Backend}>
<Layout>
<SEO title="Medusa" />
<Routes>
<Route path="oauth/:app_name" element={<Oauth />} />
<Route path="products/*" element={<ProductsRoute />} />
<Route
path="product-categories/*"
element={<ProductCategories />}
/>
<Route path="product-categories/*" element={<ProductCategories />} />
<Route path="collections/*" element={<Collections />} />
<Route path="gift-cards/*" element={<GiftCards />} />
<Route path="orders/*" element={<Orders />} />
@@ -86,7 +80,6 @@ const DashboardRoutes = () => {
</Routes>
</Layout>
</DndProvider>
</AnalyticsProvider>
)
}
+1 -7
View File
@@ -13,15 +13,11 @@ import useNotification from "../hooks/use-notification"
import { getErrorMessage } from "../utils/error-messages"
import FormValidator from "../utils/form-validator"
import { useAdminCreateAnalyticsConfig } from "../services/analytics"
import {
AnalyticsProvider,
useAnalytics,
} from "../providers/analytics-provider"
import { useAnalytics } from "../providers/analytics-provider"
import AnalyticsConfigForm, {
AnalyticsConfigFormType,
} from "../components/organisms/analytics-config-form"
import { nestedForm } from "../utils/nested-form"
import { WRITE_KEY } from "../constants/analytics"
type FormValues = {
password: string
@@ -155,7 +151,6 @@ const InvitePage = () => {
}
return (
<AnalyticsProvider writeKey={WRITE_KEY}>
<PublicLayout>
<SEO title="Create Account" />
{signUp ? (
@@ -238,7 +233,6 @@ const InvitePage = () => {
</div>
)}
</PublicLayout>
</AnalyticsProvider>
)
}