From a51021d6021ca2168c4a4ac7b8959dea52fc8b51 Mon Sep 17 00:00:00 2001 From: Yarin Dekel Date: Tue, 19 Feb 2019 11:42:04 +0200 Subject: support workflow route change 2 Issue-ID: SDC-2126 Change-Id: I8ea037d6825053a9392d952ecca5dffc5ad09f77 Signed-off-by: Yarin Dekel --- .../src/main/frontend/src/features/catalog/CatalogView.jsx | 2 +- .../src/main/frontend/src/features/workflow/overview/overviewSagas.js | 2 +- .../frontend/src/features/workflow/overview/views/WorkflowHeader.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 c1cd68ce..edaa64f3 100644 --- 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 41002c89..792d4c0c 100644 --- 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 e40b19a2..ce281299 100644 --- 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 }) => (
history.push('/workflows')} + onClick={() => history.push('/workflows/')} label={I18n.t('workflow.overview.backBtnLabel')} className="go-catalog-btn" labelPosition="right" -- cgit 1.2.3-korg