diff --git a/packages/medusa/src/api/routes/admin/draft-orders/index.js b/packages/medusa/src/api/routes/admin/draft-orders/index.js index 4bdacfde84..10b9e65f30 100644 --- a/packages/medusa/src/api/routes/admin/draft-orders/index.js +++ b/packages/medusa/src/api/routes/admin/draft-orders/index.js @@ -49,8 +49,6 @@ export const defaultRelations = ["order", "cart"] export const defaultCartRelations = [ "region", "items", - "items.variant", - "items.variant.prices", "payment", "shipping_address", "billing_address", diff --git a/packages/medusa/src/api/routes/admin/gift-cards/update-gift-card.js b/packages/medusa/src/api/routes/admin/gift-cards/update-gift-card.js index eb28ec062d..6c90578dd2 100644 --- a/packages/medusa/src/api/routes/admin/gift-cards/update-gift-card.js +++ b/packages/medusa/src/api/routes/admin/gift-cards/update-gift-card.js @@ -1,5 +1,4 @@ import { MedusaError, Validator } from "medusa-core-utils" -import { defaultFields, defaultRelations } from "./" /** * @oas [post] /gift-cards/{id} diff --git a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js index 42b676dccb..5001ed0def 100644 --- a/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js +++ b/packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js @@ -17,20 +17,13 @@ const defaultRelations = [ "returns.items.reason", "gift_cards", "gift_card_transactions", - "items", - "items.variant", - "items.variant.product", "claims", "claims.return_order", "claims.shipping_methods", "claims.shipping_address", "claims.additional_items", - "claims.additional_items.variant", - "claims.additional_items.variant.product", "claims.fulfillments", "claims.claim_items", - "claims.claim_items.variant", - "claims.claim_items.variant.product", "claims.claim_items.images", "swaps", "swaps.return_order", @@ -69,7 +62,6 @@ const defaultFields = [ "total", "paid_total", "refundable_amount", - "no_notification", ] describe("GET /admin/orders", () => { diff --git a/packages/medusa/src/api/routes/admin/orders/index.js b/packages/medusa/src/api/routes/admin/orders/index.js index 1af7932c46..98e72e599c 100644 --- a/packages/medusa/src/api/routes/admin/orders/index.js +++ b/packages/medusa/src/api/routes/admin/orders/index.js @@ -191,20 +191,13 @@ export const defaultRelations = [ "returns.items.reason", "gift_cards", "gift_card_transactions", - "items", - "items.variant", - "items.variant.product", "claims", "claims.return_order", "claims.shipping_methods", "claims.shipping_address", "claims.additional_items", - "claims.additional_items.variant", - "claims.additional_items.variant.product", "claims.fulfillments", "claims.claim_items", - "claims.claim_items.variant", - "claims.claim_items.variant.product", "claims.claim_items.images", // "claims.claim_items.tags", "swaps", @@ -244,7 +237,6 @@ export const defaultFields = [ "total", "paid_total", "refundable_amount", - "no_notification", ] export const allowedFields = [ @@ -273,7 +265,6 @@ export const allowedFields = [ "total", "paid_total", "refundable_amount", - "no_notification", ] export const allowedRelations = [ diff --git a/packages/medusa/src/api/routes/admin/swaps/get-swap.js b/packages/medusa/src/api/routes/admin/swaps/get-swap.js index c395f4974e..114a641a69 100644 --- a/packages/medusa/src/api/routes/admin/swaps/get-swap.js +++ b/packages/medusa/src/api/routes/admin/swaps/get-swap.js @@ -11,9 +11,6 @@ export default async (req, res) => { "return_order", "fulfillments", "payment", - "items", - "items.variant", - "items.variant.product", "shipping_address", "shipping_methods", "cart", diff --git a/packages/medusa/src/api/routes/store/carts/index.js b/packages/medusa/src/api/routes/store/carts/index.js index ce5dfdf06b..42363bd12c 100644 --- a/packages/medusa/src/api/routes/store/carts/index.js +++ b/packages/medusa/src/api/routes/store/carts/index.js @@ -107,15 +107,13 @@ export const defaultRelations = [ "gift_cards", "region", "items", - "items.variant", - "items.variant.prices", "payment", "shipping_address", "billing_address", "region.countries", "region.payment_providers", - "payment_sessions", "shipping_methods", + "payment_sessions", "shipping_methods.shipping_option", "discounts", ] diff --git a/packages/medusa/src/api/routes/store/orders/index.js b/packages/medusa/src/api/routes/store/orders/index.js index 72e802c90e..4405a86ba7 100644 --- a/packages/medusa/src/api/routes/store/orders/index.js +++ b/packages/medusa/src/api/routes/store/orders/index.js @@ -33,7 +33,6 @@ export const defaultRelations = [ "items", "items.variant", "items.variant.product", - "items.variant.prices", "shipping_methods", "discounts", "customer", diff --git a/packages/medusa/yarn.lock b/packages/medusa/yarn.lock index 329b52b506..897f3496c4 100644 --- a/packages/medusa/yarn.lock +++ b/packages/medusa/yarn.lock @@ -1673,10 +1673,10 @@ babel-preset-jest@^25.5.0: babel-plugin-jest-hoist "^25.5.0" babel-preset-current-node-syntax "^0.1.2" -babel-preset-medusa-package@^1.1.8: - version "1.1.9" - resolved "https://registry.yarnpkg.com/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.9.tgz#4bd3f588e9d84d5888279a82dd69559965326cdc" - integrity sha512-U+5QM2N2kQ0Rxy8/8tUXzCbckrkju7E+bvPitFLctAR9V6RAWrJuZ11joZ+tE8upIkS1/b4uEbrVnoM0pq+nNA== +babel-preset-medusa-package@^1.1.5-next.0: + version "1.1.5-next.0" + resolved "https://registry.yarnpkg.com/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.5-next.0.tgz#3ab62092742ae4976f80e2d0f9ff887866d7f032" + integrity sha512-M+DDbIi2VLZdir+svQIpWhUACHTE/1Cx2aQ8zU/n+0kb29yxMVNWqZto9m4Uh3c9PkoSnZfOYpu1AG/5RPByjw== dependencies: "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-decorators" "^7.12.1" @@ -4545,28 +4545,28 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -medusa-core-utils@^1.1.14, medusa-core-utils@^1.1.15: - version "1.1.15" - resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.15.tgz#0fe98e1a451b5554b03421d241c973b67f00ff9b" - integrity sha512-sK1+Q0k68Rsz0XDAYLVDJ9hshQssMTxceUk+9umXxZgZlPhrPcHMMi8BwwrKOEaSk+nxmN38/h0XiHJ92Pts8g== +medusa-core-utils@^1.1.11-next.0, medusa-core-utils@^1.1.11-next.0+60da043: + version "1.1.11-next.0" + resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.11-next.0.tgz#c65ec751f48a3abf530bea598793fbbb96b84796" + integrity sha512-v4qqsRAOBvueJcKeMD8uL2Qb9dvR+qh3sDvW8C+1bpbnjuTbIq2D+d/xT+963mx3+e445XRoePjXNLltUcSicw== dependencies: joi "^17.3.0" joi-objectid "^3.0.1" -medusa-interfaces@^1.1.15: - version "1.1.16" - resolved "https://registry.yarnpkg.com/medusa-interfaces/-/medusa-interfaces-1.1.16.tgz#1b693759359faa2811966c9420f20f865591cf05" - integrity sha512-ghy4radBy1RIrkRThXIQ2q86htxPPnIFA1LMNyxViPKVZ+QPv350NNow6gSXsm6diTV5lWH0Bvl/hH6AbjA8vA== +medusa-interfaces@^1.1.12-next.0: + version "1.1.12-next.0" + resolved "https://registry.yarnpkg.com/medusa-interfaces/-/medusa-interfaces-1.1.12-next.0.tgz#12f0b6eb068c729b10a66b693462e765a7661954" + integrity sha512-55CrFN4QHtUo32XQ88qKw1/CfqwikQxNnR2u05Xyyc63efoxlk6tlGg5o8PH74rA3kwQgmztjfG859GtwBRoOg== dependencies: - medusa-core-utils "^1.1.15" + medusa-core-utils "^1.1.11-next.0+60da043" -medusa-test-utils@^1.1.17: - version "1.1.18" - resolved "https://registry.yarnpkg.com/medusa-test-utils/-/medusa-test-utils-1.1.18.tgz#4660f1cbec47abf5f17fc9469bb7ec5543b93c85" - integrity sha512-M25eFBvxlBzKu4dHQFz2ijMqjQIYgG5eNIxo1NE+3CLrgRNl+nrG+LwUBE0ouVDa9fi1TMSXXeTD17/7o7UOAA== +medusa-test-utils@^1.1.14-next.0: + version "1.1.14-next.0" + resolved "https://registry.yarnpkg.com/medusa-test-utils/-/medusa-test-utils-1.1.14-next.0.tgz#29a85e7f08da811e3f2c735de5a906522de23948" + integrity sha512-NMUP7d1HH91piXLZGeF6ifEiyI4cA8jp7OTrD8+i/miS0HwilGxsXxqfzolzgsB/2AWiDrLdWg+pFF8JREQT2Q== dependencies: "@babel/plugin-transform-classes" "^7.9.5" - medusa-core-utils "^1.1.15" + medusa-core-utils "^1.1.11-next.0+60da043" randomatic "^3.1.1" merge-descriptors@1.0.1: