Merge branch 'feature/pbs-25-13' of https://github.com/CenterForOpenScience/osf.io into add-has-data-annotations-to-linked-nodes

* 'feature/pbs-25-13' of https://github.com/CenterForOpenScience/osf.io: (42 commits)
  [ENG-8462]  Institution setup fixes (CenterForOpenScience#11241)
  [ENG-8401] Earlier preprint versions download the current file (CenterForOpenScience#11245)
  added academiaInstitution in social-schema, fixed True value of 'ongoing', fixed/added tests (CenterForOpenScience#11239)
  [ENG-7979] Registrations pending moderation that have components also pending moderation do not display the children (CenterForOpenScience#11222)
  [ENG-8216] Fixed children deletion on a node page in admin (CenterForOpenScience#11237)
  [ENG-8401] Fixed preprint downloading (CenterForOpenScience#11238)
  fix categories for sendgrid emails (CenterForOpenScience#11236)
  [ENG-8936] API: Allow /v2/users/me/preprints list view to filter by tags (CenterForOpenScience#11232)
  Add collections scopes to FULL_READ and FULL_WRITE
  add brand relationship to collectionprovider
  [ENG-8224] Fixed force archive template with registration addons (CenterForOpenScience#11210)
  API: Allow /v2/users/me/preprints list view to filter by title
  [ENG-8325] Public column does not display the visibility status of child nodes on the Nodes page in the Admin App
  [ENG-8246] Fixed deletion of maintenance alerts in admin (CenterForOpenScience#11226)
  add exception handling to /review_actions/ endpoint
  Update chagnelog and bump version
  [ENG-6835] VRL Project PR - BE (CenterForOpenScience#11204)
  Bump version no. Add CHANGELOG
  move CROSSREF_UNAVAILABLE_DELAY to settings.py
  handle and 5xx status code from crossref
  ...

Author: Johnetordoff

.docker-compose.gv.env

@@ -9,8 +9,9 @@ POSTGRES_DB="gravyvalet"
 SECRET_KEY="secret"
 PYTHONUNBUFFERED=1 # This when set to 0 will allow print statements to be visible in the Docker logs
 OSF_AUTH_COOKIE_NAME=osf
+SESSION_COOKIE_SECURE=false
+SESSION_COOKIE_HTTPONLY=true
+SESSION_COOKIE_SAMESITE=Lax
 OSF_SENSITIVE_DATA_SECRET="TrainglesAre5Squares"
 OSF_SENSITIVE_DATA_SALT="yusaltydough"
 DEBUG=1
-
-

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

@@ -3,8 +3,13 @@ description: 'Generate test report from junit xml file'
 runs:
   using: "composite"
   steps:
+  - name: Archive code coverage results
+    uses: actions/upload-artifact@v4
+    with:
+      name: ${{github.job}} HTML REPORT
+      path: report.html
   - name: Generate Report
-    uses: dorny/test-reporter@v1
+    uses: dorny/test-reporter@v2
     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/workflows/test-build.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.cache
-        key: reqs_${{ hashFiles('**/pyproject.toml') }}
+        key: reqs_${{ hashFiles('poetry.lock') }}
         restore-keys: reqs
     - run: |
         mkdir -p ~/.cache/downloads
@@ -30,7 +30,7 @@ jobs:
         mkdir -p ~/.cache/testmon
         rm -rf node_modules  ## TODO remove this later
 
-  addons:
+  addons_and_admin:
     runs-on: ubuntu-22.04
     needs: build-cache
     permissions:
@@ -52,9 +52,9 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-ci-addons -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-addons --junit
     - name: Upload report
-      if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
+      if: (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
 
   website:
@@ -79,9 +79,9 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-ci-website -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-website --junit
     - name: Upload report
-      if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
+      if: (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
 
   api1_and_js:
@@ -108,9 +108,9 @@ jobs:
       - name: NVM & yarn install
         run: poetry run python3 -m invoke assets --dev
       - name: Run test
-        run: poetry run python3 -m invoke test-ci-api1-and-js -n 1 --junit
+        run: poetry run python3 -m invoke test-ci-api1-and-js --junit
       - name: Upload report
-        if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
+        if: (success() || failure())    # run this step even if previous step failed
         uses: ./.github/actions/gen-report
 
   api2:
@@ -135,9 +135,9 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-ci-api2 -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-api2 --junit
     - name: Upload report
-      if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
+      if: (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
 
   api3_and_osf:
@@ -163,7 +163,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-ci-api3-and-osf -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-api3-and-osf --junit
     - name: Upload report
-      if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
+      if: (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report

CHANGELOG

@@ -2,6 +2,35 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+25.12.0 (2025-07-08)
+====================
+
+- Verified Resource Linking project release - BE
+- OSF support for GV session optimization
+- OSF node log for add-ons
+- CI improvements
+- Task routing fixes
+
+
+25.11.1 (2025-07-03)
+====================
+
+- Hotfix to handle crossref's anticipated downtime
+
+25.11.0 (2025-06-30)
+====================
+
+- Crossref DOIs not minting with _v1, OSF is displaying DOI versions with _v1
+- When hamming a spammed user, preprints and registrations remain private
+- Fix emabrgoed registrations not becoming public after admin date change
+- Add v2 enpoint for alternative email confirmation
+- Make relationship on v2/nodes for collected_in
+- API V2: get action reviews request not listing latest preprint submit/withdraw requests
+- Add ability for admin app to change registry that a registration belongs to
+- Update to /nodes/<node-id> api
+- Subscription filtering not working correctly
+- API V2: Serialize registation resource attributes in Node Linked By Registrations list view and Node Linked Registrations list view
+
 25.10.0 (2025-06-11)
 ====================
 

addons/base/views.py

@@ -1006,13 +1006,17 @@ def persistent_file_download(auth, **kwargs):
     file = BaseFileNode.active.filter(_id=id_or_guid).first()
     if not file:
         guid = Guid.load(id_or_guid)
-        if guid:
-            file = guid.referent
-        else:
+        if not guid:
             raise HTTPError(http_status.HTTP_404_NOT_FOUND, data={
                 'message_short': 'File Not Found',
                 'message_long': 'The requested file could not be found.'
             })
+
+        file = guid.referent
+        if type(file) is Preprint:
+            referent, _ = Guid.load_referent(id_or_guid)
+            file = referent.primary_file
+
     if not file.is_file:
         raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={
             'message_long': 'Downloading folders is not permitted.'

admin/institutions/urls.py

@@ -9,6 +9,7 @@
     re_path(r'^import/$', views.ImportInstitution.as_view(), name='import'),
     re_path(r'^(?P<institution_id>[0-9]+)/$', views.InstitutionDetail.as_view(), name='detail'),
     re_path(r'^(?P<institution_id>[0-9]+)/export/$', views.InstitutionExport.as_view(), name='export'),
+    re_path(r'^(?P<institution_id>[0-9]+)/monthly_report/$', views.InstitutionMonthlyReporterDo.as_view(), name='monthly_report'),
     re_path(r'^(?P<institution_id>[0-9]+)/delete/$', views.DeleteInstitution.as_view(), name='delete'),
     re_path(r'^(?P<institution_id>[0-9]+)/deactivate/$', views.DeactivateInstitution.as_view(), name='deactivate'),
     re_path(r'^(?P<institution_id>[0-9]+)/reactivate/$', views.ReactivateInstitution.as_view(), name='reactivate'),

admin/institutions/views.py

@@ -1,4 +1,5 @@
 import json
+from dateutil.parser import isoparse
 
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -15,6 +16,9 @@
 from admin.base.forms import ImportFileForm
 from admin.institutions.forms import InstitutionForm, InstitutionalMetricsAdminRegisterForm
 from osf.models import Institution, Node, OSFUser
+from osf.metrics.utils import YearMonth
+from osf.metrics.reporters import AllMonthlyReporters
+from osf.management.commands.monthly_reporters_go import monthly_reporter_do
 
 
 class InstitutionList(PermissionRequiredMixin, ListView):
@@ -129,6 +133,38 @@ def get(self, request, *args, **kwargs):
         return response
 
 
+class InstitutionMonthlyReporterDo(PermissionRequiredMixin, View):
+    permission_required = 'osf.view_institution'
+    raise_exception = True
+
+    def post(self, request, *args, **kwargs):
+        institution_id = self.kwargs.get('institution_id')
+        try:
+            institution = Institution.objects.get_all_institutions().get(id=institution_id)
+        except Institution.DoesNotExist:
+            raise Http404(f"Institution with id {institution_id} is not found or deactivated.")
+
+        monthly_report_date = request.POST.get('monthly_report_date', None)
+        if monthly_report_date:
+            try:
+                monthly_report_date = isoparse(monthly_report_date).date()
+            except ValueError as exc:
+                messages.error(request, str(exc))
+                return redirect('institutions:detail', institution_id=institution.id)
+        else:
+            messages.error(request, 'Report date cannot be none.')
+            return redirect('institutions:detail', institution_id=institution.id)
+
+        monthly_reporter_do.apply_async(kwargs={
+            'yearmonth': str(YearMonth.from_date(monthly_report_date)),
+            'reporter_key': request.POST.get('monthly_reporter', None),
+            'report_kwargs': {'institution_pk': institution.id},
+        })
+
+        messages.success(request, 'Monthly reporter successfully went.')
+        return redirect('institutions:detail', institution_id=institution.id)
+
+
 class CreateInstitution(PermissionRequiredMixin, CreateView):
     permission_required = 'osf.change_institution'
     raise_exception = True
@@ -141,6 +177,18 @@ def get_context_data(self, *args, **kwargs):
         kwargs['import_form'] = ImportFileForm()
         return super().get_context_data(*args, **kwargs)
 
+    def form_valid(self, form):
+        response = super().form_valid(form)
+
+        # Make a report after Institution is created
+        monthly_reporter_do.apply_async(kwargs={
+            'yearmonth': str(YearMonth.from_date(self.object.created)),
+            'reporter_key': AllMonthlyReporters.INSTITUTIONAL_SUMMARY.name,
+            'report_kwargs': {'institution_pk': self.object.id},
+        })
+
+        return response
+
 
 class InstitutionNodeList(PermissionRequiredMixin, ListView):
     template_name = 'institutions/node_list.html'

admin/maintenance/views.py

@@ -6,6 +6,7 @@
 from admin.maintenance.forms import MaintenanceForm
 
 from django.shortcuts import redirect
+from django.urls import reverse_lazy
 from django.forms.models import model_to_dict
 from django.views.generic import DeleteView, TemplateView
 from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -15,11 +16,13 @@ class DeleteMaintenance(PermissionRequiredMixin, DeleteView):
     permission_required = 'osf.delete_maintenancestate'
     raise_exception = True
     template_name = 'maintenance/delete_maintenance.html'
+    success_url = reverse_lazy('maintenance:display')
 
     def get_object(self, queryset=None):
         return MaintenanceState.objects.first()
 
-    def delete(self, request, *args, **kwargs):
+    def post(self, request, *args, **kwargs):
+        super().post(request, *args, **kwargs)
         maintenance.unset_maintenance()
         return redirect('maintenance:display')
 

admin/management/views.py

@@ -130,6 +130,7 @@ def post(self, request, *args, **kwargs):
                 if report_date is not None
                 else ''
             ),
+            reporter_key=request.POST.get('monthly_reporter', '')
         )
 
         if errors:

admin/nodes/urls.py

@@ -45,4 +45,5 @@
     re_path(r'^(?P<guid>[a-z0-9]+)/remove_notifications/$', views.NodeRemoveNotificationView.as_view(), name='node-remove-notifications'),
     re_path(r'^(?P<guid>[a-z0-9]+)/update_moderation_state/$', views.NodeUpdateModerationStateView.as_view(), name='node-update-mod-state'),
     re_path(r'^(?P<guid>[a-z0-9]+)/resync_datacite/$', views.NodeResyncDataCiteView.as_view(), name='resync-datacite'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/revert/$', views.NodeRevertToDraft.as_view(), name='revert-to-draft'),
 ]