From 8ab5baf78a297572e1a8139f8e20456d36f954ec Mon Sep 17 00:00:00 2001 From: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Date: Sun, 10 Dec 2023 19:36:08 +0100 Subject: [PATCH] fix(admin-ui): Bulk editor default fields (#5829) * fix(ui): Bump cva and minor type fixes * fix version of cva * fix default fields --- .../ui/public/locales/en/translation.json | 2 +- .../edit-prices-modal/edit-prices-actions.tsx | 2 +- .../edit-prices-modal/index.tsx | 16 ++++++++++++++-- .../price-list-product-prices-form.tsx | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/admin-ui/ui/public/locales/en/translation.json b/packages/admin-ui/ui/public/locales/en/translation.json index f46e9330bf..7eae69f388 100644 --- a/packages/admin-ui/ui/public/locales/en/translation.json +++ b/packages/admin-ui/ui/public/locales/en/translation.json @@ -1512,7 +1512,7 @@ "price-list-prices-form-prices-count_other": "{{count}} prices", "price-list-product-prices-form-invalid-data-title": "Invalid data", "price-list-product-prices-form-invalid-data-body": "The data you pasted contains values that are not numbers.", - "price-list-product-prices-form-column-visibility-button": "View", + "price-list-product-prices-form-column-visibility-button": "Currencies", "price-list-product-prices-form-column-visibility-currencies-label": "Currencies", "price-list-product-prices-form-column-visibility-regions-label": "Regions", "price-list-product-prices-form-column-product-label": "Product", diff --git a/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/edit-prices-actions.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/edit-prices-actions.tsx index 0cd3503e72..6c40e5e97f 100644 --- a/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/edit-prices-actions.tsx +++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/edit-prices-actions.tsx @@ -43,7 +43,7 @@ function EditPricesActions(props: EditPricesActionsProps) { diff --git a/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/index.tsx index c99fe2430a..1e88e3b1f6 100644 --- a/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/index.tsx +++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-prices-modal/index.tsx @@ -1,5 +1,9 @@ import { MoneyAmount, Product } from "@medusajs/client-types" -import { useAdminRegions, useAdminUpdateVariant } from "medusa-react" +import { + useAdminRegions, + useAdminStore, + useAdminUpdateVariant, +} from "medusa-react" import { useEffect, useMemo, useRef, useState } from "react" import { getAllProductPricesCurrencies, @@ -52,6 +56,7 @@ function EditPricesModal(props: EditPricesModalProps) { const { regions: storeRegions } = useAdminRegions({ limit: 1000, }) + const { store } = useAdminStore() const regionCurrenciesMap = useRegionsCurrencyMap() const regions = getAllProductPricesRegions(props.product).sort() @@ -64,7 +69,14 @@ function EditPricesModal(props: EditPricesModalProps) { useState(false) const [showSaveConfirmationPrompt, setShowSaveConfirmationPrompt] = useState(false) - const [selectedCurrencies, setSelectedCurrencies] = useState(currencies) + + const initialCurrencies = + !currencies.length && !regions.length + ? store?.currencies.map((c) => c.code) + : currencies + + const [selectedCurrencies, setSelectedCurrencies] = + useState(initialCurrencies) const [selectedRegions, setSelectedRegions] = useState(regions) const toggleCurrency = (currencyCode: string) => { diff --git a/packages/admin-ui/ui/src/domain/pricing/forms/price-list-product-prices-form/price-list-product-prices-form.tsx b/packages/admin-ui/ui/src/domain/pricing/forms/price-list-product-prices-form/price-list-product-prices-form.tsx index b9c735ee83..0934b18762 100644 --- a/packages/admin-ui/ui/src/domain/pricing/forms/price-list-product-prices-form/price-list-product-prices-form.tsx +++ b/packages/admin-ui/ui/src/domain/pricing/forms/price-list-product-prices-form/price-list-product-prices-form.tsx @@ -1395,7 +1395,7 @@ const PriceListProductPricesForm = ({ {t( "price-list-product-prices-form-column-visibility-button", - "View" + "Currencies" )}