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

Author: adlius

.github/workflows/test-build.yml

@@ -201,3 +201,31 @@ jobs:
     - name: Upload report
       if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
+
+  scripts:
+    runs-on: ubuntu-22.04
+    permissions:
+      checks: write
+    needs: build-cache
+    services:
+      postgres:
+        image: postgres
+
+        env:
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/start-build
+    - name: Run tests
+      run: poetry run python3 -m invoke test-ci-scripts -n 1 --junit
+    - name: Upload report
+      if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
+      uses: ./.github/actions/gen-report

CHANGELOG

@@ -2,6 +2,41 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.1.4 (2026-01-06)
+===================
+
+- Follow-up fix for preprint/registration withdrawal request
+- Added a script/task to populate default notification subscriptions that were missing before and after NR
+- Reworked PR template
+
+26.1.3 (2026-01-05)
+===================
+
+- Increase NR migration timeout and batch size
+
+26.1.2 (2026-01-05)
+===================
+
+- Notifications Refactor Phase 2 - UAT Hotfix Part 2
+  * Fix adding moderator email in admin
+  * Fix preprint/registration withdrawal request email in digest
+  * Fix subjects for schema response update emails
+  * Update defauls for triggered emails
+
+26.1.1 (2026-01-02)
+===================
+
+- Notifications Refactor Phase 2 - UAT Hotfix Part 1
+  * Fix reset password url
+  * Fix logout query for new user confirmation url
+  * Fix new user default notification subscription
+  * Clean-up / Sync settings
+
+26.1.0 (2026-01-01)
+===================
+
+- Notifications Refactor Phase 2 Project Release
+
 25.18.2 (2025-12-19)
 ====================
 

PULL_REQUEST_TEMPLATE.md

@@ -1,39 +1,55 @@
-<!-- Before submit your Pull Request, make sure you picked
-     the right branch:
+[//]: # (
+    * Before submitting your Pull Request, make sure you've picked the right branch and your code is up-to-date with it.
+        * For critical hotfixes, select "master" as the target branch.
+        * For bugfixes, improvements and new features, select "develop" as the target branch.
+        * If your PR is part of a project/team, select project/team's dedicated feature branch as the target.
+    * If you have a JIRA ticket, prefix the ticket number [ENG-*****] to the PR title.
+)
 
-     - For hotfixes, select "master" as the target branch
-     - For new features, select "develop" as the target branch
-     - For release feature fixes, select the relevant release branch (release/X.Y.Z) as the target branch -->
+## Ticket
+
+[//]: # (Link to a JIRA ticket if available.)
+
+* [ENG-*****]()
 
 ## Purpose
 
-<!-- Describe the purpose of your changes -->
+[//]: # (Briefly describe the purpose of this PR.)
 
 ## Changes
 
-<!-- Briefly describe or list your changes  -->
+[//]: # (Briefly describe or list your changes.)
 
-## QA Notes
+## Side Effects
 
+[//]: # (Any possible side effects?)
 
-<!-- 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?
--->
+## QE Notes
 
-## Documentation
+[//]: # (
+    * Any QA testing notes for QE?
+        * Make verification statements inspired by your code and what your code touches.
+        * What are the areas of risk?
+        * Any concerns/considerations/questions that development raised?
+    * If you have a JIRA ticket, make sure the ticket also contains the QE notes.
+)
 
-<!-- Does any internal or external documentation need to be updated?
-     - If the API was versioned, update the developer.osf.io changelog.
-     - If changes were made to the API, link the developer.osf.io PR here.
--->
+## CE Notes
 
-## Side Effects
-
-<!-- Any possible side effects? -->
+[//]: # (
+    * Any server configuration and deployment notes for CE?
+        * Is model migration required? Is data migration/backfill/population required?
+            * If so, is it reversible? Is there a roll-back plan?
+        * Does server settings needs to be updated?
+            * If so, have you checked with CE on existing settings for affected servers?
+        * Are there any deployment dependencies to other services?
+    * If you have a JIRA ticket, make sure the ticket also contains the CE notes.
+)
 
-## Ticket
+## Documentation
 
-<!-- Link to Jira ticket, if applicable e.g. https://openscience.atlassian.net/browse/OSF-1234 -->
+[//]: # (
+    * Does any internal or external documentation need to be updated?
+        * If the API was versioned, update the developer.osf.io changelog.
+        * If changes were made to the API, link the developer.osf.io PR here.
+)

README-docker-compose.md

@@ -270,6 +270,12 @@
       ```bash
       docker compose run --rm web python3 -m scripts.parse_citation_styles
       ```
+- Populate Notification Types
+  - Needed for notifications.
+      ```bash
+      docker compose run --rm web python3 manage.py populate_notification_types
+      ```
+  - _NOTE: The waffle switch `POPULATE_NOTIFICATION_TYPES` needs to be turned on.
 - Start ember_osf_web
   - Needed for ember app:
     - `docker-compose up -d ember_osf_web`

addons/base/views.py

@@ -34,7 +34,6 @@
 from framework.flask import redirect
 from framework.sentry import log_exception
 from framework.transactions.handlers import no_auto_transaction
-from website import mails
 from website import settings
 from addons.base import signals as file_signals
 from addons.base.utils import format_last_known_metadata, get_mfr_url
@@ -52,7 +51,7 @@
     DraftRegistration,
     Guid,
     FileVersionUserMetadata,
-    FileVersion
+    FileVersion, NotificationType
 )
 from osf.metrics import PreprintView, PreprintDownload
 from osf.utils import permissions
@@ -64,7 +63,7 @@
 from website.util import rubeus
 
 # import so that associated listener is instantiated and gets emails
-from website.notifications.events.files import FileEvent  # noqa
+from notifications.file_event_notifications import FileEvent  # noqa
 
 ERROR_MESSAGES = {'FILE_GONE': """
 <style>
@@ -226,8 +225,6 @@ def get_auth(auth, **kwargs):
     _check_resource_permissions(resource, auth, action)
 
     provider_name = waterbutler_data['provider']
-    waterbutler_settings = None
-    waterbutler_credentials = None
     file_version = file_node = None
     if provider_name == 'osfstorage' or (not flag_is_active(request, features.ENABLE_GV)):
         file_version, file_node = _get_osfstorage_file_version_and_node(
@@ -576,20 +573,32 @@ def create_waterbutler_log(payload, **kwargs):
                     params=payload
                 )
 
-            if payload.get('email') is True or payload.get('errors'):
-                mails.send_mail(
-                    user.username,
-                    mails.FILE_OPERATION_FAILED if payload.get('errors')
-                    else mails.FILE_OPERATION_SUCCESS,
-                    action=payload['action'],
-                    source_node=source_node,
-                    destination_node=destination_node,
-                    source_path=payload['source']['materialized'],
-                    source_addon=payload['source']['addon'],
-                    destination_addon=payload['destination']['addon'],
-                    osf_support_email=settings.OSF_SUPPORT_EMAIL
+            if payload.get('email') or payload.get('errors'):
+                if payload.get('email'):
+                    notification_type = NotificationType.Type.USER_FILE_OPERATION_SUCCESS.instance
+                if payload.get('errors'):
+                    notification_type = NotificationType.Type.USER_FILE_OPERATION_FAILED.instance
+                notification_type.emit(
+                    user=user,
+                    subscribed_object=node,
+                    event_context={
+                        'user_fullname': user.fullname,
+                        'action': payload['action'],
+                        'source_node': source_node._id,
+                        'source_node_title': source_node.title,
+                        'destination_node': destination_node._id,
+                        'destination_node_title': destination_node.title,
+                        'destination_node_parent_node_title': destination_node.parent_node.title if destination_node.parent_node else None,
+                        'source_path': payload['source']['materialized'],
+                        'source_addon': payload['source']['addon'],
+                        'destination_addon': payload['destination']['addon'],
+                        'osf_support_email': settings.OSF_SUPPORT_EMAIL,
+                        'logo': settings.OSF_LOGO,
+                        'OSF_LOGO_LIST': settings.OSF_LOGO_LIST,
+                        'OSF_LOGO': settings.OSF_LOGO,
+                        'domain': settings.DOMAIN,
+                    }
                 )
-
             if payload.get('errors'):
                 # Action failed but our function succeeded
                 # Bail out to avoid file_signals
@@ -603,10 +612,8 @@ def create_waterbutler_log(payload, **kwargs):
     target_node = AbstractNode.load(metadata.get('nid'))
     if target_node and payload['action'] != 'download_file':
         update_storage_usage_with_size(payload)
-
     with transaction.atomic():
         file_signals.file_updated.send(target=node, user=user, event_type=action, payload=payload)
-
     return {'status': 'success'}
 
 

addons/boa/tasks.py

@@ -14,10 +14,9 @@
 from addons.boa.boa_error_code import BoaErrorCode
 from framework import sentry
 from framework.celery_tasks import app as celery_app
-from osf.models import OSFUser
+from osf.models import OSFUser, NotificationType
 from osf.utils.fields import ensure_str, ensure_bytes
 from website import settings as osf_settings
-from website.mails import send_mail, ADDONS_BOA_JOB_COMPLETE, ADDONS_BOA_JOB_FAILURE
 
 logger = logging.getLogger(__name__)
 
@@ -184,18 +183,19 @@ async def submit_to_boa_async(host, username, password, user_guid, project_guid,
 
     logger.info('Successfully uploaded query output to OSF.')
     logger.debug('Task ends <<<<<<<<')
-    await sync_to_async(send_mail)(
-        to_addr=user.username,
-        mail=ADDONS_BOA_JOB_COMPLETE,
-        fullname=user.fullname,
-        query_file_name=query_file_name,
-        query_file_full_path=file_full_path,
-        output_file_name=output_file_name,
-        job_id=boa_job.id,
-        project_url=project_url,
-        boa_job_list_url=boa_settings.BOA_JOB_LIST_URL,
-        boa_support_email=boa_settings.BOA_SUPPORT_EMAIL,
-        osf_support_email=osf_settings.OSF_SUPPORT_EMAIL,
+    NotificationType.Type.ADDONS_BOA_JOB_COMPLETE.instance.emit(
+        user=user,
+        event_context={
+            'user_fullname': user.fullname,
+            'query_file_name': query_file_name,
+            'query_file_full_path': file_full_path,
+            'output_file_name': output_file_name,
+            'job_id': boa_job.id,
+            'project_url': project_url,
+            'boa_job_list_url': boa_settings.BOA_JOB_LIST_URL,
+            'boa_support_email': boa_settings.BOA_SUPPORT_EMAIL,
+            'osf_support_email': osf_settings.OSF_SUPPORT_EMAIL,
+        }
     )
     return BoaErrorCode.NO_ERROR
 
@@ -209,22 +209,24 @@ def handle_boa_error(message, code, username, fullname, project_url, query_file_
         sentry.log_message(message, skip_session=True)
     except Exception:
         pass
-    send_mail(
-        to_addr=username,
-        mail=ADDONS_BOA_JOB_FAILURE,
-        fullname=fullname,
-        code=code,
-        message=message,
-        query_file_name=query_file_name,
-        file_size=file_size,
-        max_file_size=boa_settings.MAX_SUBMISSION_SIZE,
-        query_file_full_path=query_file_full_path,
-        output_file_name=output_file_name,
-        job_id=job_id,
-        max_job_wait_hours=boa_settings.MAX_JOB_WAITING_TIME / 3600,
-        project_url=project_url,
-        boa_job_list_url=boa_settings.BOA_JOB_LIST_URL,
-        boa_support_email=boa_settings.BOA_SUPPORT_EMAIL,
-        osf_support_email=osf_settings.OSF_SUPPORT_EMAIL,
+    NotificationType.Type.ADDONS_BOA_JOB_FAILURE.instance.emit(
+        destination_address=username,
+        event_context={
+            'user_fullname': fullname,
+            'code': code,
+            'query_file_name': query_file_name,
+            'file_size': file_size,
+            'message': message,
+            'max_file_size': boa_settings.MAX_SUBMISSION_SIZE,
+            'query_file_full_path': query_file_full_path,
+            'output_file_name': output_file_name,
+            'job_id': job_id,
+            'max_job_wait_hours': boa_settings.MAX_JOB_WAITING_TIME / 3600,
+            'project_url': project_url,
+            'boa_job_list_url': boa_settings.BOA_JOB_LIST_URL,
+            'boa_support_email': boa_settings.BOA_SUPPORT_EMAIL,
+            'osf_support_email': osf_settings.OSF_SUPPORT_EMAIL,
+
+        }
     )
     return code