From a0963f0edf909f6cfea17bd7a0c7899707808057 Mon Sep 17 00:00:00 2001 From: Oli Juhl <59018053+olivermrbl@users.noreply.github.com> Date: Wed, 18 Oct 2023 13:50:47 +0200 Subject: [PATCH] fix(admin-ui): Remove t() on product.status update (#5394) * fix(admin-ui): Remove t() on product.status update * Create tidy-games-drum.md --- .changeset/tidy-games-drum.md | 7 +++++ .../product-table/use-product-actions.tsx | 5 +--- .../ui/src/hooks/use-edit-product-actions.tsx | 1 - .../routes/admin/products/update-product.ts | 26 +++++++++---------- 4 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 .changeset/tidy-games-drum.md diff --git a/.changeset/tidy-games-drum.md b/.changeset/tidy-games-drum.md new file mode 100644 index 0000000000..f5cf47a2a3 --- /dev/null +++ b/.changeset/tidy-games-drum.md @@ -0,0 +1,7 @@ +--- +"@medusajs/medusa": patch +"@medusajs/admin-ui": patch +"@medusajs/admin": patch +--- + +fix(admin-ui): Remove t() on product.status update diff --git a/packages/admin-ui/ui/src/components/templates/product-table/use-product-actions.tsx b/packages/admin-ui/ui/src/components/templates/product-table/use-product-actions.tsx index 69adc8164c..5af83b01af 100644 --- a/packages/admin-ui/ui/src/components/templates/product-table/use-product-actions.tsx +++ b/packages/admin-ui/ui/src/components/templates/product-table/use-product-actions.tsx @@ -48,10 +48,7 @@ const useProductActions = (product: Product) => { ? t("product-table-unpublish", "Unpublish") : t("product-table-publish", "Publish"), onClick: () => { - const newStatus = - product.status === "published" - ? t("product-table-draft", "draft") - : t("product-table-published", "published") + const newStatus = product.status === "published" ? "draft" : "published" updateProduct.mutate( { status: newStatus, diff --git a/packages/admin-ui/ui/src/hooks/use-edit-product-actions.tsx b/packages/admin-ui/ui/src/hooks/use-edit-product-actions.tsx index 8b61aeb134..64ad38f0e1 100644 --- a/packages/admin-ui/ui/src/hooks/use-edit-product-actions.tsx +++ b/packages/admin-ui/ui/src/hooks/use-edit-product-actions.tsx @@ -132,7 +132,6 @@ const useEditProductActions = (productId: string) => { const newStatus = currentStatus === "published" ? "draft" : "published" updateProduct.mutate( { - // @ts-ignore TODO fix update type in API status: newStatus, }, { diff --git a/packages/medusa/src/api/routes/admin/products/update-product.ts b/packages/medusa/src/api/routes/admin/products/update-product.ts index 1ff86e0b2a..3e53973e8e 100644 --- a/packages/medusa/src/api/routes/admin/products/update-product.ts +++ b/packages/medusa/src/api/routes/admin/products/update-product.ts @@ -1,8 +1,3 @@ -import { - CreateProductVariantInput, - ProductVariantPricesUpdateReq, - UpdateProductVariantInput, -} from "../../../../types/product-variant" import { IsArray, IsBoolean, @@ -16,6 +11,8 @@ import { ValidateIf, ValidateNested, } from "class-validator" +import { defaultAdminProductFields, defaultAdminProductRelations } from "." +import { ProductStatus, ProductVariant } from "../../../../models" import { PricingService, ProductService, @@ -28,22 +25,25 @@ import { ProductTagReq, ProductTypeReq, } from "../../../../types/product" -import { ProductStatus, ProductVariant } from "../../../../models" +import { + CreateProductVariantInput, + ProductVariantPricesUpdateReq, + UpdateProductVariantInput, +} from "../../../../types/product-variant" import { createVariantsTransaction, revertVariantTransaction, } from "./transaction/create-product-variant" -import { defaultAdminProductFields, defaultAdminProductRelations } from "." import { DistributedTransaction } from "@medusajs/orchestration" -import { EntityManager } from "typeorm" -import { FeatureFlagDecorators } from "../../../../utils/feature-flag-decorators" import { IInventoryService } from "@medusajs/types" -import { Logger } from "../../../../types/global" import { MedusaError } from "@medusajs/utils" -import { ProductVariantRepository } from "../../../../repositories/product-variant" -import SalesChannelFeatureFlag from "../../../../loaders/feature-flags/sales-channels" import { Type } from "class-transformer" +import { EntityManager } from "typeorm" +import SalesChannelFeatureFlag from "../../../../loaders/feature-flags/sales-channels" +import { ProductVariantRepository } from "../../../../repositories/product-variant" +import { Logger } from "../../../../types/global" +import { FeatureFlagDecorators } from "../../../../utils/feature-flag-decorators" import { validator } from "../../../../utils/validator" /** @@ -603,7 +603,7 @@ export class AdminPostProductsProductReq { @IsEnum(ProductStatus) @NotEquals(null) @ValidateIf((object, value) => value !== undefined) - status?: ProductStatus + status: ProductStatus @IsOptional() @Type(() => ProductTypeReq)