Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dashboard to Develop #10785

Merged
merged 19 commits into from
Oct 25, 2024
Merged

Update Dashboard to Develop #10785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b128472
Merge branch 'hotfix/24.07.1'
mfraezz Sep 18, 2024
feef52c
update latent transitive deps
felliott Sep 23, 2024
eaf291c
bump django deps
felliott Sep 23, 2024
3e32883
Merge branch 'hotfix/24.07.2'
mfraezz Sep 23, 2024
835eb2e
Merge branch 'hotfix/24.07.2' into develop
mfraezz Sep 23, 2024
3df8200
Fix incorrectly generated CAS login URL
cslzchen Sep 30, 2024
414a3a7
Fix incorrect tests
cslzchen Sep 30, 2024
c704152
Merge branch 'cslzchen/fix-orcid-login-url' into hotfix/24.07.3
cslzchen Oct 1, 2024
6cb0fb1
Merge branch 'hotfix/24.07.3'
cslzchen Oct 1, 2024
decc312
Merge tag '24.07.3' into develop
cslzchen Oct 1, 2024
5ae3ed2
Resolve issue with updating preprint fields and validation errors
Sep 20, 2024
008488a
Fix PreprintSerializer validation to handle has_coi and has_data_link…
Oct 2, 2024
5688949
Update tests to reflect the corrected validations
Oct 3, 2024
5c02749
Add tests for data links and preregistration validation
Oct 3, 2024
5ffde1b
Add admin permission checks
Oct 9, 2024
59fab7d
remove redundan and duplicate code
Oct 10, 2024
c0eb27b
Merge branch 'uditi/form-validation-issues' into hotfix/24.07.4
cslzchen Oct 21, 2024
73e3f66
Merge branch 'hotfix/24.07.4'
cslzchen Oct 21, 2024
6eebef9
Merge tag '24.07.4' into develop
cslzchen Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 129 additions & 72 deletions api/preprints/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,135 @@ def update(self, preprint, validated_data):
if not preprint.has_permission(auth.user, osf_permissions.WRITE):
raise exceptions.PermissionDenied(detail='User must have admin or write permissions to update a preprint.')

save_preprint = False
recently_published = False

for field in ['conflict_of_interest_statement', 'why_no_data', 'why_no_prereg']:
if field in validated_data:
value = validated_data[field]
if isinstance(value, str) and not value.strip():
validated_data[field] = None

updated_has_coi = validated_data.get('has_coi', preprint.has_coi)
updated_conflict_statement = validated_data.get('conflict_of_interest_statement', preprint.conflict_of_interest_statement)

updated_has_data_links = validated_data.get('has_data_links', preprint.has_data_links)
updated_why_no_data = validated_data.get('why_no_data', preprint.why_no_data)

updated_has_prereg_links = validated_data.get('has_prereg_links', preprint.has_prereg_links)
updated_why_no_prereg = validated_data.get('why_no_prereg', preprint.why_no_prereg)

if updated_has_coi is False and updated_conflict_statement:
raise exceptions.ValidationError(
detail='Cannot provide conflict of interest statement when has_coi is set to False.',
)

if updated_has_data_links != 'no' and updated_why_no_data:
raise exceptions.ValidationError(
detail='You cannot edit this statement while your data links availability is set to true or is unanswered.',
)

if updated_has_data_links == 'no' and 'data_links' in validated_data and validated_data['data_links']:
raise exceptions.ValidationError(
detail='Cannot provide data links when has_data_links is set to "no".',
)

if updated_has_prereg_links != 'no' and updated_why_no_prereg:
raise exceptions.ValidationError(
detail='You cannot edit this statement while your prereg links availability is set to true or is unanswered.',
)

if updated_has_prereg_links != 'available':
if 'prereg_links' in validated_data and validated_data['prereg_links']:
raise exceptions.ValidationError(
detail='You cannot edit this field while your prereg links availability is set to false or is unanswered.',
)
if 'prereg_link_info' in validated_data and validated_data['prereg_link_info']:
raise exceptions.ValidationError(
detail='You cannot edit this field while your prereg links availability is set to false or is unanswered.',
)

def require_admin_permission():
if not preprint.has_permission(auth.user, osf_permissions.ADMIN):
raise exceptions.PermissionDenied(detail='Must have admin permissions to update author assertion fields.')

if 'has_coi' in validated_data:
require_admin_permission()
try:
preprint.update_has_coi(auth, validated_data['has_coi'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'conflict_of_interest_statement' in validated_data:
require_admin_permission()
try:
preprint.update_conflict_of_interest_statement(auth, validated_data['conflict_of_interest_statement'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'has_data_links' in validated_data:
require_admin_permission()
try:
preprint.update_has_data_links(auth, validated_data['has_data_links'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'why_no_data' in validated_data:
require_admin_permission()
try:
preprint.update_why_no_data(auth, validated_data['why_no_data'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'data_links' in validated_data:
require_admin_permission()
try:
preprint.update_data_links(auth, validated_data['data_links'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))
else:
if updated_has_data_links == 'no' and preprint.data_links:
preprint.update_data_links(auth, [])
save_preprint = True

if 'has_prereg_links' in validated_data:
require_admin_permission()

try:
preprint.update_has_prereg_links(auth, validated_data['has_prereg_links'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'why_no_prereg' in validated_data:
require_admin_permission()
try:
preprint.update_why_no_prereg(auth, validated_data['why_no_prereg'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'prereg_links' in validated_data:
require_admin_permission()
try:
preprint.update_prereg_links(auth, validated_data['prereg_links'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'prereg_link_info' in validated_data:
require_admin_permission()
try:
preprint.update_prereg_link_info(auth, validated_data['prereg_link_info'])
save_preprint = True
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

published = validated_data.pop('is_published', None)
if published and preprint.provider.is_reviewed:
url = absolute_reverse(
Expand Down Expand Up @@ -369,8 +498,6 @@ def update(self, preprint, validated_data):
preprint.custom_publication_citation = validated_data['custom_publication_citation'] or None
save_preprint = True

self.handle_author_assertions(preprint, validated_data, auth)

if published is not None:
if not preprint.primary_file:
raise exceptions.ValidationError(
Expand All @@ -396,76 +523,6 @@ def update(self, preprint, validated_data):

return preprint

def handle_author_assertions(self, preprint, validated_data, auth):
author_assertions = {
'has_coi',
'conflict_of_interest_statement',
'has_data_links',
'why_no_data',
'data_links',
'why_no_prereg',
'prereg_links',
'has_prereg_links',
'prereg_link_info',
}
if author_assertions & validated_data.keys():
if not preprint.is_admin_contributor(auth.user):
raise exceptions.PermissionDenied('User must be admin to add author assertions')

if 'has_coi' in validated_data:
try:
preprint.update_has_coi(auth, validated_data['has_coi'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'conflict_of_interest_statement' in validated_data:
try:
preprint.update_conflict_of_interest_statement(auth, validated_data['conflict_of_interest_statement'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'has_data_links' in validated_data:
try:
preprint.update_has_data_links(auth, validated_data['has_data_links'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'why_no_data' in validated_data:
try:
preprint.update_why_no_data(auth, validated_data['why_no_data'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'data_links' in validated_data:
try:
preprint.update_data_links(auth, validated_data['data_links'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'has_prereg_links' in validated_data:
try:
preprint.update_has_prereg_links(auth, validated_data['has_prereg_links'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'why_no_prereg' in validated_data:
try:
preprint.update_why_no_prereg(auth, validated_data['why_no_prereg'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'prereg_links' in validated_data:
try:
preprint.update_prereg_links(auth, validated_data['prereg_links'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

if 'prereg_link_info' in validated_data:
try:
preprint.update_prereg_link_info(auth, validated_data['prereg_link_info'])
except PreprintStateError as e:
raise exceptions.ValidationError(detail=str(e))

def set_field(self, func, val, auth, save=False):
try:
func(val, auth)
Expand Down
Loading
Loading