Add pagination to user queues

app/controllers/concerns/task_pagination_concern.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# shared code for controllers that paginate tasks.
+# requires methods:
+#  * total_items
+#  * allowed_params
+#
+module TaskPaginationConcern
+  extend ActiveSupport::Concern
+
+  def pagination_json
+    {
+      tasks: json_tasks(task_pager.paged_tasks),
+      task_page_count: task_pager.task_page_count,
+      total_task_count: task_pager.total_task_count,
+      tasks_per_page: TaskPager::TASKS_PER_PAGE
+    }
+  end
+
+  private
+
+  def task_pager
+    @task_pager ||= TaskPager.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 json_tasks(tasks)
+    tasks = AppealRepository.eager_load_legacy_appeals_for_tasks(tasks)
+    params = { user: current_user }
+
+    AmaAndLegacyTaskSerializer.new(
+      tasks: tasks, params: params, ama_serializer: WorkQueue::TaskSerializer
+    ).call
+  end
+end

app/controllers/organizations/task_pages_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Organizations::TaskPagesController < OrganizationsController
+  include TaskPaginationConcern
+
   before_action :verify_organization_access, only: [:index]
   before_action :verify_role_access, only: [:index]
 
@@ -24,12 +26,7 @@ class Organizations::TaskPagesController < OrganizationsController
   # }>
 
   def index
-    render json: {
-      tasks: json_tasks(task_pager.paged_tasks),
-      task_page_count: task_pager.task_page_count,
-      total_task_count: task_pager.total_task_count,
-      tasks_per_page: TaskPager::TASKS_PER_PAGE
-    }
+    render json: pagination_json
   end
 
   private
@@ -38,23 +35,7 @@ def organization_url
     params[:organization_url]
   end
 
-  def task_pager
-    @task_pager ||= TaskPager.new(
-      assignee: organization,
-      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 json_tasks(tasks)
-    tasks = AppealRepository.eager_load_legacy_appeals_for_tasks(tasks)
-    params = { user: current_user }
-
-    AmaAndLegacyTaskSerializer.new(
-      tasks: tasks, params: params, ama_serializer: organization.ama_task_serializer
-    ).call
+  def assignee
+    organization
   end
 end

app/controllers/tasks_controller.rb

@@ -42,7 +42,7 @@ def set_application
   #      GET /tasks?user_id=xxx&role=attorney
   #      GET /tasks?user_id=xxx&role=judge
   def index
-    tasks = QueueForRole.new(user_role).create(user: user).tasks
+    tasks = user.use_task_pages_api? ? [] : QueueForRole.new(user_role).create(user: user).tasks
     render json: { tasks: json_tasks(tasks), queue_config: queue_config }
   end
 

app/controllers/users/task_pages_controller.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Users::TaskPagesController < UsersController
+  include TaskPaginationConcern
+
+  # /users/{user.id}/task_pages?
+  #   tab=on_hold&
+  #   sort_by=case_details_link&
+  #   order=desc&
+  #   filter[]=col%3Ddocket_type%26val%3Dlegacy&
+  #   filter[]=col%3Dtask_action%26val%3Dtranslation&
+  #   page=3
+  #
+  # params = <ActionController::Parameters {
+  #   "tab"=>"on_hold",
+  #   "sort_by"=>"case_details_link",
+  #   "order"=>"desc",
+  #   "filter"=>[
+  #     "col=docketNumberColumn&val=legacy,evidence_submission",
+  #     "col=taskColumn&val=Unaccredited rep,Extension"
+  #   ],
+  #   "page"=>"3"
+  # }>
+
+  def index
+    render json: pagination_json
+  end
+
+  private
+
+  def assignee
+    user
+  end
+end

app/controllers/users_controller.rb

@@ -78,6 +78,7 @@ def filter_by_css_id_or_name
   end
 
   def user
+    params[:id] = params[:user_id] if params[:user_id] && !params[:id]
     unless css_id || params[:id]
       fail(
         Caseflow::Error::InvalidParameter,

app/models/organization.rb

@@ -141,10 +141,6 @@ def completed_tasks_tab
     ::OrganizationCompletedTasksTab.new(assignee: self, show_regional_office_column: show_regional_office_in_queue?)
   end
 
-  def ama_task_serializer
-    WorkQueue::TaskSerializer
-  end
-
   private
 
   def clean_url

app/models/queue_config.rb

@@ -48,7 +48,7 @@ def attach_tasks_to_tab(tab)
       # This allows us to only instantiate TaskPager if we are using the task pages API.
       task_page_count: task_pager.task_page_count,
       total_task_count: tab.tasks.count,
-      task_page_endpoint_base_path: "#{assignee_is_org? ? "#{assignee.path}/" : ''}#{endpoint}"
+      task_page_endpoint_base_path: "#{assignee_is_org? ? "#{assignee.path}/" : "users/#{assignee.id}/"}#{endpoint}"
     )
   end
 

app/models/queue_tabs/on_hold_tasks_tab.rb

@@ -17,6 +17,16 @@ def description
 
   def tasks
     Task.includes(*task_includes).visible_in_queue_table_view.on_hold.where(assigned_to: assignee)
+      .or(legacy_colocated_tasks)
+  end
+
+  def legacy_colocated_tasks
+    Task.includes(*task_includes).open.where(
+      assigned_by: assignee,
+      assigned_to_type: Organization.name,
+      appeal_type: LegacyAppeal.name,
+      type: ColocatedTask.subclasses.map(&:name)
+    )
   end
 
   # rubocop:disable Metrics/AbcSize

app/models/task_pager.rb

@@ -23,7 +23,7 @@ def initialize(args)
   end
 
   def paged_tasks
-    sorted_tasks(filtered_tasks).page(page).per(TASKS_PER_PAGE)
+    @paged_tasks ||= sorted_tasks(filtered_tasks).page(page).per(TASKS_PER_PAGE)
   end
 
   def sorted_tasks(tasks)

app/models/user.rb

@@ -325,7 +325,7 @@ def update_status!(new_status)
   end
 
   def use_task_pages_api?
-    false
+    FeatureToggle.enabled?(:user_queue_pagination)
   end
 
   def queue_tabs
@@ -337,7 +337,7 @@ def queue_tabs
   end
 
   def self.default_active_tab
-    Constants.QUEUE_CONFIG.ASSIGNED_TASKS_TAB_NAME
+    Constants.QUEUE_CONFIG.INDIVIDUALLY_ASSIGNED_TASKS_TAB_NAME
   end
 
   def assigned_tasks_tab

client/app/queue/AttorneyTaskListView.jsx

@@ -73,6 +73,7 @@ class AttorneyTaskListView extends React.PureComponent {
         assignedTasks={this.props.workableTasks}
         onHoldTasks={this.props.onHoldTasks}
         completedTasks={this.props.completedTasks}
+        paginationOptions={this.props.paginationOptions}
       />
     </AppSegment>;
   }
@@ -86,8 +87,7 @@ const mapStateToProps = (state) => {
       }
     },
     ui: {
-      messages,
-      organizations
+      messages
     }
   } = state;
 
@@ -97,7 +97,6 @@ const mapStateToProps = (state) => {
     completedTasks: completeTasksByAssigneeCssIdSelector(state),
     success: messages.success,
     error: messages.error,
-    organizations,
     taskDecision
   });
 };
@@ -124,7 +123,7 @@ AttorneyTaskListView.propTypes = {
   resetErrorMessages: PropTypes.func,
   showErrorMessage: PropTypes.func,
   onHoldTasks: PropTypes.array,
-  organizations: PropTypes.array,
+  paginationOptions: PropTypes.object,
   success: PropTypes.shape({
     title: PropTypes.string,
     detail: PropTypes.string

client/app/queue/ColocatedTaskListView.jsx

@@ -40,6 +40,7 @@ class ColocatedTaskListView extends React.PureComponent {
         assignedTasks={this.props.assignedTasks}
         onHoldTasks={this.props.onHoldTasks}
         completedTasks={this.props.completedTasks}
+        paginationOptions={this.props.paginationOptions}
       />
     </AppSegment>;
   };
@@ -50,11 +51,9 @@ const mapStateToProps = (state) => {
 
   return {
     success,
-    organizations: state.ui.organizations,
     assignedTasks: newTasksByAssigneeCssIdSelector(state),
     onHoldTasks: onHoldTasksByAssigneeCssIdSelector(state),
-    completedTasks: completeTasksByAssigneeCssIdSelector(state),
-    queueConfig: state.queue.queueConfig
+    completedTasks: completeTasksByAssigneeCssIdSelector(state)
   };
 };
 
@@ -71,7 +70,6 @@ ColocatedTaskListView.propTypes = {
   completedTasks: PropTypes.array,
   hideSuccessMessage: PropTypes.func,
   onHoldTasks: PropTypes.array,
-  organizations: PropTypes.array,
-  queueConfig: PropTypes.object,
+  paginationOptions: PropTypes.object,
   success: PropTypes.object
 };

client/app/queue/QueueApp.jsx

@@ -110,12 +110,12 @@ class QueueApp extends React.PureComponent {
     const { userRole } = this.props;
 
     if (userRole === USER_ROLE_TYPES.attorney) {
-      return <AttorneyTaskListView />;
+      return <AttorneyTaskListView paginationOptions={querystring.parse(window.location.search.slice(1))} />;
     } else if (userRole === USER_ROLE_TYPES.judge) {
       return <JudgeDecisionReviewTaskListView {...this.props} />;
     }
 
-    return <ColocatedTaskListView />;
+    return <ColocatedTaskListView paginationOptions={querystring.parse(window.location.search.slice(1))} />;
   };
 
   routedQueueList = () => (