Commit Graph

424 Commits

Author SHA1 Message Date
jasquat a9e9cf8bd9 Merge commit '9a68d490d8f8413d00198156dd5d62aadb3c359b' 2022-11-11 10:38:51 -05:00
jasquat 9a68d490d8 Squashed 'flask-bpmn/' changes from b9d407795..5e40777f4
5e40777f4 Merge pull request #164 from sartography/dependabot/pip/pyupgrade-3.2.2
e4e64ff8b Bump pyupgrade from 3.2.1 to 3.2.2
df9ab9a12 Merge pull request #163 from sartography/dependabot/pip/pyupgrade-3.2.1
e795e3c31 Bump pyupgrade from 3.2.0 to 3.2.1
fbe0d164a Merge main, resolve conflicts

git-subtree-dir: flask-bpmn
git-subtree-split: 5e40777f4013f71f2c1237f13f7dba1bdd5c0de3
2022-11-11 10:38:51 -05:00
jasquat abf1dd7b3c pulled in subtrees and resolved conflicts w/ burnettk 2022-11-11 10:38:44 -05:00
jasquat 2b5c7d138e Squashed 'spiffworkflow-frontend/' changes from 3ab257b81..ab6cf2817
ab6cf2817 Merge commit '7a36189cbf9db07b735903625b23ea23b9fa8de7'
55bf14202 pass in perm file for acceptance tests w/ burnettk
6ba87954c Merge branch 'main' into feature/nested-groups-2
86fd7a388 Merge branch 'main' into feature/nested-groups-2
53a56abfa Nested group UI stuff

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: ab6cf281724b3a63f901506d25baf2f4009d30d0
2022-11-11 10:33:57 -05:00
jasquat c10b5aeb07 pulled in subtrees and resolved conflicts w/ burnettk 2022-11-11 10:33:51 -05:00
jasquat 3e95f315ac Squashed 'spiffworkflow-backend/' changes from 43faebbd8..e78e32dcf
e78e32dcf Merge commit 'a26363d7145eeb5e07eb08ad4018be8a42e2076e'
ec2d4ef66 pass in perm file for acceptance tests w/ burnettk
eb718fd55 Merge branch 'main' into feature/nested-groups-2
1497205b1 Merge branch 'main' into feature/nested-groups-2
caa03e2f8 Fixes for adding nested groups. We pass modified ids to the api, and need to clean them up before calling services.

git-subtree-dir: spiffworkflow-backend
git-subtree-split: e78e32dcf92a141ead5c4c94c542b5af614dce93
2022-11-11 10:28:29 -05:00
jbirddog a089626d28 Report URL fixes (#29) 2022-11-11 09:21:30 -05:00
mike cullerton 5dcdd2c1fb Merge branch 'main' of https://github.com/sartography/spiff-arena 2022-11-11 09:19:28 -05:00
Dan 53259f5eb0 Set default up a level higher. 2022-11-11 08:56:12 -05:00
mike cullerton ec2a1b53a2 oops 2022-11-11 08:22:25 -05:00
mike cullerton 81967f42b1 mypy fixes 2022-11-11 08:18:11 -05:00
mike cullerton 6a45604fa3 removed duplicate code 2022-11-11 08:17:50 -05:00
mike cullerton 3cf379e18b get pagination for groups 2022-11-11 08:06:05 -05:00
mike cullerton 2c4b8f5ab2 modify process_groups_list so it can process any group path, not just the root
process_groups_list now takes an optional group path
2022-11-11 08:05:38 -05:00
mike cullerton f116aed598 renamed and reordered some methods in base_test.py 2022-11-11 08:02:35 -05:00
mike cullerton 2e7a605149 Merge branch 'main' into feature/nested-groups-2
# Conflicts:
#	spiffworkflow-frontend/src/routes/ProcessGroupShow.tsx
2022-11-10 16:50:11 -05:00
mike cullerton b13bfe0489 Delete groups now checks for running instances in nested models
also, pyl
2022-11-10 16:44:27 -05:00
Dan 4d98fafe57 github action changes. 2022-11-10 16:08:11 -05:00
Dan 241db3a136 github action changes. 2022-11-10 16:06:14 -05:00
Dan 20e2f244bd Remove actions we aren't using yet. 2022-11-10 16:05:00 -05:00
Dan 9e1442ec13 just test on 3.11 2022-11-10 16:02:52 -05:00
Dan cd0cf06364 Merge branch 'main' of github.com:sartography/spiff-arena into main 2022-11-10 16:00:56 -05:00
Dan 293c8c085b run backend tests on push and pull_request 2022-11-10 16:00:44 -05:00
jasquat 8ae9179a64 use error as a status instead of faulted w/ burnettk 2022-11-10 15:55:17 -05:00
jasquat 1bd671fe3c favor h1 tags over h2 w/ burnettk 2022-11-10 15:46:57 -05:00
jasquat 427973a4aa fixed up the process instance show page and moved contents of scss to css file and load that last w/ burnettk 2022-11-10 15:44:58 -05:00
burnettk 2988c3815b ignore pyrightconfig.json 2022-11-10 14:33:07 -05:00
burnettk db820623a1 fix lint 2022-11-10 14:32:39 -05:00
Dan 5c702225e1 Assure we are using the latest bpmn-js-spiffworkflow library. 2022-11-10 13:38:28 -05:00
mike cullerton 03492c94c8 Use the modify method 2022-11-10 12:47:45 -05:00
Dan 33ed3b7347 Minor fixes for the launch buttons. 2022-11-10 12:31:26 -05:00
jasquat e3d988d386 moved usage of ProcessBreadcrumb to use hotCrumbs except for report pages 2022-11-10 11:37:41 -05:00
jasquat a29f267b3d cleaned up breadcrumbs some more and cleaned up console.log statements 2022-11-10 09:13:27 -05:00
jasquat fcd5b431e2 support process-groups in breadcrumb component 2022-11-10 08:42:40 -05:00
burnettk c6325303d4 add breadcrumb to instances page sometimes 2022-11-09 22:55:14 -05:00
burnettk 27c5db2339 fix recent process models, at least after they visit process model show page 2022-11-09 22:24:16 -05:00
burnettk 1a060cb213 make Files half-width and add link to file 2022-11-09 21:24:51 -05:00
burnettk d708c5a4f7 lint 2022-11-09 17:48:50 -05:00
jasquat 7a36189cbf Squashed 'spiffworkflow-frontend/' changes from 13b7ebaa1..3ab257b81
3ab257b81 lint issue w/ burnettk cullerton

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: 3ab257b8103c7b0087bcda41a933eb68b9bbf81c
2022-11-09 17:30:49 -05:00
jasquat 49187a32fa Merge commit '7a36189cbf9db07b735903625b23ea23b9fa8de7' 2022-11-09 17:30:49 -05:00
jasquat a26363d714 Squashed 'spiffworkflow-backend/' changes from 795df3526..43faebbd8
43faebbd8 try windows on 3.10

git-subtree-dir: spiffworkflow-backend
git-subtree-split: 43faebbd85ee001b9100279ca0eac47802bb6c44
2022-11-09 17:30:46 -05:00
jasquat ed31a31970 Merge commit 'a26363d7145eeb5e07eb08ad4018be8a42e2076e' 2022-11-09 17:30:46 -05:00
jasquat c92dde4da4 pass in perm file for acceptance tests w/ burnettk 2022-11-09 17:30:33 -05:00
mike cullerton a759d06b83 Merge branch 'main' into feature/nested-groups-2 2022-11-09 17:02:40 -05:00
jasquat d1f95114f8 Squashed 'spiffworkflow-frontend/' changes from 45854fa9a..13b7ebaa1
13b7ebaa1 fixed unit tests w/ burnettk

git-subtree-dir: spiffworkflow-frontend
git-subtree-split: 13b7ebaa1c15b49aebe43087a319b387f4e48d52
2022-11-09 17:01:21 -05:00
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 272594b69a Merge commit '101e0365763e0b066d68925fd43d62d7a0aa79b0' 2022-11-09 15:45:53 -05:00