3159 Commits

Author SHA1 Message Date
Dan
289b4b0ae8 Merge branch 'dev' into chore/unlock-admin-sandbox-739 2022-05-26 11:53:16 -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
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
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
Dan
a44a278854 We were providing spurious/inaccurate warnings before because we were passing in the wrong arguments to the function. 2022-05-16 12:58:40 -04:00
Dan Funk
8e39a8ea7b
Merge pull request #541 from sartography/chore/workflow-state-script-738
Chore/workflow state script #738
2022-05-16 12:10:08 -04:00
Dan Funk
e95d4aa979
Merge pull request #540 from sartography/bug/reset-workflow-issue-734
Restart workflow clear data issue #734
2022-05-16 12:08:55 -04:00
mike cullerton
b127705216 Add views for Email and TaskLog
Exclude data column from the file table
Clean up imports
2022-05-12 12:17:22 -04:00
mike cullerton
4297c78a4e This is tested in test_get_study_updates_workflow_state 2022-05-12 10:11:25 -04:00
mike cullerton
d053dd8652 Clean up imports
Turn tests back on
2022-05-12 10:09:17 -04:00
mike cullerton
b10fdac32c Create run_master_spec method in BaseTest 2022-05-12 10:06:57 -04:00
mike cullerton
cb2bab33b0 Restore admin warnings 2022-05-11 16:57:39 -04:00
mike cullerton
aa31007284 Added meaningful task names 2022-05-11 15:08:26 -04:00
mike cullerton
2e9205fa08 Test and workflow for new script 2022-05-11 15:07:47 -04:00
mike cullerton
e43df04116 New script that returns state and state_message for a workflow
- Requires a workflow_spec_id

- Returns a dictionary
  - {'state': 'required', 'message': 'This workflow is required.'},
  - {'state': None, 'message': None}

- Raises an error if no workflow_spec_id or if no workflow is found
2022-05-11 15:07:03 -04:00
mike cullerton
91727ec75a first_task, second_task => task 2022-05-11 11:44:22 -04:00
mike cullerton
6fdf99a2e7 Add test for clear_data = True 2022-05-11 11:17:24 -04:00
mike cullerton
5230ad8ee7 Test and workflow for new script 2022-05-10 15:11:49 -04:00
mike cullerton
15d9eea96b New script that returns the SERVER_NAME of the current instance 2022-05-10 15:11:11 -04:00
Dan
0f611be529 Bumping to new version of Spiffworkflow with updates to the serializer. 2022-05-10 15:09:06 -04:00
Dan
b94f2ecca1 fixing the docker file not to do something weird with requirements.txt when we are using pipenv right now. 2022-05-10 13:59:25 -04:00
Dan
063da419d0 updating for the last version of Spiffworkflow which deprecates the use of task.STATE values, in favor of TaskState.STATE, for example TaskState.READY 2022-05-10 12:28:55 -04:00
Dan Funk
a78bb46682
Merge pull request #538 from sartography/bug/email-data-issues-735
Bug/email data issues #735
2022-05-10 09:54:16 -04:00
Dan Funk
0431a6f17a
Merge pull request #535 from sartography/chore/unlock-admin-sandbox-720
Chore/unlock admin sandbox #720
2022-05-10 09:49:30 -04:00
Dan Funk
8a8d0dcceb
Merge pull request #537 from sartography/progress-status-issue-721
Progress status issue #721
2022-05-10 09:49:00 -04:00
Dan
8d8194da45 Removing some unused code. 2022-05-10 09:42:23 -04:00