PyPI - invenio-app-rdm - Versions diffs - 13.0.0b2.dev3__tar.gz → 13.0.0b2.dev4__tar.gz - Mend

@@ -10,6 +10,12 @@
 Changes
 =======
+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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev3
+Version: 13.0.0b2.dev4
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -96,6 +96,12 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
+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

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

@@ -964,6 +964,8 @@ APP_RDM_DEPOSIT_FORM_PUBLISH_MODAL_EXTRA = ""
 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."""

@@ -398,13 +398,25 @@ def add_signposting_landing_page(f):
         response = make_response(f(*args, **kwargs))
         # Relies on other decorators having operated before it
-        record = kwargs["record"]
+        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()
+                )
+            )
-        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"] = signposting_headers
+            response.headers["Link"] = (
+                f'<{signposting_link}> ; rel="linkset" ; type="application/linkset+json"'  # fmt: skip
+            )
         return response

@@ -18,7 +18,10 @@ from .utils.files import send_integrity_report_email
 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()

@@ -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,
+};

@@ -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>

@@ -235,7 +235,7 @@
     in exactly the same order, and thus for instance would not match a record
     containing the phrase <em>"open access and science"</em>. A proximity search
     allows that the terms are not in the exact order and may include other terms
-    inbetween. The degree of flexiblity is specified by an integer afterwards:
+    in between. The degree of flexibility is specified by an integer afterwards:
   </p>
   <p>
     <strong>Example:</strong>

@@ -28,6 +28,9 @@ Design decisions:
 - Generated urls are absolute for now
 """
+import unicodedata
+from urllib.parse import quote
 from flask import current_app
@@ -49,7 +52,14 @@ def record_url_for(_app="ui", pid_value=""):
 def download_url_for(pid_value="", filename=""):
     """Return url for download route."""
-    url_prefix = current_app.config.get(f"SITE_UI_URL", "")
+    url_prefix = current_app.config.get("SITE_UI_URL", "")
+    # see https://github.com/pallets/werkzeug/blob/main/src/werkzeug/utils.py#L456-L465
+    try:
+        filename.encode("ascii")
+    except UnicodeEncodeError:
+        # safe = RFC 5987 attr-char
+        filename = quote(filename, safe="!#$&+-.^_`|~")
     # We use [] so that this fails and brings to attention the configuration
     # problem if APP_RDM_ROUTES.record_file_download is missing

@@ -16,16 +16,19 @@ RED='\033[0;31m'
 NC='\033[0m' # No Color
 for arg in $@; do
-	case ${arg} in
-		-i|--install)
-			npm install --no-save --no-package-lock @inveniosoftware/eslint-config-invenio@^2.0.0;;
-	  -f|--fix)
-	    printf "${GREEN}Run eslint${NC}\n";
-      npx eslint -c .eslintrc.yml invenio_app_rdm/**/*.js --fix;;
-		*)
-			printf "Argument ${RED}$arg${NC} not supported\n"
-			exit;;
-	esac
+    case ${arg} in
+        -i|--install)
+            npm install --no-save --no-package-lock @inveniosoftware/eslint-config-invenio@^2.0.0
+            ;;
+        -f|--fix)
+            printf "${GREEN}Run eslint${NC}\n";
+            npx eslint -c .eslintrc.yml invenio_app_rdm/**/*.js --fix
+            ;;
+        *)
+            printf "Argument ${RED}$arg${NC} not supported\n"
+            exit
+            ;;
+    esac
 done
 printf "${GREEN}Run eslint${NC}\n"

@@ -13,9 +13,19 @@ import pytest
 @pytest.mark.parametrize("http_method", ["head", "get"])
+@pytest.mark.parametrize("level_1_enabled", [True, False])
 def test_link_in_landing_page_response_headers(
-    running_app, client, record_with_file, http_method
+    running_app, app, client, record_with_file, http_method, level_1_enabled
 ):
+    previous_config = app.config[
+        "APP_RDM_RECORD_LANDING_PAGE_FAIR_SIGNPOSTING_LEVEL_1_ENABLED"
+    ]
+    if level_1_enabled:
+        app.config["APP_RDM_RECORD_LANDING_PAGE_FAIR_SIGNPOSTING_LEVEL_1_ENABLED"] = (
+            True
+        )
     client_http_method = getattr(client, http_method)
     res = client_http_method(f"/records/{record_with_file.id}")
@@ -29,17 +39,27 @@ def test_link_in_landing_page_response_headers(
     # - a cite-as since it has no DOI.
     # - a license.
-    # There should be at least 10 export formats supported (e.g. "application/dcat+xml", "application/x-bibtex", etc.).
-    assert sum('; rel="describedby" ;' in header for header in link_headers) >= 10
+    # There should be at least one link to a linkset (e.g. "application/linkset" and/or "application/linkset+json")
+    assert sum('; rel="linkset" ;' in header for header in link_headers) >= 1
-    # There should be at least one file in the record.
-    assert sum('; rel="item" ;' in header for header in link_headers) >= 1
+    if level_1_enabled:
+        # There should be at least 10 export formats supported (e.g. "application/dcat+xml", "application/x-bibtex", etc.).
+        assert sum('; rel="describedby" ;' in header for header in link_headers) >= 10
-    # There should be at least one description of the type of the record (e.g. "https://schema.org/Photograph").
-    assert sum('; rel="type"' in header for header in link_headers) >= 1
+        # There should be at least one file in the record.
+        assert sum('; rel="item" ;' in header for header in link_headers) >= 1
-    # There should be at least one link to a linkset (e.g. "application/linkset" and/or "application/linkset+json")
-    assert sum('; rel="linkset" ;' in header for header in link_headers) >= 1
+        # There should be at least one description of the type of the record (e.g. "https://schema.org/Photograph").
+        assert sum('; rel="type"' in header for header in link_headers) >= 1
+    else:
+        # The only link headers should be linkset headers.
+        assert sum('; rel="linkset" ;' in header for header in link_headers) == len(
+            link_headers
+        )
+    app.config["APP_RDM_RECORD_LANDING_PAGE_FAIR_SIGNPOSTING_LEVEL_1_ENABLED"] = (
+        previous_config
+    )
 @pytest.mark.parametrize("http_method", ["head", "get"])

invenio-app-rdm 13.0.0b2.dev3__tar.gz → 13.0.0b2.dev4__tar.gz

invenio-app-rdm 13.0.0b2.dev3tar.gz → 13.0.0b2.dev4tar.gz