Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

fix(profile): load custom-field link data on profile pages (#1216)

Viktor Holikc0f3cddd13e0
diff --git a/packages/admin/src/pages/profile/profile-detail/components/profile-general-section/profile-general-section.tsx b/packages/admin/src/pages/profile/profile-detail/components/profile-general-section/profile-general-section.tsx
index 098e0015d..925396fc1 100644
--- a/packages/admin/src/pages/profile/profile-detail/components/profile-general-section/profile-general-section.tsx
+++ b/packages/admin/src/pages/profile/profile-detail/components/profile-general-section/profile-general-section.tsx
@@ -2,6 +2,10 @@ import { PencilSquare } from "@medusajs/icons"
import { HttpTypes } from "@medusajs/types"
import { Container, Heading, Text } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
+import {
+ DisplayExtensionZone,
+ DisplayField,
+} from "@mercurjs/dashboard-shared"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { languages } from "../../../../../i18n/languages"
@@ -38,31 +42,43 @@ export const ProfileGeneralSection = ({ user }: ProfileGeneralSectionProps) => {
data-testid="profile-general-section-action-menu"
/>
</div>
- <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4" data-testid="profile-general-section-name-row">
- <Text size="small" leading="compact" weight="plus" data-testid="profile-general-section-name-label">
- {t("fields.name")}
- </Text>
- <Text size="small" leading="compact" data-testid="profile-general-section-name-value">
- {name || "-"}
- </Text>
- </div>
- <div className="grid grid-cols-2 items-center px-6 py-4" data-testid="profile-general-section-email-row">
- <Text size="small" leading="compact" weight="plus" data-testid="profile-general-section-email-label">
- {t("fields.email")}
- </Text>
- <Text size="small" leading="compact" data-testid="profile-general-section-email-value">
- {user.email}
- </Text>
- </div>
- <div className="grid grid-cols-2 items-center px-6 py-4" data-testid="profile-general-section-language-row">
- <Text size="small" leading="compact" weight="plus" data-testid="profile-general-section-language-label">
- {t("profile.fields.languageLabel")}
- </Text>
- <Text size="small" leading="compact" data-testid="profile-general-section-language-value">
- {languages.find((lang) => lang.code === i18n.language)
- ?.display_name || "-"}
- </Text>
- </div>
+ <DisplayField model="user" zone="general" id="name" data={user}>
+ <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4" data-testid="profile-general-section-name-row">
+ <Text size="small" leading="compact" weight="plus" data-testid="profile-general-section-name-label">
+ {t("fields.name")}
+ </Text>
+ <Text size="small" leading="compact" data-testid="profile-general-section-name-value">
+ {name || "-"}
+ </Text>
+ </div>
+ </DisplayField>
+ <DisplayField model="user" zone="general" id="email" data={user}>
+ <div className="grid grid-cols-2 items-center px-6 py-4" data-testid="profile-general-section-email-row">
+ <Text size="small" leading="compact" weight="plus" data-testid="profile-general-section-email-label">
+ {t("fields.email")}
+ </Text>
+ <Text size="small" leading="compact" data-testid="profile-general-section-email-value">
+ {user.email}
+ </Text>
+ </div>
+ </DisplayField>
+ <DisplayField model="user" zone="general" id="language" data={user}>
+ <div className="grid grid-cols-2 items-center px-6 py-4" data-testid="profile-general-section-language-row">
+ <Text size="small" leading="compact" weight="plus" data-testid="profile-general-section-language-label">
+ {t("profile.fields.languageLabel")}
+ </Text>
+ <Text size="small" leading="compact" data-testid="profile-general-section-language-value">
+ {languages.find((lang) => lang.code === i18n.language)
+ ?.display_name || "-"}
+ </Text>
+ </div>
+ </DisplayField>
+ <DisplayExtensionZone
+ model="user"
+ zone="general"
+ data={user}
+ builtInFieldIds={["name", "email", "language"]}
+ />
{/* TODO: Do we want to implement usage insights in V2? */}
{/* <div className="grid grid-cols-2 items-center px-6 py-4">
<Text size="small" leading="compact" weight="plus">
diff --git a/packages/admin/src/pages/profile/profile-detail/profile-detail.tsx b/packages/admin/src/pages/profile/profile-detail/profile-detail.tsx
index a96905754..94bd149dd 100644
--- a/packages/admin/src/pages/profile/profile-detail/profile-detail.tsx
+++ b/packages/admin/src/pages/profile/profile-detail/profile-detail.tsx
@@ -1,6 +1,6 @@
import { ReactNode, Children } from "react"
-import { WidgetZone } from "@mercurjs/dashboard-shared"
+import { WidgetZone, useExtension } from "@mercurjs/dashboard-shared"
import { useMe } from "../../../hooks/api/users"
import { ProfileGeneralSection } from "./components/profile-general-section"
@@ -8,7 +8,12 @@ import { ProfileGeneralSection } from "./components/profile-general-section"
import { SingleColumnPageSkeleton } from "../../../components/common/skeleton"
import { SingleColumnPage } from "../../../components/layout/pages"
const Root = ({ children }: { children?: ReactNode }) => {
- const { user, isPending: isLoading, isError, error } = useMe()
+ const userLinks = useExtension().getLinks("user")
+ const meQuery = userLinks.length
+ ? { fields: userLinks.map((link) => `+${link}.*`).join(",") }
+ : undefined
+
+ const { user, isPending: isLoading, isError, error } = useMe(meQuery)
if (isLoading || !user) {
return <SingleColumnPageSkeleton sections={1} />
diff --git a/packages/vendor/src/pages/settings/profile/profile-detail/components/profile-general-section/profile-general-section.tsx b/packages/vendor/src/pages/settings/profile/profile-detail/components/profile-general-section/profile-general-section.tsx
index e801b29bb..b2e557ac3 100644
--- a/packages/vendor/src/pages/settings/profile/profile-detail/components/profile-general-section/profile-general-section.tsx
+++ b/packages/vendor/src/pages/settings/profile/profile-detail/components/profile-general-section/profile-general-section.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next"
import {
DisplayExtensionZone,
DisplayField,
+ useExtension,
} from "@mercurjs/dashboard-shared"
import { ActionMenu } from "../../../../../../components/common/action-menu"
import { useMe } from "../../../../../../hooks/api"
@@ -11,7 +12,13 @@ import { languages } from "../../../../../../i18n/languages"
export const ProfileGeneralSection = () => {
const { i18n, t } = useTranslation()
- const { seller_member } = useMe()
+
+ const memberLinks = useExtension().getLinks("member")
+ const meQuery = memberLinks.length
+ ? { fields: memberLinks.map((link) => `+member.${link}.*`).join(",") }
+ : undefined
+
+ const { seller_member } = useMe(meQuery)
const member = seller_member?.member
return (
diff --git a/packages/vendor/src/pages/settings/profile/profile-detail/profile-detail.tsx b/packages/vendor/src/pages/settings/profile/profile-detail/profile-detail.tsx
index 6e9bc22ed..e7e139356 100644
--- a/packages/vendor/src/pages/settings/profile/profile-detail/profile-detail.tsx
+++ b/packages/vendor/src/pages/settings/profile/profile-detail/profile-detail.tsx
@@ -1,13 +1,18 @@
import { ReactNode, Children } from "react"
-import { WidgetZone } from "@mercurjs/dashboard-shared"
+import { WidgetZone, useExtension } from "@mercurjs/dashboard-shared"
import { useMe } from "../../../../hooks/api"
import { SingleColumnPage } from "../../../../components/layout/pages"
import { ProfileGeneralSection } from "./components/profile-general-section"
const Root = ({ children }: { children?: ReactNode }) => {
- const { seller_member } = useMe()
+ const memberLinks = useExtension().getLinks("member")
+ const meQuery = memberLinks.length
+ ? { fields: memberLinks.map((link) => `+member.${link}.*`).join(",") }
+ : undefined
+
+ const { seller_member } = useMe(meQuery)
const member = seller_member?.member
return Children.count(children) > 0 ? (