Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Show the review statuses in the operator's status picker

Damian Legawiec56781fd2a66d
diff --git a/packages/dashboard-core/src/locales/ar.json b/packages/dashboard-core/src/locales/ar.json
index 1c2b909972..5b3d33037e 100644
--- a/packages/dashboard-core/src/locales/ar.json
+++ b/packages/dashboard-core/src/locales/ar.json
@@ -1076,8 +1076,11 @@
"status_options": {
"active": "نشط",
"archived": "مؤرشف",
- "draft": "مسودة"
+ "draft": "مسودة",
+ "proposed": "قيد المراجعة",
+ "rejected": "يتطلب تعديلات"
},
+ "status_under_review": "هذا المنتج قيد المراجعة. استخدم الموافقة أو الرفض لاتخاذ القرار.",
"transfers": {
"description_external": "الاستلام الخارجي إلى <strong>{{destination}}</strong>.",
"description_internal": "تم نقل المخزون من <strong>{{source}}</strong> إلى <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard-core/src/locales/de.json b/packages/dashboard-core/src/locales/de.json
index 754393de8a..c2f40d6645 100644
--- a/packages/dashboard-core/src/locales/de.json
+++ b/packages/dashboard-core/src/locales/de.json
@@ -1076,8 +1076,11 @@
"status_options": {
"active": "Aktiv",
"archived": "Archiviert",
- "draft": "Entwurf"
+ "draft": "Entwurf",
+ "proposed": "In Prüfung",
+ "rejected": "Änderungen erforderlich"
},
+ "status_under_review": "Dieses Produkt wird geprüft. Nutze Freigeben oder Ablehnen, um zu entscheiden.",
"transfers": {
"description_external": "Externer Wareneingang in <strong>{{destination}}</strong>.",
"description_internal": "Bestand verschoben von <strong>{{source}}</strong> nach <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard-core/src/locales/en.json b/packages/dashboard-core/src/locales/en.json
index ceef433e9b..dced995104 100644
--- a/packages/dashboard-core/src/locales/en.json
+++ b/packages/dashboard-core/src/locales/en.json
@@ -1078,8 +1078,11 @@
"status_options": {
"active": "Active",
"archived": "Archived",
- "draft": "Draft"
+ "draft": "Draft",
+ "proposed": "In review",
+ "rejected": "Changes needed"
},
+ "status_under_review": "This product is in review. Use Approve or Reject to decide.",
"transfers": {
"description_external": "External receive into <strong>{{destination}}</strong>.",
"description_internal": "Inventory moved from <strong>{{source}}</strong> to <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard-core/src/locales/fr.json b/packages/dashboard-core/src/locales/fr.json
index f4fcff0e50..6588e3c945 100644
--- a/packages/dashboard-core/src/locales/fr.json
+++ b/packages/dashboard-core/src/locales/fr.json
@@ -1076,8 +1076,11 @@
"status_options": {
"active": "Actif",
"archived": "Archivé",
- "draft": "Brouillon"
+ "draft": "Brouillon",
+ "proposed": "En cours de revue",
+ "rejected": "Modifications requises"
},
+ "status_under_review": "Ce produit est en cours de revue. Utilisez Approuver ou Rejeter pour décider.",
"transfers": {
"description_external": "Réception externe dans <strong>{{destination}}</strong>.",
"description_internal": "Stock déplacé de <strong>{{source}}</strong> vers <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard-core/src/locales/pl.json b/packages/dashboard-core/src/locales/pl.json
index 6e9831f508..9ee7f46dff 100644
--- a/packages/dashboard-core/src/locales/pl.json
+++ b/packages/dashboard-core/src/locales/pl.json
@@ -1088,8 +1088,11 @@
"status_options": {
"active": "Aktywne",
"archived": "Zarchiwizowany",
- "draft": "Wersja robocza"
+ "draft": "Wersja robocza",
+ "proposed": "W recenzji",
+ "rejected": "Wymaga zmian"
},
+ "status_under_review": "Ten produkt jest w recenzji. Użyj Zatwierdź lub Odrzuć, aby zdecydować.",
"transfers": {
"description_external": "Przyjęcie zewnętrzne do <strong>{{destination}}</strong>.",
"description_internal": "Stan magazynowy przeniesiony z <strong>{{source}}</strong> do <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard-core/src/locales/zh-CN.json b/packages/dashboard-core/src/locales/zh-CN.json
index 3cc2a61a7c..a055f08385 100644
--- a/packages/dashboard-core/src/locales/zh-CN.json
+++ b/packages/dashboard-core/src/locales/zh-CN.json
@@ -1076,8 +1076,11 @@
"status_options": {
"active": "启用",
"archived": "已归档",
- "draft": "草稿"
+ "draft": "草稿",
+ "proposed": "审核中",
+ "rejected": "需要修改"
},
+ "status_under_review": "此商品正在审核中。请使用“批准”或“拒绝”做出决定。",
"transfers": {
"description_external": "外部收货至 <strong>{{destination}}</strong>。",
"description_internal": "库存从 <strong>{{source}}</strong> 调拨至 <strong>{{destination}}</strong>。",
diff --git a/packages/dashboard-core/src/products/product-form-cards.tsx b/packages/dashboard-core/src/products/product-form-cards.tsx
index 65473e76f1..6e46262fe9 100644
--- a/packages/dashboard-core/src/products/product-form-cards.tsx
+++ b/packages/dashboard-core/src/products/product-form-cards.tsx
@@ -842,8 +842,21 @@ export function SEOCard({ form, product }: FormCardProps & { product?: Product }
// Status
// ---------------------------------------------------------------------------
+const ASSIGNABLE_STATUSES = ['draft', 'active', 'archived']
+
export function StatusCard({ form }: FormCardProps) {
const { t } = useTranslation()
+ const status = useWatch({ control: form.control, name: 'status' })
+
+ // A product awaiting or refused review sits on a status nobody assigns —
+ // it got there by a seller submitting or an operator deciding, and it
+ // leaves through Approve/Reject. Listing it anyway is what lets the picker
+ // render the product's actual state instead of a raw value with no matching
+ // option; the card is read-only while it is there, because the moves out of
+ // it are the review actions rather than this control
+ // (docs/plans/6.0-seller-product-submission.md).
+ const underReview = Boolean(status) && !ASSIGNABLE_STATUSES.includes(status as string)
+ const values = underReview ? [status as string, ...ASSIGNABLE_STATUSES] : ASSIGNABLE_STATUSES
return (
<SharedStatusCard<ProductFormValues>
@@ -851,7 +864,9 @@ export function StatusCard({ form }: FormCardProps) {
name="status"
title={t('admin.fields.status.label')}
label={t('admin.fields.status.label')}
- options={['draft', 'active', 'archived'].map((value) => ({
+ disabled={underReview}
+ description={underReview ? t('admin.pages.products.status_under_review') : undefined}
+ options={values.map((value) => ({
value,
label: t(`admin.pages.products.status_options.${value}`),
}))}
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index 8aa3d61521..3de64e4ca0 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -3110,8 +3110,11 @@
"status_options": {
"active": "نشط",
"archived": "مؤرشف",
- "draft": "مسودة"
+ "draft": "مسودة",
+ "proposed": "قيد المراجعة",
+ "rejected": "يتطلب تعديلات"
},
+ "status_under_review": "هذا المنتج قيد المراجعة. استخدم الموافقة أو الرفض لاتخاذ القرار.",
"transfers": {
"description_external": "الاستلام الخارجي إلى <strong>{{destination}}</strong>.",
"description_internal": "تم نقل المخزون من <strong>{{source}}</strong> إلى <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index c4e97f6fc4..9f33c8dc63 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -3094,8 +3094,11 @@
"status_options": {
"active": "Aktiv",
"archived": "Archiviert",
- "draft": "Entwurf"
+ "draft": "Entwurf",
+ "proposed": "In Prüfung",
+ "rejected": "Änderungen erforderlich"
},
+ "status_under_review": "Dieses Produkt wird geprüft. Nutze Freigeben oder Ablehnen, um zu entscheiden.",
"transfers": {
"description_external": "Externer Wareneingang in <strong>{{destination}}</strong>.",
"description_internal": "Bestand verschoben von <strong>{{source}}</strong> nach <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 258ac3e451..8df3a98128 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -3094,8 +3094,11 @@
"status_options": {
"active": "Active",
"archived": "Archived",
- "draft": "Draft"
+ "draft": "Draft",
+ "proposed": "In review",
+ "rejected": "Changes needed"
},
+ "status_under_review": "This product is in review. Use Approve or Reject to decide.",
"transfers": {
"description_external": "External receive into <strong>{{destination}}</strong>.",
"description_internal": "Inventory moved from <strong>{{source}}</strong> to <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index cb221fe237..8fe2721d51 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -3094,8 +3094,11 @@
"status_options": {
"active": "Actif",
"archived": "Archivé",
- "draft": "Brouillon"
+ "draft": "Brouillon",
+ "proposed": "En cours de revue",
+ "rejected": "Modifications requises"
},
+ "status_under_review": "Ce produit est en cours de revue. Utilisez Approuver ou Rejeter pour décider.",
"transfers": {
"description_external": "Réception externe dans <strong>{{destination}}</strong>.",
"description_internal": "Stock déplacé de <strong>{{source}}</strong> vers <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index 2daf1b35f0..e8357c2272 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -3138,8 +3138,11 @@
"status_options": {
"active": "Aktywne",
"archived": "Zarchiwizowany",
- "draft": "Wersja robocza"
+ "draft": "Wersja robocza",
+ "proposed": "W recenzji",
+ "rejected": "Wymaga zmian"
},
+ "status_under_review": "Ten produkt jest w recenzji. Użyj Zatwierdź lub Odrzuć, aby zdecydować.",
"transfers": {
"description_external": "Przyjęcie zewnętrzne do <strong>{{destination}}</strong>.",
"description_internal": "Stan magazynowy przeniesiony z <strong>{{source}}</strong> do <strong>{{destination}}</strong>.",
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index bec13436a2..fafdfdc3f0 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -3086,8 +3086,11 @@
"status_options": {
"active": "启用",
"archived": "已归档",
- "draft": "草稿"
+ "draft": "草稿",
+ "proposed": "审核中",
+ "rejected": "需要修改"
},
+ "status_under_review": "此商品正在审核中。请使用“批准”或“拒绝”做出决定。",
"transfers": {
"description_external": "外部收货至 <strong>{{destination}}</strong>。",
"description_internal": "库存从 <strong>{{source}}</strong> 调拨至 <strong>{{destination}}</strong>。",
diff --git a/spree/api/app/controllers/spree/api/v3/admin/products_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/products_controller.rb
index bd70a00a32..97e4e76696 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/products_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/products_controller.rb
@@ -248,7 +248,17 @@ module Spree
prices: [:amount, :compare_at_amount, :currency],
stock_levels: [:id, :stock_location_id, :count_on_hand, :backorderable]
]
- )
+ ).tap { |attrs| attrs.delete(:status) if review_status?(attrs[:status]) }
+ end
+
+ # A review status is an outcome, not a value to assign: `proposed`
+ # means a seller asked, and `rejected` means somebody decided. Both
+ # are reached through the workflows behind `approve`/`reject`, so a
+ # status naming one here is dropped rather than written — the same
+ # reason `bulk_status_update` validates against `STATUSES` and not
+ # the full list (docs/plans/6.0-seller-product-submission.md).
+ def review_status?(status)
+ status.present? && Spree::Product::REVIEW_STATUSES.include?(status.to_s)
end
private
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb
index c575c7320c..cc26574480 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb
@@ -1380,6 +1380,37 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller do
end
end
+ # `proposed` and `rejected` are review outcomes, reached through the
+ # approve/reject workflows. A status naming one in an ordinary update is
+ # dropped rather than written, so a product cannot be pushed into or out of
+ # review by editing a field.
+ describe 'assigning a review status directly' do
+ let!(:draft_product) { create(:product, store: store, status: 'draft') }
+
+ before { request.headers.merge!(headers) }
+
+ it 'ignores proposed' do
+ patch :update, params: { id: draft_product.prefixed_id, status: 'proposed' }, as: :json
+
+ expect(response).to have_http_status(:ok)
+ expect(draft_product.reload).to be_draft
+ end
+
+ it 'ignores rejected' do
+ patch :update, params: { id: draft_product.prefixed_id, status: 'rejected' }, as: :json
+
+ expect(response).to have_http_status(:ok)
+ expect(draft_product.reload).to be_draft
+ end
+
+ it 'still writes the statuses an operator does assign' do
+ patch :update, params: { id: draft_product.prefixed_id, status: 'active' }, as: :json
+
+ expect(response).to have_http_status(:ok)
+ expect(draft_product.reload).to be_active
+ end
+ end
+
describe 'POST #clone' do
subject { post :clone, params: { id: product.prefixed_id }, as: :json }