fix: product options catch-all improvements

integration-tests/modules/__tests__/product/workflows/delete-products.spec.ts

@@ -0,0 +1,231 @@
+import {
+  deleteProductsWorkflow,
+  deleteProductsWorkflowId,
+} from "@medusajs/core-flows"
+import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
+import {
+  IFulfillmentModuleService,
+  IProductModuleService,
+} from "@medusajs/types"
+import { Modules } from "@medusajs/utils"
+
+jest.setTimeout(50000)
+
+medusaIntegrationTestRunner({
+  testSuite: ({ getContainer }) => {
+    describe("Workflows: Delete products", () => {
+      let appContainer
+      let service: IProductModuleService
+      let fulfillmentService: IFulfillmentModuleService
+      let shippingProfile
+
+      beforeAll(async () => {
+        appContainer = getContainer()
+        service = appContainer.resolve(Modules.PRODUCT)
+        fulfillmentService = appContainer.resolve(Modules.FULFILLMENT)
+      })
+
+      beforeEach(async () => {
+        shippingProfile = await fulfillmentService.createShippingProfiles({
+          name: "Test",
+          type: "default",
+        })
+      })
+
+      describe("deleteProductsWorkflow", () => {
+        it("should delete exclusive option when deleting its only associated product", async () => {
+          const workflow = deleteProductsWorkflow(appContainer)
+
+          const product = await service.createProducts({
+            title: "Test Product",
+            shipping_profile_id: shippingProfile.id,
+            options: [
+              {
+                title: "Size",
+                values: ["S", "M", "L"],
+              },
+            ],
+          })
+
+          const option = product.options[0]
+
+          expect(option.is_exclusive).toBe(true)
+
+          await workflow.run({
+            input: {
+              ids: [product.id],
+            },
+          })
+
+          const options = await service.listProductOptions({ id: [option.id] })
+          expect(options).toHaveLength(0)
+        })
+
+        it("should not delete non-exclusive option when deleting a product", async () => {
+          const workflow = deleteProductsWorkflow(appContainer)
+
+          const globalOption = await service.createProductOptions({
+            title: "Color",
+            is_exclusive: false,
+            values: ["Red", "Blue"],
+          })
+
+          expect(globalOption.is_exclusive).toBe(false)
+
+          // Create a product and associate the global option
+          const product = await service.createProducts({
+            title: "Test Product",
+            shipping_profile_id: shippingProfile.id,
+          })
+
+          await service.addProductOptionToProduct({
+            product_id: product.id,
+            product_option_id: globalOption.id,
+          })
+
+          await workflow.run({
+            input: {
+              ids: [product.id],
+            },
+          })
+
+          const options = await service.listProductOptions({
+            id: [globalOption.id],
+          })
+          expect(options).toHaveLength(1)
+          expect(options[0].id).toBe(globalOption.id)
+        })
+
+        it("should delete exclusive option but keep non-exclusive option when deleting a product", async () => {
+          const workflow = deleteProductsWorkflow(appContainer)
+
+          const globalOption = await service.createProductOptions({
+            title: "Material",
+            is_exclusive: false,
+            values: ["Cotton", "Polyester"],
+          })
+
+          const product = await service.createProducts({
+            title: "Test Product",
+            shipping_profile_id: shippingProfile.id,
+            options: [
+              {
+                title: "Size",
+                values: ["S", "M", "L"],
+              },
+            ],
+            variants: [
+              {
+                title: "Small",
+                options: {
+                  Size: "S",
+                },
+              },
+            ],
+          })
+
+          const exclusiveOption = product.options[0]
+          expect(exclusiveOption.is_exclusive).toBe(true)
+
+          await service.addProductOptionToProduct({
+            product_id: product.id,
+            product_option_id: globalOption.id,
+          })
+
+          await workflow.run({
+            input: {
+              ids: [product.id],
+            },
+          })
+
+          const exclusiveOptions = await service.listProductOptions({
+            id: [exclusiveOption.id],
+          })
+          expect(exclusiveOptions).toHaveLength(0)
+
+          const nonExclusiveOptions = await service.listProductOptions({
+            id: [globalOption.id],
+          })
+          expect(nonExclusiveOptions).toHaveLength(1)
+          expect(nonExclusiveOptions[0].id).toBe(globalOption.id)
+        })
+
+        it("should restore options and product data when a failure step is added at the end", async () => {
+          const workflow = deleteProductsWorkflow(appContainer)
+
+          const product = await service.createProducts({
+            title: "Test Product",
+            shipping_profile_id: shippingProfile.id,
+            options: [
+              {
+                title: "Size",
+                values: ["S", "M", "L"],
+              },
+            ],
+            variants: [
+              {
+                title: "Small",
+                options: {
+                  Size: "S",
+                },
+              },
+            ],
+          })
+
+          const option = product.options[0]
+          expect(option.is_exclusive).toBe(true)
+
+          workflow.appendAction("throw", deleteProductsWorkflowId, {
+            invoke: async () => {
+              throw new Error(`Failed after product deletion`)
+            },
+          })
+
+          const { errors } = await workflow.run({
+            input: {
+              ids: [product.id],
+            },
+            throwOnError: false,
+          })
+
+          expect(errors).toEqual([
+            {
+              action: "throw",
+              handlerType: "invoke",
+              error: expect.objectContaining({
+                message: `Failed after product deletion`,
+              }),
+            },
+          ])
+
+          const restoredProducts = await service.listProducts(
+            {
+              id: [product.id],
+            },
+            {
+              relations: ["options", "options.values", "variants"],
+            }
+          )
+          expect(restoredProducts).toHaveLength(1)
+          expect(restoredProducts[0].id).toBe(product.id)
+          expect(restoredProducts[0].deleted_at).toBeNull()
+
+          expect(restoredProducts[0].variants).toHaveLength(1)
+
+          expect(restoredProducts[0].options).toHaveLength(1)
+          expect(restoredProducts[0].options[0].id).toBe(option.id)
+          expect(
+            restoredProducts[0].options[0].values.map((v) => v.id)
+          ).toEqual(expect.arrayContaining(option.values.map((v) => v.id)))
+
+          const restoredOptions = await service.listProductOptions({
+            id: [option.id],
+          })
+          expect(restoredOptions).toHaveLength(1)
+          expect(restoredOptions[0].id).toBe(option.id)
+          expect(restoredOptions[0].deleted_at).toBeNull()
+        })
+      })
+    })
+  },
+})

packages/admin/dashboard/src/i18n/translations/$schema.json

@@ -400,10 +400,10 @@
         "saveChanges": {
           "type": "string"
         },
-        "saveAndClose": {
+        "saveAsDraft": {
           "type": "string"
         },
-        "saveAsDraft": {
+        "saveAndClose": {
           "type": "string"
         },
         "copy": {
@@ -9549,29 +9549,31 @@
         "domain": {
           "type": "string"
         },
-        "subtitle": {
-          "type": "string"
-        },
-        "list": {
+        "actions": {
           "type": "object",
           "properties": {
-            "metrics": {
+            "manage": {
+              "type": "string"
+            },
+            "manageLocales": {
               "type": "string"
             }
           },
-          "required": ["metrics"]
+          "required": ["manage", "manageLocales"],
+          "additionalProperties": false
         },
-        "actions": {
+        "subtitle": {
+          "type": "string"
+        },
+        "list": {
           "type": "object",
           "properties": {
-            "manageLocales": {
-              "type": "string"
-            },
-            "manage": {
+            "metrics": {
               "type": "string"
             }
           },
-          "required": ["manageLocales", "manage"]
+          "required": ["metrics"],
+          "additionalProperties": false
         },
         "edit": {
           "type": "object",
@@ -9589,10 +9591,12 @@
                   "type": "string"
                 }
               },
-              "required": ["title", "description"]
+              "required": ["title", "description"],
+              "additionalProperties": false
             }
           },
-          "required": ["successToast", "unsavedChanges"]
+          "required": ["successToast", "unsavedChanges"],
+          "additionalProperties": false
         },
         "bulk": {
           "type": "object",
@@ -9604,7 +9608,8 @@
               "type": "string"
             }
           },
-          "required": ["header"]
+          "required": ["header", "mainColumn"],
+          "additionalProperties": false
         },
         "activeLocales": {
           "type": "object",
@@ -9619,7 +9624,8 @@
               "type": "string"
             }
           },
-          "required": ["heading", "subtitle", "noLocalesTip"]
+          "required": ["heading", "subtitle", "noLocalesTip"],
+          "additionalProperties": false
         },
         "completion": {
           "type": "object",
@@ -9637,17 +9643,21 @@
               "type": "string"
             }
           },
-          "required": ["heading", "translated", "toTranslate", "footer"]
+          "required": ["heading", "translated", "toTranslate", "footer"],
+          "additionalProperties": false
         }
       },
       "required": [
         "domain",
         "actions",
         "subtitle",
+        "list",
+        "edit",
         "bulk",
-        "completion",
-        "edit"
-      ]
+        "activeLocales",
+        "completion"
+      ],
+      "additionalProperties": false
     },
     "store": {
       "type": "object",
@@ -12477,6 +12487,7 @@
     "priceLists",
     "profile",
     "users",
+    "translations",
     "store",
     "regions",
     "taxes",

packages/admin/dashboard/src/i18n/translations/en.json

@@ -874,7 +874,7 @@
       "successToast": "Product option \"{{title}}\" was successfully created.",
       "tabs": {
         "details": "Details",
-        "organize": "Organize"
+        "organize": "Organize rankings"
       }
     },
     "manage": {

packages/admin/dashboard/src/routes/product-options/product-option-create/components/create-product-option-form/create-product-option-details.tsx

@@ -16,7 +16,7 @@ export const CreateProductOptionDetails = ({
   const { t } = useTranslation()
 
   return (
-    <div className="flex flex-col items-center p-16">
+    <div className="mt-16 flex flex-col items-center px-16">
       <div className="flex w-full max-w-[720px] flex-col gap-y-8">
         <div>
           <Heading>{t("productOptions.create.header")}</Heading>