From 276278cbe7b3bb0367b8276589bc10f587240870 Mon Sep 17 00:00:00 2001 From: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Date: Tue, 9 Apr 2024 18:46:53 +0200 Subject: [PATCH] minor fixes to region domain and api (#7042) --- .../dashboard/src/lib/format-provider.ts | 2 +- .../create-region-form/create-region-form.tsx | 19 ++++++++++++------- .../regions/region-detail/region-detail.tsx | 6 ++++-- .../src/api-v2/admin/regions/[id]/route.ts | 10 +++++----- .../src/api-v2/admin/regions/middlewares.ts | 2 +- .../src/api-v2/admin/regions/query-config.ts | 6 +----- .../src/api-v2/admin/regions/validators.ts | 2 +- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/packages/admin-next/dashboard/src/lib/format-provider.ts b/packages/admin-next/dashboard/src/lib/format-provider.ts index 1c023682e3..df7a41340c 100644 --- a/packages/admin-next/dashboard/src/lib/format-provider.ts +++ b/packages/admin-next/dashboard/src/lib/format-provider.ts @@ -13,6 +13,6 @@ export const formatProvider = (id: string) => { name .split("-") .map((s) => s.charAt(0).toUpperCase() + s.slice(1)) - .join(" ") + (type ? ` (${type})` : "") + .join(" ") + (type ? ` (${type.toUpperCase()})` : "") ) } diff --git a/packages/admin-next/dashboard/src/v2-routes/regions/region-create/components/create-region-form/create-region-form.tsx b/packages/admin-next/dashboard/src/v2-routes/regions/region-create/components/create-region-form/create-region-form.tsx index 72fce11122..a6a6512f7c 100644 --- a/packages/admin-next/dashboard/src/v2-routes/regions/region-create/components/create-region-form/create-region-form.tsx +++ b/packages/admin-next/dashboard/src/v2-routes/regions/region-create/components/create-region-form/create-region-form.tsx @@ -16,24 +16,24 @@ import { useForm, useWatch } from "react-hook-form" import { useTranslation } from "react-i18next" import * as zod from "zod" -import { RegionCountryDTO, PaymentProviderDTO } from "@medusajs/types" +import { PaymentProviderDTO, RegionCountryDTO } from "@medusajs/types" import { Combobox } from "../../../../../components/common/combobox" import { Form } from "../../../../../components/common/form" import { SplitView } from "../../../../../components/layout/split-view" import { - useRouteModal, RouteFocusModal, + useRouteModal, } from "../../../../../components/route-modal" import { DataTable } from "../../../../../components/table/data-table" +import { useCreateRegion } from "../../../../../hooks/api/regions" import { useDataTable } from "../../../../../hooks/use-data-table" import { countries as staticCountries } from "../../../../../lib/countries" +import { CurrencyInfo } from "../../../../../lib/currencies" import { formatProvider } from "../../../../../lib/format-provider" import { useCountries } from "../../../common/hooks/use-countries" import { useCountryTableColumns } from "../../../common/hooks/use-country-table-columns" import { useCountryTableQuery } from "../../../common/hooks/use-country-table-query" -import { CurrencyInfo } from "../../../../../lib/currencies" -import { useCreateRegion } from "../../../../../hooks/api/regions" type CreateRegionFormProps = { currencies: CurrencyInfo[] @@ -78,7 +78,7 @@ export const CreateRegionForm = ({ const { t } = useTranslation() - const { mutateAsync, isLoading } = useCreateRegion() + const { mutateAsync, isPending } = useCreateRegion() const handleSubmit = form.handleSubmit(async (values) => { await mutateAsync( @@ -195,7 +195,7 @@ export const CreateRegionForm = ({ {t("actions.cancel")} - @@ -322,7 +322,12 @@ export const CreateRegionForm = ({ )}
-
diff --git a/packages/admin-next/dashboard/src/v2-routes/regions/region-detail/region-detail.tsx b/packages/admin-next/dashboard/src/v2-routes/regions/region-detail/region-detail.tsx index 1b5fe35a7d..32c0f6c1cf 100644 --- a/packages/admin-next/dashboard/src/v2-routes/regions/region-detail/region-detail.tsx +++ b/packages/admin-next/dashboard/src/v2-routes/regions/region-detail/region-detail.tsx @@ -1,9 +1,10 @@ import { Outlet, useLoaderData, useParams } from "react-router-dom" +import { JsonViewSection } from "../../../components/common/json-view-section" +import { useRegion } from "../../../hooks/api/regions" import { RegionCountrySection } from "./components/region-country-section" import { RegionGeneralSection } from "./components/region-general-section" import { regionLoader } from "./loader" -import { useRegion } from "../../../hooks/api/regions" export const RegionDetail = () => { const initialData = useLoaderData() as Awaited< @@ -13,7 +14,7 @@ export const RegionDetail = () => { const { id } = useParams() const { region, isLoading, isError, error } = useRegion( id!, - { fields: "*payment_providers" }, + { fields: "*payment_providers,*countries" }, { initialData, } @@ -32,6 +33,7 @@ export const RegionDetail = () => {
+
) diff --git a/packages/medusa/src/api-v2/admin/regions/[id]/route.ts b/packages/medusa/src/api-v2/admin/regions/[id]/route.ts index 720e05f401..61ccaf3217 100644 --- a/packages/medusa/src/api-v2/admin/regions/[id]/route.ts +++ b/packages/medusa/src/api-v2/admin/regions/[id]/route.ts @@ -1,16 +1,16 @@ -import { - AuthenticatedMedusaRequest, - MedusaResponse, -} from "../../../../types/routing" import { deleteRegionsWorkflow, updateRegionsWorkflow, } from "@medusajs/core-flows" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../../types/routing" import { UpdateRegionDTO } from "@medusajs/types" import { ContainerRegistrationKeys, - remoteQueryObjectFromString + remoteQueryObjectFromString, } from "@medusajs/utils" export const GET = async ( diff --git a/packages/medusa/src/api-v2/admin/regions/middlewares.ts b/packages/medusa/src/api-v2/admin/regions/middlewares.ts index 220ac69264..c79a9ff475 100644 --- a/packages/medusa/src/api-v2/admin/regions/middlewares.ts +++ b/packages/medusa/src/api-v2/admin/regions/middlewares.ts @@ -1,12 +1,12 @@ import * as QueryConfig from "./query-config" +import { transformBody, transformQuery } from "../../../api/middlewares" import { AdminGetRegionsParams, AdminGetRegionsRegionParams, AdminPostRegionsRegionReq, AdminPostRegionsReq, } from "./validators" -import { transformBody, transformQuery } from "../../../api/middlewares" import { MiddlewareRoute } from "../../../loaders/helpers/routing/types" import { authenticate } from "../../../utils/authenticate-middleware" diff --git a/packages/medusa/src/api-v2/admin/regions/query-config.ts b/packages/medusa/src/api-v2/admin/regions/query-config.ts index d3d80646ad..199dc1db89 100644 --- a/packages/medusa/src/api-v2/admin/regions/query-config.ts +++ b/packages/medusa/src/api-v2/admin/regions/query-config.ts @@ -6,11 +6,7 @@ export const defaultAdminRegionFields = [ "updated_at", "deleted_at", "metadata", - "countries.id", - "countries.iso_2", - "countries.iso_3", - "countries.num_code", - "countries.name", + "*countries", ] export const retrieveTransformQueryConfig = { diff --git a/packages/medusa/src/api-v2/admin/regions/validators.ts b/packages/medusa/src/api-v2/admin/regions/validators.ts index 67621c0649..94bf1711ef 100644 --- a/packages/medusa/src/api-v2/admin/regions/validators.ts +++ b/packages/medusa/src/api-v2/admin/regions/validators.ts @@ -8,7 +8,7 @@ import { IsString, ValidateNested, } from "class-validator" -import { extendedFindParamsMixin, FindParams } from "../../../types/common" +import { FindParams, extendedFindParamsMixin } from "../../../types/common" import { OperatorMapValidator } from "../../../types/validators/operator-map" export class AdminGetRegionsRegionParams extends FindParams {}