invenio-app-rdm 13.0.0b2.dev1__tar.gz → 13.0.0b2.dev2__tar.gz

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/CHANGES.rst

@@ -10,6 +10,10 @@
 Changes
 =======
 
+Version v13.0.0b2.dev2 (released 2025-02-13)
+
+- Bump prerelease dependencies to stable.
+
 Version v13.0.0b2.dev1 (released 2025-01-23)
 
 Version v13.0.0b2.dev0 (released 2024-12-16)
@@ -18,6 +22,10 @@ Version v13.0.0b2.dev0 (released 2024-12-16)
 - setup: change to reusable workflows
 - setup: bump major dependencies
 
+Version v13.0.0b1.dev30 (released 2025-01-27)
+
+- administration: add record revision comparison
+
 Version v13.0.0b1.dev29 (released 2025-01-23)
 
 - preview: do not mint parent doi if doi is not reserved and doi is optional

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev1
+Version: 13.0.0b2.dev2
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -40,8 +40,8 @@ Requires-Dist: invenio-search-ui<5.0.0,>=4.0.0
 Requires-Dist: invenio-files-rest<4.0.0,>=3.0.0
 Requires-Dist: invenio-previewer<4.0.0,>=3.0.0
 Requires-Dist: invenio-records-files<2.0.0,>=1.2.1
-Requires-Dist: invenio-communities<19.0.0,>=18.0.0.dev2
-Requires-Dist: invenio-rdm-records<18.0.0,>=17.0.0.dev2
+Requires-Dist: invenio-communities<19.0.0,>=18.0.0
+Requires-Dist: invenio-rdm-records<18.0.0,>=17.0.1
 Requires-Dist: CairoSVG<3.0.0,>=2.5.2
 Requires-Dist: invenio-banners<5.0.0,>=4.0.0
 Requires-Dist: invenio-pages<6.0.0,>=5.0.0
@@ -96,6 +96,10 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b2.dev2 (released 2025-02-13)
+
+- Bump prerelease dependencies to stable.
+
 Version v13.0.0b2.dev1 (released 2025-01-23)
 
 Version v13.0.0b2.dev0 (released 2024-12-16)
@@ -104,6 +108,10 @@ Version v13.0.0b2.dev0 (released 2024-12-16)
 - setup: change to reusable workflows
 - setup: bump major dependencies
 
+Version v13.0.0b1.dev30 (released 2025-01-27)
+
+- administration: add record revision comparison
+
 Version v13.0.0b1.dev29 (released 2025-01-23)
 
 - preview: do not mint parent doi if doi is not reserved and doi is optional

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/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.dev1"
+__version__ = "13.0.0b2.dev2"
 
 __all__ = ("__version__",)

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/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-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/config.py

@@ -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-13.0.0b2.dev2/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-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/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-13.0.0b2.dev2/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-13.0.0b2.dev2/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,
+};

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/records/RecordResourceActions.js

@@ -7,6 +7,7 @@
  */
 
 import TombstoneForm from "./TombstoneForm";
+import { CompareRevisions } from "./CompareRevisions";
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Button, Modal, Icon } from "semantic-ui-react";
@@ -22,16 +23,34 @@ export class RecordResourceActions extends Component {
       modalOpen: false,
       modalHeader: undefined,
       modalBody: undefined,
+      modalProps: undefined,
     };
   }
 
   onModalTriggerClick = (e, { payloadSchema, dataName, dataActionKey }) => {
     const { resource } = this.props;
 
+    if (dataActionKey === "compare") {
+      this.setState({
+        modalOpen: true,
+        modalHeader: i18next.t("Compare revisions"),
+        modalProps: {
+          size: "large",
+        },
+        modalBody: (
+          <CompareRevisions
+            actionSuccessCallback={this.handleSuccess}
+            actionCancelCallback={this.closeModal}
+            resource={resource}
+          />
+        ),
+      });
+    }
     if (dataActionKey === "delete") {
       this.setState({
         modalOpen: true,
         modalHeader: i18next.t("Delete record"),
+        modalProps: undefined, // default size
         modalBody: (
           <TombstoneForm
             actionSuccessCallback={this.handleSuccess}
@@ -45,6 +64,7 @@ export class RecordResourceActions extends Component {
       this.setState({
         modalOpen: true,
         modalHeader: i18next.t("Restore record"),
+        modalProps: undefined, // default size
         modalBody: (
           <RestoreConfirmation
             actionSuccessCallback={this.handleSuccess}
@@ -76,11 +96,30 @@ export class RecordResourceActions extends Component {
 
   render() {
     const { actions, Element, resource } = this.props;
-    const { modalOpen, modalHeader, modalBody } = this.state;
+    const { modalOpen, modalHeader, modalBody, modalProps } = this.state;
     let icon;
     return (
       <>
         {Object.entries(actions).map(([actionKey, actionConfig]) => {
+          if (actionKey === "compare" && !resource.deletion_status.is_deleted) {
+            icon = "file code outline";
+            return (
+              <Element
+                key={actionKey}
+                onClick={this.onModalTriggerClick}
+                payloadSchema={actionConfig.payload_schema}
+                dataName={actionConfig.text}
+                dataActionKey={actionKey}
+                icon={icon}
+                fluid
+                basic
+                labelPosition="left"
+              >
+                {icon && <Icon name={icon} />}
+                {actionConfig.text}...
+              </Element>
+            );
+          }
           if (actionKey === "delete" && !resource.deletion_status.is_deleted) {
             icon = "trash alternate";
             return (
@@ -96,7 +135,7 @@ export class RecordResourceActions extends Component {
                 labelPosition="left"
               >
                 {icon && <Icon name={icon} />}
-                {actionConfig.text}
+                {actionConfig.text}...
               </Element>
             );
           }
@@ -114,13 +153,13 @@ export class RecordResourceActions extends Component {
                 labelPosition="left"
               >
                 {icon && <Icon name={icon} />}
-                {actionConfig.text}
+                {actionConfig.text}...
               </Element>
             );
           }
           return null;
         })}
-        <ActionModal modalOpen={modalOpen} resource={resource}>
+        <ActionModal modalOpen={modalOpen} resource={resource} modalProps={modalProps}>
           {modalHeader && <Modal.Header>{modalHeader}</Modal.Header>}
           {!_isEmpty(modalBody) && modalBody}
         </ActionModal>

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/records/api/api.js

@@ -22,7 +22,12 @@ const restoreRecord = async (record) => {
   return await http.post(APIRoutes.restore(record));
 };
 
+const getRevisions = async (record) => {
+  return await http.get(APIRoutes.compare(record));
+};
+
 export const RecordModerationApi = {
   deleteRecord: deleteRecord,
   restoreRecord: restoreRecord,
+  getRevisions: getRevisions,
 };

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/records/api/routes.js

@@ -12,6 +12,9 @@ const APIRoutesGenerators = {
   delete: (record, idKeyPath = "id") => {
     return `/api/records/${_get(record, idKeyPath)}/delete`;
   },
+  compare: (record, idKeyPath = "id") => {
+    return `/api/records/${_get(record, idKeyPath)}/revisions`;
+  },
 
   restore: (record, idKeyPath = "id") => {
     return `/api/records/${_get(record, idKeyPath)}/restore`;

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/components/RecordsResultsListItem.js

@@ -107,9 +107,16 @@ class RecordsResultsListItem extends Component {
             <Item className="creatibutors">
               <SearchItemCreators creators={creators} othersLink={viewLink} />
             </Item>
-            <Item.Description className="truncate-lines-2">
-              {descriptionStripped}
-            </Item.Description>
+            <Overridable
+              id={buildUID("RecordsResultsListItem.description", "", appName)}
+              descriptionStripped={descriptionStripped}
+              result={result}
+            >
+              <Item.Description className="truncate-lines-2">
+                {descriptionStripped}
+              </Item.Description>
+            </Overridable>
+
             <Item.Extra>
               {subjects.map((subject) => (
                 <Label key={subject.title_l10n} size="tiny">

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/assets/semantic-ui/less/invenio_app_rdm/theme/elements/label.overrides

@@ -48,9 +48,9 @@ a.subject:hover {
 
 label.helptext {
   display: block;
-  color: @mutedTextColor;
-  font-weight: normal;
-  font-size: 0.9em;
+  color: @mutedTextColor !important;
+  font-weight: normal !important;
+  font-size: 0.9em !important;
   margin-top: -0.8em; // counterweight Form field bottom margin
   margin-bottom: @defaultMargin;
 }

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/assets/semantic-ui/less/invenio_app_rdm/theme/globals/site.overrides

@@ -552,3 +552,5 @@ dl.details-list {
     vertical-align: sub;
   }
 }
+
+

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/assets/semantic-ui/less/invenio_app_rdm/theme/views/item.overrides

@@ -169,3 +169,7 @@
     align-self: center;
   }
 }
+
+.item > .content{
+  max-width: 100%
+}

invenio_app_rdm-13.0.0b2.dev2/invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/administration_page.html

@@ -0,0 +1,15 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2015-2025 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{%- extends "invenio_theme/page.html" -%}
+
+{%- block css %}
+  {{ super()}}
+  <link rel="stylesheet" href="/static/css/json-diff-kit.css">
+{%- endblock css %}

{invenio_app_rdm-13.0.0b2.dev1 → invenio_app_rdm-13.0.0b2.dev2}/invenio_app_rdm/theme/webpack.py

@@ -58,6 +58,7 @@ theme = WebpackThemeBundle(
                 "react-invenio-forms": "^4.0.0",
                 "react-searchkit": "^3.0.0",
                 "yup": "^0.32.0",
+                "json-diff-kit": "^1.0.30",
             },
             aliases={
                 # Define Semantic-UI theme configuration needed by
@@ -87,6 +88,10 @@ theme = WebpackThemeBundle(
                     "from": "../node_modules/tinymce/skins/ui/oxide/content.min.css",
                     "to": "../../static/dist/js/skins/ui/oxide",
                 },
+                {
+                    "from": "../node_modules/json-diff-kit/dist/viewer.css",
+                    "to": "../../static/css/json-diff-kit.css",
+                },
             ],
         ),
     },