From 89c006de884bad67adbb4e1a0e32475b49d85cc6 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 3 Apr 2024 14:30:42 -0600
Subject: [PATCH] Asmith/appeals 43476 uat integration (#21327)

* Move Auto Assign Button to Correspondence Queue (#21324)

* Move Auto Assign Button to Correspondence Queue

* Fix Lint Errors

* Include RunAsyncable

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb       |  2 ++
 client/app/queue/OrganizationQueue.jsx             |  2 --
 client/app/queue/QueueTableBuilder.jsx             |  6 ------
 .../queue/correspondence/CorrespondenceCases.jsx   |  6 ++++--
 .../component/AutoAssignAlertBanner.jsx            |  3 ++-
 .../component/BatchAutoAssignButton.jsx            |  8 +++++---
 client/constants/QUEUE_CONFIG.json                 | 14 --------------
 7 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 5d299613ce3..8a62ae8265c 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -3,6 +3,8 @@
 # :reek:RepeatedConditional
 class CorrespondenceController < ApplicationController
   include CorrespondenceControllerUtil
+  include RunAsyncable
+
   before_action :verify_correspondence_access
   before_action :verify_feature_toggle
   before_action :correspondence
diff --git a/client/app/queue/OrganizationQueue.jsx b/client/app/queue/OrganizationQueue.jsx
index 626c52900ad..79ee4a78b73 100644
--- a/client/app/queue/OrganizationQueue.jsx
+++ b/client/app/queue/OrganizationQueue.jsx
@@ -8,7 +8,6 @@ import QueueTableBuilder from './QueueTableBuilder';
 import Alert from '../components/Alert';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import { clearCaseSelectSearch } from '../reader/CaseSelect/CaseSelectActions';
-import AutoAssignAlertBanner from './correspondence/component/AutoAssignAlertBanner';
 
 const containerStyles = css({
   position: 'relative'
@@ -28,7 +27,6 @@ class OrganizationQueue extends React.PureComponent {
 
     return <React.Fragment>
       {success && <Alert styling={alertPaddingStyles} type="success" title={success.title} message={success.detail} />}
-      {featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
       <AppSegment filledBackground styling={containerStyles}>
         <QueueTableBuilder featureToggles={featureToggles} />
       </AppSegment>
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 898495039e7..0c0186aadb5 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -42,7 +42,6 @@ import COPY from '../../COPY';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { css } from 'glamor';
 import { isActiveOrganizationVHA } from '../queue/selectors';
-import BatchAutoAssignButton from './correspondence/component/BatchAutoAssignButton';
 
 const rootStyles = css({
   '.usa-alert + &': {
@@ -211,11 +210,6 @@ const QueueTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <React.Fragment>
-          {props.userCanBulkAssign &&
-          tabConfig.allow_bulk_assign &&
-          props.activeOrganization.type === 'InboundOpsTeam' && (
-            <BatchAutoAssignButton />
-          )}
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
           </p>
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index e16996a3f73..1b1c40b2cff 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -15,6 +15,7 @@ import Modal from 'app/components/Modal';
 import RadioFieldWithChildren from '../../components/RadioFieldWithChildren';
 import ReactSelectDropdown from '../../components/ReactSelectDropdown';
 import TextareaField from '../../components/TextareaField';
+import AutoAssignAlertBanner from '../correspondence/component/AutoAssignAlertBanner';
 
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
@@ -222,6 +223,7 @@ const CorrespondenceCases = (props) => {
         />
       )}
       <AppSegment filledBackground>
+        {props.featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
         {(veteranInformation?.veteranName?.firstName && veteranInformation?.veteranName?.lastName) &&
           currentAction.action_type === 'DeleteReviewPackage' && (
           <Alert
@@ -293,8 +295,8 @@ CorrespondenceCases.propTypes = {
   taskIds: PropTypes.array,
   isMailTeamUser: PropTypes.bool,
   isMailSuperUser: PropTypes.bool,
-  isMailSupervisor: PropTypes.bool
-
+  isMailSupervisor: PropTypes.bool,
+  featureToggles: PropTypes.object
 };
 
 export default CorrespondenceCases;
diff --git a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
index dd6bbdd69b8..7f4aa3ada23 100644
--- a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
+++ b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
@@ -93,12 +93,13 @@ const AutoAssignAlertBanner = (props) => {
 
   return (
     <>
-      { batchId && bannerAlert.message &&
+      {batchId && bannerAlert.message &&
         <Alert
           type={bannerAlert.type}
           title={bannerAlert.title}
           message={bannerAlert.message}
           scrollOnAlert={false}
+          lowerMargin
         />
       }
     </>
diff --git a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
index 870cd5aaff2..02baa853b05 100644
--- a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
+++ b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
@@ -5,8 +5,10 @@ import COPY from '../../../../COPY';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { setBatchAutoAssignmentAttemptId,
-  setAutoAssignButtonDisabled } from '../correspondenceReducer/reviewPackageActions';
+import {
+  setBatchAutoAssignmentAttemptId,
+  setAutoAssignButtonDisabled
+} from '../correspondenceReducer/reviewPackageActions';
 
 const BatchAutoAssignButton = (props) => {
   const handleAutoAssign = async () => {
@@ -22,7 +24,7 @@ const BatchAutoAssignButton = (props) => {
   };
 
   return (
-    <div>
+    <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
       <Button
         onClick={handleAutoAssign}
         ariaLabel="Auto assign correspondences"
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 36ef3de8a39..f8fc50cee34 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -23,23 +23,18 @@
   "READY_FOR_REVIEW_TASKS_TAB_NAME": "readyForReviewTab",
   "VHA_PO_ON_HOLD_TASKS_TAB_NAME": "po_on_hold",
   "VHA_PO_COMPLETED_TASKS_TAB_NAME": "po_completed",
-
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL": "Your Correspondence",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-
   "EDUCATION_RPO_ASSIGNED_TASKS_TAB_NAME": "education_rpo_assigned",
   "EDUCATION_RPO_IN_PROGRESS_TASKS_TAB_NAME": "education_rpo_in_progress",
   "EDUCATION_RPO_COMPLETED_TASKS_TAB_NAME": "education_rpo_completed",
-
   "EDUCATION_EMO_UNASSIGNED_TASKS_TAB_NAME": "education_emo_unassigned",
   "EDUCATION_EMO_ASSIGNED_TASKS_TAB_NAME": "education_emo_assigned",
   "EDUCATION_EMO_COMPLETED_TASKS_TAB_NAME": "education_emo_completed",
-
   "CAREGIVER_SUPPORT_UNASSIGNED_TASK_TAB_NAME": "vha_caregiver_support_unassigned",
   "CAREGIVER_SUPPORT_IN_PROGRESS_TASKS_TAB_NAME": "caregiver_support_in_progress",
   "CAREGIVER_SUPPORT_COMPLETED_TASKS_TAB_NAME": "caregiver_support_completed",
-
   "CORRESPONDENCE_ASSIGNED_TASKS_LABEL": "Assigned",
   "CORRESPONDENCE_COMPLETED_TASKS_LABEL": "Completed",
   "CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL": "In Progress",
@@ -48,7 +43,6 @@
   "CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL": "Completed",
   "CORRESPONDENCE_PENDING_TASKS_LABEL": "Pending",
   "CORRESPONDENCE_UNASSIGNED_TASKS_LABEL": "Unassigned",
-
   "CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME": "correspondence_assigned",
   "CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME": "correspondence_completed",
   "CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME": "correspondence_in_progress",
@@ -57,7 +51,6 @@
   "CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME": "correspondence_team_completed",
   "CORRESPONDENCE_PENDING_TASKS_TAB_NAME": "correspondence_pending",
   "CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME": "correspondence_unassigned",
-
   "CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION": "Correspondence assigned to you:",
   "CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
   "CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION": "Correspondence in progress that are assigned to you:",
@@ -66,11 +59,8 @@
   "CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
   "CORRESPONDENCE_PENDING_TASKS_DESCRIPTION": "Correspondence that is currently assigned to non-mail team users:",
   "CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION": "Correspondence owned by the Mail team are unassigned to an individual:",
-
   "CORRESPONDENCE_ORG_TABLE_TITLE": "Correspondence Cases",
   "CORRESPONDENCE_USER_TABLE_TITLE": "Your Correspondence",
-
-
   "COLUMNS": {
     "ACTION_TYPE": {
       "name": "actionType",
@@ -232,21 +222,17 @@
       "sorting_columns": ["type", "action", "created_at"]
     }
   },
-
   "TAB_NAME_REQUEST_PARAM": "tab",
   "PAGE_NUMBER_REQUEST_PARAM": "page",
   "SORT_COLUMN_REQUEST_PARAM": "sort_by",
   "SORT_DIRECTION_REQUEST_PARAM": "order",
   "FILTER_COLUMN_REQUEST_PARAM": "filter",
   "SEARCH_QUERY_REQUEST_PARAM": "search_query",
-
   "COLUMN_SORT_ORDER_ASC": "asc",
   "COLUMN_SORT_ORDER_DESC": "desc",
-
   "DEFAULT_SORTING_COLUMN_KEY": "sortColName",
   "DEFAULT_SORTING_DIRECTION_KEY": "sortAscending",
   "BLANK_FILTER_KEY_VALUE": "None",
-
   "FILTER_OPTIONS": {
     "IS_AOD": {
       "key": "is_aod"