From d200e1249afe9216359563c97f643d590ed941f8 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 3 Apr 2024 09:50:29 -0600
Subject: [PATCH 1/2] Move Auto Assign Button to Correspondence Queue (#21324)

* Move Auto Assign Button to Correspondence Queue

* Fix Lint Errors
---
 client/app/queue/OrganizationQueue.jsx                    | 2 --
 client/app/queue/QueueTableBuilder.jsx                    | 6 ------
 client/app/queue/correspondence/CorrespondenceCases.jsx   | 7 ++++++-
 .../correspondence/component/AutoAssignAlertBanner.jsx    | 3 ++-
 .../correspondence/component/BatchAutoAssignButton.jsx    | 8 +++++---
 5 files changed, 13 insertions(+), 13 deletions(-)

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 cc054109078..9029420c3a7 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 6f0f8d86c32..36235d473df 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -11,6 +11,8 @@ import { css } from 'glamor';
 import CorrespondenceTable from './CorrespondenceTable';
 import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
 import Alert from '../../components/Alert';
+import AutoAssignAlertBanner from '../correspondence/component/AutoAssignAlertBanner';
+import BatchAutoAssignButton from '../correspondence/component/BatchAutoAssignButton';
 
 export const CorrespondenceCases = (props) => {
   const {
@@ -46,6 +48,7 @@ export const CorrespondenceCases = (props) => {
 
   return (
     <AppSegment filledBackground>
+      {props.featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
       {(Object.keys(veteranInformation).length > 0) &&
         currentAction.action_type === 'DeleteReviewPackage' &&
         <Alert
@@ -56,6 +59,7 @@ export const CorrespondenceCases = (props) => {
       }
       <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
       <QueueOrganizationDropdown organizations={organizations} />
+      {props.featureToggles.correspondence_queue && <BatchAutoAssignButton />}
       {vetCorrespondences &&
         <CorrespondenceTable
           vetCorrespondences={vetCorrespondences}
@@ -70,7 +74,8 @@ CorrespondenceCases.propTypes = {
   loadVetCorrespondence: PropTypes.func,
   vetCorrespondences: PropTypes.array,
   currentAction: PropTypes.object,
-  veteranInformation: PropTypes.object
+  veteranInformation: PropTypes.object,
+  featureToggles: PropTypes.object
 };
 
 const mapStateToProps = (state) => ({
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"

From bd0922b50bb3f0afe55f0d42c64322cb34e618ad Mon Sep 17 00:00:00 2001
From: Alexander Smith <alex.smith.99@thunderyard.com>
Date: Wed, 3 Apr 2024 13:41:44 -0600
Subject: [PATCH 2/2] Include RunAsyncable

---
 app/controllers/correspondence_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

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