chore: merge develop

packages/medusa/CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.17](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.16...@medusajs/medusa@1.1.17) (2021-03-30)
+
+
+### Bug Fixes
+
+* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
+
+
+
+
+
+## [1.1.16](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.16...@medusajs/medusa@1.1.16) (2021-03-30)
+
+
+### Bug Fixes
+
+* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
+
+
+
+
+
+## [1.1.15](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.16...@medusajs/medusa@1.1.15) (2021-03-30)
+
+
+### Bug Fixes
+
+* publish assist ([7719957](https://github.com/medusajs/medusa/commit/7719957b44a0c0d950eff948faf31188fe0e3ef1))
+
+
+
+
+
+## [1.1.16](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.15...@medusajs/medusa@1.1.16) (2021-03-26)
+
+**Note:** Version bump only for package @medusajs/medusa
+
+
+
+
+
+## [1.1.15](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.14...@medusajs/medusa@1.1.15) (2021-03-18)
+
+**Note:** Version bump only for package @medusajs/medusa
+
+
+
+
+
 ## [1.1.14](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.13...@medusajs/medusa@1.1.14) (2021-03-17)
 
 

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.1.14",
+  "version": "1.1.17",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "repository": {
@@ -67,8 +67,8 @@
     "joi": "^17.3.0",
     "joi-objectid": "^3.0.1",
     "jsonwebtoken": "^8.5.1",
-    "medusa-core-utils": "^1.1.3",
-    "medusa-test-utils": "^1.1.6",
+    "medusa-core-utils": "^1.1.4",
+    "medusa-test-utils": "^1.1.7",
     "morgan": "^1.9.1",
     "multer": "^1.4.2",
     "passport": "^0.4.0",
@@ -86,5 +86,5 @@
     "uuid": "^8.3.1",
     "winston": "^3.2.1"
   },
-  "gitHead": "8c87f25f766154368b0f15424028550966f7d3d6"
+  "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
 }

packages/medusa/src/api/routes/admin/discounts/__tests__/add-region.js

@@ -35,6 +35,7 @@ describe("POST /admin/discounts/:discount_id/regions/:region_id", () => {
             "id",
             "code",
             "is_dynamic",
+            "is_disabled",
             "rule_id",
             "parent_discount_id",
             "starts_at",

packages/medusa/src/api/routes/admin/discounts/__tests__/add-valid-product.js

@@ -35,6 +35,7 @@ describe("POST /admin/discounts/:discount_id/variants/:variant_id", () => {
             "id",
             "code",
             "is_dynamic",
+            "is_disabled",
             "rule_id",
             "parent_discount_id",
             "starts_at",

packages/medusa/src/api/routes/admin/discounts/__tests__/get-discount.js

@@ -6,6 +6,7 @@ const defaultFields = [
   "id",
   "code",
   "is_dynamic",
+  "is_disabled",
   "rule_id",
   "parent_discount_id",
   "starts_at",

packages/medusa/src/api/routes/admin/discounts/__tests__/remove-region.js

@@ -6,6 +6,7 @@ const defaultFields = [
   "id",
   "code",
   "is_dynamic",
+  "is_disabled",
   "rule_id",
   "parent_discount_id",
   "starts_at",

packages/medusa/src/api/routes/admin/discounts/__tests__/remove-valid-product.js

@@ -6,6 +6,7 @@ const defaultFields = [
   "id",
   "code",
   "is_dynamic",
+  "is_disabled",
   "rule_id",
   "parent_discount_id",
   "starts_at",

packages/medusa/src/api/routes/admin/discounts/index.js

@@ -59,6 +59,7 @@ export const defaultFields = [
   "id",
   "code",
   "is_dynamic",
+  "is_disabled",
   "rule_id",
   "parent_discount_id",
   "starts_at",

packages/medusa/src/services/claim-item.js

@@ -83,11 +83,12 @@ class ClaimItemService extends BaseService {
         )
       }
 
-      if (tags) {
+      let tagsToAdd = []
+      if (tags && tags.length) {
         const claimTagRepo = manager.getCustomRepository(
           this.claimTagRepository_
         )
-        const tagsToAdd = await Promise.all(
+        tagsToAdd = await Promise.all(
           tags.map(async t => {
             const normalized = t.trim().toLowerCase()
             const existing = await claimTagRepo.findOne({
@@ -96,18 +97,20 @@ class ClaimItemService extends BaseService {
             if (existing) {
               return existing
             }
-
             return claimTagRepo.create({ value: normalized })
           })
         )
       }
 
-      const claimImgRepo = manager.getCustomRepository(
-        this.claimImageRepository_
-      )
-      const imagesToAdd = images.map(url => {
-        return claimImgRepo.create({ url })
-      })
+      let imagesToAdd = []
+      if (images && images.length) {
+        const claimImgRepo = manager.getCustomRepository(
+          this.claimImageRepository_
+        )
+        imagesToAdd = images.map(url => {
+          return claimImgRepo.create({ url })
+        })
+      }
 
       const created = ciRepo.create({
         ...rest,