Skip to content

[CSM][Web] Fix loading overlay overlap and fill Change state button #1075

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
cloby99 merged 1 commit into from
Jul 7, 2026
Merged

[CSM][Web] Fix loading overlay overlap and fill Change state button #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion apps/csm-portal/webapp/src/features/csm-cases/components/CaseActionBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ export default function CaseActionBar({
<>
<Button
size="small"
variant="outlined"
variant="contained"
color="primary"
endIcon={<ChevronDown size={16} />}
onClick={(e) => setStateMenuAnchor(e.currentTarget)}
>
Expand Down
9 changes: 4 additions & 5 deletions apps/csm-portal/webapp/src/features/csm-cases/components/CaseActivitiesFeed.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ describe("CaseActivitiesFeed", () => {
);

expect(screen.getByText("State:")).toBeInTheDocument();
// The line reads "State: Resolved was In Progress" across sibling text
// nodes (new value, then the struck-through old value in its own span) —
// assert on the row's combined text rather than a single text node.
expect(container.textContent).toContain("Resolved");
expect(container.textContent).toContain("was");
// The line reads "State: In Progress → Resolved" across sibling text nodes
// (muted old value, arrow, then new value) — assert on combined row text.
expect(container.textContent).toContain("In Progress");
expect(container.textContent).toContain("→");
expect(container.textContent).toContain("Resolved");
expect(screen.getByText(/Jane Doe/)).toBeInTheDocument();
});

Expand Down
15 changes: 4 additions & 11 deletions apps/csm-portal/webapp/src/features/csm-cases/components/CaseActivitiesFeed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function formatChangeValue(value: string | undefined): string | undefined {
return formatAbsoluteForUser(value) ?? value;
}

/** One "<label>: <new> was <old>" line for a field-change entry's audit strip. */
/** One "<label>: <old> → <new>" line for a field-change entry's audit strip. */
function FieldChangeLine({
field,
}: {
Expand All @@ -108,22 +108,15 @@ function FieldChangeLine({
return (
<Typography variant="body2" component="div">
<strong>{field.fieldLabel}:</strong>{" "}
{hasNew ? formatChangeValue(field.newValue) : <em>cleared</em>}
{hadPrevious && (
<>
{" "}
was{" "}
<Box
component="span"
sx={{
textDecoration: "line-through",
color: "text.secondary",
}}
>
<Box component="span" sx={{ color: "text.secondary" }}>
{formatChangeValue(field.previousValue)}
</Box>
{" → "}
</>
)}
{hasNew ? formatChangeValue(field.newValue) : <em>cleared</em>}
</Typography>
);
}
Expand Down