Commit Graph

457 Commits

Author SHA1 Message Date
burnettk 7c9f75d2e6 Merge commit '40d3199480eada37c57edb048169575ae0d3c02a' 2022-10-25 17:53:28 -04:00
burnettk d7e8533061 Squashed 'spiffworkflow-backend/' changes from ab9b5f36..7f1776b5
7f1776b5 Merge pull request #161 from sartography/feature/potential_owners_from_task_data
d19477e3 test removing an approver from a list while user lane_owners dict w/ burnettk
2f333204 resolved merge conflicts w/ burnettk
6b9c248b Merge remote-tracking branch 'origin/main' into feature/potential_owners_from_task_data
24a96ccd WIP: deleting user after approval w/ burnettk
8659f212 pyl now passes w/ burnettk
e9ef5bfe Merge remote-tracking branch 'origin/main' into feature/potential_owners_from_task_data
56f8d734 added some support to get the potential task owners from task data w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 7f1776b5b7f11ae6c02ef435200b0ba87219d7d2
2022-10-25 17:38:59 -04:00
burnettk 5e58904238 Merge commit 'd7e8533061a995595f520f31f7d4b56440078f5b' 2022-10-25 17:38:59 -04:00
jasquat e228ab4b80 Squashed 'spiffworkflow-backend/' changes from 1092ed111..ab9b5f368
ab9b5f368 Merge pull request #157 from sartography/feature/background_or_not_scheduler
ba002f8a4 do not preload gunicorn w/ burnettk
8516154cf pyl now passes w/ burnettk
dd0566b1a added script to start scheduler in its own process w/ burnettk danfunk
7d66f922f rename environment variable to something sensible.

git-subtree-dir: spiffworkflow-backend
git-subtree-split: ab9b5f368a0b954370e43936a88b2ce9b83dc4cc
2022-10-25 16:55:11 -04:00
jasquat b6d65fe2f6 Merge commit 'e228ab4b80138b3e943b11774c1fd47957ea7562' 2022-10-25 16:55:11 -04:00
burnettk 1f25521506 Squashed 'spiffworkflow-backend/' changes from 153061d4..1092ed11
1092ed11 Merge branch 'main' of github.com:sartography/spiffworkflow-backend into main
97b96fa9 Merge commit '999e0f4d2b7a3c3665feb806fd4f00dc50f2de8e'
4d2ebbe2 Refresh token (#6)
2c47d862 Revert "Assure that the Active Task Users table is cleared out before deleting the Active Task Record."
6c1660a3 Merge commit 'eff49e1ddb2e70d62e45866b429a1350443107d0' into main
f7949ada Merge commit 'ac929cbae7717affed5fa357a56cf1a0256289d5' into main
b70804ea Merge commit '65283df3cbfe95c6cd0d69e1cc0204d91c5d535b'
5b9ad7a7 Merge commit 'a59108db95274bef304cbd9246537206d0b449cf'
038c8e68 Merge commit '835160e5a82c7e0518fa25ed7fa1168c9c435739'
aae7966b Merge commit 'a1cce807be1c4ac5f04c42d780df06c216a0de9c'
8527c6be Merge commit '7026fe1f779051f6eb99b872bcd45b14c0cbe88f'
1aa9a8da Merge commit '70480e9f91a1053531ea5db32a13a791c39fd89f'
40383711 Merge commit '9a1e33696a744527a18dbec667140edb4038ac94'
2c7b2e28 Merge commit 'd643de93e5ceaae28a6e65044cc85dd039530d2c'
e5e70161 Merge commit '2b702661f3bd9b79de887e82e5a5925d07341eb6'
b0b92474 updateing poetry lock file.
e5fd3df1 Merge commit 'f0b608789b6cdc3ef4303efac053746c98571a48'
dfe4e3e1 Merge commit 'c5a2f8b16c9a614b944a6e4610594eba1dac7b9f' into main
78dcaec3 pointless change

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 1092ed11187d1b825fa1c5e18f0d96592f0b98e7
2022-10-25 16:54:06 -04:00
burnettk cef27d43a0 Merge commit '1f25521506a6ed4caef400a13903af86a7eb83d2' 2022-10-25 16:54:06 -04:00
mike cullerton c9b95af89a mypy 2022-10-25 16:47:40 -04:00
mike cullerton 4002ac1a70 Added `get_localtime` script
Added test for new script, with test process
2022-10-25 15:56:48 -04:00
Jon Herron 90f13cb076 Squashed 'flask-bpmn/' changes from aae17b7b4..b79454e50
b79454e50 Merge pull request #150 from sartography/dependabot/pip/black-22.10.0
2e6b675b0 Bump black from 22.6.0 to 22.10.0

git-subtree-dir: flask-bpmn
git-subtree-split: b79454e50415a53704f6154f062f78cadc9b9d43
2022-10-25 14:20:05 -04:00
Jon Herron 1eccb8b9ab Merge commit '90f13cb076961679a7760ef179d0a51b654dd88e' 2022-10-25 14:20:05 -04:00
Jon Herron 999e0f4d2b Squashed 'spiffworkflow-backend/' changes from 1e338f955..153061d41
153061d41 Merge branch 'main' of github.com:sartography/spiffworkflow-backend into main
3724ef7f9 Assure that the Active Task Users table is cleared out before deleting the Active Task Record. We were depending on a cascade here, which seems to fail randomly -- apparently due to some sort of race condition.
137ebbc4b Merge branch 'main' of github.com:sartography/spiffworkflow-backend
f8f38f813 pyl - prettier maybe?
02fe90969 Merge branch 'main' into feature/edit-task-data
ca7d7d9b3 Merge branch 'main' into feature/edit-task-data
c38efe2bd w/Jon Api endpoint to update task data
15b99bf90 mypy

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 153061d413afc5d7ed0c9cec25b292393585f757
2022-10-25 14:20:02 -04:00
Jon Herron 2aba139f59 Merge commit '999e0f4d2b7a3c3665feb806fd4f00dc50f2de8e' 2022-10-25 14:20:02 -04:00
Mike Cullerton 6b741de900 Refresh token (#6)
* Handle refreshed tokens if present

* Small cleanup

* No longer require secrets to be modified by the user that created them
Rename creator_user_id column to user_id

Co-authored-by: Jon Herron <jon.herron@yahoo.com>
Co-authored-by: mike cullerton <michaelc@cullerton.com>
2022-10-25 14:12:32 -04:00
Dan 53a733e05b Merge commit 'eff49e1ddb2e70d62e45866b429a1350443107d0' into main 2022-10-25 11:53:09 -04:00
Dan eff49e1ddb Squashed 'spiffworkflow-backend/' changes from e748b1804..1e338f955
1e338f955 Another error with the error message.

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 1e338f955acaf1c0c3e7d16c56c800f634638d9d
2022-10-25 11:53:09 -04:00
Dan 1fcceaf264 Merge commit 'ac929cbae7717affed5fa357a56cf1a0256289d5' into main 2022-10-25 11:25:20 -04:00
Dan ac929cbae7 Squashed 'spiffworkflow-backend/' changes from 3c677c751..e748b1804
e748b1804 quick patch so I can see the error message.
94908a9b9 Merge pull request #155 from sartography/dependabot/pip/flake8-bugbear-22.10.25
d7ba33c03 Bump flake8-bugbear from 22.9.23 to 22.10.25
bf9db9521 Merge pull request #154 from sartography/dependabot/pip/reorder-python-imports-3.9.0
4a2b12efc Bump reorder-python-imports from 3.8.5 to 3.9.0

git-subtree-dir: spiffworkflow-backend
git-subtree-split: e748b18047e611fb635da89dad563548fff7e00f
2022-10-25 11:25:20 -04:00
burnettk 6e9aef9263 Merge commit '65283df3cbfe95c6cd0d69e1cc0204d91c5d535b' 2022-10-24 22:35:36 -04:00
burnettk 65283df3cb Squashed 'spiffworkflow-backend/' changes from 952a1af5a..3c677c751
3c677c751 update sphinx-autoapi

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 3c677c751b84ff8ddd1372b4b01c15fe7e10e0f1
2022-10-24 22:35:36 -04:00
burnettk f6a834d05c Merge commit 'a59108db95274bef304cbd9246537206d0b449cf' 2022-10-24 18:20:10 -04:00
burnettk a59108db95 Squashed 'spiffworkflow-backend/' changes from 68ea8bce3..952a1af5a
952a1af5a try upgrade

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 952a1af5a81defc95effd57d198848b134392f91
2022-10-24 18:20:10 -04:00
burnettk ee589b49e3 Merge commit '835160e5a82c7e0518fa25ed7fa1168c9c435739' 2022-10-24 18:14:53 -04:00
burnettk 835160e5a8 Squashed 'spiffworkflow-backend/' changes from 090b84fd..68ea8bce
68ea8bce working version

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 68ea8bce3f01dbfe4991c366761f8d7e07788b3c
2022-10-24 18:14:53 -04:00
burnettk ebd5da4d9d Merge commit 'a1cce807be1c4ac5f04c42d780df06c216a0de9c' 2022-10-24 18:02:49 -04:00
burnettk a1cce807be Squashed 'spiffworkflow-backend/' changes from 653a86b1..090b84fd
090b84fd only set hostname once

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 090b84fd31ffd496dd1ee1c0f70b45ecd8bc9232
2022-10-24 18:02:49 -04:00
burnettk bfbf5adadb Squashed 'flask-bpmn/' changes from c7e2f98d..aae17b7b
aae17b7b Merge pull request #141 from sartography/dependabot/pip/dot-github/workflows/pip-22.3
e003df4a Merge pull request #148 from sartography/dependabot/pip/sphinx-autoapi-2.0.0
3740daef Bump pip from 22.2.2 to 22.3 in /.github/workflows
b66dce63 Merge pull request #138 from sartography/dependabot/pip/dot-github/workflows/poetry-1.2.2
4fed6cb3 Bump sphinx-autoapi from 1.9.0 to 2.0.0
235c0a87 Merge pull request #147 from sartography/dependabot/pip/reorder-python-imports-3.8.5
1ba76081 Bump reorder-python-imports from 3.8.2 to 3.8.5
d694c6c4 Bump poetry from 1.1.14 to 1.2.2 in /.github/workflows
2409d03e Merge pull request #146 from sartography/dependabot/pip/safety-2.3.1
366238e6 Merge pull request #145 from sartography/dependabot/github_actions/actions/download-artifact-3.0.1
b8807520 Bump safety from 2.1.1 to 2.3.1
be0a29db Bump actions/download-artifact from 3.0.0 to 3.0.1
05ec31cf Merge pull request #132 from sartography/dependabot/pip/docs/furo-2022.9.29
4c6bf71d Bump furo from 2022.6.21 to 2022.9.29 in /docs
6ab6009b Merge pull request #142 from sartography/dependabot/pip/docs/sphinx-5.3.0
43482306 Merge pull request #118 from sartography/dependabot/pip/pep8-naming-0.13.2
a77fcfd6 Bump pep8-naming from 0.13.1 to 0.13.2
726673dc Bump sphinx from 5.1.1 to 5.3.0 in /docs
3a4bf06b Merge pull request #139 from sartography/dependabot/pip/xdoctest-1.1.0
367557ea Bump xdoctest from 1.0.2 to 1.1.0
a3a5fc97 Merge pull request #144 from sartography/dependabot/github_actions/actions/upload-artifact-3.1.1
796e8478 Bump actions/upload-artifact from 3.0.0 to 3.1.1

git-subtree-dir: flask-bpmn
git-subtree-split: aae17b7b4152fe09d4a365ac5ec85289218c663b
2022-10-24 17:53:04 -04:00
burnettk d3a9433ce2 Merge commit 'bfbf5adadb2865d87f66b796356cba5e5feba90e' 2022-10-24 17:53:04 -04:00
burnettk 7026fe1f77 Squashed 'spiffworkflow-backend/' changes from 945b3c0d..653a86b1
653a86b1 update keycloak version and lint
df1443e3 new keycloak realm json with 30 minute access token lifespan and 1 day refresh token lifespan
ac31f4bf wait longer before importing realms for new keycloak w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 653a86b1aebebd8248f735d28cf91664585cb378
2022-10-24 17:53:02 -04:00
burnettk af1eb47568 Merge commit '7026fe1f779051f6eb99b872bcd45b14c0cbe88f' 2022-10-24 17:53:02 -04:00
burnettk 70480e9f91 Squashed 'spiffworkflow-backend/' changes from 13855180..945b3c0d
945b3c0d Merge pull request #151 from Natalia-Fominykh/patch-1
246e160b Update demo.yml
ed7185a5 Merge pull request #139 from sartography/dependabot/pip/docs/sphinx-5.3.0
4852e3f1 Bump sphinx from 5.2.3 to 5.3.0 in /docs
f1e887e7 Merge pull request #127 from sartography/dependabot/pip/pyupgrade-3.1.0
2821bfbc Bump pyupgrade from 2.38.4 to 3.1.0

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 945b3c0d723849f0a62f18c35e3e4a6f2846bf64
2022-10-24 10:44:38 -04:00
burnettk f0b673282c Merge commit '70480e9f91a1053531ea5db32a13a791c39fd89f' 2022-10-24 10:44:38 -04:00
burnettk 9a1e33696a Squashed 'spiffworkflow-backend/' changes from e013fc5da..13855180b
13855180b upgrade keycloak
952927d41 pyl w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 13855180b203282c6fe8a71e0baf650136e3781b
2022-10-21 17:51:39 -04:00
burnettk 50a4c2c2e0 Merge commit '9a1e33696a744527a18dbec667140edb4038ac94' 2022-10-21 17:51:39 -04:00
burnettk d643de93e5 Squashed 'spiffworkflow-backend/' changes from 797c99a76..e013fc5da
e013fc5da Merge branch 'main' of github.com:sartography/spiffworkflow-backend
55632c5dd updated demo permissions yaml w/ burnettk
bc03ea3aa Merge pull request #150 from sartography/dependabot/pip/pyjwt-2.6.0
fff14d210 Merge pull request #149 from sartography/dependabot/github_actions/actions/download-artifact-3.0.1
51fa78649 Bump pyjwt from 2.5.0 to 2.6.0
3383309c7 Bump actions/download-artifact from 3.0.0 to 3.0.1

git-subtree-dir: spiffworkflow-backend
git-subtree-split: e013fc5da8710389e6d6c7dd9283042a04008ffe
2022-10-21 17:28:37 -04:00
burnettk b114ff827b Merge commit 'd643de93e5ceaae28a6e65044cc85dd039530d2c' 2022-10-21 17:28:37 -04:00
jasquat 2b702661f3 Squashed 'spiffworkflow-backend/' changes from b978f502..797c99a7
797c99a7 updated uses of normalize value to check prefixes in tests w/ burnettk
c169cbd9 updated lock file w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 797c99a76e9e03e6b78157876b1ac0d503f13b95
2022-10-21 16:46:41 -04:00
jasquat a4305764a1 Merge commit '2b702661f3bd9b79de887e82e5a5925d07341eb6' 2022-10-21 16:46:41 -04:00
Dan ba3fc0e6fb updateing poetry lock file. 2022-10-21 16:44:44 -04:00
jasquat f0b608789b Squashed 'spiffworkflow-backend/' changes from 22766521..b978f502
b978f502 Merge pull request #148 from sartography/feature/respect_lanes
e7f2d23e merged in main and resolved conflicts w/ burnettk
3a382b40 add new user to active task if appropriate w/ burnettk
d1571c58 added default group to demo and development w/ burnettk
afdf81a0 added test to ensure users can update their own task w/ burnettk
6e13ee4e Merge remote-tracking branch 'origin/main' into feature/respect_lanes
645e4d8f updated flask-bpmn for sentry and fixed for pyl w/ burnettk
57248eab fixed submitting and getting user tasks w/ burnettk
c9b086d9 ignore all null-ls w/ burnettk
63796d50 fixed model load issue w/ burnettk
49eefc56 some precommit stuff w/ burnettk
579f0902 Merge remote-tracking branch 'origin/main' into feature/respect_lanes
47bdb99f fixed swagger ui w/ burnettk
5128f752 merged in main and resolved conflicts
be1f4bcc added validation to ensure user has access to task w/ burnettk
a387b787 added some code to respect lanes in a process model w/ burnettk

git-subtree-dir: spiffworkflow-backend
git-subtree-split: b978f502a0f840554940125c6b729b9b99086001
2022-10-21 16:28:09 -04:00
jasquat 8ebf524c12 Merge commit 'f0b608789b6cdc3ef4303efac053746c98571a48' 2022-10-21 16:28:09 -04:00
Dan b54299f28f Squashed 'flask-bpmn/' changes from c8fd01df4..c7e2f98d1
c7e2f98d1 fixed sentry calls by moving the logger.exception call w/ burnettk

git-subtree-dir: flask-bpmn
git-subtree-split: c7e2f98d1c42e3ff90a989957a346f4f87e622b8
2022-10-21 16:18:27 -04:00
Dan 5a3f5b8cc2 Merge commit 'b54299f28f74ed945f6b938190c31a03f64d5fe3' into main 2022-10-21 16:18:27 -04:00
Dan c5a2f8b16c Squashed 'spiffworkflow-backend/' changes from 106b5d75b..227665212
227665212 Merge pull request #147 from sartography/feature/improve_connector_proxy_calls
306618d99 Send a json request to the connector proxy (don't send a set of post params, as these will all be converted to strings) Requires changes on the connector proxy as well. Adding SimpleJson as a dependency -- when it is available, Flask will prefer its use when serializing requests - and this will avoid errors when attempting to send decimal values.  As I understand it, using SimpleJson on both ends will assure that decimals are represented as strings during serialization, but SimpleJson will know to deserialize them back to decimals on the other side. Can't say I'm lovin on Json at the moment.

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 227665212e28f5d48e2fc03ceb92a8805ae43f0a
2022-10-21 16:18:25 -04:00
Dan 2870b98150 Merge commit 'c5a2f8b16c9a614b944a6e4610594eba1dac7b9f' into main 2022-10-21 16:18:25 -04:00
Dan Funk c20798ba14 Merge pull request #3 from sartography/feature/dan_test
pointless change
2022-10-21 12:57:22 -04:00
Dan 4061258393 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 c0bf047d30 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