invenio-app-rdm 13.0.0b3.dev15__tar.gz → 13.0.0b3.dev17__tar.gz

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/CHANGES.rst

@@ -10,6 +10,15 @@
 Changes
 =======
 
+Version v13.0.0b3.dev17 (released 2025-06-02)
+
+- Move collections implementaiton to Invenio-Collections
+- Integrate Invenio-Sitemap
+
+Version v13.0.0b3.dev16 (released 2025-05-23)
+
+- administration: audit_logs: Add View Changes and View Log button and modals
+
 Version v13.0.0b3.dev15 (released 2025-05-23)
 
 - Revert "views: pass record object to record details"

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b3.dev15
+Version: 13.0.0b3.dev17
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -41,15 +41,17 @@ 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.2.0
-Requires-Dist: invenio-rdm-records<19.0.0,>=18.4.0
+Requires-Dist: invenio-rdm-records<19.0.0,>=18.14.0
 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
 Requires-Dist: invenio-audit-logs<1.0.0,>=0.1.0
+Requires-Dist: invenio-sitemap<2.0.0,>=0.1.0
 Provides-Extra: tests
 Requires-Dist: pytest-black-ng>=0.4.0; extra == "tests"
 Requires-Dist: pytest-invenio<4.0.0,>=3.3.0; extra == "tests"
 Requires-Dist: Sphinx>=4.5.0; extra == "tests"
+Requires-Dist: time-machine<3.0.0,>=2.12.0; extra == "tests"
 Provides-Extra: elasticsearch7
 Requires-Dist: invenio-search[elasticsearch7]<4.0.0,>=3.0.0; extra == "elasticsearch7"
 Provides-Extra: opensearch1
@@ -98,6 +100,15 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b3.dev17 (released 2025-06-02)
+
+- Move collections implementaiton to Invenio-Collections
+- Integrate Invenio-Sitemap
+
+Version v13.0.0b3.dev16 (released 2025-05-23)
+
+- administration: audit_logs: Add View Changes and View Log button and modals
+
 Version v13.0.0b3.dev15 (released 2025-05-23)
 
 - Revert "views: pass record object to record details"

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/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.0b3.dev15"
+__version__ = "13.0.0b3.dev17"
 
 __all__ = ("__version__",)

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm/administration/audit_logs/audit_logs.py

@@ -34,36 +34,40 @@ class AuditLogListView(AdminResourceListView):
     display_edit = False
 
     item_field_list = {
-        "id": {
-            "text": _("Log ID"),
-            "order": 1,
-            "width": 3,
-            "width": 3,
-        },
         "resource.type": {
             "text": _("Resource"),
-            "order": 2,
+            "order": 1,
             "width": 2,
         },
-        "resource.id": {  # Link to resource in the `resource_type` admin panel
+        "resource.id": {
             "text": _("Resource ID"),
-            "order": 3,
-            "width": 2,
+            "order": 2,
         },
         "action": {
             "text": _("Action"),
-            "order": 4,
-            "width": 2,
+            "order": 3,
         },
-        "user.id": {  # Link to user in user admin panel
+        "user.id": {
             "text": _("User"),
-            "order": 5,
-            "width": 3,
+            "order": 4,
         },
         "created": {
-            "text": _("Timestamp"),
-            "order": 6,
-            "width": 7,
+            "text": _("Created"),
+            "order": 5,
+        },
+    }
+
+    actions = {
+        "view_log": {
+            "text": _("View Log"),
+            "payload_schema": None,
+            "order": 1,
+        },
+        "view_changes": {
+            "text": _("View Changes"),
+            "payload_schema": None,
+            "order": 2,
+            "show_for": ["record.publish"],
         },
     }
 

invenio_app_rdm-13.0.0b3.dev17/invenio_app_rdm/communities_ui/sitemap.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 CERN.
+# Copyright (C) 2025 Northwestern University.
+#
+# 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.
+
+"""Community sitemap content."""
+
+from invenio_base import invenio_url_for
+from invenio_communities.proxies import current_communities
+from invenio_search.api import RecordsSearchV2
+from invenio_sitemap import SitemapSection, format_to_w3c
+
+
+class SitemapSectionOfCommunities(SitemapSection):
+    """Defines the Sitemap entries for Communities."""
+
+    def iter_entities(self):
+        """Iterate over objects."""
+        communities_scan = (
+            RecordsSearchV2(index=current_communities.service.record_cls.index._name)
+            .filter("term", **{"access.visibility": "public"})
+            .filter("term", deletion_status="P")
+            .sort("-updated")
+            # Using preserve_order is fine.
+            # Using Point in Time is a recommended alternative but not
+            # particularly better than this one for our needs. See
+            # https://opensearch.org/docs/latest/search-plugins/searching-data/point-in-time/
+            .params(preserve_order=True)
+            # In keeping with original: only page is looked for
+            # (curation policy is not most relevant)
+            .source(["slug", "updated", "metadata.page"])
+            .scan()
+        )
+
+        for community in communities_scan:
+            yield {
+                "slug": community.slug,
+                "updated": community.updated,
+                "loc": invenio_url_for(
+                    "invenio_app_rdm_communities.communities_detail",
+                    pid_value=community.slug,
+                ),
+            }
+
+            if "page" in community.get("metadata", {}):
+                yield {
+                    "slug": community.slug,
+                    "updated": community.updated,
+                    "loc": invenio_url_for(
+                        "invenio_communities.communities_about",
+                        pid_value=community.slug,
+                    ),
+                }
+
+    def to_dict(self, entity):
+        """To dict used in sitemap."""
+        return {
+            "loc": entity["loc"],
+            "lastmod": format_to_w3c(entity["updated"]),
+        }

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm/communities_ui/views/communities.py

@@ -9,6 +9,12 @@
 """Request views module."""
 
 from flask import abort, g, redirect, request, url_for
+from invenio_collections.errors import (
+    CollectionNotFound,
+    CollectionTreeNotFound,
+    LogoNotFoundError,
+)
+from invenio_collections.proxies import current_collections
 from invenio_communities.views.communities import (
     HEADER_PERMISSIONS,
     _get_roles_can_invite,
@@ -18,11 +24,6 @@ from invenio_communities.views.communities import (
 from invenio_communities.views.decorators import pass_community
 from invenio_pages.proxies import current_pages_service
 from invenio_pages.records.errors import PageNotFoundError
-from invenio_rdm_records.collections import (
-    CollectionNotFound,
-    CollectionTreeNotFound,
-    LogoNotFoundError,
-)
 from invenio_rdm_records.proxies import (
     current_community_records_service,
     current_rdm_records,
@@ -54,7 +55,7 @@ def communities_detail(pid_value, community, community_ui):
 def communities_home(pid_value, community, community_ui):
     """Community home page."""
     query_params = request.args
-    collections_service = current_rdm_records.collections_service
+    collections_service = current_collections.service
     permissions = community.has_permissions_to(HEADER_PERMISSIONS)
     if not permissions["can_read"]:
         raise PermissionDeniedError()
@@ -124,7 +125,7 @@ def communities_browse(pid_value, community, community_ui):
     """Community browse page."""
     permissions = community.has_permissions_to(HEADER_PERMISSIONS)
 
-    collections_service = current_rdm_records.collections_service
+    collections_service = current_collections.service
 
     trees_ui = collections_service.list_trees(
         g.identity, community_id=community.id, depth=2
@@ -167,7 +168,7 @@ def community_collection(
     community, community_ui, pid_value, tree_slug=None, collection_slug=None
 ):
     """Render a community collection page."""
-    collections_service = current_rdm_records.collections_service
+    collections_service = current_collections.service
     try:
         collection = collections_service.read(
             identity=g.identity,

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm/communities_ui/views/ui.py

@@ -10,6 +10,7 @@
 """Communities UI blueprints module."""
 
 from flask import Blueprint, current_app, request
+from invenio_collections.searchapp import search_app_context as c_search_app_context
 from invenio_communities.errors import CommunityDeletedError
 from invenio_communities.views.ui import (
     not_found_error,
@@ -17,7 +18,6 @@ from invenio_communities.views.ui import (
     record_tombstone_error,
 )
 from invenio_pidstore.errors import PIDDeletedError, PIDDoesNotExistError
-from invenio_rdm_records.collections import search_app_context as c_search_app_context
 from invenio_records_resources.services.errors import (
     PermissionDeniedError,
     RecordPermissionDeniedError,

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm/config.py

@@ -167,6 +167,8 @@ from invenio_vocabularies.contrib.subjects.datastreams import (
 )
 from werkzeug.local import LocalProxy
 
+from .communities_ui.sitemap import SitemapSectionOfCommunities
+from .records_ui.sitemap import SitemapSectionOfRDMRecords
 from .theme.views import notification_settings
 from .users.schemas import NotificationsUserSchema, UserPreferencesNotificationsSchema
 
@@ -485,6 +487,10 @@ CELERY_BEAT_SCHEDULE = {
         "task": "invenio_jobs.logging.tasks.delete_logs",
         "schedule": crontab(minute=5, hour=0),
     },
+    "update_sitemap": {
+        "task": "invenio_sitemap.tasks.update_sitemap_cache",
+        "schedule": crontab(minute=0, hour=2),
+    },
 }
 """Scheduled tasks configuration (aka cronjobs)."""
 
@@ -1479,3 +1485,11 @@ APP_RDM_SUBCOMMUNITIES_LABEL = "Subcommunities"
 
 RDM_DETAIL_SIDE_BAR_MANAGE_ATTRIBUTES_EXTENSION_TEMPLATE = None
 """Side bar manage attributes extension template."""
+
+# Invenio-Sitemap
+# ===============
+# See https://github.com/inveniosoftware/invenio-sitemap/blob/master/invenio_sitemap/config.py  # noqa
+SITEMAP_SECTIONS = [
+    SitemapSectionOfRDMRecords(),
+    SitemapSectionOfCommunities(),
+]

invenio_app_rdm-13.0.0b3.dev17/invenio_app_rdm/records_ui/sitemap.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 CERN.
+# Copyright (C) 2025 Northwestern University.
+#
+# 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.
+
+"""RDMRecords sitemap content."""
+
+from invenio_base import invenio_url_for
+from invenio_rdm_records.proxies import current_rdm_records_service
+from invenio_search.api import RecordsSearchV2
+from invenio_sitemap import SitemapSection, format_to_w3c
+
+
+class SitemapSectionOfRDMRecords(SitemapSection):
+    """Defines the Sitemap entries for Records."""
+
+    def iter_entities(self):
+        """Iterate over objects."""
+        records_scan = (
+            RecordsSearchV2(index=current_rdm_records_service.record_cls.index._name)
+            .filter("term", **{"access.record": "public"})
+            .filter("term", deletion_status="P")
+            .sort("-updated")
+            # Using preserve_order is fine.
+            # Using Point in Time is a recommended alternative but not
+            # particularly better than this one for our needs. See
+            # https://opensearch.org/docs/latest/search-plugins/searching-data/point-in-time/
+            .params(preserve_order=True)
+            .source(["id", "updated"])
+            .scan()
+        )
+        return records_scan
+
+    def to_dict(self, entity):
+        """To dict used in sitemap."""
+        return {
+            "loc": invenio_url_for(
+                "invenio_app_rdm_records.record_detail", pid_value=entity["id"]
+            ),
+            "lastmod": format_to_w3c(entity["updated"]),
+        }

invenio_app_rdm-13.0.0b3.dev17/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/auditLogs/AuditLogActions.js

@@ -0,0 +1,136 @@
+/*
+ * // 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 { Button, Modal, Icon } from "semantic-ui-react";
+import { ActionModal } from "@js/invenio_administration";
+import _isEmpty from "lodash/isEmpty";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+import { ViewRecentChanges } from "./ViewRecentChanges";
+import { ViewJson } from "./ViewJson";
+
+export class AuditLogActions extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      modalOpen: false,
+      modalHeader: undefined,
+      modalBody: undefined,
+      modalProps: undefined,
+    };
+  }
+
+  onModalTriggerClick = (e, { payloadSchema, dataName, dataActionKey }) => {
+    const { resource } = this.props;
+
+    if (dataActionKey === "view_changes") {
+      this.setState({
+        modalOpen: true,
+        modalHeader: i18next.t("Recent changes"),
+        modalProps: {
+          size: "large",
+        },
+        modalBody: (
+          <ViewRecentChanges
+            actionCancelCallback={this.closeModal}
+            resource={resource}
+          />
+        ),
+      });
+    } else if (dataActionKey === "view_log") {
+      this.setState({
+        modalOpen: true,
+        modalHeader: i18next.t("Audit Log Details"),
+        modalProps: {
+          size: "large",
+        },
+        modalBody: <ViewJson jsonData={resource} onCloseHandler={this.closeModal} />,
+      });
+    }
+  };
+
+  closeModal = () => {
+    this.setState({
+      modalOpen: false,
+      modalHeader: undefined,
+      modalBody: undefined,
+    });
+  };
+
+  render() {
+    const { actions, Element, resource } = this.props;
+    const { action } = resource;
+    const { modalOpen, modalHeader, modalBody, modalProps } = this.state;
+    let icon;
+    return (
+      <>
+        {Object.entries(actions).map(([actionKey, actionConfig]) => {
+          if (actionKey === "view_log") {
+            icon = "eye";
+            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 === "view_changes" && actionConfig.show_for.includes(action)) {
+            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>
+            );
+          }
+          return null;
+        })}
+        <ActionModal modalOpen={modalOpen} resource={resource} modalProps={modalProps}>
+          {modalHeader && <Modal.Header>{modalHeader}</Modal.Header>}
+          {!_isEmpty(modalBody) && modalBody}
+        </ActionModal>
+      </>
+    );
+  }
+}
+
+AuditLogActions.propTypes = {
+  resource: PropTypes.object.isRequired,
+  actions: PropTypes.shape({
+    text: PropTypes.string.isRequired,
+    payload_schema: PropTypes.object.isRequired,
+    order: PropTypes.number.isRequired,
+  }),
+  Element: PropTypes.node,
+};
+
+AuditLogActions.defaultProps = {
+  Element: Button,
+  actions: undefined,
+};

invenio_app_rdm-13.0.0b3.dev17/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/auditLogs/ViewJson.js

@@ -0,0 +1,35 @@
+/*
+ * // 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 { Button, Modal } from "semantic-ui-react";
+import PropTypes from "prop-types";
+import ReactJson from "react-json-view";
+
+export class ViewJson extends Component {
+  render() {
+    const { jsonData, onCloseHandler } = this.props;
+    return (
+      <>
+        <Modal.Content>
+          <Modal.Description>
+            <ReactJson src={jsonData} name={null} />
+          </Modal.Description>
+        </Modal.Content>
+        <Modal.Actions>
+          <Button onClick={onCloseHandler}>Close</Button>
+        </Modal.Actions>
+      </>
+    );
+  }
+}
+
+ViewJson.propTypes = {
+  jsonData: PropTypes.object.isRequired,
+  onCloseHandler: PropTypes.object.isRequired,
+};

invenio_app_rdm-13.0.0b3.dev17/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/auditLogs/ViewRecentChanges.js

@@ -0,0 +1,119 @@
+/*
+ * // 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 "../records/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 { RevisionsDiffViewer } from "../components/RevisionsDiffViewer";
+
+export class ViewRecentChanges extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      loading: true,
+      error: undefined,
+      diff: undefined,
+    };
+  }
+
+  async fetchPreviousRevision() {
+    const { resource } = this.props;
+    const {
+      resource: record,
+      metadata: { revision_id: targetRevision } = { revision_id: null },
+    } = resource;
+    this.setState({ loading: true });
+
+    try {
+      if (!targetRevision) {
+        this.setState({
+          error: i18next.t("No revision ID found."),
+          loading: false,
+        });
+        return;
+      }
+      this.cancellableAction = withCancel(
+        RecordModerationApi.getLastRevision(record, targetRevision, true)
+      );
+      const response = await this.cancellableAction.promise;
+      const revisions = await response.data;
+
+      this.setState({
+        diff: {
+          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.fetchPreviousRevision();
+  }
+
+  componentWillUnmount() {
+    this.cancellableAction && this.cancellableAction.cancel();
+  }
+
+  handleModalClose = () => {
+    const { actionCancelCallback } = this.props;
+    actionCancelCallback();
+  };
+
+  render() {
+    const { error, loading, diff } = this.state;
+
+    return (
+      <>
+        <Modal.Content>
+          {error && (
+            <Modal.Content>
+              <ErrorMessage
+                header={i18next.t("Unable to fetch revisions.")}
+                content={error}
+                icon="exclamation"
+                className="text-align-left"
+                negative
+              />
+            </Modal.Content>
+          )}
+        </Modal.Content>
+        <Modal.Content scrolling>
+          <RevisionsDiffViewer diff={diff} />
+        </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>
+      </>
+    );
+  }
+}
+
+ViewRecentChanges.propTypes = {
+  resource: PropTypes.object.isRequired,
+  actionCancelCallback: PropTypes.func.isRequired,
+};

{invenio_app_rdm-13.0.0b3.dev15 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/auditLogs/index.js

@@ -9,6 +9,7 @@ import { createSearchAppInit } from "@js/invenio_search_ui";
 import { NotificationController } from "@js/invenio_administration";
 import { SearchResultItemLayout } from "./search";
 import { SearchFacets } from "@js/invenio_administration";
+import { AuditLogActions } from "./AuditLogActions";
 
 const domContainer = document.getElementById("invenio-search-config");
 
@@ -18,6 +19,7 @@ const overridenComponents = {
   ...defaultComponents,
   "InvenioAdministration.SearchResultItem.layout": SearchResultItemLayout,
   "SearchApp.facets": SearchFacets,
+  "InvenioAdministration.ResourceActions": AuditLogActions,
 };
 
 createSearchAppInit(