medusa-product-helper 0.0.24 → 0.0.26

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

@@ -152,23 +152,61 @@ const useOrderMetadataConfig = () => useMetadataConfig("order");
 const CONFIG_DOCS_URL$2 = "https://docs.medusajs.com/admin/extension-points/widgets#product-category-details";
 const CategoryMetadataTableWidget = ({ data }) => {
   const { data: descriptors = [], isPending, isError } = useCategoryMetadataConfig();
-  const metadata = (data == null ? void 0 : data.metadata) ?? {};
-  const [baselineMetadata, setBaselineMetadata] = react.useState(metadata);
+  const categoryId = (data == null ? void 0 : data.id) ?? void 0;
+  const [baselineMetadata, setBaselineMetadata] = react.useState(
+    (data == null ? void 0 : data.metadata) ?? {}
+  );
   const queryClient = reactQuery.useQueryClient();
+  const previousCategoryIdRef = react.useRef(categoryId);
+  const isInitializedRef = react.useRef(false);
+  const dataRef = react.useRef(data);
+  const descriptorsRef = react.useRef(descriptors);
+  react.useEffect(() => {
+    dataRef.current = data;
+    descriptorsRef.current = descriptors;
+  }, [data, descriptors]);
+  react.useEffect(() => {
+    var _a;
+    if (previousCategoryIdRef.current === categoryId && isInitializedRef.current) {
+      return;
+    }
+    const categoryIdChanged = previousCategoryIdRef.current !== categoryId;
+    if (categoryIdChanged || !isInitializedRef.current) {
+      const currentMetadata = (data == null ? void 0 : data.metadata) ?? ((_a = dataRef.current) == null ? void 0 : _a.metadata) ?? {};
+      const currentDescriptors = descriptorsRef.current.length > 0 ? descriptorsRef.current : descriptors;
+      if (currentDescriptors.length === 0) {
+        return;
+      }
+      previousCategoryIdRef.current = categoryId;
+      setBaselineMetadata(currentMetadata);
+      const newInitialState = buildInitialFormState(currentDescriptors, currentMetadata);
+      setValues(newInitialState);
+      isInitializedRef.current = true;
+    }
+  }, [categoryId]);
+  const metadataStringRef = react.useRef("");
   react.useEffect(() => {
-    setBaselineMetadata(metadata);
-  }, [metadata]);
+    const hasCategoryData = !!data;
+    const descriptorsLoaded = descriptors.length > 0;
+    const sameCategory = previousCategoryIdRef.current === categoryId;
+    const notInitialized = !isInitializedRef.current;
+    const currentMetadata = (data == null ? void 0 : data.metadata) ?? {};
+    const currentMetadataString = JSON.stringify(currentMetadata);
+    const metadataChanged = currentMetadataString !== metadataStringRef.current;
+    if (hasCategoryData && descriptorsLoaded && sameCategory && (notInitialized || metadataChanged)) {
+      const newInitialState = buildInitialFormState(descriptors, currentMetadata);
+      setBaselineMetadata(currentMetadata);
+      setValues(newInitialState);
+      metadataStringRef.current = currentMetadataString;
+      isInitializedRef.current = true;
+    }
+  }, [data, descriptors.length, categoryId]);
   const initialState = react.useMemo(
     () => buildInitialFormState(descriptors, baselineMetadata),
     [descriptors, baselineMetadata]
   );
-  const [values, setValues] = react.useState(
-    initialState
-  );
+  const [values, setValues] = react.useState({});
   const [isSaving, setIsSaving] = react.useState(false);
-  react.useEffect(() => {
-    setValues(initialState);
-  }, [initialState]);
   const errors = react.useMemo(() => {
     return descriptors.reduce((acc, descriptor) => {
       const error = validateValueForDescriptor(descriptor, values[descriptor.key]);
@@ -234,6 +272,15 @@ const CategoryMetadataTableWidget = ({ data }) => {
       await queryClient.invalidateQueries({
         queryKey: ["product-categories"]
       });
+      await queryClient.invalidateQueries({
+        queryKey: ["product-category", data.id]
+      });
+      if (data.id) {
+        queryClient.refetchQueries({
+          queryKey: ["product-category", data.id]
+        }).catch(() => {
+        });
+      }
     } catch (error) {
       ui.toast.error(error instanceof Error ? error.message : "Save failed");
     } finally {
@@ -248,7 +295,7 @@ const CategoryMetadataTableWidget = ({ data }) => {
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-subtle", children: "Structured metadata mapped to the keys you configured in the plugin options." })
     ] }),
-    isPending ? /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-[160px] w-full" }) : isError ? /* @__PURE__ */ jsxRuntime.jsxs(ui.InlineTip, { variant: "error", label: "Configuration unavailable", children: [
+    isPending || !isInitializedRef.current || Object.keys(values).length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-[160px] w-full" }) : isError ? /* @__PURE__ */ jsxRuntime.jsxs(ui.InlineTip, { variant: "error", label: "Configuration unavailable", children: [
       "Unable to load metadata configuration for this plugin. Confirm that the plugin is registered with options in ",
       /* @__PURE__ */ jsxRuntime.jsx("code", { children: "medusa-config.ts" }),
       "."
@@ -1017,14 +1064,14 @@ const ProductMetadataTableWidget = ({ data }) => {
   }, [productId]);
   const metadataStringRef = react.useRef("");
   react.useEffect(() => {
-    const hasMetadata = (data == null ? void 0 : data.metadata) && Object.keys(data.metadata).length > 0;
+    const hasProductData = !!data;
     const descriptorsLoaded = descriptors.length > 0;
     const sameProduct = previousProductIdRef.current === productId;
     const notInitialized = !isInitializedRef.current;
-    const currentMetadataString = hasMetadata ? JSON.stringify(data.metadata) : "";
+    const currentMetadata = (data == null ? void 0 : data.metadata) ?? {};
+    const currentMetadataString = JSON.stringify(currentMetadata);
     const metadataChanged = currentMetadataString !== metadataStringRef.current;
-    if (hasMetadata && descriptorsLoaded && sameProduct && (notInitialized || metadataChanged)) {
-      const currentMetadata = data.metadata ?? {};
+    if (hasProductData && descriptorsLoaded && sameProduct && (notInitialized || metadataChanged)) {
       const newInitialState = buildInitialFormState(descriptors, currentMetadata);
       setBaselineMetadata(currentMetadata);
       setValues(newInitialState);

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

@@ -1,7 +1,7 @@
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
 import { defineWidgetConfig } from "@medusajs/admin-sdk";
 import { Container, Heading, Badge, Text, Skeleton, InlineTip, Button, Switch, Textarea, Input, toast } from "@medusajs/ui";
-import { useState, useEffect, useMemo, useRef } from "react";
+import { useState, useRef, useEffect, useMemo } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 const METADATA_FIELD_TYPES = ["number", "text", "file", "bool"];
 const VALID_FIELD_TYPES = new Set(METADATA_FIELD_TYPES);
@@ -151,23 +151,61 @@ const useOrderMetadataConfig = () => useMetadataConfig("order");
 const CONFIG_DOCS_URL$2 = "https://docs.medusajs.com/admin/extension-points/widgets#product-category-details";
 const CategoryMetadataTableWidget = ({ data }) => {
   const { data: descriptors = [], isPending, isError } = useCategoryMetadataConfig();
-  const metadata = (data == null ? void 0 : data.metadata) ?? {};
-  const [baselineMetadata, setBaselineMetadata] = useState(metadata);
+  const categoryId = (data == null ? void 0 : data.id) ?? void 0;
+  const [baselineMetadata, setBaselineMetadata] = useState(
+    (data == null ? void 0 : data.metadata) ?? {}
+  );
   const queryClient = useQueryClient();
+  const previousCategoryIdRef = useRef(categoryId);
+  const isInitializedRef = useRef(false);
+  const dataRef = useRef(data);
+  const descriptorsRef = useRef(descriptors);
+  useEffect(() => {
+    dataRef.current = data;
+    descriptorsRef.current = descriptors;
+  }, [data, descriptors]);
+  useEffect(() => {
+    var _a;
+    if (previousCategoryIdRef.current === categoryId && isInitializedRef.current) {
+      return;
+    }
+    const categoryIdChanged = previousCategoryIdRef.current !== categoryId;
+    if (categoryIdChanged || !isInitializedRef.current) {
+      const currentMetadata = (data == null ? void 0 : data.metadata) ?? ((_a = dataRef.current) == null ? void 0 : _a.metadata) ?? {};
+      const currentDescriptors = descriptorsRef.current.length > 0 ? descriptorsRef.current : descriptors;
+      if (currentDescriptors.length === 0) {
+        return;
+      }
+      previousCategoryIdRef.current = categoryId;
+      setBaselineMetadata(currentMetadata);
+      const newInitialState = buildInitialFormState(currentDescriptors, currentMetadata);
+      setValues(newInitialState);
+      isInitializedRef.current = true;
+    }
+  }, [categoryId]);
+  const metadataStringRef = useRef("");
   useEffect(() => {
-    setBaselineMetadata(metadata);
-  }, [metadata]);
+    const hasCategoryData = !!data;
+    const descriptorsLoaded = descriptors.length > 0;
+    const sameCategory = previousCategoryIdRef.current === categoryId;
+    const notInitialized = !isInitializedRef.current;
+    const currentMetadata = (data == null ? void 0 : data.metadata) ?? {};
+    const currentMetadataString = JSON.stringify(currentMetadata);
+    const metadataChanged = currentMetadataString !== metadataStringRef.current;
+    if (hasCategoryData && descriptorsLoaded && sameCategory && (notInitialized || metadataChanged)) {
+      const newInitialState = buildInitialFormState(descriptors, currentMetadata);
+      setBaselineMetadata(currentMetadata);
+      setValues(newInitialState);
+      metadataStringRef.current = currentMetadataString;
+      isInitializedRef.current = true;
+    }
+  }, [data, descriptors.length, categoryId]);
   const initialState = useMemo(
     () => buildInitialFormState(descriptors, baselineMetadata),
     [descriptors, baselineMetadata]
   );
-  const [values, setValues] = useState(
-    initialState
-  );
+  const [values, setValues] = useState({});
   const [isSaving, setIsSaving] = useState(false);
-  useEffect(() => {
-    setValues(initialState);
-  }, [initialState]);
   const errors = useMemo(() => {
     return descriptors.reduce((acc, descriptor) => {
       const error = validateValueForDescriptor(descriptor, values[descriptor.key]);
@@ -233,6 +271,15 @@ const CategoryMetadataTableWidget = ({ data }) => {
       await queryClient.invalidateQueries({
         queryKey: ["product-categories"]
       });
+      await queryClient.invalidateQueries({
+        queryKey: ["product-category", data.id]
+      });
+      if (data.id) {
+        queryClient.refetchQueries({
+          queryKey: ["product-category", data.id]
+        }).catch(() => {
+        });
+      }
     } catch (error) {
       toast.error(error instanceof Error ? error.message : "Save failed");
     } finally {
@@ -247,7 +294,7 @@ const CategoryMetadataTableWidget = ({ data }) => {
       ] }),
       /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-subtle", children: "Structured metadata mapped to the keys you configured in the plugin options." })
     ] }),
-    isPending ? /* @__PURE__ */ jsx(Skeleton, { className: "h-[160px] w-full" }) : isError ? /* @__PURE__ */ jsxs(InlineTip, { variant: "error", label: "Configuration unavailable", children: [
+    isPending || !isInitializedRef.current || Object.keys(values).length === 0 ? /* @__PURE__ */ jsx(Skeleton, { className: "h-[160px] w-full" }) : isError ? /* @__PURE__ */ jsxs(InlineTip, { variant: "error", label: "Configuration unavailable", children: [
       "Unable to load metadata configuration for this plugin. Confirm that the plugin is registered with options in ",
       /* @__PURE__ */ jsx("code", { children: "medusa-config.ts" }),
       "."
@@ -1016,14 +1063,14 @@ const ProductMetadataTableWidget = ({ data }) => {
   }, [productId]);
   const metadataStringRef = useRef("");
   useEffect(() => {
-    const hasMetadata = (data == null ? void 0 : data.metadata) && Object.keys(data.metadata).length > 0;
+    const hasProductData = !!data;
     const descriptorsLoaded = descriptors.length > 0;
     const sameProduct = previousProductIdRef.current === productId;
     const notInitialized = !isInitializedRef.current;
-    const currentMetadataString = hasMetadata ? JSON.stringify(data.metadata) : "";
+    const currentMetadata = (data == null ? void 0 : data.metadata) ?? {};
+    const currentMetadataString = JSON.stringify(currentMetadata);
     const metadataChanged = currentMetadataString !== metadataStringRef.current;
-    if (hasMetadata && descriptorsLoaded && sameProduct && (notInitialized || metadataChanged)) {
-      const currentMetadata = data.metadata ?? {};
+    if (hasProductData && descriptorsLoaded && sameProduct && (notInitialized || metadataChanged)) {
       const newInitialState = buildInitialFormState(descriptors, currentMetadata);
       setBaselineMetadata(currentMetadata);
       setValues(newInitialState);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-product-helper",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "A starter for Medusa plugins.",
   "author": "Medusa (https://medusajs.com)",
   "license": "MIT",