[ENG-8045] Reference PR for reviewing merge conflicts

CHANGELOG

@@ -2,6 +2,26 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+25.09.0 (2025-05-14)
+====================
+
+- Accounts confirmed but not registered
+- Action requests creation for preprints and nodes not working
+- Reviews Dashboard not displaying contributors for preprint provider moderators
+- Backend Support for Static Contact Indicator in Institutional Dashboard
+- Add ability to remove categories from active collections
+- Add scopes for applications to full_read and full_write scopes
+
+25.08.0 (2025-05-02)
+====================
+
+- Bugfix and Improvements
+
+25.07.0 (2025-04-21)
+====================
+
+- Bugfix and Improvements
+
 25.06.0 (2025-04-07)
 ====================
 

addons/base/views.py

@@ -431,11 +431,7 @@ def _enqueue_metrics(file_version, file_node, action, auth, from_mfr=False):
 def _construct_payload(auth, resource, credentials, waterbutler_settings):
 
     if isinstance(resource, Registration):
-        callback_url = resource.api_url_for(
-            'registration_callbacks',
-            _absolute=True,
-            _internal=True
-        )
+        callback_url = resource.callbacks_url
     else:
         callback_url = resource.api_url_for(
             'create_waterbutler_log',

admin/collection_providers/forms.py

@@ -3,7 +3,7 @@
 from django import forms
 
 from framework.utils import sanitize_html
-from osf.models import CollectionProvider, CollectionSubmission
+from osf.models import CollectionProvider
 from admin.base.utils import get_nodelicense_choices, get_defaultlicense_choices, validate_slug
 
 
@@ -74,12 +74,6 @@ def clean_collected_type_choices(self):
             type_choices_new = {c.strip(' ') for c in json.loads(self.data.get('collected_type_choices'))}
             type_choices_added = type_choices_new - type_choices_old
             type_choices_removed = type_choices_old - type_choices_new
-            for item in type_choices_removed:
-                if CollectionSubmission.objects.filter(collection=collection_provider.primary_collection,
-                                                        collected_type=item).exists():
-                    raise forms.ValidationError(
-                        f'Cannot delete "{item}" because it is used as metadata on objects.'
-                    )
         else:
             # if this is creating a CollectionProvider
             type_choices_added = []
@@ -104,12 +98,6 @@ def clean_status_choices(self):
             status_choices_new = {c.strip(' ') for c in json.loads(self.data.get('status_choices'))}
             status_choices_added = status_choices_new - status_choices_old
             status_choices_removed = status_choices_old - status_choices_new
-            for item in status_choices_removed:
-                if CollectionSubmission.objects.filter(collection=collection_provider.primary_collection,
-                                                        status=item).exists():
-                    raise forms.ValidationError(
-                        f'Cannot delete "{item}" because it is used as metadata on objects.'
-                    )
         else:
             # if this is creating a CollectionProvider
             status_choices_added = []
@@ -134,12 +122,6 @@ def clean_volume_choices(self):
             volume_choices_new = {c.strip(' ') for c in json.loads(self.data.get('volume_choices'))}
             volume_choices_added = volume_choices_new - volume_choices_old
             volume_choices_removed = volume_choices_old - volume_choices_new
-            for item in volume_choices_removed:
-                if CollectionSubmission.objects.filter(collection=collection_provider.primary_collection,
-                                                        volume=item).exists():
-                    raise forms.ValidationError(
-                        f'Cannot delete "{item}" because it is used as metadata on objects.'
-                    )
         else:
             # if this is creating a CollectionProvider
             volume_choices_added = []
@@ -164,12 +146,6 @@ def clean_issue_choices(self):
             issue_choices_new = {c.strip(' ') for c in json.loads(self.data.get('issue_choices'))}
             issue_choices_added = issue_choices_new - issue_choices_old
             issue_choices_removed = issue_choices_old - issue_choices_new
-            for item in issue_choices_removed:
-                if CollectionSubmission.objects.filter(collection=collection_provider.primary_collection,
-                                                        issue=item).exists():
-                    raise forms.ValidationError(
-                        f'Cannot delete "{item}" because it is used as metadata on objects.'
-                    )
         else:
             # if this is creating a CollectionProvider
             issue_choices_added = []
@@ -194,12 +170,6 @@ def clean_program_area_choices(self):
             program_area_choices_new = {c.strip(' ') for c in json.loads(self.data.get('program_area_choices'))}
             program_area_choices_added = program_area_choices_new - program_area_choices_old
             program_area_choices_removed = program_area_choices_old - program_area_choices_new
-            for item in program_area_choices_removed:
-                if CollectionSubmission.objects.filter(collection=collection_provider.primary_collection,
-                                                        program_area=item).exists():
-                    raise forms.ValidationError(
-                        f'Cannot delete "{item}" because it is used as metadata on objects.'
-                    )
         else:
             # if this is creating a CollectionProvider
             program_area_choices_added = []
@@ -224,16 +194,6 @@ def clean_school_type_choices(self):
             updated_choices = {c.strip(' ') for c in json.loads(self.data.get('school_type_choices'))}
             added_choices = updated_choices - old_choices
             removed_choices = old_choices - updated_choices
-            active_removed_choices = set(
-                primary_collection.collectionsubmission_set.filter(
-                    school_type__in=removed_choices
-                ).values_list('school_type', flat=True)
-            )
-            if active_removed_choices:
-                raise forms.ValidationError(
-                    'Cannot remove the following choices for "school_type", as they are '
-                    f'currently in use: {active_removed_choices}'
-                )
         else:  # Creating a new CollectionProvider
             added_choices = set()
             removed_choices = set()
@@ -253,17 +213,6 @@ def clean_study_design_choices(self):
             updated_choices = {c.strip(' ') for c in json.loads(self.data.get('study_design_choices'))}
             added_choices = updated_choices - old_choices
             removed_choices = old_choices - updated_choices
-
-            active_removed_choices = set(
-                primary_collection.collectionsubmission_set.filter(
-                    study_design__in=removed_choices
-                ).values_list('school_type', flat=True)
-            )
-            if active_removed_choices:
-                raise forms.ValidationError(
-                    'Cannot remove the following choices for "study_design", as they are '
-                    f'currently in use: {active_removed_choices}'
-                )
         else:  # Creating a new CollectionProvider
             added_choices = set()
             removed_choices = set()
@@ -283,17 +232,6 @@ def clean_disease_choices(self):
             updated_choices = {c.strip(' ') for c in json.loads(self.data.get('disease_choices'))}
             added_choices = updated_choices - old_choices
             removed_choices = old_choices - updated_choices
-
-            active_removed_choices = set(
-                primary_collection.collectionsubmission_set.filter(
-                    disease__in=removed_choices
-                ).values_list('disease', flat=True)
-            )
-            if active_removed_choices:
-                raise forms.ValidationError(
-                    'Cannot remove the following choices for "disease", as they are '
-                    f'currently in use: {active_removed_choices}'
-                )
         else:  # Creating a new CollectionProvider
             added_choices = set()
             removed_choices = set()
@@ -313,17 +251,6 @@ def clean_data_type_choices(self):
             updated_choices = {c.strip(' ') for c in json.loads(self.data.get('data_type_choices'))}
             added_choices = updated_choices - old_choices
             removed_choices = old_choices - updated_choices
-
-            active_removed_choices = set(
-                primary_collection.collectionsubmission_set.filter(
-                    data_type__in=removed_choices
-                ).values_list('data_type', flat=True)
-            )
-            if active_removed_choices:
-                raise forms.ValidationError(
-                    'Cannot remove the following choices for "data_type", as they are '
-                    f'currently in use: {active_removed_choices}'
-                )
         else:  # Creating a new CollectionProvider
             added_choices = set()
             removed_choices = set()
@@ -343,17 +270,6 @@ def clean_grade_levels_choices(self):
             updated_choices = {c.strip(' ') for c in json.loads(self.data.get('grade_levels_choices'))}
             added_choices = updated_choices - old_choices
             removed_choices = old_choices - updated_choices
-
-            active_removed_choices = set(
-                primary_collection.collectionsubmission_set.filter(
-                    data_type__in=removed_choices
-                ).values_list('grade_levels', flat=True)
-            )
-            if active_removed_choices:
-                raise forms.ValidationError(
-                    'Cannot remove the following choices for "grade_levels", as they are '
-                    f'currently in use: {active_removed_choices}'
-                )
         else:  # Creating a new CollectionProvider
             added_choices = set()
             removed_choices = set()

admin/management/views.py

@@ -150,10 +150,12 @@ def post(self, request):
 class BulkResync(ManagementCommandPermissionView):
 
     def post(self, request):
+        missing_dois_only = request.POST.get('missing_preprint_dois_only', False)
         sync_doi_metadata.apply_async(kwargs={
             'modified_date': timezone.now(),
             'batch_size': None,
-            'dry_run': False
+            'dry_run': False,
+            'missing_preprint_dois_only': missing_dois_only
         })
         messages.success(request, 'Resyncing with CrossRef and DataCite! It will take some time.')
         return redirect(reverse('management:commands'))

admin/nodes/urls.py

@@ -27,10 +27,12 @@
     re_path(r'^(?P<guid>[a-z0-9]+)/reindex_share_node/$', views.NodeReindexShare.as_view(), name='reindex-share-node'),
     re_path(r'^(?P<guid>[a-z0-9]+)/reindex_elastic_node/$', views.NodeReindexElastic.as_view(),
         name='reindex-elastic-node'),
-    re_path(r'^(?P<guid>[a-z0-9]+)/restart_stuck_registrations/$', views.RestartStuckRegistrationsView.as_view(),
-        name='restart-stuck-registrations'),
     re_path(r'^(?P<guid>[a-z0-9]+)/remove_stuck_registrations/$', views.RemoveStuckRegistrationsView.as_view(),
         name='remove-stuck-registrations'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/check_archive_status/$', views.CheckArchiveStatusRegistrationsView.as_view(),
+        name='check-archive-status'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/force_archive_registration/$', views.ForceArchiveRegistrationsView.as_view(),
+        name='force-archive-registration'),
     re_path(r'^(?P<guid>[a-z0-9]+)/remove_user/(?P<user_id>[a-z0-9]+)/$', views.NodeRemoveContributorView.as_view(),
         name='remove-user'),
     re_path(r'^(?P<guid>[a-z0-9]+)/modify_storage_usage/$', views.NodeModifyStorageUsage.as_view(),

admin/nodes/views.py

@@ -1,4 +1,5 @@
 import pytz
+from enum import Enum
 from datetime import datetime
 from framework import status
 
@@ -26,7 +27,7 @@
 from api.share.utils import update_share
 from api.caching.tasks import update_storage_usage_cache
 
-from osf.exceptions import NodeStateError
+from osf.exceptions import NodeStateError, RegistrationStuckError
 from osf.models import (
     OSFUser,
     NodeLog,
@@ -672,44 +673,97 @@ def post(self, request, *args, **kwargs):
         return redirect(self.get_success_url())
 
 
-class RestartStuckRegistrationsView(NodeMixin, TemplateView):
-    """ Allows an authorized user to restart a registrations archive process.
+class RemoveStuckRegistrationsView(NodeMixin, View):
+    """ Allows an authorized user to remove a registrations if it's stuck in the archiving process.
     """
-    template_name = 'nodes/restart_registrations_modal.html'
     permission_required = ('osf.view_node', 'osf.change_node')
 
     def post(self, request, *args, **kwargs):
-        # Prevents circular imports that cause admin app to hang at startup
-        from osf.management.commands.force_archive import archive, verify
         stuck_reg = self.get_object()
-        if verify(stuck_reg):
-            try:
-                archive(stuck_reg)
-                messages.success(request, 'Registration archive processes has restarted')
-            except Exception as exc:
-                messages.error(request, f'This registration cannot be unstuck due to {exc.__class__.__name__} '
-                                        f'if the problem persists get a developer to fix it.')
+        if Registration.find_failed_registrations().filter(id=stuck_reg.id).exists():
+            stuck_reg.delete_registration_tree(save=True)
+            messages.success(request, 'The registration has been deleted')
         else:
             messages.error(request, 'This registration may not technically be stuck,'
                                     ' if the problem persists get a developer to fix it.')
 
         return redirect(self.get_success_url())
 
 
-class RemoveStuckRegistrationsView(NodeMixin, TemplateView):
-    """ Allows an authorized user to remove a registrations if it's stuck in the archiving process.
+class CheckArchiveStatusRegistrationsView(NodeMixin, View):
+    """Allows an authorized user to check a registration archive status.
+    """
+    permission_required = ('osf.view_node', 'osf.change_node')
+
+    def get(self, request, *args, **kwargs):
+        # Prevents circular imports that cause admin app to hang at startup
+        from osf.management.commands.force_archive import check
+
+        registration = self.get_object()
+
+        if registration.archived:
+            messages.success(request, f"Registration {registration._id} is archived.")
+            return redirect(self.get_success_url())
+
+        try:
+            archive_status = check(registration)
+            messages.success(request, archive_status)
+        except RegistrationStuckError as exc:
+            messages.error(request, str(exc))
+
+        return redirect(self.get_success_url())
+
+
+class CollisionMode(Enum):
+    NONE: str = 'none'
+    SKIP: str = 'skip'
+    DELETE: str = 'delete'
+
+
+class ForceArchiveRegistrationsView(NodeMixin, View):
+    """Allows an authorized user to force archive registration.
     """
-    template_name = 'nodes/remove_registrations_modal.html'
     permission_required = ('osf.view_node', 'osf.change_node')
 
     def post(self, request, *args, **kwargs):
-        stuck_reg = self.get_object()
-        if Registration.find_failed_registrations().filter(id=stuck_reg.id).exists():
-            stuck_reg.delete_registration_tree(save=True)
-            messages.success(request, 'The registration has been deleted')
+        # Prevents circular imports that cause admin app to hang at startup
+        from osf.management.commands.force_archive import verify, archive, DEFAULT_PERMISSIBLE_ADDONS
+
+        registration = self.get_object()
+        force_archive_params = request.POST
+
+        collision_mode = force_archive_params.get('collision_mode', CollisionMode.NONE.value)
+        delete_collision = CollisionMode.DELETE.value == collision_mode
+        skip_collision = CollisionMode.SKIP.value == collision_mode
+
+        allow_unconfigured = force_archive_params.get('allow_unconfigured', False)
+
+        addons = set(force_archive_params.getlist('addons', []))
+        addons.update(DEFAULT_PERMISSIBLE_ADDONS)
+
+        try:
+            verify(registration, permissible_addons=addons, raise_error=True)
+        except ValidationError as exc:
+            messages.error(request, str(exc))
+            return redirect(self.get_success_url())
+
+        dry_mode = force_archive_params.get('dry_mode', False)
+
+        if dry_mode:
+            messages.success(request, f"Registration {registration._id} can be archived.")
         else:
-            messages.error(request, 'This registration may not technically be stuck,'
-                                    ' if the problem persists get a developer to fix it.')
+            try:
+                archive(
+                    registration,
+                    permissible_addons=addons,
+                    allow_unconfigured=allow_unconfigured,
+                    skip_collision=skip_collision,
+                    delete_collision=delete_collision,
+                )
+                messages.success(request, 'Registration archive process has finished.')
+            except Exception as exc:
+                messages.error(request, f'This registration cannot be archived due to {exc.__class__.__name__}: {str(exc)}. '
+                                        f'If the problem persists get a developer to fix it.')
 
         return redirect(self.get_success_url())
 

admin/preprint_providers/forms.py

@@ -112,11 +112,12 @@ class PreprintProviderRegisterModeratorOrAdminForm(forms.Form):
     """ A form that finds an existing OSF User, and grants permissions to that
         user so that they can use the admin app"""
 
-    def __init__(self, *args, **kwargs):
-        provider_id = kwargs.pop('provider_id')
+    def __init__(self, *args, provider_groups=None, **kwargs):
         super().__init__(*args, **kwargs)
+
+        provider_groups = provider_groups or Group.objects.none()
         self.fields['group_perms'] = forms.ModelMultipleChoiceField(
-            queryset=Group.objects.filter(name__startswith=f'reviews_preprint_{provider_id}'),
+            queryset=provider_groups,
             required=False,
             widget=forms.CheckboxSelectMultiple
         )