Skip to content

Feature: new sponsor order grid #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smarcet merged 5 commits into from
Jun 8, 2026
Merged

Feature: new sponsor order grid #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebe79f5
chore: adjustments for new grid
santipalenque Jun 2, 2026
8ba6094
chore: new grid version
santipalenque Jun 3, 2026
e386807
chore: update uicore version
santipalenque Jun 4, 2026
47316e3
chore: new uicore version
santipalenque Jun 5, 2026
e54b807
chore: upgrade uicore version
santipalenque Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"moment": "^2.29.1",
"moment-duration-format": "^2.3.2",
"moment-timezone": "^0.5.33",
"openstack-uicore-foundation": "5.0.32",
"openstack-uicore-foundation": "5.0.33-beta.3",
"p-limit": "^6.1.0",
"path-browserify": "^1.0.1",
"postcss-loader": "^6.2.1",
Expand Down
14 changes: 12 additions & 2 deletions src/actions/sponsor-purchases-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ export const updateClientInfo =
};

export const cancelSponsorForm =
(orderId, lineId) => async (dispatch, getState) => {
(orderId, lineId, lineName) => async (dispatch, getState) => {
const { currentSummitState, currentSponsorState } = getState();
const { currentSummit } = currentSummitState;
const { entity: sponsor } = currentSponsorState;
Expand All @@ -414,7 +414,17 @@ export const cancelSponsorForm =
null,
snackbarErrorHandler
)(params)(dispatch)
.then(() => dispatch(getSponsorOrder(orderId)))
.then(() => {
dispatch(getSponsorOrder(orderId));
dispatch(
snackbarSuccessHandler({
html: T.translate(
"edit_sponsor.purchase_tab.order_details.line_cancelled",
{ lineName }
)
})
);
})
.catch(console.log) // need to catch promise reject
.finally(() => {
dispatch(stopLoading());
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2654,10 +2654,10 @@
"general_info": "General Info",
"payment_info": "Payment Info",
"issue_refund": "Issue a Refund",
"info_note": "Active order items can be canceled. Canceled items show an undo action to restore them. Refund and payment rows are display-only.",
"address_updated": "Address updated successfully",
"client_updated": "Client info updated successfully",
"order_refunded": "Refund issued successfully."
"order_refunded": "Refund issued successfully.",
"line_cancelled": "{lineName} was cancelled. This item has been voided and removed from the balance. Use the undo action to restore it."
}
},
"mu_tab": {
Expand Down
8 changes: 2 additions & 6 deletions src/pages/sponsors/sponsor-page/tabs/sponsor-cart-tab/components/cart-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ const CartView = ({
},
{
columnKey: "amount",
align: "right",
header: T.translate("edit_sponsor.cart_tab.amount")
},
{
Expand Down Expand Up @@ -244,12 +245,7 @@ const CartView = ({
}
confirmButtonColor="error"
>
<TotalRow
columns={tableColumns}
total={cart?.total}
targetCol="amount"
trailing={2}
/>
<TotalRow total={cart?.total} colGap={5} trailing={3} />
</MuiTable>
<Box
sx={{
Expand Down
8 changes: 1 addition & 7 deletions src/pages/sponsors/sponsor-page/tabs/sponsor-cart-tab/components/payment-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,7 @@ const PaymentView = ({
<Box sx={{ width: "100%" }}>
<Card sx={{ borderRadius: "10px", height: "100%" }} variant="outlined">
<CardContent>
<SponsorOrderGrid
lines={cart.forms || []}
notes={cart?.notes || []}
fees={cart?.fees || []}
total={cart?.total}
withDescription
/>
<SponsorOrderGrid order={cart} />
</CardContent>
</Card>
</Box>
Expand Down
19 changes: 4 additions & 15 deletions src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import T from "i18n-react/dist/i18n-react";
import { Box, Card, CardContent, Grid2, Typography } from "@mui/material";
import { ListCard } from "openstack-uicore-foundation/lib/components/mui/cards";
import SponsorOrderGrid from "openstack-uicore-foundation/lib/components/mui/sponsor-order-grid";
import InfoNote from "openstack-uicore-foundation/lib/components/mui/info-note";
import {
cancelSponsorForm,
getSponsorOrder,
Expand Down Expand Up @@ -122,7 +121,7 @@ const SponsorOrderDetails = ({
};

const handleCancelForm = (item) => {
cancelSponsorForm(currentOrder.id, item.id);
cancelSponsorForm(currentOrder.id, item.id, item.name);
Comment on lines 123 to +124

@coderabbitai coderabbitai Bot Jun 3, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Locate and print the relevant sections around the commented lines
echo "=== sponsor-order-details.js (around handleCancelForm) ==="
FILE="src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js"
if [ -f "$FILE" ]; then
  nl -ba "$FILE" | sed -n '90,150p'
else
  echo "Missing file: $FILE"
fi

# Find the SponsorOrderGrid component and show where cancel callbacks are shaped
echo
echo "=== sponsor-order-grid.js (cancel callback payload shape) ==="
GRID_FILE="openstack-uicore-foundation/lib/components/mui/sponsor-order-grid.js"
if [ -f "$GRID_FILE" ]; then
  nl -ba "$GRID_FILE" | sed -n '1,200p'
  echo
  # Narrow search to cancel-related code
  rg -n "onCancelForm|cancel|itemName|lineName" "$GRID_FILE" || true
  # Show nearby occurrences
  for m in $(rg -n "onCancelForm|onCancelForm\s*=" "$GRID_FILE" | cut -d: -f1); do
    start=$((m-20)); end=$((m+40));
    nl -ba "$GRID_FILE" | sed -n "${start},${end}p" | sed "s/^/${GRID_FILE##*/}: /"
  done
else
  echo "Missing file: $GRID_FILE"
  # Also try to locate it if path differs
  echo
  echo "=== Searching for sponsor-order-grid.js in repo ==="
  fd -a sponsor-order-grid.js . || true
fi

Repository: fntechgit/summit-admin

Length of output: 186

🏁 Script executed:

#!/bin/bash
set -euo pipefail

FILE="src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js"
echo "=== Exists? $FILE ==="
if [ -f "$FILE" ]; then echo "yes"; else echo "no"; fi

echo
echo "=== Find handleCancelForm / cancelSponsorForm usage ==="
rg -n "handleCancelForm|cancelSponsorForm" "$FILE" || true

echo
echo "=== Show surrounding code near cancelSponsorForm call ==="
# Use sed+awk to print line numbers without `nl`
if [ -f "$FILE" ]; then
  # print line numbers 100-160 (adjust if file shorter)
  awk 'NR>=80 && NR<=160 {printf "%5d:%s\n", NR, $0}' "$FILE" | sed -n '1,200p'
fi

echo
echo "=== Locate sponsor-order-grid.js ==="
# Prefer exact filename search across repo
GRID="$(fd -a "sponsor-order-grid.js" . | head -n 20 || true)"
if [ -z "${GRID:-}" ]; then
  echo "Could not find sponsor-order-grid.js via fd"
else
  echo "$GRID"
fi

echo
echo "=== Inspect cancel payload shaping in located sponsor-order-grid.js ==="
# If found multiple, inspect each briefly
if [ -n "${GRID:-}" ]; then
  echo "$GRID" | while read -r g; do
    echo "--- $g (around itemName / onCancelForm) ---"
    rg -n "itemName|onCancelForm|lineName|cancel" "$g" -S || true
    echo "--- $g (first 220 lines) ---"
    awk 'NR<=220 {printf "%5d:%s\n", NR, $0}' "$g" | sed -n '1,220p'
    echo
  done
fi

Repository: fntechgit/summit-admin

Length of output: 3420

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "=== Search for SponsorOrderGrid / sponsor-order-grid.js in repo ==="
fd -a "sponsor-order-grid" . || true
fd -a "SponsorOrderGrid" . || true

echo
echo "=== Search for onCancelForm / itemName in likely files ==="
rg -n --hidden --no-ignore -S "onCancelForm|itemName|lineName" . -g'*.js' -g'*.jsx' -g'*.ts' -g'*.tsx' | head -n 80

echo
echo "=== Search for cancelSponsorForm calls site-wide (to understand expected args) ==="
rg -n --hidden --no-ignore -S "cancelSponsorForm\\(" . -g'*.js' -g'*.jsx' -g'*.ts' -g'*.tsx' || true

Repository: fntechgit/summit-admin

Length of output: 50379

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "=== sponsor-order-details.js: top imports/where cancelSponsorForm comes from ==="
FILE="src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js"
awk 'NR<=80 {printf "%5d:%s\n", NR, $0}' "$FILE"

echo
echo "=== All cancelSponsorForm occurrences in repo (excluding node_modules) ==="
rg -n --hidden --no-ignore -S "cancelSponsorForm\\(" src . --glob '!**/node_modules/**' || true

echo
echo "=== cancelSponsorForm identifier definitions (excluding node_modules) ==="
rg -n --hidden --no-ignore -S "function\\s+cancelSponsorForm|const\\s+cancelSponsorForm|\\bcancelSponsorForm\\s*=\\s*\\(" . --glob '!**/node_modules/**' || true

Repository: fntechgit/summit-admin

Length of output: 3822

🏁 Script executed:

#!/bin/bash
set -euo pipefail

A="src/actions/sponsor-purchases-actions.js"
echo "=== sponsor-purchases-actions.js: cancelSponsorForm definition (around line ~275) ==="
# Print a tight window around the definition
awk 'NR>=240 && NR<=340 {printf "%5d:%s\n", NR, $0}' "$A"

echo
echo "=== Find cancelSponsorForm parameter usage (lineName / itemName / name) ==="
rg -n --hidden --no-ignore -S "cancelSponsorForm\\s*\\(|lineName|itemName|name\\b" "$A" | head -n 80

Repository: fntechgit/summit-admin

Length of output: 4146

Fix cancel lineName mapping in SponsorOrderDetails

SponsorOrderGrid passes the cancel callback item as an object with itemName, and cancelSponsorForm(orderId, lineId, lineName) uses the 3rd argument to render the “line cancelled” snackbar—so using item.name makes lineName undefined.

🩹 Suggested fix 
  const handleCancelForm = (item) => {
-    cancelSponsorForm(currentOrder.id, item.id, item.name);
+    cancelSponsorForm(currentOrder.id, item.id, item.itemName);
  };
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const handleCancelForm = (item) => {
cancelSponsorForm(currentOrder.id, item.id);
cancelSponsorForm(currentOrder.id, item.id, item.name);
const handleCancelForm = (item) => {
cancelSponsorForm(currentOrder.id, item.id, item.itemName);
};
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@src/pages/sponsors/sponsor-page/tabs/sponsor-purchases-tab/sponsor-order-details.js`
around lines 119 - 120, The cancel callback is passing the wrong property for
the line name: update handleCancelForm so it forwards the item.itemName (the
shape provided by SponsorOrderGrid) instead of item.name to cancelSponsorForm;
i.e., in handleCancelForm(item) call cancelSponsorForm(currentOrder.id, item.id,
item.itemName) so the snackbar receives the correct lineName.

};

const handleUndoCancelForm = (item) => {
Expand Down Expand Up @@ -170,20 +169,10 @@ const SponsorOrderDetails = ({
variant="outlined"
>
<CardContent>
<InfoNote
message={T.translate(
"edit_sponsor.purchase_tab.order_details.info_note"
)}
sx={{ mt: 2, mb: 3 }}
/>
<SponsorOrderGrid
lines={currentOrder?.forms || []}
notes={currentOrder?.notes || []}
payments={currentOrder?.payments || []}
refunds={currentOrder?.refunds || []}
fees={currentOrder?.fees || []}
amountDue={currentOrder?.amount_due}
withDescription
order={currentOrder}
withReconciliation
withCancelledItemsHeader
onCancelForm={handleCancelForm}
onUndoCancelForm={handleUndoCancelForm}
/>
Expand Down
29 changes: 11 additions & 18 deletions src/pages/sponsors/sponsor-page/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,14 @@ import {
formatDiscount
} from "openstack-uicore-foundation/lib/utils/money";

export const normalizeOrder = (data) => {
const amountDueSign = data?.amount_due < 0 ? "-" : "";
const amountDueStr = currencyAmountFromCents(Math.abs(data.amount_due || 0)); // currencyAmountFromCents doesn't allow negatives
const amountDue = `${amountDueSign}${amountDueStr}`;

return {
...data,
total: currencyAmountFromCents(data.net_amount || 0),
amount_due: data.amount_due === 0 ? "$0.00" : amountDue,
forms: data.forms.map((form) => ({
...form,
addon_name: form.add_on?.name || "",
discount: formatDiscount(form.discount_amount, form.discount_type),
discount_total: form.discount_in_cents || 0,
amount: currencyAmountFromCents(form.net_amount || 0)
}))
};
};
export const normalizeOrder = (data) => ({
...data,
total: data.net_amount || data.amount_due || 0,
Comment thread
santipalenque marked this conversation as resolved.
forms: data.forms.map((form) => ({
...form,
addon_name: form.add_on?.name || "",
discount: formatDiscount(form.discount_amount, form.discount_type),
discount_total: form.discount_in_cents || 0,
amount: currencyAmountFromCents(form.net_amount || 0)
}))
});
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9056,10 +9056,10 @@ open@^10.0.3:
is-inside-container "^1.0.0"
wsl-utils "^0.1.0"

openstack-uicore-foundation@5.0.32:
version "5.0.32"
resolved "https://registry.npmjs.org/openstack-uicore-foundation/-/openstack-uicore-foundation-5.0.32.tgz#856623f5d7b3021f7fa08550a3c0a7f656bd3011"
integrity sha512-jQCs/F2+74bOGgj/0mT8W6h0DfT6kbgkbwau6ZFOi5lDBjrCkKTOJosnCyonj3R4TEvtx4A6x1nmwP6Z7Mc+dQ==
openstack-uicore-foundation@5.0.33-beta.3:
version "5.0.33-beta.3"
resolved "https://registry.yarnpkg.com/openstack-uicore-foundation/-/openstack-uicore-foundation-5.0.33-beta.3.tgz#1a9136913632aa9da28e9620ca680b18e45bad0c"
integrity sha512-OJJAkfsZNH377IeKB/EHxp1c6gyQpTMiIt+UEhLhqj/qpfDMiQflozWLr0kYAhfwlHDdqn7nnZbmidugIwJJPg==
dependencies:
use-sync-external-store "^1.6.0"

Expand Down
Loading