From 07934cdaac2f3b49a935e9701ffa7d5cf1381847 Mon Sep 17 00:00:00 2001
From: Kasper Fabricius Kristensen
 <45367945+kasperkristensen@users.noreply.github.com>
Date: Fri, 24 Nov 2023 13:54:07 +0000
Subject: [PATCH] fix(admin-ui): Edit prices requires at least one product
 (#5710)

---
 .changeset/afraid-eagles-tan.md               |  5 ++++
 .../edit/prices/add-products-modal.tsx        |  2 +-
 .../price-list-prices-form.tsx                | 26 +++++++++---------
 .../price-list-products-form.tsx              | 27 +++++++++----------
 .../ui/src/domain/pricing/new/new.tsx         |  2 +-
 5 files changed, 32 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/afraid-eagles-tan.md

diff --git a/.changeset/afraid-eagles-tan.md b/.changeset/afraid-eagles-tan.md
new file mode 100644
index 0000000000..7c708d845f
--- /dev/null
+++ b/.changeset/afraid-eagles-tan.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+fix(admin-ui): Ensure that the prices step is disabled until at least one product is selected in PriceList forms
diff --git a/packages/admin-ui/ui/src/domain/pricing/edit/prices/add-products-modal.tsx b/packages/admin-ui/ui/src/domain/pricing/edit/prices/add-products-modal.tsx
index 002c8d1995..30dd6d2663 100644
--- a/packages/admin-ui/ui/src/domain/pricing/edit/prices/add-products-modal.tsx
+++ b/packages/admin-ui/ui/src/domain/pricing/edit/prices/add-products-modal.tsx
@@ -571,7 +571,7 @@ const AddProductsModal = ({
                 </span>
               </ProgressTabs.Trigger>
               <ProgressTabs.Trigger
-                disabled={selectedIds.length === 0}
+                disabled={status[Tab.PRODUCTS] !== "completed"}
                 value={Tab.PRICES}
                 className="w-full max-w-[200px]"
                 status={status[Tab.PRICES]}
diff --git a/packages/admin-ui/ui/src/domain/pricing/forms/price-list-prices-form/price-list-prices-form.tsx b/packages/admin-ui/ui/src/domain/pricing/forms/price-list-prices-form/price-list-prices-form.tsx
index 6b0ec46d3b..ee26c3a740 100644
--- a/packages/admin-ui/ui/src/domain/pricing/forms/price-list-prices-form/price-list-prices-form.tsx
+++ b/packages/admin-ui/ui/src/domain/pricing/forms/price-list-prices-form/price-list-prices-form.tsx
@@ -97,19 +97,17 @@ const PriceListPricesForm = ({
             <Heading>
               {t("price-list-prices-form-heading", "Edit prices")}
             </Heading>
-            {isDirty && (
-              <Form.Field
-                control={control}
-                name={path("products")}
-                render={() => {
-                  return (
-                    <Form.Item>
-                      <Form.ErrorMessage />
-                    </Form.Item>
-                  )
-                }}
-              />
-            )}
+            <Form.Field
+              control={control}
+              name={path("products")}
+              render={() => {
+                return (
+                  <Form.Item>
+                    <Form.ErrorMessage />
+                  </Form.Item>
+                )
+              }}
+            />
           </div>
           <div className="flex items-center gap-x-2">
             <ProductFilterMenu
@@ -129,7 +127,7 @@ const PriceListPricesForm = ({
         <div className="border-ui-border-base border-b">
           <table className="w-full text-left">
             <thead>
-              <tr className="[&_th]:text-ui-fg-subtle [&_th]:txt-compact-small-plus border-ui-border-base [&_th]:w-1/3 [&_th]:border-r [&_th]:px-4 [&_th]:py-2.5 [&_th:last-of-type]:border-r-0">
+              <tr className="[&_th]:text-ui-fg-subtle [&_th]:txt-compact-small-plus border-ui-border-base [&_th:last-of-type]:border-r-0 [&_th]:w-1/3 [&_th]:border-r [&_th]:px-4 [&_th]:py-2.5">
                 <th>{t("price-list-prices-form-variant", "Variant")}</th>
                 <th>{t("price-list-prices-form-sku", "SKU")}</th>
                 <th className="text-right">
diff --git a/packages/admin-ui/ui/src/domain/pricing/forms/price-list-products-form/price-list-products-form.tsx b/packages/admin-ui/ui/src/domain/pricing/forms/price-list-products-form/price-list-products-form.tsx
index 1dfc30dd98..0c60e048be 100644
--- a/packages/admin-ui/ui/src/domain/pricing/forms/price-list-products-form/price-list-products-form.tsx
+++ b/packages/admin-ui/ui/src/domain/pricing/forms/price-list-products-form/price-list-products-form.tsx
@@ -376,24 +376,23 @@ const PriceListProductsForm = ({
 
   return (
     <div className="flex h-full flex-col">
-      <div className="border-ui-border-base flex items-center justify-between border-b px-8 pt-6 pb-4">
+      <div className="border-ui-border-base flex items-center justify-between border-b px-8 pb-4 pt-6">
         <div className="flex items-center gap-x-3">
           <Heading>
             {t("price-list-products-form-heading", "Choose products")}
           </Heading>
-          {isDirty && (
-            <Form.Field
-              control={control}
-              name={path("ids")}
-              render={() => {
-                return (
-                  <Form.Item>
-                    <Form.ErrorMessage />
-                  </Form.Item>
-                )
-              }}
-            />
-          )}
+
+          <Form.Field
+            control={control}
+            name={path("ids")}
+            render={() => {
+              return (
+                <Form.Item>
+                  <Form.ErrorMessage />
+                </Form.Item>
+              )
+            }}
+          />
         </div>
         <div className={clx("flex items-center gap-x-2")}>
           <ProductFilterMenu
diff --git a/packages/admin-ui/ui/src/domain/pricing/new/new.tsx b/packages/admin-ui/ui/src/domain/pricing/new/new.tsx
index 79d578a116..499cf70155 100644
--- a/packages/admin-ui/ui/src/domain/pricing/new/new.tsx
+++ b/packages/admin-ui/ui/src/domain/pricing/new/new.tsx
@@ -631,7 +631,7 @@ const PriceListNew = () => {
               <ProgressTabs.Trigger
                 value={Tab.PRICES}
                 disabled={
-                  status[Tab.DETAILS] !== "completed" &&
+                  status[Tab.DETAILS] !== "completed" ||
                   status[Tab.PRODUCTS] !== "completed"
                 }
                 className="w-full min-w-0 max-w-[200px]"