Merge branch 'master' into develop

packages/medusa/src/api/routes/admin/orders/create-claim.ts

@@ -157,14 +157,7 @@ export default async (req, res) => {
                 await claimService.withTransaction(manager).create({
                   idempotency_key: idempotencyKey.idempotency_key,
                   order,
-                  type: value.type,
-                  shipping_address: value.shipping_address,
-                  claim_items: value.claim_items,
-                  return_shipping: value.return_shipping,
-                  additional_items: value.additional_items,
-                  shipping_methods: value.shipping_methods,
-                  no_notification: value.no_notification,
-                  metadata: value.metadata,
+                  ...value,
                 })
 
                 return {

packages/medusa/src/services/order.ts

@@ -17,14 +17,14 @@ import {
   PaymentStatus,
   Return,
   Swap,
-  TrackingLink
+  TrackingLink,
 } from "../models"
 import { AddressRepository } from "../repositories/address"
 import { OrderRepository } from "../repositories/order"
 import { FindConfig, QuerySelector, Selector } from "../types/common"
 import {
   CreateFulfillmentOrder,
-  FulFillmentItemType
+  FulFillmentItemType,
 } from "../types/fulfillment"
 import { UpdateOrderInput } from "../types/orders"
 import { CreateShippingMethodDto } from "../types/shipping-options"
@@ -48,7 +48,7 @@ import {
   ShippingOptionService,
   ShippingProfileService,
   TaxProviderService,
-  TotalsService
+  TotalsService,
 } from "."
 
 export const ORDER_CART_ALREADY_EXISTS_ERROR = "Order from cart already exists"
@@ -322,7 +322,7 @@ class OrderService extends TransactionBaseService {
       select = select.filter((v) => !totalFields.includes(v))
     }
 
-    const toSelect = select
+    const toSelect = [...select]
     if (toSelect.length > 0 && toSelect.indexOf("tax_rate") === -1) {
       toSelect.push("tax_rate")
     }

packages/medusa/src/utils/get-query-config.ts

@@ -39,7 +39,7 @@ export function getRetrieveConfig<TModel extends BaseEntity>(
 
   return {
     select: includeFields.length ? includeFields : defaultFields,
-    relations: expandFields.length ? expandFields : defaultRelations,
+    relations: isDefined(expand) ? expandFields : defaultRelations,
   }
 }
 
@@ -74,7 +74,7 @@ export function getListConfig<TModel extends BaseEntity>(
 
   return {
     select: includeFields.length ? includeFields : defaultFields,
-    relations: expandFields.length ? expandFields : defaultRelations,
+    relations: isDefined(expand) ? expandFields : defaultRelations,
     skip: offset,
     take: limit,
     order: orderBy,
@@ -88,13 +88,13 @@ export function prepareListQuery<
   const { order, fields, expand, limit, offset } = validated
 
   let expandRelations: string[] | undefined = undefined
-  if (expand) {
-    expandRelations = expand.split(",")
+  if (isDefined(expand)) {
+    expandRelations = expand.split(",").filter((v) => v)
   }
 
   let expandFields: (keyof TEntity)[] | undefined = undefined
-  if (fields) {
-    expandFields = fields.split(",") as (keyof TEntity)[]
+  if (isDefined(fields)) {
+    expandFields = (fields.split(",") as (keyof TEntity)[]).filter((v) => v)
   }
 
   if (expandFields?.length && queryConfig?.allowedFields?.length) {
@@ -144,14 +144,14 @@ export function prepareRetrieveQuery<
 >(validated: T, queryConfig?: QueryConfig<TEntity>) {
   const { fields, expand } = validated
 
-  let expandRelations: string[] = []
-  if (expand) {
-    expandRelations = expand.split(",")
+  let expandRelations: string[] | undefined = undefined
+  if (isDefined(expand)) {
+    expandRelations = expand.split(",").filter((v) => v)
   }
 
   let expandFields: (keyof TEntity)[] | undefined = undefined
-  if (fields) {
-    expandFields = fields.split(",") as (keyof TEntity)[]
+  if (isDefined(fields)) {
+    expandFields = (fields.split(",") as (keyof TEntity)[]).filter((v) => v)
   }
 
   if (expandFields?.length && queryConfig?.allowedFields?.length) {