wip reviewer entity

Author: zzacharo

.python-version

@@ -0,0 +1 @@
+invenio-requests-tests

invenio_requests/assets/semantic-ui/js/invenio_requests/api/InvenioRequestApi.js

@@ -5,6 +5,7 @@
 // under the terms of the MIT License; see LICENSE file for more details.
 
 import _isEmpty from "lodash/isEmpty";
+import _toNumber from "lodash/toNumber";
 import { http } from "react-invenio-forms";
 
 export class RequestLinksExtractor {
@@ -73,6 +74,14 @@ export class InvenioRequestsAPI {
     });
   };
 
+  addReviewer = async (reviewers) => {
+    return await http.put(this.#urls.self, {
+      reviewer: reviewers.map((r) => {
+        return !_toNumber(r.id) ? { group: r.id } : { user: r.id };
+      }),
+    });
+  };
+
   performAction = async (action, commentContent = null) => {
     let payload = {};
     if (!_isEmpty(commentContent)) {

invenio_requests/assets/semantic-ui/js/invenio_requests/components/Buttons.js

@@ -123,6 +123,46 @@ export const CancelButton = React.forwardRef((props, ref) => {
 
 CancelButton.displayName = "CancelButton";
 
+export const RequestApproveButton = ({
+  onClick,
+  loading,
+  ariaAttributes,
+  size,
+  content = i18next.t("Approve"),
+  className,
+}) => {
+  return (
+    <Button
+      icon="checkmark"
+      labelPosition="left"
+      content={content}
+      onClick={onClick}
+      loading={loading}
+      disabled={loading}
+      size={size}
+      positive
+      className={className}
+      {...ariaAttributes}
+    />
+  );
+};
+
+RequestApproveButton.propTypes = {
+  onClick: PropTypes.func.isRequired,
+  requestType: PropTypes.string.isRequired,
+  loading: PropTypes.bool,
+  ariaAttributes: PropTypes.object,
+  size: PropTypes.string,
+  className: PropTypes.string,
+};
+
+RequestApproveButton.defaultProps = {
+  loading: false,
+  ariaAttributes: {},
+  size: "mini",
+  className: "",
+};
+
 export const RequestCancelButton = ({
   onClick,
   loading,

invenio_requests/assets/semantic-ui/js/invenio_requests/components/ModalTriggers.js

@@ -14,6 +14,7 @@ import {
   RequestSubmitButton,
   RequestCancelButton,
   RequestDeclineButton,
+  RequestApproveButton,
 } from "./Buttons";
 
 const { MediaContextProvider, Media } = AppMedia;
@@ -118,7 +119,52 @@ RequestAcceptModalTrigger.propTypes = {
   className: PropTypes.string,
 };
 
-RequestAcceptModalTrigger.defaultProps = {
+export const RequestApproveModalTrigger = ({
+  onClick,
+  requestType,
+  loading,
+  ariaAttributes,
+  size,
+  className,
+}) => {
+  return (
+    <MediaContextProvider>
+      <Media greaterThanOrEqual="tablet">
+        <RequestApproveButton
+          onClick={onClick}
+          loading={loading}
+          disabled={loading}
+          requestType={requestType}
+          size={size}
+          className={className}
+          {...ariaAttributes}
+        />
+      </Media>
+      <Media at="mobile">
+        <Dropdown.Item
+          icon={{
+            name: "checkmark",
+            color: "positive",
+            className: "mr-5",
+          }}
+          onClick={onClick}
+          content={i18next.t("Approve")}
+        />
+      </Media>
+    </MediaContextProvider>
+  );
+};
+
+RequestApproveModalTrigger.propTypes = {
+  onClick: PropTypes.func.isRequired,
+  requestType: PropTypes.string.isRequired,
+  loading: PropTypes.bool,
+  ariaAttributes: PropTypes.object,
+  size: PropTypes.string,
+  className: PropTypes.string,
+};
+
+RequestApproveModalTrigger.defaultProps = {
   loading: false,
   ariaAttributes: {},
   size: "mini",

invenio_requests/assets/semantic-ui/js/invenio_requests/contrib/index.js

@@ -23,12 +23,14 @@ import {
 } from "@js/invenio_requests/contrib";
 import {
   RequestAcceptButton,
+  RequestApproveButton,
   RequestCancelButton,
   RequestDeclineButton,
   RequestSubmitButton,
 } from "@js/invenio_requests/components/Buttons";
 import {
   RequestAcceptModalTrigger,
+  RequestApproveModalTrigger,
   RequestDeclineModalTrigger,
   RequestCancelModalTrigger,
   RequestSubmitModalTrigger,
@@ -61,7 +63,9 @@ export const defaultContribComponents = {
   [`RequestActionButton.decline`]: RequestDeclineButton,
   [`RequestActionButton.submit`]: RequestSubmitButton,
   [`RequestActionButton.accept`]: RequestAcceptButton,
+  [`RequestActionButton.approve`]: RequestApproveButton,
   [`RequestActionModalTrigger.accept`]: RequestAcceptModalTrigger,
+  [`RequestActionModalTrigger.approve`]: RequestApproveModalTrigger,
   [`RequestActionModalTrigger.decline`]: RequestDeclineModalTrigger,
   [`RequestActionModalTrigger.cancel`]: RequestCancelModalTrigger,
   [`RequestActionModalTrigger.submit`]: RequestSubmitModalTrigger,

invenio_requests/assets/semantic-ui/js/invenio_requests/request/RequestDetails.js

@@ -26,7 +26,7 @@ class RequestDetails extends Component {
             />
           </Grid.Column>
           <Grid.Column mobile={16} tablet={4} computer={3}>
-            <RequestMetadata request={request} />
+            <RequestMetadata request={request} permissions={permissions} />
           </Grid.Column>
         </Grid>
       </Overridable>

invenio_requests/assets/semantic-ui/js/invenio_requests/request/RequestMetadata.js

@@ -11,10 +11,11 @@ import PropTypes from "prop-types";
 import React, { Component } from "react";
 import { Image } from "react-invenio-forms";
 import Overridable from "react-overridable";
-import { Divider, Header, Icon, Message } from "semantic-ui-react";
+import { Divider, Header, Icon, Message, Button } from "semantic-ui-react";
 import { toRelativeTime } from "react-invenio-forms";
 import RequestStatus from "./RequestStatus";
 import RequestTypeLabel from "./RequestTypeLabel";
+import { RequestReviewers } from "./RequestReviewers";
 
 const User = ({ user }) => (
   <div className="flex">
@@ -84,10 +85,8 @@ ExternalEmail.propTypes = {
 
 const Group = ({ group }) => (
   <div className="flex">
-    <Icon name="group" className="mr-5" />
-    <span>
-      {i18next.t("Group")}: {group?.name}
-    </span>
+    <Icon name="group" className="mr-10" />
+    <span>{group?.name}</span>
   </div>
 );
 
@@ -97,7 +96,7 @@ Group.propTypes = {
   }).isRequired,
 };
 
-const EntityDetails = ({ userData, details }) => {
+export const EntityDetails = ({ userData, details }) => {
   const isUser = "user" in userData;
   const isCommunity = "community" in userData;
   const isExternalEmail = "email" in userData;
@@ -139,7 +138,7 @@ EntityDetails.propTypes = {
   ]).isRequired,
 };
 
-const DeletedResource = ({ details }) => (
+export const DeletedResource = ({ details }) => (
   <Message negative>{details.metadata.title}</Message>
 );
 
@@ -158,9 +157,20 @@ class RequestMetadata extends Component {
     const { request } = this.props;
     const expandedCreatedBy = request.expanded?.created_by;
     const expandedReceiver = request.expanded?.receiver;
+    const expandedReviewer = request.expanded?.reviewer;
+
     return (
       <Overridable id="InvenioRequest.RequestMetadata.Layout" request={request}>
         <>
+          {expandedReviewer !== undefined && (
+            <>
+              <RequestReviewers
+                request={request}
+                permissions={this.props.permissions}
+              />
+              <Divider />
+            </>
+          )}
           {expandedCreatedBy !== undefined && (
             <>
               <Header as="h3" size="tiny">