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