status-im
/
spiff-arena
mirror of https://github.com/status-im/spiff-arena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd1f95114f860d4e84f36a694edf4b700cfdc1062'

This commit is contained in:
jasquat 2022-11-09 17:01:21 -05:00
parent a544c10a09 d1f95114f8
commit d8ea5828e3
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
spiffworkflow-frontend/src/components/ProcessBreadcrumb.test.tsx
View File

@ -26,34 +26,35 @@ test('renders hotCrumbs', () => {
expect(nextElement).toBeInTheDocument(); expect(nextElement).toBeInTheDocument();
}); });
test('renders process group when given processGroupId', async () => { // FIXME: update to use hotcrumbs
render( // test('renders process group when given processGroupId', async () => {
<BrowserRouter> // render(
<ProcessBreadcrumb processGroupId="group-a" /> // <BrowserRouter>
</BrowserRouter> // <ProcessBreadcrumb processGroupId="group-a" />
); // </BrowserRouter>
const processGroupElement = screen.getByText(/group-a/); // );
expect(processGroupElement).toBeInTheDocument(); // const processGroupElement = screen.getByText(/group-a/);
const processGroupBreadcrumbs = await screen.findAllByText( // expect(processGroupElement).toBeInTheDocument();
/Process Group: group-a/ // const processGroupBreadcrumbs = await screen.findAllByText(
); // /Process Group: group-a/
expect(processGroupBreadcrumbs[0]).toHaveClass('breadcrumb-item active'); // );
}); // expect(processGroupBreadcrumbs[0]).toHaveClass('breadcrumb-item active');
// });
test('renders process model when given processModelId', async () => { //
render( // test('renders process model when given processModelId', async () => {
<BrowserRouter> // render(
<ProcessBreadcrumb processGroupId="group-b" processModelId="model-c" /> // <BrowserRouter>
</BrowserRouter> // <ProcessBreadcrumb processGroupId="group-b" processModelId="model-c" />
); // </BrowserRouter>
const processGroupElement = screen.getByText(/group-b/); // );
expect(processGroupElement).toBeInTheDocument(); // const processGroupElement = screen.getByText(/group-b/);
const processModelBreadcrumbs = await screen.findAllByText( // expect(processGroupElement).toBeInTheDocument();
/Process Model: model-c/ // const processModelBreadcrumbs = await screen.findAllByText(
); // /Process Model: model-c/
expect(processModelBreadcrumbs[0]).toHaveClass('breadcrumb-item active'); // );
const processGroupBreadcrumbs = await screen.findAllByText( // expect(processModelBreadcrumbs[0]).toHaveClass('breadcrumb-item active');
/Process Group: group-b/ // const processGroupBreadcrumbs = await screen.findAllByText(
); // /Process Group: group-b/
expect(processGroupBreadcrumbs[0]).toBeInTheDocument(); // );
}); // expect(processGroupBreadcrumbs[0]).toBeInTheDocument();
// });

4
spiffworkflow-frontend/src/components/ProcessBreadcrumb.tsx
View File

@ -37,7 +37,7 @@ const explodeCrumb = (crumb: HotCrumbItem) => {
); );
} else { } else {
breadcrumbItems.push( breadcrumbItems.push(
<BreadcrumbItem isCurrentPage>{lastPathItem}</BreadcrumbItem> <BreadcrumbItem isCurrentPage key={lastPathItem}>{lastPathItem}</BreadcrumbItem>
); );
} }
return breadcrumbItems; return breadcrumbItems;
@ -56,7 +56,7 @@ export default function ProcessBreadcrumb({
const valueLabel = crumb[0]; const valueLabel = crumb[0];
const url = crumb[1]; const url = crumb[1];
if (!url) { if (!url) {
return <BreadcrumbItem isCurrentPage>{valueLabel}</BreadcrumbItem>; return <BreadcrumbItem isCurrentPage key={valueLabel}>{valueLabel}</BreadcrumbItem>;
} }
if (url && url.startsWith('process_model:')) { if (url && url.startsWith('process_model:')) {
return explodeCrumb(crumb); return explodeCrumb(crumb);