npm - @empty-complete-org/medusa-product-attributes - Versions diffs - 0.11.0 → 0.11.1 - Mend

@empty-complete-org/medusa-product-attributes 0.11.0 → 0.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/.medusa/server/src/admin/index.js CHANGED Viewed

@@ -34,6 +34,8 @@ const CategoryAttributeTemplatesWidget = ({
     queryFn: () => sdk.client.fetch(`/admin/category/${categoryId}/custom-attributes`)
   });
   const attributes = (result == null ? void 0 : result.category_custom_attributes) ?? [];
+  const ownAttributes = attributes.filter((a) => !a.inherited);
+  const inheritedAttributes = attributes.filter((a) => a.inherited);
   const createMutation = reactQuery.useMutation({
     mutationFn: (body) => sdk.client.fetch(`/admin/category/${categoryId}/custom-attributes`, {
       method: "POST",
@@ -66,6 +68,7 @@ const CategoryAttributeTemplatesWidget = ({
       type: addForm.type
     });
   };
+  const typeLabel = (t) => t === "text" ? "Текст" : t === "number" ? "Число" : t;
   return /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "divide-y p-0", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between px-6 py-4", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", children: "Атрибуты" }),
@@ -81,60 +84,78 @@ const CategoryAttributeTemplatesWidget = ({
     ] }),
     isLoading && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-muted text-sm", children: "Загрузка…" }) }),
     isError && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-error text-sm", children: "Не удалось загрузить атрибуты." }) }),
-    !isLoading && !isError && attributes.length === 0 && !showAddForm && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-muted text-sm", children: "Нет атрибутов. Добавьте первый." }) }),
-    attributes.length > 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "divide-y", children: attributes.map(
-      (attr) => confirmDeleteId === attr.id ? /* @__PURE__ */ jsxRuntime.jsxs(
-        "div",
-        {
-          className: "flex items-center gap-3 px-6 py-3 text-sm",
-          children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex-1 text-ui-fg-base", children: [
-              "Удалить «",
-              attr.label,
-              "»?"
-            ] }),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              ui.Button,
-              {
-                size: "small",
-                variant: "danger",
-                onClick: () => deleteMutation.mutate(attr.id),
-                isLoading: deleteMutation.isPending,
-                children: "Удалить"
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              ui.Button,
-              {
-                size: "small",
-                variant: "secondary",
-                onClick: () => setConfirmDeleteId(null),
-                children: "Отмена"
-              }
-            )
-          ]
-        },
-        attr.id
-      ) : /* @__PURE__ */ jsxRuntime.jsxs(
+    inheritedAttributes.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-2 bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "xsmall", weight: "plus", className: "text-ui-fg-muted uppercase", children: "Унаследованные" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "divide-y", children: inheritedAttributes.map((attr) => /* @__PURE__ */ jsxRuntime.jsxs(
         "div",
         {
           className: "flex items-center gap-3 px-6 py-3",
           children: [
-            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex-1 text-sm text-ui-fg-base", children: attr.label }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { size: "2xsmall", color: "grey", children: attr.type === "text" ? "Текст" : attr.type === "number" ? "Число" : attr.type }),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              "button",
-              {
-                onClick: () => setConfirmDeleteId(attr.id),
-                className: "text-xs text-ui-fg-error hover:underline",
-                children: "Удалить"
-              }
-            )
+            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex-1 text-sm text-ui-fg-subtle", children: attr.label }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { size: "2xsmall", color: "grey", children: typeLabel(attr.type) }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { size: "2xsmall", color: "blue", children: "из родителя" })
           ]
         },
         attr.id
-      )
-    ) }),
+      )) })
+    ] }),
+    ownAttributes.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      inheritedAttributes.length > 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-2 bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "xsmall", weight: "plus", className: "text-ui-fg-muted uppercase", children: "Свои" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "divide-y", children: ownAttributes.map(
+        (attr) => confirmDeleteId === attr.id ? /* @__PURE__ */ jsxRuntime.jsxs(
+          "div",
+          {
+            className: "flex items-center gap-3 px-6 py-3 text-sm",
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex-1 text-ui-fg-base", children: [
+                "Удалить «",
+                attr.label,
+                "»?"
+              ] }),
+              /* @__PURE__ */ jsxRuntime.jsx(
+                ui.Button,
+                {
+                  size: "small",
+                  variant: "danger",
+                  onClick: () => deleteMutation.mutate(attr.id),
+                  isLoading: deleteMutation.isPending,
+                  children: "Удалить"
+                }
+              ),
+              /* @__PURE__ */ jsxRuntime.jsx(
+                ui.Button,
+                {
+                  size: "small",
+                  variant: "secondary",
+                  onClick: () => setConfirmDeleteId(null),
+                  children: "Отмена"
+                }
+              )
+            ]
+          },
+          attr.id
+        ) : /* @__PURE__ */ jsxRuntime.jsxs(
+          "div",
+          {
+            className: "flex items-center gap-3 px-6 py-3",
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx("span", { className: "flex-1 text-sm text-ui-fg-base", children: attr.label }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { size: "2xsmall", color: "grey", children: typeLabel(attr.type) }),
+              /* @__PURE__ */ jsxRuntime.jsx(
+                "button",
+                {
+                  onClick: () => setConfirmDeleteId(attr.id),
+                  className: "text-xs text-ui-fg-error hover:underline",
+                  children: "Удалить"
+                }
+              )
+            ]
+          },
+          attr.id
+        )
+      ) })
+    ] }),
+    !isLoading && !isError && attributes.length === 0 && !showAddForm && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-muted text-sm", children: "Нет атрибутов. Добавьте первый." }) }),
     showAddForm && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 px-6 py-3", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
         ui.Input,

package/.medusa/server/src/admin/index.mjs CHANGED Viewed

@@ -31,6 +31,8 @@ const CategoryAttributeTemplatesWidget = ({
     queryFn: () => sdk.client.fetch(`/admin/category/${categoryId}/custom-attributes`)
   });
   const attributes = (result == null ? void 0 : result.category_custom_attributes) ?? [];
+  const ownAttributes = attributes.filter((a) => !a.inherited);
+  const inheritedAttributes = attributes.filter((a) => a.inherited);
   const createMutation = useMutation({
     mutationFn: (body) => sdk.client.fetch(`/admin/category/${categoryId}/custom-attributes`, {
       method: "POST",
@@ -63,6 +65,7 @@ const CategoryAttributeTemplatesWidget = ({
       type: addForm.type
     });
   };
+  const typeLabel = (t) => t === "text" ? "Текст" : t === "number" ? "Число" : t;
   return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", children: [
     /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between px-6 py-4", children: [
       /* @__PURE__ */ jsx(Heading, { level: "h2", children: "Атрибуты" }),
@@ -78,60 +81,78 @@ const CategoryAttributeTemplatesWidget = ({
     ] }),
     isLoading && /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-muted text-sm", children: "Загрузка…" }) }),
     isError && /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-error text-sm", children: "Не удалось загрузить атрибуты." }) }),
-    !isLoading && !isError && attributes.length === 0 && !showAddForm && /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-muted text-sm", children: "Нет атрибутов. Добавьте первый." }) }),
-    attributes.length > 0 && /* @__PURE__ */ jsx("div", { className: "divide-y", children: attributes.map(
-      (attr) => confirmDeleteId === attr.id ? /* @__PURE__ */ jsxs(
-        "div",
-        {
-          className: "flex items-center gap-3 px-6 py-3 text-sm",
-          children: [
-            /* @__PURE__ */ jsxs("span", { className: "flex-1 text-ui-fg-base", children: [
-              "Удалить «",
-              attr.label,
-              "»?"
-            ] }),
-            /* @__PURE__ */ jsx(
-              Button,
-              {
-                size: "small",
-                variant: "danger",
-                onClick: () => deleteMutation.mutate(attr.id),
-                isLoading: deleteMutation.isPending,
-                children: "Удалить"
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              Button,
-              {
-                size: "small",
-                variant: "secondary",
-                onClick: () => setConfirmDeleteId(null),
-                children: "Отмена"
-              }
-            )
-          ]
-        },
-        attr.id
-      ) : /* @__PURE__ */ jsxs(
+    inheritedAttributes.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx("div", { className: "px-6 py-2 bg-ui-bg-subtle", children: /* @__PURE__ */ jsx(Text, { size: "xsmall", weight: "plus", className: "text-ui-fg-muted uppercase", children: "Унаследованные" }) }),
+      /* @__PURE__ */ jsx("div", { className: "divide-y", children: inheritedAttributes.map((attr) => /* @__PURE__ */ jsxs(
         "div",
         {
           className: "flex items-center gap-3 px-6 py-3",
           children: [
-            /* @__PURE__ */ jsx("span", { className: "flex-1 text-sm text-ui-fg-base", children: attr.label }),
-            /* @__PURE__ */ jsx(Badge, { size: "2xsmall", color: "grey", children: attr.type === "text" ? "Текст" : attr.type === "number" ? "Число" : attr.type }),
-            /* @__PURE__ */ jsx(
-              "button",
-              {
-                onClick: () => setConfirmDeleteId(attr.id),
-                className: "text-xs text-ui-fg-error hover:underline",
-                children: "Удалить"
-              }
-            )
+            /* @__PURE__ */ jsx("span", { className: "flex-1 text-sm text-ui-fg-subtle", children: attr.label }),
+            /* @__PURE__ */ jsx(Badge, { size: "2xsmall", color: "grey", children: typeLabel(attr.type) }),
+            /* @__PURE__ */ jsx(Badge, { size: "2xsmall", color: "blue", children: "из родителя" })
           ]
         },
         attr.id
-      )
-    ) }),
+      )) })
+    ] }),
+    ownAttributes.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+      inheritedAttributes.length > 0 && /* @__PURE__ */ jsx("div", { className: "px-6 py-2 bg-ui-bg-subtle", children: /* @__PURE__ */ jsx(Text, { size: "xsmall", weight: "plus", className: "text-ui-fg-muted uppercase", children: "Свои" }) }),
+      /* @__PURE__ */ jsx("div", { className: "divide-y", children: ownAttributes.map(
+        (attr) => confirmDeleteId === attr.id ? /* @__PURE__ */ jsxs(
+          "div",
+          {
+            className: "flex items-center gap-3 px-6 py-3 text-sm",
+            children: [
+              /* @__PURE__ */ jsxs("span", { className: "flex-1 text-ui-fg-base", children: [
+                "Удалить «",
+                attr.label,
+                "»?"
+              ] }),
+              /* @__PURE__ */ jsx(
+                Button,
+                {
+                  size: "small",
+                  variant: "danger",
+                  onClick: () => deleteMutation.mutate(attr.id),
+                  isLoading: deleteMutation.isPending,
+                  children: "Удалить"
+                }
+              ),
+              /* @__PURE__ */ jsx(
+                Button,
+                {
+                  size: "small",
+                  variant: "secondary",
+                  onClick: () => setConfirmDeleteId(null),
+                  children: "Отмена"
+                }
+              )
+            ]
+          },
+          attr.id
+        ) : /* @__PURE__ */ jsxs(
+          "div",
+          {
+            className: "flex items-center gap-3 px-6 py-3",
+            children: [
+              /* @__PURE__ */ jsx("span", { className: "flex-1 text-sm text-ui-fg-base", children: attr.label }),
+              /* @__PURE__ */ jsx(Badge, { size: "2xsmall", color: "grey", children: typeLabel(attr.type) }),
+              /* @__PURE__ */ jsx(
+                "button",
+                {
+                  onClick: () => setConfirmDeleteId(attr.id),
+                  className: "text-xs text-ui-fg-error hover:underline",
+                  children: "Удалить"
+                }
+              )
+            ]
+          },
+          attr.id
+        )
+      ) })
+    ] }),
+    !isLoading && !isError && attributes.length === 0 && !showAddForm && /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-muted text-sm", children: "Нет атрибутов. Добавьте первый." }) }),
     showAddForm && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 px-6 py-3", children: [
       /* @__PURE__ */ jsx(
         Input,

package/.medusa/server/src/api/admin/category/[categoryId]/custom-attributes/route.js CHANGED Viewed

@@ -3,11 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = GET;
 exports.POST = POST;
 exports.PATCH = PATCH;
+const utils_1 = require("@medusajs/framework/utils");
 const product_attributes_1 = require("../../../../../modules/product-attributes");
+/**
+ * Walk up the category tree, starting from `leafId`, collecting ids of the
+ * category itself and all of its ancestors. Ordered leaf → root.
+ *
+ * A hard cap of 20 levels guards against cycles in malformed data.
+ */
+async function resolveAncestorChain(productService, leafId) {
+    const chain = [];
+    let currentId = leafId;
+    let depth = 0;
+    while (currentId && depth < 20) {
+        chain.push(currentId);
+        const category = await productService.retrieveProductCategory(currentId, {
+            select: ["id", "parent_category_id"],
+        });
+        currentId = category?.parent_category_id ?? null;
+        depth++;
+    }
+    return chain;
+}
 async function GET(req, res) {
     const { categoryId } = req.params;
     const service = req.scope.resolve(product_attributes_1.CUSTOM_ATTRIBUTE_MODULE);
-    const category_custom_attributes = await service.getCategoryAttributes(categoryId);
+    const productService = req.scope.resolve(utils_1.Modules.PRODUCT);
+    const categoryIds = await resolveAncestorChain(productService, categoryId);
+    const category_custom_attributes = await service.getAttributesByCategoryIds(categoryIds);
     res.json({ category_custom_attributes });
 }
 async function POST(req, res) {

package/.medusa/server/src/api/admin/category/[categoryId]/custom-attributes/route.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../../src/api/admin/category/[categoryId]/custom-attributes/route.ts"],"names":[],"mappings":";;~~AAIA~~,~~kBAOC~~;AAED,oBAoBC;AAED,sBAcC;~~AAhDD~~,kFAAmF;~~AAG5E~~,KAAK,UAAU,GAAG,CAAC,GAAkB,EAAE,GAAmB;IAC/D,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACjC,MAAM,OAAO,GAA2B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,4CAAuB,CAAC,CAAA;~~IAElF~~,MAAM,0BAA0B,GAAG,MAAM,OAAO,CAAC,~~qBAAqB~~,CAAC,~~UAAU~~,CAAC,CAAA;~~IAElF~~,GAAG,CAAC,IAAI,CAAC,EAAE,0BAA0B,EAAE,CAAC,CAAA;AAC1C,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,GAAkB,EAAE,GAAmB;IAChE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACjC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,IAK7C,CAAA;IAED,MAAM,OAAO,GAA2B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,4CAAuB,CAAC,CAAA;IAElF,MAAM,yBAAyB,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC;QACtE,KAAK;QACL,IAAI,EAAE,IAAI,IAAI,MAAM;QACpB,IAAI,EAAE,IAAI,IAAI,IAAI;QAClB,WAAW,EAAE,UAAU;QACvB,UAAU;KACX,CAAC,CAAA;IAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,yBAAyB,EAAE,CAAC,CAAA;AACrD,CAAC;AAEM,KAAK,UAAU,KAAK,CAAC,GAAkB,EAAE,GAAmB;IACjE,MAAM,OAAO,GAA2B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,4CAAuB,CAAC,CAAA;IAClF,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC,IAO3B,CAAA;IAED,MAAM,yBAAyB,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAEjF,GAAG,CAAC,IAAI,CAAC,EAAE,yBAAyB,EAAE,CAAC,CAAA;AACzC,CAAC"}
1	+ {"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../../src/api/admin/category/[categoryId]/custom-attributes/route.ts"],"names":[],"mappings":";;AA6BA,kBASC;AAED,oBAoBC;AAED,sBAcC;AA3ED,qDAAmD;AACnD,kFAAmF;AAGnF;;;;;GAKG;AACH,KAAK,UAAU,oBAAoB,CACjC,cAAmB,EACnB,MAAc;IAEd,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,IAAI,SAAS,GAAkB,MAAM,CAAA;IACrC,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,OAAO,SAAS,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACrB,MAAM,QAAQ,GAAQ,MAAM,cAAc,CAAC,uBAAuB,CAAC,SAAS,EAAE;YAC5E,MAAM,EAAE,CAAC,IAAI,EAAE,oBAAoB,CAAC;SACrC,CAAC,CAAA;QACF,SAAS,GAAI,QAAQ,EAAE,kBAAoC,IAAI,IAAI,CAAA;QACnE,KAAK,EAAE,CAAA;IACT,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAEM,KAAK,UAAU,GAAG,CAAC,GAAkB,EAAE,GAAmB;IAC/D,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACjC,MAAM,OAAO,GAA2B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,4CAAuB,CAAC,CAAA;IAClF,MAAM,cAAc,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,eAAO,CAAC,OAAO,CAAC,CAAA;IAEzD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;IAC1E,MAAM,0BAA0B,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAA;IAExF,GAAG,CAAC,IAAI,CAAC,EAAE,0BAA0B,EAAE,CAAC,CAAA;AAC1C,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,GAAkB,EAAE,GAAmB;IAChE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IACjC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,IAK7C,CAAA;IAED,MAAM,OAAO,GAA2B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,4CAAuB,CAAC,CAAA;IAElF,MAAM,yBAAyB,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC;QACtE,KAAK;QACL,IAAI,EAAE,IAAI,IAAI,MAAM;QACpB,IAAI,EAAE,IAAI,IAAI,IAAI;QAClB,WAAW,EAAE,UAAU;QACvB,UAAU;KACX,CAAC,CAAA;IAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,yBAAyB,EAAE,CAAC,CAAA;AACrD,CAAC;AAEM,KAAK,UAAU,KAAK,CAAC,GAAkB,EAAE,GAAmB;IACjE,MAAM,OAAO,GAA2B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,4CAAuB,CAAC,CAAA;IAClF,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC,IAO3B,CAAA;IAED,MAAM,yBAAyB,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IAEjF,GAAG,CAAC,IAAI,CAAC,EAAE,yBAAyB,EAAE,CAAC,CAAA;AACzC,CAAC"}

package/.medusa/server/src/modules/product-attributes/service.d.ts CHANGED Viewed

@@ -63,6 +63,7 @@ declare class CustomAttributeService extends CustomAttributeService_base {
         updated_at: Date;
         deleted_at: Date | null;
     }[]>;
+    getAttributesByCategoryIds(categoryIds: string[]): Promise<any[]>;
     createCategoryAttribute(data: {
         label: string;
         type: string;

package/.medusa/server/src/modules/product-attributes/service.js CHANGED Viewed

@@ -19,6 +19,24 @@ class CustomAttributeService extends (0, utils_1.MedusaService)(models) {
             deleted_at: null,
         });
     }
+    async getAttributesByCategoryIds(categoryIds) {
+        if (!categoryIds || categoryIds.length === 0) {
+            return [];
+        }
+        // @ts-ignore - method generated by MedusaService
+        const attributes = await this.listCategoryCustomAttributes({
+            category_id: categoryIds,
+            deleted_at: null,
+        });
+        // First id in the list is the leaf category — its attributes are "own",
+        // everything else is inherited from an ancestor.
+        const leafId = categoryIds[0];
+        return attributes.map((attr) => ({
+            ...attr,
+            inherited: attr.category_id !== leafId,
+            source_category_id: attr.category_id,
+        }));
+    }
     async createCategoryAttribute(data) {
         const key = this.generateKey(data.label);
         // @ts-ignore - method generated by MedusaService

package/.medusa/server/src/modules/product-attributes/service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/product-attributes/service.ts"],"names":[],"mappings":";;;;;AAAA,qDAAyD;AACzD,mGAAwE;AACxE,iGAAsE;AAEtE,MAAM,MAAM,GAAG;IACb,uBAAuB,EAAvB,mCAAuB;IACvB,sBAAsB,EAAtB,kCAAsB;CACvB,CAAA;AAID,2EAA2E;AAC3E,MAAM,sBAAuB,SAAQ,IAAA,qBAAa,EAAC,MAAM,CAAC;IACxD,KAAK,CAAC,qBAAqB,CAAC,UAAkB;QAC5C,iDAAiD;QACjD,OAAO,MAAM,IAAI,CAAC,4BAA4B,CAAC;YAC7C,WAAW,EAAE,UAAU;YACvB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,IAO7B;QACC,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxC,iDAAiD;QACjD,OAAO,MAAM,IAAI,CAAC,8BAA8B,CAAC;YAC/C,GAAG,IAAI;YACP,GAAG;YACH,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,KAAK;YACtC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,CAAC;SACjC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,EAAU,EACV,IAMC;QAED,MAAM,UAAU,GAAwB,EAAE,GAAG,IAAI,EAAE,CAAA;QACnD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/C,CAAC;QACD,iDAAiD;QACjD,OAAO,MAAM,IAAI,CAAC,8BAA8B,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAM5B;QACC,iDAAiD;QACjD,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAA;IACvD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,EAAU,EACV,IAKC;QAED,iDAAiD;QACjD,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAA;IACpE,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,SAAiB;QAC1C,iDAAiD;QACjD,OAAO,MAAM,IAAI,CAAC,2BAA2B,CAAC;YAC5C,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,IAAI;SACjB,EAAE;YACD,SAAS,EAAE,CAAC,2BAA2B,CAAC;SACzC,CAAC,CAAA;IACJ,CAAC;IAEO,WAAW,CAAC,KAAa;QAC/B,OAAO,KAAK;aACT,WAAW,EAAE;aACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;aAC3B,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAC1B,CAAC;CACF;AAED,kBAAe,sBAAsB,CAAA"}
1	+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/product-attributes/service.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@empty-complete-org/medusa-product-attributes",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Custom attributes module for Medusa v2 with support for text, number, file types and units of measurement",
   "author": "empty-complete",
   "license": "MIT",