Skip to content
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

Jump to bottom

Add unique key to transporter array elements #718

Merged
merged 3 commits into from
May 30, 2024
Merged

Add unique key to transporter array elements #718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a27b02
in reference to issue #620 https://github.com/USEPA/haztrak/issues/62…
sheckathorne May 29, 2024
eff012b
add uuid in transporter section and transporter schema
dpgraham4401 May 30, 2024
c4c82e2
increment patch version
dpgraham4401 May 30, 2024
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
8 changes: 4 additions & 4 deletions client/src/components/Manifest/Transporter/TransporterRowActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function TransporterRowActions({
swapTransporter(index, index - 1);
},
disabled: isFirst,
label: `move transporter ${index} up`,
label: `move transporter ${index + 1} up`,
dpgraham4401 marked this conversation as resolved.
Show resolved Hide resolved
},
{
text: 'Move Down',
Expand All @@ -68,7 +68,7 @@ export function TransporterRowActions({
swapTransporter(index, index + 1);
},
disabled: isLast,
label: `move transporter ${index} down`,
label: `move transporter ${index + 1} down`,
},
{
text: 'Remove',
Expand All @@ -77,7 +77,7 @@ export function TransporterRowActions({
removeTransporter(index);
},
disabled: false,
label: `remove transporter ${index}`,
label: `remove transporter ${index + 1}`,
},
{
text: open ? 'Close' : 'Details',
Expand All @@ -86,7 +86,7 @@ export function TransporterRowActions({
decoratedOnClick(event);
},
disabled: false,
label: `View transporter ${index} details`,
label: `View transporter ${index + 1} details`,
},
];

Expand Down
30 changes: 28 additions & 2 deletions client/src/components/Manifest/Transporter/TransporterTable.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ describe('TransporterTable', () => {
});
for (let i = 1; i < TRAN_ARRAY.length; i++) {
await userEvent.click(actionDropdowns[i]);
expect(screen.getByTitle(`move transporter ${i} up`)).not.toBeDisabled();
expect(screen.getByTitle(`move transporter ${i + 1} up`)).not.toBeDisabled();
}
});
test('All but last move-down buttons are not disabled', async () => {
Expand All @@ -113,7 +113,33 @@ describe('TransporterTable', () => {
});
for (let i = 0; i < TRAN_ARRAY.length; i++) {
await userEvent.click(actionDropdowns[i]);
expect(screen.getByTitle(`move transporter ${i} down`)).not.toBeDisabled();
expect(screen.getByTitle(`move transporter ${i + 1} down`)).not.toBeDisabled();
}
});
});
test('Expanding transporter opens one accordion only', async () => {
const emptyArrayFieldMethods = {}; // empty method placeholders to fulfill required prop
TRAN_ARRAY.push({
...createMockTransporter({ epaSiteId: HANDLER_ID_1, name: HANDLER_NAME_1, order: 3 }),
});

renderWithProviders(
<TransporterTable
setupSign={mockSetupSign}
// @ts-ignore
arrayFieldMethods={emptyArrayFieldMethods}
transporters={TRAN_ARRAY}
/>,
{ preloadedState: { manifest: { readOnly: false } } }
);
const actionDropdown = await screen.findByRole('button', {
name: /transporter 1 actions/,
});
await userEvent.click(actionDropdown);
const detailButton = await screen.findByTitle('View transporter 1 details');
await userEvent.click(detailButton);

const accordion = document.querySelectorAll('.accordion-collapse.collapse.show');
expect(accordion).toHaveLength(1);
expect(accordion[0]).toBeInTheDocument();
});
9 changes: 5 additions & 4 deletions client/src/components/Manifest/Transporter/TransporterTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ function TransporterTable({ transporters, arrayFieldMethods, setupSign }: Transp
<>
<Accordion ref={parent}>
{transporters.map((transporter, index) => {
const transporterKey: string = `${transporter.epaSiteId}-${index.toString()}`;
dpgraham4401 marked this conversation as resolved.
Show resolved Hide resolved
return (
<Card key={transporter.epaSiteId} className="py-2 ps-4 pe-2 my-2">
<Card key={transporterKey} className="py-2 ps-4 pe-2 my-2">
<Row className="d-flex justify-content-around">
<Col xs={8} className="d-flex align-items-center">
<h5 className="mb-0 me-3">{transporter.order} </h5>
Expand All @@ -76,19 +77,19 @@ function TransporterTable({ transporters, arrayFieldMethods, setupSign }: Transp
</Col>
<Col xs={2} className="d-flex justify-content-end align-items-center">
{readOnly ? (
<CustomToggle eventKey={transporter.epaSiteId}></CustomToggle>
<CustomToggle eventKey={transporterKey}></CustomToggle>
) : (
<TransporterRowActions
removeTransporter={arrayFieldMethods.remove}
swapTransporter={arrayFieldMethods.swap}
index={index}
length={transporters?.length}
eventKey={transporter.epaSiteId}
eventKey={transporterKey}
/>
)}
</Col>
</Row>
<Accordion.Collapse eventKey={transporter.epaSiteId}>
<Accordion.Collapse eventKey={transporterKey}>
<Card.Body>
<Table responsive>
<thead>
Expand Down
Loading