From 6a86308c119cbfbcfd54ed7d70f3803140f22a54 Mon Sep 17 00:00:00 2001
From: burnettk <burnettk@users.noreply.github.com>
Date: Thu, 29 Sep 2022 17:20:49 -0400
Subject: [PATCH] fix tests and start looking at showing recent process models

---
 cypress/e2e/tasks.cy.js          |  6 +++---
 cypress/support/commands.js      |  6 +++---
 src/App.tsx                      |  1 +
 src/components/NavigationBar.tsx |  2 +-
 src/components/SubNavigation.tsx |  2 +-
 src/routes/HomePage.tsx          |  3 +++
 src/routes/ProcessModelShow.tsx  | 35 ++++++++++++++++++++++++++++++++
 7 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/tasks.cy.js b/cypress/e2e/tasks.cy.js
index 77bef45..6c5a3ae 100644
--- a/cypress/e2e/tasks.cy.js
+++ b/cypress/e2e/tasks.cy.js
@@ -85,8 +85,8 @@ describe('tasks', () => {
     checkTaskHasClass('form4', activeTaskClassName);
     cy.get('.modal .btn-close').click();
 
-    cy.navigateToTasks();
-    cy.url().should('include', '/tasks');
+    cy.navigateToHome();
+    cy.contains('Tasks').should('exist');
 
     // FIXME: this will probably need a better way to link to the proper form that we want
     cy.contains('Complete Task').click();
@@ -121,7 +121,7 @@ describe('tasks', () => {
     cy.runPrimaryBpmnFile();
     cy.runPrimaryBpmnFile();
 
-    cy.navigateToTasks();
+    cy.navigateToHome();
     cy.basicPaginationTest();
   });
 });
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 63abe3e..4e2c9fb 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -30,12 +30,12 @@ Cypress.Commands.add('getBySel', (selector, ...args) => {
   return cy.get(`[data-qa=${selector}]`, ...args);
 });
 
-Cypress.Commands.add('navigateToTasks', () => {
-  cy.getBySel('nav-item-tasks').click();
+Cypress.Commands.add('navigateToHome', () => {
+  cy.getBySel('nav-home').click();
 });
 
 Cypress.Commands.add('navigateToAdmin', () => {
-  cy.getBySel('nav-item-admin').click();
+  cy.getBySel('spiffworkflow-logo').click();
 });
 
 Cypress.Commands.add('login', (selector, ...args) => {
diff --git a/src/App.tsx b/src/App.tsx
index cff9bb3..805548c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -39,6 +39,7 @@ export default function App() {
             <main style={{ padding: '1rem 0' }}>
               <Routes>
                 <Route path="/" element={<HomePage />} />
+                <Route path="/tasks" element={<HomePage />} />
                 <Route path="/admin/*" element={<AdminRoutes />} />
                 <Route
                   path="/tasks/:process_instance_id/:task_id"
diff --git a/src/components/NavigationBar.tsx b/src/components/NavigationBar.tsx
index 53e7d09..8527209 100644
--- a/src/components/NavigationBar.tsx
+++ b/src/components/NavigationBar.tsx
@@ -79,7 +79,7 @@ export default function NavigationBar() {
   return (
     <Navbar bg="dark" expand="lg" variant="dark">
       <Container>
-        <Navbar.Brand href="/admin">
+        <Navbar.Brand data-qa="spiffworkflow-logo" href="/admin">
           <img src={logo} className="app-logo" alt="logo" />
         </Navbar.Brand>
         <Navbar.Toggle aria-controls="basic-navbar-nav" />
diff --git a/src/components/SubNavigation.tsx b/src/components/SubNavigation.tsx
index 244a1b1..871d017 100644
--- a/src/components/SubNavigation.tsx
+++ b/src/components/SubNavigation.tsx
@@ -25,7 +25,7 @@ export default function SubNavigation() {
   if (activeKey) {
     return (
       <Nav variant="tabs" activeKey={activeKey}>
-        <Nav.Item>
+        <Nav.Item data-qa="nav-home">
           <Nav.Link href="/">Home</Nav.Link>
         </Nav.Item>
         <Nav.Item>
diff --git a/src/routes/HomePage.tsx b/src/routes/HomePage.tsx
index 1229170..97767ab 100644
--- a/src/routes/HomePage.tsx
+++ b/src/routes/HomePage.tsx
@@ -74,6 +74,8 @@ export default function HomePage() {
     );
   };
 
+  const relevantProcessModelSection = null;
+
   if (pagination) {
     const { page, perPage } = getPageInfoFromSearchParams(searchParams);
     return (
@@ -86,6 +88,7 @@ export default function HomePage() {
           tableToDisplay={buildTable()}
           path="/tasks"
         />
+        {relevantProcessModelSection}
       </>
     );
   }
diff --git a/src/routes/ProcessModelShow.tsx b/src/routes/ProcessModelShow.tsx
index 92fae7b..6cf2d82 100644
--- a/src/routes/ProcessModelShow.tsx
+++ b/src/routes/ProcessModelShow.tsx
@@ -14,6 +14,41 @@ export default function ProcessModelShow() {
   const [processInstanceResult, setProcessInstanceResult] = useState(null);
   const [reloadModel, setReloadModel] = useState(false);
 
+  // useEffect(() => {
+  //   // All values stored in localStorage are strings.
+  //   // Grab our recentProcessModels string from localStorage.
+  //   const stringFromLocalStorage = window.localStorage.getItem(
+  //     'recentProcessModels'
+  //   );
+  //
+  //   // Then parse that string into an actual value.
+  //   const parsedValueFromString = JSON.parse(stringFromLocalStorage);
+  //
+  //   // If that value is null (meaning that we've never saved anything to that spot in localStorage before), use an empty array as our array. Otherwise, just stick with the value we've just parsed out.
+  //   const array = parsedValueFromString || [];
+  //
+  //   // Here's the value we want to add
+  //   const value = {
+  //     processGroupIdentifier: params.process_group_id,
+  //     processModelIdentifier: params.process_model_id,
+  //   };
+  //
+  //   // If our parsed/empty array doesn't already have this value in it...
+  //   if (array.indexOf(value) == -1) {
+  //     // add the value to the array
+  //     array.push(value);
+  //
+  //     // turn the array WITH THE NEW VALUE IN IT into a string to prepare it to be stored in localStorage
+  //     const stringRepresentingArray = JSON.stringify(array);
+  //
+  //     // and store it in localStorage as "recentProcessModels"
+  //     window.localStorage.setItem(
+  //       'recentProcessModels',
+  //       stringRepresentingArray
+  //     );
+  //   }
+  // }, []);
+
   useEffect(() => {
     const processResult = (result: object) => {
       setProcessModel(result);