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(products): surface missing required category attributes in panels (#1237)

Viktor Holik670be5a31a7f
diff --git a/packages/admin/src/components/common/sidebar-link/sidebar-link.tsx b/packages/admin/src/components/common/sidebar-link/sidebar-link.tsx
index 7e0c2c9cb..dc79f0ca4 100644
--- a/packages/admin/src/components/common/sidebar-link/sidebar-link.tsx
+++ b/packages/admin/src/components/common/sidebar-link/sidebar-link.tsx
@@ -10,6 +10,7 @@ export interface SidebarLinkProps {
labelKey: string
descriptionKey: string
icon: ReactNode
+ dataTestid?: string
}
export const SidebarLink = ({
@@ -17,9 +18,10 @@ export const SidebarLink = ({
labelKey,
descriptionKey,
icon,
+ dataTestid,
}: SidebarLinkProps) => {
return (
- <Link to={to} className="group outline-none">
+ <Link to={to} className="group outline-none" data-testid={dataTestid}>
<div className="flex flex-col gap-2 px-2 pb-2">
<div className="shadow-elevation-card-rest bg-ui-bg-component transition-fg hover:bg-ui-bg-component-hover active:bg-ui-bg-component-pressed group-focus-visible:shadow-borders-interactive-with-active rounded-md px-4 py-2">
<div className="flex items-center gap-4">
diff --git a/packages/admin/src/extension-targets.d.ts b/packages/admin/src/extension-targets.d.ts
index 740c7d2d0..23f3268c1 100644
--- a/packages/admin/src/extension-targets.d.ts
+++ b/packages/admin/src/extension-targets.d.ts
@@ -244,7 +244,7 @@ declare module "@mercurjs/dashboard-sdk" {
"product": {
formZones: "create"
formTabs: { "create": "attributes" | "details" | "organize" | "variants" }
- displayZones: "attributes" | "general" | "media" | "organize" | "request" | "variants"
+ displayZones: "general" | "media" | "organize" | "request" | "variants"
displayFieldIds: "description" | "discountable" | "handle" | "status" | "subtitle" | "title"
}
"promotion": {
@@ -265,5 +265,11 @@ declare module "@mercurjs/dashboard-sdk" {
displayZones: "address" | "company-details" | "configuration" | "general" | "members" | "offers" | "orders" | "payment-details" | "requests"
displayFieldIds: "currency_code" | "description" | "email" | "handle" | "phone" | "website_url"
}
+ "user": {
+ formZones: never
+ formTabs: Record<string, string>
+ displayZones: "general"
+ displayFieldIds: "email" | "language" | "name"
+ }
}
}
diff --git a/packages/admin/src/i18n/translations/en.json b/packages/admin/src/i18n/translations/en.json
index feaa29c72..83e8576a6 100644
--- a/packages/admin/src/i18n/translations/en.json
+++ b/packages/admin/src/i18n/translations/en.json
@@ -570,6 +570,7 @@
"attributeProductInformationDescription": "Attributes used for informational purposes",
"attributeRequiredByMarketplace": "This attribute is required by the marketplace.",
"attributeRequiredDeleteDisabledTooltip": "Required attributes cannot be removed.",
+ "missingRequiredAttributesHint": "Please provide the required information",
"addAttribute": "Add Attribute",
"deleteAttributeWarning": "Are you sure you want to delete the attribute \"{{title}}\"? This action cannot be undone.",
"editAttributes": "Edit Attributes",
diff --git a/packages/admin/src/pages/offers/[id]/_components/offer-associated-product-section.tsx b/packages/admin/src/pages/offers/[id]/_components/offer-associated-product-section.tsx
index 05458c41e..9aa6bf70f 100644
--- a/packages/admin/src/pages/offers/[id]/_components/offer-associated-product-section.tsx
+++ b/packages/admin/src/pages/offers/[id]/_components/offer-associated-product-section.tsx
@@ -1,11 +1,10 @@
-import { TriangleRightMini } from "@medusajs/icons"
import { Container, Heading } from "@medusajs/ui"
import { HttpTypes } from "@medusajs/types"
import { useTranslation } from "react-i18next"
-import { Link } from "react-router-dom"
import { DisplayExtensionZone } from "@mercurjs/dashboard-shared"
+import { SidebarLink } from "../../../../components/common/sidebar-link/sidebar-link"
import { Thumbnail } from "../../../../components/common/thumbnail"
/**
@@ -25,34 +24,13 @@ export const OfferAssociatedProductSection = ({
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">{t("offers.detail.associatedProduct")}</Heading>
</div>
- <div className="txt-small flex flex-col gap-2 px-2 pb-2">
- <Link
- to={`/products/${product.id}`}
- className="outline-none focus-within:shadow-borders-interactive-with-focus rounded-md [&:hover>div]:bg-ui-bg-component-hover"
- data-testid="offer-associated-product-link"
- >
- <div className="shadow-elevation-card-rest bg-ui-bg-component rounded-md px-4 py-2 transition-colors">
- <div className="flex items-center gap-3">
- <div className="shadow-elevation-card-rest rounded-md">
- <Thumbnail src={product.thumbnail ?? null} />
- </div>
- <div className="flex flex-1 flex-col overflow-hidden">
- <span className="text-ui-fg-base truncate font-medium">
- {product.title}
- </span>
- {product.handle && (
- <span className="text-ui-fg-subtle truncate">
- /{product.handle}
- </span>
- )}
- </div>
- <div className="size-7 flex items-center justify-center">
- <TriangleRightMini className="text-ui-fg-muted rtl:rotate-180" />
- </div>
- </div>
- </div>
- </Link>
- </div>
+ <SidebarLink
+ to={`/products/${product.id}`}
+ labelKey={product.title}
+ descriptionKey={product.handle ? `/${product.handle}` : ""}
+ icon={<Thumbnail src={product.thumbnail ?? null} />}
+ dataTestid="offer-associated-product-link"
+ />
<DisplayExtensionZone
model="offer"
zone="associated-product"
diff --git a/packages/admin/src/pages/products/product-detail/components/product-attribute-section/product-attribute-section.tsx b/packages/admin/src/pages/products/product-detail/components/product-attribute-section/product-attribute-section.tsx
index f53f6f265..0e1186a9f 100644
--- a/packages/admin/src/pages/products/product-detail/components/product-attribute-section/product-attribute-section.tsx
+++ b/packages/admin/src/pages/products/product-detail/components/product-attribute-section/product-attribute-section.tsx
@@ -1,213 +1,16 @@
+import { toast } from "@medusajs/ui";
import {
- Plus,
- Trash,
- Swatch,
- DropCap,
- InformationCircleSolid,
- PencilSquare,
-} from "@medusajs/icons";
-import {
- Badge,
- Container,
- Heading,
- Text,
- toast,
- Tooltip,
- usePrompt,
-} from "@medusajs/ui";
-import { useTranslation } from "react-i18next";
-import { ActionMenu } from "../../../../../components/common/action-menu";
-import { ProductAttributeDTO, ProductDTO } from "@mercurjs/types";
-import { DisplayExtensionZone } from "@mercurjs/dashboard-shared";
-import { useRemoveAttributeFromProduct } from "../../../../../hooks/api/products";
-
-type ProductWithAttributes = Pick<ProductDTO, "id" | "attributes">;
-
-const AttributeActions = ({
- productId,
- attribute,
-}: {
- productId: string;
- attribute: ProductAttributeDTO;
-}) => {
- const { t } = useTranslation();
- const prompt = usePrompt();
- const { mutateAsync } = useRemoveAttributeFromProduct(productId, attribute.id);
+ ProductAttributeSection as SharedProductAttributeSection,
+} from "@mercurjs/dashboard-shared";
+import { ProductAttributeDTO } from "@mercurjs/types";
- const handleDelete = async () => {
- const res = await prompt({
- title: t("general.areYouSure"),
- description: t("products.deleteAttributeWarning", {
- title: attribute.name,
- }),
- confirmText: t("actions.delete"),
- cancelText: t("actions.cancel"),
- });
+import { useProductAttributes } from "../../../../../hooks/api";
+import { useBatchProductAttributes } from "../../../../../hooks/api/products";
- if (!res) {
- return;
- }
-
- await mutateAsync(undefined, {
- onError: (error) => {
- toast.error(error.message);
- },
- });
- };
-
- return (
- <ActionMenu
- groups={[
- {
- actions: [
- {
- label: t("actions.edit"),
- to: `attributes/${attribute.id}/edit`,
- icon: <PencilSquare />,
- },
- ],
- },
- ...(attribute.is_required
- ? []
- : [
- {
- actions: [
- {
- label: t("actions.delete"),
- onClick: handleDelete,
- icon: <Trash />,
- },
- ],
- },
- ]),
- ]}
- />
- );
-};
-
-const AttributeValue = ({
- attribute,
-}: {
- attribute: ProductAttributeDTO;
-}) => {
- const { t } = useTranslation();
- const values = attribute.values?.map((v) => v.name) ?? [];
-
- if (["single_select", "multi_select"].includes(attribute.type)) {
- return (
- <div className="flex flex-wrap gap-1">
- {values.map((val) => (
- <Badge
- key={val}
- size="2xsmall"
- className="flex min-w-[20px] items-center justify-center"
- >
- {val}
- </Badge>
- ))}
- </div>
- );
- }
-
- const textValue =
- attribute.type === "toggle"
- ? values
- .map((val) => (val === "true" ? t("general.yes") : t("general.no")))
- .join(", ") || "-"
- : values.join(", ") || "-";
-
- return (
- <Tooltip content={<span className="break-all">{textValue}</span>}>
- <Text
- size="small"
- leading="compact"
- className="line-clamp-3 min-w-0 break-words text-ui-fg-subtle"
- >
- {textValue}
- </Text>
- </Tooltip>
- );
-};
-
-const AttributeGroup = ({
- icon,
- title,
- description,
- attributes,
- productId,
-}: {
- icon: React.ReactNode;
- title: string;
- description: string;
- attributes: ProductAttributeDTO[];
- productId: string;
-}) => {
- const { t } = useTranslation();
-
- if (!attributes.length) {
- return null;
- }
-
- return (
- <div className="flex flex-col gap-y-4 px-3 py-4">
- <div className="flex items-center gap-x-3 px-3">
- <div className="text-ui-fg-muted flex h-8 w-8 items-center justify-center rounded-lg border border-ui-border-base bg-ui-bg-component">
- {icon}
- </div>
- <div>
- <Text size="small" weight="plus" leading="compact">
- {title}
- </Text>
- <Text size="small" leading="compact" className="text-ui-fg-subtle">
- {description}
- </Text>
- </div>
- </div>
-
- <div className="flex flex-col gap-y-0">
- <div className="overflow-hidden rounded-xl border border-ui-border-base">
- {attributes.map((attr, index) => {
- return (
- <div
- key={attr.id}
- className={
- index < attributes.length - 1
- ? "border-b border-ui-border-base"
- : ""
- }
- >
- <div className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_28px] items-center gap-4 px-4 py-3 bg-ui-bg-component">
- <div className="flex items-center gap-x-2 text-ui-fg-subtle">
- <Text size="small" weight="plus" leading="compact">
- {attr.name}
- </Text>
- {attr.description && (
- <Tooltip content={attr.description}>
- <span className="text-ui-fg-muted flex items-center">
- <InformationCircleSolid />
- </span>
- </Tooltip>
- )}
- {attr.is_required && (
- <Tooltip content={t("products.attributeRequiredByMarketplace")}>
- <span className="text-ui-fg-muted flex items-center">
- <InformationCircleSolid />
- </span>
- </Tooltip>
- )}
- </div>
-
- <AttributeValue attribute={attr} />
-
- <AttributeActions productId={productId} attribute={attr} />
- </div>
- </div>
- );
- })}
- </div>
- </div>
- </div>
- );
+type ProductWithAttributes = {
+ id: string;
+ attributes?: ProductAttributeDTO[] | null;
+ categories?: { id?: string | null }[] | null;
};
export const ProductAttributeSection = ({
@@ -215,64 +18,34 @@ export const ProductAttributeSection = ({
}: {
product: ProductWithAttributes;
}) => {
- const { t } = useTranslation();
+ const categoryId = product.categories?.[0]?.id;
+ const { product_attributes } = useProductAttributes(
+ { category_id: categoryId, is_required: true },
+ { enabled: !!categoryId },
+ );
- const allAttributes = product.attributes ?? [];
- const variantAttributes = allAttributes.filter((a) => a.is_variant_axis);
- const infoAttributes = allAttributes.filter((a) => !a.is_variant_axis);
+ const { mutateAsync } = useBatchProductAttributes(product.id);
- const isEmpty = !variantAttributes.length && !infoAttributes.length;
+ const onDeleteAttribute = async (attribute: ProductAttributeDTO) => {
+ try {
+ await mutateAsync(
+ { remove: [attribute.id] },
+ {
+ onError: (error) => {
+ toast.error(error.message);
+ },
+ },
+ );
+ } catch {
+ // Error surfaced via the mutation's onError toast.
+ }
+ };
return (
- <Container className="p-0">
- <div
- className={`flex items-center justify-between px-6 py-4${isEmpty ? "" : " border-b border-ui-border-base"}`}
- >
- <Heading level="h2">{t("products.attributes")}</Heading>
- <ActionMenu
- groups={[
- {
- actions: [
- {
- label: t("products.create.attributes.addExisting"),
- to: "attributes/add",
- icon: <Plus />,
- },
- {
- label: t("products.create.attributes.createNew"),
- to: "attributes/create",
- icon: <PencilSquare />,
- },
- ],
- },
- ]}
- />
- </div>
-
- {variantAttributes.length > 0 && (
- <AttributeGroup
- icon={<Swatch />}
- title={t("products.attributeVariations")}
- description={t("products.attributeVariantsDescription")}
- attributes={variantAttributes}
- productId={product.id}
- />
- )}
-
- {variantAttributes.length > 0 && infoAttributes.length > 0 && (
- <div className="border-t border-dashed border-ui-border-base" />
- )}
-
- {infoAttributes.length > 0 && (
- <AttributeGroup
- icon={<DropCap />}
- title={t("products.attributeProductInformation")}
- description={t("products.attributeProductInformationDescription")}
- attributes={infoAttributes}
- productId={product.id}
- />
- )}
- <DisplayExtensionZone model="product" zone="attributes" data={product} />
- </Container>
+ <SharedProductAttributeSection
+ product={product}
+ requiredAttributes={product_attributes}
+ onDeleteAttribute={onDeleteAttribute}
+ />
);
};
diff --git a/packages/admin/src/pages/products/product-edit-attribute/components/edit-attribute-form/edit-attribute-form.tsx b/packages/admin/src/pages/products/product-edit-attribute/components/edit-attribute-form/edit-attribute-form.tsx
deleted file mode 100644
index 66ed407b8..000000000
--- a/packages/admin/src/pages/products/product-edit-attribute/components/edit-attribute-form/edit-attribute-form.tsx
+++ /dev/null
@@ -1,397 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, InlineTip, Input, Label, toast } from "@medusajs/ui";
-import { AttributeType } from "@mercurjs/types";
-import { useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
-import * as zod from "zod";
-
-import { AttributeValueInput } from "../../../../../components/inputs/attribute-value-input";
-import { ChipInput } from "../../../../../components/inputs/chip-input";
-import { Form } from "../../../../../components/common/form";
-import { RouteDrawer, useRouteModal } from "../../../../../components/modals";
-import { KeyboundForm } from "../../../../../components/utilities/keybound-form";
-import { useBatchProductAttributes } from "../../../../../hooks/api/products";
-
-type AttributeValue = { id: string; name: string };
-
-type EditAttributeAttribute = {
- id: string;
- name: string;
- type: AttributeType | string;
- description?: string;
- is_required?: boolean;
- is_variant_axis?: boolean;
- is_scoped?: boolean;
- values?: AttributeValue[];
- all_values?: AttributeValue[];
-};
-
-type EditAttributeFormProps = {
- productId: string;
- attribute: EditAttributeAttribute;
-};
-
-const isVariantAxis = (attribute: EditAttributeAttribute) =>
- attribute.type === AttributeType.MULTI_SELECT || !!attribute.is_variant_axis;
-
-export const EditAttributeForm = ({
- productId,
- attribute,
-}: EditAttributeFormProps) => {
- if (attribute.is_scoped) {
- return <EditScopedAttributeForm productId={productId} attribute={attribute} />;
- }
-
- return <EditCatalogAttributeForm productId={productId} attribute={attribute} />;
-};
-
-const AttributeWarning = () => {
- const { t } = useTranslation();
-
- return (
- <InlineTip
- variant="warning"
- label={t("products.create.attributes.warning")}
- >
- {t("products.create.attributes.editWarning")}
- </InlineTip>
- );
-};
-
-const VariantAxisTip = () => {
- const { t } = useTranslation();
-
- return (
- <InlineTip label={t("products.create.attributes.tip")}>
- {t("products.create.attributes.editVariantAxisTip")}
- </InlineTip>
- );
-};
-
-type ScopedFormValues = {
- title: string;
- values: string | string[];
-};
-
-const EditScopedAttributeForm = ({
- productId,
- attribute,
-}: EditAttributeFormProps) => {
- const { t } = useTranslation();
- const { handleSuccess } = useRouteModal();
-
- const isAxis = isVariantAxis(attribute);
- const currentValues = attribute.values ?? attribute.all_values ?? [];
-
- const schema = zod.object({
- title: zod
- .string()
- .trim()
- .min(1, { message: t("products.create.attributes.errors.titleRequired") }),
- values: zod
- .union([zod.string(), zod.array(zod.string())])
- .refine(
- (v) => (Array.isArray(v) ? v.length > 0 : v.trim().length > 0),
- { message: t("products.create.attributes.errors.valuesRequired") },
- ),
- });
-
- const form = useForm<ScopedFormValues>({
- defaultValues: {
- title: attribute.name,
- values: isAxis
- ? currentValues.map((v) => v.name)
- : currentValues[0]?.name ?? "",
- },
- resolver: zodResolver(schema),
- });
-
- const { mutateAsync, isPending } = useBatchProductAttributes(productId);
-
- const handleSubmit = form.handleSubmit(async (data) => {
- const title =
- data.title.trim() !== attribute.name ? data.title.trim() : undefined;
-
- let payload: Parameters<typeof mutateAsync>[0];
-
- if (isAxis) {
- const newNames = (Array.isArray(data.values) ? data.values : [])
- .map((v) => v.trim())
- .filter(Boolean);
- const byName = new Map(currentValues.map((v) => [v.name, v.id]));
- const add = newNames
- .filter((name) => !byName.has(name))
- .map((value) => ({ value }));
- const remove = currentValues
- .filter((v) => !newNames.includes(v.name))
- .map((v) => v.id);
- payload = {
- update: [{ id: attribute.id, title, add, remove }],
- };
- } else {
- const value = Array.isArray(data.values)
- ? data.values[0] ?? ""
- : data.values;
- payload = {
- update: [{ id: attribute.id, title, value }],
- };
- }
-
- await mutateAsync(payload, {
- onSuccess: () => handleSuccess(),
- onError: (error) => toast.error(error.message),
- });
- });
-
- return (
- <RouteDrawer.Form form={form}>
- <KeyboundForm onSubmit={handleSubmit} className="flex h-full flex-col">
- <RouteDrawer.Body>
- <div className="flex flex-col gap-y-4">
- <div className="bg-ui-bg-component shadow-elevation-card-rest rounded-xl p-1.5">
- <div className="grid grid-cols-[min-content,1fr] items-start gap-1.5">
- <div className="flex items-center px-2 py-1.5">
- <Label
- size="xsmall"
- weight="plus"
- className="text-ui-fg-subtle"
- >
- {t("fields.title")}
- </Label>
- </div>
- <Form.Field
- control={form.control}
- name="title"
- render={({ field, fieldState }) => (
- <Form.Item>
- <Form.Control>
- <Input
- {...field}
- aria-invalid={fieldState.invalid ? "true" : undefined}
- className={
- fieldState.invalid
- ? "bg-ui-bg-field-component shadow-borders-error focus:shadow-borders-error"
- : "bg-ui-bg-field-component hover:bg-ui-bg-field-component-hover"
- }
- data-testid="edit-attribute-title-input"
- />
- </Form.Control>
- <Form.ErrorMessage />
- </Form.Item>
- )}
- />
- <div className="flex items-center px-2 py-1.5">
- <Label
- size="xsmall"
- weight="plus"
- className="text-ui-fg-subtle"
- >
- {t("fields.values")}
- </Label>
- </div>
- <Form.Field
- control={form.control}
- name="values"
- render={({ field: { onChange, value }, fieldState }) => (
- <Form.Item>
- <Form.Control>
- {isAxis ? (
- <ChipInput
- variant="contrast"
- value={Array.isArray(value) ? value : []}
- onChange={onChange}
- aria-invalid={
- fieldState.invalid ? "true" : undefined
- }
- className={
- fieldState.invalid
- ? "shadow-borders-error focus-within:!shadow-borders-error"
- : undefined
- }
- placeholder={t(
- "products.create.attributes.valuePlaceholder",
- )}
- />
- ) : (
- <AttributeValueInput
- type={attribute.type}
- value={value}
- onChange={onChange}
- placeholder={t(
- "products.create.attributes.valuePlaceholder",
- )}
- />
- )}
- </Form.Control>
- <Form.ErrorMessage />
- </Form.Item>
- )}
- />
- </div>
- </div>
- {isAxis && <VariantAxisTip />}
- <AttributeWarning />
- </div>
- </RouteDrawer.Body>
- <RouteDrawer.Footer>
- <div className="flex items-center justify-end gap-x-2">
- <RouteDrawer.Close asChild>
- <Button size="small" variant="secondary">
- {t("actions.cancel")}
- </Button>
- </RouteDrawer.Close>
- <Button
- size="small"
- type="submit"
- isLoading={isPending}
- data-testid="edit-attribute-submit-button"
- >
- {t("actions.save")}
- </Button>
- </div>
- </RouteDrawer.Footer>
- </KeyboundForm>
- </RouteDrawer.Form>
- );
-};
-
-type CatalogFormValues = {
- values: string | string[];
-};
-
-const EditCatalogAttributeForm = ({
- productId,
- attribute,
-}: EditAttributeFormProps) => {
- const { t } = useTranslation();
- const { handleSuccess } = useRouteModal();
-
- const isAxis = isVariantAxis(attribute);
-
- const hasPresetValues =
- attribute.type === AttributeType.SINGLE_SELECT ||
- attribute.type === AttributeType.MULTI_SELECT;
-
- const labelTooltip =
- attribute.description ||
- (attribute.is_required
- ? t("products.attributeRequiredByMarketplace")
- : undefined);
-
- const initialValues = (() => {
- const selected = attribute.values ?? [];
- if (attribute.type === AttributeType.MULTI_SELECT) {
- return selected.map((v) => v.name);
- }
- return selected[0]?.name ?? "";
- })();
-
- const schema = zod.object({
- values: zod
- .union([zod.string(), zod.array(zod.string())])
- .refine(
- (v) => (Array.isArray(v) ? v.length > 0 : v.trim().length > 0),
- { message: t("products.create.attributes.errors.valuesRequired") },
- ),
- });
-
- const form = useForm<CatalogFormValues>({
- defaultValues: { values: initialValues },
- resolver: zodResolver(schema),
- });
-
- const { mutateAsync, isPending } = useBatchProductAttributes(productId);
-
- const handleSubmit = form.handleSubmit(async (data) => {
- const vals = Array.isArray(data.values)
- ? data.values
- : [data.values].filter((s) => s.trim().length > 0);
-
- let payload: Parameters<typeof mutateAsync>[0];
-
- if (hasPresetValues) {
- const selectedIds = (attribute.all_values ?? [])
- .filter((v) => vals.includes(v.name))
- .map((v) => v.id);
-
- if (attribute.is_variant_axis) {
- const currentIds = (attribute.values ?? []).map((v) => v.id);
- const add = selectedIds.filter((id) => !currentIds.includes(id));
- const remove = currentIds.filter((id) => !selectedIds.includes(id));
- payload = { update: [{ id: attribute.id, add, remove }] };
- } else {
- payload = {
- remove: [attribute.id],
- add: [{ id: attribute.id, value_ids: selectedIds }],
- };
- }
- } else {
- payload = {
- update: [
- {
- id: attribute.id,
- value:
- attribute.type === AttributeType.TOGGLE
- ? vals[0] === "true"
- : vals[0],
- },
- ],
- };
- }
-
- await mutateAsync(payload, {
- onSuccess: () => handleSuccess(),
- onError: (error) => toast.error(error.message),
- });
- });
-
- return (
- <RouteDrawer.Form form={form}>
- <KeyboundForm onSubmit={handleSubmit} className="flex h-full flex-col">
- <RouteDrawer.Body>
- <div className="flex flex-col gap-y-4">
- <Form.Field
- control={form.control}
- name="values"
- render={({ field: { onChange, value } }) => (
- <Form.Item>
- <Form.Label tooltip={labelTooltip}>
- {attribute.name}
- </Form.Label>
- <Form.Control>
- <AttributeValueInput
- type={attribute.type}
- value={value}
- onChange={onChange}
- availableValues={attribute.all_values ?? []}
- />
- </Form.Control>
- <Form.ErrorMessage />
- {isAxis && <VariantAxisTip />}
- </Form.Item>
- )}
- />
- <AttributeWarning />
- </div>
- </RouteDrawer.Body>
- <RouteDrawer.Footer>
- <div className="flex items-center justify-end gap-x-2">
- <RouteDrawer.Close asChild>
- <Button size="small" variant="secondary">
- {t("actions.cancel")}
- </Button>
- </RouteDrawer.Close>
- <Button
- size="small"
- type="submit"
- isLoading={isPending}
- data-testid="edit-attribute-submit-button"
- >
- {t("actions.save")}
- </Button>
- </div>
- </RouteDrawer.Footer>
- </KeyboundForm>
- </RouteDrawer.Form>
- );
-};
diff --git a/packages/admin/src/pages/products/product-edit-attribute/components/edit-attribute-form/index.ts b/packages/admin/src/pages/products/product-edit-attribute/components/edit-attribute-form/index.ts
deleted file mode 100644
index 3c7ecb9e8..000000000
--- a/packages/admin/src/pages/products/product-edit-attribute/components/edit-attribute-form/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./edit-attribute-form";
diff --git a/packages/admin/src/pages/products/product-edit-attribute/product-edit-attribute.tsx b/packages/admin/src/pages/products/product-edit-attribute/product-edit-attribute.tsx
index bee101303..322206d74 100644
--- a/packages/admin/src/pages/products/product-edit-attribute/product-edit-attribute.tsx
+++ b/packages/admin/src/pages/products/product-edit-attribute/product-edit-attribute.tsx
@@ -1,11 +1,16 @@
-import { Heading } from "@medusajs/ui";
+import { Heading, toast } from "@medusajs/ui";
import { useTranslation } from "react-i18next";
import { useParams } from "react-router-dom";
-import { RouteDrawer } from "../../../components/modals";
-import { useProduct } from "../../../hooks/api/products";
+import {
+ EditAttributeForm,
+ ProductAttributeBatchPayload,
+ RouteDrawer,
+} from "@mercurjs/dashboard-shared";
+
+import { useBatchProductAttributes, useProduct } from "../../../hooks/api/products";
+import { useProductAttribute } from "../../../hooks/api/product-attributes";
import { PRODUCT_DETAIL_QUERY } from "../constants";
-import { EditAttributeForm } from "./components/edit-attribute-form";
export const ProductEditAttribute = () => {
const { id, attribute_id } = useParams();
@@ -16,15 +21,56 @@ export const ProductEditAttribute = () => {
PRODUCT_DETAIL_QUERY,
);
+ const attached = (product as any)?.attributes?.find(
+ (a: any) => a.id === attribute_id,
+ );
+
+ const {
+ product_attribute: catalogAttribute,
+ isLoading: isCatalogLoading,
+ isError: isCatalogError,
+ error: catalogError,
+ } = useProductAttribute(attribute_id!, undefined, {
+ enabled: !!attribute_id && !isLoading && !attached,
+ });
+
+ const { mutateAsync, isPending } = useBatchProductAttributes(id!);
+
if (isError) {
throw error;
}
+ if (isCatalogError) {
+ throw catalogError;
+ }
- const attribute = (product as any)?.attributes?.find(
- (a: any) => a.id === attribute_id,
- );
+ const fallbackAttribute = catalogAttribute
+ ? {
+ id: catalogAttribute.id,
+ name: catalogAttribute.name,
+ handle: (catalogAttribute as any).handle ?? null,
+ type: catalogAttribute.type,
+ is_variant_axis: !!(catalogAttribute as any).is_variant_axis,
+ is_required: !!(catalogAttribute as any).is_required,
+ is_scoped: false,
+ values: [],
+ all_values: (catalogAttribute.values ?? []).map((v: any) => ({
+ id: v.id,
+ name: v.name,
+ })),
+ }
+ : undefined;
+
+ const attribute = attached ?? fallbackAttribute;
+ const isAttached = !!attached;
+
+ const ready =
+ !isLoading && !!product && !!attribute && (!!attached || !isCatalogLoading);
- const ready = !isLoading && !!product && !!attribute;
+ const onSubmit = async (payload: ProductAttributeBatchPayload) => {
+ await mutateAsync(payload, {
+ onError: (error) => toast.error(error.message),
+ });
+ };
return (
<RouteDrawer>
@@ -37,7 +83,12 @@ export const ProductEditAttribute = () => {
</RouteDrawer.Description>
</RouteDrawer.Header>
{ready && (
- <EditAttributeForm productId={id!} attribute={attribute} />
+ <EditAttributeForm
+ attribute={attribute}
+ isAttached={isAttached}
+ isPending={isPending}
+ onSubmit={onSubmit}
+ />
)}
</RouteDrawer>
);
diff --git a/packages/admin/tailwind.config.cjs b/packages/admin/tailwind.config.cjs
index b2781995b..ed756a7e1 100644
--- a/packages/admin/tailwind.config.cjs
+++ b/packages/admin/tailwind.config.cjs
@@ -5,10 +5,15 @@ const medusaUI = path.join(
"**/*.{js,jsx,ts,tsx}"
)
+const dashboardShared = path.join(
+ __dirname,
+ "../dashboard-shared/src/**/*.{js,jsx,ts,tsx}"
+)
+
/** @type {import('tailwindcss').Config} */
module.exports = {
presets: [require("@medusajs/ui-preset")],
- content: ["./src/**/*.{js,ts,jsx,tsx}", medusaUI],
+ content: ["./src/**/*.{js,ts,jsx,tsx}", medusaUI, dashboardShared],
darkMode: "class",
theme: {
extend: {},
diff --git a/packages/core/.mercur/routes.d.ts b/packages/core/.mercur/routes.d.ts
index c9a7a9095..ce633a143 100644
--- a/packages/core/.mercur/routes.d.ts
+++ b/packages/core/.mercur/routes.d.ts
@@ -628,6 +628,7 @@ export type Routes = {
$id: typeof import("@medusajs/medusa/api/store/return-reasons/[id]/route");
};
returns: typeof import("@medusajs/medusa/api/store/returns/route");
+ search: typeof import("@mercurjs/core/api/store/search/route");
sellers: typeof import("../src/api/store/sellers/route") & {
$id: typeof import("../src/api/store/sellers/[id]/route");
};
diff --git a/packages/core/src/workflows/product-attribute/workflows/create-and-link-product-attributes.ts b/packages/core/src/workflows/product-attribute/workflows/create-and-link-product-attributes.ts
index b676f0311..2d7b0b2ec 100644
--- a/packages/core/src/workflows/product-attribute/workflows/create-and-link-product-attributes.ts
+++ b/packages/core/src/workflows/product-attribute/workflows/create-and-link-product-attributes.ts
@@ -2,6 +2,7 @@ import { AdditionalData } from "@medusajs/framework/types"
import {
createHook,
createWorkflow,
+ transform,
when,
WorkflowResponse,
type Hook,
@@ -44,9 +45,22 @@ export const createAndLinkProductAttributesToProductWorkflow: ReturnWorkflow<
function (input: CreateAndLinkProductAttributesWorkflowInput) {
const validate = createHook("validate", { input })
+ const removeInput = transform({ input }, ({ input }) => {
+ const addIds = new Set(
+ (input.add ?? [])
+ .map((a) => ("id" in a ? a.id : undefined))
+ .filter((id): id is string => !!id),
+ )
+ return {
+ product_id: input.product_id,
+ remove: input.remove ?? [],
+ readd: (input.remove ?? []).filter((id) => addIds.has(id)),
+ }
+ })
+
when({ input }, ({ input }) => !!input.remove?.length).then(() =>
removeProductAttributesFromProductWorkflow.runAsStep({
- input: { product_id: input.product_id, remove: input.remove ?? [] },
+ input: removeInput,
}),
)
diff --git a/packages/core/src/workflows/product-attribute/workflows/remove-product-attributes-from-product.ts b/packages/core/src/workflows/product-attribute/workflows/remove-product-attributes-from-product.ts
index ade8bf723..0293c7350 100644
--- a/packages/core/src/workflows/product-attribute/workflows/remove-product-attributes-from-product.ts
+++ b/packages/core/src/workflows/product-attribute/workflows/remove-product-attributes-from-product.ts
@@ -19,6 +19,7 @@ import { deleteProductAttributesWorkflow } from "./delete-product-attributes"
export type RemoveProductAttributesFromProductWorkflowInput = {
product_id: string
remove: string[]
+ readd?: string[]
} & AdditionalData
export const removeProductAttributesFromProductWorkflowId =
@@ -42,13 +43,16 @@ export const removeProductAttributesFromProductWorkflow = createWorkflow(
}).config({ name: "rm-pa-attributes" })
validateProductAttributesNotRequiredStep(
- transform({ attributesQuery }, ({ attributesQuery }) =>
- ((attributesQuery.data ?? [])).map((a) => ({
- id: a.id,
- name: a.name,
- is_required: !!a.is_required,
- })),
- ),
+ transform({ attributesQuery, input }, ({ attributesQuery, input }) => {
+ const readd = new Set(input.readd ?? [])
+ return (attributesQuery.data ?? [])
+ .filter((a) => !readd.has(a.id))
+ .map((a) => ({
+ id: a.id,
+ name: a.name,
+ is_required: !!a.is_required,
+ }))
+ }),
)
const productQuery = useQueryGraphStep({
diff --git a/packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/components/edit-attribute-form/edit-attribute-form.tsx b/packages/dashboard-shared/src/components/forms/edit-attribute-form/edit-attribute-form.tsx
similarity index 83%
rename from packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/components/edit-attribute-form/edit-attribute-form.tsx
rename to packages/dashboard-shared/src/components/forms/edit-attribute-form/edit-attribute-form.tsx
index e5999baa3..c2c9e3893 100644
--- a/packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/components/edit-attribute-form/edit-attribute-form.tsx
+++ b/packages/dashboard-shared/src/components/forms/edit-attribute-form/edit-attribute-form.tsx
@@ -1,21 +1,27 @@
import { zodResolver } from "@hookform/resolvers/zod"
-import { Button, InlineTip, Input, Label, toast } from "@medusajs/ui"
-import { AttributeType, MercurFeatureFlags } from "@mercurjs/types"
+import { Button, InlineTip, Input, Label } from "@medusajs/ui"
+import {
+ AttributeType,
+ ProductAttributeBatchInput,
+} from "@mercurjs/types"
import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next"
import * as zod from "zod"
-import { AttributeValueInput } from "@components/inputs/attribute-value-input"
-import { ChipInput } from "@components/inputs/chip-input"
-import { Form } from "@components/common/form"
-import { RouteDrawer, useRouteModal } from "@components/modals"
-import { KeyboundForm } from "@components/utilities/keybound-form"
-import { useFeatureFlags } from "@hooks/api"
-import { useBatchProductAttributes } from "@hooks/api/products"
+import { Form } from "../../common/form"
+import { AttributeValueInput } from "../../inputs/attribute-value-input"
+import { ChipInput } from "../../inputs/chip-input"
+import { RouteDrawer, useRouteModal } from "../../modals"
+import { KeyboundForm } from "../../utilities/keybound-form"
+
+export type ProductAttributeBatchPayload = Omit<
+ ProductAttributeBatchInput,
+ "product_id"
+>
type AttributeValue = { id: string; name: string }
-type EditAttributeAttribute = {
+export type EditAttributeAttribute = {
id: string
name: string
type: AttributeType | string
@@ -27,23 +33,22 @@ type EditAttributeAttribute = {
all_values?: AttributeValue[]
}
-type EditAttributeFormProps = {
- productId: string
+export type EditAttributeFormProps = {
attribute: EditAttributeAttribute
+ isAttached?: boolean
+ isPending: boolean
+ onSubmit: (payload: ProductAttributeBatchPayload) => Promise<void>
}
const isVariantAxis = (attribute: EditAttributeAttribute) =>
attribute.type === AttributeType.MULTI_SELECT || !!attribute.is_variant_axis
-export const EditAttributeForm = ({
- productId,
- attribute,
-}: EditAttributeFormProps) => {
- if (attribute.is_scoped) {
- return <EditScopedAttributeForm productId={productId} attribute={attribute} />
+export const EditAttributeForm = (props: EditAttributeFormProps) => {
+ if (props.attribute.is_scoped) {
+ return <EditScopedAttributeForm {...props} />
}
- return <EditCatalogAttributeForm productId={productId} attribute={attribute} />
+ return <EditCatalogAttributeForm {...props} />
}
const AttributeWarning = () => {
@@ -75,8 +80,9 @@ type ScopedFormValues = {
}
const EditScopedAttributeForm = ({
- productId,
attribute,
+ isPending,
+ onSubmit,
}: EditAttributeFormProps) => {
const { t } = useTranslation()
const { handleSuccess } = useRouteModal()
@@ -107,13 +113,11 @@ const EditScopedAttributeForm = ({
resolver: zodResolver(schema),
})
- const { mutateAsync, isPending } = useBatchProductAttributes(productId)
-
const handleSubmit = form.handleSubmit(async (data) => {
const title =
data.title.trim() !== attribute.name ? data.title.trim() : undefined
- let payload: Parameters<typeof mutateAsync>[0]
+ let payload: ProductAttributeBatchPayload
if (isAxis) {
const newNames = (Array.isArray(data.values) ? data.values : [])
@@ -138,10 +142,12 @@ const EditScopedAttributeForm = ({
}
}
- await mutateAsync(payload, {
- onSuccess: () => handleSuccess(),
- onError: (error) => toast.error(error.message),
- })
+ try {
+ await onSubmit(payload)
+ handleSuccess()
+ } catch {
+ // The caller is responsible for surfacing the error.
+ }
})
return (
@@ -261,16 +267,14 @@ type CatalogFormValues = {
}
const EditCatalogAttributeForm = ({
- productId,
attribute,
+ isAttached = true,
+ isPending,
+ onSubmit,
}: EditAttributeFormProps) => {
const { t } = useTranslation()
const { handleSuccess } = useRouteModal()
- const { feature_flags } = useFeatureFlags()
- const isProductRequestEnabled =
- !!feature_flags?.[MercurFeatureFlags.PRODUCT_REQUEST]
-
const isAxis = isVariantAxis(attribute)
const hasPresetValues =
@@ -280,7 +284,7 @@ const EditCatalogAttributeForm = ({
const labelTooltip =
attribute.description ||
(attribute.is_required
- ? t("products.create.attributes.requiredTooltip")
+ ? t("products.attributeRequiredByMarketplace")
: undefined)
const initialValues = (() => {
@@ -305,21 +309,24 @@ const EditCatalogAttributeForm = ({
resolver: zodResolver(schema),
})
- const { mutateAsync, isPending } = useBatchProductAttributes(productId)
-
const handleSubmit = form.handleSubmit(async (data) => {
const vals = Array.isArray(data.values)
? data.values
: [data.values].filter((s) => s.trim().length > 0)
- let payload: Parameters<typeof mutateAsync>[0]
+ let payload: ProductAttributeBatchPayload
+
+ const scalarValue =
+ attribute.type === AttributeType.TOGGLE ? vals[0] === "true" : vals[0]
if (hasPresetValues) {
const selectedIds = (attribute.all_values ?? [])
.filter((v) => vals.includes(v.name))
.map((v) => v.id)
- if (attribute.is_variant_axis) {
+ if (!isAttached) {
+ payload = { add: [{ id: attribute.id, value_ids: selectedIds }] }
+ } else if (attribute.is_variant_axis) {
const currentIds = (attribute.values ?? []).map((v) => v.id)
const add = selectedIds.filter((id) => !currentIds.includes(id))
const remove = currentIds.filter((id) => !selectedIds.includes(id))
@@ -330,31 +337,20 @@ const EditCatalogAttributeForm = ({
add: [{ id: attribute.id, value_ids: selectedIds }],
}
}
+ } else if (!isAttached) {
+ payload = { add: [{ id: attribute.id, value: scalarValue }] }
} else {
payload = {
- update: [
- {
- id: attribute.id,
- value:
- attribute.type === AttributeType.TOGGLE
- ? vals[0] === "true"
- : vals[0],
- },
- ],
+ update: [{ id: attribute.id, value: scalarValue }],
}
}
- await mutateAsync(payload, {
- onSuccess: () => {
- handleSuccess()
- toast.success(
- isProductRequestEnabled
- ? t("products.edit.requestSuccessToast")
- : t("products.edit.attributes.updateSuccessToast"),
- )
- },
- onError: (error) => toast.error(error.message),
- })
+ try {
+ await onSubmit(payload)
+ handleSuccess()
+ } catch {
+ // The caller is responsible for surfacing the error.
+ }
})
return (
diff --git a/packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/components/edit-attribute-form/index.ts b/packages/dashboard-shared/src/components/forms/edit-attribute-form/index.ts
similarity index 100%
rename from packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/components/edit-attribute-form/index.ts
rename to packages/dashboard-shared/src/components/forms/edit-attribute-form/index.ts
diff --git a/packages/dashboard-shared/src/components/forms/index.ts b/packages/dashboard-shared/src/components/forms/index.ts
index 23599394a..44d3dd21b 100644
--- a/packages/dashboard-shared/src/components/forms/index.ts
+++ b/packages/dashboard-shared/src/components/forms/index.ts
@@ -1,3 +1,4 @@
export * from "./address-form"
+export * from "./edit-attribute-form"
export * from "./email-form"
export * from "./metadata-form"
diff --git a/packages/dashboard-shared/src/components/index.ts b/packages/dashboard-shared/src/components/index.ts
index 8a716052d..feb5eec59 100644
--- a/packages/dashboard-shared/src/components/index.ts
+++ b/packages/dashboard-shared/src/components/index.ts
@@ -4,7 +4,9 @@ export * from "./data-table"
export * from "./filtering"
export * from "./forms"
export * from "./icons"
+export * from "./inputs/attribute-value-input"
export * from "./layout/pages"
export * from "./modals"
+export * from "./sections"
export * from "./tabbed-form"
export * from "./table"
diff --git a/packages/dashboard-shared/src/components/inputs/attribute-value-input/attribute-value-input.tsx b/packages/dashboard-shared/src/components/inputs/attribute-value-input/attribute-value-input.tsx
new file mode 100644
index 000000000..c38983e5c
--- /dev/null
+++ b/packages/dashboard-shared/src/components/inputs/attribute-value-input/attribute-value-input.tsx
@@ -0,0 +1,98 @@
+import { Input, Select, Textarea } from "@medusajs/ui"
+import { AttributeType } from "@mercurjs/types"
+import { useTranslation } from "react-i18next"
+
+import { Combobox } from "../combobox"
+
+type AttributeValueInputProps = {
+ type: AttributeType | string
+ value: string | string[]
+ onChange: (value: string | string[]) => void
+ availableValues?: { id: string; name: string }[]
+ placeholder?: string
+}
+
+export const AttributeValueInput = ({
+ type,
+ value,
+ onChange,
+ availableValues = [],
+ placeholder,
+}: AttributeValueInputProps) => {
+ const { t } = useTranslation()
+ const ph = placeholder ?? t("products.create.attributes.valuePlaceholder")
+
+ switch (type) {
+ case AttributeType.MULTI_SELECT:
+ return (
+ <Combobox
+ value={Array.isArray(value) ? value : []}
+ onChange={(val) => onChange(val ?? [])}
+ options={availableValues.map((v) => ({
+ value: v.name,
+ label: v.name,
+ }))}
+ placeholder={t("products.create.attributes.selectValues")}
+ />
+ )
+
+ case AttributeType.SINGLE_SELECT:
+ return (
+ <Select
+ value={typeof value === "string" ? value : value?.[0] ?? ""}
+ onValueChange={onChange}
+ >
+ <Select.Trigger>
+ <Select.Value
+ placeholder={t("products.create.attributes.selectValuePlaceholder")}
+ />
+ </Select.Trigger>
+ <Select.Content>
+ {availableValues.map((v) => (
+ <Select.Item key={v.id} value={v.name}>
+ {v.name}
+ </Select.Item>
+ ))}
+ </Select.Content>
+ </Select>
+ )
+
+ case AttributeType.TOGGLE:
+ return (
+ <Select
+ value={typeof value === "string" ? value : value?.[0] ?? ""}
+ onValueChange={onChange}
+ >
+ <Select.Trigger>
+ <Select.Value
+ placeholder={t("products.create.attributes.selectValuePlaceholder")}
+ />
+ </Select.Trigger>
+ <Select.Content>
+ <Select.Item value="true">{t("filters.radio.yes")}</Select.Item>
+ <Select.Item value="false">{t("filters.radio.no")}</Select.Item>
+ </Select.Content>
+ </Select>
+ )
+
+ case AttributeType.TEXT:
+ return (
+ <Textarea
+ className="bg-ui-bg-field-component hover:bg-ui-bg-field-component-hover"
+ value={typeof value === "string" ? value : value?.[0] ?? ""}
+ onChange={(e) => onChange(e.target.value)}
+ placeholder={ph}
+ />
+ )
+
+ default:
+ return (
+ <Input
+ className="bg-ui-bg-field-component hover:bg-ui-bg-field-component-hover"
+ value={typeof value === "string" ? value : value?.[0] ?? ""}
+ onChange={(e) => onChange(e.target.value)}
+ placeholder={ph}
+ />
+ )
+ }
+}
diff --git a/packages/dashboard-shared/src/components/inputs/attribute-value-input/index.ts b/packages/dashboard-shared/src/components/inputs/attribute-value-input/index.ts
new file mode 100644
index 000000000..169a951b0
--- /dev/null
+++ b/packages/dashboard-shared/src/components/inputs/attribute-value-input/index.ts
@@ -0,0 +1 @@
+export * from "./attribute-value-input"
diff --git a/packages/dashboard-shared/src/components/sections/index.ts b/packages/dashboard-shared/src/components/sections/index.ts
new file mode 100644
index 000000000..7619bb30d
--- /dev/null
+++ b/packages/dashboard-shared/src/components/sections/index.ts
@@ -0,0 +1 @@
+export * from "./product-attribute-section"
diff --git a/packages/dashboard-shared/src/components/sections/product-attribute-section/index.ts b/packages/dashboard-shared/src/components/sections/product-attribute-section/index.ts
new file mode 100644
index 000000000..7619bb30d
--- /dev/null
+++ b/packages/dashboard-shared/src/components/sections/product-attribute-section/index.ts
@@ -0,0 +1 @@
+export * from "./product-attribute-section"
diff --git a/packages/dashboard-shared/src/components/sections/product-attribute-section/product-attribute-section.tsx b/packages/dashboard-shared/src/components/sections/product-attribute-section/product-attribute-section.tsx
new file mode 100644
index 000000000..914aa9a30
--- /dev/null
+++ b/packages/dashboard-shared/src/components/sections/product-attribute-section/product-attribute-section.tsx
@@ -0,0 +1,328 @@
+import {
+ DropCap,
+ InformationCircleSolid,
+ PencilSquare,
+ Plus,
+ Swatch,
+ Trash,
+} from "@medusajs/icons";
+import {
+ Badge,
+ Container,
+ Heading,
+ Text,
+ Tooltip,
+ usePrompt,
+} from "@medusajs/ui";
+import { ProductAttributeDTO } from "@mercurjs/types";
+import { useTranslation } from "react-i18next";
+
+import { ActionMenu } from "../../common/action-menu";
+import { IconAvatar } from "../../common/icon-avatar";
+import { DisplayExtensionZone } from "../../../extensions";
+
+type ProductWithAttributes = {
+ id: string;
+ attributes?: ProductAttributeDTO[] | null;
+};
+
+export type ProductAttributeSectionProps = {
+ product: ProductWithAttributes;
+ requiredAttributes?: ProductAttributeDTO[];
+ onDeleteAttribute: (attribute: ProductAttributeDTO) => Promise<void>;
+ getEditHref?: (attribute: ProductAttributeDTO) => string;
+ addExistingHref?: string;
+ createNewHref?: string;
+};
+
+type AttributeActionsProps = {
+ attribute: ProductAttributeDTO;
+ editHref: string;
+ onDelete: (attribute: ProductAttributeDTO) => Promise<void>;
+};
+
+const AttributeActions = ({
+ attribute,
+ editHref,
+ onDelete,
+}: AttributeActionsProps) => {
+ const { t } = useTranslation();
+ const prompt = usePrompt();
+
+ const handleDelete = async () => {
+ const res = await prompt({
+ title: t("general.areYouSure"),
+ description: t("products.deleteAttributeWarning", {
+ title: attribute.name,
+ }),
+ confirmText: t("actions.delete"),
+ cancelText: t("actions.cancel"),
+ });
+
+ if (!res) {
+ return;
+ }
+
+ await onDelete(attribute);
+ };
+
+ return (
+ <ActionMenu
+ groups={[
+ {
+ actions: [
+ {
+ label: t("actions.edit"),
+ to: editHref,
+ icon: <PencilSquare />,
+ },
+ ],
+ },
+ ...(attribute.is_required
+ ? []
+ : [
+ {
+ actions: [
+ {
+ label: t("actions.delete"),
+ onClick: handleDelete,
+ icon: <Trash />,
+ },
+ ],
+ },
+ ]),
+ ]}
+ />
+ );
+};
+
+const AttributeValue = ({ attribute }: { attribute: ProductAttributeDTO }) => {
+ const { t } = useTranslation();
+ const values = attribute.values?.map((v) => v.name) ?? [];
+
+ if (attribute.is_required && !values.length) {
+ return (
+ <Text
+ size="small"
+ leading="compact"
+ className="text-ui-fg-error"
+ data-testid={`product-missing-required-attribute-${attribute.id}`}
+ >
+ {t("products.missingRequiredAttributesHint")}
+ </Text>
+ );
+ }
+
+ if (["single_select", "multi_select"].includes(attribute.type)) {
+ return (
+ <div className="flex flex-wrap gap-1">
+ {values.map((val) => (
+ <Badge
+ key={val}
+ size="2xsmall"
+ className="flex min-w-[20px] items-center justify-center"
+ >
+ {val}
+ </Badge>
+ ))}
+ </div>
+ );
+ }
+
+ const textValue =
+ attribute.type === "toggle"
+ ? values
+ .map((val) => (val === "true" ? t("general.yes") : t("general.no")))
+ .join(", ") || "-"
+ : values.join(", ") || "-";
+
+ return (
+ <Tooltip content={<span className="break-all">{textValue}</span>}>
+ <Text
+ size="small"
+ leading="compact"
+ className="line-clamp-3 min-w-0 break-words text-ui-fg-subtle"
+ >
+ {textValue}
+ </Text>
+ </Tooltip>
+ );
+};
+
+type AttributeGroupProps = {
+ icon: React.ReactNode;
+ title: string;
+ description: string;
+ attributes: ProductAttributeDTO[];
+ getEditHref: (attribute: ProductAttributeDTO) => string;
+ onDelete: (attribute: ProductAttributeDTO) => Promise<void>;
+};
+
+const AttributeGroup = ({
+ icon,
+ title,
+ description,
+ attributes,
+ getEditHref,
+ onDelete,
+}: AttributeGroupProps) => {
+ const { t } = useTranslation();
+
+ if (!attributes.length) {
+ return null;
+ }
+
+ return (
+ <div className="flex flex-col gap-y-4 px-3 py-4">
+ <div className="flex items-center gap-x-3 px-3">
+ <IconAvatar>{icon}</IconAvatar>
+ <div>
+ <Text size="small" weight="plus" leading="compact">
+ {title}
+ </Text>
+ <Text size="small" leading="compact" className="text-ui-fg-subtle">
+ {description}
+ </Text>
+ </div>
+ </div>
+
+ <div className="flex flex-col gap-y-0">
+ <div className="overflow-hidden rounded-xl border border-ui-border-base">
+ {attributes.map((attr, index) => {
+ return (
+ <div
+ key={attr.id}
+ className={
+ index < attributes.length - 1
+ ? "border-b border-ui-border-base"
+ : ""
+ }
+ >
+ <div className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_28px] items-center gap-4 px-3 py-2 bg-ui-bg-component">
+ <div className="flex items-center gap-x-2 text-ui-fg-subtle">
+ <Text size="small" weight="plus" leading="compact">
+ {attr.name}
+ </Text>
+ {attr.description && (
+ <Tooltip content={attr.description}>
+ <span className="text-ui-fg-muted flex items-center">
+ <InformationCircleSolid />
+ </span>
+ </Tooltip>
+ )}
+ {attr.is_required && (
+ <Tooltip
+ content={t("products.attributeRequiredByMarketplace")}
+ >
+ <span className="text-ui-fg-muted flex items-center">
+ <InformationCircleSolid />
+ </span>
+ </Tooltip>
+ )}
+ </div>
+
+ <AttributeValue attribute={attr} />
+
+ <AttributeActions
+ attribute={attr}
+ editHref={getEditHref(attr)}
+ onDelete={onDelete}
+ />
+ </div>
+ </div>
+ );
+ })}
+ </div>
+ </div>
+ </div>
+ );
+};
+
+const defaultEditHref = (attribute: ProductAttributeDTO) =>
+ `attributes/${attribute.id}/edit`;
+
+export const ProductAttributeSection = ({
+ product,
+ requiredAttributes,
+ onDeleteAttribute,
+ getEditHref = defaultEditHref,
+ addExistingHref = "attributes/add",
+ createNewHref = "attributes/create",
+}: ProductAttributeSectionProps) => {
+ const { t } = useTranslation();
+
+ const attributes = product.attributes ?? [];
+ const attachedIds = new Set(attributes.map((a) => a.id));
+
+ const missing = (requiredAttributes ?? [])
+ .filter((required) => !attachedIds.has(required.id))
+ .map(
+ (required) =>
+ ({
+ ...required,
+ values: [],
+ is_required: true,
+ }) as unknown as ProductAttributeDTO,
+ );
+
+ const allAttributes = [...attributes, ...missing];
+ const variantAttributes = allAttributes.filter((a) => a.is_variant_axis);
+ const infoAttributes = allAttributes.filter((a) => !a.is_variant_axis);
+
+ const isEmpty = !variantAttributes.length && !infoAttributes.length;
+
+ return (
+ <Container className="p-0">
+ <div
+ className={`flex items-center justify-between px-6 py-4${isEmpty ? "" : " border-b border-ui-border-base"}`}
+ >
+ <Heading level="h2">{t("products.attributes")}</Heading>
+ <ActionMenu
+ groups={[
+ {
+ actions: [
+ {
+ label: t("products.create.attributes.addExisting"),
+ to: addExistingHref,
+ icon: <Plus />,
+ },
+ {
+ label: t("products.create.attributes.createNew"),
+ to: createNewHref,
+ icon: <PencilSquare />,
+ },
+ ],
+ },
+ ]}
+ />
+ </div>
+
+ {variantAttributes.length > 0 && (
+ <AttributeGroup
+ icon={<Swatch />}
+ title={t("products.attributeVariations")}
+ description={t("products.attributeVariantsDescription")}
+ attributes={variantAttributes}
+ getEditHref={getEditHref}
+ onDelete={onDeleteAttribute}
+ />
+ )}
+
+ {variantAttributes.length > 0 && infoAttributes.length > 0 && (
+ <div className="border-t border-dashed border-ui-border-base" />
+ )}
+
+ {infoAttributes.length > 0 && (
+ <AttributeGroup
+ icon={<DropCap />}
+ title={t("products.attributeProductInformation")}
+ description={t("products.attributeProductInformationDescription")}
+ attributes={infoAttributes}
+ getEditHref={getEditHref}
+ onDelete={onDeleteAttribute}
+ />
+ )}
+ <DisplayExtensionZone model="product" zone="attributes" data={product} />
+ </Container>
+ );
+};
diff --git a/packages/vendor/src/components/common/sidebar-link/sidebar-link.tsx b/packages/vendor/src/components/common/sidebar-link/sidebar-link.tsx
index 7e0c2c9cb..dc79f0ca4 100644
--- a/packages/vendor/src/components/common/sidebar-link/sidebar-link.tsx
+++ b/packages/vendor/src/components/common/sidebar-link/sidebar-link.tsx
@@ -10,6 +10,7 @@ export interface SidebarLinkProps {
labelKey: string
descriptionKey: string
icon: ReactNode
+ dataTestid?: string
}
export const SidebarLink = ({
@@ -17,9 +18,10 @@ export const SidebarLink = ({
labelKey,
descriptionKey,
icon,
+ dataTestid,
}: SidebarLinkProps) => {
return (
- <Link to={to} className="group outline-none">
+ <Link to={to} className="group outline-none" data-testid={dataTestid}>
<div className="flex flex-col gap-2 px-2 pb-2">
<div className="shadow-elevation-card-rest bg-ui-bg-component transition-fg hover:bg-ui-bg-component-hover active:bg-ui-bg-component-pressed group-focus-visible:shadow-borders-interactive-with-active rounded-md px-4 py-2">
<div className="flex items-center gap-4">
diff --git a/packages/vendor/src/extension-targets.d.ts b/packages/vendor/src/extension-targets.d.ts
index 478ca4192..d41322a33 100644
--- a/packages/vendor/src/extension-targets.d.ts
+++ b/packages/vendor/src/extension-targets.d.ts
@@ -223,7 +223,7 @@ declare module "@mercurjs/dashboard-sdk" {
"product": {
formZones: "create" | "edit"
formTabs: { "create": "attributes" | "details" | "organize" | "variants" }
- displayZones: "attributes" | "general" | "media" | "organize" | "sales-channels" | "shipping-profile" | "variants"
+ displayZones: "general" | "media" | "organize" | "sales-channels" | "shipping-profile" | "variants"
displayFieldIds: "description" | "discountable" | "handle" | "status" | "subtitle" | "title"
}
"promotion": {
diff --git a/packages/vendor/src/i18n/translations/$schema.json b/packages/vendor/src/i18n/translations/$schema.json
index 5073fe716..52d720be3 100644
--- a/packages/vendor/src/i18n/translations/$schema.json
+++ b/packages/vendor/src/i18n/translations/$schema.json
@@ -2602,6 +2602,12 @@
"attributeRequiredByMarketplace": {
"type": "string"
},
+ "attributeRequiredDeleteDisabledTooltip": {
+ "type": "string"
+ },
+ "missingRequiredAttributesHint": {
+ "type": "string"
+ },
"addAttribute": {
"type": "string"
},
@@ -3740,6 +3746,8 @@
"attributeProductInformation",
"attributeProductInformationDescription",
"attributeRequiredByMarketplace",
+ "attributeRequiredDeleteDisabledTooltip",
+ "missingRequiredAttributesHint",
"addAttribute",
"deleteAttributeWarning",
"attributesSection",
diff --git a/packages/vendor/src/i18n/translations/en.json b/packages/vendor/src/i18n/translations/en.json
index f127d9349..cdf95eb39 100644
--- a/packages/vendor/src/i18n/translations/en.json
+++ b/packages/vendor/src/i18n/translations/en.json
@@ -645,6 +645,7 @@
"attributeProductInformationDescription": "Attributes used for informational purposes",
"attributeRequiredByMarketplace": "This attribute is required by the marketplace.",
"attributeRequiredDeleteDisabledTooltip": "Required attributes cannot be removed.",
+ "missingRequiredAttributesHint": "Please provide the required information",
"addAttribute": "Add Attribute",
"deleteAttributeWarning": "Are you sure you want to delete the attribute \"{{title}}\"? This action cannot be undone.",
"attributesSection": {
diff --git a/packages/vendor/src/pages/offers/[id]/_components/offer-associated-product-section.tsx b/packages/vendor/src/pages/offers/[id]/_components/offer-associated-product-section.tsx
index 9a54fece3..2bcb92125 100644
--- a/packages/vendor/src/pages/offers/[id]/_components/offer-associated-product-section.tsx
+++ b/packages/vendor/src/pages/offers/[id]/_components/offer-associated-product-section.tsx
@@ -1,11 +1,10 @@
-import { TriangleRightMini } from "@medusajs/icons"
import { Container, Heading } from "@medusajs/ui"
import { HttpTypes } from "@medusajs/types"
import { useTranslation } from "react-i18next"
-import { Link } from "react-router-dom"
import { DisplayExtensionZone } from "@mercurjs/dashboard-shared"
+import { SidebarLink } from "../../../../components/common/sidebar-link/sidebar-link"
import { Thumbnail } from "../../../../components/common/thumbnail"
/**
@@ -25,34 +24,13 @@ export const OfferAssociatedProductSection = ({
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">{t("offers.detail.associatedProduct")}</Heading>
</div>
- <div className="txt-small flex flex-col gap-2 px-2 pb-2">
- <Link
- to={`/products/${product.id}`}
- className="outline-none focus-within:shadow-borders-interactive-with-focus rounded-md [&:hover>div]:bg-ui-bg-component-hover"
- data-testid="offer-associated-product-link"
- >
- <div className="shadow-elevation-card-rest bg-ui-bg-component rounded-md px-4 py-2 transition-colors">
- <div className="flex items-center gap-3">
- <div className="shadow-elevation-card-rest rounded-md">
- <Thumbnail src={product.thumbnail ?? null} />
- </div>
- <div className="flex flex-1 flex-col overflow-hidden">
- <span className="text-ui-fg-base truncate font-medium">
- {product.title}
- </span>
- {product.handle && (
- <span className="text-ui-fg-subtle truncate">
- /{product.handle}
- </span>
- )}
- </div>
- <div className="size-7 flex items-center justify-center">
- <TriangleRightMini className="text-ui-fg-muted rtl:rotate-180" />
- </div>
- </div>
- </div>
- </Link>
- </div>
+ <SidebarLink
+ to={`/products/${product.id}`}
+ labelKey={product.title}
+ descriptionKey={product.handle ? `/${product.handle}` : ""}
+ icon={<Thumbnail src={product.thumbnail ?? null} />}
+ dataTestid="offer-associated-product-link"
+ />
<DisplayExtensionZone
model="offer"
zone="associated-product"
diff --git a/packages/vendor/src/pages/offers/[id]/_components/offer-variant-section.tsx b/packages/vendor/src/pages/offers/[id]/_components/offer-variant-section.tsx
index f8f3ba933..793970436 100644
--- a/packages/vendor/src/pages/offers/[id]/_components/offer-variant-section.tsx
+++ b/packages/vendor/src/pages/offers/[id]/_components/offer-variant-section.tsx
@@ -1,8 +1,7 @@
-import { TriangleRightMini } from "@medusajs/icons"
import { Container, Heading } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
-import { Link } from "react-router-dom"
+import { SidebarLink } from "../../../../components/common/sidebar-link/sidebar-link"
import { Thumbnail } from "../../../../components/common/thumbnail"
import { OfferDetail } from "../../common/types"
@@ -21,58 +20,36 @@ export const OfferVariantSection = ({ offer }: Props) => {
const title = variant.product?.title ?? variant.title ?? variant.id
const subtitle = variant.title ?? ""
-
- const Inner = (
- <div
- className="shadow-elevation-card-rest bg-ui-bg-component rounded-md px-4 py-2 transition-colors"
- data-testid="offer-detail-variant"
- >
- <div className="flex items-center gap-3">
- <div
- className="shadow-elevation-card-rest rounded-md"
- data-testid="offer-detail-variant-thumbnail"
- >
- <Thumbnail src={variant.product?.thumbnail ?? null} />
- </div>
- <div className="flex flex-1 flex-col">
- <span
- className="text-ui-fg-base font-medium"
- data-testid="offer-detail-variant-title"
- >
- {title}
- </span>
- <span
- className="text-ui-fg-subtle"
- data-testid="offer-detail-variant-subtitle"
- >
- {subtitle}
- </span>
- </div>
- <div className="size-7 flex items-center justify-center">
- <TriangleRightMini className="text-ui-fg-muted rtl:rotate-180" />
- </div>
- </div>
- </div>
- )
+ const thumbnail = <Thumbnail src={variant.product?.thumbnail ?? null} />
return (
<Container className="p-0" data-testid="offer-detail-variant-section">
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">{t("offers.detail.productVariant")}</Heading>
</div>
- <div className="txt-small flex flex-col gap-2 px-2 pb-2">
- {link ? (
- <Link
- to={link}
- className="outline-none focus-within:shadow-borders-interactive-with-focus rounded-md [&:hover>div]:bg-ui-bg-component-hover"
- data-testid="offer-detail-variant-link"
- >
- {Inner}
- </Link>
- ) : (
- <div>{Inner}</div>
- )}
- </div>
+ {link ? (
+ <SidebarLink
+ to={link}
+ labelKey={title}
+ descriptionKey={subtitle}
+ icon={thumbnail}
+ dataTestid="offer-detail-variant-link"
+ />
+ ) : (
+ <div className="flex flex-col gap-2 px-2 pb-2">
+ <div className="shadow-elevation-card-rest bg-ui-bg-component rounded-md px-4 py-2">
+ <div className="flex items-center gap-3">
+ <div className="shadow-elevation-card-rest rounded-md">
+ {thumbnail}
+ </div>
+ <div className="flex flex-1 flex-col">
+ <span className="text-ui-fg-base font-medium">{title}</span>
+ <span className="text-ui-fg-subtle">{subtitle}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ )}
</Container>
)
}
diff --git a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsx b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsx
index 6dbd2272f..d5ed58ef6 100644
--- a/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsx
+++ b/packages/vendor/src/pages/offers/[id]/variants/[offer_id]/_components/offer-variant-shipping-section.tsx
@@ -1,12 +1,12 @@
-import { Buildings, PencilSquare, TriangleRightMini } from "@medusajs/icons"
+import { Buildings, PencilSquare } from "@medusajs/icons"
import { Container, Heading } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
-import { Link } from "react-router-dom"
import { DisplayExtensionZone } from "@mercurjs/dashboard-shared"
import { ActionMenu } from "../../../../../../components/common/action-menu"
import { NoRecords } from "../../../../../../components/common/empty-table-content"
+import { SidebarLink } from "../../../../../../components/common/sidebar-link/sidebar-link"
type OfferShippingData = {
shipping_profile?: {
@@ -43,34 +43,13 @@ export const OfferVariantShippingSection = ({
/>
</div>
{profile?.name ? (
- <div className="txt-small flex flex-col gap-2 px-2 pb-2">
- <Link
- to={`/settings/locations/shipping-profiles/${profile.id}`}
- className="outline-none focus-within:shadow-borders-interactive-with-focus rounded-md [&:hover>div]:bg-ui-bg-component-hover"
- data-testid="offer-variant-shipping-link"
- >
- <div className="shadow-elevation-card-rest bg-ui-bg-component rounded-md px-4 py-2 transition-colors">
- <div className="flex items-center gap-3">
- <div className="shadow-elevation-card-rest text-ui-fg-subtle flex size-7 items-center justify-center rounded-md">
- <Buildings />
- </div>
- <div className="flex flex-1 flex-col overflow-hidden">
- <span className="text-ui-fg-base truncate font-medium">
- {profile.name}
- </span>
- {profile.type && (
- <span className="text-ui-fg-subtle truncate">
- {profile.type}
- </span>
- )}
- </div>
- <div className="size-7 flex items-center justify-center">
- <TriangleRightMini className="text-ui-fg-muted rtl:rotate-180" />
- </div>
- </div>
- </div>
- </Link>
- </div>
+ <SidebarLink
+ to={`/settings/locations/shipping-profiles/${profile.id}`}
+ labelKey={profile.name}
+ descriptionKey={profile.type ?? ""}
+ icon={<Buildings />}
+ dataTestid="offer-variant-shipping-link"
+ />
) : (
<NoRecords className="h-40" />
)}
diff --git a/packages/vendor/src/pages/products/[id]/_components/product-attribute-section/product-attribute-section.tsx b/packages/vendor/src/pages/products/[id]/_components/product-attribute-section/product-attribute-section.tsx
index 36369c432..f60ee5a7c 100644
--- a/packages/vendor/src/pages/products/[id]/_components/product-attribute-section/product-attribute-section.tsx
+++ b/packages/vendor/src/pages/products/[id]/_components/product-attribute-section/product-attribute-section.tsx
@@ -1,294 +1,65 @@
+import { toast } from "@medusajs/ui";
import {
- Plus,
- Trash,
- Swatch,
- DropCap,
- InformationCircleSolid,
- PencilSquare,
-} from "@medusajs/icons"
-import {
- Badge,
- Container,
- Heading,
- Text,
- toast,
- Tooltip,
- usePrompt,
-} from "@medusajs/ui"
-import { DisplayExtensionZone } from "@mercurjs/dashboard-shared"
-import { useTranslation } from "react-i18next"
+ ProductAttributeSection as SharedProductAttributeSection,
+} from "@mercurjs/dashboard-shared";
+import { MercurFeatureFlags, ProductAttributeDTO } from "@mercurjs/types";
+import { useTranslation } from "react-i18next";
-import { ActionMenu } from "@components/common/action-menu"
-import {
- MercurFeatureFlags,
- ProductAttributeDTO,
- ProductDTO,
-} from "@mercurjs/types"
-import { useFeatureFlags } from "@hooks/api"
-import { useRemoveAttributeFromProduct } from "@hooks/api/products"
+import { useFeatureFlags, useProductAttributes } from "@hooks/api";
+import { useBatchProductAttributes } from "@hooks/api/products";
-type ProductWithAttributes = Pick<ProductDTO, "id" | "attributes">
+type ProductWithAttributes = {
+ id: string;
+ attributes?: ProductAttributeDTO[] | null;
+ categories?: { id?: string | null }[] | null;
+};
-const AttributeActions = ({
- productId,
- attribute,
+export const ProductAttributeSection = ({
+ product,
}: {
- productId: string
- attribute: ProductAttributeDTO
+ product: ProductWithAttributes;
}) => {
- const { t } = useTranslation()
- const prompt = usePrompt()
- const { feature_flags } = useFeatureFlags()
- const isProductRequestEnabled =
- !!feature_flags?.[MercurFeatureFlags.PRODUCT_REQUEST]
- const { mutateAsync } = useRemoveAttributeFromProduct(productId, attribute.id)
+ const { t } = useTranslation();
- const handleDelete = async () => {
- const res = await prompt({
- title: t("general.areYouSure"),
- description: t("products.deleteAttributeWarning", {
- title: attribute.name,
- }),
- confirmText: t("actions.delete"),
- cancelText: t("actions.cancel"),
- })
+ const { feature_flags } = useFeatureFlags();
+ const isProductRequestEnabled =
+ !!feature_flags?.[MercurFeatureFlags.PRODUCT_REQUEST];
- if (!res) {
- return
- }
+ const categoryId = product.categories?.[0]?.id;
+ const { product_attributes } = useProductAttributes(
+ { category_id: categoryId, is_required: true },
+ { enabled: !!categoryId },
+ );
- await mutateAsync(undefined, {
- onSuccess: () => {
- toast.success(
- isProductRequestEnabled
- ? t("products.edit.requestSuccessToast")
- : t("products.edit.attributes.deleteSuccessToast"),
- );
- },
- onError: (error) => {
- toast.error(error.message)
- },
- })
- }
+ const { mutateAsync } = useBatchProductAttributes(product.id);
- return (
- <ActionMenu
- groups={[
+ const onDeleteAttribute = async (attribute: ProductAttributeDTO) => {
+ try {
+ await mutateAsync(
+ { remove: [attribute.id] },
{
- actions: [
- {
- label: t("actions.edit"),
- to: `attributes/${attribute.id}/edit`,
- icon: <PencilSquare />,
- },
- ],
+ onSuccess: () => {
+ toast.success(
+ isProductRequestEnabled
+ ? t("products.edit.requestSuccessToast")
+ : t("products.edit.attributes.deleteSuccessToast"),
+ );
+ },
+ onError: (error) => {
+ toast.error(error.message);
+ },
},
- ...(attribute.is_required
- ? []
- : [
- {
- actions: [
- {
- label: t("actions.delete"),
- onClick: handleDelete,
- icon: <Trash />,
- },
- ],
- },
- ]),
- ]}
- />
- )
-}
-
-const AttributeValue = ({
- attribute,
-}: {
- attribute: ProductAttributeDTO
-}) => {
- const { t } = useTranslation()
- const values = attribute.values?.map((v) => v.name) ?? []
-
- if (["single_select", "multi_select"].includes(attribute.type)) {
- return (
- <div className="flex flex-wrap gap-1">
- {values.map((val) => (
- <Badge
- key={val}
- size="2xsmall"
- className="flex min-w-[20px] items-center justify-center"
- >
- {val}
- </Badge>
- ))}
- </div>
- )
- }
-
- const textValue =
- attribute.type === "toggle"
- ? values
- .map((val) => (val === "true" ? t("general.yes") : t("general.no")))
- .join(", ") || "-"
- : values.join(", ") || "-"
-
- return (
- <Tooltip content={<span className="break-all">{textValue}</span>}>
- <Text
- size="small"
- leading="compact"
- className="line-clamp-3 min-w-0 break-words text-ui-fg-subtle"
- >
- {textValue}
- </Text>
- </Tooltip>
- )
-}
-
-const AttributeGroup = ({
- icon,
- title,
- description,
- attributes,
- productId,
-}: {
- icon: React.ReactNode
- title: string
- description: string
- attributes: ProductAttributeDTO[]
- productId: string
-}) => {
- const { t } = useTranslation()
-
- if (!attributes.length) {
- return null
- }
-
- return (
- <div className="flex flex-col gap-y-4 px-3 py-4">
- <div className="flex items-center gap-x-3 px-3">
- <div className="text-ui-fg-muted flex h-8 w-8 items-center justify-center rounded-lg border border-ui-border-base bg-ui-bg-component">
- {icon}
- </div>
- <div>
- <Text size="small" weight="plus" leading="compact">
- {title}
- </Text>
- <Text size="small" leading="compact" className="text-ui-fg-subtle">
- {description}
- </Text>
- </div>
- </div>
-
- <div className="flex flex-col gap-y-0">
- <div className="overflow-hidden rounded-xl border border-ui-border-base">
- {attributes.map((attr, index) => {
- return (
- <div
- key={attr.id}
- className={
- index < attributes.length - 1
- ? "border-b border-ui-border-base"
- : ""
- }
- >
- <div className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_28px] items-center gap-4 px-4 py-3 bg-ui-bg-component">
- <div className="flex items-center gap-x-2 text-ui-fg-subtle">
- <Text size="small" weight="plus" leading="compact">
- {attr.name}
- </Text>
- {attr.description && (
- <Tooltip content={attr.description}>
- <span className="text-ui-fg-muted flex items-center">
- <InformationCircleSolid />
- </span>
- </Tooltip>
- )}
- {attr.is_required && (
- <Tooltip content={t("products.attributeRequiredByMarketplace")}>
- <span className="text-ui-fg-muted flex items-center">
- <InformationCircleSolid />
- </span>
- </Tooltip>
- )}
- </div>
-
- <AttributeValue attribute={attr} />
-
- <AttributeActions productId={productId} attribute={attr} />
- </div>
- </div>
- )
- })}
- </div>
- </div>
- </div>
- )
-}
-
-export const ProductAttributeSection = ({
- product,
-}: {
- product: ProductWithAttributes
-}) => {
- const { t } = useTranslation()
-
- const allAttributes = product.attributes ?? []
- const variantAttributes = allAttributes.filter((a) => a.is_variant_axis)
- const infoAttributes = allAttributes.filter((a) => !a.is_variant_axis)
-
- const isEmpty = !variantAttributes.length && !infoAttributes.length
+ );
+ } catch {
+ // Error surfaced via the mutation's onError toast.
+ }
+ };
return (
- <Container className="p-0">
- <div
- className={`flex items-center justify-between px-6 py-4${isEmpty ? "" : " border-b border-ui-border-base"}`}
- >
- <Heading level="h2">{t("products.attributes")}</Heading>
- <ActionMenu
- groups={[
- {
- actions: [
- {
- label: t("products.create.attributes.addExisting"),
- to: "attributes/add",
- icon: <Plus />,
- },
- {
- label: t("products.create.attributes.createNew"),
- to: "attributes/create",
- icon: <PencilSquare />,
- },
- ],
- },
- ]}
- />
- </div>
-
- {variantAttributes.length > 0 && (
- <AttributeGroup
- icon={<Swatch />}
- title={t("products.attributeVariations")}
- description={t("products.attributeVariantsDescription")}
- attributes={variantAttributes}
- productId={product.id}
- />
- )}
-
- {variantAttributes.length > 0 && infoAttributes.length > 0 && (
- <div className="border-t border-dashed border-ui-border-base" />
- )}
-
- {infoAttributes.length > 0 && (
- <AttributeGroup
- icon={<DropCap />}
- title={t("products.attributeProductInformation")}
- description={t("products.attributeProductInformationDescription")}
- attributes={infoAttributes}
- productId={product.id}
- />
- )}
- <DisplayExtensionZone model="product" zone="attributes" data={product} />
- </Container>
- )
-}
+ <SharedProductAttributeSection
+ product={product}
+ requiredAttributes={product_attributes}
+ onDeleteAttribute={onDeleteAttribute}
+ />
+ );
+};
diff --git a/packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/index.tsx b/packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/index.tsx
index e121eb975..3b301f390 100644
--- a/packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/index.tsx
+++ b/packages/vendor/src/pages/products/[id]/attributes/[attribute_id]/edit/index.tsx
@@ -1,14 +1,21 @@
// Route: /products/:id/attributes/:attribute_id/edit
-import { Heading } from "@medusajs/ui";
+import { Heading, toast } from "@medusajs/ui";
import { useTranslation } from "react-i18next";
import { useParams } from "react-router-dom";
-import { useLinkQuery } from "@mercurjs/dashboard-shared";
+import {
+ EditAttributeAttribute,
+ EditAttributeForm,
+ ProductAttributeBatchPayload,
+ RouteDrawer,
+ useLinkQuery,
+} from "@mercurjs/dashboard-shared";
+import { MercurFeatureFlags } from "@mercurjs/types";
-import { RouteDrawer } from "@components/modals";
-import { useProduct } from "@hooks/api/products";
+import { useFeatureFlags } from "@hooks/api";
+import { useBatchProductAttributes, useProduct } from "@hooks/api/products";
+import { useProductAttribute } from "@hooks/api/product-attributes";
import { PRODUCT_DETAIL_QUERY } from "../../../../common/constants";
-import { EditAttributeForm } from "./components/edit-attribute-form";
export const Component = () => {
const { id, attribute_id } = useParams();
@@ -17,15 +24,65 @@ export const Component = () => {
const query = useLinkQuery("product", PRODUCT_DETAIL_QUERY.fields);
const { product, isLoading, isError, error } = useProduct(id!, query);
+ const attached = product?.attributes?.find((a) => a.id === attribute_id);
+
+ const {
+ product_attribute: catalogAttribute,
+ isLoading: isCatalogLoading,
+ isError: isCatalogError,
+ error: catalogError,
+ } = useProductAttribute(attribute_id!, undefined, {
+ enabled: !!attribute_id && !isLoading && !attached,
+ });
+
+ const { feature_flags } = useFeatureFlags();
+ const isProductRequestEnabled =
+ !!feature_flags?.[MercurFeatureFlags.PRODUCT_REQUEST];
+
+ const { mutateAsync, isPending } = useBatchProductAttributes(id!);
+
if (isError) {
throw error;
}
+ if (isCatalogError) {
+ throw catalogError;
+ }
- const attribute = (product as any)?.attributes?.find(
- (a: any) => a.id === attribute_id,
- );
+ const fallbackAttribute = catalogAttribute
+ ? {
+ id: catalogAttribute.id,
+ name: catalogAttribute.name,
+ handle: (catalogAttribute as any).handle ?? null,
+ type: catalogAttribute.type,
+ is_variant_axis: !!(catalogAttribute as any).is_variant_axis,
+ is_required: !!(catalogAttribute as any).is_required,
+ is_scoped: false,
+ values: [],
+ all_values: (catalogAttribute.values ?? []).map((v: any) => ({
+ id: v.id,
+ name: v.name,
+ })),
+ }
+ : undefined;
+
+ const attribute = attached ?? fallbackAttribute;
+ const isAttached = !!attached;
+
+ const ready =
+ !isLoading && !!product && !!attribute && (!!attached || !isCatalogLoading);
- const ready = !isLoading && !!product && !!attribute;
+ const onSubmit = async (payload: ProductAttributeBatchPayload) => {
+ await mutateAsync(payload, {
+ onSuccess: () => {
+ toast.success(
+ isProductRequestEnabled
+ ? t("products.edit.requestSuccessToast")
+ : t("products.edit.attributes.updateSuccessToast"),
+ );
+ },
+ onError: (error) => toast.error(error.message),
+ });
+ };
return (
<RouteDrawer>
@@ -38,7 +95,12 @@ export const Component = () => {
</RouteDrawer.Description>
</RouteDrawer.Header>
{ready && (
- <EditAttributeForm productId={id!} attribute={attribute} />
+ <EditAttributeForm
+ attribute={attribute as unknown as EditAttributeAttribute}
+ isAttached={isAttached}
+ isPending={isPending}
+ onSubmit={onSubmit}
+ />
)}
</RouteDrawer>
);
diff --git a/packages/vendor/tailwind.config.cjs b/packages/vendor/tailwind.config.cjs
index b2781995b..ed756a7e1 100644
--- a/packages/vendor/tailwind.config.cjs
+++ b/packages/vendor/tailwind.config.cjs
@@ -5,10 +5,15 @@ const medusaUI = path.join(
"**/*.{js,jsx,ts,tsx}"
)
+const dashboardShared = path.join(
+ __dirname,
+ "../dashboard-shared/src/**/*.{js,jsx,ts,tsx}"
+)
+
/** @type {import('tailwindcss').Config} */
module.exports = {
presets: [require("@medusajs/ui-preset")],
- content: ["./src/**/*.{js,ts,jsx,tsx}", medusaUI],
+ content: ["./src/**/*.{js,ts,jsx,tsx}", medusaUI, dashboardShared],
darkMode: "class",
theme: {
extend: {},