Commit Graph

3331 Commits

Author SHA1 Message Date
mike cullerton 6911ab7aae Fixes for failing tests after removing `current_user` from task data 2022-05-31 16:53:15 -04:00
mike cullerton f74afc3e18 Remove `current_user` from task data 2022-05-31 16:51:03 -04:00
mike cullerton 1d8fc77cf3 Add impersonator to current_user, if we have one 2022-05-31 15:01:34 -04:00
mike cullerton 2f6b84e29c add `get_impersonator` method to user_service 2022-05-31 15:00:58 -04:00
mike cullerton 8d504c7550 add `impersonator` attribute to UserModelSchema 2022-05-31 15:00:27 -04:00
mike cullerton 4bab660441 does this smell better 2022-05-27 10:37:06 -04:00
mike cullerton 2d9307cc4e Tests for each of the ways we can pass attachments 2022-05-27 10:25:20 -04:00
mike cullerton df4c37a1e6 Move the attachment tests to a separate file 2022-05-27 10:24:19 -04:00
mike cullerton 1ca2bcd4a6 Allow attachments in emails to be filtered.
We use doc_codes to add attachments to emails
Sometimes, there are multiple files for a doc_code.
This allows us to filter the files associated with a doc_code
2022-05-27 10:22:59 -04:00
mike cullerton 1822dda830 Move test_email_script to the scripts directory 2022-05-27 08:54:25 -04:00
mike cullerton 0887fec9e2 Merge branch 'chore/unlock-admin-sandbox-739' of https://github.com/sartography/cr-connect-workflow into chore/unlock-admin-sandbox-739 2022-05-26 13:36:43 -04:00
mike cullerton 251ff921ff clean up imports 2022-05-26 13:36:10 -04:00
mike cullerton d07df26103 Remove unused method 2022-05-26 13:35:47 -04:00
mike cullerton 95c915a434 Remove code that doesn't let master workflow set state and state_message for admin sandbox workflows
Remove test for this feature
2022-05-26 13:35:30 -04:00
Dan baa28adc5f Merge remote-tracking branch 'origin/dev' into chore/unlock-admin-sandbox-739 2022-05-26 11:53:22 -04:00
Dan 289b4b0ae8 Merge branch 'dev' into chore/unlock-admin-sandbox-739 2022-05-26 11:53:16 -04:00
Dan Funk cfa1431164
Merge pull request #549 from sartography/dependabot/pip/deploy/pyjwt-2.4.0
Bump pyjwt from 1.7.1 to 2.4.0 in /deploy
2022-05-26 11:52:41 -04:00
Dan Funk 87d3d2f6bd
Merge pull request #548 from sartography/dependabot/pip/pyjwt-2.4.0
Bump pyjwt from 2.3.0 to 2.4.0
2022-05-26 11:52:30 -04:00
Dan fb790fabe9 Merge branch 'dev' into chore/email-script-parameter-746 2022-05-26 11:51:01 -04:00
Dan Funk d517f003e0
Merge pull request #546 from sartography/chore/create-template-option-745
Chore/create template option #745
2022-05-25 16:26:52 -04:00
Dan Funk 4aa753bef1
Merge pull request #545 from sartography/file-refactor-cleanup-743
File refactor cleanup #743
2022-05-25 16:25:03 -04:00
Dan Funk fe99872263
Merge pull request #544 from sartography/admin-page-changes-742
Admin page changes #742
2022-05-25 16:24:02 -04:00
Dan Funk a500b89309
Merge pull request #539 from sartography/chore/get-instance-script-729
Chore/get instance script #729
2022-05-25 16:18:02 -04:00
mike cullerton 5b2b2f7b60 better wording 2022-05-25 15:06:31 -04:00
mike cullerton 4a1300f101 Add test that checks the is_admin_workflow attribute on WorkflowApi
Add `from_workflow_model` helper method to the WorkflowApi class in api_models
2022-05-25 14:29:14 -04:00
dependabot[bot] d7ec3eb670
Bump pyjwt from 1.7.1 to 2.4.0 in /deploy
Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 1.7.1 to 2.4.0.
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jpadilla/pyjwt/compare/1.7.1...2.4.0)

---
updated-dependencies:
- dependency-name: pyjwt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 04:59:20 +00:00
dependabot[bot] f411f0d118
Bump pyjwt from 2.3.0 to 2.4.0
Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jpadilla/pyjwt/compare/2.3.0...2.4.0)

---
updated-dependencies:
- dependency-name: pyjwt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 03:34:55 +00:00
mike cullerton 2c083f73a8 Add `is_admin_workflow` attribute to WorkflowApi and WorkflowApiSchema
Set is_admin_workflow when we instantiate WorkflowApi in WorkflowService.processor_to_workflow_api
2022-05-24 15:57:08 -04:00
mike cullerton 132a140d5a Make sure the Master Workflow doesn't change the state for workflows in an Admin Sandbox 2022-05-24 15:33:56 -04:00
mike cullerton 3bd591b2ce Allow us to set the `admin` bit when creating a test WorkflowSpecCategory
This allows us to create an "admin sandbox" category in a test
2022-05-24 15:32:51 -04:00
mike cullerton eb3011ae5f Don't let the master workflow change the state of workflows in the admin sandbox.
I.e., when category.admin is True

If a workflow is in the admin sandbox, we set the state to 'optional', no matter what the master workflow says

Added a method to get the category for a workflow spec.
2022-05-24 15:28:13 -04:00
mike cullerton 7ab265a5b5 Add a test for filtering attachments
Modify the bpmn file to accommodate the changes
2022-05-23 16:59:47 -04:00
mike cullerton 71bbdf1d82 Change the way we handle attachments, so we can optionally filter the files returned for a particular doc_code
instead of passing a doc_code, we pass a tuple of (doc_code, file_names), where file_names is a list of file_names
We also accept a list of these tuples

Yeah, it's kind of wonky
2022-05-23 16:57:16 -04:00
mike cullerton a97c21c8ed remove unused line 2022-05-23 14:27:25 -04:00
mike cullerton e2feb2495d Added some spacing 2022-05-23 14:26:04 -04:00
mike cullerton e92be44b6c Assert that we have the correct file name, depending on whether we pass the optional file_name parameter
Modify the bpmn file to accept the optional file_name
2022-05-23 14:22:14 -04:00
mike cullerton 03384789d4 Modify complete_template script to accept optional file_name argument.
If present, we use file_name to name the generated file.
Otherwise, we use template_file_name to name the generated file
2022-05-23 14:20:52 -04:00
mike cullerton 4c24fde952 Code cleanup after file refactor 2022-05-20 10:47:14 -04:00
mike cullerton 5da6a9aa12 database cleanup after file refactor 2022-05-20 10:42:04 -04:00
mike cullerton 801da35b1c Open up create/edit/delete access on Study and File models
Add column_searchable, column_filters to TaskLogView, similar to EmailView
2022-05-19 15:54:37 -04:00
Dan e4627c472a rollback database transactions when we encounter an error resetting a workflow, or processing a waiting workflow. 2022-05-19 10:23:48 -04:00
mike cullerton b66bfb8a9b Merge branch 'dev' into chore/get-instance-script-729 2022-05-17 10:02:19 -04:00
mike cullerton 26abac3352 Update the test and README 2022-05-17 10:00:16 -04:00
mike cullerton 1b4821d2b9 Use a new INSTANCE_NAME variable for this, instead of SERVER_NAME 2022-05-17 09:59:33 -04:00
Dan 45d5654da4 Do not automatically archive old files when a file of the same type is added. 2022-05-17 09:39:38 -04:00
Dan 62d2229379 don't delete the status messages, that would be senseless. 2022-05-16 16:42:02 -04:00
Dan ec61615686 run our github actions for more things than just feature branches.
Don't try to decode a string object.
2022-05-16 15:41:44 -04:00
Dan b94487ee9e Moving from master to main. 2022-05-16 13:30:39 -04:00
Dan Funk a267cff26b
Merge pull request #543 from sartography/admin-page-changes-736
Admin page changes #736
2022-05-16 13:05:28 -04:00
Dan Funk 353da693a0
Merge pull request #542 from sartography/chore/revisit-admin-warnings-733
Chore/revisit admin warnings #733
2022-05-16 13:03:00 -04:00