Fix report approval by admins and when automatic

client/src/components/ReportWorkflow.js

@@ -16,6 +16,7 @@ const ACTION_TYPE_DETAILS = {
   UNPUBLISH: { text: "Unpublished", cssClass: "btn-danger unpublished" },
   null: { text: "Pending", cssClass: "btn-pending default" }
 }
+const SYSTEM_USER = "system"
 
 const ApprovalStepModalStatus = ({ action }) => {
   if (action.type) {
@@ -27,7 +28,7 @@ const ApprovalStepModalStatus = ({ action }) => {
         <LinkTo
           modelType="Person"
           model={action.person}
-          whenUnspecified="system"
+          whenUnspecified={SYSTEM_USER}
           isLink={false}
         />{" "}
         on
@@ -109,7 +110,12 @@ export const ActionButton = ({ action }) => {
       disabled
     >
       <span>
-        <LinkTo modelType="Person" model={action.person} isLink={false} />
+        <LinkTo
+          modelType="Person"
+          model={action.person}
+          whenUnspecified={SYSTEM_USER}
+          isLink={false}
+        />
       </span>
     </Button>
   )
@@ -127,7 +133,7 @@ const ActionDetails = ({ action }) => {
           <LinkTo
             modelType="Person"
             model={action.person}
-            whenUnspecified="system"
+            whenUnspecified={SYSTEM_USER}
           />
         </span>
         <br />

client/src/pages/reports/Show.js

@@ -357,11 +357,11 @@ const ReportShow = ({ setSearchQuery, pageDispatchers }) => {
   )
   const tasksLabel = pluralize(Settings.fields.task.shortLabel)
 
-  // User can approve when admin,
-  // or if report is pending approval and user is one of the approvers in the current approval step
+  // User can approve when report is pending approval,
+  // and user is admin or user is one of the approvers in the current approval step
   const canApprove =
-    isAdmin ||
-    (report.isPending() &&
+    report.isPending() &&
+    (isAdmin ||
       report.approvalStep?.approvers?.some(member =>
         Position.isEqual(member, currentUser?.position)
       ))

src/main/java/mil/dds/anet/resources/ReportResource.java

@@ -453,7 +453,7 @@ public int approveReport(@GraphQLRootContext Map<String, Object> context,
     }
 
     // Verify that this user can approve for this step.
-    final boolean canApprove = engine
+    final boolean canApprove = AuthUtils.isAdmin(approver) || engine
         .canUserApproveStep(engine.getContext(), approver.getUuid(), step, r.getAdvisorOrgUuid())
         .join();
     if (!canApprove) {

src/main/java/mil/dds/anet/threads/ReportApprovalWorker.java

@@ -43,30 +43,29 @@ protected void runInternal(Instant now, JobHistory jobHistory, Map<String, Objec
           logger.error("Couldn't process report approval for report {}, it has no workflow",
               r.getUuid());
         } else {
-          for (int i = workflow.size() - 1; i >= 0; i--) {
+          for (int i = workflow.size() - 1; i >= 1; i--) {
             final ReportAction reportAction = workflow.get(i);
-            if (reportAction.getCreatedAt() == null && i > 1) {
-              // Check previous action
-              final ReportAction previousAction = workflow.get(i - 1);
-              if (previousAction.getCreatedAt() != null
-                  && previousAction.getCreatedAt().isBefore(approvalTimeout)) {
-                // Approve the report
-                try {
-                  final ApprovalStep approvalStep = reportAction.getStep();
-                  final int numRows = dao.approve(r, null, approvalStep);
-                  if (numRows == 0) {
-                    logger.error("Couldn't process report approval for report {} step {}",
-                        r.getUuid(), DaoUtils.getUuid(approvalStep));
-                  } else {
-                    AnetAuditLogger.log(
-                        "report {} step {} automatically approved by the ReportApprovalWorker",
-                        r.getUuid(), DaoUtils.getUuid(approvalStep));
-                  }
-                } catch (Exception e) {
-                  logger.error("Exception when approving report", e);
+            final ReportAction previousAction = workflow.get(i - 1);
+            if (reportAction.getCreatedAt() == null
+                // Check previous action
+                && previousAction.getCreatedAt() != null
+                && previousAction.getCreatedAt().isBefore(approvalTimeout)) {
+              // Approve the report
+              try {
+                final ApprovalStep approvalStep = reportAction.getStep();
+                final int numRows = dao.approve(r, null, approvalStep);
+                if (numRows == 0) {
+                  logger.error("Couldn't process report approval for report {} step {}",
+                      r.getUuid(), DaoUtils.getUuid(approvalStep));
+                } else {
+                  AnetAuditLogger.log(
+                      "report {} step {} automatically approved by the ReportApprovalWorker",
+                      r.getUuid(), DaoUtils.getUuid(approvalStep));
                 }
-                break;
+              } catch (Exception e) {
+                logger.error("Exception when approving report", e);
               }
+              break;
             }
           }
         }