Merge branch 'inveniosoftware:master' into add_i18n_to_pages

Author: wgresshoff

CHANGES.rst

@@ -10,6 +10,33 @@
 Changes
 =======
 
+Version v13.0.0b2.dev5 (released 2025-03-11)
+
+- dashboard: use always view button to redirect user to the upload
+    - If upload is published redirect user to published record
+    - If upload is draft redirect user to upload or preview depending on their permission
+- deposit: use permissions.can_manage for record community management
+- dashboard: split mine and shared with me uploads
+
+Version v13.0.0b2.dev4 (released 2025-03-10)
+
+- views: FAIR signposting level 1 support (config flag)
+- tasks: skip health checks for files that don't have a uri
+- views: signposting: files: fix filename encoding issues for downloads
+
+Version v13.0.0b2.dev3 (released 2025-02-21)
+
+- views: FAIR signposting level 1 support
+- meta: FAIR signposting level 1 support (link rel item)
+- globals: site.overrides: Increase pdf preview iframe height
+- tests: fix mock module paths
+- tests: add __init__.py in all directories
+    * This is necessary for pytest v8.x to be able to detect all unique
+      tests.
+
+- tests: filter out excessive warnings
+- fix: flask changed to TRUSTED_HOSTS
+
 Version v13.0.0b2.dev2 (released 2025-02-13)
 
 - Bump prerelease dependencies to stable.

invenio_app_rdm/__init__.py

@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
 
-__version__ = "13.0.0b2.dev2"
+__version__ = "13.0.0b2.dev5"
 
 __all__ = ("__version__",)

invenio_app_rdm/config.py

@@ -964,6 +964,8 @@ def github_link_render(record):
 
 APP_RDM_RECORD_LANDING_PAGE_TEMPLATE = "invenio_app_rdm/records/detail.html"
 
+APP_RDM_RECORD_LANDING_PAGE_FAIR_SIGNPOSTING_LEVEL_1_ENABLED = False
+
 APP_RDM_RECORD_THUMBNAIL_SIZES = [10, 50, 100, 250, 750, 1200]
 """Allowed record thumbnail sizes."""
 

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/detail.html

@@ -25,11 +25,11 @@
 {%- set title = record.metadata.title %}
 {%- set metadata = record.metadata %}
 
-{%- set can_manage_record = permissions is defined and (permissions.can_edit or permissions.can_review) %}
+{%- set can_curate_record = permissions is defined and (permissions.can_edit or permissions.can_review) %}
 
 <!-- preview_submission_request is set to true when coming from a community submission request -->
 {%- set is_preview_submission_request = preview_submission_request or false %}
-{%- set show_record_management_menu = can_manage_record and (not is_preview or is_preview_submission_request) %}
+{%- set show_record_management_menu = can_curate_record and (not is_preview or is_preview_submission_request) %}
 
 {%- if record.parent.access.settings %}
   {%- set allow_user_requests = not current_user.is_anonymous and record.parent.access.settings.allow_user_requests %}
@@ -175,7 +175,7 @@
 
               {%- block record_header_button -%}
 
-                {% if is_preview and not is_preview_submission_request and can_manage_record and is_draft %}
+                {% if is_preview and not is_preview_submission_request and can_curate_record and is_draft %}
                   <nav class="back-navigation rel-pb-2 pl-0"
                        aria-label="{{ _('Back-navigation') }}">
                     {%- set back_page = url_for('invenio_app_rdm_records.deposit_edit', pid_value=record.id) -%}

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/meta.html

@@ -1,5 +1,5 @@
 {#
-Copyright (C) 2020-2024 CERN.
+Copyright (C) 2020-2025 CERN.
 Copyright (C) 2020 Northwestern University.
 Copyright (C) 2021 New York University.
 Copyright (C) 2023 Front Matter.
@@ -28,6 +28,8 @@
       <meta name="citation_pdf_url" content="{{ file_url }}"/>
     {%- endif %}
     <link rel="alternate" type="{{ file.mimetype }}" href="{{ file_url }}">
+    {#- See https://signposting.org/FAIR/ #}
+    <link rel="item" type="{{ file.mimetype }}" href="{{ file_url }}">
   {%- endfor %}
 {% endif %}
 

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/communities.html

@@ -4,7 +4,6 @@
   data-record-community-endpoint="{{ record.links.communities }}"
   data-record-community-search-endpoint="{{ record.links['communities-suggestions'] }}"
   data-record-user-community-search-endpoint="{{ record.links['user-communities-suggestions'] }}"
-  data-can-manage-record='{{ can_manage_record |tojson }}'
   data-pending-communities-search-config='{{ search_app_rdm_record_requests_config(app_id="InvenioAppRdm.RecordRequests", endpoint=record.links.requests) | tojson }}'
   data-record-community-search-config='{{ search_app_rdm_record_communities_config(app_id="InvenioAppRdm.RecordCommunitiesSuggestions", endpoint=record.links["communities-suggestions"]) | tojson }}'
   data-record-user-community-search-config='{{ search_app_rdm_record_user_communities_config(app_id="InvenioAppRdm.RecordUserCommunitiesSuggestions", endpoint=record.links["communities-suggestions"]) | tojson }}'

invenio_app_rdm/records_ui/views/decorators.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2021 Northwestern University.
 # Copyright (C)      2021 TU Wien.
 #
@@ -11,14 +11,17 @@
 
 from functools import wraps
 
-from flask import g, make_response, redirect, request, session, url_for
+from flask import current_app, g, make_response, redirect, request, session, url_for
 from flask_login import login_required
 from invenio_communities.communities.resources.serializer import (
     UICommunityJSONSerializer,
 )
 from invenio_communities.proxies import current_communities
 from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_rdm_records.proxies import current_rdm_records
+from invenio_rdm_records.resources.serializers.signposting import (
+    FAIRSignpostingProfileLvl1Serializer,
+)
 from invenio_records_resources.services.errors import PermissionDeniedError
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -365,20 +368,100 @@ def view(**kwargs):
     return view
 
 
-def add_signposting(f):
-    """Add signposting link to view's response headers."""
+def _get_header(rel, value, link_type=None):
+    header = f'<{value}> ; rel="{rel}"'
+    if link_type:
+        header += f' ; type="{link_type}"'
+    return header
+
+
+def _get_signposting_collection(pid_value):
+    ui_url = record_url_for(pid_value=pid_value)
+    return _get_header("collection", ui_url, "text/html")
+
+
+def _get_signposting_describes(pid_value):
+    ui_url = record_url_for(pid_value=pid_value)
+    return _get_header("describes", ui_url, "text/html")
+
+
+def _get_signposting_linkset(pid_value):
+    api_url = record_url_for(_app="api", pid_value=pid_value)
+    return _get_header("linkset", api_url, "application/linkset+json")
+
+
+def add_signposting_landing_page(f):
+    """Add signposting links to the landing page view's response headers."""
+
+    @wraps(f)
+    def view(*args, **kwargs):
+        response = make_response(f(*args, **kwargs))
+
+        # Relies on other decorators having operated before it
+        if current_app.config[
+            "APP_RDM_RECORD_LANDING_PAGE_FAIR_SIGNPOSTING_LEVEL_1_ENABLED"
+        ]:
+            record = kwargs["record"]
+
+            signposting_headers = (
+                FAIRSignpostingProfileLvl1Serializer().serialize_object(
+                    record.to_dict()
+                )
+            )
+
+            response.headers["Link"] = signposting_headers
+        else:
+            pid_value = kwargs["pid_value"]
+            signposting_link = record_url_for(_app="api", pid_value=pid_value)
+
+            response.headers["Link"] = (
+                f'<{signposting_link}> ; rel="linkset" ; type="application/linkset+json"'  # fmt: skip
+            )
+
+        return response
+
+    return view
+
+
+def add_signposting_content_resources(f):
+    """Add signposting links to the content resources view's response headers."""
 
     @wraps(f)
     def view(*args, **kwargs):
         response = make_response(f(*args, **kwargs))
 
         # Relies on other decorators having operated before it
         pid_value = kwargs["pid_value"]
-        signposting_link = record_url_for(_app="api", pid_value=pid_value)
 
-        response.headers["Link"] = (
-            f'<{signposting_link}> ; rel="linkset" ; type="application/linkset+json"'  # fmt: skip
-        )
+        signposting_headers = [
+            _get_signposting_collection(pid_value),
+            _get_signposting_linkset(pid_value),
+        ]
+
+        response.headers["Link"] = " , ".join(signposting_headers)
+
+        return response
+
+    return view
+
+
+def add_signposting_metadata_resources(f):
+    """Add signposting links to the metadata resources view's response headers."""
+
+    @wraps(f)
+    def view(*args, **kwargs):
+        response = make_response(f(*args, **kwargs))
+
+        # Relies on other decorators having operated before it
+        pid_value = kwargs["pid_value"]
+
+        signposting_headers = [
+            _get_signposting_describes(pid_value),
+            _get_signposting_linkset(pid_value),
+        ]
+
+        response.headers["Link"] = " , ".join(signposting_headers)
+
         return response
 
     return view

invenio_app_rdm/records_ui/views/deposits.py

@@ -444,6 +444,7 @@ def deposit_create(community=None):
         .get("doi", {})
         .get("required")
     )
+
     return render_community_theme_template(
         current_app.config["APP_RDM_DEPOSIT_FORM_TEMPLATE"],
         theme=community_theme,
@@ -483,7 +484,12 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
     can_edit_draft = service.check_permission(
         g.identity, "update_draft", record=draft._record
     )
+    can_preview_draft = service.check_permission(
+        g.identity, "preview", record=draft._record
+    )
     if not can_edit_draft:
+        if can_preview_draft:
+            return redirect(draft["links"]["preview_html"])
         raise PermissionDeniedError()
 
     files_dict = None if draft_files is None else draft_files.to_dict()

invenio_app_rdm/records_ui/views/records.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2021 Northwestern University.
 # Copyright (C) 2021-2023 TU Wien.
 #
@@ -39,7 +39,9 @@
 
 from ..utils import get_external_resources
 from .decorators import (
-    add_signposting,
+    add_signposting_content_resources,
+    add_signposting_landing_page,
+    add_signposting_metadata_resources,
     pass_file_item,
     pass_file_metadata,
     pass_include_deleted,
@@ -141,7 +143,7 @@ def open(self):
 @pass_record_or_draft(expand=True)
 @pass_record_files
 @pass_record_media_files
-@add_signposting
+@add_signposting_landing_page
 def record_detail(
     pid_value, record, files, media_files, is_preview=False, include_deleted=False
 ):
@@ -263,6 +265,7 @@ def record_detail(
 
 @pass_is_preview
 @pass_record_or_draft(expand=False)
+@add_signposting_metadata_resources
 def record_export(
     pid_value, record, export_format=None, permissions=None, is_preview=False
 ):
@@ -325,7 +328,7 @@ def record_file_preview(
 
 @pass_is_preview
 @pass_file_item(is_media=False)
-@add_signposting
+@add_signposting_content_resources
 def record_file_download(pid_value, file_item=None, is_preview=False, **kwargs):
     """Download a file from a record."""
     download = bool(request.args.get("download"))

invenio_app_rdm/tasks.py

@@ -18,7 +18,10 @@
 def file_integrity_report():
     """Send a report of uhealthy/missing files to system admins."""
     # First retry verifying files that errored during their last check
-    files = FileInstance.query.filter(FileInstance.last_check.is_(None))
+    files = FileInstance.query.filter(
+        FileInstance.last_check.is_(None),
+        FileInstance.uri.is_not(None),
+    )
     for f in files:
         try:
             f.clear_last_check()
@@ -32,7 +35,8 @@ def file_integrity_report():
         FileInstance.query.filter(
             sa.or_(
                 FileInstance.last_check.is_(None), FileInstance.last_check.is_(False)
-            )
+            ),
+            FileInstance.uri.is_not(None),
         )
         .order_by(FileInstance.created.desc())
         .all()

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/components/CompareRevisionsDropdown.js

@@ -1,6 +1,7 @@
 /*
  * // This file is part of Invenio-App-Rdm
  * // Copyright (C) 2025 CERN.
+ * // Copyright (C) 2025 Graz University of Technology.
  * //
  * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
  * // under the terms of the MIT License; see LICENSE file for more details.
@@ -81,3 +82,8 @@ CompareRevisionsDropdown.propTypes = {
   srcRevision: PropTypes.object,
   targetRevision: PropTypes.object,
 };
+
+CompareRevisionsDropdown.defaultProps = {
+  srcRevision: 0,
+  targetRevision: 0,
+};

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/components/RevisionsDiffViewer.js

@@ -1,6 +1,7 @@
 /*
  * // This file is part of Invenio-App-Rdm
  * // Copyright (C) 2025 CERN.
+ * // Copyright (C) 2025 Graz University of Technology.
  * //
  * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
  * // under the terms of the MIT License; see LICENSE file for more details.
@@ -75,3 +76,7 @@ RevisionsDiffViewer.propTypes = {
   diff: PropTypes.object,
   viewerProps: PropTypes.object.isRequired,
 };
+
+RevisionsDiffViewer.defaultProps = {
+  diff: {},
+};

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/records/CompareRevisions.js

@@ -1,6 +1,7 @@
 /*
  * // This file is part of Invenio-App-Rdm
  * // Copyright (C) 2025 CERN.
+ * // Copyright (C) 2025 Graz University of Technology.
  * //
  * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
  * // under the terms of the MIT License; see LICENSE file for more details.
@@ -28,6 +29,14 @@ export class CompareRevisions extends Component {
     };
   }
 
+  componentDidMount() {
+    this.fetchRevisions();
+  }
+
+  componentWillUnmount() {
+    this.cancellableAction && this.cancellableAction.cancel();
+  }
+
   async fetchRevisions() {
     const { resource } = this.props;
     this.setState({ loading: true });
@@ -50,14 +59,6 @@ export class CompareRevisions extends Component {
     }
   }
 
-  componentDidMount() {
-    this.fetchRevisions();
-  }
-
-  componentWillUnmount() {
-    this.cancellableAction && this.cancellableAction.cancel();
-  }
-
   handleModalClose = () => {
     const { actionCancelCallback } = this.props;
     actionCancelCallback();
@@ -100,7 +101,7 @@ export class CompareRevisions extends Component {
             </Modal.Content>
           )}
           <Modal.Content scrolling>
-            <RevisionsDiffViewer diff={this.state.diff} />
+            <RevisionsDiffViewer diff={diff} />
           </Modal.Content>
         </Modal.Content>
         <Modal.Actions>