Merge branch 'develop' into fix/price-list-rules

medusajs · Nov 24, 2023 · 03d75c3 · 03d75c3
2 parents fe06b7e + f4c489f
commit 03d75c3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/.changeset/hungry-dodos-fix.md b/.changeset/hungry-dodos-fix.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+fix(admin-ui): Fix an issue where if product.categories was null the details page would crash
diff --git a/.changeset/lemon-poems-join.md b/.changeset/lemon-poems-join.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): update default admin query with product categories
diff --git a/packages/admin-ui/ui/src/components/organisms/product-general-section/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-general-section/index.tsx
@@ -157,7 +157,7 @@ const ProductDetails = ({ product }: Props) => {
       {isFeatureEnabled(FeatureFlag.PRODUCT_CATEGORIES) && (
         <Detail
           title={t("product-general-section-category", "Category")}
-          value={product.categories.map((c) => c.name)}
+          value={product.categories?.map((c) => c.name)}
         />
       )}
       <Detail

diff --git a/packages/admin-ui/ui/src/domain/products/new/add-variants/new-variant/index.tsx b/packages/admin-ui/ui/src/domain/products/new/add-variants/new-variant/index.tsx
@@ -175,7 +175,7 @@ const NewVariant = ({
         ref={preview}
         data-handler-id={handlerId}
         className={clsx(
-          "rounded-rounded py-xsmall pl-xsmall pr-base focus-within:bg-grey-5 hover:bg-grey-5 grid h-16 translate-y-0 translate-x-0 grid-cols-[32px_1fr_90px_100px_48px] transition-all",
+          "rounded-rounded py-xsmall pl-xsmall pr-base focus-within:bg-grey-5 hover:bg-grey-5 grid h-16 translate-x-0 translate-y-0 grid-cols-[32px_1fr_90px_100px_48px] transition-all",
           {
             "opacity-50": isDragging,
           }
@@ -294,7 +294,6 @@ const VariantValidity = ({
   productDimensions,
 }: Pick<Props, "source" | "productCustoms" | "productDimensions">) => {
   const {
-    prices,
     options,
     dimensions,
     customs,
@@ -335,8 +334,6 @@ const VariantValidity = ({
     )
   }
 
-  const validPrices = prices?.prices.some((p) => p.amount !== null)
-
   const validDimensions =
     Object.values(productDimensions).every((value) => !!value) ||
     Object.values(dimensions).every((value) => !!value)
@@ -346,13 +343,7 @@ const VariantValidity = ({
 
   const barcodeValidity = !!barcode || !!upc || !!ean
 
-  if (
-    !sku ||
-    !validCustoms ||
-    !validDimensions ||
-    !barcodeValidity ||
-    !validPrices
-  ) {
+  if (!sku || !validCustoms || !validDimensions || !barcodeValidity) {
     return (
       <IconTooltip
         type="warning"
@@ -364,7 +355,6 @@ const VariantValidity = ({
               fields:
             </p>
             <ul className="list-inside list-disc">
-              {!validPrices && <li>Pricing</li>}
               {!validDimensions && <li>Dimensions</li>}
               {!validCustoms && <li>Customs</li>}
               {!inventory_quantity && <li>Inventory quantity</li>}

diff --git a/packages/admin-ui/webpack.config.dev.ts b/packages/admin-ui/webpack.config.dev.ts
@@ -48,7 +48,7 @@ const getDevServerConfig = () => {
         onListening: function () {
           openBrowser(`http://localhost:7001`)
         },
-        allowedHosts: 'auto',
+        allowedHosts: "auto",
       } as Configuration,
     },
   }

diff --git a/packages/medusa/src/api/routes/admin/products/index.ts b/packages/medusa/src/api/routes/admin/products/index.ts
@@ -159,6 +159,18 @@ export const defaultAdminProductRemoteQueryObject = {
     fields: ["title", "handle", "id", "created_at", "updated_at", "deleted_at"],
   },
 
+  categories: {
+    fields: [
+      "id",
+      "name",
+      "description",
+      "handle",
+      "is_active",
+      "is_internal",
+      "parent_category_id",
+    ],
+  },
+
   options: {
     fields: [
       "id",
@@ -503,4 +515,3 @@ export * from "./set-metadata"
 export * from "./update-option"
 export * from "./update-product"
 export * from "./update-variant"
-