Fix output params

Fix issue: Output parameters are being duplicated as input parameters in Composition page

Issue-ID: SDC-1817
Signed-off-by: Malek <malek.zoabi@amdocs.com>
Change-Id: If59ed6db69d36afa3f7efa1935cbcdfe60a3a0b5

diff --git a/workflow-designer-ui/src/main/frontend/src/features/version/composition/custom-properties-provider/provider/camunda/parts/implementation/InputOutputUpdater.js b/workflow-designer-ui/src/main/frontend/src/features/version/composition/custom-properties-provider/provider/camunda/parts/implementation/InputOutputUpdater.js
index bc05b87..056a2db 100644 (file)
--- a/workflow-designer-ui/src/main/frontend/src/features/version/composition/custom-properties-provider/provider/camunda/parts/implementation/InputOutputUpdater.js
+++ b/workflow-designer-ui/src/main/frontend/src/features/version/composition/custom-properties-provider/provider/camunda/parts/implementation/InputOutputUpdater.js
@@ -36,7 +36,7 @@ export default ({ element, bo, bpmnFactory, activityInputsOutputs }) => {
         })
     );
 
-    const outputs = activityInputsOutputs.inputs.map(({ name, value }) =>
+    const outputs = activityInputsOutputs.outputs.map(({ name, value }) =>
         createElement(OUTPUT, newInputOutput, bpmnFactory, {
             name,
             type: 'Text',

diff --git a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/Overview.js b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/Overview.js
index 4fe857d..0cce3e5 100644 (file)
--- a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/Overview.js
+++ b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/Overview.js
@@ -23,8 +23,7 @@ import {
 } from 'features/workflow/overview/overviewSelectors';
 import {
     getVersionsAction,
-    updateWorkflowAction,
-    selectVersionAction
+    updateWorkflowAction
 } from 'features/workflow/overview/overviewConstansts';
 import { NEW_VERSION_MODAL } from 'shared/modal/modalWrapperComponents';
 import { showCustomModalAction } from 'shared/modal/modalWrapperActions';
@@ -42,7 +41,6 @@ function mapStateToProps(state) {
 function mapDispatchToProps(dispatch) {
     return {
         getOverview: workflowId => dispatch(getVersionsAction(workflowId)),
-        onSelectVersion: payload => dispatch(selectVersionAction(payload)),
         showNewVersionModal: () =>
             dispatch(
                 showCustomModalAction({

diff --git a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/OverviewView.jsx b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/OverviewView.jsx
index 3166cad..2c74661 100644 (file)
--- a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/OverviewView.jsx
+++ b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/OverviewView.jsx
@@ -5,9 +5,9 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+*      http://www.apache.org/licenses/LICENSE-2.0
 *
- * Unless required by applicable law or agreed to in writing, software
+* Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
@@ -25,7 +25,6 @@ class OverviewView extends Component {
     static propTypes = {
         getOverview: PropTypes.func,
         versions: PropTypes.array,
-        onSelectVersion: PropTypes.func,
         onCreateVersion: PropTypes.func,
         selectedVersion: PropTypes.string,
         workflow: PropTypes.object,
@@ -53,8 +52,7 @@ class OverviewView extends Component {
     }
 
     onSelectVersionFromTable = data => {
-        const { onSelectVersion, history, workflow } = this.props;
-        onSelectVersion({ workflowId: workflow.id, versionId: data.id });
+        const { history, workflow } = this.props;
         history.push('/workflow/' + workflow.id + '/version/' + data.id);
     };
 
@@ -120,7 +118,6 @@ class OverviewView extends Component {
 OverviewView.defaultProps = {
     versions: [],
     getOverview: () => {},
-    onSelectVersion: () => {},
     selectedVersion: ''
 };
 

diff --git a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewConstansts.js b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewConstansts.js
index 53e9061..c90685c 100644 (file)
--- a/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewConstansts.js
+++ b/workflow-designer-ui/src/main/frontend/src/features/workflow/overview/overviewConstansts.js
@@ -4,10 +4,10 @@
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
-* 
- *      http://www.apache.org/licenses/LICENSE-2.0
-* 
- * Unless required by applicable law or agreed to in writing, software
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
@@ -18,7 +18,6 @@ import { createAction } from 'redux-actions';
 
 export const FETCH_VERSION_LIST = 'overview/FETCH_VERSION_LIST';
 export const GET_OVERVIEW = 'overview/GET_OVERVIEW';
-export const SELECT_VERSION = 'overview/SELECT_VERSION';
 export const UPDATE_WORKFLOW = 'overview/UPDATE_WORKFLOW';
 
 export const versionListFetchAction = payload => ({
@@ -26,11 +25,6 @@ export const versionListFetchAction = payload => ({
     payload
 });
 
-export const selectVersionAction = payload => ({
-    type: SELECT_VERSION,
-    payload
-});
-
 export const getVersionsAction = workflowId => ({
     type: GET_OVERVIEW,
     payload: workflowId

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 28549c8..6df38a4 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
@@ -5,9 +5,9 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+*      http://www.apache.org/licenses/LICENSE-2.0
 *
- * Unless required by applicable law or agreed to in writing, software
+* Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
@@ -20,12 +20,10 @@ import overviewApi from 'features/workflow/overview/overviewApi';
 import {
     versionListFetchAction,
     GET_OVERVIEW,
-    SELECT_VERSION,
     UPDATE_WORKFLOW
 } from 'features/workflow/overview/overviewConstansts';
 import { setWorkflowAction } from 'features/workflow/workflowConstants';
 import { notificationActions } from 'shared/notifications/notificationsActions';
-import { workflowVersionFetchRequestedAction } from 'features/version/versionConstants';
 
 export function* getOverview(action) {
     try {
@@ -38,14 +36,6 @@ export function* getOverview(action) {
     }
 }
 
-export function* setCurrentVersion(action) {
-    try {
-        yield put(workflowVersionFetchRequestedAction(action.payload));
-    } catch (e) {
-        yield put(genericNetworkErrorAction(e));
-    }
-}
-
 export function* updateWorkflow(action) {
     try {
         yield call(overviewApi.updateWorkflow, action.payload);
@@ -62,6 +52,5 @@ export function* updateWorkflow(action) {
 
 export function* watchOverview() {
     yield takeEvery(GET_OVERVIEW, getOverview);
-    yield takeEvery(SELECT_VERSION, setCurrentVersion);
     yield takeEvery(UPDATE_WORKFLOW, updateWorkflow);
 }