10b9c7b892
Merge pull request #234 from sartography/hidden-and-required-fields-185
...
Hidden and required fields 185
2021-02-11 11:20:35 -05:00
f7337f4e54
Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev
2021-02-11 11:17:56 -05:00
2ada9f6f42
Private Ldap settings
2021-02-11 11:17:21 -05:00
39e874504f
We now allow value_expression to evaluate to an empty string ("") so that we *do not* set a default value for enums in some cases.
...
This was causing an error because "" was not an option for the enum.
2021-02-10 14:35:58 -05:00
8a2a8b1443
Still not in working order. Committing to work on another ticket.
2021-02-10 12:28:59 -05:00
da0af14724
Changes to enable front-end changes
...
Added a human readable name to created user
added last updated task time and name,
added is_review on the workflow which is triggered by a swimlane with a name present.
Notably - it does NOT update or change any of the performance concerns that we were having with this.
2021-02-10 11:58:19 -05:00
777cfbdecd
We now test whether we have a valid StudyModel when getting a study by study model.
...
We raise an ApiError if the model is None or empty.
2021-02-09 17:37:55 -05:00
3e32cdedc4
New error handler for non Api errors. Ticket 187
2021-02-09 16:35:57 -05:00
b42b843f7d
It was possible for an enum field lookup to return an empty list. This meant there were no options for the list.
...
We now test for this and raise an error.
2021-02-08 15:10:53 -05:00
e87e7b5b8b
Form fields that can be hidden and required must now have a default value or value_expression.
...
Also, if a field is hidden but not required, it should not produce a value.
2021-02-08 10:18:41 -05:00
fa34bee18a
First commit for cleaning up error messages for customers.
...
This is *not* in a working state.
Committing this so I can work on another ticket.
2021-02-04 11:23:05 -05:00
329146237e
Merge pull request #232 from sartography/boolean-default-values-175
...
Boolean default values 175
2021-02-03 16:34:54 -05:00
effd11f947
Merge pull request #231 from sartography/cancellations-137
...
Cancellations 137
2021-02-03 16:31:18 -05:00
2d01b92a50
Merge pull request #230 from sartography/pretty-emails-160
...
Pretty emails 160
2021-02-03 16:20:38 -05:00
1eba20f420
Merge pull request #229 from sartography/workflow-spec-order-74
...
Workflow spec order 74
2021-02-03 16:18:34 -05:00
b090e31e00
This fixes 2 issues with setting boolean defaults
...
- If the default was False, we failed an early test and returned None. We now only return None if default is None
- We have a better test for deciding if the default value we return should be True or False. We used to return True if the value was the string 'false'.
2021-02-03 09:50:16 -05:00
c5cf3ea7ff
Changed call to WorkflowProcessor.reset to reflect change from class method to instance method.
2021-01-29 14:34:09 -05:00
7e76639cf3
When a study is put on hold, we now reset workflows and call any pending cancel_notify events.
...
In api.study.update_study we test the study status and call the new WorkflowService method process_workflows_for_cancels.
In services.workflow_service we added the new method process_workflows_for_cancels. It loops through workflows for a study, and resets them if they are in progress.
In services.workflow_processor, we changed the reset method to be an instance method so we can call self.cancel_notify.
In tests.test_lookup_service we changed the call to WorkflowProcessor.reset to reflect the change from class method to instance method
2021-01-29 14:05:07 -05:00
958d5a6281
Possible solution for W3C issues raised by Sonarcloud
2021-01-28 09:45:53 -05:00
d7a3afe8f4
changed the template to use the responsive html email template at https://github.com/leemunroe/responsive-html-email-template
...
added method get_cr_connect_wrapper to render our new html email template. This takes the email text generated from the task element documentation as the email_body.
2021-01-27 17:12:03 -05:00
cccb722e07
Merge pull request #226 from sartography/enum_default_value_expression_162
...
Enum default value expression 162
2021-01-27 10:43:46 -05:00
81e55b6055
Cleaning up my smell. A task should only have default_value *or* value_expresion, not both.
2021-01-27 10:21:13 -05:00
c99a388405
We now set the display_order automatically. Users can modify order using the arrows.
2021-01-27 09:50:29 -05:00
98f946c119
Merge pull request #227 from sartography/missing_form_key_163
...
Missing form key 163
2021-01-27 09:42:46 -05:00
ecc553c4ea
Jinja templates and svg file for pretty emails
2021-01-26 09:20:16 -05:00
909af9b8d6
Change HTML emails so they look like the CR-Connect website. Add logo, color, style, etc.
...
Cleaned up email script a little.
Also, email script no longer uses services.mails. It uses email_service directly now.
2021-01-26 09:19:28 -05:00
b71fd93dd4
We now make sure that forms have a form key. Ticket 163
2021-01-22 12:14:17 -05:00
00d9276483
In spiff_task_to_api_task, when looping through fields, if the field doesn't have a value, we now try to set it with the default value
...
In test_spec, we now check for FIELD_PROP_VALUE_EXPRESSION when setting default values
2021-01-22 10:00:28 -05:00
5921ce9f10
Merge branch 'dev' into 152-workflow-spec-pull
2021-01-21 12:30:43 -05:00
5b13195182
Merge pull request #224 from sartography/restart-with-no-data-99
...
Restart with no data 99
2021-01-20 17:22:18 -05:00
41dac33039
Removed two tests around soft_reset that are no longer required.
...
Reset should construct the workflow_processor, thus completing the reset process.
Removed the spec argument from init, as it is never used anywhere.
2021-01-20 13:24:53 -05:00
039a1dcd79
WorkflowProcessor code for new restart_workflow api endpoint. WorkflowProcessor.reset will clear workflow_model.bpmn_workflow_json, and if clear_data is True will clear form data.
...
WorkflowProcessor.__init__ is mostly unchanged.
2021-01-19 15:14:36 -05:00
9c71a503ca
Python code for new restart_workflow api endpoint. Cleaned up code and docstring in get_workflow to match.
2021-01-19 15:09:20 -05:00
e1532a90c9
New api endpoint for restarting a workflow. Unsure if I needed the responses section. **Dan, can you check this?**
...
Also, removed clear_data and reload_spec as parameters for standard get workflow endpoint.
2021-01-19 15:00:39 -05:00
6a9e6d3570
Restart workflow without form data. Committing so Dan can check it out
2021-01-14 15:32:14 -05:00
cf7990ce85
Refactor for better readability due to code smell test
2021-01-12 08:54:32 -05:00
e14b896225
Add documentation
2021-01-11 09:31:08 -05:00
f282a9ef73
Make sure that top_level_workflow is transferred over, also include reference files in the list of files to sync
...
We may want to revisit this because I used a 'Magic' workflow_ref_id of 'REFERENCE_FILES' as a special case so I could re-use most of what I already had. This works well, but we may want to structure it different.
2021-01-11 09:21:44 -05:00
336c093bf8
Catch errors when building enumeration lists.
2021-01-08 15:15:24 -05:00
26655b26d3
merging in dev, and fixing a failing test from dev.
2021-01-08 14:42:13 -05:00
9118517995
Merge pull request #220 from sartography/prevent-duplicate-template-upload-111
...
Users cannot upload a workflow_spec_file that already exists. We rais…
2021-01-08 13:55:19 -05:00
be288ae048
Merge pull request #219 from sartography/fix-api-call-missing-fieldname-143
...
Fixed ApiError call. Now includes task_id and task_name.
2021-01-08 13:46:26 -05:00
81fe3e7957
Merge pull request #218 from sartography/is-file-uploaded-143
...
Ticket 143. Test whether file is uploaded.
2021-01-08 13:45:24 -05:00
72a73c1fc4
Allow for synch to work even if the local set of workflow specifications are completely empty.
2021-01-08 13:23:01 -05:00
d274813ae5
We now check form field IDs so they play well with Python and Javascript.
2021-01-07 11:10:31 -05:00
c9a4a9685f
Users cannot upload a workflow_spec_file that already exists. We raise an error that is displayed on the fron end.
2021-01-04 15:47:45 -05:00
0ae4448fbe
Fixed ApiError call. Now includes task_id and task_name.
2021-01-04 13:48:34 -05:00
b0dc834682
Don't error out on autocomplete_num
2021-01-04 13:41:57 -05:00
0c47d09972
Ticket 143. Test whether file is uploaded.
2021-01-04 10:53:21 -05:00
386feddeed
Merge pull request #214 from sartography/validate-hide-expression-103
...
Modified study_info do_task_validate_only so that we take the default…
2020-12-31 10:53:27 -05:00
cf106fb9cd
Merge pull request #216 from sartography/place-study-on-hold-20
...
Studies can now be put on hold in the dashboard. We were overriding t…
2020-12-31 10:53:03 -05:00
ede5df4df5
Studies can now be put on hold in the dashboard. We were overriding the status in StudyModel.update_from_protocol_builder.
2020-12-30 17:49:59 -05:00
efdbbcbc72
StudyInfo sometimes returns arrays of items, each item in the array should be coverted to a Box dictionary if possible.
2020-12-30 14:51:51 -05:00
f29429f0d0
Modified study_info do_task_validate_only so that we take the default path in ind_update workflow.
2020-12-30 10:04:10 -05:00
e5a38874f6
A hard or soft reset should also cause a 'cancel_notify' which will kick off any CANCEL events. If this happens during
...
a hard or soft reset, and an error is thrown trying to fulfil a cancel event, the reset should still fire.
Sending emails still had a number of issues correctly parsing it's arguments. This is corrected.
2020-12-29 18:05:13 -05:00
c288a8a2bc
Merge branch 'dev' into check-field-type#143
2020-12-29 11:11:43 -05:00
7938ac8eed
We now assure each form field has a field type. Modified populate_form_with_random_data, added check at beginning of form field loop.
2020-12-28 18:02:16 -05:00
6cfce839c1
Validation now assures that we won't encounter errors when generating navigation lists.
...
Fixing workflow sync paths that were incorrect.
Repairing a suddenly failing test in files, that just don't make no sense.
Bumping spiffworkflow that contains a fix for issue #155
2020-12-28 17:33:38 -05:00
1f9bf72c59
Merge branch 'dev' into bug/navigation
2020-12-14 11:46:44 -05:00
4268d0f482
Merge pull request #208 from sartography/152-workflow-spec-pull
...
152 workflow spec pull
2020-12-14 11:35:06 -05:00
bcb78de225
Merge branch 'dev' into bug/navigation
2020-12-14 11:33:51 -05:00
e54404e424
Merge pull request #205 from sartography/test-email-script
...
Test email script
2020-12-14 11:28:14 -05:00
6bf24cc438
fixing some failing tests related to changes in the underlying spiffworkflow library.
2020-12-14 11:27:38 -05:00
b62a9c7074
Merge remote-tracking branch 'origin/dev' into bug/navigation
2020-12-14 10:40:21 -05:00
fd4b881416
upgrading the pip libraries.
2020-12-14 10:30:10 -05:00
ee3ee9fd4a
Added tests to cover most of the use cases and code, and a bunch of stuff to make the mocks happy
2020-12-14 10:27:40 -05:00
02ea414b94
Additional fixes to Navigation to allow a nested navigation structure.
2020-12-14 10:07:19 -05:00
7defc2b02f
Tests for uid in logs. Currently we test for uid in a response. This covers ApiError.
...
Currently, we don't have a test for Sentry. Unsure how to do this.
Also added a script, service and test workflow to help. (Also to learn about adding a script and service.)
2020-12-11 17:47:53 -05:00
856fe445b0
Added user.uid to ApiError and Sentry logging
2020-12-11 16:26:03 -05:00
adc4dc4453
redid the api a bit so that nothing was using open security - added a new endpoint for getting a workflow spec that uses the alternate API_TOKEN security and leave the original endpoint as it was.
2020-12-11 12:03:41 -05:00
55e6f5b753
refactored calls into a service - forgot to add actual service
2020-12-11 11:42:00 -05:00
3a1160efac
refactored calls into a service
2020-12-11 11:41:32 -05:00
9eea26e019
add workflow_sync test
2020-12-11 08:34:59 -05:00
993c7bc76e
fixed error on api.yml from search / replace
2020-12-11 08:29:37 -05:00
3f56dfe484
Move all workflow sync stuff into new file
...
Make changes to api naming scheme
add some error checking around endpoints for missing/invalid endpoints
2020-12-10 10:46:23 -05:00
a8203ed01d
save changes before refactor
2020-12-10 10:06:21 -05:00
e377a05dea
Add some punctuation
2020-12-09 13:50:52 -05:00
c57b17df1e
Add a robust way of adding an API key, update examples and documentation for swagger API and add the ability to completely sync the local system from the remote system.
2020-12-09 12:13:17 -05:00
32c5060a31
No longer use eval on the email address. It is already parsed.
...
Tests for single and multiple emails, and email error checking.
Still need to figure out how to implement multiple emails.
2020-12-09 12:11:46 -05:00
0e1aa59fa1
Make a change to make sure that if there is a new file locally that is not present remotely when we pull from the remote, the new local file gets deleted.
...
Also: add several things to the requirements.txt that should have been there in the first place.
2020-12-08 13:42:01 -05:00
730d0ca18f
Email script now uses an email address instead of a UVA LDAP user_id.
2020-12-07 16:23:41 -05:00
44c72115ae
Make sure we get the file we intended
2020-12-07 08:50:20 -05:00
f26a8615a4
Get more file details so we can fill out everything locally and also add a method to download the file by md5_hash
2020-12-07 08:49:38 -05:00
93b12a8e82
updates using new navigation from spiff workflow's navigation branch, all tests passing.
2020-12-04 17:56:12 -05:00
cad613cf63
Fix problem when method is run for a workflow that is non-existant locally
2020-12-04 12:00:02 -05:00
d41d018fe3
For a given workflow - find the files that are different from a remote endpoint for the same workflow
2020-12-04 11:49:07 -05:00
3e8d4ca7c9
Add some inline documentation to make the process more clear
2020-12-04 10:23:03 -05:00
10dce542ec
documentation change
2020-12-03 15:27:45 -05:00
0f59d3de09
add endpoint that gets a record for all changed /new workflow_specs at a remote endpoint
2020-12-03 14:45:57 -05:00
bcb45a59c8
allow cors
2020-12-03 08:46:34 -05:00
0e8913434a
refactor a bit
2020-12-03 08:44:15 -05:00
92aa1b971d
commit before removing big long SQL
2020-12-02 16:04:00 -05:00
aca1fb366b
Fixing a failing test and updating the personnel.
2020-12-01 15:47:27 -05:00
e15130e09c
Merge pull request #203 from sartography/151-data-store-exclusive-branch-expression
...
Added the ability to use the custom functions within a decision/flow …
2020-12-01 14:44:27 -05:00
801c5df75e
Merge pull request #201 from sartography/verify-end-event-#105
...
Verify end event #105
2020-12-01 14:24:12 -05:00
e0c28cbc7d
Make it easer to start things up.
2020-12-01 11:17:07 -05:00
94662c560e
Added the ability to use the custom functions within a decision/flow coming off of an exclusive join
...
Altered previous test to test this feature
2020-12-01 09:13:12 -05:00
73e01b347b
Ticket #105 . Verify End Event Documentation. Added explicit call to _process_documentation at end of crc.services.workflow_service.test_spec for the end event
2020-11-24 16:51:18 -05:00
071c98d72e
Some minor config tweaks to try and deal with some database timeout issues.
2020-11-19 11:25:58 -05:00
b8a91a513b
Merge pull request #196 from sartography/128-data-store
...
128 data store
2020-11-18 18:55:33 -05:00
b83ab1bcd1
Move data store base into its own file.
2020-11-18 15:34:50 -05:00
d198f124d7
Committing a merge from dev
2020-11-18 15:33:44 -05:00
66693d9f3a
Removing datastore script, as it isn't used in the api at all.
2020-11-18 15:06:28 -05:00
c62b73a539
drop some of the test-only api endpints and rework the tests so they aren't needed
2020-11-18 15:04:36 -05:00
16313609ec
removed call to signal (changed to cancel_notify)
2020-11-18 13:55:30 -05:00
72ade3c367
Add crosstalk test
2020-11-17 10:29:49 -05:00
e9979efb0d
Add some tests
2020-11-17 09:33:29 -05:00
a2dc3c4812
Use Cancel Event
...
New title 'New Title'
2020-11-16 09:59:22 -05:00
70425eee0d
Add last_updated field - change the api signature to be closer to what we need going forward, but retain the old methods for testing the script get/set through the API
2020-11-13 12:03:29 -05:00
7c2c725840
save before changing how API works
2020-11-13 09:58:21 -05:00
acaf633b45
Added ID as pk
2020-11-11 11:36:25 -05:00
9a4d167dcd
Add in api changes
2020-11-11 09:44:58 -05:00
cef221be32
Refactor to reuse code
2020-11-10 11:32:59 -05:00
3ba11f5e6b
add user_data_get/set and alter test so that it ensures that we don't grab study_data stuff from the user_data calls
...
change the test to mock up the user.
2020-11-10 10:32:37 -05:00
245124779e
Add mostly-working elements of the data-store, compare with dev to see why db is not working after running tests
2020-11-10 08:21:46 -05:00
e598994d34
Change the study_sponsors script so that we can actually call it :
...
var = study_info('sponsors')
to keep it more in line with other scripts that we have
2020-11-05 10:31:47 -05:00
1815a4b657
Merge branch '117-save-restore' into dev
2020-11-05 08:24:18 -05:00
a78af4eab8
Run cancel task during interrupt. Currently this uses Signal event. We may change this to the Cancel event.
2020-11-04 14:37:53 -05:00
2931f45187
Add 'sponsors' to study_info call
2020-11-04 14:34:10 -05:00
849a4e9f94
Made changes to how soft_reset works so it is backward compatible - essentially, we use the file if we are doing a soft-reset or a new workflow. NB, this may actually still have problems if we have a workflow with P/SMI and we do a soft-reset on it even if there are no structural changes.
...
Also, change how default_value is interpreted, looking at the object attribute rather than the properties list.
2020-10-09 11:00:33 -04:00
8b23cdc05c
commit changes before switching branches
2020-10-09 08:46:14 -04:00
b2aede2b8d
Glob on windows seems to return directories where in linux it does not, so now assuring we don't try to add files from the sub-directory.
2020-10-05 17:35:35 -04:00
014a4d9757
Fixing a failing test and updating the personnel.
2020-09-02 08:24:48 -04:00
b544334f45
1. Updating Personnel BPMN diagram to debug some issues.
...
2. Disabling the token timeout for now, to see if this corrects the issues Alex is having with lost work.
3. Raising more thoughtful error messages for unknown lookup options.
4. Providing better validation of default values and injecting the correct value for defaults related to enum lists of all types.
5. Bumping Spiffworkflow library which contains some better error messages and checks.
2020-09-01 15:58:50 -04:00
1052dff549
Merge remote-tracking branch 'origin/dev' into feature/python_eval
2020-08-27 14:33:16 -04:00
5dacc46600
Adding some additional bpmns from Staging server to include in tests.
2020-08-27 14:00:45 -04:00
53d09303d8
Validating that field properties are valid - they must exist as constants on the Task model.
...
Making all the lookup field names consistent.
Fixing the lookup service which was failing at times trying to find the correct field to use for building the lookup table.
Updating validation to check for additional fields and properties.
When connexion level errors occur, wrapping it in an API Error to be consistent.
2020-08-27 14:00:14 -04:00
1a713bd140
updating bpmn files from the staging server.
2020-08-27 13:55:27 -04:00
d31fd47837
Merge branch 'dev' into feature/python_eval
2020-08-25 11:08:42 -04:00
5be35e8bab
Adding a study sponsors script to return details about study sponsors
2020-08-25 10:30:46 -04:00
182e375fdc
Adds a test for string manipulation
2020-08-21 13:46:10 -04:00
4dc98a6b6b
Injects current user into task data.
2020-08-21 13:34:37 -04:00
66e49a347a
Minor tweaks to the eval endpoint, which should take both the expression and the data as one data structure.
2020-08-20 16:13:48 -04:00
7f60a19d55
Merge pull request #189 from sartography/feature/documents_publishing
...
Update github routines to use branches
2020-08-17 15:52:47 -04:00
8f5488d910
Don't raise an error when validating workflows that use the ldap script.
2020-08-17 15:45:37 -04:00
35b1b20960
Merge remote-tracking branch 'origin/dev' into feature/documents_publishing
2020-08-17 15:19:24 -04:00
dfaffc22b5
Merge remote-tracking branch 'origin/dev' into fix/returning_failed_name_message
2020-08-17 15:18:17 -04:00
d4c5e297cc
Merge remote-tracking branch 'origin/dev' into fix/delete_workflow_endpoint
2020-08-17 15:09:11 -04:00
32d47c1417
Merge remote-tracking branch 'origin/dev' into fix/delete_workflow_endpoint
2020-08-17 15:08:44 -04:00
c09441d019
Merge branch 'dev' into fix/delete_workflow_endpoint
2020-08-17 15:07:58 -04:00
85ad477b2b
Some minor cleanup on the study status and automatic events. I wanted to avoid having one database model automatically generating other database models as a side effect. The study service now has full responsiblity to recording study events.
...
To help in running tests, adding __init__.py methods to all the test directories.
2020-08-17 14:56:00 -04:00
2bd906e96d
Update github routines to use branches
2020-08-14 11:04:22 -06:00
304ca77e3e
Fixing exception within NameError handler
2020-08-14 09:01:15 -06:00
369fe4bb35
Automatic events refactoring
2020-08-14 08:36:46 -06:00
aa010272cc
Automatic event creation in study creation
2020-08-14 08:36:10 -06:00
c57ac6d302
Merge pull request #185 from sartography/feature/107_current_user_info
...
calling ldap with no argument will return information about the curre…
2020-08-14 09:18:10 -04:00
08c24b7441
Merge pull request #184 from sartography/PMI_fix
...
Pmi fix
2020-08-14 09:17:58 -04:00
c12e2b97f3
calling ldap with no argument will return information about the current user.
2020-08-13 21:09:52 -04:00
1a963cf940
Merge branch 'dev' into PMI_fix
2020-08-13 20:49:45 -04:00
9a5c1d7cfb
I may have finally wrapped my head around full text search in python. Now properly using an index based on simple rather than english dictionary which has far fewer stop words and stemming processes and plays much better to the type ahead search we are trying to provide.
...
Stop words are no longer excluded, so "other" is a valid search and gets a result.
2020-08-13 18:13:41 -04:00
Dan Funk
mike cullerton
Kelly McDonald
Aaron Louie
Carlos Lopez