Hotfix/appeals 46639 prodtest

app/models/appeal.rb

@@ -251,11 +251,15 @@ def contested_claim?
 
     category_substrings = %w[Contested Apportionment]
 
-    request_issues.active.any? do |request_issue|
-      category_substrings.any? do |substring|
-        request_issues.active.include?(request_issue) && request_issue.nonrating_issue_category&.include?(substring)
+    request_issues.each do |request_issue|
+      category_substrings.each do |substring|
+        if request_issue.active? && request_issue.nonrating_issue_category&.include?(substring)
+          return true
+        end
       end
     end
+
+    false
   end
 
   # :reek:RepeatedConditionals

app/models/decision_review.rb

@@ -125,7 +125,11 @@ def veteran_full_name
   end
 
   def number_of_issues
-    request_issues.active.count
+    request_issues.count(&:active?)
+  end
+
+  def issue_categories
+    request_issues.select(&:active?).map(&:nonrating_issue_category)
   end
 
   def external_id

app/models/queue_tabs/specialty_case_team_unassigned_tasks_tab.rb

@@ -21,13 +21,31 @@ def tasks
     assigned_tasks
   end
 
+  # Override task_includes to optimize the queue a bit
+  def task_includes
+    [
+      { appeal: [
+        :request_issues,
+        :available_hearing_locations,
+        :claimants,
+        :work_mode,
+        :latest_informal_hearing_presentation_task
+      ] },
+      :assigned_by,
+      :assigned_to,
+      :children,
+      :parent,
+      :attorney_case_reviews
+    ]
+  end
+
   def column_names
     SpecialtyCaseTeam::COLUMN_NAMES
   end
 
   # This only affects bulk assign on the standard queue tab view
   def allow_bulk_assign?
-    true
+    false
   end
 
   def hide_from_queue_table_view
@@ -37,8 +55,4 @@ def hide_from_queue_table_view
   def no_task_limit
     false
   end
-
-  def custom_task_limit
-    60
-  end
 end

app/models/serializers/work_queue/task_column_serializer.rb

@@ -90,11 +90,7 @@ def self.serialize_attribute?(params, columns)
     columns = [Constants.QUEUE_CONFIG.COLUMNS.ISSUE_TYPES.name]
 
     if serialize_attribute?(params, columns)
-      if object.appeal.is_a?(LegacyAppeal)
-        object.appeal.issue_categories
-      else
-        object.appeal.request_issues.active.map(&:nonrating_issue_category)
-      end.join(",")
+      object.appeal.issue_categories.join(",")
     end
   end
 

app/models/serializers/work_queue/task_serializer.rb

@@ -146,11 +146,7 @@ class WorkQueue::TaskSerializer
   end
 
   attribute :issue_types do |object|
-    if object.appeal.is_a?(LegacyAppeal)
-      object.appeal.issue_categories
-    else
-      object.appeal.request_issues.active.map(&:nonrating_issue_category)
-    end.join(",")
+    object.appeal.issue_categories.join(",")
   end
 
   attribute :external_hearing_id do |object|

client/app/queue/QueueActions.js

@@ -14,6 +14,7 @@ import ApiUtil from '../util/ApiUtil';
 import { getMinutesToMilliseconds } from '../util/DateUtil';
 import pluralize from 'pluralize';
 import { keyBy, pick } from 'lodash';
+import { removeTaskIdsFromCache } from './caching/queueTableCache.slice';
 
 export const onReceiveQueue = (
   { tasks, amaTasks, appeals }
@@ -419,12 +420,13 @@ export const fetchTasksAndAppealsOfAttorney = (attorneyId, params) => (dispatch)
 };
 
 export const setSelectionOfTaskOfUser =
-  ({ userId, taskId, selected }) => ({
+  ({ userId, taskId, selected, task }) => ({
     type: ACTIONS.SET_SELECTION_OF_TASK_OF_USER,
     payload: {
       userId,
       taskId,
-      selected
+      selected,
+      task
     }
   });
 
@@ -507,6 +509,9 @@ export const initialSpecialtyCaseTeamAssignTasksToUser = ({
     then((resp) => {
       const receievedTasks = prepareAllTasksForStore(resp.tasks.data);
 
+      // Removes tasks from queue table cache if using redux caching instead of local component state
+      dispatch(removeTaskIdsFromCache({ taskIds }));
+
       dispatch(onReceiveTasks(pick(receievedTasks, ['tasks', 'amaTasks'])));
 
       dispatch(incrementTaskCountForAttorney({

client/app/queue/QueueTable.jsx

@@ -353,10 +353,21 @@ export default class QueueTable extends React.PureComponent {
 
     if (this.props.rowObjects.length) {
       this.setState({ cachedResponses: { ...this.state.cachedResponses, [this.requestUrl()]: firstResponse } });
+
+      if (this.props.useReduxCache) {
+        this.props.updateReduxCache({ key: this.requestUrl(), value: firstResponse });
+      }
+
     }
   };
 
   componentDidUpdate = (previousProps, previousState) => {
+    if (this.props.useReduxCache &&
+      (this.props.reduxCache[this.requestUrl()]?.tasks?.length !==
+        previousProps.reduxCache[this.requestUrl()]?.tasks?.length)) {
+      this.setState({ tasksFromApi: this.props.reduxCache[this.requestUrl()].tasks });
+    }
+
     // Only refetch if the search query text changes
     if (this.props.tabPaginationOptions &&
       previousState.querySearchText !== this.props.tabPaginationOptions[QUEUE_CONFIG.SEARCH_QUERY_REQUEST_PARAM]) {
@@ -556,9 +567,29 @@ export default class QueueTable extends React.PureComponent {
 
   deepLink = () => {
     const base = `${window.location.origin}${window.location.pathname}`;
-    const tab = this.props.taskPagesApiEndpoint.split('?')[1];
+    const currentParams = new URLSearchParams(window.location.search);
+    const tableParams = new URLSearchParams(this.requestQueryString());
+    const tabParams = new URLSearchParams(this.props.taskPagesApiEndpoint.split('?')[1]);
+
+    // List of parameters that should be cleared if not present in tableParams
+    const paramsToClear = [
+      QUEUE_CONFIG.SEARCH_QUERY_REQUEST_PARAM,
+      `${QUEUE_CONFIG.FILTER_COLUMN_REQUEST_PARAM}[]`,
+    ];
+
+    // Remove paramsToClear from currentParams if they are not in tableParams
+    paramsToClear.forEach((param) => {
+      if (!tableParams.has(param)) {
+        currentParams.delete(param);
+      }
+    });
+
+    // Merge tableParams and tabParams into currentParams, overwriting any duplicate keys
+    for (const [key, value] of [...tabParams.entries(), ...tableParams.entries()]) {
+      currentParams.set(key, value);
+    }
 
-    return `${base}?${tab}${this.requestQueryString()}`;
+    return `${base}?${currentParams.toString()}`;
   };
 
   // /organizations/vlj-support-staff/tasks?tab=on_hold
@@ -622,7 +653,8 @@ export default class QueueTable extends React.PureComponent {
     const endpointUrl = this.requestUrl();
 
     // If we already have the tasks cached then we set the state and return early.
-    const responseFromCache = this.state.cachedResponses[endpointUrl];
+    const responseFromCache = this.props.useReduxCache ? this.props.reduxCache[endpointUrl] :
+      this.state.cachedResponses[endpointUrl];
 
     if (responseFromCache) {
       this.setState({ tasksFromApi: responseFromCache.tasks });
@@ -643,11 +675,21 @@ export default class QueueTable extends React.PureComponent {
         const preparedResponse = Object.assign(response.body, { tasks: preparedTasks });
 
         this.setState({
-          cachedResponses: { ...this.state.cachedResponses, [endpointUrl]: preparedResponse },
+          // cachedResponses: { ...this.state.cachedResponses, [endpointUrl]: preparedResponse },
+          ...(!this.props.useReduxCache && {
+            cachedResponses: {
+              ...this.state.cachedResponses,
+              [endpointUrl]: preparedResponse
+            }
+          }),
           tasksFromApi: preparedTasks,
           loadingComponent: null
         });
 
+        if (this.props.useReduxCache) {
+          this.props.updateReduxCache({ key: endpointUrl, value: preparedResponse });
+        }
+
         this.updateAddressBar();
       }).
       catch(() => this.setState({ loadingComponent: null }));
@@ -669,7 +711,9 @@ export default class QueueTable extends React.PureComponent {
       styling,
       bodyStyling,
       enablePagination,
-      useTaskPagesApi
+      useTaskPagesApi,
+      reduxCache,
+      useReduxCache
     } = this.props;
 
     let { totalTaskCount, numberOfPages, rowObjects, casesPerPage } = this.props;
@@ -682,7 +726,7 @@ export default class QueueTable extends React.PureComponent {
 
         // If we already have the response cached then use the attributes of the response to set the pagination vars.
         const endpointUrl = this.requestUrl();
-        const responseFromCache = this.state.cachedResponses[endpointUrl];
+        const responseFromCache = useReduxCache ? reduxCache[endpointUrl] : this.state.cachedResponses[endpointUrl];
 
         if (responseFromCache) {
           numberOfPages = responseFromCache.task_page_count;
@@ -843,6 +887,9 @@ HeaderRow.propTypes = FooterRow.propTypes = Row.propTypes = BodyRows.propTypes =
   }),
   onHistoryUpdate: PropTypes.func,
   preserveFilter: PropTypes.bool,
+  useReduxCache: PropTypes.bool,
+  reduxCache: PropTypes.object,
+  updateReduxCache: PropTypes.func
 };
 
 Row.propTypes.rowObjects = PropTypes.arrayOf(PropTypes.object);

client/app/queue/QueueTableBuilder.jsx

@@ -10,38 +10,12 @@ import QueueTable from './QueueTable';
 import TabWindow from '../components/TabWindow';
 import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
 import QueueOrganizationDropdown from './components/QueueOrganizationDropdown';
-import {
-  assignedToColumn,
-  assignedByColumn,
-  badgesColumn,
-  boardIntakeColumn,
-  completedToNameColumn,
-  daysOnHoldColumn,
-  daysSinceLastActionColumn,
-  daysSinceIntakeColumn,
-  receiptDateColumn,
-  daysWaitingColumn,
-  detailsColumn,
-  docketNumberColumn,
-  documentIdColumn,
-  lastActionColumn,
-  issueCountColumn,
-  issueTypesColumn,
-  readerLinkColumn,
-  readerLinkColumnWithNewDocsIcon,
-  regionalOfficeColumn,
-  taskColumn,
-  taskOwnerColumn,
-  taskCompletedDateColumn,
-  typeColumn,
-  vamcOwnerColumn
-} from './components/TaskTableColumns';
 import { tasksWithAppealsFromRawTasks } from './utils';
 
 import COPY from '../../COPY';
-import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { css } from 'glamor';
 import { isActiveOrganizationVHA } from '../queue/selectors';
+import { columnsFromConfig } from './queueTableUtils';
 
 const rootStyles = css({
   '.usa-alert + &': {
@@ -86,94 +60,6 @@ const QueueTableBuilder = (props) => {
     return config;
   };
 
-  const filterValuesForColumn = (column) =>
-    column && column.filterable && column.filter_options;
-
-  const createColumnObject = (column, config, tasks) => {
-
-    const { requireDasRecord } = props;
-    const filterOptions = filterValuesForColumn(column);
-    const functionForColumn = {
-      [QUEUE_CONFIG.COLUMNS.APPEAL_TYPE.name]: typeColumn(
-        tasks,
-        filterOptions,
-        requireDasRecord
-      ),
-      [QUEUE_CONFIG.COLUMNS.BADGES.name]: badgesColumn(tasks),
-      [QUEUE_CONFIG.COLUMNS.CASE_DETAILS_LINK.name]: detailsColumn(
-        tasks,
-        requireDasRecord,
-        config.userRole
-      ),
-      [QUEUE_CONFIG.COLUMNS.DAYS_ON_HOLD.name]: daysOnHoldColumn(
-        requireDasRecord
-      ),
-      [QUEUE_CONFIG.COLUMNS.DAYS_SINCE_LAST_ACTION.name]: daysSinceLastActionColumn(
-        requireDasRecord
-      ),
-      [QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name]: daysWaitingColumn(
-        requireDasRecord
-      ),
-      [QUEUE_CONFIG.COLUMNS.DOCKET_NUMBER.name]: docketNumberColumn(
-        tasks,
-        filterOptions,
-        requireDasRecord
-      ),
-      [QUEUE_CONFIG.COLUMNS.DOCUMENT_COUNT_READER_LINK.name]: readerLinkColumn(
-        requireDasRecord,
-        true
-      ),
-      [QUEUE_CONFIG.COLUMNS.DOCUMENT_ID.name]: documentIdColumn(),
-      [QUEUE_CONFIG.COLUMNS.ISSUE_COUNT.name]: issueCountColumn(
-        tasks,
-        filterOptions,
-        requireDasRecord
-      ),
-      [QUEUE_CONFIG.COLUMNS.ISSUE_TYPES.name]: issueTypesColumn(
-        tasks,
-        filterOptions,
-        requireDasRecord
-      ),
-      [QUEUE_CONFIG.COLUMNS.READER_LINK_WITH_NEW_DOCS_ICON.
-        name]: readerLinkColumnWithNewDocsIcon(requireDasRecord),
-      [QUEUE_CONFIG.COLUMNS.REGIONAL_OFFICE.name]: regionalOfficeColumn(
-        tasks,
-        filterOptions
-      ),
-      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name]: assignedToColumn(
-        tasks,
-        filterOptions
-      ),
-      [QUEUE_CONFIG.COLUMNS.BOARD_INTAKE.name]: boardIntakeColumn(
-        filterOptions
-      ),
-      [QUEUE_CONFIG.COLUMNS.LAST_ACTION.name]: lastActionColumn(
-        tasks,
-        filterOptions
-      ),
-      [QUEUE_CONFIG.COLUMNS.TASK_OWNER.name]: taskOwnerColumn(
-        filterOptions
-      ),
-      [QUEUE_CONFIG.COLUMNS.VAMC_OWNER.name]: vamcOwnerColumn(
-        tasks,
-        filterOptions
-      ),
-      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNER.name]: completedToNameColumn(),
-      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name]: assignedByColumn(),
-      [QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name]: taskCompletedDateColumn(),
-      [QUEUE_CONFIG.COLUMNS.TASK_TYPE.name]: taskColumn(tasks, filterOptions),
-      [QUEUE_CONFIG.COLUMNS.DAYS_SINCE_INTAKE.name]: daysSinceIntakeColumn(requireDasRecord),
-      [QUEUE_CONFIG.COLUMNS.RECEIPT_DATE_INTAKE.name]: receiptDateColumn(),
-    };
-
-    return functionForColumn[column.name];
-  };
-
-  const columnsFromConfig = (config, tabConfig, tasks) =>
-    (tabConfig.columns || []).map((column) =>
-      createColumnObject(column, config, tasks)
-    );
-
   const taskTableTabFactory = (tabConfig, config) => {
     const savedPaginationOptions = storedPaginationOptions;
     const tasks = tasksWithAppealsFromRawTasks(tabConfig.tasks);