[ENG-10890] Merge latest develop, fix conflicts and merge migrations after osf.io 26.8 release

.github/actions/gen-report/action.yml

@@ -4,12 +4,12 @@ runs:
   using: "composite"
   steps:
   - name: Archive code coverage results
-    uses: actions/upload-artifact@v4
+    uses: actions/upload-artifact@v7
     with:
       name: ${{github.job}} HTML REPORT
       path: report.html
   - name: Generate Report
-    uses: dorny/test-reporter@v2
+    uses: dorny/test-reporter@v3
     if: success() || failure()    # run this step even if previous step failed
     with:
       name: ${{github.job}} REPORT   # Name of the check run which will be created

.github/actions/start-build/action.yml

@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
   - id: cache-objects
-    uses: actions/cache@v4
+    uses: actions/cache@v5
     with:
       path: ~/.cache
       key: reqs_${{ hashFiles('poetry.lock') }}
@@ -16,7 +16,7 @@ runs:
     with:
       ELASTICSEARCH6_ARCHIVE: ${{ env.ELASTICSEARCH6_ARCHIVE }}
   - name: Set up Python 3.12
-    uses: actions/setup-python@v5
+    uses: actions/setup-python@v6
     with:
       python-version: '3.12'
   - name: Install lxml

.github/workflows/test-build.yml

@@ -17,9 +17,9 @@ jobs:
   build-cache:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - id: cache-objects
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.cache
         key: reqs_${{ hashFiles('poetry.lock') }}
@@ -50,7 +50,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ./.github/actions/start-build
     - name: Run tests
       run: poetry run python3 -m invoke test-ci-addons --junit
@@ -77,7 +77,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ./.github/actions/start-build
     - name: Run tests
       run: poetry run python3 -m invoke test-ci-website --junit
@@ -104,7 +104,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/start-build
       - name: NVM & yarn install
         run: poetry run python3 -m invoke assets --dev
@@ -133,7 +133,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ./.github/actions/start-build
     - name: Run tests
       run: poetry run python3 -m invoke test-ci-api2 --junit
@@ -161,7 +161,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ./.github/actions/start-build
     - name: Run tests
       run: poetry run python3 -m invoke test-ci-api3-and-osf --junit
@@ -194,7 +194,7 @@ jobs:
           - 1025:1025
           - 8025:8025
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ./.github/actions/start-build
     - name: Run tests
       run: poetry run python3 -m invoke test-ci-mailhog -n 1 --junit
@@ -222,7 +222,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ./.github/actions/start-build
     - name: Run tests
       run: poetry run python3 -m invoke test-ci-scripts -n 1 --junit

CHANGELOG

@@ -2,6 +2,16 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.8.0 (2026-04-23)
+===================
+
+- Miscellaneous improvements and bug fixes
+
+26.7.1 (2026-04-22)
+===================
+
+- Hotfix to improve notifications and logging for failed registrations
+
 26.7.0 (2026-04-08)
 ===================
 

admin/base/urls.py

@@ -37,6 +37,7 @@
             re_path(r'^cedar_metadata_templates/', include('admin.cedar.urls', namespace='cedar_metadata_templates')),
             re_path(r'^draft_registrations/', include('admin.draft_registrations.urls', namespace='draft_registrations')),
             re_path(r'^files/', include('admin.files.urls', namespace='files')),
+            re_path(r'^share_reindex/', include('admin.share_reindex.urls', namespace='share_reindex')),
         ]),
     ),
 ]

admin/nodes/urls.py

@@ -8,6 +8,7 @@
     re_path(r'^flagged_spam$', views.NodeFlaggedSpamList.as_view(), name='flagged-spam'),
     re_path(r'^known_spam$', views.NodeKnownSpamList.as_view(), name='known-spam'),
     re_path(r'^known_ham$', views.NodeKnownHamList.as_view(), name='known-ham'),
+    re_path(r'^embargo_report/$', views.EmbargoReportView.as_view(), name='embargo-report'),
     re_path(r'^doi_backlog_list/$', views.DoiBacklogListView.as_view(), name='doi-backlog-list'),
     re_path(r'^approval_backlog_list/$', views.ApprovalBacklogListView.as_view(), name='approval-backlog-list'),
     re_path(r'^confirm_approve_backlog_list/$', views.ConfirmApproveBacklogView.as_view(), name='confirm-approve-backlog-list'),
@@ -51,4 +52,7 @@
     re_path(r'^(?P<guid>[a-z0-9]+)/system_tags/(?P<tag_id>[a-z0-9]+)/remove/$', views.NodeRemoveSystemTag.as_view(), name='remove-system-tag'),
     re_path(r'^(?P<guid>[a-z0-9]+)/update_permissions/$', views.NodeUpdatePermissionsView.as_view(), name='update-permissions'),
     re_path(r'^(?P<guid>[a-z0-9]+)/remove_file/$', views.NodeRemoveFileView.as_view(), name='remove-file'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/add_osfstorage_file/$', views.NodeAddOsfStorageFileView.as_view(), name='add-osfstorage-file'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/remove_osfstorage_file/$', views.NodeRemoveOsfStorageFileView.as_view(), name='remove-osfstorage-file'),
+
 ]

admin/nodes/views.py

@@ -16,13 +16,16 @@
     View,
     FormView,
     ListView,
+    TemplateView
 )
+from django.core.paginator import Paginator, InvalidPage
 
 from admin.base.forms import GuidForm
 from admin.base.utils import change_embargo_date
 from admin.base.views import GuidView
 from admin.nodes.forms import AddSystemTagForm, RegistrationDateForm
 from admin.notifications.views import delete_selected_notifications
+from addons.osfstorage.models import OsfStorageFolder
 from api.caching.tasks import update_storage_usage_cache
 from api.share.utils import update_share
 from framework import status
@@ -39,6 +42,7 @@
     SpamStatus,
     TrashedFile
 )
+from osf.models.sanctions import Embargo
 from osf.models.admin_log_entry import (
     update_admin_log,
     NODE_REMOVED,
@@ -50,6 +54,7 @@
     REINDEX_SHARE,
     REINDEX_ELASTIC,
 )
+from osf.models.files import File
 from osf.utils.permissions import ADMIN, API_CONTRIBUTOR_PERMISSIONS
 from scripts.approve_registrations import approve_past_pendings
 from website import settings, search
@@ -474,6 +479,54 @@ def get_context_data(self, **kwargs):
         }
 
 
+class EmbargoReportView(PermissionRequiredMixin, TemplateView):
+    """Report view for inspecting current and overdue embargoed registrations.
+
+    Shows:
+    - pending embargoes that should have been activated
+    - active embargoes that are past their end date
+    - upcoming active embargoes
+    """
+    template_name = 'nodes/embargo_report.html'
+    permission_required = 'osf.view_registration'
+    raise_exception = True
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        pending_embargoes = Embargo.objects.pending_embargoes().select_related('initiated_by')
+        active_embargoes = Embargo.objects.active_embargoes().select_related('initiated_by')
+
+        pending_overdue_embargoes = [
+            embargo for embargo in pending_embargoes
+            if embargo.should_be_embargoed
+        ]
+
+        overdue_embargoes = [
+            embargo for embargo in active_embargoes
+            if embargo.should_be_completed
+        ]
+
+        upcoming_queryset = active_embargoes.filter(
+            end_date__gte=timezone.now(),
+        ).order_by('end_date')
+
+        page_number = self.request.GET.get('page') or 1
+        paginator = Paginator(upcoming_queryset, 10)
+        try:
+            upcoming_page = paginator.page(page_number)
+        except InvalidPage:
+            upcoming_page = paginator.page(1)
+
+        context.update({
+            'now': timezone.now(),
+            'pending_overdue_embargoes': pending_overdue_embargoes,
+            'overdue_embargoes': overdue_embargoes,
+            'upcoming_embargoes': upcoming_page.object_list,
+            'upcoming_page': upcoming_page,
+        })
+        return context
+
+
 class ConfirmApproveBacklogView(RegistrationListView):
     template_name = 'nodes/registration_approval_list.html'
     permission_required = 'osf.view_registrationapproval'
@@ -846,6 +899,72 @@ def _remove_file_from_schema_response_blocks(registration, removed_file_id):
         return redirect(self.get_success_url())
 
 
+class NodeAddOsfStorageFileView(NodeMixin, View):
+    """ Allows an authorized user to add a file to osfstorage of an archived node.
+    """
+    permission_required = 'osf.change_node'
+
+    def post(self, request, *args, **kwargs):
+        registration = self.get_object()
+        guid_id = request.POST.get('file-guid', '').strip()
+        guid = Guid.load(guid_id)
+        if not guid:
+            messages.error(request, 'No file found with the provided guid.')
+            return redirect(self.get_success_url())
+
+        file = guid.referent
+        if not isinstance(file, File):
+            messages.error(request, 'The guid provided does not correspond to a file.')
+            return redirect(self.get_success_url())
+
+        parent_node = registration.registered_from
+        if not parent_node:
+            messages.error(request, 'The registration does not have the parent node.')
+            return redirect(self.get_success_url())
+
+        if not parent_node.files.filter(id=file.id).exists():
+            messages.error(request, 'The file with the provided guid is not part of the parent node.')
+            return redirect(self.get_success_url())
+
+        osfstorage = registration.get_addon('osfstorage')
+        # copy file to Archive of OSF Storage folder
+        archive_folder = OsfStorageFolder.objects.filter(
+            parent=osfstorage.get_root(),
+            name=osfstorage.archive_folder_name
+        ).first()
+        file.copy_under(archive_folder)
+        messages.success(request, 'The file was successfully added.')
+        return redirect(self.get_success_url())
+
+
+class NodeRemoveOsfStorageFileView(NodeMixin, View):
+    """ Allows an authorized user to remove a file from osfstorage of an archived node.
+    """
+    permission_required = 'osf.change_node'
+
+    def post(self, request, *args, **kwargs):
+        registration = self.get_object()
+        guid_id = request.POST.get('file-guid', '').strip()
+        guid = Guid.load(guid_id)
+        if not guid:
+            messages.error(request, 'No file found with the provided guid.')
+            return redirect(self.get_success_url())
+
+        file = guid.referent
+        if not isinstance(file, File):
+            messages.error(request, 'The guid provided does not correspond to a file.')
+            return redirect(self.get_success_url())
+
+        registration_file = registration.files.filter(id=file.id)
+        if not registration_file.exists():
+            messages.error(request, 'The file with the provided guid is not part of the registration.')
+            return redirect(self.get_success_url())
+
+        registration_file.delete()
+        messages.success(request, 'The file was successfully removed.')
+        return redirect(self.get_success_url())
+
+
 class RemoveStuckRegistrationsView(NodeMixin, View):
     """ Allows an authorized user to remove a registrations if it's stuck in the archiving process.
     """

admin/preprints/urls.py

@@ -17,6 +17,7 @@
     re_path(r'^(?P<guid>\w+)/remove_user/(?P<user_id>[a-z0-9]+)/$', views.PreprintRemoveContributorView.as_view(), name='remove-user'),
     re_path(r'^(?P<guid>\w+)/make_private/$', views.PreprintMakePrivate.as_view(), name='make-private'),
     re_path(r'^(?P<guid>\w+)/fix_editing/$', views.PreprintFixEditing.as_view(), name='fix-editing'),
+    re_path(r'^(?P<guid>\w+)/fix_coi/$', views.PreprintFixCOI.as_view(), name='fix-coi'),
     re_path(r'^(?P<guid>\w+)/make_public/$', views.PreprintMakePublic.as_view(), name='make-public'),
     re_path(r'^(?P<guid>\w+)/remove/$', views.PreprintDeleteView.as_view(), name='remove'),
     re_path(r'^(?P<guid>\w+)/restore/$', views.PreprintDeleteView.as_view(), name='restore'),

admin/preprints/views.py

@@ -668,6 +668,22 @@ def post(self, request, *args, **kwargs):
         return redirect(self.get_success_url())
 
 
+class PreprintFixCOI(PreprintMixin, View):
+    """ Allows an authorized user to manually fix conflict of interest field.
+    """
+    permission_required = 'osf.change_preprint'
+
+    def post(self, request, *args, **kwargs):
+        preprint = self.get_object()
+        if preprint.conflict_of_interest_statement and not preprint.has_coi:
+            preprint.update_has_coi(auth=request, has_coi=True, ignore_permission=True)
+            messages.success(request, 'The COI was successfully fixed.')
+        else:
+            messages.error(request, 'The COI is either already fixed or the preprint does not have conflict of interest set.')
+
+        return redirect(self.get_success_url())
+
+
 class PreprintMakePublic(PreprintMixin, View):
     """ Allows an authorized user to manually make a private preprint public.
     """

admin/registration_schemas/views.py

@@ -17,7 +17,7 @@ class RegistrationSchemaDetailView(FormView, PermissionRequiredMixin, TemplateVi
     Allows authorized users to view and edit some attributes of a Registration Schema.
     """
     template_name = 'registration_schemas/registration_schema.html'
-    permission_required = 'osf.view_registration_schema'
+    permission_required = 'osf.view_registrationschema'
     raise_exception = True
     form_class = RegistrationSchemaEditForm
 
@@ -143,7 +143,7 @@ class RegistrationSchemaListView(PermissionRequiredMixin, ListView):
     Allows authorized users to view all Registration Schema.
     """
     template_name = 'registration_schemas/registration_schema_list.html'
-    permission_required = 'osf.view_registration_schema'
+    permission_required = 'osf.view_registrationschema'
     raise_exception = True
 
     def get_queryset(self):

admin/share_reindex/urls.py

@@ -0,0 +1,9 @@
+from django.urls import re_path
+from . import views
+
+app_name = 'admin'
+
+urlpatterns = [
+    re_path(r'^$', views.FailedShareIndexedGuidList.as_view(), name='list'),
+    re_path(r'^(?P<resource_type>[^/]+)/$', views.FailedShareIndexedGuidReindex.as_view(), name='reindex-share-resource'),
+]