From 8b61dccd0f320314c002befde5c729a7ee26362c Mon Sep 17 00:00:00 2001 From: Oli Juhl <59018053+olivermrbl@users.noreply.github.com> Date: Tue, 7 May 2024 09:39:42 +0200 Subject: [PATCH] fix(dashboard,medusa): Minor clean-up of admin v2 (#7257) --- .../layout/main-layout/main-layout.tsx | 27 ++++++++++--------- .../settings-layout/settings-layout.tsx | 8 ------ .../src/hooks/api/customer-groups.tsx | 2 +- .../src/lib/client/customer-groups.ts | 2 +- .../providers/router-provider/route-map.tsx | 2 +- .../add-customers-form/add-customers-form.tsx | 2 +- .../api-v2/admin/price-lists/validators.ts | 4 +-- 7 files changed, 21 insertions(+), 26 deletions(-) diff --git a/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx b/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx index 2eabd55802..52abfc5c8c 100644 --- a/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx +++ b/packages/admin-next/dashboard/src/components/layout/main-layout/main-layout.tsx @@ -87,10 +87,11 @@ const useCoreRoutes = (): Omit[] => { label: t("orders.domain"), to: "/orders", items: [ - { - label: t("draftOrders.domain"), - to: "/draft-orders", - }, + // TODO: Enable when domin is introduced + // { + // label: t("draftOrders.domain"), + // to: "/draft-orders", + // }, ], }, { @@ -98,18 +99,20 @@ const useCoreRoutes = (): Omit[] => { label: t("products.domain"), to: "/products", items: [ - { - label: t("collections.domain"), - to: "/collections", - }, + // TODO: Enable when domin is introduced + // { + // label: t("collections.domain"), + // to: "/collections", + // }, { label: t("categories.domain"), to: "/categories", }, - { - label: t("giftCards.domain"), - to: "/gift-cards", - }, + // TODO: Enable when domin is introduced + // { + // label: t("giftCards.domain"), + // to: "/gift-cards", + // }, ], }, { diff --git a/packages/admin-next/dashboard/src/components/layout/settings-layout/settings-layout.tsx b/packages/admin-next/dashboard/src/components/layout/settings-layout/settings-layout.tsx index b8dc416c1f..d4d44ecd12 100644 --- a/packages/admin-next/dashboard/src/components/layout/settings-layout/settings-layout.tsx +++ b/packages/admin-next/dashboard/src/components/layout/settings-layout/settings-layout.tsx @@ -37,18 +37,10 @@ const useSettingRoutes = (): NavItemProps[] => { label: t("regions.domain"), to: "/settings/regions", }, - { - label: t("returnReasons.domain"), - to: "/settings/return-reasons", - }, { label: "Taxes", to: "/settings/taxes", }, - { - label: "Locations", - to: "/settings/locations", - }, { label: t("salesChannels.domain"), to: "/settings/sales-channels", 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 6517de2bfc..9d0a188610 100644 --- a/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx +++ b/packages/admin-next/dashboard/src/hooks/api/customer-groups.tsx @@ -135,7 +135,7 @@ export const useAddCustomersToGroup = ( options?: UseMutationOptions< AdminCustomerGroupResponse, Error, - { customer_ids: { id: string }[] } + { customer_ids: string[] } > ) => { return useMutation({ diff --git a/packages/admin-next/dashboard/src/lib/client/customer-groups.ts b/packages/admin-next/dashboard/src/lib/client/customer-groups.ts index cfe81bc371..f669596ffb 100644 --- a/packages/admin-next/dashboard/src/lib/client/customer-groups.ts +++ b/packages/admin-next/dashboard/src/lib/client/customer-groups.ts @@ -50,7 +50,7 @@ async function deleteCustomerGroup(id: string) { async function batchAddCustomers( id: string, - payload: { customer_ids: { id: string }[] } + payload: { customer_ids: string[] } ) { return postRequest( `/admin/customer-groups/${id}/customers`, diff --git a/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx b/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx index 37469c9d14..fe0cf44d9c 100644 --- a/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx +++ b/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx @@ -347,7 +347,7 @@ export const RouteMap: RouteObject[] = [ path: "create", lazy: () => import( - "../../v2-routes/reservations/reservation-list/create-reservation" + "../../v2-routes/customer-groups/customer-group-create" ), }, ], diff --git a/packages/admin-next/dashboard/src/v2-routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx b/packages/admin-next/dashboard/src/v2-routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx index 1bc2cda529..4ea54d38e8 100644 --- a/packages/admin-next/dashboard/src/v2-routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx +++ b/packages/admin-next/dashboard/src/v2-routes/customer-groups/customer-group-add-customers/components/add-customers-form/add-customers-form.tsx @@ -105,7 +105,7 @@ export const AddCustomersForm = ({ const handleSubmit = form.handleSubmit(async (data) => { await mutateAsync( { - customer_ids: data.customer_ids.map((id) => ({ id })), + customer_ids: data.customer_ids, }, { onSuccess: () => { diff --git a/packages/medusa/src/api-v2/admin/price-lists/validators.ts b/packages/medusa/src/api-v2/admin/price-lists/validators.ts index 01ca9241f0..05971a0a86 100644 --- a/packages/medusa/src/api-v2/admin/price-lists/validators.ts +++ b/packages/medusa/src/api-v2/admin/price-lists/validators.ts @@ -55,8 +55,8 @@ export type AdminUpdatePriceListPriceType = z.infer< export const AdminCreatePriceList = z.object({ title: z.string(), description: z.string(), - starts_at: z.string().optional(), - ends_at: z.string().optional(), + starts_at: z.union([z.string(), z.null()]).optional(), + ends_at: z.union([z.string(), z.null()]).optional(), status: z.nativeEnum(PriceListStatus).optional(), type: z.nativeEnum(PriceListType).optional(), rules: z.record(z.string(), z.array(z.string())).optional(),