invenio-app-rdm 14.0.0b0.dev4__py2.py3-none-any.whl → 14.0.0b1.dev2__py2.py3-none-any.whl

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/guest-access-request/index.html

@@ -30,11 +30,11 @@
           {# only display the header for the receiver #}
           {%- set back_button_url = url_for("invenio_app_rdm_users.requests") %}
           {{ inclusion_request_header(
-        back_button_url=back_button_url,
-        back_button_text=_("Back to requests"),
-        request=invenio_request,
-        accepted=request_is_accepted
-      ) }}
+            back_button_url=back_button_url,
+            back_button_text=_("Back to requests"),
+            request=invenio_request,
+            accepted=request_is_accepted
+          ) }}
 
         {%- else %}
           <div class="ui grid rel-mt-2">

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/record-deletion/index.html

@@ -0,0 +1,93 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2016-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_requests/details/index.html" %}
+
+{% set active_dashboard_menu_item = 'requests' %}
+{% set active_community_header_menu_item = 'requests' %}
+
+{%- block request_header %}
+    {% set back_button_url = url_for("invenio_app_rdm_users.requests") %}
+  {% from "invenio_requests/macros/request_header.html" import inclusion_request_header %}
+  {{ inclusion_request_header(
+      request=invenio_request,
+      record=record,
+      accepted=request_is_accepted,
+      back_button_url=back_button_url,
+      back_button_text=_("Back to requests")
+    ) }}
+
+    <div class="twelve wide column mt-10">
+      <p><strong>{{ _("Reason:") }}</strong> {{ invenio_request["payload"]["reason_label"] }}</p>
+      <p><strong>{{ _("Justification:") }}</strong> {{ invenio_request["payload"]["comment"] }}</p>
+    </div>
+{%- endblock request_header %}
+
+{% block request_timeline %}
+  <div
+    class="ui container rdm-tab-container fluid rel-pt-2 ml-0-mobile mr-0-mobile"
+    id="request-request-deletion-tab-container"
+  >
+    <div
+      class="ui secondary pointing menu rdm-tab-menu"
+      id="request-deletion-request-tab"
+    >
+      <a
+        class="active item"
+        data-tab="conversation"
+        role="tab"
+        aria-selected="true"
+        aria-controls="conversation-tab-panel"
+        id="conversation-tab"
+      >
+        {{ _("Conversation") }}
+      </a>
+
+      {% if record_ui %}
+        <a
+          role="tab"
+          class="item"
+          data-tab="record"
+          aria-selected="false"
+          aria-controls="record-tab-panel"
+          id="record-tab"
+        >
+          {{ _("Record") }}
+        </a>
+      {% endif %}
+    </div>
+
+    <div
+      class="ui bottom attached tab segment active borderless p-0"
+      data-tab="conversation"
+      role="tabpanel"
+      aria-labelledby="conversation-tab"
+      id="conversation-tab-panel"
+    >
+      {{ super() }}
+    </div>
+
+    {# The record tab content needs to be last since the HTML structure is complex and breaks following tab contents #}
+    {% if record_ui %}
+      <div
+        class="ui bottom attached tab segment borderless"
+        data-tab="record"
+        role="tabpanel"
+        aria-labelledby="record-tab"
+        id="record-tab-panel"
+        hidden="hidden"
+      >
+        {% set use_theme_basic_template = false %}
+        {% set preview_submission_request = true %}
+        {% include config.APP_RDM_RECORD_LANDING_PAGE_TEMPLATE %}
+      </div>
+    {% endif %}
+
+  </div>
+{% endblock request_timeline %}

invenio_app_rdm/requests_ui/views/requests.py

@@ -22,16 +22,20 @@ from invenio_communities.subcommunities.services.request import (
 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 ...records_ui.utils import get_external_resources
@@ -89,7 +93,7 @@ def _resolve_topic_record(request):
             record = current_rdm_records_service.read_draft(
                 g.identity, pid, expand=True
             )
-    except (NoResultFound, PIDDoesNotExistError):
+    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
@@ -98,7 +102,7 @@ def _resolve_topic_record(request):
         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
@@ -202,6 +206,17 @@ def user_dashboard_request_view(request, **kwargs):
             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"),
+            )
+
         return render_template(
             f"invenio_requests/{request_type}/index.html",
             base_template="invenio_app_rdm/users/base.html",

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/requests/RequestsSearchResultItem.js

@@ -0,0 +1,81 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2025 CERN.
+ *
+ * InvenioAppRdm 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 PropTypes from "prop-types";
+import React, { Component } from "react";
+import { Table } from "semantic-ui-react";
+import { withState } from "react-searchkit";
+import { AdminUIRoutes } from "@js/invenio_administration/src/routes.js";
+import { UserListItemCompact, toRelativeTime } from "react-invenio-forms";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+
+class SearchResultItemComponent extends Component {
+  refreshAfterAction = () => {
+    const { updateQueryState, currentQueryState } = this.props;
+    updateQueryState(currentQueryState);
+  };
+
+  render() {
+    const { result, columns, idKeyPath, listUIEndpoint } = this.props;
+    return (
+      <Table.Row>
+        <Table.Cell
+          key={`${columns[0][1]["text"]}-${columns[0][1]["order"]}`}
+          data-label={columns[0][1]["text"]}
+          className="word-break-all"
+        >
+          <a href={AdminUIRoutes.detailsView(listUIEndpoint, result, idKeyPath)}>
+            {/* TODO we need a better way to get the (translatable) label of a request type
+            https://github.com/inveniosoftware/invenio-requests/issues/414 */}
+            {result.type === "record-deletion" && "Record deletion"}
+          </a>
+        </Table.Cell>
+        <Table.Cell
+          key={`${columns[1][1]["text"]}-${columns[1][1]["order"]}`}
+          data-label={columns[1][1]["text"]}
+          className="word-break-all"
+        >
+          <UserListItemCompact
+            user={result.expanded.created_by}
+            id={result.created_by.user}
+            // TODO linkToDetailView= filter by user?
+          />
+          {toRelativeTime(result.created)}
+        </Table.Cell>
+        <Table.Cell
+          key={`${columns[2][1]["text"]}-${columns[2][1]["order"]}`}
+          data-label={columns[2][1]["text"]}
+          className="word-break-all"
+        >
+          {result.expanded.last_reply ? (
+            <>
+              <UserListItemCompact
+                user={result.expanded.last_reply.created_by}
+                id={result.last_reply.created_by.user}
+              />
+              {toRelativeTime(result.last_reply.created)}
+            </>
+          ) : (
+            i18next.t("No replies")
+          )}
+        </Table.Cell>
+      </Table.Row>
+    );
+  }
+}
+
+SearchResultItemComponent.propTypes = {
+  result: PropTypes.object.isRequired,
+  columns: PropTypes.array.isRequired,
+  updateQueryState: PropTypes.func.isRequired,
+  currentQueryState: PropTypes.object.isRequired,
+  idKeyPath: PropTypes.string.isRequired,
+  listUIEndpoint: PropTypes.string.isRequired,
+};
+
+export const SearchResultItem = withState(SearchResultItemComponent);

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/requests/RequestsSearchbarLayout.js

@@ -0,0 +1,48 @@
+/*
+ * // This file is part of Invenio-Requests
+ * // Copyright (C) 2025 CERN.
+ * //
+ * // Invenio-Requests 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 PropTypes from "prop-types";
+import React, { Component } from "react";
+import { RequestStatusFilter } from "@js/invenio_requests/search";
+import { SearchBar, Sort } from "react-searchkit";
+
+export class RequestsSearchbarLayout extends Component {
+  render() {
+    const { config } = this.props;
+
+    return (
+      <>
+        {/* auto column grid used instead of SUI grid for better searchbar width adjustment */}
+        <div className="auto-column-grid">
+          <div className="flex column-mobile">
+            <div className="mobile only rel-mb-1 flex align-items-center justify-space-between">
+              <RequestStatusFilter keepFiltersOnUpdate />
+            </div>
+
+            <div className="tablet only computer only rel-mr-2">
+              <RequestStatusFilter keepFiltersOnUpdate />
+            </div>
+            <div className="full-width">
+              <SearchBar fluid />
+            </div>
+          </div>
+          <div className="flex align-items-center column-mobile">
+            <div className="full-width flex align-items-center justify-end column-mobile">
+              <Sort values={config.sortOptions} />
+            </div>
+          </div>
+        </div>
+        <div className="rel-mb-1" />
+      </>
+    );
+  }
+}
+
+RequestsSearchbarLayout.propTypes = {
+  config: PropTypes.object.isRequired,
+};

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/administration/requests/index.js

@@ -0,0 +1,22 @@
+// This file is part of InvenioCommunities
+// Copyright (C) 2025 CERN.
+//
+// Invenio 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 { initDefaultSearchComponents } from "@js/invenio_administration";
+import { createSearchAppInit } from "@js/invenio_search_ui";
+import { RequestsSearchbarLayout } from "./RequestsSearchbarLayout";
+import { SearchResultItem } from "./RequestsSearchResultItem";
+
+const domContainer = document.getElementById("invenio-search-config");
+
+const defaultComponents = initDefaultSearchComponents(domContainer);
+
+const overridenComponents = {
+  ...defaultComponents,
+  "SearchApp.searchbarContainer": RequestsSearchbarLayout,
+  "InvenioAdministration.SearchResultItem.layout": SearchResultItem,
+};
+
+createSearchAppInit(overridenComponents, true, "invenio-search-config", false);

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/components/RecordDeletion/DeletionModal.js

@@ -0,0 +1,356 @@
+// This file is part of InvenioRDM
+// 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 { i18next } from "@translations/invenio_app_rdm/i18next";
+import { Formik } from "formik";
+import PropTypes from "prop-types";
+import React, { Component } from "react";
+
+import {
+  ErrorMessage,
+  http,
+  SelectField,
+  TextAreaField,
+  withCancel,
+} from "react-invenio-forms";
+import {
+  Button,
+  Checkbox,
+  Icon,
+  Form,
+  Message,
+  Modal,
+  ModalActions,
+  ModalContent,
+  ModalHeader,
+  Table,
+  TableBody,
+  TableHeader,
+  TableHeaderCell,
+  TableRow,
+} from "semantic-ui-react";
+import * as Yup from "yup";
+import DeletionRadioGroup from "./DeletionRadioGroup";
+
+export class DeletionModal extends Component {
+  constructor(props) {
+    super(props);
+    const { recordDeletion } = this.props;
+    const checklistLength = recordDeletion["checklist"]?.length || 0;
+    this.initState = {
+      loading: false,
+      error: undefined,
+      checklistState: Array(checklistLength).fill(undefined),
+      checkboxState: Array(2).fill(false), // TODO dynamic count of number of checkboxes
+      messages: [],
+    };
+    this.state = { ...this.initState };
+  }
+
+  handleClose = () => {
+    this.setState({
+      ...this.initState,
+    });
+    const { handleClose } = this.props;
+    handleClose();
+  };
+
+  handleRadioUpdate = (index, value) => {
+    const { recordDeletion } = this.props;
+    const { checklistState } = this.state;
+    const nextChecklistState = checklistState.map((c, i) => {
+      if (i === index) {
+        return value;
+      } else {
+        return c;
+      }
+    });
+    const filteredChecklist = recordDeletion["checklist"].filter((_, index) => {
+      return nextChecklistState[index];
+    });
+    const newMessages = filteredChecklist.map((x) => x["message"]);
+    this.setState({ checklistState: nextChecklistState, messages: newMessages });
+  };
+
+  handleCheckboxUpdate = (index) => {
+    const { checkboxState } = this.state;
+    const nextCheckboxState = checkboxState.map((c, i) => {
+      if (i === index) {
+        return !checkboxState[i];
+      } else {
+        return c;
+      }
+    });
+    this.setState({ checkboxState: nextCheckboxState });
+  };
+
+  deletionRequestSchema = (immediateDeletionAllowed) => {
+    if (immediateDeletionAllowed) {
+      return Yup.object({
+        reason: Yup.string().required("Required"),
+      });
+    } else {
+      return Yup.object({
+        reason: Yup.string().required("Required"),
+        comment: Yup.string()
+          .min(25, "Please write at least 25 characters")
+          .required("Required"),
+      });
+    }
+  };
+
+  handleSubmit = async (values) => {
+    this.setState({ loading: true });
+    const { record } = this.props;
+    const payload = {
+      reason: values.reason,
+      comment: values.comment,
+    };
+    if ("request_deletion" in record.links) {
+      this.cancellableAction = withCancel(
+        http.post(record.links.request_deletion, payload)
+      );
+      try {
+        const response = await this.cancellableAction.promise;
+        const data = response.data;
+
+        if (response.status === 200) {
+          window.location.reload();
+        } else if (response.status === 201) {
+          window.location.href = data.links.self_html;
+        }
+      } catch (error) {
+        this.setState({ error: error });
+        console.error(error);
+      } finally {
+        this.setState({ loading: false });
+      }
+    } else {
+      this.setState({ error: "Could not submit deletion request", loading: false });
+    }
+  };
+
+  render() {
+    const { open, recordDeletion, options } = this.props;
+    const { loading, error, checklistState, checkboxState, messages } = this.state;
+
+    const { checklist } = recordDeletion;
+
+    if (!("recordDeletion" in recordDeletion)) {
+      return null;
+    }
+
+    const immediateDeletionAllowed =
+      recordDeletion["recordDeletion"]["immediate_deletion"]["allowed"];
+
+    const modalHeaderText = immediateDeletionAllowed
+      ? i18next.t("Delete record")
+      : i18next.t("Request deletion");
+    const deletionButtonText = immediateDeletionAllowed
+      ? i18next.t("Delete immediately")
+      : i18next.t("Request deletion");
+    const deletionButtonClass = immediateDeletionAllowed ? "negative" : "primary";
+
+    const files = recordDeletion["context"]["files"];
+    const internalDoi = recordDeletion["context"]["internalDoi"];
+
+    const formDisabled =
+      checkboxState.some((v) => v === false) ||
+      checklistState.some((x) => x === true || x === undefined);
+
+    return (
+      <Modal
+        open={open}
+        closeIcon
+        onClose={this.handleClose}
+        role="dialog"
+        aria-modal="true"
+        tab-index="-1"
+        size="tiny"
+        closeOnDimmerClick={false}
+        onClick={(e) => e.stopPropagation()} // prevent interaction with dropdown
+        onKeyDown={(e) => e.stopPropagation()} // prevent interaction with dropdown
+      >
+        <ModalHeader>{modalHeaderText}</ModalHeader>
+        <Formik
+          onSubmit={this.handleSubmit}
+          validationSchema={this.deletionRequestSchema(immediateDeletionAllowed)}
+          initialValues={{ reason: "", comment: "" }}
+          validateOnChange={false}
+          validateOnBlur={false}
+        >
+          {({ handleSubmit }) => (
+            <Form>
+              <ModalContent>
+                <>
+                  {immediateDeletionAllowed ? (
+                    <p>
+                      {
+                        recordDeletion["recordDeletion"]["immediate_deletion"][
+                          "policy"
+                        ]["description"]
+                      }
+                    </p>
+                  ) : (
+                    <p>
+                      {
+                        recordDeletion["recordDeletion"]["request_deletion"]["policy"][
+                          "description"
+                        ]
+                      }
+                    </p>
+                  )}
+                  <Message negative>
+                    <Icon name="warning sign" />
+                    {i18next.t("By deleting this record you acknowledge that:")}
+                    <br />
+                    <Checkbox
+                      label={
+                        /* eslint-disable-next-line jsx-a11y/label-has-associated-control */
+                        <label>
+                          <strong>
+                            {files} file{files !== 1 ? "s" : ""}
+                          </strong>{" "}
+                          {i18next.t("will be deleted.")}
+                        </label>
+                      }
+                      className="mt-5 mb-5"
+                      onChange={() => this.handleCheckboxUpdate(0)}
+                    />
+                    <br />
+                    {internalDoi ? (
+                      <Checkbox
+                        label={
+                          /* eslint-disable-next-line jsx-a11y/label-has-associated-control */
+                          <label>
+                            <strong>{i18next.t("The DOI cannot be reused")}</strong>{" "}
+                            {i18next.t(
+                              "and the DOI will resolve to a tombstone page with the record's citation (including title, author/s, publication year and publisher)"
+                            )}
+                          </label>
+                        }
+                        className="mb-5"
+                        onChange={() => this.handleCheckboxUpdate(1)}
+                      />
+                    ) : (
+                      <Checkbox
+                        label={
+                          /* eslint-disable-next-line jsx-a11y/label-has-associated-control */
+                          <label>
+                            {i18next.t(
+                              "A tombstone page with the citation will replace the record page"
+                            )}
+                          </label>
+                        }
+                        className="mb-5"
+                        onChange={() => this.handleCheckboxUpdate(1)}
+                      />
+                    )}
+                  </Message>
+                </>
+                {checklist.length > 0 && (
+                  <>
+                    <strong>{i18next.t("Record deletion checklist:")}</strong>
+                    <Table basic="very" unstackable className="mt-0">
+                      <TableHeader>
+                        <TableRow>
+                          <TableHeaderCell />
+                          <TableHeaderCell>{i18next.t("Yes")}</TableHeaderCell>
+                          <TableHeaderCell>{i18next.t("No")}</TableHeaderCell>
+                        </TableRow>
+                      </TableHeader>
+                      <TableBody>
+                        {checklist.map((row, index) => (
+                          <DeletionRadioGroup
+                            index={index}
+                            row={row}
+                            key={row.name}
+                            state={checklistState}
+                            onStateChange={this.handleRadioUpdate}
+                          />
+                        ))}
+                      </TableBody>
+                    </Table>
+                    {messages.length > 0 && (
+                      <Message info>
+                        {messages.length === 1 ? (
+                          <p dangerouslySetInnerHTML={{ __html: messages[0] }} />
+                        ) : (
+                          <Message.List>
+                            {messages.map((message) => (
+                              <Message.Item key={message}>
+                                <p dangerouslySetInnerHTML={{ __html: message }} />
+                              </Message.Item>
+                            ))}
+                          </Message.List>
+                        )}
+                      </Message>
+                    )}
+                  </>
+                )}
+                <SelectField
+                  fluid
+                  fieldPath="reason"
+                  name="reason"
+                  label={i18next.t("I want to delete this record because:")}
+                  options={options}
+                  required
+                  disabled={formDisabled}
+                />
+
+                {!immediateDeletionAllowed && (
+                  <TextAreaField
+                    fieldPath="comment"
+                    name="comment"
+                    label={i18next.t("Detailed justification:")}
+                    required
+                    placeholder={i18next.t(
+                      "Your justification will not be shared publicly"
+                    )}
+                    disabled={formDisabled}
+                  />
+                )}
+                {error && (
+                  <ErrorMessage
+                    header={i18next.t("Unable to request deletion.")}
+                    content={i18next.t(error)}
+                    icon="exclamation"
+                    className="text-align-left"
+                    negative
+                  />
+                )}
+              </ModalContent>
+              <ModalActions>
+                <Button
+                  onClick={this.handleClose}
+                  content={i18next.t("Close")}
+                  floated="left"
+                />
+                <Button
+                  content={deletionButtonText}
+                  className={deletionButtonClass}
+                  icon="trash alternate outline"
+                  type="submit"
+                  onClick={(event) => handleSubmit(event)}
+                  loading={loading}
+                  disabled={formDisabled || loading}
+                />
+              </ModalActions>
+            </Form>
+          )}
+        </Formik>
+      </Modal>
+    );
+  }
+}
+
+DeletionModal.propTypes = {
+  record: PropTypes.object.isRequired,
+  open: PropTypes.bool.isRequired,
+  handleClose: PropTypes.func.isRequired,
+  recordDeletion: PropTypes.object.isRequired,
+  options: PropTypes.array.isRequired,
+};