Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Asmith/appeals 43476 uat integration #21327

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/controllers/correspondence_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions client/app/queue/OrganizationQueue.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions client/app/queue/QueueTableBuilder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 + &': {
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions client/app/queue/correspondence/CorrespondenceCases.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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
/>
}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -22,7 +24,7 @@ const BatchAutoAssignButton = (props) => {
};

return (
<div>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<Button
onClick={handleAutoAssign}
ariaLabel="Auto assign correspondences"
Expand Down
14 changes: 0 additions & 14 deletions client/constants/QUEUE_CONFIG.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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:",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
Loading