invenio-app-rdm 12.0.0.dev8__py2.py3-none-any.whl → 14.0.0b1.dev8__py2.py3-none-any.whl

invenio_app_rdm/requests_ui/views/requests.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2022 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2022 Northwestern University.
 # Copyright (C)      2022 TU Wien.
 #
@@ -9,47 +9,100 @@
 
 """Request views module."""
 
-from flask import g, render_template
+from flask import current_app, g, render_template
 from flask_login import current_user, login_required
+from invenio_checks.api import ChecksAPI
+from invenio_communities.config import COMMUNITIES_ROLES
 from invenio_communities.members.services.request import CommunityInvitation
+from invenio_communities.proxies import current_identities_cache
+from invenio_communities.subcommunities.services.request import (
+    SubCommunityInvitationRequest,
+    SubCommunityRequest,
+)
+from invenio_communities.utils import identity_cache_key
+from invenio_communities.views.communities import render_community_theme_template
 from invenio_communities.views.decorators import pass_community
+from invenio_i18n.ext import current_i18n
+from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_rdm_records.proxies import current_rdm_records_service
 from invenio_rdm_records.requests import CommunityInclusion, CommunitySubmission
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
+from invenio_rdm_records.services.errors import RecordDeletedException
+from invenio_rdm_records.services.generators import CommunityInclusionNeed
 from invenio_records_resources.services.errors import PermissionDeniedError
 from invenio_requests.customizations import AcceptAction
 from invenio_requests.resolvers.registry import ResolverRegistry
 from invenio_requests.views.decorators import pass_request
 from invenio_users_resources.proxies import current_user_resources
+from invenio_vocabularies.proxies import current_service as vocabulary_service
+from marshmallow_utils.fields.babel import gettext_from_dict
 from sqlalchemy.orm.exc import NoResultFound
 
-from invenio_app_rdm.records_ui.views.decorators import (
+from ...records_ui.utils import get_external_resources
+from ...records_ui.views.decorators import (
     draft_files_service,
+    draft_media_files_service,
     files_service,
+    media_files_service,
+)
+from ...records_ui.views.deposits import (
+    get_user_communities_memberships,
+    load_custom_fields,
 )
-from invenio_app_rdm.records_ui.views.deposits import load_custom_fields
 
 
 def _resolve_topic_record(request):
     """Resolve the record in the topic, when it is a draft or a published record."""
-    user_owns_request = str(request["expanded"]["created_by"]["id"]) == str(
-        current_user.id
-    )
+    creator_id = request["expanded"].get("created_by", {}).get("id", None)
+    user_owns_request = str(creator_id) == str(current_user.id)
+
     if request["is_closed"] and not user_owns_request:
-        return dict(permissions={}, record_ui=None)
+        return dict(permissions={}, record_ui=None, record=None)
 
     record = None
     # parse the topic field to get the draft/record pid `record:abcd-efgh`
     entity = ResolverRegistry.resolve_entity_proxy(request["topic"])
     pid = entity._parse_ref_dict_id()
+
+    request_type = request["type"]
+    is_record_inclusion = request_type == CommunityInclusion.type_id
+
     try:
-        # read draft
-        record = current_rdm_records_service.read_draft(g.identity, pid, expand=True)
-    except NoResultFound:
+        if is_record_inclusion:
+            community = request["receiver"]["community"]
+            # Get the roles that can curate and in consequence should be able to see the record of the inclusion request
+            can_curate_roles = {
+                role["name"]
+                for role in COMMUNITIES_ROLES
+                if role.get("can_curate", False)
+            }
+            cache_key = identity_cache_key(g.identity)
+            user_community_roles = current_identities_cache.get(cache_key)
+            for community_id, role in user_community_roles:
+                if community_id == community and role in can_curate_roles:
+                    # This need should not be reused, see CommunityInclusionReviewers generator docstring for more info
+                    community_inclusion_need = CommunityInclusionNeed(
+                        pid
+                    )  # pid is the record pid
+                    g.identity.provides.add(community_inclusion_need)
+                    break
+            # read published record
+            record = current_rdm_records_service.read(g.identity, pid, expand=True)
+        else:
+            # read draft
+            record = current_rdm_records_service.read_draft(
+                g.identity, pid, expand=True
+            )
+    except (NoResultFound, PIDDoesNotExistError, RecordDeletedException):
+        # We catch PIDDoesNotExistError because a published record with
+        # a soft-deleted draft will raise this error. The lines below
+        # will catch the case that a id does not exists and raise a
+        # PIDDoesNotExistError that can be handled as 404 in the resource
+        # layer.
         try:
             # read published record
             record = current_rdm_records_service.read(g.identity, pid, expand=True)
-        except NoResultFound:
+        except (NoResultFound, RecordDeletedException):
             # record tab not displayed when the record is not found
             # the request is probably not open anymore
             pass
@@ -64,27 +117,60 @@ def _resolve_topic_record(request):
                 "update_draft",
                 "read_files",
                 "review",
+                "read",
             ]
         )
-        return dict(permissions=permissions, record_ui=record_ui)
+        return dict(
+            permissions=permissions,
+            record_ui=record_ui,
+            record=record,
+        )
 
-    return dict(permissions={}, record_ui=None)
+    return dict(permissions={}, record_ui=None, record=None)
 
 
-def _resolve_record_or_draft_files(record):
+def _resolve_record_or_draft_files(record, request):
     """Resolve the record's or draft's files."""
+    request_type = request["type"]
+    is_record_inclusion = request_type == CommunityInclusion.type_id
     if record and record["files"]["enabled"]:
         record_pid = record["id"]
         try:
-            files = draft_files_service().list_files(
-                id_=record_pid, identity=g.identity
-            )
+            if is_record_inclusion:
+                files = files_service().list_files(id_=record_pid, identity=g.identity)
+            else:
+                files = draft_files_service().list_files(
+                    id_=record_pid, identity=g.identity
+                )
         except NoResultFound:
             files = files_service().list_files(id_=record_pid, identity=g.identity)
         return files.to_dict()
     return None
 
 
+def _resolve_record_or_draft_media_files(record, request):
+    """Resolve the record's or draft's media files."""
+    request_type = request["type"]
+    is_record_inclusion = request_type == CommunityInclusion.type_id
+    if record and record["media_files"]["enabled"]:
+        record_pid = record["id"]
+        try:
+            if is_record_inclusion:
+                media_files = media_files_service().list_files(
+                    id_=record_pid, identity=g.identity
+                )
+            else:
+                media_files = draft_media_files_service().list_files(
+                    id_=record_pid, identity=g.identity
+                )
+        except NoResultFound:
+            media_files = media_files_service().list_files(
+                id_=record_pid, identity=g.identity
+            )
+        return media_files.to_dict()
+    return None
+
+
 @login_required
 @pass_request(expand=True)
 def user_dashboard_request_view(request, **kwargs):
@@ -94,42 +180,92 @@ def user_dashboard_request_view(request, **kwargs):
     )["avatar"]
 
     request_type = request["type"]
+    request_is_accepted = request["status"] == AcceptAction.status_to
 
-    is_draft_submission = request_type == CommunitySubmission.type_id
+    has_topic = request["topic"] is not None
+    has_record_topic = has_topic and "record" in request["topic"]
+    has_community_topic = has_topic and "community" in request["topic"]
     is_record_inclusion = request_type == CommunityInclusion.type_id
-    is_member_invitation = request_type == CommunityInvitation.type_id
-    request_is_accepted = request["status"] == AcceptAction.status_to
+    request_permissions = request.has_permissions_to(["action_accept"])
 
-    if is_draft_submission or is_record_inclusion:
+    if has_record_topic:
         topic = _resolve_topic_record(request)
-        record = topic["record_ui"]  # None when draft
-        is_draft = record["is_draft"] if record else False
+        record_ui = topic["record_ui"]
+        record = topic["record"]
+        is_draft = record_ui["is_draft"] if record_ui else False
+        is_published = record_ui["is_published"] if record_ui else False
+        has_draft = record._record.has_draft if record else False
+
+        files = _resolve_record_or_draft_files(record_ui, request)
+        media_files = _resolve_record_or_draft_media_files(record_ui, request)
+
+        checks = None
+        if current_app.config.get("CHECKS_ENABLED", False) and record:
+            if is_record_inclusion and has_draft:
+                checks = ChecksAPI.get_runs(record._record, is_draft=True)
+            else:
+                checks = ChecksAPI.get_runs(record._record)
+
+        if request_type == "record-deletion":
+            reason_title = vocabulary_service.read(
+                g.identity,
+                ("removalreasons", request["payload"]["reason"]),
+            ).to_dict()
+            request["payload"]["reason_label"] = gettext_from_dict(
+                reason_title["title"],
+                current_i18n.locale,
+                current_app.config.get("BABEL_DEFAULT_LOCALE", "en"),
+            )
 
-        files = _resolve_record_or_draft_files(record)
         return render_template(
             f"invenio_requests/{request_type}/index.html",
             base_template="invenio_app_rdm/users/base.html",
             user_avatar=avatar,
             invenio_request=request.to_dict(),
+            record_ui=record_ui,
             record=record,
-            permissions=topic["permissions"],
+            checks=checks,
+            permissions={**topic["permissions"], **request_permissions},
             is_preview=is_draft,  # preview only when draft
             is_draft=is_draft,
+            is_published=is_published,
+            has_draft=has_draft,
             request_is_accepted=request_is_accepted,
             files=files,
+            media_files=media_files,
             is_user_dashboard=True,
             custom_fields_ui=load_custom_fields()["ui"],
+            user_communities_memberships=get_user_communities_memberships(),
+            external_resources=get_external_resources(record),
+            include_deleted=False,
         )
 
-    elif is_member_invitation:
+    elif has_community_topic or not has_topic:
         return render_template(
             f"invenio_requests/{request_type}/user_dashboard.html",
             base_template="invenio_app_rdm/users/base.html",
             user_avatar=avatar,
             invenio_request=request.to_dict(),
             request_is_accepted=request_is_accepted,
+            permissions={**request_permissions},
+            include_deleted=False,
         )
 
+    topic = _resolve_topic_record(request)
+    record_ui = topic["record_ui"]
+
+    return render_template(
+        f"invenio_requests/{request_type}/index.html",
+        base_template="invenio_app_rdm/users/base.html",
+        user_avatar=avatar,
+        record=record,
+        record_ui=record_ui,
+        permissions={**topic["permissions"], **request_permissions},
+        invenio_request=request.to_dict(),
+        request_is_accepted=request_is_accepted,
+        include_deleted=False,
+    )
+
 
 @login_required
 @pass_request(expand=True)
@@ -145,47 +281,90 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
     is_draft_submission = request_type == CommunitySubmission.type_id
     is_record_inclusion = request_type == CommunityInclusion.type_id
     is_member_invitation = request_type == CommunityInvitation.type_id
+    is_subcommunity_request = request_type == SubCommunityRequest.type_id
+    is_subcommunity_invitation_request = (
+        request_type == SubCommunityInvitationRequest.type_id
+    )
     request_is_accepted = request["status"] == AcceptAction.status_to
 
-    if is_draft_submission or is_record_inclusion:
-        permissions = community.has_permissions_to(
-            ["update", "read", "search_requests", "search_invites"]
-        )
+    permissions = community.has_permissions_to(
+        ["update", "read", "search_requests", "search_invites", "submit_record"]
+    )
+    request_permissions = request.has_permissions_to(["action_accept"])
+    # Add request specific permissions so that reviewers can be selected from community curators
+    permissions.update(request_permissions)
 
+    if is_draft_submission or is_record_inclusion:
         topic = _resolve_topic_record(request)
-        record = topic["record_ui"]  # None when draft
-        is_draft = record["is_draft"] if record else False
-
+        record_ui = topic["record_ui"]
+        record = topic["record"]
+        is_draft = record_ui["is_draft"] if record_ui else False
+        is_published = record_ui["is_published"] if record_ui else False
+        has_draft = record._record.has_draft if record else False
         permissions.update(topic["permissions"])
-        files = _resolve_record_or_draft_files(record)
-        return render_template(
+
+        files = _resolve_record_or_draft_files(record_ui, request)
+        media_files = _resolve_record_or_draft_media_files(record_ui, request)
+
+        checks = None
+        if current_app.config.get("CHECKS_ENABLED", False) and record:
+            if is_record_inclusion and has_draft:
+                checks = ChecksAPI.get_runs(record._record, is_draft=True)
+            else:
+                checks = ChecksAPI.get_runs(record._record)
+
+        return render_community_theme_template(
             f"invenio_requests/{request_type}/index.html",
+            theme=community.to_dict().get("theme", {}),
             base_template="invenio_communities/details/base.html",
             invenio_request=request.to_dict(),
             record=record,
-            community=community_ui,
+            record_ui=record_ui,
+            community=community,
+            community_ui=community_ui,
+            checks=checks,
             permissions=permissions,
             is_preview=is_draft,  # preview only when draft
             is_draft=is_draft,
+            has_draft=has_draft,
+            is_published=is_published,
             request_is_accepted=request_is_accepted,
             files=files,
+            media_files=media_files,
             user_avatar=avatar,
             custom_fields_ui=load_custom_fields()["ui"],
+            user_communities_memberships=get_user_communities_memberships(),
+            external_resources=get_external_resources(record),
+            include_deleted=False,
         )
 
     elif is_member_invitation:
-        permissions = community.has_permissions_to(
-            ["update", "read", "search_requests", "search_invites"]
-        )
         if not permissions["can_search_invites"]:
             raise PermissionDeniedError()
 
-        return render_template(
+        return render_community_theme_template(
             f"invenio_requests/{request_type}/community_dashboard.html",
+            theme=community.to_dict().get("theme", {}),
             base_template="invenio_communities/details/members/base.html",
             invenio_request=request.to_dict(),
-            community=community.to_dict(),
+            community=community,
+            community_ui=community_ui,
+            permissions=permissions,
+            request_is_accepted=request_is_accepted,
+            user_avatar=avatar,
+            include_deleted=False,
+        )
+
+    elif is_subcommunity_request or is_subcommunity_invitation_request:
+        return render_community_theme_template(
+            f"invenio_requests/{request_type}/index.html",
+            theme=community.to_dict().get("theme", {}),
+            base_template="invenio_communities/details/base.html",
+            invenio_request=request.to_dict(),
+            community=community,
+            community_ui=community_ui,
             permissions=permissions,
             request_is_accepted=request_is_accepted,
             user_avatar=avatar,
+            include_deleted=False,
         )

invenio_app_rdm/requests_ui/views/ui.py

@@ -10,17 +10,20 @@
 
 from flask import Blueprint
 from invenio_pidstore.errors import PIDDeletedError, PIDDoesNotExistError
+from invenio_rdm_records.access_requests_ui.views import (
+    read_request,
+    verify_access_request_token,
+)
 from invenio_records_resources.services.errors import PermissionDeniedError
 from invenio_requests.views.ui import (
     not_found_error,
     record_permission_denied_error,
     record_tombstone_error,
 )
+from sqlalchemy.exc import NoResultFound
 
-from invenio_app_rdm.requests_ui.views.requests import (
-    community_dashboard_request_view,
-    user_dashboard_request_view,
-)
+from ...records_ui.searchapp import search_app_context
+from .requests import community_dashboard_request_view, user_dashboard_request_view
 
 
 def create_ui_blueprint(app):
@@ -49,11 +52,21 @@ def create_ui_blueprint(app):
         view_func=community_dashboard_request_view,
     )
 
+    blueprint.add_url_rule(
+        "/access/requests/confirm", view_func=verify_access_request_token
+    )
+    blueprint.add_url_rule(
+        "/access/requests/<request_pid_value>", view_func=read_request
+    )
+
     # Register error handlers
     blueprint.register_error_handler(
         PermissionDeniedError, record_permission_denied_error
     )
     blueprint.register_error_handler(PIDDeletedError, record_tombstone_error)
     blueprint.register_error_handler(PIDDoesNotExistError, not_found_error)
+    # due to requests found by ID, not PID (check service read method)
+    blueprint.register_error_handler(NoResultFound, not_found_error)
+    blueprint.app_context_processor(search_app_context)
 
     return blueprint

invenio_app_rdm/tasks.py

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

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