support workflow route change 2

Issue-ID: SDC-2126
Change-Id: I8ea037d6825053a9392d952ecca5dffc5ad09f77
Signed-off-by: Yarin Dekel <yarind@amdocs.com>

diff --git a/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx b/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx
index c1cd68c..edaa64f 100644 (file)
--- a/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx
+++ b/workflow-designer-ui/src/main/frontend/src/features/catalog/CatalogView.jsx
@@ -101,7 +101,7 @@ class CatalogView extends Component {
     goToOverviewPage = id => {
         const { history } = this.props;
         const { location } = history;
-        history.push(`${location.pathname}/workflow/${id}/overview`);
+        history.push(`${location.pathname}workflow/${id}/overview`);
     };
 
     searchChange = searchValue => {

diff --git a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewSagas.js b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewSagas.js
index 41002c8..792d4c0 100644 (file)
--- a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewSagas.js
+++ b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewSagas.js
@@ -93,7 +93,7 @@ export function* archiveWorkflow(action) {
             })
         })
     );
-    history.push('/workflows');
+    history.push('/workflows/');
 }
 
 export function* watchOverview() {

diff --git a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/views/WorkflowHeader.jsx b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/views/WorkflowHeader.jsx
index e40b19a..ce28129 100644 (file)
--- a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/views/WorkflowHeader.jsx
+++ b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/views/WorkflowHeader.jsx
@@ -23,7 +23,7 @@ import ArchiveLabel from 'shared/archiveLabel/ArchiveLabel';
 const Buttons = ({ history, archiveWorkflow, restoreWorkflow, isArchive }) => (
     <div className="header-buttons">
         <SVGIcon
-            onClick={() => history.push('/workflows')}
+            onClick={() => history.push('/workflows/')}
             label={I18n.t('workflow.overview.backBtnLabel')}
             className="go-catalog-btn"
             labelPosition="right"