External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 02:50:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Add more sort options to new lists

Browse Source
This commit is contained in:
mabashian 2019-04-25 15:21:47 -04:00
parent 27d74528c0
commit 7f452ee8d1
16 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/features/applications/applications.strings.js
View File

@ -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'];

11
awx/ui/client/features/applications/list-applications-users.controller.js
View File

@ -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 () {

4
awx/ui/client/features/applications/list-applications.controller.js
View File

@ -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;

7
awx/ui/client/features/jobs/jobs.strings.js
View File

@ -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'),

6
awx/ui/client/features/jobs/jobsList.controller.js
View File

@ -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
];

5
awx/ui/client/features/projects/projects.strings.js
View File

@ -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'];

9
awx/ui/client/features/projects/projectsList.controller.js
View File

@ -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;

5
awx/ui/client/features/templates/templates.strings.js
View File

@ -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'];

6
awx/ui/client/features/templates/templatesList.controller.js
View File

@ -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;

5
awx/ui/client/features/users/tokens/tokens.strings.js
View File

@ -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'];

11
awx/ui/client/features/users/tokens/users-tokens-list.controller.js
View File

@ -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 () {

21
awx/ui/client/lib/services/base-string.service.js
View File

@ -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 });
/**

5
awx/ui/client/src/instance-groups/instance-groups.strings.js
View File

@ -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'];

11
awx/ui/client/src/instance-groups/instances/instance-modal.controller.js
View File

@ -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', () => {

11
awx/ui/client/src/instance-groups/instances/instances.controller.js
View File

@ -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', () => {

9
awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js
View File

@ -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;