asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(dashboard): minor fixes to profile (#7046)

Browse Source
This commit is contained in:
Kasper Fabricius Kristensen
2024-04-11 09:52:28 +02:00
committed by GitHub
parent eac4d2d87a
commit 27387b7cf1
4 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/admin-next/dashboard/public/locales/en-US/translation.json
View File

@@ -802,11 +802,16 @@
"profile": {
"domain": "Profile",
"manageYourProfileDetails": "Manage your profile details",
"editProfile": "Edit profile",
"languageHint": "The language you want to use in the admin dashboard. This will not change the language of your store.",
"userInsightsHint": "Share usage insights and help us improve Medusa. You can read more about what we collect and how we use it in our <0>documentation</0>.",
"language": "Language",
"usageInsights": "Usage insights"
"fields": {
"languageLabel": "Language",
"usageInsightsLabel": "Usage insights"
},
"edit": {
"header": "Edit Profile",
"languageHint": "The language you want to use in the admin dashboard. This will not change the language of your store.",
"languagePlaceholder": "Select language",
"usageInsightsHint": "Share usage insights and help us improve Medusa. You can read more about what we collect and how we use it in our <0>documentation</0>."
}
},
"users": {
"domain": "Users",

9
packages/admin-next/dashboard/src/v2-routes/profile/profile-detail/components/profile-general-section/profile-general-section.tsx
View File

@@ -10,6 +10,9 @@ type ProfileGeneralSectionProps = {
export const ProfileGeneralSection = ({ user }: ProfileGeneralSectionProps) => {
const { i18n, t } = useTranslation()
const name = [user.first_name, user.last_name].filter(Boolean).join(" ")
return (
<Container className="divide-y p-0">
<div className="flex items-center justify-between px-6 py-4">
@@ -30,7 +33,7 @@ export const ProfileGeneralSection = ({ user }: ProfileGeneralSectionProps) => {
{t("fields.name")}
</Text>
<Text size="small" leading="compact">
{user.first_name} {user.last_name}
{name || "-"}
</Text>
</div>
<div className="grid grid-cols-2 items-center px-6 py-4">
@@ -43,7 +46,7 @@ export const ProfileGeneralSection = ({ user }: ProfileGeneralSectionProps) => {
</div>
<div className="grid grid-cols-2 items-center px-6 py-4">
<Text size="small" leading="compact" weight="plus">
{t("profile.language")}
{t("profile.fields.languageLabel")}
</Text>
<Text size="small" leading="compact">
{languages.find((lang) => lang.code === i18n.language)
@@ -52,7 +55,7 @@ export const ProfileGeneralSection = ({ user }: ProfileGeneralSectionProps) => {
</div>
<div className="grid grid-cols-2 items-center px-6 py-4">
<Text size="small" leading="compact" weight="plus">
{t("profile.usageInsights")}
{t("profile.fields.usageInsightsLabel")}
</Text>
<StatusBadge color="red" className="w-fit">
{t("general.disabled")}

24
packages/admin-next/dashboard/src/v2-routes/profile/profile-edit/components/edit-profile-form/edit-profile-form.tsx
View File

@@ -80,7 +80,7 @@ export const EditProfileForm = ({ user, usageInsights }: EditProfileProps) => {
<Form.Item>
<Form.Label>{t("fields.firstName")}</Form.Label>
<Form.Control>
<Input {...field} size="small" />
<Input {...field} />
</Form.Control>
<Form.ErrorMessage />
</Form.Item>
@@ -93,7 +93,7 @@ export const EditProfileForm = ({ user, usageInsights }: EditProfileProps) => {
<Form.Item>
<Form.Label>{t("fields.lastName")}</Form.Label>
<Form.Control>
<Input {...field} size="small" />
<Input {...field} />
</Form.Control>
<Form.ErrorMessage />
</Form.Item>
@@ -106,18 +106,16 @@ export const EditProfileForm = ({ user, usageInsights }: EditProfileProps) => {
render={({ field: { ref, ...field } }) => (
<Form.Item className="gap-y-4">
<div>
<Form.Label>{t("profile.language")}</Form.Label>
<Form.Hint>{t("profile.languageHint")}</Form.Hint>
<Form.Label>{t("profile.fields.languageLabel")}</Form.Label>
<Form.Hint>{t("profile.edit.languageHint")}</Form.Hint>
</div>
<div>
<Form.Control>
<Select
{...field}
onValueChange={field.onChange}
size="small"
>
<Select {...field} onValueChange={field.onChange}>
<Select.Trigger ref={ref} className="py-1 text-[13px]">
<Select.Value placeholder="Choose language">
<Select.Value
placeholder={t("profile.edit.languagePlaceholder")}
>
{
sortedLanguages.find(
(language) => language.code === field.value
@@ -148,7 +146,9 @@ export const EditProfileForm = ({ user, usageInsights }: EditProfileProps) => {
render={({ field: { value, onChange, ...rest } }) => (
<Form.Item>
<div className="flex items-center justify-between">
<Form.Label>{t("profile.usageInsights")}</Form.Label>
<Form.Label>
{t("profile.fields.usageInsightsLabel")}
</Form.Label>
<Form.Control>
<Switch
{...rest}
@@ -160,7 +160,7 @@ export const EditProfileForm = ({ user, usageInsights }: EditProfileProps) => {
<Form.Hint>
<span>
<Trans
i18nKey="profile.userInsightsHint"
i18nKey="profile.edit.usageInsightsHint"
components={[
<a
key="hint-link"

2
packages/admin-next/dashboard/src/v2-routes/profile/profile-edit/profile-edit.tsx
View File

@@ -16,7 +16,7 @@ export const ProfileEdit = () => {
return (
<RouteDrawer>
<RouteDrawer.Header className="capitalize">
<Heading>{t("profile.editProfile")}</Heading>
<Heading>{t("profile.edit.header")}</Heading>
</RouteDrawer.Header>
{!isLoading && user && (
<EditProfileForm user={user} usageInsights={false} />