invenio-app-rdm 13.0.0b2.dev0__py2.py3-none-any.whl → 13.0.0b2.dev2__py2.py3-none-any.whl

invenio_app_rdm/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2022 Northwestern University.
 # Copyright (C) 2024 Graz University of Technology.
 #
@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
 
-__version__ = "13.0.0b2.dev0"
+__version__ = "13.0.0b2.dev2"
 
 __all__ = ("__version__",)

invenio_app_rdm/administration/records/records.py

@@ -56,6 +56,11 @@ class RecordAdminListView(AdminResourceListView):
             "payload_schema": None,
             "order": 1,
         },
+        "compare": {
+            "text": _("Compare revisions"),
+            "payload_schema": None,
+            "order": 1,
+        },
     }
 
     search_config_name = "RDM_SEARCH"

invenio_app_rdm/config.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2020 Northwestern University.
 # Copyright (C) 2021-2024 Graz University of Technology.
 # Copyright (C) 2022-2024 KTH Royal Institute of Technology.
@@ -1461,6 +1461,9 @@ from invenio_app_rdm import __version__
 ADMINISTRATION_DISPLAY_VERSIONS = [("invenio-app-rdm", f"v{__version__}")]
 """Show the InvenioRDM version in the administration panel."""
 
+ADMINISTRATION_THEME_BASE_TEMPLATE = "invenio_app_rdm/administration_page.html"
+"""Administration base template."""
+
 
 APP_RDM_SUBCOMMUNITIES_LABEL = "Subcommunities"
 """Label for the subcommunities in the community browse page."""

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

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2020 CERN.
+  Copyright (C) 2020-2025 CERN.
   Copyright (C) 2020 Northwestern University.
   Copyright (C) 2021 New York University.
 
@@ -15,7 +15,7 @@
     <h2 id="description-heading" class="sr-only">{{ _('Description') }}</h2>
     {# description data is being sanitized by marshmallow in the backend #}
     <div style="word-wrap: break-word;">
-      <p>{{ description | safe }}</p>
+      {{ description | safe }}
     </div>
   </section>
 {% endif %}

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

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2020-2024 CERN.
+  Copyright (C) 2020-2025 CERN.
   Copyright (C) 2024 Northwestern University.
 
   Invenio RDM Records is free software; you can redistribute it and/or modify
@@ -96,40 +96,37 @@
 
 
 {% macro _show_funding_item(item, index) %}
+  <dt class="ui tiny header">{{ item.funder.name if item.funder }}</dt>
   {%- if item.award -%}
-    {%- if item.award.title_l10n -%}
-      <dt class="ui tiny header">
-        <span class="mr-5">
-          {% if item.award.acronym %}
-            {{ item.award.acronym }} –
-          {% endif %}
-
-          {{ item.award.title_l10n }}
-        </span>
+  <dt class="ui tiny header">
+    <span class="mr-0 text-muted">
+      {% if item.award.acronym %}
+        {{ item.award.acronym }} –
+      {% endif %}
+      
+      {%- if item.award.title_l10n -%}
+        {{ item.award.title_l10n }}
+      {%- endif -%}
+    </span>
 
-        {%- if item.award.number -%}
-          <span class="ui mini basic label ml-0 mr-5" id="number-label-{{ index }}">
-            {{ item.award.number }}
-          </span>
-        {%- endif -%}
+    {%- if item.award.number -%}
+      <span class="ui mini basic label {% if not item.award.title_l10n %}ml-0{% endif %}" id="number-label-{{ index }}">
+        {{ item.award.number }}
+      </span>
+    {%- endif -%}
 
-        {%- if item.award.identifiers -%}
-          {% for identifier in item.award.identifiers if 'url' == identifier.scheme %}
-            <a href="{{ identifier.identifier }}" target="_blank"
-               rel="noopener noreferrer" aria-label="{{ _('Open external link') }}">
-              <i class="external alternate icon"></i>
-            </a>
-          {%- endfor -%}
-        {%- endif -%}
-      </dt>
+    {%- if item.award.identifiers -%}
+      {% for identifier in item.award.identifiers if 'url' == identifier.scheme %}
+        <a href="{{ identifier.identifier }}" target="_blank"
+          rel="noopener noreferrer" aria-label="{{ _('Open external link') }}">
+          <i class="external alternate icon"></i>
+        </a>
+      {%- endfor -%}
     {%- endif -%}
-    <dd class="text-muted">{{ item.funder.name if item.funder }}</dd>
-  {%- else -%}
-    <dt class="ui tiny header">{{ item.funder.name if item.funder }}</dt>
-  {%- endif -%}
+  </dt>
+{%- endif -%}
 {% endmacro %}
 
-
 {% macro show_references(references) %}
   <ul class="ui bulleted list details-list">
     {% for reference in references %}

invenio_app_rdm/records_ui/views/decorators.py

@@ -403,3 +403,24 @@ def secret_link_or_login_required():
         return view
 
     return decorator
+
+
+def no_cache_response(f):
+    """Add appropriate response headers to force no caching.
+
+    This decorator is used to prevent caching of the response in the browser. This is needed
+    in the deposit form as we initialize the form with the record metadata included in the html page
+    and we don't want the browser to cache this page so that the user always gets the latest version of the record.
+    """
+
+    @wraps(f)
+    def view(*args, **kwargs):
+        response = make_response(f(*args, **kwargs))
+
+        response.cache_control.no_cache = True
+        response.cache_control.no_store = True
+        response.cache_control.must_revalidate = True
+
+        return response
+
+    return view

invenio_app_rdm/records_ui/views/deposits.py

@@ -23,6 +23,7 @@ from invenio_i18n.ext import current_i18n
 from invenio_rdm_records.proxies import current_rdm_records
 from invenio_rdm_records.records.api import get_files_quota
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
+from invenio_rdm_records.services.components.pids import _get_optional_doi_transitions
 from invenio_rdm_records.services.schemas import RDMRecordSchema
 from invenio_rdm_records.services.schemas.utils import dump_empty
 from invenio_records_resources.services.errors import PermissionDeniedError
@@ -34,6 +35,7 @@ from sqlalchemy.orm import load_only
 
 from ..utils import set_default_value
 from .decorators import (
+    no_cache_response,
     pass_draft,
     pass_draft_community,
     pass_draft_files,
@@ -45,7 +47,7 @@ from .filters import get_scheme_label
 #
 # Helpers
 #
-def get_form_pids_config():
+def get_form_pids_config(record=None):
     """Prepare configuration for the pids field.
 
     Currently supporting only doi.
@@ -55,17 +57,45 @@ def get_form_pids_config():
     # FIXME: User provider.is_managed() requires tiny fix in config
     can_be_managed = True
     can_be_unmanaged = True
+    # We initialize the optional doi to empty to indicate that there is no restriction on the transitions
+    # This is valid for new uploads and when the DOI is required in an instance
+    optional_doi_transitions = []
     for scheme in service.config.pids_providers.keys():
         if not scheme == "doi":
             continue
+
         record_pid_config = current_app.config["RDM_PERSISTENT_IDENTIFIERS"]
         scheme_label = record_pid_config.get(scheme, {}).get("label", scheme)
         is_doi_required = record_pid_config.get(scheme, {}).get("required")
         default_selected = (
             record_pid_config.get(scheme, {}).get("ui", {}).get("default_selected")
         )
+        if record is not None and not is_doi_required:
+            sitename = current_app.config.get("THEME_SITENAME", "this repository")
+            previous_published_record = (
+                service.record_cls.get_latest_published_by_parent(record.parent)
+            )
+            optional_doi_transitions = _get_optional_doi_transitions(
+                previous_published_record
+            )
+            if optional_doi_transitions:
+                optional_doi_transitions["message"] = optional_doi_transitions.get(
+                    "message"
+                ).format(sitename=sitename)
+                if set(optional_doi_transitions.get("allowed_providers", [])) - set(
+                    ["external", "not_needed"]
+                ):
+                    # In case we have locally managed provider as an allowed one, we need to
+                    # select it by default. That is relevant for the case when the
+                    # user creates a new version of the record and the previous version
+                    # had a datacite DOI.
+                    default_selected = "no"
+
+        # if the DOI is required but the default selected is not_needed then we set it to yes
+        # to force the user to mint a DOI
         if is_doi_required and default_selected == "not_needed":
             default_selected = "yes"
+
         pids_provider = {
             "scheme": scheme,
             "field_label": "Digital Object Identifier",
@@ -89,6 +119,7 @@ def get_form_pids_config():
                 "unambiguously cited. Example: 10.1234/foo.bar"
             ).format(scheme_label=scheme_label),
             "default_selected": default_selected,
+            "optional_doi_transitions": optional_doi_transitions,
         }
         pids_providers.append(pids_provider)
 
@@ -332,6 +363,8 @@ def get_form_config(**kwargs):
     if record_quota:
         quota["maxStorage"] = record_quota["quota_size"]
 
+    record = kwargs.pop("record", None)
+
     return dict(
         vocabularies=VocabulariesOptions().dump(),
         autocomplete_names=conf.get(
@@ -339,7 +372,7 @@ def get_form_config(**kwargs):
         ),
         current_locale=str(current_i18n.locale),
         default_locale=conf.get("BABEL_DEFAULT_LOCALE", "en"),
-        pids=get_form_pids_config(),
+        pids=get_form_pids_config(record=record),
         quota=quota,
         decimal_size_display=conf.get("APP_RDM_DISPLAY_DECIMAL_FILE_SIZES", True),
         links=dict(
@@ -390,6 +423,7 @@ def new_record():
 # Views
 #
 @login_required
+@no_cache_response
 @pass_draft_community
 def deposit_create(community=None):
     """Create a new deposit."""
@@ -441,6 +475,7 @@ def deposit_create(community=None):
 @secret_link_or_login_required()
 @pass_draft(expand=True)
 @pass_draft_files
+@no_cache_response
 def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
     """Edit an existing deposit."""
     # don't show draft's deposit form if the user can't edit it
@@ -490,6 +525,7 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
         # hide react community component
         hide_community_selection=community_use_jinja_header,
         is_doi_required=is_doi_required,
+        record=draft._record,
     )
 
     if is_doi_required and not record.get("pids", {}).get("doi"):

invenio_app_rdm/records_ui/views/records.py

@@ -178,7 +178,7 @@ def record_detail(
             )
         except ValidationError:
             abort(404)
-        # inject parent doi format for new drafts so we can show in preview
+        # inject parent doi format for new drafts so we can show in preview if parent doi is required
         if current_app.config["DATACITE_ENABLED"]:
             service = current_rdm_records.records_service
             datacite_provider = [
@@ -187,11 +187,27 @@ def record_detail(
                 if p == "doi" and "datacite" in v
             ]
             if datacite_provider:
-                datacite_provider = datacite_provider[0]
-                parent_doi = datacite_provider.client.generate_doi(
-                    record._record.parent
+                should_mint_parent_doi = True
+                is_doi_required = (
+                    current_app.config.get("RDM_PARENT_PERSISTENT_IDENTIFIERS", {})
+                    .get("doi", {})
+                    .get("required")
                 )
-                record_ui["ui"]["new_draft_parent_doi"] = parent_doi
+                if not is_doi_required:
+                    # check if the draft has a reserved doi and mint parent doi only in that case
+                    record_doi = record._record.pids.get("doi", {})
+                    is_doi_reserved = record_doi.get(
+                        "provider", ""
+                    ) == "datacite" and record_doi.get("identifier")
+                    if not is_doi_reserved:
+                        should_mint_parent_doi = False
+
+                if should_mint_parent_doi:
+                    datacite_provider = datacite_provider[0]
+                    parent_doi = datacite_provider.client.generate_doi(
+                        record._record.parent
+                    )
+                    record_ui["ui"]["new_draft_parent_doi"] = parent_doi
 
     # emit a record view stats event
     emitter = current_stats.get_event_emitter("record-view")

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

@@ -0,0 +1,83 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2025 CERN.
+ * //
+ * // 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.
+ */
+
+import React, { useState } from "react";
+import PropTypes from "prop-types";
+import { Grid, Dropdown, Button } from "semantic-ui-react";
+
+export const CompareRevisionsDropdown = ({
+  loading,
+  options,
+  onCompare,
+  srcRevision: srcOption,
+  targetRevision: targetOption,
+}) => {
+  // Local state for selected revisions
+  const [srcRevision, setSrcRevision] = useState(srcOption);
+  const [targetRevision, setTargetRevision] = useState(targetOption);
+
+  const handleCompare = () => {
+    onCompare(srcRevision, targetRevision);
+  };
+
+  return (
+    <Grid>
+      <Grid.Column mobile={16} computer={6} tablet={16} largeScreen={6} widescreen={6}>
+        <label htmlFor="source-revision">From</label>
+        <Dropdown
+          id="source-revision"
+          loading={loading}
+          placeholder="Source revision..."
+          fluid
+          selection
+          value={srcRevision}
+          onChange={(e, { value }) => setSrcRevision(value)}
+          options={options}
+          scrolling
+        />
+      </Grid.Column>
+      <Grid.Column mobile={16} computer={6} tablet={16} largeScreen={6} widescreen={6}>
+        <label htmlFor="target-revision">To</label>
+        <Dropdown
+          id="target-revision"
+          loading={loading}
+          placeholder="Target revision..."
+          fluid
+          selection
+          value={targetRevision}
+          onChange={(e, { value }) => setTargetRevision(value)}
+          options={options}
+          scrolling
+        />
+      </Grid.Column>
+      <Grid.Column
+        verticalAlign="bottom"
+        mobile={16}
+        computer={2}
+        tablet={16}
+        largeScreen={2}
+        widescreen={2}
+      >
+        <Button
+          onClick={handleCompare}
+          disabled={loading || !srcRevision || !targetRevision}
+        >
+          Compare
+        </Button>
+      </Grid.Column>
+    </Grid>
+  );
+};
+
+CompareRevisionsDropdown.propTypes = {
+  loading: PropTypes.bool.isRequired,
+  options: PropTypes.array.isRequired,
+  onCompare: PropTypes.func.isRequired,
+  srcRevision: PropTypes.object,
+  targetRevision: PropTypes.object,
+};

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

@@ -83,7 +83,6 @@ export class ImpersonateUserForm extends Component {
   render() {
     const { error, loading } = this.state;
     const { user } = this.props;
-    console.log({ user });
     return (
       <Formik
         onSubmit={this.handleSubmit}

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

@@ -0,0 +1,77 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2025 CERN.
+ * //
+ * // 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.
+ */
+
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { Grid, Container } from "semantic-ui-react";
+import { Differ, Viewer } from "json-diff-kit";
+
+export class RevisionsDiffViewer extends Component {
+  constructor(props) {
+    super(props);
+    this.differ = new Differ({
+      detectCircular: true,
+      maxDepth: null,
+      showModifications: true,
+      arrayDiffMethod: "lcs",
+      ignoreCase: false,
+      ignoreCaseForKey: false,
+      recursiveEqual: true,
+    });
+
+    this.viewerProps = {
+      indent: 4,
+      lineNumbers: true,
+      highlightInlineDiff: true,
+      inlineDiffOptions: {
+        mode: "word",
+        wordSeparator: " ",
+      },
+      hideUnchangedLines: true,
+      syntaxHighlight: false,
+      virtual: true,
+    };
+
+    this.state = {
+      currentDiff: undefined,
+    };
+  }
+
+  componentDidUpdate(prevProps) {
+    const { diff } = this.props;
+
+    if (diff !== prevProps.diff) {
+      this.computeDiff();
+    }
+  }
+
+  computeDiff = () => {
+    const { diff } = this.props;
+    const _diff = this.differ.diff(diff?.srcRevision, diff?.targetRevision);
+    this.setState({ currentDiff: _diff });
+  };
+
+  render() {
+    const { currentDiff } = this.state;
+
+    return currentDiff ? (
+      <Grid>
+        <Grid.Column width={16}>
+          <Container fluid>
+            <Viewer diff={currentDiff} {...this.viewerProps} />
+          </Container>
+        </Grid.Column>
+      </Grid>
+    ) : null;
+  }
+}
+
+RevisionsDiffViewer.propTypes = {
+  diff: PropTypes.object,
+  viewerProps: PropTypes.object.isRequired,
+};

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

@@ -0,0 +1,128 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2025 CERN.
+ * //
+ * // 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.
+ */
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { RecordModerationApi } from "./api";
+import { withCancel, ErrorMessage } from "react-invenio-forms";
+import { Modal, Button, Grid } from "semantic-ui-react";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+import { CompareRevisionsDropdown } from "../components/CompareRevisionsDropdown";
+import { RevisionsDiffViewer } from "../components/RevisionsDiffViewer";
+
+export class CompareRevisions extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      loading: true,
+      error: undefined,
+      allRevisions: {},
+      srcRevision: undefined,
+      targetRevision: undefined,
+      diff: undefined,
+    };
+  }
+
+  async fetchRevisions() {
+    const { resource } = this.props;
+    this.setState({ loading: true });
+
+    try {
+      this.cancellableAction = withCancel(RecordModerationApi.getRevisions(resource));
+      const response = await this.cancellableAction.promise;
+      const revisions = await response.data;
+
+      this.setState({
+        allRevisions: revisions,
+        targetRevision: revisions[0],
+        srcRevision: revisions.length > 1 ? revisions[1] : revisions[0],
+        loading: false,
+      });
+    } catch (error) {
+      if (error === "UNMOUNTED") return;
+      this.setState({ error: error, loading: false });
+      console.error(error);
+    }
+  }
+
+  componentDidMount() {
+    this.fetchRevisions();
+  }
+
+  componentWillUnmount() {
+    this.cancellableAction && this.cancellableAction.cancel();
+  }
+
+  handleModalClose = () => {
+    const { actionCancelCallback } = this.props;
+    actionCancelCallback();
+  };
+
+  handleCompare = (srcRevision, targetRevision) => {
+    this.setState({ diff: { srcRevision, targetRevision } });
+  };
+
+  render() {
+    const { error, loading, allRevisions, srcRevision, targetRevision, diff } =
+      this.state;
+    const options = Object.values(allRevisions).map((rev) => ({
+      key: rev.updated,
+      text: `${rev.updated} (${rev.revision_id})`,
+      value: rev,
+    }));
+
+    return loading ? (
+      <p>Loading...</p>
+    ) : (
+      <>
+        <Modal.Content>
+          <CompareRevisionsDropdown
+            loading={loading}
+            options={options}
+            srcRevision={srcRevision}
+            targetRevision={targetRevision}
+            onCompare={this.handleCompare}
+          />
+          {error && (
+            <Modal.Content>
+              <ErrorMessage
+                header={i18next.t("Unable to fetch revisions.")}
+                content={error}
+                icon="exclamation"
+                className="text-align-left"
+                negative
+              />
+            </Modal.Content>
+          )}
+          <Modal.Content scrolling>
+            <RevisionsDiffViewer diff={this.state.diff} />
+          </Modal.Content>
+        </Modal.Content>
+        <Modal.Actions>
+          <Grid>
+            <Grid.Column floated="left" width={8} textAlign="left">
+              <Button
+                onClick={this.handleModalClose}
+                disabled={loading}
+                loading={loading}
+                aria-label={i18next.t("Cancel revision comparison")}
+              >
+                Close
+              </Button>
+            </Grid.Column>
+          </Grid>
+        </Modal.Actions>
+      </>
+    );
+  }
+}
+
+CompareRevisions.propTypes = {
+  resource: PropTypes.object.isRequired,
+  actionCancelCallback: PropTypes.func.isRequired,
+};