Merge pull request #11675 from Ostap-Zherebetskyi/feature/merge_develop

[ENG-10642] Merge latest `develop` into feature branch

Author: cslzchen

.gitignore

@@ -122,6 +122,7 @@ website/static/sitemaps/
 ##############
 
 api/static/vendor
+osf/features.override.yaml
 
 # Local settings files
 local.py

CHANGELOG

@@ -2,6 +2,27 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.6.3 (2026-04-02)
+===================
+
+- Readd reindex share button
+- Fix missing notification during email throttle check
+- Fix filter query in AbstractProviderSubscriptionList
+
+26.6.0 (2026-03-26)
+===================
+
+- Miscellaneous improvements and bug fixes
+
+26.5.1 (2026-03-25)
+===================
+
+- Post-NR hotfixes
+  - Rework notification history cleanup task
+  - Update merge subscription provider task
+  - Enable overriding features.yaml for local dev to use mailhog
+  - Remove deprecated routes, script and commands
+
 26.5.0 (2026-03-13)
 ===================
 

README-docker-compose.md

@@ -171,7 +171,7 @@
   - When starting with an empty database you will need to run migrations and populate preprint providers. See the [Running arbitrary commands](#running-arbitrary-commands) section below for instructions.
 6. Start the OSF Web, API Server, and Preprints (Detached)
     ```bash
-    docker compose up -d worker web api admin preprints ember_osf_web gv
+    docker compose up -d worker web api admin preprints gv
     ```
 7. View the OSF at [http://localhost:5000](http://localhost:5000).
 
@@ -181,7 +181,7 @@
 - Once the requirements have all been installed, you can start the OSF in the background with
 
   ```bash
-  docker compose up -d assets admin_assets mfr wb fakecas sharejs worker web api admin preprints ember_osf_web gv
+  docker compose up -d assets admin_assets mfr wb fakecas sharejs worker web api admin preprints gv
   ```
 
 - To view the logs for a given container:
@@ -270,20 +270,10 @@
       ```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`
 - OPTIONAL: Register OAuth Scopes
-  - Needed for things such as the ember-osf dummy app
-      ```bash
-      docker compose run --rm web python3 -m scripts.register_oauth_scopes
-      ```
+    ```bash
+    docker compose run --rm web python3 -m scripts.register_oauth_scopes
+    ```
 - OPTIONAL: Create migrations:
   - After changing a model you will need to create migrations and apply them. Migrations are python code that changes either the structure or the data of a database. This will compare the django models on disk to the database, find the differences, and create migration code to change the database. If there are no changes this command is a noop.
       ```bash
@@ -294,6 +284,11 @@
       ```bash
       docker compose run --rm web python3 manage.py reset_db --noinput
       ```
+- OPTIONAL: Create a `features.yaml` override
+  ```bash
+  cp osf/features.yaml osf/features.override.yaml
+  ```
+  Note: Update the WAFFLE_VALUES_YAML variable to point to the override file (osf/features.override.yaml).
 
 ## Application Debugging
 
@@ -506,4 +501,4 @@ wb:
 
 ### Running Collections
 
-To run collections, you must uncomment COLLECTIONS_ENABLED=true in docker-compose.yml under ember_osf_web, then recreate your ember and web containers.
+To run collections, you must uncomment COLLECTIONS_ENABLED=true in docker-compose.yml, then recreate web container.

addons/base/views.py

@@ -928,12 +928,12 @@ def addon_view_or_download_file(auth, path, provider, **kwargs):
         )
     )
 
-    # There's no download action redirect to the Ember front-end file view and create guid.
+    # There's no download action redirect to the front-end file view and create guid.
     if action != 'download':
-        if isinstance(target, Node) and flag_is_active(request, features.EMBER_FILE_PROJECT_DETAIL):
+        if isinstance(target, Node):
             guid = file_node.get_guid(create=True)
             return redirect(f'{settings.DOMAIN}{guid._id}/')
-        if isinstance(target, Registration) and flag_is_active(request, features.EMBER_FILE_REGISTRATION_DETAIL):
+        if isinstance(target, Registration):
             guid = file_node.get_guid(create=True)
             return redirect(f'{settings.DOMAIN}{guid._id}/')
 

addons/osfstorage/tests/test_views.py

@@ -36,7 +36,6 @@
 
 from osf_tests.factories import ProjectFactory, ApiOAuth2PersonalTokenFactory, PreprintFactory
 from website.files.utils import attach_versions
-from website.settings import EXTERNAL_EMBER_APPS
 from api_tests.draft_nodes.views.test_draft_node_files_lists import prepare_mock_wb_response
 
 
@@ -1413,28 +1412,17 @@ def test_file_view_updates_history(self):
                 {'name': 'testpath', 'path': '/testpath', 'materialized': '/testpath', 'kind': 'file'},
             ]
         )
-        with override_flag(features.EMBER_FILE_PROJECT_DETAIL, active=True):
-            url = self.node.web_url_for('addon_view_or_download_file', path='testpath', provider='github')
-            self.app.get(url, auth=self.user.auth)
-            file = GithubFile.objects.get(_path='/testpath', provider='github')
-            assert file.history
-
-    @mock.patch('website.views.stream_emberapp')
-    def test_file_views(self, mock_ember):
-        with override_flag(features.EMBER_FILE_PROJECT_DETAIL, active=True):
-            file = create_test_file(target=self.node, user=self.user)
-            url = self.node.web_url_for('addon_view_or_download_file', path=file._id, provider=file.provider)
-            res = self.app.get(url, auth=self.user.auth)
-            assert res.status_code == 302
-            assert res.headers['Location'] == f'{settings.DOMAIN}{file.get_guid()._id}/'
-            assert not mock_ember.called
-            res = self.app.get(url, auth=self.user.auth, follow_redirects=True)
-            assert res.status_code == 200
-            assert mock_ember.called
-            args, kwargs = mock_ember.call_args
-
-            assert args[0] == EXTERNAL_EMBER_APPS['ember_osf_web']['server']
-            assert args[1] == EXTERNAL_EMBER_APPS['ember_osf_web']['path'].rstrip('/')
+        url = self.node.web_url_for('addon_view_or_download_file', path='testpath', provider='github')
+        self.app.get(url, auth=self.user.auth)
+        file = GithubFile.objects.get(_path='/testpath', provider='github')
+        assert file.history
+
+    def test_file_views(self):
+        file = create_test_file(target=self.node, user=self.user)
+        url = self.node.web_url_for('addon_view_or_download_file', path=file._id, provider=file.provider)
+        res = self.app.get(url, auth=self.user.auth)
+        assert res.status_code == 302
+        assert res.headers['Location'] == f'{settings.DOMAIN}{file.get_guid()._id}/'
 
     def test_download_file(self):
         file = create_test_file(target=self.node, user=self.user)

addons/wiki/routes.py

@@ -3,88 +3,18 @@
 """
 
 from framework.routing import Rule, json_renderer
-from website.routes import OsfWebRenderer
 
 from . import views
 
-TEMPLATE_DIR = './addons/wiki/templates/'
-
 settings_routes = {
     'rules': [],
     'prefix': '/api/v1',
 }
 
 # NOTE: <wname> refers to a wiki page's key, e.g. 'Home'
+# All HTML-rendered wiki routes have been removed; only API routes remain.
 page_routes = {
-
-    'rules': [
-
-        # Home (Base) | GET
-        Rule(
-            [
-                '/project/<pid>/wiki/',
-                '/project/<pid>/node/<nid>/wiki/',
-            ],
-            'get',
-            views.project_wiki_home,
-            OsfWebRenderer('edit.mako', trust=False, template_dir=TEMPLATE_DIR)
-        ),
-
-        # View (ID) | GET
-        Rule(
-            [
-                '/project/<pid>/wiki/id/<wid>/',
-                '/project/<pid>/node/<nid>/wiki/id/<wid>/',
-            ],
-            'get',
-            views.project_wiki_id_page,
-            OsfWebRenderer('edit.mako', trust=False, template_dir=TEMPLATE_DIR)
-        ),
-
-        # Wiki | GET
-        Rule(
-            [
-                '/project/<pid>/wiki/<wname>/',
-                '/project/<pid>/node/<nid>/wiki/<wname>/',
-            ],
-            'get',
-            views.project_wiki_view,
-            OsfWebRenderer('edit.mako', trust=False, template_dir=TEMPLATE_DIR)
-        ),
-
-        # Edit | GET (legacy url, trigger redirect)
-        Rule(
-            [
-                '/project/<pid>/wiki/<wname>/edit/',
-                '/project/<pid>/node/<nid>/wiki/<wname>/edit/',
-            ],
-            'get',
-            views.project_wiki_edit,
-            OsfWebRenderer('edit.mako', trust=False, template_dir=TEMPLATE_DIR)
-        ),
-
-        # Compare | GET (legacy url, trigger redirect)
-        Rule(
-            [
-                '/project/<pid>/wiki/<wname>/compare/<int:wver>/',
-                '/project/<pid>/node/<nid>/wiki/<wname>/compare/<int:wver>/',
-            ],
-            'get',
-            views.project_wiki_compare,
-            OsfWebRenderer('edit.mako', trust=False, template_dir=TEMPLATE_DIR)
-        ),
-
-        # Edit | POST
-        Rule(
-            [
-                '/project/<pid>/wiki/<wname>/',
-                '/project/<pid>/node/<nid>/wiki/<wname>/',
-            ],
-            'post',
-            views.project_wiki_edit_post,
-            OsfWebRenderer('edit.mako', trust=False, template_dir=TEMPLATE_DIR)
-        ),
-    ]
+    'rules': [],
 }
 
 api_routes = {