Merge branch 'develop' into docs-util/support-query-argument

.changeset/calm-needles-buy.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/workflow-engine-redis": patch
+"@medusajs/workflows-sdk": patch
+"@medusajs/core-flows": patch
+"@medusajs/utils": patch
+---
+
+fix: when/then step name

.changeset/cuddly-students-travel.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/api-key": patch
+---
+
+refactor: migrate api key module to DML

.changeset/green-turkeys-fetch.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/utils": patch
+---
+
+fix(utils): DML one to one definition

.changeset/honest-cars-knock.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/core-flows": patch
+"@medusajs/types": patch
+"@medusajs/dashboard": patch
+---
+
+fix(): Deleted default sales channel should be prevented

.changeset/spicy-carrots-itch.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/dashboard": patch
+---
+
+fix(dashboard): Cleanup unsafe accesses to possibly undefined values in order timeline

.changeset/thick-cars-smash.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/framework": patch
+---
+
+fix(framework): add missing query type argument in request types

integration-tests/http/__tests__/product/store/product.spec.ts

@@ -1329,6 +1329,150 @@ medusaIntegrationTestRunner({
           )
         })
 
+        it("should handle inventory items and location levels correctly", async () => {
+          const container = getContainer()
+          const channelService = container.resolve("sales_channel")
+          const locationService = container.resolve("stock_location")
+          const inventoryService = container.resolve("inventory")
+          const productService = container.resolve("product")
+          const pubKeyService = container.resolve("api_key")
+          const linkService = container.resolve("remoteLink")
+
+          const [channelOne, channelTwo] =
+            await channelService.createSalesChannels([
+              { name: "Sales Channel 1" },
+              { name: "Sales Channel 2" },
+            ])
+
+          const product = await productService.createProducts({
+            status: "published",
+            title: "my prod",
+            options: [{ title: "color", values: ["green", "blue"] }],
+            variants: [
+              { title: "variant one", options: { color: "green" } },
+              { title: "variant two", options: { color: "blue" } },
+            ],
+          })
+          console.log(product)
+          const [variantOne, variantTwo] = product.variants
+
+          const [itemOne, itemTwo, itemThree] =
+            await inventoryService.createInventoryItems([
+              { sku: "sku-one" },
+              { sku: "sku-two" },
+              { sku: "sku-three" },
+            ])
+
+          const [locationOne, locationTwo] =
+            await locationService.createStockLocations([
+              { name: "Location One" },
+              { name: "Location Two" },
+            ])
+
+          await inventoryService.createInventoryLevels([
+            {
+              location_id: locationOne.id,
+              inventory_item_id: itemOne.id,
+              stocked_quantity: 23,
+            },
+            {
+              location_id: locationOne.id,
+              inventory_item_id: itemTwo.id,
+              stocked_quantity: 10,
+            },
+            {
+              location_id: locationTwo.id,
+              inventory_item_id: itemThree.id,
+              stocked_quantity: 5,
+            },
+          ])
+
+          const [pubKeyOne, pubKeyTwo] = await pubKeyService.createApiKeys([
+            { title: "pub key one", type: "publishable", created_by: "me" },
+            { title: "pub key two", type: "publishable", created_by: "me" },
+          ])
+
+          await linkService.create([
+            {
+              product: { product_id: product.id },
+              sales_channel: { sales_channel_id: channelOne.id },
+            },
+            {
+              product: { product_id: product.id },
+              sales_channel: { sales_channel_id: channelTwo.id },
+            },
+            {
+              product: { variant_id: variantOne.id },
+              inventory: { inventory_item_id: itemOne.id },
+            },
+            {
+              product: { variant_id: variantTwo.id },
+              inventory: { inventory_item_id: itemTwo.id },
+            },
+            {
+              product: { variant_id: variantTwo.id },
+              inventory: { inventory_item_id: itemThree.id },
+              data: { required_quantity: 2 },
+            },
+            {
+              sales_channel: { sales_channel_id: channelOne.id },
+              stock_location: { stock_location_id: locationOne.id },
+            },
+            {
+              sales_channel: { sales_channel_id: channelTwo.id },
+              stock_location: { stock_location_id: locationOne.id },
+            },
+            {
+              sales_channel: { sales_channel_id: channelTwo.id },
+              stock_location: { stock_location_id: locationTwo.id },
+            },
+            {
+              api_key: { publishable_key_id: pubKeyOne.id },
+              sales_channel: { sales_channel_id: channelOne.id },
+            },
+            {
+              api_key: { publishable_key_id: pubKeyTwo.id },
+              sales_channel: { sales_channel_id: channelTwo.id },
+            },
+          ])
+
+          let response = await api.get(
+            `/store/products?fields=+variants.inventory_quantity`,
+            { headers: { "x-publishable-api-key": pubKeyOne.token } }
+          )
+
+          expect(response.status).toEqual(200)
+          for (const variant of response.data.products
+            .map((p) => p.variants)
+            .flat()) {
+            if (variant.id === variantOne.id) {
+              expect(variant.inventory_quantity).toEqual(23)
+            } else if (variant.id === variantTwo.id) {
+              expect(variant.inventory_quantity).toEqual(0)
+            } else {
+              throw new Error("Unexpected variant")
+            }
+          }
+
+          response = await api.get(
+            `/store/products?fields=+variants.inventory_quantity`,
+            { headers: { "x-publishable-api-key": pubKeyTwo.token } }
+          )
+
+          expect(response.status).toEqual(200)
+          for (const variant of response.data.products
+            .map((p) => p.variants)
+            .flat()) {
+            if (variant.id === variantOne.id) {
+              expect(variant.inventory_quantity).toEqual(23)
+            } else if (variant.id === variantTwo.id) {
+              expect(variant.inventory_quantity).toEqual(2)
+            } else {
+              throw new Error("Unexpected variant")
+            }
+          }
+        })
+
         it("should list all inventory items for a variant", async () => {
           let response = await api.get(
             `/store/products?sales_channel_id[]=${salesChannel1.id}&fields=variants.inventory_items.inventory.location_levels.*`,

integration-tests/http/__tests__/sales-channel/admin/sales-channel.spec.ts

@@ -3,16 +3,18 @@ import {
   adminHeaders,
   createAdminUser,
 } from "../../../../helpers/create-admin-user"
+import { Modules } from "@medusajs/framework/utils"
 
 jest.setTimeout(60000)
 
 medusaIntegrationTestRunner({
   testSuite: ({ dbConnection, getContainer, api }) => {
     let salesChannel1
     let salesChannel2
+    let container
 
     beforeEach(async () => {
-      const container = getContainer()
+      container = getContainer()
       await createAdminUser(dbConnection, adminHeaders, container)
 
       salesChannel1 = (
@@ -245,6 +247,34 @@ medusaIntegrationTestRunner({
     })
 
     describe("DELETE /admin/sales-channels/:id", () => {
+      it("should fail to delete the requested sales channel if it is used as a default sales channel", async () => {
+        const salesChannel = (
+          await api.post(
+            "/admin/sales-channels",
+            { name: "Test channel", description: "Test" },
+            adminHeaders
+          )
+        ).data.sales_channel
+
+        const storeModule = container.resolve(Modules.STORE)
+        await storeModule.createStores({
+          name: "New store",
+          supported_currencies: [
+            { currency_code: "usd", is_default: true },
+            { currency_code: "dkk" },
+          ],
+          default_sales_channel_id: salesChannel.id,
+        })
+
+        const errorResponse = await api
+          .delete(`/admin/sales-channels/${salesChannel.id}`, adminHeaders)
+          .catch((err) => err)
+
+        expect(errorResponse.response.data.message).toEqual(
+          `Cannot delete default sales channels: ${salesChannel.id}`
+        )
+      })
+
       it("should delete the requested sales channel", async () => {
         const toDelete = (
           await api.get(
@@ -268,17 +298,19 @@ medusaIntegrationTestRunner({
           object: "sales-channel",
         })
 
-        await api
+        const err = await api
           .get(
             `/admin/sales-channels/${salesChannel1.id}?fields=id,deleted_at`,
             adminHeaders
           )
           .catch((err) => {
-            expect(err.response.data.type).toEqual("not_found")
-            expect(err.response.data.message).toEqual(
-              `Sales channel with id: ${salesChannel1.id} not found`
-            )
+            return err
           })
+
+        expect(err.response.data.type).toEqual("not_found")
+        expect(err.response.data.message).toEqual(
+          `Sales channel with id: ${salesChannel1.id} not found`
+        )
       })
 
       it("should successfully delete channel associations", async () => {