From 7f452ee8d10f209caebc648420ea1fffb08c8cfe Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 25 Apr 2019 15:21:47 -0400 Subject: [PATCH 1/5] Add more sort options to new lists --- .../applications/applications.strings.js | 7 ------- .../list-applications-users.controller.js | 11 ++++++---- .../list-applications.controller.js | 4 +++- awx/ui/client/features/jobs/jobs.strings.js | 7 ------- .../features/jobs/jobsList.controller.js | 6 ++++-- .../features/projects/projects.strings.js | 5 ----- .../projects/projectsList.controller.js | 9 ++++---- .../features/templates/templates.strings.js | 5 ----- .../templates/templatesList.controller.js | 6 +++++- .../features/users/tokens/tokens.strings.js | 5 ----- .../tokens/users-tokens-list.controller.js | 11 ++++++---- .../lib/services/base-string.service.js | 21 +++++++++++++++++++ .../instance-groups.strings.js | 5 ----- .../instances/instance-modal.controller.js | 11 ++++++---- .../instances/instances.controller.js | 11 ++++++---- .../list/instance-groups-list.controller.js | 9 ++++---- 16 files changed, 71 insertions(+), 62 deletions(-) diff --git a/awx/ui/client/features/applications/applications.strings.js b/awx/ui/client/features/applications/applications.strings.js index 4c907acbfc..f6fb73f56a 100644 --- a/awx/ui/client/features/applications/applications.strings.js +++ b/awx/ui/client/features/applications/applications.strings.js @@ -38,13 +38,6 @@ function ApplicationsStrings (BaseString) { ns.inputs = { ORGANIZATION_PLACEHOLDER: t.s('SELECT AN ORGANIZATION') }; - - ns.sort = { - NAME_ASCENDING: t.s('Name (Ascending)'), - NAME_DESCENDING: t.s('Name (Descending)'), - USERNAME_ASCENDING: t.s('Username (Ascending)'), - USERNAME_DESCENDING: t.s('Username (Descending)') - }; } ApplicationsStrings.$inject = ['BaseStringService']; diff --git a/awx/ui/client/features/applications/list-applications-users.controller.js b/awx/ui/client/features/applications/list-applications-users.controller.js index 83b33b8251..bb7dc70edd 100644 --- a/awx/ui/client/features/applications/list-applications-users.controller.js +++ b/awx/ui/client/features/applications/list-applications-users.controller.js @@ -41,10 +41,13 @@ function ListApplicationsUsersController ( vm.toolbarSortOptions = [ toolbarSortDefault, - { - label: `${strings.get('sort.USERNAME_DESCENDING')}`, - value: '-user__username' - } + { label: `${strings.get('sort.USERNAME_DESCENDING')}`, value: '-user__username' }, + { 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.EXPIRES_ASCENDING')}`, value: 'expires' }, + { label: `${strings.get('sort.EXPIRES_DESCENDING')}`, value: '-expires' } ]; function setToolbarSort () { diff --git a/awx/ui/client/features/applications/list-applications.controller.js b/awx/ui/client/features/applications/list-applications.controller.js index df824ac52f..254b31930b 100644 --- a/awx/ui/client/features/applications/list-applications.controller.js +++ b/awx/ui/client/features/applications/list-applications.controller.js @@ -54,7 +54,9 @@ function ListApplicationsController ( vm.toolbarSortOptions = [ toolbarSortDefault, - { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' } + { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, + { label: `${strings.get('sort.CREATED_ASCENDING')}`, value: 'created' }, + { label: `${strings.get('sort.CREATED_DESCENDING')}`, value: '-created' } ]; vm.toolbarSortValue = toolbarSortDefault; diff --git a/awx/ui/client/features/jobs/jobs.strings.js b/awx/ui/client/features/jobs/jobs.strings.js index 6bc6225760..a5b69df13f 100644 --- a/awx/ui/client/features/jobs/jobs.strings.js +++ b/awx/ui/client/features/jobs/jobs.strings.js @@ -4,13 +4,6 @@ function JobsStrings (BaseString) { const { t } = this; const ns = this.jobs; - ns.sort = { - NAME_ASCENDING: t.s('Name (Ascending)'), - NAME_DESCENDING: t.s('Name (Descending)'), - START_TIME: t.s('Start Time'), - FINISH_TIME: t.s('Finish Time') - }; - ns.list = { PANEL_TITLE: t.s('JOBS'), ROW_ITEM_LABEL_STARTED: t.s('Started'), diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index 48bedb049e..9b99bc397d 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -46,7 +46,7 @@ function ListJobsController ( }, true); const toolbarSortDefault = { - label: `${strings.get('sort.FINISH_TIME')}`, + label: `${strings.get('sort.FINISH_TIME_DESCENDING')}`, value: '-finished' }; @@ -63,7 +63,9 @@ function ListJobsController ( vm.toolbarSortOptions = [ { label: `${strings.get('sort.NAME_ASCENDING')}`, value: 'name' }, { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, - { label: `${strings.get('sort.START_TIME')}`, value: 'finished' }, + { 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' }, toolbarSortDefault ]; diff --git a/awx/ui/client/features/projects/projects.strings.js b/awx/ui/client/features/projects/projects.strings.js index 7512f0f339..c09f3104d9 100644 --- a/awx/ui/client/features/projects/projects.strings.js +++ b/awx/ui/client/features/projects/projects.strings.js @@ -46,11 +46,6 @@ function ProjectsStrings (BaseString) { HEADER: this.error.HEADER, CALL: this.error.CALL, }; - - ns.sort = { - NAME_ASCENDING: t.s('Name (Ascending)'), - NAME_DESCENDING: t.s('Name (Descending)') - }; } ProjectsStrings.$inject = ['BaseStringService']; diff --git a/awx/ui/client/features/projects/projectsList.controller.js b/awx/ui/client/features/projects/projectsList.controller.js index b3557d7d00..3d2e1369fa 100644 --- a/awx/ui/client/features/projects/projectsList.controller.js +++ b/awx/ui/client/features/projects/projectsList.controller.js @@ -68,10 +68,11 @@ function projectsListController ( vm.toolbarSortOptions = [ toolbarSortDefault, - { - label: `${strings.get('sort.NAME_DESCENDING')}`, - value: '-name' - } + { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, + { 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' } ]; vm.toolbarSortValue = toolbarSortDefault; diff --git a/awx/ui/client/features/templates/templates.strings.js b/awx/ui/client/features/templates/templates.strings.js index b536f665b3..d294988d01 100644 --- a/awx/ui/client/features/templates/templates.strings.js +++ b/awx/ui/client/features/templates/templates.strings.js @@ -143,11 +143,6 @@ function TemplatesStrings (BaseString) { CANCEL: t.s('CANCEL'), SAVE_AND_EXIT: t.s('SAVE & EXIT') }; - - ns.sort = { - NAME_ASCENDING: t.s('Name (Ascending)'), - NAME_DESCENDING: t.s('Name (Descending)') - }; } TemplatesStrings.$inject = ['BaseStringService']; diff --git a/awx/ui/client/features/templates/templatesList.controller.js b/awx/ui/client/features/templates/templatesList.controller.js index b072029752..84c2d512fb 100644 --- a/awx/ui/client/features/templates/templatesList.controller.js +++ b/awx/ui/client/features/templates/templatesList.controller.js @@ -71,7 +71,11 @@ function ListTemplatesController( vm.toolbarSortOptions = [ toolbarSortDefault, - { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' } + { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, + { 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' } ]; vm.toolbarSortValue = toolbarSortDefault; diff --git a/awx/ui/client/features/users/tokens/tokens.strings.js b/awx/ui/client/features/users/tokens/tokens.strings.js index 13487e9ede..2f84642eae 100644 --- a/awx/ui/client/features/users/tokens/tokens.strings.js +++ b/awx/ui/client/features/users/tokens/tokens.strings.js @@ -41,11 +41,6 @@ function TokensStrings (BaseString) { PERSONAL_ACCESS_TOKEN: t.s('Personal Access Token'), HEADER: appName => t.s('{{ appName }} Token', { appName }), }; - - ns.sort = { - NAME_ASCENDING: t.s('Name (Ascending)'), - NAME_DESCENDING: t.s('Name (Descending)') - }; } TokensStrings.$inject = ['BaseStringService']; diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js index aedac69bcb..008f30fda7 100644 --- a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js +++ b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js @@ -50,10 +50,13 @@ function ListTokensController ( vm.toolbarSortOptions = [ toolbarSortDefault, - { - label: `${strings.get('sort.NAME_DESCENDING')}`, - value: '-application__name' - } + { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-application__name' }, + { 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.EXPIRES_ASCENDING')}`, value: 'expires' }, + { label: `${strings.get('sort.EXPIRES_DESCENDING')}`, value: '-expires' } ]; function setToolbarSort () { diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index 6db4249b49..df725d43a4 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -103,6 +103,27 @@ function BaseStringService (namespace) { CANCEL: resourceType => t.s('Cancel the {{resourceType}}', { resourceType }) }; + this.sort = { + NAME_ASCENDING: t.s('Name (Ascending)'), + NAME_DESCENDING: t.s('Name (Descending)'), + CREATED_ASCENDING: t.s('Created (Ascending)'), + CREATED_DESCENDING: t.s('Created (Descending)'), + MODIFIED_ASCENDING: t.s('Modified (Ascending)'), + MODIFIED_DESCENDING: t.s('Modified (Descending)'), + EXPIRES_ASCENDING: t.s('Expires (Ascending)'), + EXPIRES_DESCENDING: t.s('Expires (Descending)'), + LAST_JOB_RUN_ASCENDING: t.s('Last Run (Ascending)'), + LAST_JOB_RUN_DESCENDING: t.s('Last Run (Descending)'), + USERNAME_ASCENDING: t.s('Username (Ascending)'), + USERNAME_DESCENDING: t.s('Username (Descending)'), + START_TIME_ASCENDING: t.s('Start Time (Ascending)'), + START_TIME_DESCENDING: t.s('Start Time (Descending)'), + 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)') + }; + this.ALERT = ({ header, body }) => t.s('{{ header }} {{ body }}', { header, body }); /** diff --git a/awx/ui/client/src/instance-groups/instance-groups.strings.js b/awx/ui/client/src/instance-groups/instance-groups.strings.js index ca93c23140..0becb671f7 100644 --- a/awx/ui/client/src/instance-groups/instance-groups.strings.js +++ b/awx/ui/client/src/instance-groups/instance-groups.strings.js @@ -62,11 +62,6 @@ function InstanceGroupsStrings (BaseString) { ns.alert = { MISSING_PARAMETER: t.s('Instance Group parameter is missing.'), }; - - ns.sort = { - NAME_ASCENDING: t.s('Name (Ascending)'), - NAME_DESCENDING: t.s('Name (Descending)') - }; } InstanceGroupsStrings.$inject = ['BaseStringService']; 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 474e3712bf..fdafc621bb 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 @@ -42,10 +42,13 @@ function InstanceModalController ($scope, $state, Dataset, models, strings, Proc vm.toolbarSortValue = toolbarSortDefault; vm.toolbarSortOptions = [ toolbarSortDefault, - { - label: `${strings.get('sort.NAME_DESCENDING')}`, - value: '-hostname' - } + { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-hostname' }, + { label: `${strings.get('sort.UUID_ASCENDING')}`, value: 'uuid' }, + { label: `${strings.get('sort.UUID_DESCENDING')}`, value: '-uuid' }, + { 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' } ]; 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 329ee1ad19..7b54b13af1 100644 --- a/awx/ui/client/src/instance-groups/instances/instances.controller.js +++ b/awx/ui/client/src/instance-groups/instances/instances.controller.js @@ -24,10 +24,13 @@ function InstancesController ($scope, $state, $http, $transitions, models, strin vm.toolbarSortValue = toolbarSortDefault; vm.toolbarSortOptions = [ toolbarSortDefault, - { - label: `${strings.get('sort.NAME_DESCENDING')}`, - value: '-hostname' - } + { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-hostname' }, + { label: `${strings.get('sort.UUID_ASCENDING')}`, value: 'uuid' }, + { label: `${strings.get('sort.UUID_DESCENDING')}`, value: '-uuid' }, + { 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' } ]; const removeStateParamsListener = $scope.$watchCollection('$state.params', () => { diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js b/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js index 766f968442..2037aef0d9 100644 --- a/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js +++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js @@ -43,10 +43,11 @@ export default ['$scope', '$filter', '$state', 'Alert', 'resolvedModels', 'Datas vm.toolbarSortOptions = [ toolbarSortDefault, - { - label: `${strings.get('sort.NAME_DESCENDING')}`, - value: '-name' - } + { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, + { 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' } ]; vm.toolbarSortValue = toolbarSortDefault; From 3cd8d4f7e62f24bf3da4ff7ac1935fc45bc5d099 Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 26 Apr 2019 11:52:07 -0400 Subject: [PATCH 2/5] 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', () => { From b7e26b350787c5b64a6b108637876765ee3049c2 Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 26 Apr 2019 13:15:37 -0400 Subject: [PATCH 3/5] Fix linting error --- awx/ui/client/lib/services/base-string.service.js | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index e90c343678..faf89389e7 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -132,7 +132,6 @@ function BaseStringService (namespace) { 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 }); From eaaad89a8c69f680b81062cb794f8e37f3d434e8 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 1 May 2019 09:17:15 -0400 Subject: [PATCH 4/5] Removed inventory sorting from jobs list. Changed Last Run to Last Used in project sort filters. --- awx/ui/client/features/jobs/jobsList.controller.js | 2 -- awx/ui/client/features/projects/projectsList.controller.js | 4 ++-- awx/ui/client/lib/services/base-string.service.js | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index c4784e5a69..3881a4071c 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -68,8 +68,6 @@ function ListJobsController ( { 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 d1ba3922f7..a295d6e52b 100644 --- a/awx/ui/client/features/projects/projectsList.controller.js +++ b/awx/ui/client/features/projects/projectsList.controller.js @@ -71,8 +71,8 @@ function projectsListController ( { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, { 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_USED_ASCENDING')}`, value: 'last_job_run' }, + { label: `${strings.get('sort.LAST_USED_DESCENDING')}`, value: '-last_job_run' }, { label: `${strings.get('sort.ORGANIZATION_ASCENDING')}`, value: 'organization' }, { label: `${strings.get('sort.ORGANIZATION_DESCENDING')}`, value: '-organization' } ]; diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index faf89389e7..3e7b3b7cd7 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -114,6 +114,8 @@ function BaseStringService (namespace) { EXPIRES_DESCENDING: t.s('Expires (Descending)'), LAST_JOB_RUN_ASCENDING: t.s('Last Run (Ascending)'), LAST_JOB_RUN_DESCENDING: t.s('Last Run (Descending)'), + LAST_USED_ASCENDING: t.s('Last Used (Ascending)'), + LAST_USED_DESCENDING: t.s('Last Used (Descending)'), USERNAME_ASCENDING: t.s('Username (Ascending)'), USERNAME_DESCENDING: t.s('Username (Descending)'), START_TIME_ASCENDING: t.s('Start Time (Ascending)'), From b754e0dbba3f28681a44589bf11d615816ba7924 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 2 May 2019 13:55:20 -0400 Subject: [PATCH 5/5] Fix template sorting by project --- awx/ui/client/features/templates/templatesList.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/features/templates/templatesList.controller.js b/awx/ui/client/features/templates/templatesList.controller.js index 7a0e13b6f8..8c95aa745a 100644 --- a/awx/ui/client/features/templates/templatesList.controller.js +++ b/awx/ui/client/features/templates/templatesList.controller.js @@ -78,8 +78,8 @@ function ListTemplatesController( { 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' }, + { label: `${strings.get('sort.PROJECT_ASCENDING')}`, value: 'jobtemplate__project__id' }, + { label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-jobtemplate__project__id' }, ]; vm.toolbarSortValue = toolbarSortDefault;