Commit Graph

437 Commits

Author SHA1 Message Date
mike cullerton 572ca1db6b Fixes for backend code after removing `name` column from `workflow_spec` and `workflow_spec_category` tables 2021-10-05 14:17:41 -04:00
Dan d0c819dd5f sync was failing because it tried to add the libraries before adding the spec the libraries connect to. 2021-09-29 10:21:24 -04:00
Dan Funk e4add14193
Merge pull request #378 from sartography/bug/246_user_ldap_refactor
Bug/246 user ldap refactor
2021-09-22 15:31:34 -04:00
Dan 19104303de Refactor of the way we store and return details about users - All the details about a user, or individual associated with a study is returned within in an Ldap model. I've removed duplication between these models. This required some cleanup of the tests, and a migration that will drop the user details. 2021-09-22 13:16:25 -04:00
mike cullerton d7b7f39128 Added a field `handle` that displays the filename, which is what configurators actually call in a script task. 2021-09-22 12:10:43 -04:00
Mike Cullerton 787614ee91
Merge pull request #369 from sartography/dmn-from-spreadsheet-395
Dmn from spreadsheet #395
2021-09-14 17:41:01 -04:00
Mike Cullerton 15efc2f3f1
Merge pull request #370 from sartography/library-listing-453
Library listing #453
2021-09-14 16:11:56 -04:00
alicia pritchett a7f032d372 Returns workflow spec categories ordered by display order
sorry to open a whole branch just for this little fix
2021-09-14 10:56:41 -04:00
mike cullerton 7b7c228a81 2 changes
- The `all_specifications` method is now explicit in what it returns; either `library`, `standalone`, or `regular` workflow specs

- When we add/edit a workflow spec, we make sure that `library` and `standalone` workflow specs do not get a category_id
2021-09-13 16:15:18 -04:00
mike cullerton 5ddff1d1be Merge branch 'dev' into add-reorder-api-endpoints-444 2021-09-09 13:10:54 -04:00
mike cullerton cc403f1fac Merge branch 'dev' into dmn-from-spreadsheet-395 2021-09-09 13:09:35 -04:00
mike cullerton 9bd012c822 Clean up display_order numbers when reordering.
This fixes the problem where we have don't have all unique display_order numbers.
I.e., 0, 1, 1, 3, 5
2021-09-08 11:16:49 -04:00
mike cullerton a3b3df1bbb Use flask send_file to return DMN file 2021-09-07 12:09:30 -04:00
Dan Funk 1a008499c4
Merge pull request #366 from sartography/file-id-error-info-449
Added file_id to some error messages in api.file #449
2021-09-03 14:32:14 -04:00
mike cullerton 8677d0368b Grab the file data from the request, not as a parameter 2021-09-03 10:32:32 -04:00
mike cullerton b5082b8fd3 Call FileService 2021-09-02 09:53:17 -04:00
mike cullerton 0c31b091ee Merge branch 'dev' into dmn-from-spreadsheet-395 2021-09-01 09:38:03 -04:00
mike cullerton 5db5c7ca43 Added file_id to some error messages in api.file 2021-08-31 15:28:21 -04:00
mike cullerton ed57993f8d Workflow spec cleanup needs a category_id 2021-08-31 12:17:25 -04:00
Dan 1140b21414 Adding a test that assures we pick up libraries on the remote system when syncing. 2021-08-31 12:07:41 -04:00
mike cullerton b92676ea75 Make sure we have good display_orders before adding specs and categories 2021-08-31 11:16:27 -04:00
mike cullerton 994ce4008f Don't let updates to workflow-spec and workflow-spec-category metadata change the display_order
Force display_order changes to use the new reorder API endpoints
2021-08-31 10:36:22 -04:00
mike cullerton f6816a2e42 Move display_order cleanup to their own methods 2021-08-31 10:07:38 -04:00
Dan d17a2c39ed A little cleanup to assure that when we sync we correctly pick up and associate librarires with a workflow when we sync. 2021-08-30 15:46:16 -04:00
mike cullerton b76f45368b Explicitly commit the changes 2021-08-30 15:29:49 -04:00
mike cullerton 7bbb64cf27 Reorder remaining categories after delete 2021-08-30 15:20:45 -04:00
mike cullerton c275c01526 Reorder remaining workflow specs upon deletion 2021-08-30 14:56:26 -04:00
mike cullerton eb6b73fde5 Fixed typo where I returned an ApiError, instead of raising it. 2021-08-30 13:55:21 -04:00
mike cullerton 070a9c9350 Code for reordering Workflow Spec Categories
Still need to work on edge cases where you try to move past top or bottom of list
Still need to work on tests
2021-08-30 11:27:07 -04:00
mike cullerton f2201a3cef Move business logic to WorkflowService
Return ordered list of specs
2021-08-30 10:41:08 -04:00
mike cullerton 41414e39c8 First pass at reorder spec code.
Still need to return list of specs
Still need to work on spec categories
2021-08-27 13:02:49 -04:00
mike cullerton f639e101b7 Commit the skeleton API endpoints, so we can use them while developing the BPMN side of things. 2021-08-27 11:40:38 -04:00
mike cullerton 4c41011299 Add task_spec_name to `add_file` API call 2021-08-26 10:37:05 -04:00
Mike Cullerton 5692f7d377
Merge pull request #359 from sartography/413-LibraryCleanup
413 library cleanup
2021-08-18 13:39:37 -04:00
Mike Cullerton feb72af32e
Update workflow.py
Just completing a comment so I understood
2021-08-18 13:27:28 -04:00
Kelly McDonald b4ecb0f97a Add backref cascade and make changes to the spot where we delete so it loads objects into memory and then uses the SQLAlchemy plumbing to make sure that the db object gets cleaned up. 2021-08-18 08:25:17 -04:00
Dan 7a8eeab820 Merge branch 'dev' into bug/missing_pi_name_246 2021-08-17 11:16:03 -04:00
Dan 6ce560cc2d Made a stupid mistake in a hot fix, causing the builds to fail. 2021-08-17 10:14:49 -04:00
Dan 4e0e162fd6 Removing the execution flag Nile keeps adding to files. 2021-08-17 09:50:57 -04:00
Dan 77de2a8f47 Merge branch 'dev' into bug/missing_pi_name_246 2021-08-17 09:47:09 -04:00
Dan 0a2597ae36 Just a quick hot fix so that when can still report errors back to the UI even when the task_data can't be serialized, which can happen when functions are defined. 2021-08-17 09:43:08 -04:00
nilez 07ffcd7c76 Dependencies In Testing are behind this avoids that issue. https://sonarcloud.io/project/issues?id=sartography_cr-connect-workflow&pullRequest=356&resolved=false&types=BUG 2021-08-16 23:46:39 -04:00
mike cullerton 2a2fd710c4 Merge branch 'dev' into dmn-from-spreadsheet-395 2021-08-16 14:22:02 -04:00
nilez 0a232dace6 assertEquals -> assertEqual 2021-08-16 10:25:41 -04:00
nilez f8dd4c3eb9 Check Study Associates Endpoint 2021-08-16 09:32:02 -04:00
nilez 4a2581e938 get studies raises and error when invalid studies are the only studies associated with the user 2021-08-12 14:03:44 -04:00
nilez e32c1db4c8 Merge remote-tracking branch 'origin/dev' into bug/missing_pi_name_246
# Conflicts:
#	crc/models/study.py
#	crc/services/study_service.py
#	crc/services/workflow_service.py
#	tests/study/test_study_associate_script.py
2021-08-12 12:59:15 -04:00
Dan 000de03733 Just a quick hot fix so that when can still report errors back to the UI even when the task_data can't be serialized, which can happen when functions are defined. 2021-08-12 12:49:19 -04:00
nilez d20b68e483 Fixed Deprecation Warnings in Test Files 2021-08-12 12:33:27 -04:00
nilez 2732071585 Merge branch 'dev' into bug/missing_pi_name_246 2021-08-12 12:07:25 -04:00