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.

feat(vendor): gate login register link on runtime flag + auth language switcher (#1221)

Viktor Holik83bddfa30a4d
diff --git a/packages/vendor/src/components/layout/auth-layout/auth-language-select.tsx b/packages/vendor/src/components/layout/auth-layout/auth-language-select.tsx
new file mode 100644
index 000000000..1d4d9bd6e
--- /dev/null
+++ b/packages/vendor/src/components/layout/auth-layout/auth-language-select.tsx
@@ -0,0 +1,53 @@
+import { GlobeEurope } from "@medusajs/icons";
+import { DropdownMenu } from "@medusajs/ui";
+import { useTranslation } from "react-i18next";
+
+import { useDocumentDirection } from "../../../hooks/use-document-direction";
+import { languages } from "../../../i18n/languages";
+
+export const AuthLanguageSelect = () => {
+ const { t, i18n } = useTranslation();
+ const direction = useDocumentDirection();
+
+ const sortedLanguages = [...languages].sort((a, b) =>
+ a.display_name.localeCompare(b.display_name)
+ );
+
+ const currentLanguage = sortedLanguages.find(
+ (language) => language.code === i18n.language
+ );
+
+ return (
+ <DropdownMenu dir={direction}>
+ <DropdownMenu.Trigger
+ className="text-ui-fg-subtle hover:bg-ui-bg-subtle-hover focus-visible:shadow-borders-focus flex items-center gap-x-2 rounded-md px-2 py-1 outline-none transition-fg"
+ data-testid="auth-language-select-trigger"
+ >
+ <GlobeEurope />
+ <span className="txt-compact-small">
+ {currentLanguage?.display_name ?? t("profile.fields.languageLabel")}
+ </span>
+ </DropdownMenu.Trigger>
+ <DropdownMenu.Content
+ align="end"
+ className="max-h-[300px] overflow-y-auto"
+ >
+ <DropdownMenu.RadioGroup value={i18n.language}>
+ {sortedLanguages.map((language) => (
+ <DropdownMenu.RadioItem
+ key={language.code}
+ value={language.code}
+ onClick={(e) => {
+ e.preventDefault();
+ i18n.changeLanguage(language.code);
+ }}
+ data-testid={`auth-language-select-option-${language.code}`}
+ >
+ {language.display_name}
+ </DropdownMenu.RadioItem>
+ ))}
+ </DropdownMenu.RadioGroup>
+ </DropdownMenu.Content>
+ </DropdownMenu>
+ );
+};
diff --git a/packages/vendor/src/components/layout/auth-layout/auth-layout.tsx b/packages/vendor/src/components/layout/auth-layout/auth-layout.tsx
index a53072832..7405647d7 100644
--- a/packages/vendor/src/components/layout/auth-layout/auth-layout.tsx
+++ b/packages/vendor/src/components/layout/auth-layout/auth-layout.tsx
@@ -1,6 +1,7 @@
import { ReactNode } from "react";
import { assetUrl } from "../../../utils/asset-url";
+import { AuthLanguageSelect } from "./auth-language-select";
type AuthLayoutProps = {
children: ReactNode;
@@ -10,7 +11,10 @@ export const AuthLayout = ({ children }: AuthLayoutProps) => {
return (
<div className="flex h-dvh w-dvw overflow-hidden">
<div className="bg-ui-bg-base border-ui-border-base flex h-full w-full flex-col overflow-y-auto border-r lg:w-[584px] lg:shrink-0">
- <div className="flex flex-1 flex-col p-8 lg:px-14 lg:py-12">
+ <div className="flex justify-end px-8 pt-8 lg:px-14 lg:pt-12">
+ <AuthLanguageSelect />
+ </div>
+ <div className="flex flex-1 flex-col px-8 pb-8 lg:px-14 lg:pb-12">
{children}
</div>
</div>
diff --git a/packages/vendor/src/pages/login/login.tsx b/packages/vendor/src/pages/login/login.tsx
index cd637ac23..80d0094ea 100644
--- a/packages/vendor/src/pages/login/login.tsx
+++ b/packages/vendor/src/pages/login/login.tsx
@@ -7,11 +7,12 @@ import { Trans, useTranslation } from "react-i18next";
import { Link, useNavigate, useSearchParams } from "react-router-dom";
import * as z from "zod";
+import { MercurFeatureFlags } from "@mercurjs/types";
import { WidgetZone } from "@mercurjs/dashboard-shared";
import { Form } from "@components/common/form";
import AvatarBox from "@components/common/logo-box/avatar-box";
import { AuthLayout } from "@components/layout/auth-layout";
-import { useSignInWithEmailPass } from "@hooks/api";
+import { useFeatureFlags, useSignInWithEmailPass } from "@hooks/api";
import { isFetchError } from "@lib/is-fetch-error";
import config from "virtual:mercur/config";
@@ -162,6 +163,8 @@ const LoginForm = () => {
};
const LoginFooter = () => {
+ const { feature_flags } = useFeatureFlags();
+
return (
<div className="mt-auto flex flex-col gap-y-2">
<span className="text-ui-fg-muted txt-small">
@@ -176,7 +179,7 @@ const LoginFooter = () => {
]}
/>
</span>
- {config.enableSellerRegistration && (
+ {feature_flags?.[MercurFeatureFlags.SELLER_REGISTRATION] && (
<span className="text-ui-fg-muted txt-small">
<Trans
i18nKey="login.notSellerYet"