From 3cd8d4f7e62f24bf3da4ff7ac1935fc45bc5d099 Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 26 Apr 2019 11:52:07 -0400 Subject: [PATCH] Adds more sort options to lists --- awx/ui/client/features/jobs/jobsList.controller.js | 6 ++++++ .../features/projects/projectsList.controller.js | 4 +++- .../features/templates/templatesList.controller.js | 6 +++++- awx/ui/client/lib/services/base-string.service.js | 13 ++++++++++++- .../instances/instance-modal.controller.js | 4 +++- .../instances/instances.controller.js | 4 +++- 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index 9b99bc397d..c4784e5a69 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -66,6 +66,12 @@ function ListJobsController ( { label: `${strings.get('sort.FINISH_TIME_ASCENDING')}`, value: 'finished' }, { label: `${strings.get('sort.START_TIME_ASCENDING')}`, value: 'started' }, { label: `${strings.get('sort.START_TIME_DESCENDING')}`, value: '-started' }, + { label: `${strings.get('sort.LAUNCHED_BY_ASCENDING')}`, value: 'created_by__id' }, + { label: `${strings.get('sort.LAUNCHED_BY_DESCENDING')}`, value: '-created_by__id' }, + { label: `${strings.get('sort.INVENTORY_ASCENDING')}`, value: 'unified_job_template__inventory__id' }, + { label: `${strings.get('sort.INVENTORY_DESCENDING')}`, value: '-unified_job_template__inventory__id' }, + { label: `${strings.get('sort.PROJECT_ASCENDING')}`, value: 'unified_job_template__project__id' }, + { label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-unified_job_template__project__id' }, toolbarSortDefault ]; diff --git a/awx/ui/client/features/projects/projectsList.controller.js b/awx/ui/client/features/projects/projectsList.controller.js index 3d2e1369fa..d1ba3922f7 100644 --- a/awx/ui/client/features/projects/projectsList.controller.js +++ b/awx/ui/client/features/projects/projectsList.controller.js @@ -72,7 +72,9 @@ function projectsListController ( { label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' }, { label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' }, { label: `${strings.get('sort.LAST_JOB_RUN_ASCENDING')}`, value: 'last_job_run' }, - { label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' } + { label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' }, + { label: `${strings.get('sort.ORGANIZATION_ASCENDING')}`, value: 'organization' }, + { label: `${strings.get('sort.ORGANIZATION_DESCENDING')}`, value: '-organization' } ]; vm.toolbarSortValue = toolbarSortDefault; diff --git a/awx/ui/client/features/templates/templatesList.controller.js b/awx/ui/client/features/templates/templatesList.controller.js index 84c2d512fb..7a0e13b6f8 100644 --- a/awx/ui/client/features/templates/templatesList.controller.js +++ b/awx/ui/client/features/templates/templatesList.controller.js @@ -75,7 +75,11 @@ function ListTemplatesController( { label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' }, { label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' }, { label: `${strings.get('sort.LAST_JOB_RUN_ASCENDING')}`, value: 'last_job_run' }, - { label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' } + { label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' }, + { label: `${strings.get('sort.INVENTORY_ASCENDING')}`, value: 'job_template__inventory__id' }, + { label: `${strings.get('sort.INVENTORY_DESCENDING')}`, value: '-job_template__inventory__id' }, + { label: `${strings.get('sort.PROJECT_ASCENDING')}`, value: 'project__id' }, + { label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-project__id' }, ]; vm.toolbarSortValue = toolbarSortDefault; diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index df725d43a4..e90c343678 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -121,7 +121,18 @@ function BaseStringService (namespace) { FINISH_TIME_ASCENDING: t.s('Finish Time (Ascending)'), FINISH_TIME_DESCENDING: t.s('Finish Time (Descending)'), UUID_ASCENDING: t.s('UUID (Ascending)'), - UUID_DESCENDING: t.s('UUID (Descending)') + UUID_DESCENDING: t.s('UUID (Descending)'), + LAUNCHED_BY_ASCENDING: t.s('Launched By (Ascending)'), + LAUNCHED_BY_DESCENDING: t.s('Launched By (Descending)'), + INVENTORY_ASCENDING: t.s('Inventory (Ascending)'), + INVENTORY_DESCENDING: t.s('Inventory (Descending)'), + PROJECT_ASCENDING: t.s('Project (Ascending)'), + PROJECT_DESCENDING: t.s('Project (Descending)'), + ORGANIZATION_ASCENDING: t.s('Organization (Ascending)'), + ORGANIZATION_DESCENDING: t.s('Organization (Descending)'), + CAPACITY_ASCENDING: t.s('Capacity (Ascending)'), + CAPACITY_DESCENDING: t.s('Capacity (Descending)') + }; this.ALERT = ({ header, body }) => t.s('{{ header }} {{ body }}', { header, body }); diff --git a/awx/ui/client/src/instance-groups/instances/instance-modal.controller.js b/awx/ui/client/src/instance-groups/instances/instance-modal.controller.js index fdafc621bb..7ca555d81e 100644 --- a/awx/ui/client/src/instance-groups/instances/instance-modal.controller.js +++ b/awx/ui/client/src/instance-groups/instances/instance-modal.controller.js @@ -48,7 +48,9 @@ function InstanceModalController ($scope, $state, Dataset, models, strings, Proc { label: `${strings.get('sort.CREATED_ASCENDING')}`, value: 'created' }, { label: `${strings.get('sort.CREATED_DESCENDING')}`, value: '-created' }, { label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' }, - { label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' } + { label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' }, + { label: `${strings.get('sort.CAPACITY_ASCENDING')}`, value: 'capacity' }, + { label: `${strings.get('sort.CAPACITY_DESCENDING')}`, value: '-capacity' } ]; const removeStateParamsListener = $scope.$watchCollection('$state.params', () => { diff --git a/awx/ui/client/src/instance-groups/instances/instances.controller.js b/awx/ui/client/src/instance-groups/instances/instances.controller.js index 7b54b13af1..dbd5645d0a 100644 --- a/awx/ui/client/src/instance-groups/instances/instances.controller.js +++ b/awx/ui/client/src/instance-groups/instances/instances.controller.js @@ -30,7 +30,9 @@ function InstancesController ($scope, $state, $http, $transitions, models, strin { label: `${strings.get('sort.CREATED_ASCENDING')}`, value: 'created' }, { label: `${strings.get('sort.CREATED_DESCENDING')}`, value: '-created' }, { label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' }, - { label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' } + { label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' }, + { label: `${strings.get('sort.CAPACITY_ASCENDING')}`, value: 'capacity' }, + { label: `${strings.get('sort.CAPACITY_DESCENDING')}`, value: '-capacity' } ]; const removeStateParamsListener = $scope.$watchCollection('$state.params', () => {