Team Queue and Individual Correspondence Page - Framework 35471

app/controllers/concerns/task_pagination_concern.rb

@@ -17,8 +17,28 @@ def pagination_json
     }
   end
 
+  def correspondence_pagination_json
+    {
+      tasks: correspondence_json_tasks(correspondence_task_pager.paged_tasks),
+      task_page_count: correspondence_task_pager.task_page_count,
+      total_task_count: correspondence_task_pager.total_task_count,
+      tasks_per_page: CorrespondenceTaskPager::TASKS_PER_PAGE
+    }
+  end
+
   private
 
+  def correspondence_task_pager
+    @correspondence_task_pager ||= CorrespondenceTaskPager.new(
+      assignee: assignee,
+      tab_name: params[Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM.to_sym],
+      page: params[Constants.QUEUE_CONFIG.PAGE_NUMBER_REQUEST_PARAM.to_sym],
+      sort_order: params[Constants.QUEUE_CONFIG.SORT_DIRECTION_REQUEST_PARAM.to_sym],
+      sort_by: params[Constants.QUEUE_CONFIG.SORT_COLUMN_REQUEST_PARAM.to_sym],
+      filters: params[Constants.QUEUE_CONFIG.FILTER_COLUMN_REQUEST_PARAM.to_sym]
+    )
+  end
+
   def task_pager
     @task_pager ||= TaskPager.new(
       assignee: assignee,
@@ -30,6 +50,13 @@ def task_pager
     )
   end
 
+  def correspondence_json_tasks(tasks)
+    { data: WorkQueue::CorrespondenceTaskColumnSerializer.new(
+      tasks,
+      is_collection: true
+    ).serializable_hash[:data] }
+  end
+
   def json_tasks(tasks)
     tasks = AppealRepository.eager_load_legacy_appeals_for_tasks(tasks)
     params = { user: current_user }

app/controllers/correspondence_task_pages_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CorrespondenceTaskPagesController < ApplicationController
+  include TaskPaginationConcern
+
+  def index
+    render json: correspondence_pagination_json
+  end
+
+  def assignee
+    if params[:user_id]
+      User.find(params[:user_id])
+    elsif params[:organization_id]
+      Organization.find(params[:organization_id])
+    end
+  end
+end

app/models/correspondence_config.rb

@@ -21,12 +21,17 @@ def attach_tasks_to_tab(tab)
       sort_order: tab.default_sorting_direction
     )
     endpoint = "task_pages?#{Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM}=#{tab.name}"
+    base_path = if assignee_is_org?
+                  "organizations/#{assignee.id}/"
+                else
+                  "correspondence/users/#{assignee.id}/}#{endpoint}"
+                end
 
     tab.to_hash.merge(
       tasks: serialized_tasks_for_columns(task_pager.paged_tasks, tab.column_names),
       task_page_count: task_pager.task_page_count,
       total_task_count: task_pager.total_task_count,
-      task_page_endpoint_base_path: "#{assignee_is_org? ? "#{assignee.path}/" : "users/#{assignee.id}/"}#{endpoint}"
+      task_page_endpoint_base_path: base_path
     )
   end
 

app/models/correspondence_queue_tab.rb

@@ -20,4 +20,12 @@ def task_includes
   def default_sorting_column
     CorrespondenceQueueColumn.from_name(Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name)
   end
+
+   # If you don't create your own tab name it will default to the tab defined in QueueTab
+   def self.from_name(tab_name)
+    tab = descendants.find { |subclass| subclass.tab_name == tab_name }
+    fail(Caseflow::Error::InvalidTaskTableTab, tab_name: tab_name) unless tab
+
+    tab
+  end
 end

app/models/tasks/cavc_correspondence_mail_task.rb

@@ -77,4 +77,12 @@ def user_task_assigned_to_cavc_lit_support
   def assigned_to_cavc_lit_team_member
     CavcLitigationSupport.singleton.users.include?(assigned_to)
   end
+
+  def status_is_valid_on_create
+    unless [Constants.TASK_STATUSES.assigned, Constants.TASK_STATUSES.completed].include?(status)
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    end
+
+    true
+  end
 end

app/models/tasks/correspondence_task.rb

@@ -48,15 +48,21 @@ def correspondence
 
   private
 
+  # rubocop:disable Metrics/CyclomaticComplexity
   def status_is_valid_on_create
-    if type == "ReviewPackageTask" && status != Constants.TASK_STATUSES.unassigned
-      update!(status: :unassigned)
-    elsif type != "ReviewPackageTask" && status != Constants.TASK_STATUSES.assigned
-      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    case type
+    when "ReviewPackageTask"
+      return Constants.TASK_STATUSES.on_hold if status != Constants.TASK_STATUSES.on_hold
+    when "CorrespondenceIntakeTask", "EfolderUploadFailedTask"
+      return Constants.TASK_STATUSES.in_progress if status != Constants.TASK_STATUSES.in_progress
+    when "CorrespondenceRootTask", "HearingPostponementRequestMailTask"
+      return Constants.TASK_STATUSES.completed if status != Constants.TASK_STATUSES.completed
+    else
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type unless status == Constants.TASK_STATUSES.assigned
     end
-
     true
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def assignee_status_is_valid_on_create
     if parent&.child_must_have_active_assignee? && assigned_to.is_a?(User) && !assigned_to.active?

client/COPY.json

@@ -51,10 +51,10 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Edit document type",
-  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Change the document type of the selected document.",
-  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Original document type",
-  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "New document type",
+  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Edit document type",
+  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Change the document type of the selected document.",
+  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Original document type",
+  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "New document type",
   "CASE_LIST_TABLE_EMPTY_TEXT": "This Veteran has no appeals at this time.",
   "CASE_LIST_TABLE_TOTAL_DAYS_COLUMN_TITLE": "Total Days",
   "CASE_LIST_TABLE_BOARD_INTAKE": "Board Intake",

client/app/queue/QueueTable.jsx

@@ -13,7 +13,7 @@ import Pagination from '../components/Pagination/Pagination';
 import { COLORS, LOGO_COLORS } from '../constants/AppConstants';
 import ApiUtil from '../util/ApiUtil';
 import LoadingScreen from '../components/LoadingScreen';
-import { tasksWithAppealsFromRawTasks } from './utils';
+import { tasksWithAppealsFromRawTasks, tasksWithCorrespondenceFromRawTasks } from './utils';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import COPY from '../../COPY';
 
@@ -638,7 +638,9 @@ export default class QueueTable extends React.PureComponent {
           tasks: { data: tasks }
         } = response.body;
 
-        const preparedTasks = tasksWithAppealsFromRawTasks(tasks);
+        const preparedTasks = this.props.isCorrespondenceTable ?
+          tasksWithCorrespondenceFromRawTasks(tasks) :
+          tasksWithAppealsFromRawTasks(tasks);
 
         const preparedResponse = Object.assign(response.body, { tasks: preparedTasks });
 
@@ -843,6 +845,7 @@ HeaderRow.propTypes = FooterRow.propTypes = Row.propTypes = BodyRows.propTypes =
   }),
   onHistoryUpdate: PropTypes.func,
   preserveFilter: PropTypes.bool,
+  isCorrespondenceTable: PropTypes.bool,
 };
 
 Row.propTypes.rowObjects = PropTypes.arrayOf(PropTypes.object);

client/app/queue/components/TaskTableColumns.jsx

@@ -13,6 +13,7 @@ import ContinuousProgressBar from 'app/components/ContinuousProgressBar';
 import OnHoldLabel, { numDaysOnHold } from './OnHoldLabel';
 import IhpDaysWaitingTooltip from './IhpDaysWaitingTooltip';
 import TranscriptionTaskTooltip from './TranscriptionTaskTooltip';
+import Checkbox from '../../components/Checkbox';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
 import { DateString, daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
@@ -222,6 +223,51 @@ export const assignedByColumn = () => {
   };
 };
 
+export const veteranDetails = () => {
+  return {
+    header: 'Veteran Details',
+    valueFunction: (task) => task.veteranDetails
+  };
+};
+
+export const vaDor = () => {
+
+  return {
+    header: 'VA DOR',
+    valueFunction: (task) => {
+      return moment(task.vador).format('MM/DD/YYYY');
+    }
+  };
+};
+
+export const notes = () => {
+  return {
+    header: 'Notes',
+    valueFunction: (task) => task.notes
+  };
+};
+
+export const checkboxColumn = () => {
+  return {
+    header: 'Select',
+    valueFunction: (task) => task ? <Checkbox id={task.uniqueId} /> : ''
+  };
+};
+
+export const actionType = () => {
+  return {
+    header: 'Action Type',
+    valueFunction: (task) => task.actionType
+  };
+};
+
+export const daysWaitingCorrespondence = () => {
+  return {
+    header: 'Days Waiting',
+    valueFunction: (task) => task.daysWaiting
+  };
+};
+
 export const regionalOfficeColumn = (tasks, filterOptions) => {
   return {
     header: COPY.CASE_LIST_TABLE_REGIONAL_OFFICE_COLUMN_TITLE,

client/app/queue/correspondence/CorrespondenceCases.jsx

@@ -5,36 +5,23 @@ import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolki
 import PropTypes from 'prop-types';
 import COPY from '../../../COPY';
 import { sprintf } from 'sprintf-js';
-import { css } from 'glamor';
-// import CorrespondenceTable from './CorrespondenceTable';
-// import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
 import Alert from '../../components/Alert';
 
-// import {
-//   initialAssignTasksToUser,
-//   initialCamoAssignTasksToVhaProgramOffice
-// } from '../QueueActions';
-
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
   const configUrl = props.configUrl;
+
   const currentAction = useSelector((state) => state.reviewPackage.lastAction);
   const veteranInformation = useSelector((state) => state.reviewPackage.veteranInformation);
 
   const [vetName, setVetName] = useState('');
 
   useEffect(() => {
     dispatch(loadCorrespondenceConfig(configUrl));
-  }, [dispatch, configUrl]);
+  }, []);
 
-  useEffect(() => {
-    // Retry the request after a delay
-    setTimeout(() => {
-      if (configUrl) {
-        dispatch(loadCorrespondenceConfig(configUrl));
-      }
-    }, 1000);
-  }, [configUrl]);
+  const config = useSelector((state) => state.intakeCorrespondence.correspondenceConfig);
 
   useEffect(() => {
     if (
@@ -46,28 +33,21 @@ const CorrespondenceCases = (props) => {
   }, [veteranInformation]);
 
   return (
-    <React.Fragment>
+    <>
       <AppSegment filledBackground>
-      {(veteranInformation?.veteran_name?.first_name && veteranInformation?.veteran_name?.last_name) &&
+        {(veteranInformation?.veteran_name?.first_name && veteranInformation?.veteran_name?.last_name) &&
           currentAction.action_type === 'DeleteReviewPackage' && (
-            <Alert
-              type="success"
-              title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
-              message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER}
-              scrollOnAlert={false}
-            />
-          )}
-        <h1 {...css({ display: 'inline-block' })}>
-          {COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}
-        </h1>
-          {/* <QueueOrganizationDropdown organizations={organizations} />
-          {this.props.correspondenceConfig &&
-          <CorrespondenceTable
-            correspondenceConfig={this.props.correspondenceConfig}
+          <Alert
+            type="success"
+            title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
+            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER}
+            scrollOnAlert={false}
           />
-          } */}
+        )}
+        {config &&
+        <CorrespondenceTableBuilder />}
       </AppSegment>
-    </React.Fragment>
+    </>
   );
 };