Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate st2flow #759

Merged
merged 87 commits into from
Jan 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
8e7feb6
initial attempt at integrating st2flow
mickmcgrath13 May 28, 2020
e7016d9
workaround for the redux connect issue in the st2flow editor
mickmcgrath13 May 28, 2020
da047b8
fix missing pack icon
mickmcgrath13 May 28, 2020
d7fcb53
add standard st2 header to st2 flow ui
mickmcgrath13 May 28, 2020
d5f64ab
enable edit link for workflows in action details panel
mickmcgrath13 May 28, 2020
69a8482
update licenses to OS for st2flow files
mickmcgrath13 Jul 7, 2020
d13e59c
fix lint errors
mickmcgrath13 Jul 7, 2020
f307362
pull in link component directly to flow-link
mickmcgrath13 Jul 7, 2020
6176ed3
do not pass urlprops into st2flow link
mickmcgrath13 Jul 7, 2020
1f8a1b8
revert changes for pulling link directly for now. will try again later
mickmcgrath13 Jul 7, 2020
3a8dd88
use link directly instead of flowlink
mickmcgrath13 Jul 7, 2020
8533fac
skip test for flow link - it is deprecated anyway
mickmcgrath13 Jul 7, 2020
86a83f9
add perf_hooks to st2flow-perf script
mickmcgrath13 Jul 20, 2020
3e50674
merge master
mickmcgrath13 Jul 20, 2020
775ce96
remove performance require in st2flow-perf
mickmcgrath13 Jul 20, 2020
4cb0b99
Merge branch 'integrate-st2flow' into integrate-st2flow-merge-master
mickmcgrath13 Jul 20, 2020
b873a86
Merge branch 'master' into integrate-st2flow
Jul 31, 2020
5555656
testing dev vs prod
mickmcgrath13 Aug 3, 2020
ecb6ca7
Merge branch 'integrate-st2flow' of github.com:StackStorm/st2web into…
mickmcgrath13 Aug 3, 2020
f1060fe
use makefiles and add distinction between dev and prod builds
mickmcgrath13 Aug 5, 2020
71b893f
add docker-compose details to readme
mickmcgrath13 Aug 5, 2020
d2e90df
debugging production build via docker-compose
mickmcgrath13 Aug 10, 2020
0245f6a
fix master merge conflicts
mickmcgrath13 Aug 10, 2020
485e897
fix docker-based development for both dev and prod
mickmcgrath13 Aug 17, 2020
e78a649
remove unused include from gulpfile
mickmcgrath13 Aug 17, 2020
2358f69
update readme with a note about config.local.js
mickmcgrath13 Aug 17, 2020
e64649e
docker-compose with nginx
mickmcgrath13 Aug 27, 2020
6d91533
Make st2flow modules public
m4dcoder Aug 30, 2020
8b341c2
Merge branch 'master' into integrate-st2flow
Sep 1, 2020
f759fe4
workflow-integration-issue-fixes
Sep 3, 2020
c0659e6
function test cases execution issue fixes
Sep 10, 2020
b69f1e1
unit test case execution issue fixes
Sep 15, 2020
d7594ab
functional test failure issue fixed for circle CI job
Sep 15, 2020
eb34dcf
Merge pull request #798 from orchestral-st2/integrate-st2flow-issue-fix
m4dcoder Sep 18, 2020
b8c0c60
Increment app-workflows version to 0.3.1
m4dcoder Sep 18, 2020
853a72c
changes in Makefile to delete node_modules from st2-workflow
Sep 23, 2020
6353f5f
Minor fixes to indentation error in Makefile
m4dcoder Sep 23, 2020
1a05b62
Remove blank lines in Makefile
m4dcoder Sep 23, 2020
41b9079
Merge pull request #799 from orchestral-st2/integration-st2flow-build…
m4dcoder Sep 23, 2020
47225a9
workflow tab zoom icon css issue fixes
Sep 24, 2020
2659822
indentation removed from Makefile
Sep 24, 2020
3137b0d
Merge remote-tracking branch 'upstream/integrate-st2flow' into integr…
m4dcoder Sep 24, 2020
dba6760
Merge pull request #800 from orchestral-st2/integration-st2-flow-css-…
m4dcoder Sep 24, 2020
88f5545
workflow-UI-issues and + icon redirection issue
Sep 26, 2020
7e569e8
Merge pull request #802 from shital-orchestral/workflow-UI-modificati…
m4dcoder Sep 26, 2020
834cc4d
workflow-ui-enhancement-and-issues fixes
Sep 30, 2020
26db732
workflow properties toggle button css issue fixes
Oct 1, 2020
4605d61
Merge pull request #803 from shital-orchestral/workflow-UI-enhanment-…
m4dcoder Oct 6, 2020
b42ab57
removed commented code
Oct 6, 2020
be4fd4e
Merge remote-tracking branch 'origin/integrate-st2flow' into workflow…
Oct 6, 2020
1aeef3a
Merge pull request #804 from shital-orchestral/workflow-toggle-button…
m4dcoder Oct 6, 2020
dffdea8
Merge branch 'master' into integrate-st2flow
m4dcoder Oct 6, 2020
dcac1b2
Update st2-auto-form to v2.4.4
m4dcoder Oct 7, 2020
db20b73
transition tab display and css issue fixes
Oct 8, 2020
756b2a1
Merge pull request #807 from shital-orchestral/transition-tab-issue-f…
m4dcoder Oct 8, 2020
c92c89b
workflow model issue fixing
Oct 9, 2020
5d010ae
unit-test-cases-failure-issue-fix
Oct 9, 2020
e2e9870
Update st2-auto-form to v2.4.5
m4dcoder Oct 9, 2020
0490fc0
Merge pull request #808 from shital-orchestral/workflow-module-new-is…
m4dcoder Oct 9, 2020
04a5554
workflow coordinates changes auto save and workflow header changes
Oct 13, 2020
1b325e5
Merge pull request #810 from shital-orchestral/workflow-auto-save-hea…
m4dcoder Oct 13, 2020
04cdd2e
workflow header ui fixes
Oct 14, 2020
9dcf105
Merge pull request #813 from shital-orchestral/workflow-module-header…
m4dcoder Oct 15, 2020
2df0ad4
workflow module header format changes
Oct 16, 2020
bc322c4
Merge pull request #814 from shital-orchestral/wokflow-new-UI-enhance…
m4dcoder Oct 16, 2020
77009c6
entry-point-auto-populate-and-validation
Oct 21, 2020
56857a5
Merge pull request #816 from shital-orchestral/entry-point-validation
m4dcoder Oct 21, 2020
66561e8
Merge remote-tracking branch 'origin/master' into integrate-st2flow
m4dcoder Oct 21, 2020
0564135
minor ui fixes and notification error message time increased
Oct 26, 2020
7ab78d9
Merge pull request #817 from shital-orchestral/minor-ui-fixes-noticat…
m4dcoder Oct 26, 2020
c5cb0e8
st2flow UI fixes
Oct 28, 2020
abee689
Merge pull request #818 from shital-orchestral/flow-integration-issue…
m4dcoder Oct 29, 2020
88cba3b
notification link will be open in parent window from canvas
Nov 2, 2020
d146c04
Merge pull request #819 from shital-orchestral/opening-parent-window-…
m4dcoder Nov 2, 2020
0b9cd84
opening history link in the existing parent window
Nov 5, 2020
ee27b47
Merge pull request #820 from shital-orchestral/open-history-in-parent…
m4dcoder Nov 5, 2020
6f66d98
Fix join all tasks radio button visibility
m4dcoder Nov 20, 2020
d2f50c1
Merge pull request #821 from shital-orchestral/display-radio-buttons-…
m4dcoder Nov 20, 2020
12c44f0
save indicator should light up on task rearrangement or addition
Dec 1, 2020
94202df
Merge pull request #844 from shital-orchestral/save-indicator-changes
m4dcoder Dec 4, 2020
2857fd2
save indicator gets light up on rearrangeing the tasks
Dec 7, 2020
bd346a3
save indicator light up modification with same dirty flag
Dec 10, 2020
438d522
Merge pull request #845 from shital-orchestral/save-chanegs-modification
m4dcoder Dec 11, 2020
468ff03
chaging parameter name causing for duplication of parameter issue fixes
Dec 14, 2020
960c695
Merge pull request #847 from shital-orchestral/change-param-name-dupl…
m4dcoder Dec 15, 2020
716952a
Merge remote-tracking branch 'origin' into integrate-st2flow
m4dcoder Dec 15, 2020
d89418e
Add copyright headers for StackStorm authors
m4dcoder Jan 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
root: true
globals:
$Shape: false
plugins:
- flowtype
- react
- notice
extends:
Expand Down Expand Up @@ -138,3 +141,4 @@ rules:
notice/notice:
- error
- mustMatch: "(// Copyright \\d{4} [a-zA-Z0-9,\\.\\s]+\\n)+//\\n// Licensed under the Apache License, Version 2\\.0 \\(the \"License\"\\);\\n// you may not use this file except in compliance with the License\\.\\n// You may obtain a copy of the License at\\n//\\n//\\s+http://www\\.apache\\.org/licenses/LICENSE-2\\.0\\n//\\n// Unless required by applicable law or agreed to in writing, software\\n// distributed under the License is distributed on an \"AS IS\" BASIS,\\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n// See the License for the specific language governing permissions and\\n// limitations under the License\\.\\n"

13 changes: 13 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[ignore]
.*/module-deps/test/invalid_pkg/package.json

[include]

[libs]

[lints]

[options]
esproposal.decorators=ignore

[strict]
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ debian/files

# VIM Swap
.*.swp


# local stuff
config.local.js
17 changes: 17 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM node:10.15.3

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web

# get files
COPY . /opt/stackstorm/static/webui/st2web
RUN rm /opt/stackstorm/static/webui/st2web/yarn.lock

# install dependencies
RUN make build-and-install

# expose your ports
EXPOSE 3000

# start it up
CMD [ "npm", "run", "serve" ]
17 changes: 17 additions & 0 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM node:10.15.3

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web

# get files
COPY . /opt/stackstorm/static/webui/st2web
RUN rm /opt/stackstorm/static/webui/st2web/yarn.lock

# install dependencies
RUN make build-dev

# expose your ports
EXPOSE 3000

# start it up
CMD [ "npm", "run", "serve-dev" ]
26 changes: 26 additions & 0 deletions Dockerfile-nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM node:10.15.3 as build

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web

# get files
COPY . /opt/stackstorm/static/webui/st2web
RUN rm /opt/stackstorm/static/webui/st2web/yarn.lock

# install dependencies
RUN make build-and-install

# expose your ports
EXPOSE 3000


FROM nginx
RUN rm -f /etc/nginx/conf.d/default.conf
# COPY ./nginx.local.conf /etc/nginx/conf.d/default.conf
COPY ./nginx.local.conf /etc/nginx/conf.d/st2.conf
COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui
# Generate self-signed certificate or place your existing certificate under /etc/ssl/st2
RUN mkdir -p /etc/ssl/st2
RUN openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/st2/st2.key -out /etc/ssl/st2/st2.crt \
-days 365 -nodes -subj "/C=US/ST=California/L=Palo Alto/O=StackStorm/OU=Information \
Technology/CN=$(hostname)"
20 changes: 20 additions & 0 deletions Dockerfile-nginx-dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM node:10.15.3 as build

# Create app directory
WORKDIR /opt/stackstorm/static/webui/st2web

# get files
COPY . /opt/stackstorm/static/webui/st2web
RUN rm /opt/stackstorm/static/webui/st2web/yarn.lock

# install dependencies
RUN make build-dev

# expose your ports
EXPOSE 3000


FROM nginx
RUN rm -f /etc/nginx/conf.d/default.conf
COPY ./nginx.local-dev.conf /etc/nginx/conf.d/st2.conf
COPY --from=build /opt/stackstorm/static/webui /opt/stackstorm/static/webui
25 changes: 25 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,40 @@ DEB_DISTRO := $(shell (echo $(PKG_VERSION) | grep -q dev) && echo unstable || ec
.PHONY: all build clean install deb rpm
all: build

npm-install:
echo "npm install"
npm install -g lerna yarn

lerna:
echo "lerna"
lerna bootstrap
rm -rf apps/st2-workflows/node_modules

build-dev:
echo "build-dev"
make npm-install
make lerna

build-and-install:
make build
make install

build:
echo "build-and-install"
make npm-install
make lerna
echo "run gulp production directly"
npm run build

clean:
rm -Rf build/
mkdir -p build/

install:
echo "make install"
echo "mkdir -p $(DESTDIR)$(PREFIX)"
mkdir -p $(DESTDIR)$(PREFIX)
echo "cp -R $(CURDIR)/build/* $(DESTDIR)$(PREFIX)"
cp -R $(CURDIR)/build/* $(DESTDIR)$(PREFIX)

deb:
Expand Down
25 changes: 25 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,31 @@ $ gulp

At that point you should be able to point your browser to http://localhost:3000/ and see the the page.

Quick start (docker-compose)
-----------

> **Note:** docker-compose uses `config.local.js` which is gitignored and should be a copy of `config.js` with your specific values

Production:
```
docker-compose up
```

Dev:
```
docker-compose -f docker-compose.dev.yml up --build
```

Production with NGINX:
```
docker-compose -f docker-compose.nginx.yml up --build
```

Dev with NGINX:
```
docker-compose -f docker-compose.nginx-dev.yml up --build
```

Build system
------------

Expand Down
15 changes: 12 additions & 3 deletions apps/st2-actions/actions-details.component.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2021 The StackStorm Authors.
// Copyright 2019 Extreme Networks, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -31,7 +32,6 @@ import {
FlexTableColumn,
FlexTableInsert,
} from '@stackstorm/module-flex-table';
import FlowLink from '@stackstorm/module-flow-link';
import Button from '@stackstorm/module-forms/button.component';
import Highlight from '@stackstorm/module-highlight';
import Label from '@stackstorm/module-label';
Expand Down Expand Up @@ -213,7 +213,9 @@ export default class ActionsDetails extends React.Component {
},
});
}

setWindowName(e){
window.name="parent"
}
handleRun(e, ...args) {
e.preventDefault();

Expand Down Expand Up @@ -253,7 +255,14 @@ export default class ActionsDetails extends React.Component {
<Button flat value="Preview" onClick={() => this.handleToggleRunPreview()} />
<DetailsToolbarSeparator />
{ action.runner_type === 'mistral-v2' || action.runner_type === 'orquesta' ? (
<FlowLink action={action.ref} data-test="flow_link" />
<Link
target="_blank"
to={`/action/${action.ref}`}
className="st2-forms__button st2-details__toolbar-button"
onClick ={e => this.setWindowName(e)}
>
Edit
</Link>
) : null }
</DetailsToolbar>
{ this.state.runPreview && <Highlight key="preview" well data-test="action_code" code={this.state.runValue} /> }
Expand Down
12 changes: 10 additions & 2 deletions apps/st2-actions/actions-panel.component.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2021 The StackStorm Authors.
// Copyright 2019 Extreme Networks, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -27,7 +28,7 @@ import notification from '@stackstorm/module-notification';
import setTitle from '@stackstorm/module-title';

import FlexTable from '@stackstorm/module-flex-table';
import FlowLink from '@stackstorm/module-flow-link';
import Link from '@stackstorm/module-router/link.component';
import PackIcon from '@stackstorm/module-pack-icon';
import {
Panel,
Expand Down Expand Up @@ -222,7 +223,14 @@ export default class ActionsPanel extends React.Component {
<Panel data-test="actions_panel" detailed>
<PanelView className="st2-actions">
<div className="st2-panel__toolbar-actions">
<FlowLink />
<Link
target="_blank"
to="/action"
replace={true}
className="st2-panel__toolbar-button"
>
<i className="icon-plus" />
</Link>
</div>
<Toolbar title="Actions">
<ToolbarSearch
Expand Down
2 changes: 1 addition & 1 deletion apps/st2-actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"dependencies": {
"@stackstorm/module-action-reporter": "^2.4.3",
"@stackstorm/module-api": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.5",
"@stackstorm/module-filter-expandable": "^2.4.3",
"@stackstorm/module-flex-table": "^2.4.3",
"@stackstorm/module-flow-link": "^2.4.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/st2-history/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"dependencies": {
"@stackstorm/module-action-reporter": "^2.4.3",
"@stackstorm/module-api": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.5",
"@stackstorm/module-filter": "^2.4.3",
"@stackstorm/module-filter-expandable": "^2.4.3",
"@stackstorm/module-flex-table": "^2.4.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/st2-inquiry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"dependencies": {
"@stackstorm/module-api": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.5",
"@stackstorm/module-flex-table": "^2.4.3",
"@stackstorm/module-forms": "^2.4.3",
"@stackstorm/module-highlight": "^2.4.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/st2-packs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"dependencies": {
"@stackstorm/module-api": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.5",
"@stackstorm/module-flex-table": "^2.4.3",
"@stackstorm/module-forms": "^2.4.3",
"@stackstorm/module-highlight": "^2.4.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/st2-rules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"dependencies": {
"@stackstorm/module-api": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.3",
"@stackstorm/module-auto-form": "^2.4.5",
"@stackstorm/module-criteria": "^2.4.3",
"@stackstorm/module-flex-table": "^2.4.3",
"@stackstorm/module-forms": "^2.4.3",
Expand Down
25 changes: 25 additions & 0 deletions apps/st2-workflows/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2021 The StackStorm Authors.
// Copyright 2019 Extreme Networks, Inc.
//
m4dcoder marked this conversation as resolved.
Show resolved Hide resolved
// 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.

import Workflows from './workflows.component';

const route = {
title: 'Workflows',
url: '/action',
Component: Workflows,
position: 7,
};

export default route;
Loading