Commit Graph

1463 Commits

Author SHA1 Message Date
Dan d331c792f6 Merge commit 'c5a2f8b16c9a614b944a6e4610594eba1dac7b9f' into main 2022-10-21 16:18:25 -04:00
Dan Funk 2aabe19766
Merge pull request #3 from sartography/feature/dan_test
pointless change
2022-10-21 12:57:22 -04:00
Dan 3043252cdd pointless change 2022-10-21 12:56:15 -04:00
Dan 3a0b6f634c Squashed 'spiffworkflow-frontend/' changes from b0000877..647a428c
647a428c Merge pull request #93 from sartography/test_arena_push
9d119258 Pause/resume process instances (#2)
0c4b7541 Merge commit '5adbec7e67d36fd582fc01da083e531ff0925b9e'
73a17f29 Merge commit '2a5690772af8fcd121b257dd0b0ba606c57be47a'
3ecfc4f3 Merge commit 'f930f96d1b389e239d05e865afe4db339cb49cbf'
0c9e869f Merge commit '75729ba3df3a8e1eccbae237d96efa7f17f72b26'
93891c60 Merge commit '8d86fe710d083e1d5b2f031ddcf3443b044785e3'
e63af290 Merge commit 'a087961fab0d73cc54f9cae658e9eb50ab060f96'
1b737265 Merge commit '3cfc1bd3834a5ed8ec9d1aa91886ebf0a0c69053'
12b8b32f CI fixes
e8451a3e Merge main, resolve conflicts
716bb3cb Updaging the jinja processing so it doesn't leave a bunch of blank lines in the markdown that has strong feelings about white space.  Updating the front end to render markdown formatted instructions.  And adding a little css love to tables that are generated in Markdown.

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: 647a428c7eb93b2a0c501b64903e5fbfc59b87cc
2022-10-21 12:55:02 -04:00
Dan 6fbc7597c5 Merge commit '3a0b6f634cdb1bf76ec4fdef8c57a6849ca55961' into main 2022-10-21 12:55:02 -04:00
Dan 44b07c6a21 Squashed 'spiffworkflow-backend/' changes from 1e831706..106b5d75
106b5d75 only add status if active_task has it w/ burnettk
48cbc757 resolved merge conflicts in backend w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 106b5d75b9b401c315b80ccabb337925bf0d8c09
2022-10-21 12:55:00 -04:00
Dan 92434bfa24 Merge commit '44b07c6a21e8c7a74e6c5c780e4347b340dd100d' into main 2022-10-21 12:55:00 -04:00
jasquat d63622f7a2 only add status if active_task has it w/ burnettk 2022-10-21 11:10:57 -04:00
jasquat a2dc475bf9 added script to push out a subtree w/ burnettk 2022-10-21 10:48:02 -04:00
jasquat a55337102a resolved merge conflicts in backend w/ burnettk 2022-10-21 10:38:13 -04:00
jasquat cd7c413da2 Squashed 'spiffworkflow-backend/' changes from 5225a8b4..1e831706
1e831706 Merge pull request #146 from sartography/test_arena_push
df95dccf fixed conflicts and updated usage of active task status w/ burnettk
33b81894 Merge pull request #145 from sartography/feature/remove-task-data-from-active-task
7e1ce35c remove task_data column
b9cd1c06 Merge pull request #144 from sartography/feature/lib-updates-and-mypy
5e09e28d fix mypy
68485ab4 use fork of sqlalchemy-stubs
872480db Merge remote-tracking branch 'origin/main' into feature/lib-updates-and-mypy
18a892f6 work in progress
84344d53 Pause/resume process instances (#2)
53652cff Merge commit '4a48d9cccd1ca8619b3dbef3c10bcce667c9d9e0'
9ea3def2 lint
c05b5181 Merge remote-tracking branch 'origin/main' into feature/lib-updates-and-mypy
b2a75f60 Merge commit 'c661100e03eef762cb51b02be1b309ec47be7002'
3ddaa5d0 lib updates and mypy
30d04282 Merge commit '4fdb0f3ec4b3b6a68cc2e56ed84ffb6dc2743068'
a961b2a1 Merge commit '81746ee508f6ab0ffe757856d9a3d5d855db2560'
10651984 Merge commit '8f8b4717990eb86c6bfd2f309ef064152c51b452'
59b90fba Merge branch 'main' of github.com:sartography/spiff-arena
577e0fe3 Merge commit 'a166df83031cb88d223e5c75ae8db8c896622821'
11d40241 Merge commit '106e2ca7214aec4dba965ccb3f94b0658acaa2b2'
1fcc935e Merge commit '9781908243408ed221f2b0131a00b8a9612f81f3'
e9734bff Merge commit '64e7049c9a0a4360101a155a41ce64ae692acd3c'
28239aa4 Merge commit 'aa22f4b397a899fa06d06c2e9127ca98d9eb909a'
8b184a5c Merge commit '4f0f5b1ece069ec56f8eb4154d61334a321749a1'
bd1effc6 Merge commit 'b4975660431c275ce736e0431b98c39548200af1'
eafa4f61 Merge commit 'c9bd62250452403550ae1bf1d27547d4796dd316'
50d9a0c3 Merge commit '9be0517531543655a35023af17b76dbb41eab93e'
34e98b77 Merge commit 'a1a01ad25a1ef60b879dede6f037f0fff3381ae4'
c8d0cb8a Merge commit 'bee232a55a82054e629f48f0333495b61a7da7d1'
00478271 Merge commit '71e189afbc127b574cca8d02fc31b2e65aff0d52'
657fbad9 Merge commit 'f21d0ef3a98458deb347fb2a51fab0b5b41f7fe2'
c91c279e Merge commit '93dbce681ec89bc45479748aaae06ddd92b64da4'
b95a1af9 Merge commit '48918b00428e777ea29d351662467c0ac4e34a36'
afea9254 pre-commit updates
e3bc3b76 Merge main, resolve conflicts
2e317da8 Updaging the jinja processing so it doesn't leave a bunch of blank lines in the markdown that has strong feelings about white space.  Updating the front end to render markdown formatted instructions.  And adding a little css love to tables that are generated in Markdown.

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 1e831706a1f7ed841e343537cfe1dc05d5eedaca
2022-10-21 10:36:41 -04:00
jbirddog 2da327bd76
Pause/resume process instances (#2)
Collab with @cullerton
2022-10-20 16:44:08 -04:00
burnettk 9b83ec1849 Squashed 'flask-bpmn/' changes from bd4b45a84..c8fd01df4
c8fd01df4 send ApiError to sentry and remove ApiError specific handler and send everything through the same one
70ee69c9b let InternalServerError be handled by the common Exception handler and do not send ApiErrors to sentry

git-subtree-dir: flask-bpmn
git-subtree-split: c8fd01df47518749a074772fec383256c482139f
2022-10-20 16:00:14 -04:00
burnettk 742a2ef487 Merge commit '9b83ec1849a2d68dbedb2a8f07d0bfd0a44a85e5' 2022-10-20 16:00:14 -04:00
burnettk 4a48d9cccd Squashed 'spiffworkflow-backend/' changes from f9c2fa21e..5225a8b4c
5225a8b4c pyl
259f74a1e Merge branch 'main' into bug/refresh-token
d452208ef Merge pull request #135 from sartography/feature/permissions3
8e1075406 Merge branch 'main' into bug/refresh-token
2b01d2fe7 fixed authentication_callback and getting the user w/ burnettk
476e36c7d mypy changes
6403e62c0 Fix migration after merging main
594a32b67 merged in main and resolved conflicts w/ burnettk
b285ba1a1 added updated columns to secrets and updated flask-bpmn
7c53fc9fa Merge remote-tracking branch 'origin/main' into feature/permissions3
201a6918a pyl changes
a6112f7fb Merge branch 'main' into bug/refresh-token
87f65a6c6 auth_token should be dictionary, not string
f163de61c pyl
1f443bb94 PublicAuthenticationService -> AuthenticationService
6c491a3df Don't refresh token here. They just logged in. We are validating the returned token. If it is bad, raise an error.
91b8649f8 id_token -> auth_token
fc94774bb Move `store_refresh_token` to authentication_service
00d66e9c5 mypy
c4e415dbe mypy
1e75716eb Pre commit
a72b03e09 Rename method. We pass it auth_tokens, not id_tokens
9a6700a6d Too many things expect g.token. Reverting my change
74883fb23 Noe store refresh_token, and try to use it if auth_token is expired Renamed some methods to use correct token type
be0557013 Cleanup - remove unused code
cf01f0d51 Add refresh_token model
1c0c937af added method to delete all permissions so we can recreate them w/ burnettk
aaeaac879 Merge remote-tracking branch 'origin/main' into feature/permissions3
44856fce2 added api endpoint to check if user has permissions based on given target uris w/ burnettk
ae830054d precommit w/ burnettk
94d50efb1 created common method to check whether an api method should have auth w/ burnettk
c955335d0 precommit w/ burnettk
37caf1a69 added a finance user to keycloak and fixed up the staging permission yml w/ burnettk
93c456294 merged in main and resolved conflicts w/ burnettk
06a7c6485 remaining tests are now passing w/ burnettk
50529d04c added test to make sure api gives a 403 if a permission is not found w/ burnettk
6a9d0a68a api calls are somewhat respecting permissions now and the process api tests are passing
d07fbbeff attempting to respect permissions w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 5225a8b4c101133567d4f7efa33632d36c29c81d
2022-10-20 16:00:12 -04:00
burnettk 338c40ae48 Merge commit '4a48d9cccd1ca8619b3dbef3c10bcce667c9d9e0' 2022-10-20 16:00:12 -04:00
burnettk d326c45572 remove dependencies 2022-10-20 15:59:58 -04:00
burnettk c661100e03 Squashed 'spiffworkflow-backend/' changes from af8dd9e2d..f9c2fa21e
f9c2fa21e lint
287d10494 only do startswith when it is a string
80c5357b9 lint

git-subtree-dir: spiffworkflow-backend
git-subtree-split: f9c2fa21ec0e68c5deb240be17aed347ba4867cd
2022-10-20 07:19:24 -04:00
burnettk 01d39f31dd Merge commit 'c661100e03eef762cb51b02be1b309ec47be7002' 2022-10-20 07:19:24 -04:00
burnettk b93ad83f0e new script 2022-10-20 07:19:18 -04:00
burnettk d10a1543f0 Squashed 'flask-bpmn/' changes from 6e1411dd1..bd4b45a84
bd4b45a84 update libs

git-subtree-dir: flask-bpmn
git-subtree-split: bd4b45a842ed63a29e74ff02ea7f2a56d7b2298a
2022-10-19 19:33:01 -04:00
burnettk acc7915a5f Merge commit 'd10a1543f012f2e8e49a3a606423afe106397a6b' 2022-10-19 19:33:01 -04:00
burnettk 4fdb0f3ec4 Squashed 'spiffworkflow-backend/' changes from 22bc66758..af8dd9e2d
af8dd9e2d Merge branch 'main' of github.com:sartography/spiffworkflow-backend into main
2f40b0d7f Post, Not Get -- to the connector proxy Allow insane large task data in the database

git-subtree-dir: spiffworkflow-backend
git-subtree-split: af8dd9e2d6cd116034e1df3b00e4c7186ffe7dba
2022-10-19 19:32:59 -04:00
burnettk c4244cd8ea Merge commit '4fdb0f3ec4b3b6a68cc2e56ed84ffb6dc2743068' 2022-10-19 19:32:59 -04:00
burnettk 5adbec7e67 Squashed 'spiffworkflow-frontend/' changes from 6f8e41848..b00008779
b00008779 update bpmn-js

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: b00008779005693812050c9c78e396e9f1a6447d
2022-10-19 16:48:28 -04:00
burnettk ffdf2ac728 Merge commit '5adbec7e67d36fd582fc01da083e531ff0925b9e' 2022-10-19 16:48:28 -04:00
jasquat bb86175687 Squashed 'bpmn-js-spiffworkflow/' changes from b3eef6e52..9c0da0240
9c0da0240 Merge pull request #21 from sartography/bug/data_objects
6fe36aeb0 Minor fixes.
d21cb75fb Assure we aren't setting the properties on every service task to the same thing.
f28a3f89e Deleting any data object reference caused the associated data object to get deleted. Fixes this so that only if you delete all references, wii the data object be removed. Also assures that a new data object is not created when adding to a participant in a collaboration (an edge case bug(.

git-subtree-dir: bpmn-js-spiffworkflow
git-subtree-split: 9c0da02406ecbc51cfd7fd1ed1f2f311101d9987
2022-10-19 16:16:54 -04:00
jasquat d932dec9ec Merge commit 'bb86175687658b8c4d0042eef5439ba75b49d5c2' 2022-10-19 16:16:54 -04:00
jasquat 81746ee508 Squashed 'spiffworkflow-backend/' changes from 6c573bb64..22bc66758
22bc66758 allow request to be 8k w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 22bc66758576b8b8d51348eddd64c56c77d54388
2022-10-19 16:16:50 -04:00
jasquat 6789a81f2c Merge commit '81746ee508f6ab0ffe757856d9a3d5d855db2560' 2022-10-19 16:16:50 -04:00
jasquat 36ceec0c11 set auto edit to no w/ burnettk 2022-10-19 16:16:43 -04:00
burnettk 2a5690772a Squashed 'spiffworkflow-frontend/' changes from 7f1f0b359..6f8e41848
6f8e41848 do not send invalid model keys to the backend w/ burnettk

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: 6f8e418481edb3cd0c0e1a1947f6fba3f863e893
2022-10-19 15:25:27 -04:00
burnettk e6046b727e Merge commit '2a5690772af8fcd121b257dd0b0ba606c57be47a' 2022-10-19 15:25:27 -04:00
burnettk 8f8b471799 Squashed 'spiffworkflow-backend/' changes from 72049c004..6c573bb64
6c573bb64 remove standlone from api yaml since it is no longer used w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 6c573bb645541ea06b177ab1ab01c9be95106109
2022-10-19 15:25:23 -04:00
burnettk 80abbdf587 Merge commit '8f8b4717990eb86c6bfd2f309ef064152c51b452' 2022-10-19 15:25:23 -04:00
burnettk aca9f618cb Merge branch 'main' of github.com:sartography/spiff-arena 2022-10-19 15:18:40 -04:00
burnettk 9d0278add0 Squashed 'flask-bpmn/' changes from 5edb83f66..6e1411dd1
6e1411dd1 log the exception before returning the response

git-subtree-dir: flask-bpmn
git-subtree-split: 6e1411dd134955a829bb9f3d59b4af121907cd35
2022-10-19 15:17:22 -04:00
burnettk 971374e392 Merge commit '9d0278add0e9d0b4c4d853a112d47d9562d48a7e' 2022-10-19 15:17:22 -04:00
burnettk f930f96d1b Squashed 'spiffworkflow-frontend/' changes from bf2d2a224..7f1f0b359
7f1f0b359 Merge branch 'main' of github.com:sartography/spiffworkflow-frontend
03499ae0c add the redirect url back into the call to connector proxy
c0199ebf2 Merge pull request #91 from sartography/bugfix/style-of-date-selection
96880aee2 comment
63c24e024 Json Web Form CSS Fix - Bootsrtrap now requires that each li have a "list-inline-item", also have a PR  in on this with the react-jsonschema-form.

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: 7f1f0b3596b567d705b159b1df975113b75a2825
2022-10-19 15:17:20 -04:00
burnettk 87cbd46981 Merge commit 'f930f96d1b389e239d05e865afe4db339cb49cbf' 2022-10-19 15:17:20 -04:00
burnettk a166df8303 Squashed 'spiffworkflow-backend/' changes from 57ba8e0c8..72049c004
72049c004 added authentication callback endpoint. w/ burnettk, cullerton, jbirddog
1902b785d updated flask-bpmn w/ burnettk cullerton

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 72049c00413ab9aa7d4c65b77247583654c06488
2022-10-19 15:17:17 -04:00
burnettk 2a1d8ee4e9 Merge commit 'a166df83031cb88d223e5c75ae8db8c896622821' 2022-10-19 15:17:17 -04:00
jasquat 44f53a85f2 Merge commit '106e2ca7214aec4dba965ccb3f94b0658acaa2b2' 2022-10-19 10:43:46 -04:00
jasquat 106e2ca721 Squashed 'spiffworkflow-backend/' changes from 57ba8e0c8..1902b785d
1902b785d updated flask-bpmn w/ burnettk cullerton

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 1902b785d95112b8c5807e8514010022952b1a85
2022-10-19 10:43:46 -04:00
burnettk 6423633c91 Squashed 'flask-bpmn/' changes from 42cebab51..5edb83f66
5edb83f66 require spiffworkflow git main for dev w/ burnettk

git-subtree-dir: flask-bpmn
git-subtree-split: 5edb83f662a6da2c8ce0dea8992ef8602218828f
2022-10-19 10:31:39 -04:00
burnettk cdee34feb8 Merge commit '6423633c91aa649461a89ffe687e0be41b455c02' 2022-10-19 10:31:39 -04:00
burnettk 9781908243 Squashed 'spiffworkflow-backend/' changes from d0336039c..57ba8e0c8
57ba8e0c8 also set up the config for hacked app w/ burnettk
045fe9c93 configure sentry in hacked up app w/ burnettk
fd1a273d3 save process instance even it fails w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 57ba8e0c8205cb049d3f93c21f73be96232dda93
2022-10-19 10:31:35 -04:00
burnettk 4856f833c7 Merge commit '9781908243408ed221f2b0131a00b8a9612f81f3' 2022-10-19 10:31:35 -04:00
burnettk dfd3eee5e9 Squashed 'SpiffWorkflow/' changes from d9fcd45a3..a094adad8
a094adad8 Prep for release 1.2.1 - Minor fix for a dependency in Python 3.10
b9e3dd80e Merge pull request #253 from sartography/feature/avoid_importlib_for_python_3.8_up
df311639c do not install importlib-metadata if greater than python 3.7 w/ burnettk

git-subtree-dir: SpiffWorkflow
git-subtree-split: a094adad8767f82e9c5fa806a46597e066252a72
2022-10-19 10:31:33 -04:00
burnettk 4000266a5c Merge commit 'dfd3eee5e95dc0a4e6f09034851fddf1f5e4bb50' 2022-10-19 10:31:33 -04:00