feat: enable admins to change decision, preserving current functionality

bcgov · Apr 23, 2021 · 3596c7e · 3596c7e
1 parent 5ee53aa
commit 3596c7e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 8 deletions.
diff --git a/app/containers/Admin/ApplicationReview/ApplicationReviewStepSelector.tsx b/app/containers/Admin/ApplicationReview/ApplicationReviewStepSelector.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
-import {Row, Col, ListGroup} from 'react-bootstrap';
+import {Row, Button, ListGroup} from 'react-bootstrap';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {
   faCheck,
   faComments,
   faTimes,
-  faHourglassHalf
+  faHourglassHalf,
+  faKey
 } from '@fortawesome/free-solid-svg-icons';
 import {graphql, createFragmentContainer} from 'react-relay';
 import {ApplicationReviewStepSelector_applicationReviewSteps} from '__generated__/ApplicationReviewStepSelector_applicationReviewSteps.graphql';
@@ -21,6 +22,7 @@ interface Props {
     | 'REJECTED'
     | 'REQUESTED_CHANGES';
   onDecisionOrChangeRequestAction: () => void;
+  changeDecision?: () => void;
 }
 
 const DECISION_BS_VARIANT = {
@@ -48,7 +50,8 @@ export const ApplicationReviewStepSelector: React.FunctionComponent<Props> = ({
   selectedStep,
   onSelectStep,
   decisionOrChangeRequestStatus,
-  onDecisionOrChangeRequestAction
+  onDecisionOrChangeRequestAction,
+  changeDecision
 }) => {
   const steps = applicationReviewSteps.edges;
   const allStepsAreComplete = steps.every((edge) => edge.node.isComplete);
@@ -67,7 +70,7 @@ export const ApplicationReviewStepSelector: React.FunctionComponent<Props> = ({
   );
   return (
     <Row>
-      <Col md={5}>
+      <div className="col-xxl-6 col-xl-7 col-lg-8 col-md-10">
         <ListGroup as="ul" id="selector">
           {steps.map((edge) => {
             const {reviewStepId, isComplete} = edge.node;
@@ -126,7 +129,24 @@ export const ApplicationReviewStepSelector: React.FunctionComponent<Props> = ({
             {DECISION_BUTTON_TEXT[decisionOrChangeRequestStatus]}
           </ListGroup.Item>
         </ListGroup>
-      </Col>
+      </div>
+      <div
+        id="change-decision"
+        className="col-md-12 col-lg-4 col-xl-5 col-xxl-6"
+      >
+        {changeDecision && (
+          <Button variant="link" onClick={changeDecision}>
+            <FontAwesomeIcon icon={faKey} style={{marginRight: 8}} />
+            Change decision
+          </Button>
+        )}
+      </div>
+      <style jsx>{`
+        #change-decision {
+          display: flex;
+          align-items: flex-end;
+        }
+      `}</style>
       <style jsx global>{`
         #selector .list-group-item-danger.disabled,
         .list-group-item-danger:disabled {

diff --git a/app/containers/Admin/ApplicationReview/ReviewSidebar.tsx b/app/containers/Admin/ApplicationReview/ReviewSidebar.tsx
@@ -149,7 +149,7 @@ export const ReviewSidebar: React.FunctionComponent<Props> = ({
         description={description}
         createdAt={createdAt}
         createdBy={`${ciipUserByCreatedBy.firstName} ${ciipUserByCreatedBy.lastName}`}
-        viewOnly={applicationReviewStep?.isComplete}
+        viewOnly={isFinalized || applicationReviewStep?.isComplete}
         isResolved={resolved}
         onResolveToggle={resolveComment}
         onDelete={(id) => deleteComment(id, commentType)}
@@ -248,7 +248,7 @@ export const ReviewSidebar: React.FunctionComponent<Props> = ({
         <Button variant="link" style={{padding: 0}} onClick={toggleResolved}>
           {`${showingResolved ? 'Hide' : 'Show'} resolved comments`}
         </Button>
-        {!applicationReviewStep?.isComplete && (
+        {!isFinalized && !applicationReviewStep?.isComplete && (
           <Button variant="primary">+ New Comment</Button>
         )}
       </div>

diff --git a/app/pages/analyst/application-review.tsx b/app/pages/analyst/application-review.tsx
@@ -109,7 +109,18 @@ class ApplicationReview extends Component<Props, State> {
     const {overrideJustification} = query?.applicationRevision;
     const {applicationRevisionStatus} = query?.application.reviewRevisionStatus;
     const {session} = query || {};
-    const currentReviewIsFinalized = applicationRevisionStatus !== 'SUBMITTED';
+    const isUserAdmin = query?.session.userGroups.some((groupConst) =>
+      ADMIN_GROUP.includes(groupConst)
+    );
+    const currentReviewIsFinalized =
+      this.props.query?.application.reviewRevisionStatus
+        .applicationRevisionStatus !== 'SUBMITTED';
+
+    const handleChangeDecision = () => {
+      console.log(
+        'implement me in 2294 - should open the decision dialog with admin-only option to revert (to SUBMITTED status)'
+      );
+    };
 
     return (
       <DefaultLayout
@@ -147,6 +158,11 @@ class ApplicationReview extends Component<Props, State> {
               }
               selectedStep={this.state.selectedReviewStepId}
               onSelectStep={this.selectReviewStep}
+              changeDecision={
+                isUserAdmin && currentReviewIsFinalized
+                  ? handleChangeDecision
+                  : undefined
+              }
             />
             <ApplicationOverrideNotification
               overrideJustification={overrideJustification}