diff --git a/packages/admin-next/dashboard/src/hooks/api/api-keys.tsx b/packages/admin-next/dashboard/src/hooks/api/api-keys.tsx index c9fdf8d2bc..41027c1297 100644 --- a/packages/admin-next/dashboard/src/hooks/api/api-keys.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/api-keys.tsx @@ -114,7 +114,7 @@ export const useRevokeApiKey = ( export const useDeleteApiKey = ( id: string, options?: MutationOptions< - HttpTypes.DeleteResponse<"api_key">, + HttpTypes.AdminApiKeyDeleteResponse, FetchError, void > diff --git a/packages/admin-next/dashboard/src/hooks/api/collections.tsx b/packages/admin-next/dashboard/src/hooks/api/collections.tsx index d22e544b84..9a6fbded6d 100644 --- a/packages/admin-next/dashboard/src/hooks/api/collections.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/collections.tsx @@ -129,7 +129,7 @@ export const useCreateCollection = ( export const useDeleteCollection = ( id: string, options?: UseMutationOptions< - HttpTypes.DeleteResponse<"collection">, + HttpTypes.AdminCollectionDeleteResponse, FetchError, void > diff --git a/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx b/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx index 916690e795..3bf96252e1 100644 --- a/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx @@ -105,7 +105,7 @@ export const useUpdateCustomerGroup = ( export const useDeleteCustomerGroup = ( id: string, options?: UseMutationOptions< - HttpTypes.DeleteResponse<"customer_group">, + HttpTypes.AdminCustomerGroupDeleteResponse, FetchError, void > diff --git a/packages/admin-next/dashboard/src/hooks/api/customers.tsx b/packages/admin-next/dashboard/src/hooks/api/customers.tsx index ef99260459..a5ff2136b4 100644 --- a/packages/admin-next/dashboard/src/hooks/api/customers.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/customers.tsx @@ -1,5 +1,5 @@ import { FetchError } from "@medusajs/js-sdk" -import { DeleteResponse, HttpTypes, PaginatedResponse } from "@medusajs/types" +import { HttpTypes, PaginatedResponse } from "@medusajs/types" import { QueryKey, UseMutationOptions, @@ -96,7 +96,11 @@ export const useUpdateCustomer = ( export const useDeleteCustomer = ( id: string, - options?: UseMutationOptions, FetchError, void> + options?: UseMutationOptions< + HttpTypes.AdminCustomerDeleteResponse, + FetchError, + void + > ) => { return useMutation({ mutationFn: () => sdk.admin.customer.delete(id), diff --git a/packages/admin-next/dashboard/src/hooks/api/invites.tsx b/packages/admin-next/dashboard/src/hooks/api/invites.tsx index afc8c41844..d049716621 100644 --- a/packages/admin-next/dashboard/src/hooks/api/invites.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/invites.tsx @@ -1,6 +1,5 @@ import { AdminInviteResponse, - DeleteResponse, HttpTypes, PaginatedResponse, } from "@medusajs/types" @@ -94,7 +93,7 @@ export const useResendInvite = ( export const useDeleteInvite = ( id: string, - options?: UseMutationOptions, Error, void> + options?: UseMutationOptions ) => { return useMutation({ mutationFn: () => sdk.admin.invite.delete(id), diff --git a/packages/admin-next/dashboard/src/hooks/api/regions.tsx b/packages/admin-next/dashboard/src/hooks/api/regions.tsx index c2053d4206..f0e2865264 100644 --- a/packages/admin-next/dashboard/src/hooks/api/regions.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/regions.tsx @@ -1,4 +1,4 @@ -import { DeleteResponse, HttpTypes, PaginatedResponse } from "@medusajs/types" +import { HttpTypes, PaginatedResponse } from "@medusajs/types" import { QueryKey, UseMutationOptions, @@ -111,7 +111,7 @@ export const useUpdateRegion = ( export const useDeleteRegion = ( id: string, - options?: UseMutationOptions, Error, void> + options?: UseMutationOptions ) => { return useMutation({ mutationFn: () => sdk.admin.region.delete(id), diff --git a/packages/admin-next/dashboard/src/hooks/api/reservations.tsx b/packages/admin-next/dashboard/src/hooks/api/reservations.tsx index 14c4303b60..6113ea245f 100644 --- a/packages/admin-next/dashboard/src/hooks/api/reservations.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/reservations.tsx @@ -122,7 +122,7 @@ export const useCreateReservationItem = ( export const useDeleteReservationItem = ( id: string, options?: UseMutationOptions< - HttpTypes.DeleteResponse<"reservation">, + HttpTypes.AdminReservationDeleteResponse, FetchError, void > diff --git a/packages/core/js-sdk/src/admin/api-key.ts b/packages/core/js-sdk/src/admin/api-key.ts index 8f481fa42b..7cae5ed2b8 100644 --- a/packages/core/js-sdk/src/admin/api-key.ts +++ b/packages/core/js-sdk/src/admin/api-key.ts @@ -73,7 +73,7 @@ export class ApiKey { } async delete(id: string, headers?: ClientHeaders) { - return await this.client.fetch>( + return await this.client.fetch( `/admin/api-keys/${id}`, { method: "DELETE", diff --git a/packages/core/js-sdk/src/admin/customer-group.ts b/packages/core/js-sdk/src/admin/customer-group.ts index f78899707c..9a10f20a19 100644 --- a/packages/core/js-sdk/src/admin/customer-group.ts +++ b/packages/core/js-sdk/src/admin/customer-group.ts @@ -71,7 +71,7 @@ export class CustomerGroup { } async delete(id: string, headers?: ClientHeaders) { - return await this.client.fetch>( + return await this.client.fetch( `/admin/customer-groups/${id}`, { method: "DELETE", diff --git a/packages/core/js-sdk/src/admin/customer.ts b/packages/core/js-sdk/src/admin/customer.ts index 6d4d37b0c5..161312451a 100644 --- a/packages/core/js-sdk/src/admin/customer.ts +++ b/packages/core/js-sdk/src/admin/customer.ts @@ -1,5 +1,4 @@ import { - DeleteResponse, FindParams, HttpTypes, PaginatedResponse, @@ -69,7 +68,7 @@ export class Customer { } async delete(id: string, headers?: ClientHeaders) { - return this.client.fetch>( + return this.client.fetch( `/admin/customers/${id}`, { method: "DELETE", diff --git a/packages/core/js-sdk/src/admin/invite.ts b/packages/core/js-sdk/src/admin/invite.ts index 43c9d03126..70d4d81147 100644 --- a/packages/core/js-sdk/src/admin/invite.ts +++ b/packages/core/js-sdk/src/admin/invite.ts @@ -1,5 +1,4 @@ import { - DeleteResponse, FindParams, HttpTypes, PaginatedResponse, @@ -76,7 +75,7 @@ export class Invite { } async delete(id: string, headers?: ClientHeaders) { - return await this.client.fetch>( + return await this.client.fetch( `/admin/invites/${id}`, { method: "DELETE", diff --git a/packages/core/js-sdk/src/admin/region.ts b/packages/core/js-sdk/src/admin/region.ts index 70fd099506..385089d2c0 100644 --- a/packages/core/js-sdk/src/admin/region.ts +++ b/packages/core/js-sdk/src/admin/region.ts @@ -1,5 +1,4 @@ import { - DeleteResponse, FindParams, HttpTypes, PaginatedResponse, @@ -70,7 +69,7 @@ export class Region { } async delete(id: string, headers?: ClientHeaders) { - return await this.client.fetch>( + return await this.client.fetch( `/admin/regions/${id}`, { method: "DELETE", diff --git a/packages/core/js-sdk/src/admin/reservation.ts b/packages/core/js-sdk/src/admin/reservation.ts index 46dccb4da6..eab007655c 100644 --- a/packages/core/js-sdk/src/admin/reservation.ts +++ b/packages/core/js-sdk/src/admin/reservation.ts @@ -71,7 +71,7 @@ class Reservation { } async delete(id: string, headers?: ClientHeaders) { - return await this.client.fetch>( + return await this.client.fetch( `/admin/reservations/${id}`, { method: "DELETE", diff --git a/packages/core/js-sdk/src/admin/upload.ts b/packages/core/js-sdk/src/admin/upload.ts index 9568d96f49..c482d7aef6 100644 --- a/packages/core/js-sdk/src/admin/upload.ts +++ b/packages/core/js-sdk/src/admin/upload.ts @@ -1,4 +1,4 @@ -import { DeleteResponse, HttpTypes, SelectParams } from "@medusajs/types" +import { HttpTypes, SelectParams } from "@medusajs/types" import { Client } from "../client" import { ClientHeaders } from "../types" @@ -59,7 +59,7 @@ export class Upload { } async delete(id: string, headers?: ClientHeaders) { - return this.client.fetch>(`/admin/uploads/${id}`, { + return this.client.fetch(`/admin/uploads/${id}`, { method: "DELETE", headers, }) diff --git a/packages/core/js-sdk/src/store/index.ts b/packages/core/js-sdk/src/store/index.ts index f27ff83c87..1ba06eb58a 100644 --- a/packages/core/js-sdk/src/store/index.ts +++ b/packages/core/js-sdk/src/store/index.ts @@ -1,5 +1,4 @@ import { - DeleteResponse, FindParams, HttpTypes, PaginatedResponse, @@ -206,7 +205,7 @@ export class Store { headers?: ClientHeaders ) => { return this.client.fetch< - DeleteResponse<"line-item", HttpTypes.StoreCart> + HttpTypes.StoreLineItemDeleteResponse >(`/store/carts/${cartId}/line-items/${lineItemId}`, { method: "DELETE", headers, @@ -434,7 +433,7 @@ export class Store { }, deleteAddress: async (addressId: string, headers?: ClientHeaders) => { return this.client.fetch< - DeleteResponse<"address", HttpTypes.StoreCustomer> + HttpTypes.StoreCustomerAddressDeleteResponse >(`/store/customers/me/addresses/${addressId}`, { method: "DELETE", headers, diff --git a/packages/core/types/src/http/api-key/admin/index.ts b/packages/core/types/src/http/api-key/admin/index.ts index cfa3aa8953..63ca1e7d01 100644 --- a/packages/core/types/src/http/api-key/admin/index.ts +++ b/packages/core/types/src/http/api-key/admin/index.ts @@ -1,3 +1,3 @@ -export * from "./api-key" +export * from "./responses" export * from "./payloads" export * from "./queries" diff --git a/packages/core/types/src/http/api-key/admin/api-key.ts b/packages/core/types/src/http/api-key/admin/responses.ts similarity index 76% rename from packages/core/types/src/http/api-key/admin/api-key.ts rename to packages/core/types/src/http/api-key/admin/responses.ts index b5b54048de..9a6a47a744 100644 --- a/packages/core/types/src/http/api-key/admin/api-key.ts +++ b/packages/core/types/src/http/api-key/admin/responses.ts @@ -1,5 +1,5 @@ import { ApiKeyType } from "../../../api-key" -import { PaginatedResponse } from "../../common" +import { DeleteResponse, PaginatedResponse } from "../../common" interface AdminApiKey { id: string @@ -21,3 +21,5 @@ export interface AdminApiKeyResponse { export type AdminApiKeyListResponse = PaginatedResponse<{ api_keys: AdminApiKey[] }> + +export type AdminApiKeyDeleteResponse = DeleteResponse<"api_key"> \ No newline at end of file diff --git a/packages/core/types/src/http/campaign/admin/responses.ts b/packages/core/types/src/http/campaign/admin/responses.ts index 07fb5428a6..5d81754921 100644 --- a/packages/core/types/src/http/campaign/admin/responses.ts +++ b/packages/core/types/src/http/campaign/admin/responses.ts @@ -1,5 +1,5 @@ import { CampaignBudgetTypeValues } from "../../../promotion" -import { PaginatedResponse } from "../../common" +import { DeleteResponse, PaginatedResponse } from "../../common" export interface AdminCampaign { id: string @@ -25,3 +25,5 @@ export type AdminCampaignListResponse = PaginatedResponse<{ export interface AdminCampaignResponse { campaign: AdminCampaign } + +export type AdminCampaignDeleteResponse = DeleteResponse<"campaign"> \ No newline at end of file diff --git a/packages/core/types/src/http/cart/store/responses.ts b/packages/core/types/src/http/cart/store/responses.ts index f517335db5..db2e5e16e2 100644 --- a/packages/core/types/src/http/cart/store/responses.ts +++ b/packages/core/types/src/http/cart/store/responses.ts @@ -1,3 +1,4 @@ +import { DeleteResponseWithParent } from "../../common" import { StoreOrder } from "../../order" import { StoreCart } from "./entities" @@ -16,4 +17,6 @@ export type StoreCompleteCartResponse = { } | { type: "order" order: StoreOrder -} \ No newline at end of file +} + +export type StoreLineItemDeleteResponse = DeleteResponseWithParent<"line-item", StoreCart> \ No newline at end of file diff --git a/packages/core/types/src/http/common/response.ts b/packages/core/types/src/http/common/response.ts index 80a2b2fa2a..c06ea8b2e8 100644 --- a/packages/core/types/src/http/common/response.ts +++ b/packages/core/types/src/http/common/response.ts @@ -1,4 +1,4 @@ -export type DeleteResponse = { +export type DeleteResponse = { /** * The ID of the item that was deleted. */ @@ -13,13 +13,17 @@ export type DeleteResponse = { * Whether the item was deleted successfully. */ deleted: boolean - - /** - * The parent resource of the item that was deleted, if applicable. - */ - parent?: TParent } +export type DeleteResponseWithParent = + DeleteResponse & + { + /** + * The parent resource of the item that was deleted, if applicable. + */ + parent?: TParent + } + export type PaginatedResponse = { limit: number offset: number diff --git a/packages/core/types/src/http/customer/admin/responses.ts b/packages/core/types/src/http/customer/admin/responses.ts index 1ef83316f4..9fbadae5c3 100644 --- a/packages/core/types/src/http/customer/admin/responses.ts +++ b/packages/core/types/src/http/customer/admin/responses.ts @@ -1,4 +1,4 @@ -import { PaginatedResponse } from "../../common" +import { DeleteResponse, DeleteResponseWithParent, PaginatedResponse } from "../../common" import { AdminCustomer, AdminCustomerAddress } from "./entities" export interface AdminCustomerResponse { @@ -16,3 +16,12 @@ export interface AdminCustomerAddressResponse { export type AdminCustomerAddressListResponse = PaginatedResponse<{ addresses: AdminCustomerAddress[] }> + +export type AdminCustomerDeleteResponse = DeleteResponse<"customer"> + +export type AdminCustomerGroupDeleteResponse = DeleteResponse<"customer_group"> + +export type AdminCustomerAddressDeleteResponse = DeleteResponseWithParent< + "customer_address", + AdminCustomer +> diff --git a/packages/core/types/src/http/customer/store/responses.ts b/packages/core/types/src/http/customer/store/responses.ts index 34d8a10465..493c18048c 100644 --- a/packages/core/types/src/http/customer/store/responses.ts +++ b/packages/core/types/src/http/customer/store/responses.ts @@ -1,4 +1,4 @@ -import { PaginatedResponse } from "../../common"; +import { DeleteResponseWithParent, PaginatedResponse } from "../../common"; import { StoreCustomer, StoreCustomerAddress } from "./entities"; export interface StoreCustomerResponse { @@ -11,3 +11,5 @@ export interface StoreCustomerAddressResponse { export interface StoreCustomerAddressListResponse extends PaginatedResponse<{ addresses: StoreCustomerAddress[] }> {} + +export type StoreCustomerAddressDeleteResponse = DeleteResponseWithParent<"address", StoreCustomer> \ No newline at end of file diff --git a/packages/core/types/src/http/file/admin/responses.ts b/packages/core/types/src/http/file/admin/responses.ts index fa409bf5fd..073c4654c7 100644 --- a/packages/core/types/src/http/file/admin/responses.ts +++ b/packages/core/types/src/http/file/admin/responses.ts @@ -1,3 +1,4 @@ +import { DeleteResponse } from "../../common"; import { AdminFile } from "./entities"; export interface AdminFileResponse { @@ -6,4 +7,6 @@ export interface AdminFileResponse { export interface AdminFileListResponse { files: AdminFile[] -} \ No newline at end of file +} + +export type AdminFileDeleteResponse = DeleteResponse<"file"> \ No newline at end of file diff --git a/packages/core/types/src/http/fulfillment-set/admin/responses.ts b/packages/core/types/src/http/fulfillment-set/admin/responses.ts index 3a14cb51fe..5d1e62384f 100644 --- a/packages/core/types/src/http/fulfillment-set/admin/responses.ts +++ b/packages/core/types/src/http/fulfillment-set/admin/responses.ts @@ -1,4 +1,4 @@ -import { DeleteResponse } from "../../common" +import { DeleteResponse, DeleteResponseWithParent } from "../../common" import { AdminFulfillmentSet, AdminServiceZone } from "./entities" export interface AdminServiceZoneResponse { @@ -6,7 +6,7 @@ export interface AdminServiceZoneResponse { } export interface AdminServiceZoneDeleteResponse - extends DeleteResponse<"service_zone", AdminFulfillmentSet> {} + extends DeleteResponseWithParent<"service_zone", AdminFulfillmentSet> {} export interface AdminFulfillmentSetResponse { fulfillment_set: AdminFulfillmentSet diff --git a/packages/core/types/src/http/inventory/admin/responses.ts b/packages/core/types/src/http/inventory/admin/responses.ts index 28e2e1e937..2ae2370b9e 100644 --- a/packages/core/types/src/http/inventory/admin/responses.ts +++ b/packages/core/types/src/http/inventory/admin/responses.ts @@ -1,4 +1,4 @@ -import { DeleteResponse, PaginatedResponse } from "../../common" +import { DeleteResponse, DeleteResponseWithParent, PaginatedResponse } from "../../common" import { AdminInventoryItem } from "./entities" export interface AdminInventoryItemResponse { @@ -10,3 +10,8 @@ export type AdminInventoryItemListResponse = PaginatedResponse<{ }> export type AdminInventoryItemDeleteResponse = DeleteResponse<"inventory_item"> + +export type AdminInventoryLevelDeleteResponse = DeleteResponseWithParent< + "inventory-level", + AdminInventoryItem +> \ No newline at end of file diff --git a/packages/core/types/src/http/invite/admin/responses.ts b/packages/core/types/src/http/invite/admin/responses.ts index d326abdaf9..c746992f1f 100644 --- a/packages/core/types/src/http/invite/admin/responses.ts +++ b/packages/core/types/src/http/invite/admin/responses.ts @@ -1,4 +1,4 @@ -import { PaginatedResponse } from "../../common"; +import { DeleteResponse, PaginatedResponse } from "../../common"; import { AdminUser } from "../../user"; import { AdminInvite } from "./entities"; @@ -14,4 +14,6 @@ export type AdminAcceptInviteResponse = { user: AdminUser } | { message: string -} \ No newline at end of file +} + +export type AdminInviteDeleteResponse = DeleteResponse<"invite"> \ No newline at end of file diff --git a/packages/core/types/src/http/order-edit/admin/responses.ts b/packages/core/types/src/http/order-edit/admin/responses.ts index b43a735fc3..aa47795d35 100644 --- a/packages/core/types/src/http/order-edit/admin/responses.ts +++ b/packages/core/types/src/http/order-edit/admin/responses.ts @@ -1,4 +1,5 @@ import { OrderChangeDTO, OrderPreviewDTO } from "../../../order" +import { DeleteResponse } from "../../common" export interface AdminOrderEditPreviewResponse { order_preview: OrderPreviewDTO @@ -8,8 +9,4 @@ export interface AdminOrderEditResponse { order_change: OrderChangeDTO } -export interface AdminOrderEditDeleteResponse { - id: string - object: "order-edit" - deleted: true -} +export type AdminOrderEditDeleteResponse = DeleteResponse<"order-edit"> diff --git a/packages/core/types/src/http/payment/admin/responses.ts b/packages/core/types/src/http/payment/admin/responses.ts index ae99ee87cb..6790ad8f97 100644 --- a/packages/core/types/src/http/payment/admin/responses.ts +++ b/packages/core/types/src/http/payment/admin/responses.ts @@ -45,3 +45,5 @@ export type RefundReasonsResponse = PaginatedResponse<{ export type AdminPaymentProviderListResponse = PaginatedResponse<{ payment_providers: AdminPaymentProvider[] }> + +export type AdminRefundReasonDeleteResponse = DeleteResponse<"refund_reason"> diff --git a/packages/core/types/src/http/product/admin/responses.ts b/packages/core/types/src/http/product/admin/responses.ts index 1b599b2cd8..db15104e01 100644 --- a/packages/core/types/src/http/product/admin/responses.ts +++ b/packages/core/types/src/http/product/admin/responses.ts @@ -1,5 +1,5 @@ import { BatchMethodResponse } from "../../../common" -import { DeleteResponse, PaginatedResponse } from "../../common" +import { DeleteResponse, DeleteResponseWithParent, PaginatedResponse } from "../../common" import { AdminProduct, AdminProductOption, @@ -30,7 +30,7 @@ export type AdminProductVariantListResponse = PaginatedResponse<{ }> export interface AdminProductVariantDeleteResponse - extends DeleteResponse<"variant", AdminProduct> {} + extends DeleteResponseWithParent<"variant", AdminProduct> {} export interface AdminExportProductResponse { transaction_id: string @@ -59,7 +59,7 @@ export type AdminProductOptionListResponse = PaginatedResponse<{ }> export interface AdminProductOptionDeleteResponse - extends DeleteResponse<"product_option", AdminProduct> {} + extends DeleteResponseWithParent<"product_option", AdminProduct> {} export type AdminProductVariantInventoryResponse = AdminProductVariantInventoryLink | AdminProductVariantInventoryLink[] diff --git a/packages/core/types/src/http/promotion/admin/responses.ts b/packages/core/types/src/http/promotion/admin/responses.ts index d481e71117..b64709e160 100644 --- a/packages/core/types/src/http/promotion/admin/responses.ts +++ b/packages/core/types/src/http/promotion/admin/responses.ts @@ -1,5 +1,5 @@ import { BatchMethodResponse } from "../../../common"; -import { PaginatedResponse } from "../../common"; +import { DeleteResponse, PaginatedResponse } from "../../common"; import { AdminPromotion, AdminPromotionRule, @@ -54,4 +54,6 @@ export type AdminRuleValueOptionsListResponse = { values: AdminRuleValueOption[] } -export type AdminPromotionRuleBatchResponse = BatchMethodResponse \ No newline at end of file +export type AdminPromotionRuleBatchResponse = BatchMethodResponse + +export type AdminPromotionDeleteResponse = DeleteResponse<"promotion"> \ No newline at end of file diff --git a/packages/core/types/src/http/region/admin/responses.ts b/packages/core/types/src/http/region/admin/responses.ts index 5938bd3d1a..8bc2717413 100644 --- a/packages/core/types/src/http/region/admin/responses.ts +++ b/packages/core/types/src/http/region/admin/responses.ts @@ -1,4 +1,4 @@ -import { PaginatedResponse } from "../../common"; +import { DeleteResponse, PaginatedResponse } from "../../common"; import { AdminRegion } from "./entities"; export interface AdminRegionResponse { @@ -7,4 +7,6 @@ export interface AdminRegionResponse { export type AdminRegionListResponse = PaginatedResponse<{ regions: AdminRegion[] -}> \ No newline at end of file +}> + +export type AdminRegionDeleteResponse = DeleteResponse<"region"> \ No newline at end of file diff --git a/packages/core/types/src/http/reservation/admin/responses.ts b/packages/core/types/src/http/reservation/admin/responses.ts index 77224f2c5e..693d3f8708 100644 --- a/packages/core/types/src/http/reservation/admin/responses.ts +++ b/packages/core/types/src/http/reservation/admin/responses.ts @@ -1,4 +1,4 @@ -import { PaginatedResponse } from "../../common" +import { DeleteResponse, PaginatedResponse } from "../../common" import { AdminReservation } from "./entities" export interface AdminReservationResponse { @@ -8,3 +8,5 @@ export interface AdminReservationResponse { export type AdminReservationListResponse = PaginatedResponse<{ reservations: AdminReservation[] }> + +export type AdminReservationDeleteResponse = DeleteResponse<"reservation"> \ No newline at end of file diff --git a/packages/core/types/src/http/return/admin/responses.ts b/packages/core/types/src/http/return/admin/responses.ts index 5c30302ea9..46a87b088f 100644 --- a/packages/core/types/src/http/return/admin/responses.ts +++ b/packages/core/types/src/http/return/admin/responses.ts @@ -1,5 +1,5 @@ import { OrderDTO } from "../../../order" -import { PaginatedResponse } from "../../common" +import { DeleteResponse, PaginatedResponse } from "../../common" import { AdminOrderPreview } from "../../order" import { AdminReturn } from "./entities" @@ -19,4 +19,6 @@ export interface AdminOrderReturnResponse { export interface AdminReturnPreviewResponse { order_preview: AdminOrderPreview return: AdminReturn -} \ No newline at end of file +} + +export type AdminReturnDeleteResponse = DeleteResponse<"return"> \ No newline at end of file diff --git a/packages/core/types/src/http/tax-rate/admin/responses.ts b/packages/core/types/src/http/tax-rate/admin/responses.ts index 0e0e7b917d..c9a70de3d2 100644 --- a/packages/core/types/src/http/tax-rate/admin/responses.ts +++ b/packages/core/types/src/http/tax-rate/admin/responses.ts @@ -1,4 +1,4 @@ -import { DeleteResponse, PaginatedResponse } from "../../common" +import { DeleteResponse, DeleteResponseWithParent, PaginatedResponse } from "../../common" import { AdminTaxRate } from "./entities" export interface AdminTaxRateResponse { @@ -11,3 +11,5 @@ export type AdminTaxRateListResponse = PaginatedResponse<{ export interface AdminTaxRateDeleteResponse extends DeleteResponse<"tax_rate"> {} + +export type AdminTaxRateRuleDeleteResponse = DeleteResponseWithParent<"tax_rate_rule", AdminTaxRate> \ No newline at end of file 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 9bbff4618b..c2ea60e010 100644 --- a/packages/medusa/src/api/admin/api-keys/[id]/route.ts +++ b/packages/medusa/src/api/admin/api-keys/[id]/route.ts @@ -10,7 +10,7 @@ import { import { refetchApiKey } from "../helpers" import { AdminUpdateApiKeyType } from "../validators" import { MedusaError } from "@medusajs/utils" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -54,7 +54,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/campaigns/[id]/route.ts b/packages/medusa/src/api/admin/campaigns/[id]/route.ts index c21fd68273..465e122c8e 100644 --- a/packages/medusa/src/api/admin/campaigns/[id]/route.ts +++ b/packages/medusa/src/api/admin/campaigns/[id]/route.ts @@ -10,7 +10,7 @@ import { import { refetchCampaign } from "../helpers" import { AdminUpdateCampaignType } from "../validators" import { MedusaError } from "@medusajs/utils" -import { AdditionalData, DeleteResponse, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -59,7 +59,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id const deleteCampaigns = deleteCampaignsWorkflow(req.scope) 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 48857c1abd..645c2c4860 100644 --- a/packages/medusa/src/api/admin/customer-groups/[id]/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/[id]/route.ts @@ -10,7 +10,7 @@ import { import { MedusaError } from "@medusajs/utils" import { refetchCustomerGroup } from "../helpers" import { AdminUpdateCustomerGroupType } from "../validators" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -53,7 +53,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id const deleteCustomerGroups = deleteCustomerGroupsWorkflow(req.scope) 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 746d75b45a..74a69268ce 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 @@ -13,7 +13,7 @@ import { } from "@medusajs/utils" import { AdminCreateCustomerAddressType } from "../../../validators" import { refetchCustomer } from "../../../helpers" -import { AdditionalData, DeleteResponse, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -61,7 +61,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.address_id const deleteAddress = deleteCustomerAddressesWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/customers/[id]/route.ts b/packages/medusa/src/api/admin/customers/[id]/route.ts index 6309b61f73..061cf2efbc 100644 --- a/packages/medusa/src/api/admin/customers/[id]/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/route.ts @@ -2,7 +2,7 @@ import { deleteCustomersWorkflow, updateCustomersWorkflow, } from "@medusajs/core-flows" -import { AdditionalData, DeleteResponse, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/types" import { MedusaError } from "@medusajs/utils" import { AuthenticatedMedusaRequest, @@ -55,7 +55,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id const deleteCustomers = deleteCustomersWorkflow(req.scope) 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 338288b130..2120986bcc 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts @@ -2,7 +2,7 @@ import { cancelBeginOrderExchangeWorkflow, confirmExchangeRequestWorkflow, } from "@medusajs/core-flows" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, @@ -66,7 +66,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params 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 4b8a21ba1a..18be0a24da 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 @@ -5,7 +5,7 @@ import { import { AdminFulfillmentSetResponse, AdminServiceZoneResponse, - DeleteResponse, + HttpTypes, IFulfillmentModuleService, } from "@medusajs/types" import { @@ -94,7 +94,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id, zone_id } = req.params @@ -125,6 +125,6 @@ export const DELETE = async ( id: zone_id, object: "service_zone", deleted: true, - parent: fulfillmentSet, + parent: fulfillmentSet as unknown as HttpTypes.AdminFulfillmentSet, }) } 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 ca8c482eb8..211837afff 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 @@ -11,11 +11,11 @@ import { } from "@medusajs/core-flows" import { refetchInventoryItem } from "../../../helpers" import { AdminUpdateInventoryLocationLevelType } from "../../../validators" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const DELETE = async ( req: MedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id, location_id } = req.params 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 dbec0b9850..782cdd75c9 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/route.ts @@ -9,7 +9,7 @@ import { AdminUpdateInventoryItemType, } from "../validators" import { refetchInventoryItem } from "../helpers" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: MedusaRequest, @@ -59,7 +59,7 @@ export const POST = async ( export const DELETE = async ( req: MedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id const deleteInventoryItems = deleteInventoryItemWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/invites/[id]/route.ts b/packages/medusa/src/api/admin/invites/[id]/route.ts index 0216bc9498..05b8972e9c 100644 --- a/packages/medusa/src/api/admin/invites/[id]/route.ts +++ b/packages/medusa/src/api/admin/invites/[id]/route.ts @@ -6,7 +6,7 @@ import { MedusaError } from "@medusajs/utils" import { deleteInvitesWorkflow } from "@medusajs/core-flows" import { refetchInvite } from "../helpers" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -31,7 +31,7 @@ export const GET = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params const workflow = deleteInvitesWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/order-edits/[id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/route.ts index 680833dd64..1c09d4797a 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/route.ts @@ -1,5 +1,5 @@ import { cancelBeginOrderEditWorkflow } from "@medusajs/core-flows" -import { DeleteResponse } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -7,7 +7,7 @@ import { export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/payment-collections/[id]/route.ts b/packages/medusa/src/api/admin/payment-collections/[id]/route.ts index 8c01232063..406cefba30 100644 --- a/packages/medusa/src/api/admin/payment-collections/[id]/route.ts +++ b/packages/medusa/src/api/admin/payment-collections/[id]/route.ts @@ -1,5 +1,5 @@ import { deleteOrderPaymentCollections } from "@medusajs/core-flows" -import { DeleteResponse } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -7,7 +7,7 @@ import { export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/promotions/[id]/route.ts b/packages/medusa/src/api/admin/promotions/[id]/route.ts index 7e9433398e..33b5b30301 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/route.ts @@ -16,7 +16,7 @@ import { AdminGetPromotionParamsType, AdminUpdatePromotionType, } from "../validators" -import { AdditionalData, DeleteResponse, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -71,7 +71,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id const deletePromotions = deletePromotionsWorkflow(req.scope) 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 e2c5731f4b..37d4b0e2c3 100644 --- a/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts +++ b/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts @@ -2,7 +2,7 @@ import { deleteReturnReasonsWorkflow, updateRefundReasonsWorkflow, } from "@medusajs/core-flows" -import { DeleteResponse, RefundReasonResponse } from "@medusajs/types" +import { HttpTypes, RefundReasonResponse } from "@medusajs/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -51,7 +51,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params const input = { ids: [id] } diff --git a/packages/medusa/src/api/admin/regions/[id]/route.ts b/packages/medusa/src/api/admin/regions/[id]/route.ts index 2188cd5df1..66d9738f32 100644 --- a/packages/medusa/src/api/admin/regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/regions/[id]/route.ts @@ -9,7 +9,7 @@ import { } from "../../../../types/routing" import { refetchRegion } from "../helpers" import { AdminGetRegionParamsType, AdminUpdateRegionType } from "../validators" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -53,7 +53,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/reservations/[id]/route.ts b/packages/medusa/src/api/admin/reservations/[id]/route.ts index 263c54d084..e2376a9623 100644 --- a/packages/medusa/src/api/admin/reservations/[id]/route.ts +++ b/packages/medusa/src/api/admin/reservations/[id]/route.ts @@ -10,7 +10,7 @@ import { MedusaError } from "@medusajs/utils" import { deleteReservationsWorkflow } from "@medusajs/core-flows" import { updateReservationsWorkflow } from "@medusajs/core-flows" import { refetchReservation } from "../helpers" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -55,7 +55,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id 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 0db7cb221c..141950a9d3 100644 --- a/packages/medusa/src/api/admin/return-reasons/[id]/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/[id]/route.ts @@ -4,7 +4,7 @@ import { } from "@medusajs/core-flows" import { AdminReturnReasonResponse, - DeleteResponse, + HttpTypes, UpdateOrderReturnReasonDTO, } from "@medusajs/types" import { @@ -69,7 +69,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params 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 26f55c2998..ef171ed01d 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts @@ -13,7 +13,7 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReceiveReturnsReqSchemaType } from "../../validators" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, @@ -56,7 +56,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params 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 3f8553eaf2..883ade7587 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request/route.ts @@ -2,7 +2,7 @@ import { cancelReturnRequestWorkflow, confirmReturnRequestWorkflow, } from "@medusajs/core-flows" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, @@ -49,7 +49,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const { id } = req.params 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 cfe6d99e99..466fdbc349 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 @@ -4,11 +4,11 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { refetchTaxRate } from "../../../helpers" -import { DeleteResponse } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { await deleteTaxRateRulesWorkflow(req.scope).run({ input: { ids: [req.params.rule_id] }, diff --git a/packages/medusa/src/api/admin/uploads/[id]/route.ts b/packages/medusa/src/api/admin/uploads/[id]/route.ts index 09373763ff..dffefe707c 100644 --- a/packages/medusa/src/api/admin/uploads/[id]/route.ts +++ b/packages/medusa/src/api/admin/uploads/[id]/route.ts @@ -3,7 +3,7 @@ import { MedusaResponse, } from "../../../../types/routing" import { deleteFilesWorkflow } from "@medusajs/core-flows" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, MedusaError } from "@medusajs/utils" import { remoteQueryObjectFromString } from "@medusajs/utils" @@ -33,7 +33,7 @@ export const GET = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.id 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 a12d2cad32..ad447a9e5d 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 @@ -2,7 +2,7 @@ import { deleteLineItemsWorkflow, updateLineItemInCartWorkflow, } from "@medusajs/core-flows" -import { DeleteResponse, HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/types" import { MedusaError } from "@medusajs/utils" import { MedusaRequest, MedusaResponse } from "../../../../../../types/routing" import { prepareListQuery } from "../../../../../../utils/get-query-config" @@ -60,7 +60,7 @@ export const POST = async ( export const DELETE = async ( req: MedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.params.line_id 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 7b321d94de..26451f2645 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 @@ -6,8 +6,7 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" - -import { DeleteResponse, HttpTypes, MedusaContainer } from "@medusajs/types" +import { HttpTypes, MedusaContainer } from "@medusajs/types" import { ContainerRegistrationKeys, MedusaError, @@ -71,7 +70,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse> + res: MedusaResponse ) => { const id = req.auth_context.actor_id await validateCustomerAddress(req.scope, id, req.params.address_id)