Commit Graph

3329 Commits

Author SHA1 Message Date
jasquat c3a57c7c89 Merge commit 'd1f95114f860d4e84f36a694edf4b700cfdc1062' 2022-11-09 17:01:21 -05:00
jasquat 127ef67f12 Squashed 'spiffworkflow-backend/' changes from a195512fd..795df3526
795df3526 use instance path instead of root_path for nox w/ burnettk
d4113651e task_json is not optional w/ burnettk
c93dd2822 Merge commit '89bfc25f35bdfd57eb9ccf6f3a9a3de76e68cf93'
44ba4738f Merge commit 'de30945eec9161570080b4858da967a7628ec86c'
f894ebee2 Bulk insert spiff logs and step details (#26)

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 795df35260fe24562cf3ab2b92169ecad37d3d55
2022-11-09 17:01:17 -05:00
jasquat f4142ba1fb Merge commit '127ef67f120ef4035a5f214f6b140488eca60a8d' 2022-11-09 17:01:17 -05:00
mike cullerton b0d673ac37 Merge branch 'main' into feature/nested-groups-2
# Conflicts:
#	spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py
#	spiffworkflow-backend/src/spiffworkflow_backend/services/process_model_service.py
#	spiffworkflow-frontend/src/components/ProcessModelForm.tsx
#	spiffworkflow-frontend/src/helpers.tsx
2022-11-09 16:49:15 -05:00
Jon Herron 101e036576 Squashed 'bpmn-js-spiffworkflow/' changes from 24c2cc360..09fa713bb
09fa713bb kill a few consoles

git-subtree-dir: bpmn-js-spiffworkflow
git-subtree-split: 09fa713bb0bb1b9d4f97684afc46bc3711e11770
2022-11-09 15:45:53 -05:00
Jon Herron 272594b69a Merge commit '101e0365763e0b066d68925fd43d62d7a0aa79b0' 2022-11-09 15:45:53 -05:00
Jon Herron 89bfc25f35 Squashed 'spiffworkflow-backend/' changes from 6b54770d1..a195512fd
a195512fd do not install dev dependencies when building docker image w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: a195512fd94dc57b4b84c5d8fdce40f224650f50
2022-11-09 15:45:49 -05:00
Jon Herron 2401f3aa9c Merge commit '89bfc25f35bdfd57eb9ccf6f3a9a3de76e68cf93' 2022-11-09 15:45:49 -05:00
mike cullerton 21b6c947a8 Nested group UI stuff 2022-11-09 15:45:45 -05:00
Jon Herron 045ce807b5 Merge main, resolve conflicts 2022-11-09 15:45:37 -05:00
mike cullerton 7d5c6b8efc Fixes for adding nested groups.
We pass modified ids to the api, and need to clean them up before calling services.
2022-11-09 15:45:12 -05:00
Jon Herron 3d399cc796 Squashed 'flask-bpmn/' changes from 17434e090..b9d407795
b9d407795 Merge pull request #162 from sartography/dependabot/pip/mypy-0.990
4b5a0b0b9 Bump mypy from 0.982 to 0.990
84e2310e2 Merge commit 'c8bbd6a93e75c72eba85eb54893575a4746d9e15'
0bbcbf077 Move to Python 3.11 (#27)

git-subtree-dir: flask-bpmn
git-subtree-split: b9d4077955e0d45406946ef07440176fb9fd12e5
2022-11-09 15:44:12 -05:00
Jon Herron 18371cb2f5 Squashed 'spiffworkflow-frontend/' changes from 2149f03f5..45854fa9a
45854fa9a merged in and recsovled conflicts of frontend tree w/ burnettk
baa5f37ae Merge branch 'main' of github.com:sartography/spiff-arena
3cb6a9c77 process instance cypress tests pass now w/ burnettk

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: 45854fa9aea1cc8b48b39afd5680e525a745188d
2022-11-09 15:44:11 -05:00
Jon Herron 507c2e11dd Merge commit '18371cb2f53fdf108c28375f44461286f2af9cf1' 2022-11-09 15:44:11 -05:00
Jon Herron de30945eec Squashed 'spiffworkflow-backend/' changes from 64ac70428..6b54770d1
6b54770d1 update greenlet w/ burnettk
aa5cf0ed7 add back in support for python 3.9 and favor 3.11 for tests w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 6b54770d173f71528974b44ab2555cfcdbb19a32
2022-11-09 15:44:08 -05:00
Jon Herron 19810f1727 Merge commit 'de30945eec9161570080b4858da967a7628ec86c' 2022-11-09 15:44:08 -05:00
Jon Herron 5d972b7be5 Squashed 'SpiffWorkflow/' changes from 5d35f5c50..580939cc8
580939cc8 Merge commit '1e89f888c080f84dca0c373391a43bd509928b48'
0898498e5 Move to Python 3.11 (#27)

git-subtree-dir: SpiffWorkflow
git-subtree-split: 580939cc8cb0b7ade1571483bd1e28f554434ac4
2022-11-09 15:44:06 -05:00
Jon Herron 43f8985c8a Merge commit '5d972b7be567e7d3a23de4a2027114e68af9b80b' 2022-11-09 15:44:06 -05:00
jbirddog 2b92a6afef Bulk insert spiff logs and step details (#26) 2022-11-09 15:43:12 -05:00
jasquat 91db48797b merged in and resovled conflicts of bpmn-js tree w/ burnettk 2022-11-09 15:04:40 -05:00
jasquat 25a1e84439 Squashed 'bpmn-js-spiffworkflow/' changes from 96dcd1a24..24c2cc360
24c2cc360 don't flake out when no dmn options are returned.

git-subtree-dir: bpmn-js-spiffworkflow
git-subtree-split: 24c2cc36067adf8fed75990c6bf4a1a67bc9122b
2022-11-09 15:03:55 -05:00
jasquat c8bbd6a93e Squashed 'flask-bpmn/' changes from 191f0f327..17434e090
17434e090 Merge pull request #161 from sartography/dependabot/pip/dot-github/workflows/pip-22.3.1
8b290eb56 Bump pip from 22.3 to 22.3.1 in /.github/workflows
cc35c94cd Merge pull request #160 from sartography/dependabot/pip/dot-github/workflows/nox-poetry-1.0.2
1cf87405d Bump nox-poetry from 1.0.1 to 1.0.2 in /.github/workflows

git-subtree-dir: flask-bpmn
git-subtree-split: 17434e0907cc35914d013614bb79288eed1bd437
2022-11-09 15:03:53 -05:00
jasquat faf4f8a39e Merge commit 'c8bbd6a93e75c72eba85eb54893575a4746d9e15' 2022-11-09 15:03:53 -05:00
jasquat 22ad31300a merged in and recsovled conflicts of frontend tree w/ burnettk 2022-11-09 15:03:43 -05:00
jasquat 0a0bb2281a Squashed 'spiffworkflow-frontend/' changes from cdae31a57..2149f03f5
2149f03f5 fix breadcrumb
4106c5aac Merge pull request #28 from sartography/bug/browser_lock_on_dmn_selection
d9f04b932 one instance test left for cypress w/ burnettk
db4ff9019 kill a few consoles
8fd0cbafc fixing up routes for launching editor. Also some fixes in the bpmn-js-spiffworkflow to avoid locking up the browser if no files are available.
063fc1e0c process model cypress tests are passing
a1de9eca1 camelcase
67116e6ac fix process model create and a couple tests, docker build refactor
6dbdbffad fixed lint issue w/ burnettk cullerton
441e300c6 merged in main and resolved conflicts w/ burnettk cullerton
8c29bc3f6 fixed some acceptance tests w/ burnettk cullerton
cf9af691e updated breadcrumbs to work with new process models ids w/ burnettk cullerton
23ff4e816 made a process model form w/ burnettk
dbe0b9c71 Merge branch 'main' into feature/nested-groups
099ce24bb lint
da1bd979d return next task when running an instance w/ burnettk
ee76c5c81 More frontend changes
ff0e4c762 process model show page lists files as accordion with action icons w/ burnettk
a8cf19162 Merge remote-tracking branch 'origin/main' into feature/carbon_process_model_show
0b334f08d some minor chnages to prepare for chnaging actions dropdown to buttons
4e7d4733f First pass at custom report/perspective for Process Instance List (#23)
381cd4578 change action dropdown direction based on if it is the last one or not
ec72afceb add back run and edit and add actions menu
331c079e1 added a table for files w/ burnettk
65874023b updated process modal show page to use accordion component w/ burnettk
d50d23f14 First stab at fixing routes and urls
d26b67865 Merge remote-tracking branch 'origin/main' into feature/carbon_process_model_show
6d8fee5eb Merge commit '44e49e6ae6a1f644162489a27618c39194f4628d' into main
01218b3ca update gitignore.
ee11c1c2f updated the breadcrumb component and added a test for buttons in file dropdown

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: 2149f03f5d352ba2f40b4dc41e9435cfb396d0e5
2022-11-09 15:02:22 -05:00
jasquat 23f0b12e9a Squashed 'spiffworkflow-backend/' changes from b8924100d..64ac70428
64ac70428 Move to Python 3.11 (#27)
167851df1 remove leading slash from model identifiers
3503fe400 one instance test left for cypress w/ burnettk
7e09363c4 merged in main and resolved conflicts w/ burnettk cullerton
afbc3157d fixed some acceptance tests w/ burnettk cullerton
96e7b63c6 made a process model form w/ burnettk
c19aac25f Somethings up w/authentication. Maybe the stored token is bad
d17007eaa Merge branch 'main' into feature/nested-groups
729b13881 script to modify all model json files to use full path for model id. Also removes process_group_id
7856b8caa return next task when running an instance w/ burnettk
d183b961c First pass at custom report/perspective for Process Instance List (#23)
f303c0f77 remove process_group_identifier from process-instances endpoint
207de9ab8 Merge branch 'main' into feature/nested-groups
fec8d06b8 started test for test_script_unit_test_run
ea31c7a12 fixed process_model_identifier in script_unit_test_create
5d058cbea Fix url in test
f8afd7bdd Remove the `_2` methods
7c13ec802 Fix urls for uspend and resume endpoints
19158d7b0 Get testing bpmn files out of the config directory
5f1ee7f16 fixed failing test
de3b4b81d Merge branch 'main' into feature/nested-groups
440871d57 First stab at nested folders. Added temp endpoints Changes to tests and test helpers
1bd6a199f Don't need parent. Just use the whole path for the group id
a2ab420b2 Committing so Jon can view code

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 64ac7042887af80869963bc103c01f56404727f2
2022-11-09 15:02:19 -05:00
jasquat 781f95d54e Merge commit '23f0b12e9ab61b746e9d8d038c16ba8bc6ff0e2b' 2022-11-09 15:02:19 -05:00
jasquat 1e89f888c0 Squashed 'SpiffWorkflow/' changes from 8d820dce1..5d35f5c50
5d35f5c50 Quick fix on the readthedocs.

git-subtree-dir: SpiffWorkflow
git-subtree-split: 5d35f5c50d06e35b17c7e045fcf6000a6e16d8b6
2022-11-09 15:02:17 -05:00
jasquat 93df613dc9 Merge commit '1e89f888c080f84dca0c373391a43bd509928b48' 2022-11-09 15:02:17 -05:00
jasquat 3c737678c5 Merge branch 'main' of github.com:sartography/spiff-arena 2022-11-09 14:51:26 -05:00
jasquat c1c95aafa5 process instance cypress tests pass now w/ burnettk 2022-11-09 14:51:22 -05:00
jbirddog 5b01c50d6a Move to Python 3.11 (#27) 2022-11-09 13:45:16 -05:00
burnettk bd57ad29b9 fix breadcrumb 2022-11-09 13:19:01 -05:00
Dan Funk 97ef915944 Merge pull request #28 from sartography/bug/browser_lock_on_dmn_selection
Bug/browser lock on dmn selection
2022-11-09 13:10:36 -05:00
burnettk fe5f9d9e2d remove leading slash from model identifiers 2022-11-09 12:46:39 -05:00
jasquat cb8ea4d966 one instance test left for cypress w/ burnettk 2022-11-09 12:33:43 -05:00
burnettk e37ae5945d kill a few consoles 2022-11-09 12:09:23 -05:00
Dan 1423fe4c84 fixing up routes for launching editor.
Also some fixes in the bpmn-js-spiffworkflow to avoid locking up the browser if no files are available.
2022-11-09 12:03:55 -05:00
jasquat afa8aae60e process model cypress tests are passing 2022-11-09 10:12:13 -05:00
burnettk 34ec5b894a camelcase 2022-11-09 09:18:01 -05:00
burnettk 2cda810a04 fix process model create and a couple tests, docker build refactor 2022-11-08 22:36:39 -05:00
jasquat 0e31ff2be4 fixed lint issue w/ burnettk cullerton 2022-11-08 18:05:17 -05:00
jasquat 534f1d7a04 Merge pull request #25 from sartography/feature/nested-groups
Feature/nested groups
2022-11-08 17:49:43 -05:00
jasquat 1029b36a1b merged in main and resolved conflicts w/ burnettk cullerton 2022-11-08 17:49:23 -05:00
jasquat 06e5d05d51 fixed some acceptance tests w/ burnettk cullerton 2022-11-08 17:20:17 -05:00
jasquat e8ae76958e updated breadcrumbs to work with new process models ids w/ burnettk cullerton 2022-11-08 16:00:44 -05:00
jasquat b50db8999e made a process model form w/ burnettk 2022-11-08 14:31:24 -05:00
mike cullerton 149ffa6ef6 Somethings up w/authentication. Maybe the stored token is bad 2022-11-08 14:18:39 -05:00
mike cullerton b646fa98bd Merge branch 'main' into feature/nested-groups
# Conflicts:
#	spiffworkflow-backend/src/spiffworkflow_backend/api.yml
#	spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_report.py
#	spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py
#	spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
#	spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spec_file_service.py
#	spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
#	spiffworkflow-frontend/src/routes/ProcessInstanceReportList.tsx
#	spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx
#	spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
2022-11-08 14:09:03 -05:00
burnettk 124d4e2eb0 lint 2022-11-08 12:50:39 -05:00