Merge pull request #11734 from ihorsokhanexoft/es2-develop-merge-conflicts

Es2-develop merge conflicts

Author: adlius

.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,36 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.9.0 (2026-05-07)
+===================
+
+- OSF4I In-progress SSO Project - BE Piece
+
+26.8.2 (2026-05-06)
+===================
+
+- Hotfix to avoid 502 on creating preprint version from rejected version
+
+26.8.1 (2026-04-30)
+===================
+
+- Hotfix for registrations sometimes fail to become public after approval
+
+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)
+===================
+
+- ORCiD Integration Project - BE Part
+
 26.6.3 (2026-04-02)
 ===================
 

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/institutions/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from osf.models import Institution
+from osf.models.institution import Institution, SSOAvailability
 
 
 class InstitutionForm(forms.ModelForm):
@@ -10,6 +10,25 @@ class Meta:
             'is_deleted', 'contributors', 'storage_regions',
         ]
 
+    def clean(self):
+        super().clean()
+
+        if hasattr(self, 'cleaned_data') and self.changed_data:
+            if not self.cleaned_data['delegation_protocol']:
+                if self.cleaned_data['sso_availability'] != SSOAvailability.UNAVAILABLE.value:
+                    self.add_error(None, 'SSO availability must be set to "Unavailable" when no delegation protocol is configured.')
+
+            elif self.cleaned_data['deactivated']:
+                if self.cleaned_data['sso_availability'] != SSOAvailability.HIDDEN.value:
+                    self.add_error(None, 'SSO availability must be set to "Hidden" when the institution is deactivated.')
+
+            else:
+                if self.cleaned_data['sso_availability'] not in [
+                    SSOAvailability.PUBLIC.value,
+                    SSOAvailability.HIDDEN.value
+                ]:
+                    self.add_error(None, 'SSO availability must be set to "Public" or "Hidden" when delegation protocol is configured.')
+
 
 class InstitutionalMetricsAdminRegisterForm(forms.Form):
     """ A form that finds an existing OSF User, and grants permissions to that

admin/institutions/views.py

@@ -56,6 +56,7 @@ def get_context_data(self, *args, **kwargs):
         institution_dict = model_to_dict(institution)
         kwargs.setdefault('page_number', self.request.GET.get('page', '1'))
         kwargs['institution'] = institution_dict
+        kwargs['cas_login_url'] = institution.cas_login_url
         kwargs['logo_path'] = institution.logo_path
         kwargs['banner_path'] = institution.banner_path
         fields = institution_dict
@@ -117,6 +118,17 @@ def get_context_data(self, *args, **kwargs):
     def get_success_url(self, *args, **kwargs):
         return reverse_lazy('institutions:detail', kwargs={'institution_id': self.kwargs.get('institution_id')})
 
+    def post(self, request, *args, **kwargs):
+        # Override `post` method in `django.views.generic.edit.ProcessFormView` due to custom behavior
+        self.object = self.get_object()
+        form = self.get_form()
+        if form.is_valid():
+            return self.form_valid(form)
+        else:
+            for error in form.non_field_errors():
+                messages.error(request, error)
+            return redirect('institutions:detail', institution_id=self.kwargs.get('institution_id'))
+
 
 class InstitutionExport(PermissionRequiredMixin, View):
     permission_required = 'osf.view_institution'

admin/management/urls.py

@@ -19,5 +19,7 @@
     re_path(r'^empty_metadata_dataarchive_registration_bulk_resync', views.EmptyMetadataDataarchiveRegistrationBulkResync.as_view(),
             name='empty-metadata-dataarchive-registration-bulk-resync'),
     re_path(r'^sync_notification_templates', views.SyncNotificationTemplates.as_view(),
-            name='sync_notification_templates')
+            name='sync_notification_templates'),
+    re_path(r'^remove_orcid_from_user_social', views.RemoveOrcidFromUserSocial.as_view(),
+            name='remove_orcid_from_user_social')
 ]

admin/management/views.py

@@ -12,6 +12,7 @@
 from osf.management.commands.fetch_cedar_metadata_templates import ingest_cedar_metadata_templates
 from osf.management.commands.sync_doi_metadata import sync_doi_metadata, sync_doi_empty_metadata_dataarchive_registrations
 from osf.management.commands.populate_notification_types import populate_notification_types
+from osf.management.commands.remove_orcid_from_user_social import remove_orcid_from_user_social
 from scripts.find_spammy_content import manage_spammy_content
 from django.urls import reverse
 from django.shortcuts import redirect
@@ -181,3 +182,11 @@ def post(self, request):
         populate_notification_types()
         messages.success(request, 'Notification templates have been successfully synced.')
         return redirect(reverse('management:commands'))
+
+
+class RemoveOrcidFromUserSocial(ManagementCommandPermissionView):
+
+    def post(self, request):
+        remove_orcid_from_user_social()
+        messages.success(request, 'Orcid from user social have been successfully removed.')
+        return redirect(reverse('management:commands'))

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'),
+
 ]