Match Timeline order view with matrix per-line actions (#6731)

* Improve order line matrix and bring Timeline view to parity

Remove the confusing Needs action filter, share line row actions and refund callouts across both views, and extract shared row-action utilities so matrix and timeline stay in sync.

* Scope Timeline row menus to shipment context

Hide Return on returned and refunded fulfillment rows while keeping line-global actions in matrix, and limit Fulfill shortcuts to unfulfilled timeline cards.

* Remove duplicate Fulfill button from unfulfilled card

* Align order cog menu with model-type detail page pattern

Move Return to the items header, put extensions and GraphiQL first with icons, and Cancel last as the destructive action. Remove dead menu helpers and the unused returnOrder message.

* Fix order draft delete error and channel picker loading state

* Add changeset

* Extract messages

Author: mirekm

.changeset/order-details-items-polish.md

@@ -0,0 +1,9 @@
+---
+"saleor-dashboard": patch
+---
+
+*Timeline* now matches line matrix for day-to-day work: order-level refund callout, *Fulfill* and *Return* in the items section header, per-line row actions, and return/replace reasons on unfulfilled lines when present. *Return* and *Fulfill* on a timeline row apply only within that shipment's context — not on already returned, refunded, or replaced fulfillments.
+
+Reorganized the order details cog menu: extension actions and GraphiQL (with icons) first, *Cancel order* last as the destructive action. *Return / Replace order* is in the items section header only.
+
+Draft orders: deleting a draft no longer shows Internal Server Error notification. The *Select a channel* confirm button in *Create order* shows a loading state while the draft is created.

.changeset/order-line-matrix.md

@@ -62,10 +62,6 @@
     "context": "Dry run dialog object title",
     "string": "Select object type to perform dry run on provided query"
   },
-  "+RjQjs": {
-    "context": "return button",
-    "string": "Return / Replace order"
-  },
   "+SYLEL": {
     "context": "refunded fulfillment, section header",
     "string": "Refunded"
@@ -292,10 +288,6 @@
     "context": "collection name",
     "string": "Name"
   },
-  "/Xwjww": {
-    "context": "button",
-    "string": "Fulfill"
-  },
   "/dnWE8": {
     "context": "products in collection",
     "string": "Products in {name}"
@@ -713,10 +705,6 @@
   "1Znp5B": {
     "string": "Be extra careful with taxes and payment extensions, ensure your configuration selects other extension to be used"
   },
-  "1g1Hsn": {
-    "context": "needs action help bullet for pending approval",
-    "string": "Pending shipment approval"
-  },
   "1lk/oS": {
     "context": "button",
     "string": "Add postal code range"
@@ -896,6 +884,10 @@
   "2atspc": {
     "string": "Drafts"
   },
+  "2cFaF8": {
+    "context": "fulfill a single order line from row menu",
+    "string": "Fulfill this line"
+  },
   "2dgbGR": {
     "string": "Those codes already exist"
   },
@@ -998,10 +990,6 @@
     "context": "filter range separator",
     "string": "and"
   },
-  "34P9Lf": {
-    "context": "needs action help bullet for failed refunds",
-    "string": "Failed refund transfers"
-  },
   "37IPJQ": {
     "context": "return items table, edit reason button",
     "string": "Edit reason"
@@ -1454,10 +1442,6 @@
     "context": "acre-ft unit",
     "string": "acre-ft"
   },
-  "5YW/f6": {
-    "context": "fulfill a single order line from matrix row menu",
-    "string": "Fulfill this line"
-  },
   "5ZYUn5": {
     "context": "Filter and element text",
     "string": "And"
@@ -3474,6 +3458,10 @@
     "context": "label",
     "string": "Shipping rate name"
   },
+  "FkHonS": {
+    "context": "refund a single order line from row menu",
+    "string": "Refund this line"
+  },
   "FkRNk+": {
     "context": "field placeholder",
     "string": "Description of a shipping zone."
@@ -3665,10 +3653,6 @@
     "context": "configuration menu item title",
     "string": "Product attributes"
   },
-  "GTiyDh": {
-    "context": "filter matrix rows that need merchant attention",
-    "string": "Needs action"
-  },
   "GUeIcq": {
     "context": "edit structure, header",
     "string": "Edit Item"
@@ -5455,10 +5439,6 @@
     "context": "save preset, header",
     "string": "Save view preset"
   },
-  "PAqicb": {
-    "context": "button",
-    "string": "Cancel order"
-  },
   "PBd/e+": {
     "context": "dialog header",
     "string": "Change address for order"
@@ -6532,10 +6512,6 @@
     "context": "collection filter published",
     "string": "Published"
   },
-  "UZjdjP": {
-    "context": "aria label for needs action toggle above line matrix",
-    "string": "Highlight lines that need action"
-  },
   "UcrXYE": {
     "context": "Description for scheduled status when publication date is in the future",
     "string": "Publication scheduled"
@@ -7785,6 +7761,10 @@
     "context": "label",
     "string": "Link type"
   },
+  "ab8LMF": {
+    "context": "return a single order line from row menu",
+    "string": "Return this line"
+  },
   "abTH5q": {
     "context": "error message",
     "string": "Email address is not set"
@@ -8988,10 +8968,6 @@
     "context": "dialog content",
     "string": "This customer doesn't have any addresses in the address book. Provide address for order."
   },
-  "gpda9P": {
-    "context": "explains muted rows when needs action filter is on",
-    "string": "Stay visible in the list but appear faded."
-  },
   "gr+oXW": {
     "context": "page title",
     "string": "Title"
@@ -9481,10 +9457,6 @@
     "context": "bulk issue gift cards quantity section header",
     "string": "Gift cards to issue"
   },
-  "j9r+EY": {
-    "context": "section label for non-highlighted lines in needs action tooltip",
-    "string": "Other lines"
-  },
   "jBl05c": {
     "context": "Badge shown when channel has validation errors",
     "string": "Error"
@@ -10378,10 +10350,6 @@
     "context": "staff members status active",
     "string": "Active"
   },
-  "nHOEZP": {
-    "context": "return a single order line from matrix row menu",
-    "string": "Return this line"
-  },
   "nIuKz3": {
     "context": "Refund status none",
     "string": "Draft"
@@ -11602,10 +11570,6 @@
     "context": "Shown while verification is in progress",
     "string": "Verifying..."
   },
-  "t53iRo": {
-    "context": "title for needs action filter help tooltip",
-    "string": "Needs action"
-  },
   "t7UwLY": {
     "context": "voucher status",
     "string": "Expired"
@@ -11693,10 +11657,6 @@
     "context": "variant stocks section subtitle",
     "string": "Assign this variant to a channel in the product channel manager to define warehouses allocation"
   },
-  "tcioFM": {
-    "context": "needs action help bullet for draft refunds",
-    "string": "Draft refunds not sent"
-  },
   "teWSsc": {
     "context": "assign warehouse dialog search label",
     "string": "Search warehouses"
@@ -12644,10 +12604,6 @@
     "context": "expand canceled shipments in line expanded panel",
     "string": "Show {count, plural, one {# canceled shipment} other {# canceled shipments}}"
   },
-  "xXlmYh": {
-    "context": "section label for lines included in needs action filter",
-    "string": "Highlighted lines"
-  },
   "xeMcID": {
     "string": "Warehouse created"
   },
@@ -12860,10 +12816,6 @@
   "yi1HSj": {
     "string": "({numberOfCharacters} of {maxCharacters} characters)"
   },
-  "yiJ6EO": {
-    "context": "refund a single order line from matrix row menu",
-    "string": "Refund this line"
-  },
   "yivxZJ": {
     "context": "order payment",
     "string": "Paid with Gift Card: ({link})"

locale/defaultMessages.json

@@ -44,7 +44,7 @@ export class OrdersPage extends BasePage {
     readonly orderSummarySection = page.getByTestId("OrderSummaryCard"),
     readonly paymentSummarySection = page.getByTestId("payment-section"),
     readonly paymentStatusBadges = page.getByTestId("payment-status-badges"),
-    readonly fulfillButton = page.getByTestId("fulfill-button"),
+    readonly fulfillButton = page.getByTestId("order-items-fulfill-button"),
     readonly addProducts = page.getByTestId("add-products-button"),
     readonly orderTransactionsList = page.getByTestId("orderTransactionsList").locator("table"),
     readonly salesChannel = page.getByTestId("salesChannel"),

playwright/pages/ordersPage.ts

@@ -64,6 +64,7 @@ export const ChannelPickerDialog = ({
           <DashboardModal.Inset>
             <DynamicCombobox
               data-test-id="channel-autocomplete"
+              disabled={isSubmitting}
               label={intl.formatMessage(messages.channelName)}
               options={result}
               onInputValueChange={search}
@@ -79,7 +80,7 @@ export const ChannelPickerDialog = ({
           <BackButton disabled={isSubmitting} onClick={handleClose} />
           <ConfirmButton
             data-test-id="submit"
-            disabled={isSubmitting}
+            disabled={isSubmitting || !selectedOption?.value}
             onClick={() => onConfirm(selectedOption?.value ?? "")}
             transitionState={confirmButtonState}
           >

src/channels/components/ChannelPickerDialog/ChannelPickerDialog.tsx

@@ -12215,13 +12215,9 @@ export const OrderDraftCancelDocument = gql`
     errors {
       ...OrderError
     }
-    order {
-      ...OrderDetails
-    }
   }
 }
-    ${OrderErrorFragmentDoc}
-${OrderDetailsFragmentDoc}`;
+    ${OrderErrorFragmentDoc}`;
 export type OrderDraftCancelMutationFn = Apollo.MutationFunction<Types.OrderDraftCancelMutation, Types.OrderDraftCancelMutationVariables>;
 
 /**

src/graphql/hooks.generated.ts

@@ -14,6 +14,7 @@ const meta: Meta<typeof OrderDetailsDatagrid> = {
 
   args: {
     lines: orderFixture.lines,
+    order: orderFixture,
     loading: false,
     onOrderLineShowMetadata: fn(),
   },