diff options
8 files changed, 56 insertions, 10 deletions
diff --git a/workflow-designer-ui/src/main/frontend/package.json b/workflow-designer-ui/src/main/frontend/package.json index bd224ba2..f1f33712 100644 --- a/workflow-designer-ui/src/main/frontend/package.json +++ b/workflow-designer-ui/src/main/frontend/package.json @@ -46,7 +46,7 @@ "redux-saga": "^0.16.0", "redux-thunk": "^2.3.0", "reselect": "^3.0.1", - "sdc-ui": "1.6.55", + "sdc-ui": "1.6.57", "uuid-js": "^0.7.5", "validator": "^10.2.0" }, diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/features/_composition.scss b/workflow-designer-ui/src/main/frontend/resources/scss/features/_composition.scss index a159a4b7..119bbf02 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/features/_composition.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/features/_composition.scss @@ -8,6 +8,7 @@ } .bpmn-sidebar { height: 100%; + width: 320px; .properties-panel { &, .bpp-properties-panel { height: 100%; diff --git a/workflow-designer-ui/src/main/frontend/src/features/activities/activitiesActions.js b/workflow-designer-ui/src/main/frontend/src/features/activities/activitiesActions.js new file mode 100644 index 00000000..ab0a3c4c --- /dev/null +++ b/workflow-designer-ui/src/main/frontend/src/features/activities/activitiesActions.js @@ -0,0 +1,6 @@ +import { SET_ACTIVITIES_LIST } from './activitiesConstants'; + +export const setActivitiesList = payload => ({ + type: SET_ACTIVITIES_LIST, + payload +}); diff --git a/workflow-designer-ui/src/main/frontend/src/features/activities/activitiesApi.js b/workflow-designer-ui/src/main/frontend/src/features/activities/activitiesApi.js new file mode 100644 index 00000000..8e1afc15 --- /dev/null +++ b/workflow-designer-ui/src/main/frontend/src/features/activities/activitiesApi.js @@ -0,0 +1,25 @@ +/* +* Copyright © 2018 European Support Limited +* +* 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 +* 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 +* limitations under the License. +*/ + +const mockActivities = { + results: [] +}; + +export default { + fetchActivities: () => { + return Promise.resolve(mockActivities); + } +}; diff --git a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx index 74dfc32e..7209f633 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx +++ b/workflow-designer-ui/src/main/frontend/src/features/catalog/views/AddWorkflow.jsx @@ -28,7 +28,7 @@ class AddWorkflow extends React.Component { data-test-id="wf-catalog-add-workflow" onClick={onClick}> <div className="add-workflow__icon"> - <SVGIcon name="plusCircle" /> + <SVGIcon name="plusCircleThick" /> </div> <div className="add-workflow__label"> <Translate value="catalog.addWorkflow" /> diff --git a/workflow-designer-ui/src/main/frontend/src/features/version/composition/Composition.js b/workflow-designer-ui/src/main/frontend/src/features/version/composition/Composition.js index d2c273c4..d322207d 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/version/composition/Composition.js +++ b/workflow-designer-ui/src/main/frontend/src/features/version/composition/Composition.js @@ -20,11 +20,13 @@ import CompositionView from './CompositionView'; import { showErrorModalAction } from '../../../shared/modal/modalWrapperActions'; import { getComposition } from './compositionSelectors'; import { getWorkflowName } from '../../workflow/workflowSelectors'; +import { activitiesSelector } from 'features/activities/activitiesSelectors'; function mapStateToProps(state) { return { composition: getComposition(state), - name: getWorkflowName(state) + name: getWorkflowName(state), + activities: activitiesSelector(state) }; } diff --git a/workflow-designer-ui/src/main/frontend/src/features/version/versionSaga.js b/workflow-designer-ui/src/main/frontend/src/features/version/versionSaga.js index 78b82ab1..be52579e 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/version/versionSaga.js +++ b/workflow-designer-ui/src/main/frontend/src/features/version/versionSaga.js @@ -33,6 +33,8 @@ import { versionState } from 'features/version/versionConstants'; import overviewApi from '../workflow/overview/overviewApi'; import { versionListFetchAction } from '../workflow/overview/overviewConstansts'; import { updateComposition } from 'features/version/composition/compositionActions'; +import activitiesApi from 'features/activities/activitiesApi'; +import { setActivitiesList } from 'features/activities/activitiesActions'; function* fetchVersion(action) { try { @@ -46,10 +48,12 @@ function* fetchVersion(action) { action.payload ); } + const activitiesList = yield call(activitiesApi.fetchActivities); yield all([ put(setWorkflowVersionAction(rest)), put(setInputsOutputs({ inputs, outputs })), - put(updateComposition(composition)) + put(updateComposition(composition)), + put(setActivitiesList(activitiesList.results)) ]); } catch (error) { yield put(genericNetworkErrorAction(error)); diff --git a/workflow-designer-ui/src/main/frontend/yarn.lock b/workflow-designer-ui/src/main/frontend/yarn.lock index 6642482b..5a1ac9af 100644 --- a/workflow-designer-ui/src/main/frontend/yarn.lock +++ b/workflow-designer-ui/src/main/frontend/yarn.lock @@ -1221,10 +1221,10 @@ babel-plugin-jest-hoist@^22.4.3: resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a" babel-plugin-macros@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.3.0.tgz#1538e6339cbcbf093f334dc2f10f5f53043e3fda" + version "2.4.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.4.0.tgz#6c5f9836e1f6c0a9743b3bab4af29f73e437e544" dependencies: - cosmiconfig "^4.0.0" + cosmiconfig "^5.0.5" babel-plugin-minify-builtins@^0.3.0: version "0.3.0" @@ -3034,6 +3034,14 @@ cosmiconfig@^4.0.0: parse-json "^4.0.0" require-from-string "^2.0.1" +cosmiconfig@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0" + dependencies: + is-directory "^0.3.1" + js-yaml "^3.9.0" + parse-json "^4.0.0" + create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -10385,9 +10393,9 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" -sdc-ui@1.6.55: - version "1.6.55" - resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.55.tgz#a66f50cdb0d661cd36b586815b504fe51a6f66cc" +sdc-ui@1.6.57: + version "1.6.57" + resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.57.tgz#9250faa279163e13f36bb91c835b8fe78f77ebaf" dependencies: "@angular/common" "~2.4.8" "@angular/core" "~2.4.8" |