refactor: remove approve action + opinionated reviews

Author: yashlamba

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

@@ -123,45 +123,6 @@ 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,

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

@@ -14,7 +14,6 @@ import {
   RequestSubmitButton,
   RequestCancelButton,
   RequestDeclineButton,
-  RequestApproveButton,
 } from "./Buttons";
 
 const { MediaContextProvider, Media } = AppMedia;
@@ -119,58 +118,6 @@ RequestAcceptModalTrigger.propTypes = {
   className: PropTypes.string,
 };
 
-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",
-  className: "ml-5",
-};
-
 export const RequestCancelModalTrigger = ({
   onClick,
   loading,

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

@@ -23,14 +23,12 @@ import {
 } from "@js/invenio_requests/contrib";
 import {
   RequestAcceptButton,
-  RequestApproveButton,
   RequestCancelButton,
   RequestDeclineButton,
   RequestSubmitButton,
 } from "@js/invenio_requests/components/Buttons";
 import {
   RequestAcceptModalTrigger,
-  RequestApproveModalTrigger,
   RequestDeclineModalTrigger,
   RequestCancelModalTrigger,
   RequestSubmitModalTrigger,
@@ -63,9 +61,7 @@ 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/requestsAppInit.js

@@ -22,7 +22,6 @@ import {
 } from "./request";
 import {
   TimelineAcceptEvent,
-  TimelineApproveEvent,
   TimelineCancelEvent,
   TimelineCommentDeletionEvent,
   TimelineDeclineEvent,
@@ -41,7 +40,6 @@ const defaultComponents = {
   "TimelineEvent.layout.unknown": TimelineUnknownEvent,
   "TimelineEvent.layout.declined": TimelineDeclineEvent,
   "TimelineEvent.layout.accepted": TimelineAcceptEvent,
-  "TimelineEvent.layout.approved": TimelineApproveEvent,
   "TimelineEvent.layout.expired": TimelineExpireEvent,
   "TimelineEvent.layout.cancelled": TimelineCancelEvent,
   "TimelineEvent.layout.comment_deleted": TimelineCommentDeletionEvent,

invenio_requests/assets/semantic-ui/js/invenio_requests/timelineEvents/timelineActionEvents.js

@@ -23,19 +23,6 @@ TimelineAcceptEvent.propTypes = {
   event: PropTypes.object.isRequired,
 };
 
-export const TimelineApproveEvent = ({ event }) => (
-  <TimelineActionEvent
-    iconName="check circle"
-    iconColor="positive"
-    event={event}
-    eventContent={i18next.t("approved this request")}
-  />
-);
-
-TimelineApproveEvent.propTypes = {
-  event: PropTypes.object.isRequired,
-};
-
 export const TimelineDeclineEvent = ({ event }) => (
   <TimelineActionEvent
     iconName="close"

invenio_requests/customizations/__init__.py

@@ -10,7 +10,6 @@
 
 from .actions import (
     AcceptAction,
-    ApproveAction,
     CancelAction,
     CreateAction,
     CreateAndSubmitAction,
@@ -27,7 +26,6 @@
 
 __all__ = (
     "AcceptAction",
-    "ApproveAction",
     "CancelAction",
     "CommentEventType",
     "CreateAction",

invenio_requests/customizations/actions.py

@@ -8,8 +8,6 @@
 
 """Base class for customizable actions on requests."""
 
-from datetime import datetime
-
 from ..errors import NoSuchActionError
 from ..proxies import current_events_service
 from .event_types import LogEventType
@@ -151,28 +149,3 @@ class ExpireAction(RequestAction):
 
     status_from = ["submitted"]
     status_to = "expired"
-
-
-class ApproveAction(RequestAction):
-    """Approve a request."""
-
-    status_from = ["submitted"]
-    status_to = "submitted"
-
-    def execute(self, identity, uow):
-        """Execute the request action."""
-        self.request.status = self.status_to
-        # check if identity is a reviewer then add it to the lastOpiniatedReview
-        # new_reviewer = {"user": identity.id, "state": "approved"}
-        # set_of_reviewers = set(self.request.reviewers)
-        # set_of_reviewers.add(new_reviewer)
-        # self.request.reviewers = list(set_of_reviewers)
-        # breakpoint()
-        event = LogEventType(payload=dict(event="approved"))
-        _data = dict(payload=event.payload)
-        current_events_service.create(identity, self.request.id, _data, event, uow=uow)
-        self.request.lastOpiniatedReviews = {
-            "user": str(identity.id),
-            "state": "approved",
-            "timestamp": datetime.now().isoformat(),
-        }

invenio_requests/customizations/request_types.py

@@ -21,7 +21,6 @@
 from ..proxies import current_requests
 from .actions import (
     AcceptAction,
-    ApproveAction,
     CancelAction,
     CreateAction,
     DeclineAction,
@@ -112,7 +111,6 @@ class RequestType:
         "submit": SubmitAction,
         "delete": DeleteAction,
         "accept": AcceptAction,
-        "approve": ApproveAction,
         "decline": DeclineAction,
         "cancel": CancelAction,
         "expire": ExpireAction,

invenio_requests/records/api.py

@@ -86,9 +86,6 @@ class Request(Record):
     reviewers = MultiEntityReferenceField("reviewers", check_allowed_reviewers)
     """The entity that will receive the request."""
 
-    lastOpiniatedReviews = DictField("last_opiniated_reviews")
-    """The last opiniated reviews of the request."""
-
     status = RequestStatusField("status")
     """The current status of the request."""
 

invenio_requests/records/jsonschemas/requests/request-v1.0.0.json

@@ -42,9 +42,6 @@
       "items": {
         "$ref": "local://definitions-v1.0.0.json#/entity_reference"
       }
-    },
-    "last_opiniated_reviews": {
-      "$ref": "local://requests/definitions-v1.0.0.json#/anything"
     }
   }
 }