From 5e9d86d75d1f2745c24a4bcd4a5c0df066578ef5 Mon Sep 17 00:00:00 2001 From: Harminder Virk Date: Fri, 3 Jan 2025 14:16:23 +0530 Subject: [PATCH] feat: deprecate remoteQueryConfig in favor of queryConfig (#10773) Fixes: FRMW-2783 --- .changeset/nice-teachers-design.md | 7 +++++++ .../src/http/__tests__/validate-query.spec.ts | 6 +++--- .../http/middlewares/apply-default-filters.ts | 5 +---- packages/core/framework/src/http/types.ts | 21 ++++++++++++++----- .../src/http/utils/refetch-entities.ts | 2 +- .../src/http/utils/validate-query.ts | 3 ++- packages/core/types/src/common/common.ts | 2 +- .../api/admin/api-keys/[id]/revoke/route.ts | 2 +- .../src/api/admin/api-keys/[id]/route.ts | 4 ++-- .../api-keys/[id]/sales-channels/route.ts | 2 +- .../medusa/src/api/admin/api-keys/route.ts | 4 ++-- .../admin/campaigns/[id]/promotions/route.ts | 2 +- .../src/api/admin/campaigns/[id]/route.ts | 4 ++-- .../medusa/src/api/admin/campaigns/route.ts | 6 +++--- .../[id]/claim-items/[action_id]/route.ts | 4 ++-- .../admin/claims/[id]/claim-items/route.ts | 2 +- .../shipping-method/[action_id]/route.ts | 2 +- .../[id]/outbound/items/[action_id]/route.ts | 4 ++-- .../admin/claims/[id]/outbound/items/route.ts | 2 +- .../shipping-method/[action_id]/route.ts | 4 ++-- .../[id]/outbound/shipping-method/route.ts | 2 +- .../api/admin/claims/[id]/request/route.ts | 2 +- .../medusa/src/api/admin/claims/[id]/route.ts | 2 +- packages/medusa/src/api/admin/claims/route.ts | 6 +++--- .../admin/collections/[id]/products/route.ts | 2 +- .../src/api/admin/collections/[id]/route.ts | 4 ++-- .../medusa/src/api/admin/collections/route.ts | 6 +++--- .../src/api/admin/currencies/[code]/route.ts | 2 +- .../medusa/src/api/admin/currencies/route.ts | 4 ++-- .../customer-groups/[id]/customers/route.ts | 2 +- .../api/admin/customer-groups/[id]/route.ts | 4 ++-- .../src/api/admin/customer-groups/route.ts | 6 +++--- .../[id]/addresses/[address_id]/route.ts | 6 +++--- .../admin/customers/[id]/addresses/route.ts | 6 +++--- .../customers/[id]/customer-groups/route.ts | 6 +----- .../src/api/admin/customers/[id]/route.ts | 4 ++-- .../medusa/src/api/admin/customers/route.ts | 6 +++--- .../src/api/admin/draft-orders/route.ts | 6 +++--- .../shipping-method/[action_id]/route.ts | 2 +- .../[id]/outbound/items/[action_id]/route.ts | 4 ++-- .../exchanges/[id]/outbound/items/route.ts | 2 +- .../shipping-method/[action_id]/route.ts | 4 ++-- .../[id]/outbound/shipping-method/route.ts | 2 +- .../api/admin/exchanges/[id]/request/route.ts | 2 +- .../src/api/admin/exchanges/[id]/route.ts | 2 +- .../medusa/src/api/admin/exchanges/route.ts | 6 +++--- .../api/admin/fulfillment-providers/route.ts | 4 ++-- .../[id]/service-zones/[zone_id]/route.ts | 4 ++-- .../[id]/service-zones/route.ts | 2 +- .../admin/fulfillments/[id]/cancel/route.ts | 2 +- .../admin/fulfillments/[id]/shipment/route.ts | 2 +- .../src/api/admin/fulfillments/route.ts | 2 +- .../location-levels/[location_id]/route.ts | 4 ++-- .../[id]/location-levels/route.ts | 6 +++--- .../api/admin/inventory-items/[id]/route.ts | 4 ++-- .../src/api/admin/inventory-items/route.ts | 6 +++--- .../api/admin/invites/[id]/resend/route.ts | 2 +- .../src/api/admin/invites/[id]/route.ts | 6 +----- .../medusa/src/api/admin/invites/route.ts | 6 +++--- .../src/api/admin/notifications/[id]/route.ts | 2 +- .../src/api/admin/notifications/route.ts | 4 ++-- .../api/admin/orders/[id]/archive/route.ts | 2 +- .../src/api/admin/orders/[id]/cancel/route.ts | 2 +- .../api/admin/orders/[id]/changes/route.ts | 2 +- .../api/admin/orders/[id]/complete/route.ts | 2 +- .../[fulfillment_id]/cancel/route.ts | 2 +- .../mark-as-delivered/route.ts | 2 +- .../[fulfillment_id]/shipments/route.ts | 2 +- .../admin/orders/[id]/fulfillments/route.ts | 2 +- .../api/admin/orders/[id]/line-items/route.ts | 4 +--- .../medusa/src/api/admin/orders/[id]/route.ts | 4 ++-- .../orders/[id]/transfer/cancel/route.ts | 2 +- .../api/admin/orders/[id]/transfer/route.ts | 2 +- packages/medusa/src/api/admin/orders/route.ts | 4 ++-- .../[id]/mark-as-paid/route.ts | 2 +- .../api/admin/payment-collections/route.ts | 2 +- .../api/admin/payments/[id]/capture/route.ts | 6 +----- .../api/admin/payments/[id]/refund/route.ts | 6 +----- .../src/api/admin/payments/[id]/route.ts | 2 +- .../admin/payments/payment-providers/route.ts | 4 ++-- .../medusa/src/api/admin/payments/route.ts | 4 ++-- .../admin/price-lists/[id]/products/route.ts | 6 +----- .../src/api/admin/price-lists/[id]/route.ts | 8 ++----- .../medusa/src/api/admin/price-lists/route.ts | 6 +++--- .../api/admin/price-preferences/[id]/route.ts | 4 ++-- .../src/api/admin/price-preferences/route.ts | 6 +++--- .../product-categories/[id]/products/route.ts | 2 +- .../admin/product-categories/[id]/route.ts | 4 ++-- .../src/api/admin/product-categories/route.ts | 6 +++--- .../src/api/admin/product-tags/[id]/route.ts | 4 ++-- .../src/api/admin/product-tags/route.ts | 6 +++--- .../src/api/admin/product-types/[id]/route.ts | 4 ++-- .../src/api/admin/product-types/route.ts | 6 +++--- .../src/api/admin/product-variants/route.ts | 8 +++---- .../[id]/options/[option_id]/route.ts | 6 +++--- .../api/admin/products/[id]/options/route.ts | 6 +++--- .../src/api/admin/products/[id]/route.ts | 4 ++-- .../[inventory_item_id]/route.ts | 4 ++-- .../[variant_id]/inventory-items/route.ts | 2 +- .../[id]/variants/[variant_id]/route.ts | 6 +++--- .../products/[id]/variants/batch/route.ts | 2 +- .../api/admin/products/[id]/variants/route.ts | 10 ++++----- .../src/api/admin/products/batch/route.ts | 2 +- .../src/api/admin/products/export/route.ts | 2 +- .../medusa/src/api/admin/products/route.ts | 6 +++--- .../promotions/[id]/[rule_type]/route.ts | 2 +- .../promotions/[id]/buy-rules/batch/route.ts | 2 +- .../src/api/admin/promotions/[id]/route.ts | 4 ++-- .../promotions/[id]/rules/batch/route.ts | 2 +- .../[id]/target-rules/batch/route.ts | 2 +- .../medusa/src/api/admin/promotions/route.ts | 6 +++--- .../[rule_type]/[rule_attribute_id]/route.ts | 2 +- .../api/admin/refund-reasons/[id]/route.ts | 4 ++-- .../src/api/admin/refund-reasons/route.ts | 6 +++--- .../src/api/admin/regions/[id]/route.ts | 4 ++-- .../medusa/src/api/admin/regions/route.ts | 6 +++--- .../src/api/admin/reservations/[id]/route.ts | 4 ++-- .../src/api/admin/reservations/route.ts | 6 +++--- .../api/admin/return-reasons/[id]/route.ts | 4 ++-- .../src/api/admin/return-reasons/route.ts | 6 +++--- .../[id]/dismiss-items/[action_id]/route.ts | 4 ++-- .../admin/returns/[id]/dismiss-items/route.ts | 2 +- .../[id]/receive-items/[action_id]/route.ts | 4 ++-- .../admin/returns/[id]/receive-items/route.ts | 2 +- .../returns/[id]/receive/confirm/route.ts | 2 +- .../api/admin/returns/[id]/receive/route.ts | 2 +- .../[id]/request-items/[action_id]/route.ts | 4 ++-- .../admin/returns/[id]/request-items/route.ts | 2 +- .../api/admin/returns/[id]/request/route.ts | 2 +- .../src/api/admin/returns/[id]/route.ts | 4 ++-- .../[id]/shipping-method/[action_id]/route.ts | 4 ++-- .../returns/[id]/shipping-method/route.ts | 2 +- .../medusa/src/api/admin/returns/route.ts | 6 +++--- .../sales-channels/[id]/products/route.ts | 2 +- .../api/admin/sales-channels/[id]/route.ts | 4 ++-- .../src/api/admin/sales-channels/route.ts | 6 +++--- .../api/admin/shipping-options/[id]/route.ts | 4 ++-- .../[id]/rules/batch/route.ts | 2 +- .../src/api/admin/shipping-options/route.ts | 6 +++--- .../api/admin/shipping-profiles/[id]/route.ts | 4 ++-- .../src/api/admin/shipping-profiles/route.ts | 6 +++--- .../[id]/fulfillment-providers/route.ts | 2 +- .../[id]/fulfillment-sets/route.ts | 2 +- .../api/admin/stock-locations/[id]/route.ts | 4 ++-- .../[id]/sales-channels/route.ts | 2 +- .../src/api/admin/stock-locations/route.ts | 6 +++--- .../medusa/src/api/admin/stores/[id]/route.ts | 4 ++-- packages/medusa/src/api/admin/stores/route.ts | 4 ++-- .../src/api/admin/tax-rates/[id]/route.ts | 4 ++-- .../tax-rates/[id]/rules/[rule_id]/route.ts | 2 +- .../api/admin/tax-rates/[id]/rules/route.ts | 2 +- .../medusa/src/api/admin/tax-rates/route.ts | 6 +++--- .../src/api/admin/tax-regions/[id]/route.ts | 4 ++-- .../medusa/src/api/admin/tax-regions/route.ts | 6 +++--- .../src/api/admin/uploads/[id]/route.ts | 2 +- .../medusa/src/api/admin/users/[id]/route.ts | 4 ++-- .../medusa/src/api/admin/users/me/route.ts | 2 +- packages/medusa/src/api/admin/users/route.ts | 4 ++-- .../admin/workflows-executions/[id]/route.ts | 2 +- .../[workflow_id]/[transaction_id]/route.ts | 2 +- .../api/admin/workflows-executions/route.ts | 4 ++-- .../api/store/carts/[id]/complete/route.ts | 4 ++-- .../api/store/carts/[id]/customer/route.ts | 2 +- .../carts/[id]/line-items/[line_id]/route.ts | 4 ++-- .../api/store/carts/[id]/line-items/route.ts | 2 +- .../api/store/carts/[id]/promotions/route.ts | 4 ++-- .../medusa/src/api/store/carts/[id]/route.ts | 4 ++-- .../carts/[id]/shipping-methods/route.ts | 2 +- .../src/api/store/carts/[id]/taxes/route.ts | 2 +- packages/medusa/src/api/store/carts/route.ts | 6 +----- .../src/api/store/collections/[id]/route.ts | 2 +- .../medusa/src/api/store/collections/route.ts | 4 ++-- .../src/api/store/currencies/[code]/route.ts | 2 +- .../medusa/src/api/store/currencies/route.ts | 4 ++-- .../me/addresses/[address_id]/route.ts | 14 +++---------- .../api/store/customers/me/addresses/route.ts | 6 +++--- .../src/api/store/customers/me/route.ts | 8 ++----- .../medusa/src/api/store/customers/route.ts | 2 +- .../medusa/src/api/store/orders/[id]/route.ts | 2 +- .../orders/[id]/transfer/accept/route.ts | 2 +- .../orders/[id]/transfer/cancel/route.ts | 2 +- .../orders/[id]/transfer/decline/route.ts | 2 +- .../orders/[id]/transfer/request/route.ts | 2 +- packages/medusa/src/api/store/orders/route.ts | 4 ++-- .../[id]/payment-sessions/route.ts | 2 +- .../api/store/payment-collections/route.ts | 8 ++----- .../src/api/store/payment-providers/route.ts | 4 ++-- .../store/product-categories/[id]/route.ts | 2 +- .../src/api/store/product-categories/route.ts | 4 ++-- .../src/api/store/products/[id]/route.ts | 6 +++--- .../medusa/src/api/store/products/route.ts | 8 +++---- .../src/api/store/regions/[id]/route.ts | 2 +- .../medusa/src/api/store/regions/route.ts | 4 ++-- .../api/store/return-reasons/[id]/route.ts | 2 +- .../src/api/store/return-reasons/route.ts | 4 ++-- .../shipping-options/[id]/calculate/route.ts | 2 +- .../products/normalize-data-for-context.ts | 4 ++-- .../products/set-pricing-context.ts | 2 +- .../middlewares/products/set-tax-context.ts | 2 +- packages/medusa/src/types/global.ts | 8 ++++++- 200 files changed, 375 insertions(+), 399 deletions(-) create mode 100644 .changeset/nice-teachers-design.md diff --git a/.changeset/nice-teachers-design.md b/.changeset/nice-teachers-design.md new file mode 100644 index 0000000000..b169eede49 --- /dev/null +++ b/.changeset/nice-teachers-design.md @@ -0,0 +1,7 @@ +--- +"@medusajs/medusa": patch +"@medusajs/framework": patch +"@medusajs/types": patch +--- + +feat: deprecate remoteQueryConfig in favor of queryConfig diff --git a/packages/core/framework/src/http/__tests__/validate-query.spec.ts b/packages/core/framework/src/http/__tests__/validate-query.spec.ts index b65e59727a..527fac2c7e 100644 --- a/packages/core/framework/src/http/__tests__/validate-query.spec.ts +++ b/packages/core/framework/src/http/__tests__/validate-query.spec.ts @@ -107,7 +107,7 @@ describe("validateAndTransformQuery", () => { ], order: transformedOrder, }) - expect(mockRequest.remoteQueryConfig).toEqual({ + expect(mockRequest.queryConfig).toEqual({ fields: [ "id", "created_at", @@ -387,7 +387,7 @@ describe("validateAndTransformQuery", () => { ], }) ) - expect(mockRequest.remoteQueryConfig).toEqual( + expect(mockRequest.queryConfig).toEqual( expect.objectContaining({ fields: [ "id", @@ -447,7 +447,7 @@ describe("validateAndTransformQuery", () => { relations: ["store"], }) ) - expect(mockRequest.remoteQueryConfig).toEqual( + expect(mockRequest.queryConfig).toEqual( expect.objectContaining({ fields: ["store.name", "id"], }) diff --git a/packages/core/framework/src/http/middlewares/apply-default-filters.ts b/packages/core/framework/src/http/middlewares/apply-default-filters.ts index 6cbbd0b688..6cea3b632c 100644 --- a/packages/core/framework/src/http/middlewares/apply-default-filters.ts +++ b/packages/core/framework/src/http/middlewares/apply-default-filters.ts @@ -15,10 +15,7 @@ export function applyDefaultFilters( // Currently we only need it to delete filter keys from the request filter object, but this could // be used for other purposes. If we can't find other purposes, we can refactor to accept an array // of strings to delete after filters have been applied. - valueToApply = filterValue( - req.filterableFields, - req.remoteQueryConfig.fields - ) + valueToApply = filterValue(req.filterableFields, req.queryConfig.fields) } // If the value to apply is an object, we add it to any existing filters thats already applied diff --git a/packages/core/framework/src/http/types.ts b/packages/core/framework/src/http/types.ts index 9596b7e1b4..987f610080 100644 --- a/packages/core/framework/src/http/types.ts +++ b/packages/core/framework/src/http/types.ts @@ -108,13 +108,20 @@ export interface MedusaRequest< * An object containing the select, relation to be used with medusa internal services */ retrieveConfig: FindConfig + /** * An object containing fields and variables to be used with the remoteQuery */ - remoteQueryConfig: { + queryConfig: { fields: string[] pagination: { order?: Record; skip: number; take?: number } } + + /** + * @deprecated. Instead use "req.queryConfig" + */ + remoteQueryConfig: MedusaRequest["queryConfig"] + /** * An object containing the fields that are filterable e.g `{ id: Any }` */ @@ -163,14 +170,18 @@ export interface PublishableKeyContext { sales_channel_ids: string[] } -export interface AuthenticatedMedusaRequest> - extends MedusaRequest { +export interface AuthenticatedMedusaRequest< + Body = unknown, + QueryFields = Record +> extends MedusaRequest { auth_context: AuthContext publishable_key_context?: PublishableKeyContext } -export interface MedusaStoreRequest> - extends MedusaRequest { +export interface MedusaStoreRequest< + Body = unknown, + QueryFields = Record +> extends MedusaRequest { auth_context?: AuthContext publishable_key_context: PublishableKeyContext } diff --git a/packages/core/framework/src/http/utils/refetch-entities.ts b/packages/core/framework/src/http/utils/refetch-entities.ts index e8b7e33e9c..d277addae5 100644 --- a/packages/core/framework/src/http/utils/refetch-entities.ts +++ b/packages/core/framework/src/http/utils/refetch-entities.ts @@ -11,7 +11,7 @@ export const refetchEntities = async ( idOrFilter: string | object, scope: MedusaContainer, fields: string[], - pagination?: MedusaRequest["remoteQueryConfig"]["pagination"] + pagination?: MedusaRequest["queryConfig"]["pagination"] ) => { const remoteQuery = scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const filters = isString(idOrFilter) ? { id: idOrFilter } : idOrFilter diff --git a/packages/core/framework/src/http/utils/validate-query.ts b/packages/core/framework/src/http/utils/validate-query.ts index a7ea3a3096..726e88eaf4 100644 --- a/packages/core/framework/src/http/utils/validate-query.ts +++ b/packages/core/framework/src/http/utils/validate-query.ts @@ -90,7 +90,8 @@ export function validateAndTransformQuery( req.validatedQuery = validated req.filterableFields = getFilterableFields(req.validatedQuery) - req.remoteQueryConfig = cnf.remoteQueryConfig as any + req.queryConfig = cnf.remoteQueryConfig as any + req.remoteQueryConfig = req.queryConfig req.listConfig = (cnf as any).listConfig req.retrieveConfig = (cnf as any).retrieveConfig diff --git a/packages/core/types/src/common/common.ts b/packages/core/types/src/common/common.ts index 261482629c..0057b54373 100644 --- a/packages/core/types/src/common/common.ts +++ b/packages/core/types/src/common/common.ts @@ -443,7 +443,7 @@ export type QueryConfig = { defaultLimit?: number /** * If the route that will use that configuration is supposed to return a list of entities. This - * will change the configuration that will be created on req.listConfig and req.remoteQueryConfig (among + * will change the configuration that will be created on req.listConfig and req.queryConfig (among * other things it will include pagination and sorting) */ isList?: boolean diff --git a/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts b/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts index 065f9de5ff..ee45147314 100644 --- a/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts +++ b/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts @@ -24,7 +24,7 @@ export const POST = async ( const apiKey = await refetchApiKey( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ api_key: apiKey }) diff --git a/packages/medusa/src/api/admin/api-keys/[id]/route.ts b/packages/medusa/src/api/admin/api-keys/[id]/route.ts index 8ca110b46e..6cb01ad194 100644 --- a/packages/medusa/src/api/admin/api-keys/[id]/route.ts +++ b/packages/medusa/src/api/admin/api-keys/[id]/route.ts @@ -19,7 +19,7 @@ export const GET = async ( const apiKey = await refetchApiKey( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!apiKey) { @@ -46,7 +46,7 @@ export const POST = async ( const apiKey = await refetchApiKey( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ api_key: apiKey }) diff --git a/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts b/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts index 72e4056758..5b8af4d47e 100644 --- a/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts @@ -32,7 +32,7 @@ export const POST = async ( const updatedApiKey = await refetchApiKey( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ api_key: updatedApiKey }) diff --git a/packages/medusa/src/api/admin/api-keys/route.ts b/packages/medusa/src/api/admin/api-keys/route.ts index 1d399d93a4..2670b210fc 100644 --- a/packages/medusa/src/api/admin/api-keys/route.ts +++ b/packages/medusa/src/api/admin/api-keys/route.ts @@ -20,9 +20,9 @@ export const GET = async ( entryPoint: "api_key", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: apiKeys, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts b/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts index 8702dd836b..e5c34de356 100644 --- a/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts +++ b/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts @@ -20,7 +20,7 @@ export const POST = async ( const campaign = await refetchCampaign( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ campaign }) diff --git a/packages/medusa/src/api/admin/campaigns/[id]/route.ts b/packages/medusa/src/api/admin/campaigns/[id]/route.ts index 91f2c32f73..9c378da7bf 100644 --- a/packages/medusa/src/api/admin/campaigns/[id]/route.ts +++ b/packages/medusa/src/api/admin/campaigns/[id]/route.ts @@ -19,7 +19,7 @@ export const GET = async ( const campaign = await refetchCampaign( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!campaign) { @@ -62,7 +62,7 @@ export const POST = async ( const campaign = await refetchCampaign( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ campaign }) } diff --git a/packages/medusa/src/api/admin/campaigns/route.ts b/packages/medusa/src/api/admin/campaigns/route.ts index f72ba8e3c3..afd8ecc182 100644 --- a/packages/medusa/src/api/admin/campaigns/route.ts +++ b/packages/medusa/src/api/admin/campaigns/route.ts @@ -21,9 +21,9 @@ export const GET = async ( entryPoint: "campaign", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: campaigns, metadata } = await remoteQuery(query) @@ -54,7 +54,7 @@ export const POST = async ( const campaign = await refetchCampaign( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ campaign }) diff --git a/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts index e7b4940b0c..59d87e0d1e 100644 --- a/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts @@ -37,7 +37,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) @@ -73,7 +73,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts b/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts index 26f3dd1d85..6021f8f226 100644 --- a/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts @@ -30,7 +30,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts index 1c7277d536..ee2bc56a4c 100644 --- a/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts @@ -51,7 +51,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts index 45d0ae9873..12a3f8b23c 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts @@ -37,7 +37,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) @@ -72,7 +72,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts index d44f70b59c..0324d26ff2 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts @@ -31,7 +31,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts index 1e6fc9d752..18dd503927 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts @@ -37,7 +37,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) @@ -73,7 +73,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts index 3b1ea6c1c0..75813ad471 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts @@ -30,7 +30,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/claims/[id]/request/route.ts b/packages/medusa/src/api/admin/claims/[id]/request/route.ts index 6b2e77b065..879eea4e04 100644 --- a/packages/medusa/src/api/admin/claims/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/request/route.ts @@ -36,7 +36,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderClaim] = await remoteQuery(queryObject, { diff --git a/packages/medusa/src/api/admin/claims/[id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/route.ts index 542c71edff..9fd5c72282 100644 --- a/packages/medusa/src/api/admin/claims/[id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/route.ts @@ -14,7 +14,7 @@ export const GET = async ( "order_claim", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!claim) { diff --git a/packages/medusa/src/api/admin/claims/route.ts b/packages/medusa/src/api/admin/claims/route.ts index e5f4c547a8..267f4e7010 100644 --- a/packages/medusa/src/api/admin/claims/route.ts +++ b/packages/medusa/src/api/admin/claims/route.ts @@ -24,9 +24,9 @@ export const GET = async ( filters: { ...req.filterableFields, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: claims, metadata } = await remoteQuery(queryObject) @@ -64,7 +64,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order, orderClaim] = await promiseAll([ diff --git a/packages/medusa/src/api/admin/collections/[id]/products/route.ts b/packages/medusa/src/api/admin/collections/[id]/products/route.ts index e0908ccf59..0c0645f7af 100644 --- a/packages/medusa/src/api/admin/collections/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/collections/[id]/products/route.ts @@ -25,7 +25,7 @@ export const POST = async ( const collection = await refetchCollection( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/collections/[id]/route.ts b/packages/medusa/src/api/admin/collections/[id]/route.ts index d4d44e2636..f898092b54 100644 --- a/packages/medusa/src/api/admin/collections/[id]/route.ts +++ b/packages/medusa/src/api/admin/collections/[id]/route.ts @@ -19,7 +19,7 @@ export const GET = async ( const collection = await refetchCollection( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ collection }) @@ -49,7 +49,7 @@ export const POST = async ( const collection = await refetchCollection( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ collection }) diff --git a/packages/medusa/src/api/admin/collections/route.ts b/packages/medusa/src/api/admin/collections/route.ts index 8384a70573..74e56708c9 100644 --- a/packages/medusa/src/api/admin/collections/route.ts +++ b/packages/medusa/src/api/admin/collections/route.ts @@ -22,9 +22,9 @@ export const GET = async ( entryPoint: "product_collection", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: collections, metadata } = await remoteQuery(query) @@ -54,7 +54,7 @@ export const POST = async ( const collection = await refetchCollection( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ collection }) diff --git a/packages/medusa/src/api/admin/currencies/[code]/route.ts b/packages/medusa/src/api/admin/currencies/[code]/route.ts index b6570f7dc5..c73620f27c 100644 --- a/packages/medusa/src/api/admin/currencies/[code]/route.ts +++ b/packages/medusa/src/api/admin/currencies/[code]/route.ts @@ -17,7 +17,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "currency", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [currency] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/currencies/route.ts b/packages/medusa/src/api/admin/currencies/route.ts index 9b02b63266..ed2bc1b9b7 100644 --- a/packages/medusa/src/api/admin/currencies/route.ts +++ b/packages/medusa/src/api/admin/currencies/route.ts @@ -15,9 +15,9 @@ export const GET = async ( entryPoint: "currency", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: currencies, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts b/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts index 4aa2ac47c0..dd23f91d45 100644 --- a/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const customerGroup = await refetchCustomerGroup( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer_group: customerGroup }) } diff --git a/packages/medusa/src/api/admin/customer-groups/[id]/route.ts b/packages/medusa/src/api/admin/customer-groups/[id]/route.ts index 9b09b95715..0cab744cf5 100644 --- a/packages/medusa/src/api/admin/customer-groups/[id]/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/[id]/route.ts @@ -19,7 +19,7 @@ export const GET = async ( const customerGroup = await refetchCustomerGroup( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!customerGroup) { @@ -58,7 +58,7 @@ export const POST = async ( const customerGroup = await refetchCustomerGroup( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer_group: customerGroup }) } diff --git a/packages/medusa/src/api/admin/customer-groups/route.ts b/packages/medusa/src/api/admin/customer-groups/route.ts index a92c1d8095..b1d8a28467 100644 --- a/packages/medusa/src/api/admin/customer-groups/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/route.ts @@ -21,9 +21,9 @@ export const GET = async ( entryPoint: "customer_group", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: customer_groups, metadata } = await remoteQuery(query) @@ -55,7 +55,7 @@ export const POST = async ( const customerGroup = await refetchCustomerGroup( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer_group: customerGroup }) diff --git a/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts b/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts index 308745b333..deb393b5b9 100644 --- a/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts @@ -25,7 +25,7 @@ export const GET = async ( variables: { filters: { id: req.params.address_id, customer_id: req.params.id }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [address] = await remoteQuery(queryObject) @@ -53,7 +53,7 @@ export const POST = async ( const customer = await refetchCustomer( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer }) @@ -73,7 +73,7 @@ export const DELETE = async ( const customer = await refetchCustomer( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts b/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts index 8f22e19afe..ae03da2aa4 100644 --- a/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts @@ -22,9 +22,9 @@ export const GET = async ( entryPoint: "customer_address", variables: { filters: { ...req.filterableFields, customer_id: customerId }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: addresses, metadata } = await remoteQuery(query) @@ -60,7 +60,7 @@ export const POST = async ( const customer = await refetchCustomer( customerId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer }) diff --git a/packages/medusa/src/api/admin/customers/[id]/customer-groups/route.ts b/packages/medusa/src/api/admin/customers/[id]/customer-groups/route.ts index 5b1d73186b..45ff6077c0 100644 --- a/packages/medusa/src/api/admin/customers/[id]/customer-groups/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/customer-groups/route.ts @@ -24,11 +24,7 @@ export const POST = async ( }, }) - const customer = await refetchCustomer( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const customer = await refetchCustomer(id, req.scope, req.queryConfig.fields) res.status(200).json({ customer: customer }) } diff --git a/packages/medusa/src/api/admin/customers/[id]/route.ts b/packages/medusa/src/api/admin/customers/[id]/route.ts index 2702dc75e7..aa69071927 100644 --- a/packages/medusa/src/api/admin/customers/[id]/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/route.ts @@ -18,7 +18,7 @@ export const GET = async ( const customer = await refetchCustomer( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!customer) { @@ -58,7 +58,7 @@ export const POST = async ( const customer = await refetchCustomer( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer }) } diff --git a/packages/medusa/src/api/admin/customers/route.ts b/packages/medusa/src/api/admin/customers/route.ts index fa6a4aa62b..3a1693855e 100644 --- a/packages/medusa/src/api/admin/customers/route.ts +++ b/packages/medusa/src/api/admin/customers/route.ts @@ -22,9 +22,9 @@ export const GET = async ( entryPoint: "customers", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: customers, metadata } = await remoteQuery(query) @@ -58,7 +58,7 @@ export const POST = async ( const customer = await refetchCustomer( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer }) diff --git a/packages/medusa/src/api/admin/draft-orders/route.ts b/packages/medusa/src/api/admin/draft-orders/route.ts index 3c92c72953..d29958be28 100644 --- a/packages/medusa/src/api/admin/draft-orders/route.ts +++ b/packages/medusa/src/api/admin/draft-orders/route.ts @@ -30,9 +30,9 @@ export const GET = async ( ...req.filterableFields, is_draft_order: true, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: draft_orders, metadata } = await remoteQuery(queryObject) @@ -90,7 +90,7 @@ export const POST = async ( const draftOrder = await refetchOrder( result.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ draft_order: draftOrder }) diff --git a/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts index b67e23703e..dd80ae96d8 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts @@ -51,7 +51,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts index 8de123844a..90e77b1920 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts @@ -37,7 +37,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject) @@ -73,7 +73,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts index ca76cc2e4f..d98ffced8d 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts @@ -31,7 +31,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts index 7e959b2b14..af82d8211d 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts @@ -37,7 +37,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject) @@ -73,7 +73,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts index 8a8f062efd..78bff49462 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts @@ -30,7 +30,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts index cae1644c7c..e18d2a2589 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts @@ -36,7 +36,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderExchange] = await remoteQuery(queryObject, { diff --git a/packages/medusa/src/api/admin/exchanges/[id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/route.ts index 8aa297d7e1..95b7d5c118 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/route.ts @@ -14,7 +14,7 @@ export const GET = async ( "order_exchange", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!exchange) { diff --git a/packages/medusa/src/api/admin/exchanges/route.ts b/packages/medusa/src/api/admin/exchanges/route.ts index 692c5c01cb..88c52b95d2 100644 --- a/packages/medusa/src/api/admin/exchanges/route.ts +++ b/packages/medusa/src/api/admin/exchanges/route.ts @@ -24,9 +24,9 @@ export const GET = async ( filters: { ...req.filterableFields, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: exchanges, metadata } = await remoteQuery(queryObject) @@ -64,7 +64,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order, orderExchange] = await promiseAll([ diff --git a/packages/medusa/src/api/admin/fulfillment-providers/route.ts b/packages/medusa/src/api/admin/fulfillment-providers/route.ts index ea860ec9b7..cd05f6bcc6 100644 --- a/packages/medusa/src/api/admin/fulfillment-providers/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-providers/route.ts @@ -17,9 +17,9 @@ export const GET = async ( entryPoint: "fulfillment_provider", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: fulfillment_providers, metadata } = await remoteQuery( diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts index 5df0028f14..0b56799bd0 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts @@ -33,7 +33,7 @@ export const GET = async ( variables: { id: req.params.zone_id, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) ) @@ -85,7 +85,7 @@ export const POST = async ( variables: { id: req.params.id, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) ) diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts index 1bc3dfca6c..ef42f05f75 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts @@ -25,7 +25,7 @@ export const POST = async ( const fulfillmentSet = await refetchFulfillmentSet( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ fulfillment_set: fulfillmentSet }) diff --git a/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts b/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts index 07effd1f0f..a8db892a0c 100644 --- a/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts @@ -18,7 +18,7 @@ export const POST = async ( const fulfillment = await refetchFulfillment( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ fulfillment }) diff --git a/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts b/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts index 340604dd63..616f799149 100644 --- a/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts @@ -24,7 +24,7 @@ export const POST = async ( const fulfillment = await refetchFulfillment( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ fulfillment }) diff --git a/packages/medusa/src/api/admin/fulfillments/route.ts b/packages/medusa/src/api/admin/fulfillments/route.ts index 4efbd776eb..80a52372a1 100644 --- a/packages/medusa/src/api/admin/fulfillments/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/route.ts @@ -23,7 +23,7 @@ export const POST = async ( const fulfillment = await refetchFulfillment( fullfillment.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ fulfillment }) diff --git a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts index 693f2890da..7a2c58f1b6 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts @@ -52,7 +52,7 @@ export const DELETE = async ( const inventoryItem = await refetchInventoryItem( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ @@ -77,7 +77,7 @@ export const POST = async ( const inventoryItem = await refetchInventoryItem( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts index 8b4f6eb4c0..b3e2e201ad 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts @@ -33,7 +33,7 @@ export const POST = async ( const inventoryItem = await refetchInventoryItem( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ inventory_item: inventoryItem }) } @@ -50,9 +50,9 @@ export const GET = async ( entryPoint: "inventory_levels", variables: { filters: { ...req.filterableFields, inventory_item_id: id }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: inventory_levels, metadata } = await remoteQuery(query) diff --git a/packages/medusa/src/api/admin/inventory-items/[id]/route.ts b/packages/medusa/src/api/admin/inventory-items/[id]/route.ts index 65a439c9c7..9e92f3ec79 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/route.ts @@ -19,7 +19,7 @@ export const GET = async ( const inventoryItem = await refetchInventoryItem( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!inventoryItem) { throw new MedusaError( @@ -49,7 +49,7 @@ export const POST = async ( const inventoryItem = await refetchInventoryItem( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/inventory-items/route.ts b/packages/medusa/src/api/admin/inventory-items/route.ts index a420f6411d..17d0d13fbc 100644 --- a/packages/medusa/src/api/admin/inventory-items/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/route.ts @@ -22,7 +22,7 @@ export const POST = async ( const inventoryItem = await refetchInventoryItem( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ inventory_item: inventoryItem }) @@ -38,9 +38,9 @@ export const GET = async ( entryPoint: "inventory_items", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: inventory_items, metadata } = await remoteQuery({ diff --git a/packages/medusa/src/api/admin/invites/[id]/resend/route.ts b/packages/medusa/src/api/admin/invites/[id]/resend/route.ts index 38710e135d..bcebd9ff10 100644 --- a/packages/medusa/src/api/admin/invites/[id]/resend/route.ts +++ b/packages/medusa/src/api/admin/invites/[id]/resend/route.ts @@ -18,7 +18,7 @@ export const POST = async ( const invite = await refetchInvite( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ invite }) diff --git a/packages/medusa/src/api/admin/invites/[id]/route.ts b/packages/medusa/src/api/admin/invites/[id]/route.ts index ff74344368..091595f66c 100644 --- a/packages/medusa/src/api/admin/invites/[id]/route.ts +++ b/packages/medusa/src/api/admin/invites/[id]/route.ts @@ -13,11 +13,7 @@ export const GET = async ( res: MedusaResponse ) => { const { id } = req.params - const invite = await refetchInvite( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const invite = await refetchInvite(id, req.scope, req.queryConfig.fields) if (!invite) { throw new MedusaError( diff --git a/packages/medusa/src/api/admin/invites/route.ts b/packages/medusa/src/api/admin/invites/route.ts index de0ff1cc3b..e44fad0e1d 100644 --- a/packages/medusa/src/api/admin/invites/route.ts +++ b/packages/medusa/src/api/admin/invites/route.ts @@ -20,9 +20,9 @@ export const GET = async ( entryPoint: "invite", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: invites, metadata } = await remoteQuery(queryObject) @@ -52,7 +52,7 @@ export const POST = async ( const invite = await refetchInvite( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ invite }) diff --git a/packages/medusa/src/api/admin/notifications/[id]/route.ts b/packages/medusa/src/api/admin/notifications/[id]/route.ts index e0ee0d4b15..42909a810a 100644 --- a/packages/medusa/src/api/admin/notifications/[id]/route.ts +++ b/packages/medusa/src/api/admin/notifications/[id]/route.ts @@ -14,7 +14,7 @@ export const GET = async ( "notification", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ notification }) } diff --git a/packages/medusa/src/api/admin/notifications/route.ts b/packages/medusa/src/api/admin/notifications/route.ts index 31c5c2a5fc..76f51801c9 100644 --- a/packages/medusa/src/api/admin/notifications/route.ts +++ b/packages/medusa/src/api/admin/notifications/route.ts @@ -13,8 +13,8 @@ export const GET = async ( "notification", req.filterableFields, req.scope, - req.remoteQueryConfig.fields, - req.remoteQueryConfig.pagination + req.queryConfig.fields, + req.queryConfig.pagination ) res.json({ diff --git a/packages/medusa/src/api/admin/orders/[id]/archive/route.ts b/packages/medusa/src/api/admin/orders/[id]/archive/route.ts index 71fc16ef34..451e06b62f 100644 --- a/packages/medusa/src/api/admin/orders/[id]/archive/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/archive/route.ts @@ -23,7 +23,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "order", variables: { id }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts b/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts index 20b4538a38..ded7577afa 100644 --- a/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts @@ -29,7 +29,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "order", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/[id]/changes/route.ts b/packages/medusa/src/api/admin/orders/[id]/changes/route.ts index ca78811eec..2a7b1e8e9f 100644 --- a/packages/medusa/src/api/admin/orders/[id]/changes/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/changes/route.ts @@ -23,7 +23,7 @@ export const GET = async ( order_id: id, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const order_changes = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/[id]/complete/route.ts b/packages/medusa/src/api/admin/orders/[id]/complete/route.ts index aa50d1a82f..24fc2f464a 100644 --- a/packages/medusa/src/api/admin/orders/[id]/complete/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/complete/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "order", variables: { id }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts index 7acaa065f8..555dfe3139 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts @@ -34,7 +34,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "order", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts index 44b236ca4d..a4e7667561 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts @@ -20,7 +20,7 @@ export const POST = async ( "order", orderId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ order }) diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts index 665588a87e..ea797c877e 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts @@ -34,7 +34,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "order", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts index 9f9c3eb17c..cc59e9e641 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts @@ -28,7 +28,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "order", variables: { id: req.params.id }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/[id]/line-items/route.ts b/packages/medusa/src/api/admin/orders/[id]/line-items/route.ts index b50eebd377..abac3adcad 100644 --- a/packages/medusa/src/api/admin/orders/[id]/line-items/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/line-items/route.ts @@ -22,9 +22,7 @@ export const GET = async ( ...req.filterableFields, order_id: id, }, - fields: deduplicate( - req.remoteQueryConfig.fields.concat(["item_id", "version"]) - ), + fields: deduplicate(req.queryConfig.fields.concat(["item_id", "version"])), }) const data = result.data diff --git a/packages/medusa/src/api/admin/orders/[id]/route.ts b/packages/medusa/src/api/admin/orders/[id]/route.ts index 4fce9e3f29..0e48284dfb 100644 --- a/packages/medusa/src/api/admin/orders/[id]/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/route.ts @@ -20,7 +20,7 @@ export const GET = async ( const workflow = getOrderDetailWorkflow(req.scope) const { result } = await workflow.run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, order_id: req.params.id, version: req.validatedQuery.version as number, }, @@ -46,7 +46,7 @@ export const POST = async ( const result = await query.graph({ entity: "order", filters: { id: req.params.id }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) res.status(200).json({ order: result.data[0] as AdminOrder }) diff --git a/packages/medusa/src/api/admin/orders/[id]/transfer/cancel/route.ts b/packages/medusa/src/api/admin/orders/[id]/transfer/cancel/route.ts index b9235a7b56..2aaf8a90a1 100644 --- a/packages/medusa/src/api/admin/orders/[id]/transfer/cancel/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/transfer/cancel/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const result = await query.graph({ entity: "order", filters: { id: orderId }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) res.status(200).json({ order: result.data[0] as AdminOrder }) diff --git a/packages/medusa/src/api/admin/orders/[id]/transfer/route.ts b/packages/medusa/src/api/admin/orders/[id]/transfer/route.ts index becd8da8c3..b071e66a35 100644 --- a/packages/medusa/src/api/admin/orders/[id]/transfer/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/transfer/route.ts @@ -31,7 +31,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "order", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/orders/route.ts b/packages/medusa/src/api/admin/orders/route.ts index 610827e190..2bebdcd49c 100644 --- a/packages/medusa/src/api/admin/orders/route.ts +++ b/packages/medusa/src/api/admin/orders/route.ts @@ -14,13 +14,13 @@ export const GET = async ( ...req.filterableFields, is_draft_order: false, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, } const workflow = getOrdersListWorkflow(req.scope) const { result } = await workflow.run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, variables, }, }) diff --git a/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts b/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts index 6e77a7549b..1d7725dbc4 100644 --- a/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts +++ b/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts @@ -25,7 +25,7 @@ export const POST = async ( "payment_collection", id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ payment_collection: paymentCollection }) diff --git a/packages/medusa/src/api/admin/payment-collections/route.ts b/packages/medusa/src/api/admin/payment-collections/route.ts index f96e0da602..3968c1b68c 100644 --- a/packages/medusa/src/api/admin/payment-collections/route.ts +++ b/packages/medusa/src/api/admin/payment-collections/route.ts @@ -19,7 +19,7 @@ export const POST = async ( "payment_collection", result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ payment_collection: paymentCollection }) diff --git a/packages/medusa/src/api/admin/payments/[id]/capture/route.ts b/packages/medusa/src/api/admin/payments/[id]/capture/route.ts index 7bc812a4d3..f1b97b6a0d 100644 --- a/packages/medusa/src/api/admin/payments/[id]/capture/route.ts +++ b/packages/medusa/src/api/admin/payments/[id]/capture/route.ts @@ -21,11 +21,7 @@ export const POST = async ( }, }) - const payment = await refetchPayment( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const payment = await refetchPayment(id, req.scope, req.queryConfig.fields) res.status(200).json({ payment }) } diff --git a/packages/medusa/src/api/admin/payments/[id]/refund/route.ts b/packages/medusa/src/api/admin/payments/[id]/refund/route.ts index f7429b9472..86845dfbdf 100644 --- a/packages/medusa/src/api/admin/payments/[id]/refund/route.ts +++ b/packages/medusa/src/api/admin/payments/[id]/refund/route.ts @@ -20,11 +20,7 @@ export const POST = async ( }, }) - const payment = await refetchPayment( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const payment = await refetchPayment(id, req.scope, req.queryConfig.fields) res.status(200).json({ payment }) } diff --git a/packages/medusa/src/api/admin/payments/[id]/route.ts b/packages/medusa/src/api/admin/payments/[id]/route.ts index 1ef740c4e0..d9383f433d 100644 --- a/packages/medusa/src/api/admin/payments/[id]/route.ts +++ b/packages/medusa/src/api/admin/payments/[id]/route.ts @@ -13,7 +13,7 @@ export const GET = async ( const payment = await refetchPayment( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ payment }) diff --git a/packages/medusa/src/api/admin/payments/payment-providers/route.ts b/packages/medusa/src/api/admin/payments/payment-providers/route.ts index 2da7855902..b4e6c814b2 100644 --- a/packages/medusa/src/api/admin/payments/payment-providers/route.ts +++ b/packages/medusa/src/api/admin/payments/payment-providers/route.ts @@ -17,9 +17,9 @@ export const GET = async ( entryPoint: "payment_provider", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: payment_providers, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/payments/route.ts b/packages/medusa/src/api/admin/payments/route.ts index f6ca4f26c2..8c545b260a 100644 --- a/packages/medusa/src/api/admin/payments/route.ts +++ b/packages/medusa/src/api/admin/payments/route.ts @@ -17,9 +17,9 @@ export const GET = async ( entryPoint: "payment", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: payments, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts b/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts index 176852575c..680baa2359 100644 --- a/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts @@ -39,11 +39,7 @@ export const POST = async ( }, }) - const priceList = await fetchPriceList( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const priceList = await fetchPriceList(id, req.scope, req.queryConfig.fields) res.status(200).json({ price_list: priceList }) } diff --git a/packages/medusa/src/api/admin/price-lists/[id]/route.ts b/packages/medusa/src/api/admin/price-lists/[id]/route.ts index 5380fc90e2..f881b47d16 100644 --- a/packages/medusa/src/api/admin/price-lists/[id]/route.ts +++ b/packages/medusa/src/api/admin/price-lists/[id]/route.ts @@ -17,7 +17,7 @@ export const GET = async ( const price_list = await fetchPriceList( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ price_list }) @@ -34,11 +34,7 @@ export const POST = async ( input: { price_lists_data: [{ ...req.validatedBody, id }] }, }) - const price_list = await fetchPriceList( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const price_list = await fetchPriceList(id, req.scope, req.queryConfig.fields) res.status(200).json({ price_list }) } diff --git a/packages/medusa/src/api/admin/price-lists/route.ts b/packages/medusa/src/api/admin/price-lists/route.ts index 471e1801f4..8b8abd0da0 100644 --- a/packages/medusa/src/api/admin/price-lists/route.ts +++ b/packages/medusa/src/api/admin/price-lists/route.ts @@ -21,9 +21,9 @@ export const GET = async ( entryPoint: "price_list", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: priceLists, metadata } = await remoteQuery(queryObject) @@ -48,7 +48,7 @@ export const POST = async ( const price_list = await fetchPriceList( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ price_list }) diff --git a/packages/medusa/src/api/admin/price-preferences/[id]/route.ts b/packages/medusa/src/api/admin/price-preferences/[id]/route.ts index ab9909f6cc..5333787227 100644 --- a/packages/medusa/src/api/admin/price-preferences/[id]/route.ts +++ b/packages/medusa/src/api/admin/price-preferences/[id]/route.ts @@ -18,7 +18,7 @@ export const GET = async ( "price_preference", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ price_preference }) @@ -39,7 +39,7 @@ export const POST = async ( "price_preference", id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ price_preference }) diff --git a/packages/medusa/src/api/admin/price-preferences/route.ts b/packages/medusa/src/api/admin/price-preferences/route.ts index 27785a84a3..da521120f9 100644 --- a/packages/medusa/src/api/admin/price-preferences/route.ts +++ b/packages/medusa/src/api/admin/price-preferences/route.ts @@ -15,8 +15,8 @@ export const GET = async ( "price_preference", req.filterableFields, req.scope, - req.remoteQueryConfig.fields, - req.remoteQueryConfig.pagination + req.queryConfig.fields, + req.queryConfig.pagination ) res.json({ price_preferences: price_preferences, @@ -39,7 +39,7 @@ export const POST = async ( "price_preference", result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ price_preference }) diff --git a/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts b/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts index cc88a24809..f21bb7997f 100644 --- a/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts @@ -23,7 +23,7 @@ export const POST = async ( "product_category", id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_category: category }) diff --git a/packages/medusa/src/api/admin/product-categories/[id]/route.ts b/packages/medusa/src/api/admin/product-categories/[id]/route.ts index 40ca296d79..afacf03574 100644 --- a/packages/medusa/src/api/admin/product-categories/[id]/route.ts +++ b/packages/medusa/src/api/admin/product-categories/[id]/route.ts @@ -25,7 +25,7 @@ export const GET = async ( "product_category", { id: req.params.id, ...req.filterableFields }, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!category) { @@ -52,7 +52,7 @@ export const POST = async ( "product_category", { id, ...req.filterableFields }, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_category: category }) diff --git a/packages/medusa/src/api/admin/product-categories/route.ts b/packages/medusa/src/api/admin/product-categories/route.ts index bed3e831ae..91e9d7e2f9 100644 --- a/packages/medusa/src/api/admin/product-categories/route.ts +++ b/packages/medusa/src/api/admin/product-categories/route.ts @@ -14,8 +14,8 @@ export const GET = async ( "product_category", req.filterableFields, req.scope, - req.remoteQueryConfig.fields, - req.remoteQueryConfig.pagination + req.queryConfig.fields, + req.queryConfig.pagination ) res.json({ @@ -38,7 +38,7 @@ export const POST = async ( "product_category", { id: result[0].id, ...req.filterableFields }, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_category: category }) diff --git a/packages/medusa/src/api/admin/product-tags/[id]/route.ts b/packages/medusa/src/api/admin/product-tags/[id]/route.ts index 794bd34d83..f657ba1c50 100644 --- a/packages/medusa/src/api/admin/product-tags/[id]/route.ts +++ b/packages/medusa/src/api/admin/product-tags/[id]/route.ts @@ -23,7 +23,7 @@ export const GET = async ( "product_tag", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_tag: productTag }) @@ -58,7 +58,7 @@ export const POST = async ( "product_tag", result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_tag: productTag }) diff --git a/packages/medusa/src/api/admin/product-tags/route.ts b/packages/medusa/src/api/admin/product-tags/route.ts index 23d545ffa2..5e8d671062 100644 --- a/packages/medusa/src/api/admin/product-tags/route.ts +++ b/packages/medusa/src/api/admin/product-tags/route.ts @@ -16,8 +16,8 @@ export const GET = async ( "product_tag", req.filterableFields, req.scope, - req.remoteQueryConfig.fields, - req.remoteQueryConfig.pagination + req.queryConfig.fields, + req.queryConfig.pagination ) res.json({ @@ -42,7 +42,7 @@ export const POST = async ( "product_tag", result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_tag: productTag }) diff --git a/packages/medusa/src/api/admin/product-types/[id]/route.ts b/packages/medusa/src/api/admin/product-types/[id]/route.ts index 29ff2f5e38..ef96996533 100644 --- a/packages/medusa/src/api/admin/product-types/[id]/route.ts +++ b/packages/medusa/src/api/admin/product-types/[id]/route.ts @@ -22,7 +22,7 @@ export const GET = async ( const productType = await refetchProductType( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_type: productType }) @@ -55,7 +55,7 @@ export const POST = async ( const productType = await refetchProductType( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_type: productType }) diff --git a/packages/medusa/src/api/admin/product-types/route.ts b/packages/medusa/src/api/admin/product-types/route.ts index 753f5623fd..000651398c 100644 --- a/packages/medusa/src/api/admin/product-types/route.ts +++ b/packages/medusa/src/api/admin/product-types/route.ts @@ -20,9 +20,9 @@ export const GET = async ( entryPoint: "product_type", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: product_types, metadata } = await remoteQuery(queryObject) @@ -48,7 +48,7 @@ export const POST = async ( const productType = await refetchProductType( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_type: productType }) diff --git a/packages/medusa/src/api/admin/product-variants/route.ts b/packages/medusa/src/api/admin/product-variants/route.ts index 43e30217f5..1b70c26f16 100644 --- a/packages/medusa/src/api/admin/product-variants/route.ts +++ b/packages/medusa/src/api/admin/product-variants/route.ts @@ -11,12 +11,12 @@ export const GET = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { - const withInventoryQuantity = req.remoteQueryConfig.fields.some((field) => + const withInventoryQuantity = req.queryConfig.fields.some((field) => field.includes("inventory_quantity") ) if (withInventoryQuantity) { - req.remoteQueryConfig.fields = req.remoteQueryConfig.fields.filter( + req.queryConfig.fields = req.queryConfig.fields.filter( (field) => !field.includes("inventory_quantity") ) } @@ -25,8 +25,8 @@ export const GET = async ( "variant", { ...req.filterableFields }, req.scope, - remapKeysForVariant(req.remoteQueryConfig.fields ?? []), - req.remoteQueryConfig.pagination + remapKeysForVariant(req.queryConfig.fields ?? []), + req.queryConfig.pagination ) if (withInventoryQuantity) { diff --git a/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts b/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts index ec86505f76..2d9aa05776 100644 --- a/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts @@ -21,7 +21,7 @@ export const GET = async ( "product_option", { id: optionId, product_id: productId }, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ product_option: productOption }) @@ -49,7 +49,7 @@ export const POST = async ( "product", productId, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ product: remapProductResponse(product) }) @@ -71,7 +71,7 @@ export const DELETE = async ( "product", productId, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/products/[id]/options/route.ts b/packages/medusa/src/api/admin/products/[id]/options/route.ts index f5a4488de3..b552fe5322 100644 --- a/packages/medusa/src/api/admin/products/[id]/options/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/options/route.ts @@ -18,8 +18,8 @@ export const GET = async ( "product_option", { ...req.filterableFields, product_id: productId }, req.scope, - req.remoteQueryConfig.fields, - req.remoteQueryConfig.pagination + req.queryConfig.fields, + req.queryConfig.pagination ) res.json({ @@ -55,7 +55,7 @@ export const POST = async ( "product", productId, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ product: remapProductResponse(product) }) } diff --git a/packages/medusa/src/api/admin/products/[id]/route.ts b/packages/medusa/src/api/admin/products/[id]/route.ts index 1aa55d0e99..c39c0e63ed 100644 --- a/packages/medusa/src/api/admin/products/[id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/route.ts @@ -15,7 +15,7 @@ export const GET = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { - const selectFields = remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + const selectFields = remapKeysForProduct(req.queryConfig.fields ?? []) const product = await refetchEntity( "product", req.params.id, @@ -66,7 +66,7 @@ export const POST = async ( "product", result[0].id, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ product: remapProductResponse(product) }) diff --git a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts index 0dfc9dec51..a6ef34c1a4 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts @@ -28,7 +28,7 @@ export const POST = async ( const variant = await refetchVariant( variantId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ variant }) @@ -55,7 +55,7 @@ export const DELETE = async ( const parent = await refetchVariant( variantId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts index 459fb7fc1f..ceea06f689 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts @@ -29,7 +29,7 @@ export const POST = async ( const variant = await refetchVariant( variantId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ variant }) diff --git a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts index 283edee8c2..91a819fde5 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts @@ -28,7 +28,7 @@ export const GET = async ( "variant", variables, req.scope, - remapKeysForVariant(req.remoteQueryConfig.fields ?? []) + remapKeysForVariant(req.queryConfig.fields ?? []) ) res.status(200).json({ variant: remapVariantResponse(variant) }) @@ -56,7 +56,7 @@ export const POST = async ( "product", productId, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ product: remapProductResponse(product) }) @@ -78,7 +78,7 @@ export const DELETE = async ( "product", productId, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts index c3a84eb54c..3c92c135b5 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts @@ -31,7 +31,7 @@ export const POST = async ( const batchResults = await refetchBatchVariants( result, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/products/[id]/variants/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/route.ts index c151d43128..830d0a651a 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/route.ts @@ -19,12 +19,12 @@ export const GET = async ( ) => { const productId = req.params.id - const withInventoryQuantity = req.remoteQueryConfig.fields.some((field) => + const withInventoryQuantity = req.queryConfig.fields.some((field) => field.includes("inventory_quantity") ) if (withInventoryQuantity) { - req.remoteQueryConfig.fields = req.remoteQueryConfig.fields.filter( + req.queryConfig.fields = req.queryConfig.fields.filter( (field) => !field.includes("inventory_quantity") ) } @@ -33,8 +33,8 @@ export const GET = async ( "variant", { ...req.filterableFields, product_id: productId }, req.scope, - remapKeysForVariant(req.remoteQueryConfig.fields ?? []), - req.remoteQueryConfig.pagination + remapKeysForVariant(req.queryConfig.fields ?? []), + req.queryConfig.pagination ) if (withInventoryQuantity) { @@ -73,7 +73,7 @@ export const POST = async ( "product", productId, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ product: remapProductResponse(product) }) diff --git a/packages/medusa/src/api/admin/products/batch/route.ts b/packages/medusa/src/api/admin/products/batch/route.ts index bdb6a2b41c..7067463373 100644 --- a/packages/medusa/src/api/admin/products/batch/route.ts +++ b/packages/medusa/src/api/admin/products/batch/route.ts @@ -17,7 +17,7 @@ export const POST = async ( const batchResults = await refetchBatchProducts( result, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/products/export/route.ts b/packages/medusa/src/api/admin/products/export/route.ts index c401d33ec2..e245649eed 100644 --- a/packages/medusa/src/api/admin/products/export/route.ts +++ b/packages/medusa/src/api/admin/products/export/route.ts @@ -10,7 +10,7 @@ export const POST = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { - const selectFields = remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + const selectFields = remapKeysForProduct(req.queryConfig.fields ?? []) const input = { select: selectFields, filter: req.filterableFields } const { transaction } = await exportProductsWorkflow(req.scope).run({ diff --git a/packages/medusa/src/api/admin/products/route.ts b/packages/medusa/src/api/admin/products/route.ts index 3a3fb48d7e..cd384b954a 100644 --- a/packages/medusa/src/api/admin/products/route.ts +++ b/packages/medusa/src/api/admin/products/route.ts @@ -12,14 +12,14 @@ export const GET = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { - const selectFields = remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + const selectFields = remapKeysForProduct(req.queryConfig.fields ?? []) const { rows: products, metadata } = await refetchEntities( "product", req.filterableFields, req.scope, selectFields, - req.remoteQueryConfig.pagination + req.queryConfig.pagination ) res.json({ @@ -46,7 +46,7 @@ export const POST = async ( "product", result[0].id, req.scope, - remapKeysForProduct(req.remoteQueryConfig.fields ?? []) + remapKeysForProduct(req.queryConfig.fields ?? []) ) res.status(200).json({ product: remapProductResponse(product) }) diff --git a/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts b/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts index e492acb7c6..eef75f2cd8 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts @@ -29,7 +29,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "promotion", variables: { id }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [promotion] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts b/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts index 0bbc9e7d77..b9c49543f6 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts @@ -30,7 +30,7 @@ export const POST = async ( const batchResults = await refetchBatchRules( result, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json(batchResults) diff --git a/packages/medusa/src/api/admin/promotions/[id]/route.ts b/packages/medusa/src/api/admin/promotions/[id]/route.ts index a489b02254..0fec6cb26b 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/route.ts @@ -29,7 +29,7 @@ export const GET = async ( variables: { filters: { $or: [{ id: idOrCode }, { code: idOrCode }] }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [promotion] = await remoteQuery(queryObject) @@ -63,7 +63,7 @@ export const POST = async ( const promotion = await refetchPromotion( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ promotion }) diff --git a/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts b/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts index 9212c8234a..84bf3548b9 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts @@ -30,7 +30,7 @@ export const POST = async ( const batchResults = await refetchBatchRules( result, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json(batchResults) diff --git a/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts b/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts index 99e9206add..f9d3138944 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts @@ -30,7 +30,7 @@ export const POST = async ( const batchResults = await refetchBatchRules( result, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json(batchResults) diff --git a/packages/medusa/src/api/admin/promotions/route.ts b/packages/medusa/src/api/admin/promotions/route.ts index 6d534ac562..77134f48b1 100644 --- a/packages/medusa/src/api/admin/promotions/route.ts +++ b/packages/medusa/src/api/admin/promotions/route.ts @@ -20,9 +20,9 @@ export const GET = async ( entryPoint: "promotion", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: promotions, metadata } = await remoteQuery(queryObject) @@ -52,7 +52,7 @@ export const POST = async ( const promotion = await refetchPromotion( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ promotion }) diff --git a/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts b/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts index e2f76f22ae..98dcf3f709 100644 --- a/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts +++ b/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts @@ -54,7 +54,7 @@ export const GET = async ( entryPoint: queryConfig.entryPoint, variables: { filters: filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, fields: [queryConfig.labelAttr, queryConfig.valueAttr], }) diff --git a/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts b/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts index 6e2fe28f31..c2fd17b544 100644 --- a/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts +++ b/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts @@ -18,7 +18,7 @@ export const GET = async ( "refund_reason", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.json({ refund_reason }) @@ -43,7 +43,7 @@ export const POST = async ( "refund_reason", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.json({ refund_reason }) diff --git a/packages/medusa/src/api/admin/refund-reasons/route.ts b/packages/medusa/src/api/admin/refund-reasons/route.ts index 196113d118..2b296b918a 100644 --- a/packages/medusa/src/api/admin/refund-reasons/route.ts +++ b/packages/medusa/src/api/admin/refund-reasons/route.ts @@ -21,8 +21,8 @@ export const GET = async ( "refund_reasons", req.filterableFields, req.scope, - req.remoteQueryConfig.fields, - req.remoteQueryConfig.pagination + req.queryConfig.fields, + req.queryConfig.pagination ) res.json({ @@ -47,7 +47,7 @@ export const POST = async ( "refund_reason", refundReason.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ refund_reason }) diff --git a/packages/medusa/src/api/admin/regions/[id]/route.ts b/packages/medusa/src/api/admin/regions/[id]/route.ts index 542d6ff060..bad7006c69 100644 --- a/packages/medusa/src/api/admin/regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/regions/[id]/route.ts @@ -18,7 +18,7 @@ export const GET = async ( const region = await refetchRegion( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!region) { @@ -53,7 +53,7 @@ export const POST = async ( const region = await refetchRegion( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ region }) diff --git a/packages/medusa/src/api/admin/regions/route.ts b/packages/medusa/src/api/admin/regions/route.ts index 6295beeb5b..903556aa81 100644 --- a/packages/medusa/src/api/admin/regions/route.ts +++ b/packages/medusa/src/api/admin/regions/route.ts @@ -20,9 +20,9 @@ export const GET = async ( entryPoint: "region", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: regions, metadata } = await remoteQuery(queryObject) @@ -48,7 +48,7 @@ export const POST = async ( const region = await refetchRegion( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ region }) diff --git a/packages/medusa/src/api/admin/reservations/[id]/route.ts b/packages/medusa/src/api/admin/reservations/[id]/route.ts index c741c46b4d..9d8ce655d0 100644 --- a/packages/medusa/src/api/admin/reservations/[id]/route.ts +++ b/packages/medusa/src/api/admin/reservations/[id]/route.ts @@ -23,7 +23,7 @@ export const GET = async ( const reservation = await refetchReservation( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!reservation) { @@ -50,7 +50,7 @@ export const POST = async ( const reservation = await refetchReservation( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ reservation }) } diff --git a/packages/medusa/src/api/admin/reservations/route.ts b/packages/medusa/src/api/admin/reservations/route.ts index 70069074bf..f96cb0a34d 100644 --- a/packages/medusa/src/api/admin/reservations/route.ts +++ b/packages/medusa/src/api/admin/reservations/route.ts @@ -21,9 +21,9 @@ export const GET = async ( entryPoint: "reservation", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: reservations, metadata } = await remoteQuery(queryObject) @@ -49,7 +49,7 @@ export const POST = async ( const reservation = await refetchReservation( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ reservation }) } diff --git a/packages/medusa/src/api/admin/return-reasons/[id]/route.ts b/packages/medusa/src/api/admin/return-reasons/[id]/route.ts index c8985c5b77..893e55a310 100644 --- a/packages/medusa/src/api/admin/return-reasons/[id]/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/[id]/route.ts @@ -22,7 +22,7 @@ export const GET = async ( "return_reason", req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!return_reason) { @@ -54,7 +54,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "return_reason", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/return-reasons/route.ts b/packages/medusa/src/api/admin/return-reasons/route.ts index 3b429e95c3..ff948b6712 100644 --- a/packages/medusa/src/api/admin/return-reasons/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/route.ts @@ -20,9 +20,9 @@ export const GET = async ( filters: { ...req.filterableFields, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: return_reasons, metadata } = await remoteQuery(queryObject) @@ -56,7 +56,7 @@ export const POST = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "return_reason", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts index 43e93142d7..cacf957928 100644 --- a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts @@ -39,7 +39,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) @@ -75,7 +75,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts index 8199ee440a..3afa0a16bd 100644 --- a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts @@ -30,7 +30,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts index e888df6b71..984d8b0f42 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts @@ -39,7 +39,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) @@ -75,7 +75,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts index ed578d97c9..724e721b3f 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts @@ -30,7 +30,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts index a9a423f85a..d8b28d0a7f 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts @@ -33,7 +33,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts index 72c8965d39..a54d4dac20 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts @@ -40,7 +40,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order, orderReturn] = await promiseAll([ diff --git a/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts index 3b9794b0f2..ebd63061d8 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts @@ -37,7 +37,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) @@ -73,7 +73,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts index 778da5c340..372730200e 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts @@ -30,7 +30,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/request/route.ts b/packages/medusa/src/api/admin/returns/[id]/request/route.ts index 7c855e26c1..b2bde8ed1f 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request/route.ts @@ -36,7 +36,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/route.ts index b5aeaa91e1..4bbd410197 100644 --- a/packages/medusa/src/api/admin/returns/[id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/route.ts @@ -26,7 +26,7 @@ export const GET = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject, { @@ -58,7 +58,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts index bff1df6a55..ea361c7428 100644 --- a/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts @@ -37,7 +37,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) @@ -73,7 +73,7 @@ export const DELETE = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts b/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts index 48ea183493..d5c24e2ffd 100644 --- a/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts @@ -30,7 +30,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [orderReturn] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/returns/route.ts b/packages/medusa/src/api/admin/returns/route.ts index b978282d0b..4466ac04be 100644 --- a/packages/medusa/src/api/admin/returns/route.ts +++ b/packages/medusa/src/api/admin/returns/route.ts @@ -24,9 +24,9 @@ export const GET = async ( filters: { ...req.filterableFields, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: returns, metadata } = await remoteQuery(queryObject) @@ -64,7 +64,7 @@ export const POST = async ( ...req.filterableFields, }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [order, orderReturn] = await promiseAll([ diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts index a25e6a2790..65dcc22c91 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const salesChannel = await refetchSalesChannel( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ sales_channel: salesChannel }) } diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts index 29fddac17e..097a98d0b0 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts @@ -21,7 +21,7 @@ export const GET = async ( const salesChannel = await refetchSalesChannel( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!salesChannel) { @@ -61,7 +61,7 @@ export const POST = async ( const salesChannel = await refetchSalesChannel( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ sales_channel: salesChannel }) } diff --git a/packages/medusa/src/api/admin/sales-channels/route.ts b/packages/medusa/src/api/admin/sales-channels/route.ts index ba11c04feb..8995ffaadd 100644 --- a/packages/medusa/src/api/admin/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/route.ts @@ -20,9 +20,9 @@ export const GET = async ( entryPoint: "sales_channels", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: sales_channels, metadata } = await remoteQuery(queryObject) @@ -48,7 +48,7 @@ export const POST = async ( const salesChannel = await refetchSalesChannel( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ sales_channel: salesChannel }) diff --git a/packages/medusa/src/api/admin/shipping-options/[id]/route.ts b/packages/medusa/src/api/admin/shipping-options/[id]/route.ts index b04289bf67..ae97d49e31 100644 --- a/packages/medusa/src/api/admin/shipping-options/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/[id]/route.ts @@ -21,7 +21,7 @@ export const GET = async ( const shippingOption = await refetchShippingOption( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!shippingOption) { @@ -55,7 +55,7 @@ export const POST = async ( const shippingOption = await refetchShippingOption( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ shipping_option: shippingOption }) diff --git a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts index 167af0bfd5..a4a2a4fb26 100644 --- a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts @@ -30,7 +30,7 @@ export const POST = async ( const batchResults = await refetchBatchRules( result, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res diff --git a/packages/medusa/src/api/admin/shipping-options/route.ts b/packages/medusa/src/api/admin/shipping-options/route.ts index 38efbec210..01a7c94921 100644 --- a/packages/medusa/src/api/admin/shipping-options/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/route.ts @@ -20,9 +20,9 @@ export const GET = async ( entryPoint: "shipping_options", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: shipping_options, metadata } = await remoteQuery(queryObject) @@ -50,7 +50,7 @@ export const POST = async ( const shippingOption = await refetchShippingOption( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ shipping_option: shippingOption }) diff --git a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts index b93bb52814..d6eed0646b 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts @@ -21,7 +21,7 @@ export const GET = async ( const shippingProfile = await refetchShippingProfile( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ shipping_profile: shippingProfile }) @@ -64,7 +64,7 @@ export const POST = async ( const shippingProfile = await refetchShippingProfile( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/shipping-profiles/route.ts b/packages/medusa/src/api/admin/shipping-profiles/route.ts index 1474431cab..9e71d8bbe0 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/route.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/route.ts @@ -23,7 +23,7 @@ export const POST = async ( const shippingProfile = await refetchShippingProfile( result?.[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ shipping_profile: shippingProfile }) @@ -39,9 +39,9 @@ export const GET = async ( entryPoint: "shipping_profiles", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: shippingProfiles, metadata } = await remoteQuery(query) diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts index 0c136a0021..8585055f4e 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts @@ -34,7 +34,7 @@ export const POST = async ( const stockLocation = await refetchStockLocation( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ stock_location: stockLocation }) diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts index c21f1a73dd..1156122f6e 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts @@ -24,7 +24,7 @@ export const POST = async ( const stockLocation = await refetchStockLocation( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ stock_location: stockLocation }) diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/route.ts index 44103cc3e4..90e62899aa 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/route.ts @@ -30,7 +30,7 @@ export const POST = async ( const stockLocation = await refetchStockLocation( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ @@ -47,7 +47,7 @@ export const GET = async ( const stockLocation = await refetchStockLocation( id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!stockLocation) { diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts index a86cc09757..cab1f492e7 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const stockLocation = await refetchStockLocation( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ stock_location: stockLocation }) } diff --git a/packages/medusa/src/api/admin/stock-locations/route.ts b/packages/medusa/src/api/admin/stock-locations/route.ts index fd30bd7658..dcfc204310 100644 --- a/packages/medusa/src/api/admin/stock-locations/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/route.ts @@ -23,7 +23,7 @@ export const POST = async ( const stockLocation = await refetchStockLocation( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ stock_location: stockLocation }) @@ -40,9 +40,9 @@ export const GET = async ( entryPoint: "stock_locations", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) ) diff --git a/packages/medusa/src/api/admin/stores/[id]/route.ts b/packages/medusa/src/api/admin/stores/[id]/route.ts index 735631b002..b20384a0e5 100644 --- a/packages/medusa/src/api/admin/stores/[id]/route.ts +++ b/packages/medusa/src/api/admin/stores/[id]/route.ts @@ -22,7 +22,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "store", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [store] = await remoteQuery(queryObject) @@ -51,7 +51,7 @@ export const POST = async ( const store = await refetchStore( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ store }) diff --git a/packages/medusa/src/api/admin/stores/route.ts b/packages/medusa/src/api/admin/stores/route.ts index eaf9d340b3..4f00c2ee98 100644 --- a/packages/medusa/src/api/admin/stores/route.ts +++ b/packages/medusa/src/api/admin/stores/route.ts @@ -18,9 +18,9 @@ export const GET = async ( entryPoint: "store", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: stores, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts index ffea1b5a74..5ea918df73 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts @@ -41,7 +41,7 @@ export const POST = async ( const taxRate = await refetchTaxRate( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ tax_rate: taxRate }) } @@ -56,7 +56,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "tax_rate", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [taxRate] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts index adcce3aa9d..42435b69ff 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts @@ -17,7 +17,7 @@ export const DELETE = async ( const taxRate = await refetchTaxRate( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts index 6b926e455d..a720712b7c 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const taxRate = await refetchTaxRate( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ tax_rate: taxRate }) } diff --git a/packages/medusa/src/api/admin/tax-rates/route.ts b/packages/medusa/src/api/admin/tax-rates/route.ts index ac0f49086a..805279c205 100644 --- a/packages/medusa/src/api/admin/tax-rates/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const taxRate = await refetchTaxRate( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ tax_rate: taxRate }) } @@ -41,9 +41,9 @@ export const GET = async ( entryPoint: "tax_rate", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) ) diff --git a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts index 3385eca929..afbad3259e 100644 --- a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts @@ -24,7 +24,7 @@ export const GET = async ( remoteQueryObjectFromString({ entryPoint: "tax_region", variables: { filters }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) ) @@ -54,7 +54,7 @@ export const POST = async ( } = await query.graph( { entity: "tax_region", - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, filters: { id }, }, { throwIfKeyNotFound: true } diff --git a/packages/medusa/src/api/admin/tax-regions/route.ts b/packages/medusa/src/api/admin/tax-regions/route.ts index 260e9494e2..bb9a91eada 100644 --- a/packages/medusa/src/api/admin/tax-regions/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const taxRegion = await refetchTaxRegion( result[0].id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ tax_region: taxRegion }) } @@ -42,9 +42,9 @@ export const GET = async ( entryPoint: "tax_regions", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) ) diff --git a/packages/medusa/src/api/admin/uploads/[id]/route.ts b/packages/medusa/src/api/admin/uploads/[id]/route.ts index 095d02b91f..bfb33fe97b 100644 --- a/packages/medusa/src/api/admin/uploads/[id]/route.ts +++ b/packages/medusa/src/api/admin/uploads/[id]/route.ts @@ -20,7 +20,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "file", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [file] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/users/[id]/route.ts b/packages/medusa/src/api/admin/users/[id]/route.ts index 63b6008f17..36c6bde6e8 100644 --- a/packages/medusa/src/api/admin/users/[id]/route.ts +++ b/packages/medusa/src/api/admin/users/[id]/route.ts @@ -27,7 +27,7 @@ export const GET = async ( const query = remoteQueryObjectFromString({ entryPoint: "user", variables: { id }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [user] = await remoteQuery(query) @@ -62,7 +62,7 @@ export const POST = async ( const user = await refetchUser( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ user }) diff --git a/packages/medusa/src/api/admin/users/me/route.ts b/packages/medusa/src/api/admin/users/me/route.ts index a9c99cbafd..ac44fbca69 100644 --- a/packages/medusa/src/api/admin/users/me/route.ts +++ b/packages/medusa/src/api/admin/users/me/route.ts @@ -23,7 +23,7 @@ export const GET = async ( const query = remoteQueryObjectFromString({ entryPoint: "user", variables: { id }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [user] = await remoteQuery(query) diff --git a/packages/medusa/src/api/admin/users/route.ts b/packages/medusa/src/api/admin/users/route.ts index c8627954ef..709d9e3bd2 100644 --- a/packages/medusa/src/api/admin/users/route.ts +++ b/packages/medusa/src/api/admin/users/route.ts @@ -18,9 +18,9 @@ export const GET = async ( entryPoint: "user", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: users, metadata } = await remoteQuery(query) diff --git a/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts b/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts index d4fd88de28..2f40d9512a 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts @@ -20,7 +20,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "workflow_execution", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [workflowExecution] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts index 80d76efc51..8975368dc1 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts @@ -22,7 +22,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "workflow_execution", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [workflowExecution] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/admin/workflows-executions/route.ts b/packages/medusa/src/api/admin/workflows-executions/route.ts index 0a4bdf39ad..1ad8708c9a 100644 --- a/packages/medusa/src/api/admin/workflows-executions/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/route.ts @@ -18,9 +18,9 @@ export const GET = async ( entryPoint: "workflow_execution", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: workflowExecutions, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/carts/[id]/complete/route.ts b/packages/medusa/src/api/store/carts/[id]/complete/route.ts index 858dc802aa..70bbe97977 100644 --- a/packages/medusa/src/api/store/carts/[id]/complete/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/complete/route.ts @@ -60,12 +60,12 @@ export const POST = async ( type: error.type, }, }) - return; + return } const { data } = await query.graph({ entity: "order", - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, filters: { id: result.id }, }) diff --git a/packages/medusa/src/api/store/carts/[id]/customer/route.ts b/packages/medusa/src/api/store/carts/[id]/customer/route.ts index 144d818903..c54b77b686 100644 --- a/packages/medusa/src/api/store/carts/[id]/customer/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/customer/route.ts @@ -23,7 +23,7 @@ export const POST = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart }) diff --git a/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts b/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts index 5a4a4b8a91..189e060b47 100644 --- a/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts @@ -51,7 +51,7 @@ export const POST = async ( const updatedCart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart: updatedCart }) @@ -70,7 +70,7 @@ export const DELETE = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/store/carts/[id]/line-items/route.ts b/packages/medusa/src/api/store/carts/[id]/line-items/route.ts index 6ede47979d..c071a9116d 100644 --- a/packages/medusa/src/api/store/carts/[id]/line-items/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/line-items/route.ts @@ -18,7 +18,7 @@ export const POST = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart }) diff --git a/packages/medusa/src/api/store/carts/[id]/promotions/route.ts b/packages/medusa/src/api/store/carts/[id]/promotions/route.ts index a851b85d76..47302c9488 100644 --- a/packages/medusa/src/api/store/carts/[id]/promotions/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/promotions/route.ts @@ -26,7 +26,7 @@ export const POST = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart }) @@ -52,7 +52,7 @@ export const DELETE = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart }) diff --git a/packages/medusa/src/api/store/carts/[id]/route.ts b/packages/medusa/src/api/store/carts/[id]/route.ts index 1a752e21f4..99fb325022 100644 --- a/packages/medusa/src/api/store/carts/[id]/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/route.ts @@ -15,7 +15,7 @@ export const GET = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.json({ cart }) @@ -39,7 +39,7 @@ export const POST = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart }) diff --git a/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts b/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts index 0a2a6899d8..ff3a4579a6 100644 --- a/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts @@ -20,7 +20,7 @@ export const POST = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart }) diff --git a/packages/medusa/src/api/store/carts/[id]/taxes/route.ts b/packages/medusa/src/api/store/carts/[id]/taxes/route.ts index 1c01867de7..bb54e2690c 100644 --- a/packages/medusa/src/api/store/carts/[id]/taxes/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/taxes/route.ts @@ -17,7 +17,7 @@ export const POST = async ( const cart = await refetchCart( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ cart }) diff --git a/packages/medusa/src/api/store/carts/route.ts b/packages/medusa/src/api/store/carts/route.ts index 15e5539cac..6c36ac43ff 100644 --- a/packages/medusa/src/api/store/carts/route.ts +++ b/packages/medusa/src/api/store/carts/route.ts @@ -23,11 +23,7 @@ export const POST = async ( input: workflowInput as CreateCartWorkflowInputDTO, }) - const cart = await refetchCart( - result.id, - req.scope, - req.remoteQueryConfig.fields - ) + const cart = await refetchCart(result.id, req.scope, req.queryConfig.fields) res.status(200).json({ cart }) } diff --git a/packages/medusa/src/api/store/collections/[id]/route.ts b/packages/medusa/src/api/store/collections/[id]/route.ts index a545af34fb..c8ace04efc 100644 --- a/packages/medusa/src/api/store/collections/[id]/route.ts +++ b/packages/medusa/src/api/store/collections/[id]/route.ts @@ -12,7 +12,7 @@ export const GET = async ( const collection = await refetchCollection( req.params.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ collection }) diff --git a/packages/medusa/src/api/store/collections/route.ts b/packages/medusa/src/api/store/collections/route.ts index 506d186074..64535999a7 100644 --- a/packages/medusa/src/api/store/collections/route.ts +++ b/packages/medusa/src/api/store/collections/route.ts @@ -19,9 +19,9 @@ export const GET = async ( entryPoint: "product_collection", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: collections, metadata } = await remoteQuery(query) diff --git a/packages/medusa/src/api/store/currencies/[code]/route.ts b/packages/medusa/src/api/store/currencies/[code]/route.ts index d132ac9f7f..4aa94c4681 100644 --- a/packages/medusa/src/api/store/currencies/[code]/route.ts +++ b/packages/medusa/src/api/store/currencies/[code]/route.ts @@ -17,7 +17,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "currency", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [currency] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/currencies/route.ts b/packages/medusa/src/api/store/currencies/route.ts index 1b21e03621..a77c94ee00 100644 --- a/packages/medusa/src/api/store/currencies/route.ts +++ b/packages/medusa/src/api/store/currencies/route.ts @@ -15,9 +15,9 @@ export const GET = async ( entryPoint: "currency", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: currencies, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts b/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts index 64829aecc8..e1912ffb9f 100644 --- a/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts +++ b/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts @@ -30,7 +30,7 @@ export const GET = async ( variables: { filters: { id: req.params.address_id, customer_id: customerId }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [address] = await remoteQuery(queryObject) @@ -59,11 +59,7 @@ export const POST = async ( }, }) - const customer = await refetchCustomer( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const customer = await refetchCustomer(id, req.scope, req.queryConfig.fields) res.status(200).json({ customer }) } @@ -80,11 +76,7 @@ export const DELETE = async ( input: { ids: [req.params.address_id] }, }) - const customer = await refetchCustomer( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const customer = await refetchCustomer(id, req.scope, req.queryConfig.fields) res.status(200).json({ id, diff --git a/packages/medusa/src/api/store/customers/me/addresses/route.ts b/packages/medusa/src/api/store/customers/me/addresses/route.ts index 0dd6e37517..1eed1714e7 100644 --- a/packages/medusa/src/api/store/customers/me/addresses/route.ts +++ b/packages/medusa/src/api/store/customers/me/addresses/route.ts @@ -26,9 +26,9 @@ export const GET = async ( entryPoint: "customer_address", variables: { filters: { ...req.filterableFields, customer_id: customerId }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: addresses, metadata } = await remoteQuery(queryObject) @@ -62,7 +62,7 @@ export const POST = async ( const customer = await refetchCustomer( customerId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer }) diff --git a/packages/medusa/src/api/store/customers/me/route.ts b/packages/medusa/src/api/store/customers/me/route.ts index 40ba3357fc..e23994c4c6 100644 --- a/packages/medusa/src/api/store/customers/me/route.ts +++ b/packages/medusa/src/api/store/customers/me/route.ts @@ -17,11 +17,7 @@ export const GET = async ( res: MedusaResponse ) => { const id = req.auth_context.actor_id - const customer = await refetchCustomer( - id, - req.scope, - req.remoteQueryConfig.fields - ) + const customer = await refetchCustomer(id, req.scope, req.queryConfig.fields) if (!customer) { throw new MedusaError( @@ -48,7 +44,7 @@ export const POST = async ( const customer = await refetchCustomer( customerId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer }) } diff --git a/packages/medusa/src/api/store/customers/route.ts b/packages/medusa/src/api/store/customers/route.ts index ea3921ef46..87df269620 100644 --- a/packages/medusa/src/api/store/customers/route.ts +++ b/packages/medusa/src/api/store/customers/route.ts @@ -30,7 +30,7 @@ export const POST = async ( const customer = await refetchCustomer( result.id, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ customer }) diff --git a/packages/medusa/src/api/store/orders/[id]/route.ts b/packages/medusa/src/api/store/orders/[id]/route.ts index f814de1b4d..e7e2ee3231 100644 --- a/packages/medusa/src/api/store/orders/[id]/route.ts +++ b/packages/medusa/src/api/store/orders/[id]/route.ts @@ -10,7 +10,7 @@ export const GET = async ( const workflow = getOrderDetailWorkflow(req.scope) const { result } = await workflow.run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, order_id: req.params.id, filters: { is_draft_order: false, diff --git a/packages/medusa/src/api/store/orders/[id]/transfer/accept/route.ts b/packages/medusa/src/api/store/orders/[id]/transfer/accept/route.ts index f46a1bc46a..90c4b9c4d4 100644 --- a/packages/medusa/src/api/store/orders/[id]/transfer/accept/route.ts +++ b/packages/medusa/src/api/store/orders/[id]/transfer/accept/route.ts @@ -20,7 +20,7 @@ export const POST = async ( const { result } = await getOrderDetailWorkflow(req.scope).run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, order_id: req.params.id, }, }) diff --git a/packages/medusa/src/api/store/orders/[id]/transfer/cancel/route.ts b/packages/medusa/src/api/store/orders/[id]/transfer/cancel/route.ts index 54d05f78a9..78b8b4dbf8 100644 --- a/packages/medusa/src/api/store/orders/[id]/transfer/cancel/route.ts +++ b/packages/medusa/src/api/store/orders/[id]/transfer/cancel/route.ts @@ -25,7 +25,7 @@ export const POST = async ( const { result } = await getOrderDetailWorkflow(req.scope).run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, order_id: orderId, }, }) diff --git a/packages/medusa/src/api/store/orders/[id]/transfer/decline/route.ts b/packages/medusa/src/api/store/orders/[id]/transfer/decline/route.ts index f82f00d9fe..8644d87d7a 100644 --- a/packages/medusa/src/api/store/orders/[id]/transfer/decline/route.ts +++ b/packages/medusa/src/api/store/orders/[id]/transfer/decline/route.ts @@ -20,7 +20,7 @@ export const POST = async ( const { result } = await getOrderDetailWorkflow(req.scope).run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, order_id: req.params.id, }, }) diff --git a/packages/medusa/src/api/store/orders/[id]/transfer/request/route.ts b/packages/medusa/src/api/store/orders/[id]/transfer/request/route.ts index 43f4bc7f62..c61261b9f3 100644 --- a/packages/medusa/src/api/store/orders/[id]/transfer/request/route.ts +++ b/packages/medusa/src/api/store/orders/[id]/transfer/request/route.ts @@ -27,7 +27,7 @@ export const POST = async ( const { result } = await getOrderDetailWorkflow(req.scope).run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, order_id: orderId, }, }) diff --git a/packages/medusa/src/api/store/orders/route.ts b/packages/medusa/src/api/store/orders/route.ts index 2c6e690273..7bdcaf3d44 100644 --- a/packages/medusa/src/api/store/orders/route.ts +++ b/packages/medusa/src/api/store/orders/route.ts @@ -15,13 +15,13 @@ export const GET = async ( is_draft_order: false, customer_id: req.auth_context.actor_id, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, } const workflow = getOrdersListWorkflow(req.scope) const { result } = await workflow.run({ input: { - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, variables, }, }) diff --git a/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts b/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts index b03364c8db..02eadea4a7 100644 --- a/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts +++ b/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts @@ -33,7 +33,7 @@ export const POST = async ( const paymentCollection = await refetchPaymentCollection( collectionId, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) res.status(200).json({ diff --git a/packages/medusa/src/api/store/payment-collections/route.ts b/packages/medusa/src/api/store/payment-collections/route.ts index a70de79dad..ea8c7a762e 100644 --- a/packages/medusa/src/api/store/payment-collections/route.ts +++ b/packages/medusa/src/api/store/payment-collections/route.ts @@ -21,9 +21,7 @@ export const POST = async ( remoteQueryObjectFromString({ entryPoint: "cart_payment_collection", variables: { filters: { cart_id } }, - fields: req.remoteQueryConfig.fields.map( - (f) => `payment_collection.${f}` - ), + fields: req.queryConfig.fields.map((f) => `payment_collection.${f}`), }) ) let paymentCollection = cartCollectionRelation?.payment_collection @@ -37,9 +35,7 @@ export const POST = async ( remoteQueryObjectFromString({ entryPoint: "cart_payment_collection", variables: { filters: { cart_id } }, - fields: req.remoteQueryConfig.fields.map( - (f) => `payment_collection.${f}` - ), + fields: req.queryConfig.fields.map((f) => `payment_collection.${f}`), }) ) paymentCollection = cartCollectionRelation?.payment_collection diff --git a/packages/medusa/src/api/store/payment-providers/route.ts b/packages/medusa/src/api/store/payment-providers/route.ts index 13e6e80d41..437962ddf1 100644 --- a/packages/medusa/src/api/store/payment-providers/route.ts +++ b/packages/medusa/src/api/store/payment-providers/route.ts @@ -28,9 +28,9 @@ export const GET = async ( filters: { region_id: req.filterableFields.region_id, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields.map((f) => `payment_provider.${f}`), + fields: req.queryConfig.fields.map((f) => `payment_provider.${f}`), }) const { rows: regionPaymentProvidersRelation, metadata } = await remoteQuery( diff --git a/packages/medusa/src/api/store/product-categories/[id]/route.ts b/packages/medusa/src/api/store/product-categories/[id]/route.ts index e9d7b10711..c08cbd9e67 100644 --- a/packages/medusa/src/api/store/product-categories/[id]/route.ts +++ b/packages/medusa/src/api/store/product-categories/[id]/route.ts @@ -15,7 +15,7 @@ export const GET = async ( "product_category", { id: req.params.id, ...req.filterableFields }, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!category) { diff --git a/packages/medusa/src/api/store/product-categories/route.ts b/packages/medusa/src/api/store/product-categories/route.ts index d74dd5243e..20c1f34b40 100644 --- a/packages/medusa/src/api/store/product-categories/route.ts +++ b/packages/medusa/src/api/store/product-categories/route.ts @@ -21,9 +21,9 @@ export const GET = async ( entryPoint: "product_category", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: product_categories, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/products/[id]/route.ts b/packages/medusa/src/api/store/products/[id]/route.ts index 88c24d614c..2fc3bc314e 100644 --- a/packages/medusa/src/api/store/products/[id]/route.ts +++ b/packages/medusa/src/api/store/products/[id]/route.ts @@ -12,12 +12,12 @@ export const GET = async ( req: RequestWithContext, res: MedusaResponse ) => { - const withInventoryQuantity = req.remoteQueryConfig.fields.some((field) => + const withInventoryQuantity = req.queryConfig.fields.some((field) => field.includes("variants.inventory_quantity") ) if (withInventoryQuantity) { - req.remoteQueryConfig.fields = req.remoteQueryConfig.fields.filter( + req.queryConfig.fields = req.queryConfig.fields.filter( (field) => !field.includes("variants.inventory_quantity") ) } @@ -36,7 +36,7 @@ export const GET = async ( const product = await refetchProduct( filters, req.scope, - req.remoteQueryConfig.fields + req.queryConfig.fields ) if (!product) { diff --git a/packages/medusa/src/api/store/products/route.ts b/packages/medusa/src/api/store/products/route.ts index a9741fe8e2..6db5f57ec2 100644 --- a/packages/medusa/src/api/store/products/route.ts +++ b/packages/medusa/src/api/store/products/route.ts @@ -14,12 +14,12 @@ export const GET = async ( ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const context: object = {} - const withInventoryQuantity = req.remoteQueryConfig.fields.some((field) => + const withInventoryQuantity = req.queryConfig.fields.some((field) => field.includes("variants.inventory_quantity") ) if (withInventoryQuantity) { - req.remoteQueryConfig.fields = req.remoteQueryConfig.fields.filter( + req.queryConfig.fields = req.queryConfig.fields.filter( (field) => !field.includes("variants.inventory_quantity") ) } @@ -34,10 +34,10 @@ export const GET = async ( entryPoint: "product", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, ...context, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: products, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/regions/[id]/route.ts b/packages/medusa/src/api/store/regions/[id]/route.ts index d8c75ea3e6..6cdcf94e3f 100644 --- a/packages/medusa/src/api/store/regions/[id]/route.ts +++ b/packages/medusa/src/api/store/regions/[id]/route.ts @@ -16,7 +16,7 @@ export const GET = async ( variables: { filters: { id: req.params.id }, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [region] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/regions/route.ts b/packages/medusa/src/api/store/regions/route.ts index b1ec2cbb04..0152dda49b 100644 --- a/packages/medusa/src/api/store/regions/route.ts +++ b/packages/medusa/src/api/store/regions/route.ts @@ -15,9 +15,9 @@ export const GET = async ( entryPoint: "region", variables: { filters: req.filterableFields, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: regions, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/return-reasons/[id]/route.ts b/packages/medusa/src/api/store/return-reasons/[id]/route.ts index 8c741ef38e..997d375005 100644 --- a/packages/medusa/src/api/store/return-reasons/[id]/route.ts +++ b/packages/medusa/src/api/store/return-reasons/[id]/route.ts @@ -17,7 +17,7 @@ export const GET = async ( const queryObject = remoteQueryObjectFromString({ entryPoint: "return_reason", variables, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const [return_reason] = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/return-reasons/route.ts b/packages/medusa/src/api/store/return-reasons/route.ts index 9911bf8089..94a8414f7a 100644 --- a/packages/medusa/src/api/store/return-reasons/route.ts +++ b/packages/medusa/src/api/store/return-reasons/route.ts @@ -17,9 +17,9 @@ export const GET = async ( filters: { ...req.filterableFields, }, - ...req.remoteQueryConfig.pagination, + ...req.queryConfig.pagination, }, - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, }) const { rows: return_reasons, metadata } = await remoteQuery(queryObject) diff --git a/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts b/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts index 50a4420d72..8447d00eb7 100644 --- a/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts +++ b/packages/medusa/src/api/store/shipping-options/[id]/calculate/route.ts @@ -20,7 +20,7 @@ export const POST = async ( const { data } = await query.graph({ entity: "shipping_option", - fields: req.remoteQueryConfig.fields, + fields: req.queryConfig.fields, filters: { id: req.params.id }, }) diff --git a/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts b/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts index 693ed43b3a..2a4567cdfb 100644 --- a/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts +++ b/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts @@ -9,14 +9,14 @@ import { export function normalizeDataForContext() { return async (req: AuthenticatedMedusaRequest, _, next: NextFunction) => { // If the product pricing is not requested, we don't need region information - let withCalculatedPrice = req.remoteQueryConfig.fields.some((field) => + let withCalculatedPrice = req.queryConfig.fields.some((field) => field.startsWith("variants.calculated_price") ) // If the region is passed, we calculate the prices without requesting them. // TODO: This seems a bit messy, reconsider if we want to keep this logic. if (!withCalculatedPrice && req.filterableFields.region_id) { - req.remoteQueryConfig.fields.push("variants.calculated_price.*") + req.queryConfig.fields.push("variants.calculated_price.*") withCalculatedPrice = true } diff --git a/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts b/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts index 8f74374e80..98b1a12bb5 100644 --- a/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts +++ b/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts @@ -9,7 +9,7 @@ import { NextFunction } from "express" export function setPricingContext() { return async (req: AuthenticatedMedusaRequest, _, next: NextFunction) => { - const withCalculatedPrice = req.remoteQueryConfig.fields.some((field) => + const withCalculatedPrice = req.queryConfig.fields.some((field) => field.startsWith("variants.calculated_price") ) if (!withCalculatedPrice) { diff --git a/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts b/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts index 90c4712876..3c76c8f4c3 100644 --- a/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts +++ b/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts @@ -10,7 +10,7 @@ import { RequestWithContext } from "../../../store/products/helpers" export function setTaxContext() { return async (req: AuthenticatedMedusaRequest, _, next: NextFunction) => { - const withCalculatedPrice = req.remoteQueryConfig.fields.some((field) => + const withCalculatedPrice = req.queryConfig.fields.some((field) => field.startsWith("variants.calculated_price") ) if (!withCalculatedPrice) { diff --git a/packages/medusa/src/types/global.ts b/packages/medusa/src/types/global.ts index 942f248797..9eee33e59b 100644 --- a/packages/medusa/src/types/global.ts +++ b/packages/medusa/src/types/global.ts @@ -28,7 +28,7 @@ declare global { /** * An object containing fields and variables to be used with the remoteQuery */ - remoteQueryConfig: { + queryConfig: { fields: string[] pagination: { order?: Record @@ -36,6 +36,12 @@ declare global { take?: number } } + + /** + * @deprecated. Instead use "req.queryConfig" + */ + remoteQueryConfig: Request["queryConfig"] + /** * An object containing the fields that are filterable e.g `{ id: Any }` */