Merge remote-tracking branch 'upstream/feature/pbs-25-25' into feature/institution_affiliation_admin

Author: Ostap-Zherebetskyi

CHANGELOG

@@ -2,6 +2,28 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+25.18.2 (2025-12-19)
+====================
+
+- Remove users from sitemap
+- Fix error when making registrations public
+- Fix PR templates
+
+25.18.1 (2025-12-10)
+====================
+
+- Add missing migrations
+
+25.18.0
+=======
+
+- TODO: add date and notes
+
+25.17.7 ~ 25.17.10
+==================
+
+- TODO: add date and notes
+
 25.17.6 (2025-10-11)
 ====================
 

PULL_REQUEST_TEMPLATE.md

@@ -15,13 +15,13 @@
 
 ## QA Notes
 
-Please make verification statements inspired by your code and what your code touches.
-- Verify
-- Verify
 
-What are the areas of risk?
-
-Any concerns/considerations/questions that development raised?
+<!-- Please make verification statements inspired by your code and what your code touches.
+     - Verify
+     - Verify
+     What are the areas of risk?
+     Any concerns/considerations/questions that development raised?
+-->
 
 ## Documentation
 

admin/nodes/views.py

@@ -53,6 +53,7 @@
 from scripts.approve_registrations import approve_past_pendings
 
 from website import settings, search
+from website.archiver.tasks import force_archive
 
 
 class NodeMixin(PermissionRequiredMixin):
@@ -832,16 +833,19 @@ class CheckArchiveStatusRegistrationsView(NodeMixin, View):
 
     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
+        from osf.management.commands.force_archive import check, DEFAULT_PERMISSIBLE_ADDONS
 
         registration = self.get_object()
 
         if registration.archived:
             messages.success(request, f"Registration {registration._id} is archived.")
             return redirect(self.get_success_url())
 
+        addons = set(registration.registered_from.get_addon_names())
+        addons.update(DEFAULT_PERMISSIBLE_ADDONS)
+
         try:
-            archive_status = check(registration)
+            archive_status = check(registration, permissible_addons=addons)
             messages.success(request, archive_status)
         except RegistrationStuckError as exc:
             messages.error(request, str(exc))
@@ -862,7 +866,7 @@ class ForceArchiveRegistrationsView(NodeMixin, View):
 
     def post(self, request, *args, **kwargs):
         # Prevents circular imports that cause admin app to hang at startup
-        from osf.management.commands.force_archive import verify, archive, DEFAULT_PERMISSIBLE_ADDONS
+        from osf.management.commands.force_archive import verify, DEFAULT_PERMISSIBLE_ADDONS
 
         registration = self.get_object()
         force_archive_params = request.POST
@@ -887,18 +891,14 @@ def post(self, request, *args, **kwargs):
         if dry_mode:
             messages.success(request, f"Registration {registration._id} can be archived.")
         else:
-            try:
-                archive(
-                    registration,
-                    permissible_addons=addons,
-                    allow_unconfigured=allow_unconfigured,
-                    skip_collisions=skip_collision,
-                    delete_collisions=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.')
+            force_archive_task = force_archive.delay(
+                str(registration._id),
+                permissible_addons=list(addons),
+                allow_unconfigured=allow_unconfigured,
+                skip_collisions=skip_collision,
+                delete_collisions=delete_collision,
+            )
+            messages.success(request, f'Registration archive process has started. Task id: {force_archive_task.id}.')
 
         return redirect(self.get_success_url())
 

admin/templates/institutions/detail.html

@@ -24,11 +24,11 @@
                 <a class="btn btn-danger" href={% url 'institutions:delete' institution.id %}>Delete institution</a>
                 {%  endif %}
 				{% if perms.osf.change_institution %}
-					{% if institution.deactivated is None %}
-					<a class="btn btn-danger" href={% url 'institutions:deactivate' institution.id %}>Deactivate institution</a>
-					{% else %}
-					<a class="btn btn-danger" href={% url 'institutions:reactivate' institution.id %}>Reactivate institution</a>
-					{% endif %}
+                {% if institution.deactivated is None %}
+                <a class="btn btn-danger" href={% url 'institutions:deactivate' institution.id %}>Deactivate institution</a>
+                {% else %}
+                <a class="btn btn-danger" href={% url 'institutions:reactivate' institution.id %}>Reactivate institution</a>
+                {% endif %}
 					<a class="btn btn-primary" href={% url 'institutions:affiliations' institution.id %}>Affiliations</a>
 				{% endif %}
                 {% if perms.osf.change_institution %}

api/guids/views.py

@@ -1,5 +1,6 @@
 from furl import furl
 from django import http
+from osf.models.base import VersionedGuidMixin
 from rest_framework.exceptions import NotFound
 from rest_framework import permissions as drf_permissions
 from rest_framework import generics
@@ -70,11 +71,17 @@ def get(self, request, **kwargs):
         raise NotFound
 
     def get_redirect_url(self, **kwargs):
-        guid = Guid.load(kwargs['guids'])
-        if guid:
-            referent = guid.referent
+        guid_str, version_number = Guid.split_guid(kwargs['guids'])
+        guid = Guid.load(guid_str)
+        if not guid:
+            return None
+        referent = guid.referent
+        if version_number and isinstance(referent, VersionedGuidMixin):
+            # if the guid string contains a version number and referent is versionable
+            return referent.get_versioned_absolute_api_v2_url(version_number)
+        else:
+            # if the guid string doesn't have a version number or the referent is not versionable
             if getattr(referent, 'absolute_api_v2_url', None):
                 return referent.absolute_api_v2_url
             else:
                 raise EndpointNotImplementedError()
-        return None

api/nodes/views.py

@@ -545,13 +545,17 @@ def get_serializer_context(self):
         return context
 
     def perform_destroy(self, instance):
-        node = self.get_resource()
+        node: Node = self.get_resource()
         auth = get_user_auth(self.request)
         if node.visible_contributors.count() == 1 and instance.visible:
             raise ValidationError('Must have at least one visible contributor')
         removed = node.remove_contributor(instance, auth)
         if not removed:
             raise ValidationError('Must have at least one registered admin contributor')
+        propagate = self.request.query_params.get('propagate_to_children') == 'true'
+        if propagate:
+            for child_node in node.get_nodes(_contributors__in=[instance.user]):
+                child_node.remove_contributor(instance, auth)
 
 
 class NodeImplicitContributorsList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin, NodeMixin):

api_tests/guids/views/test_guid_detail.py

@@ -4,6 +4,7 @@
 from api.base.settings.defaults import API_BASE
 from osf_tests.factories import (
     AuthUserFactory,
+    PreprintFactory,
     ProjectFactory,
     RegistrationFactory,
     CommentFactory,
@@ -28,6 +29,18 @@ def project(self):
     def registration(self):
         return RegistrationFactory()
 
+    @pytest.fixture()
+    def versioned_preprint(self, user):
+        preprint = PreprintFactory(reviews_workflow='pre-moderation')
+        PreprintFactory.create_version(
+            create_from=preprint,
+            creator=user,
+            final_machine_state='accepted',
+            is_published=True,
+            set_doi=False
+        )
+        return preprint
+
     def test_redirects(self, app, project, registration, user):
         # test_redirect_to_node_view
         url = f'/{API_BASE}guids/{project._id}/'
@@ -125,6 +138,38 @@ def test_redirects_through_view_only_link(self, app, project, user):
         assert res.status_code == 302
         assert res.location == redirect_url
 
+    def test_redirects_with_version_for_versionable_objects(self, app, versioned_preprint, user):
+        # if you go to the guids endpoint with just the guid without version number
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}/'
+        res = app.get(url, auth=user.auth)
+        redirect_url = f'{API_DOMAIN}{API_BASE}preprints/{versioned_preprint.versioned_guids.first().guid._id}_v2/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
+        # if you go to the guids endpoint with just the guid with a version number
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}_v2/'
+        res = app.get(url, auth=user.auth)
+        redirect_url = f'{API_DOMAIN}{API_BASE}preprints/{versioned_preprint.versioned_guids.first().guid._id}_v2/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}_v1/'
+        res = app.get(url, auth=user.auth)
+        redirect_url = f'{API_DOMAIN}{API_BASE}preprints/{versioned_preprint.versioned_guids.first().guid._id}_v1/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}_v3/'
+        res = app.get(url, auth=user.auth, expect_errors=True)
+        assert res.status_code == 404
+
+    def test_redirects_with_version_for_unversionable_objects(self, app, project, user):
+        url = f'/{API_BASE}guids/{project._id}_v12/'
+        res = app.get(url, auth=user.auth, expect_errors=True)
+        redirect_url = f'{API_DOMAIN}{API_BASE}nodes/{project._id}/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
     def test_resolves(self, app, project, user):
         # test_resolve_query_param
         url = '{}{}guids/{}/?resolve=false'.format(

osf/management/commands/force_archive.py

@@ -36,10 +36,13 @@
 from addons.osfstorage.models import OsfStorageFile, OsfStorageFolder, OsfStorageFileNode
 from framework import sentry
 from framework.exceptions import HTTPError
+from osf import features
 from osf.models import AbstractNode, Node, NodeLog, Registration, BaseFileNode
 from osf.models.files import TrashedFileNode
+from osf.utils.requests import get_current_request
 from osf.exceptions import RegistrationStuckRecoverableException, RegistrationStuckBrokenException
 from api.base.utils import waterbutler_api_url_for
+from api.waffle.utils import flag_is_active
 from scripts import utils as script_utils
 from website.archiver import ARCHIVER_SUCCESS
 from website.settings import ARCHIVE_TIMEOUT_TIMEDELTA, ARCHIVE_PROVIDER, COOKIE_NAME
@@ -149,9 +152,11 @@ def complete_archive_target(reg, addon_short_name):
 
 def perform_wb_copy(reg, node_settings, delete_collisions=False, skip_collisions=False):
     src, dst, user = reg.archive_job.info()
-    if dst.files.filter(name=node_settings.archive_folder_name.replace('/', '-')).exists():
+    dst_storage = dst.get_addon('osfstorage')
+    archive_name = node_settings.archive_folder_name.replace('/', '-')
+    if dst_storage.get_root().children.filter(name=archive_name).exists():
         if not delete_collisions and not skip_collisions:
-            raise Exception('Archive folder for {} already exists. Investigate manually and rerun with either --delete-collisions or --skip-collisions')
+            raise Exception(f'Archive folder for {archive_name} already exists. Investigate manually and rerun with either --delete-collisions or --skip-collisions')
         if delete_collisions:
             archive_folder = dst.files.exclude(type='osf.trashedfolder').get(name=node_settings.archive_folder_name.replace('/', '-'))
             logger.info(f'Removing {archive_folder}')
@@ -393,12 +398,23 @@ def archive(registration, *args, permissible_addons=DEFAULT_PERMISSIBLE_ADDONS,
         logger.info(f'Preparing to archive {reg._id}')
         for short_name in permissible_addons:
             node_settings = reg.registered_from.get_addon(short_name)
+            if not node_settings and short_name != 'osfstorage' and flag_is_active(get_current_request(), features.ENABLE_GV):
+                # get_addon() returns None for addons when archive is running inside of
+                # the celery task. In this case, try to get addon settings from the GV
+                try:
+                    from website.archiver.tasks import get_addon_from_gv
+                    node_settings = get_addon_from_gv(reg.registered_from, short_name, reg.registered_from.creator)
+                except Exception as e:
+                    logger.warning(f'Could not load {short_name} from GV: {e}')
+
             if not hasattr(node_settings, '_get_file_tree'):
                 # Excludes invalid or None-type
+                logger.warning(f"Skipping {short_name} for {registration._id}.")
                 continue
             if not node_settings.configured:
                 if not allow_unconfigured:
                     raise Exception(f'{reg._id}: {short_name} on {reg.registered_from._id} is not configured. If this is permissible, re-run with `--allow-unconfigured`.')
+                logger.warning(f"{short_name} is not configured for {registration._id}.")
                 continue
             if not reg.archive_job.get_target(short_name) or reg.archive_job.get_target(short_name).status == ARCHIVER_SUCCESS:
                 continue
@@ -486,7 +502,7 @@ def verify_registrations(registration_ids, permissible_addons):
             else:
                 SKIPPED.append(reg)
 
-def check(reg):
+def check(reg, *args, **kwargs):
     """Check registration status. Raise exception if registration stuck."""
     logger.info(f'Checking {reg._id}')
     if reg.is_deleted:
@@ -503,7 +519,7 @@ def check(reg):
         still_archiving = not archive_tree_finished
     if still_archiving and root_job.datetime_initiated < expired_if_before:
         logger.warning(f'Registration {reg._id} is stuck in archiving')
-        if verify(reg):
+        if verify(reg, *args, **kwargs):
             raise RegistrationStuckRecoverableException(f'Registration {reg._id} is stuck and verified recoverable')
         else:
             raise RegistrationStuckBrokenException(f'Registration {reg._id} is stuck and verified broken')