Merge branch 'develop' into feat/show-db-error-message

.changeset/big-chefs-dream.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/pricing": patch
+"@medusajs/product": patch
+---
+
+feat(product, pricing, utils): Transaction issues and reference issues + refactoring

.changeset/breezy-suns-marry.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+fix(admin-ui): Fixes an issue where using the bulk editor with comma as the decimal separator would convert the input to NaN

.github/actions/setup-server/action.yml

@@ -5,7 +5,7 @@ inputs:
   node-version:
     description: "Node version"
     required: false
-    default: "16.20.2"
+    default: "16.10.0"
   cache-extension:
     description: "Extension for fetching cached dependencies"
     required: true

.github/workflows/action.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Assert changed
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Assert changed
@@ -171,7 +171,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies
@@ -223,7 +223,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies
@@ -275,7 +275,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/codegen-test.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/docs-freshness-check.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/docs-new-announcement.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/docs-remove-announcement.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/generate-references.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies
@@ -89,7 +89,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/oas-test.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

.github/workflows/release-notifications.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Post to Slack channel

integration-tests/environment-helpers/bootstrap-app.js

@@ -54,6 +54,7 @@ module.exports = {
 
     const shutdown = async () => {
       await Promise.all([
+        container.dispose(),
         expressServer.close(),
         db?.destroy(),
         pgConnection?.context?.destroy(),

integration-tests/plugins/__tests__/product/admin/create-product.ts

@@ -22,7 +22,7 @@ const env = {
   MEDUSA_FF_ISOLATE_PRODUCT_DOMAIN: true,
 }
 
-describe.skip("[Product & Pricing Module] POST /admin/products", () => {
+describe("[Product & Pricing Module] POST /admin/products", () => {
   let dbConnection
   let appContainer
   let shutdownServer

integration-tests/plugins/__tests__/product/admin/update-product-variant.spec.ts

@@ -26,7 +26,7 @@ const env = {
   MEDUSA_FF_ISOLATE_PRODUCT_DOMAIN: true,
 }
 
-describe.skip("[Product & Pricing Module] POST /admin/products/:id/variants/:id", () => {
+describe("[Product & Pricing Module] POST /admin/products/:id/variants/:id", () => {
   let dbConnection
   let appContainer
   let shutdownServer

integration-tests/plugins/__tests__/product/admin/update-product.spec.ts

@@ -24,7 +24,7 @@ const env = {
   MEDUSA_FF_ISOLATE_PRODUCT_DOMAIN: true,
 }
 
-describe.skip("[Product & Pricing Module] POST /admin/products/:id", () => {
+describe("[Product & Pricing Module] POST /admin/products/:id", () => {
   let dbConnection
   let appContainer
   let shutdownServer
@@ -172,9 +172,7 @@ describe.skip("[Product & Pricing Module] POST /admin/products/:id", () => {
       ],
     }
 
-    console.log("I am here first")
     await api.post(`/admin/products/${product.id}`, data, adminHeaders)
-    console.log("I am here")
 
     const response = await api.get(
       `/admin/products/${product.id}`,

integration-tests/plugins/__tests__/workflows/product/update-product.ts

@@ -12,7 +12,7 @@ import { getContainer } from "../../../../environment-helpers/use-container"
 import { initDb, useDb } from "../../../../environment-helpers/use-db"
 import { simpleProductFactory } from "../../../../factories"
 
-jest.setTimeout(30000)
+jest.setTimeout(100000)
 
 describe("UpdateProduct workflow", function () {
   let dbConnection

integration-tests/plugins/jest.config.js

@@ -9,7 +9,7 @@ module.exports = {
     `/www/`,
     `/dist/`,
     `/node_modules/`,
-    "<rootDir>/node_modules",
+    `<rootDir>/node_modules/`,
     `__tests__/fixtures`,
     `__testfixtures__`,
     `.cache`,

integration-tests/plugins/package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "test:integration": "node --expose-gc ./../../node_modules/.bin/jest --silent=false --runInBand --bail --logHeapUsage --forceExit",
+    "test:integration": "node --expose-gc ./../../node_modules/.bin/jest --silent=false --runInBand --bail --detectOpenHandles --logHeapUsage --clearMocks --no-compilation-cache --forceExit",
     "build": "babel src -d dist --extensions \".ts,.js\""
   },
   "dependencies": {

packages/admin-ui/ui/src/domain/pricing/forms/price-list-product-prices-form/price-list-product-prices-form.tsx

@@ -1511,7 +1511,7 @@ const PriceListProductPricesForm = ({
           ref={tableRef}
         >
           <thead>
-            <tr className="[&_th]:txt-compact-small-plus text-ui-fg-subtle [&_th]:border-ui-border-base h-10 [&_th]:min-w-[220px] [&_th]:border-r [&_th]:border-b [&_th:last-of-type]:border-r-0">
+            <tr className="[&_th]:txt-compact-small-plus text-ui-fg-subtle [&_th]:border-ui-border-base h-10 [&_th:last-of-type]:border-r-0 [&_th]:min-w-[220px] [&_th]:border-b [&_th]:border-r">
               <th className="max-w-[220px] text-left">
                 <div className="px-4 py-2.5">
                   {t(
@@ -1586,7 +1586,7 @@ const PriceListProductPricesForm = ({
             </tr>
           </thead>
           <tbody>
-            <tr className="bg-ui-bg-subtle h-10 [&_td:last-of-type]:border-r-0 [&_td]:border-r [&_td]:border-b">
+            <tr className="bg-ui-bg-subtle h-10 [&_td:last-of-type]:border-r-0 [&_td]:border-b [&_td]:border-r">
               <td className="w-[220px] max-w-[220px]">
                 <div className="grid w-[220px] grid-cols-[16px_1fr] gap-x-3 overflow-hidden px-4 py-2.5">
                   <div className="bg-ui-bg-component h-[22px] w-4 rounded-[4px]">
@@ -1828,7 +1828,7 @@ const Cell = React.forwardRef<HTMLInputElement, CellProps>(
          */
         const formattedValue = strippedValue
           ? formatValue({
-              value: strippedValue,
+              value: strippedValue.replace(/,/g, "."), // If the current locale uses commas as decimal separators, then we need to replace them with dots.
               decimalScale: decimalScale ?? 0,
               disableGroupSeparators: true,
             })
@@ -2138,7 +2138,7 @@ const Cell = React.forwardRef<HTMLInputElement, CellProps>(
         {borders.bottom && borders.right && (
           <div
             onMouseDown={onDragToFillStart}
-            className="bg-ui-bg-interactive absolute -right-1 -bottom-1 z-50 h-2 w-2 cursor-crosshair rounded-full"
+            className="bg-ui-bg-interactive absolute -bottom-1 -right-1 z-50 h-2 w-2 cursor-crosshair rounded-full"
           />
         )}
       </td>

packages/medusa/oas/admin.oas.base.yaml

@@ -233,6 +233,7 @@ tags:
       description: How to manage users
       url: https://docs.medusajs.com/modules/users/admin/manage-users
 servers:
+  - url: http://localhost:9000
   - url: https://api.medusa-commerce.com
 paths: { }
 components:

packages/medusa/oas/store.oas.base.yaml

@@ -109,6 +109,7 @@ tags:
       description: How to create a swap in a storefront
       url: https://docs.medusajs.com/modules/orders/storefront/create-swap
 servers:
+  - url: http://localhost:9000
   - url: https://api.medusa-commerce.com
 paths: { }
 components:

packages/medusa/src/api/routes/admin/publishable-api-keys/update-publishable-api-key.ts

@@ -5,7 +5,7 @@ import { EntityManager } from "typeorm"
 import PublishableApiKeyService from "../../../../services/publishable-api-key"
 
 /**
- * @oas [post] /admin/publishable-api-key/{id}
+ * @oas [post] /admin/publishable-api-keys/{id}
  * operationId: "PostPublishableApiKysPublishableApiKey"
  * summary: "Update Publishable API Key"
  * description: "Update a Publishable API Key's details."

packages/pricing/src/repositories/pricing.ts

@@ -27,7 +27,7 @@ export class PricingRepository
     pricingContext: PricingContext = { context: {} },
     sharedContext: Context = {}
   ): Promise<CalculatedPriceSetDTO[]> {
-    const manager = this.getActiveManager<SqlEntityManager>()
+    const manager = this.getActiveManager<SqlEntityManager>(sharedContext)
     const knex = manager.getKnex()
     const context = pricingContext.context || {}
 

packages/pricing/src/services/currency.ts

@@ -9,8 +9,6 @@ import {
 import { Currency } from "@models"
 import { CurrencyRepository } from "@repositories"
 
-import { doNotForceTransaction, shouldForceTransaction } from "@medusajs/utils"
-
 type InjectedDependencies = {
   currencyRepository: DAL.RepositoryService
 }
@@ -75,7 +73,7 @@ export default class CurrencyService<TEntity extends Currency = Currency> {
     return queryOptions
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "currencyRepository_")
+  @InjectTransactionManager("currencyRepository_")
   async create(
     data: PricingTypes.CreateCurrencyDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -86,7 +84,7 @@ export default class CurrencyService<TEntity extends Currency = Currency> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "currencyRepository_")
+  @InjectTransactionManager("currencyRepository_")
   async update(
     data: PricingTypes.UpdateCurrencyDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -97,7 +95,7 @@ export default class CurrencyService<TEntity extends Currency = Currency> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(doNotForceTransaction, "currencyRepository_")
+  @InjectTransactionManager("currencyRepository_")
   async delete(
     ids: string[],
     @MedusaContext() sharedContext: Context = {}

packages/pricing/src/services/money-amount.ts

@@ -9,8 +9,6 @@ import {
 import { MoneyAmount } from "@models"
 import { MoneyAmountRepository } from "@repositories"
 
-import { doNotForceTransaction, shouldForceTransaction } from "@medusajs/utils"
-
 type InjectedDependencies = {
   moneyAmountRepository: DAL.RepositoryService
 }
@@ -73,7 +71,7 @@ export default class MoneyAmountService<
     )) as [TEntity[], number]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "moneyAmountRepository_")
+  @InjectTransactionManager("moneyAmountRepository_")
   async create(
     data: PricingTypes.CreateMoneyAmountDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -84,7 +82,7 @@ export default class MoneyAmountService<
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "moneyAmountRepository_")
+  @InjectTransactionManager("moneyAmountRepository_")
   async update(
     data: PricingTypes.UpdateMoneyAmountDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -95,7 +93,7 @@ export default class MoneyAmountService<
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(doNotForceTransaction, "moneyAmountRepository_")
+  @InjectTransactionManager("moneyAmountRepository_")
   async delete(
     ids: string[],
     @MedusaContext() sharedContext: Context = {}

packages/pricing/src/services/price-rule.ts

@@ -4,9 +4,7 @@ import {
   InjectTransactionManager,
   MedusaContext,
   ModulesSdkUtils,
-  doNotForceTransaction,
   retrieveEntity,
-  shouldForceTransaction,
 } from "@medusajs/utils"
 import { PriceRule } from "@models"
 import { PriceRuleRepository } from "@repositories"
@@ -65,7 +63,7 @@ export default class PriceRuleService<TEntity extends PriceRule = PriceRule> {
     )) as [TEntity[], number]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "priceRuleRepository_")
+  @InjectTransactionManager("priceRuleRepository_")
   async create(
     data: PricingTypes.CreatePriceRuleDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -76,7 +74,7 @@ export default class PriceRuleService<TEntity extends PriceRule = PriceRule> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "priceRuleRepository_")
+  @InjectTransactionManager("priceRuleRepository_")
   async update(
     data: PricingTypes.UpdatePriceRuleDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -87,7 +85,7 @@ export default class PriceRuleService<TEntity extends PriceRule = PriceRule> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(doNotForceTransaction, "priceRuleRepository_")
+  @InjectTransactionManager("priceRuleRepository_")
   async delete(
     ids: string[],
     @MedusaContext() sharedContext: Context = {}