shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 06:51:10 +03:00
Code Releases Activity

Use eslint on ui/lib and ui/features code

Browse Source
This commit is contained in:
gconsidine 2017-09-15 17:40:59 -04:00
parent 6b7126ab6b
commit cec9507504
53 changed files with 525 additions and 562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/.babelrc
View File

@ -1,3 +0,0 @@
{
"presets": ["es2015"]
}

7
awx/ui/.eslintignore
View File

@ -13,5 +13,8 @@ tests
client/**/*.js
test
!client/component/**/*.js
!client/model/**/*.js
!client/lib/components/**/*.js
!client/lib/models/**/*.js
!client/lib/services/**/*.js
!client/features/**/*.js

24
awx/ui/.eslintrc.js
View File

@ -1,8 +1,19 @@
const path = require('path');
module.exports = {
extends: 'airbnb-base',
extends: [
'airbnb-base'
],
plugins: [
'import'
],
settings: {
'import/resolver': {
webpack: {
config: path.join(__dirname, 'build/webpack.development.js')
}
}
},
env: {
browser: true,
node: true
@ -11,13 +22,20 @@ module.exports = {
angular: true,
d3: true,
$: true,
_: true,
codemirror: true,
jsyaml: true
},
rules: {
indent: [0, 4],
'comma-dangle': 0,
'prefer-const': 0,
'space-before-function-paren': [2, 'always']
'space-before-function-paren': [2, 'always'],
'arrow-parens': 0,
'no-param-reassign': 0,
'no-underscore-dangle': 0,
'no-mixed-operators': 0,
'no-plusplus': 0,
'no-continue': 0,
'object-curly-newline': 0
}
};

43
awx/ui/build/webpack.base.js
View File

@ -42,12 +42,16 @@ let base = {
publicPath: '',
filename: OUTPUT
},
stats: 'minimal',
module: {
rules: [
{
test: /\.js$/,
loader: 'babel-loader',
exclude: /node_modules/
exclude: /node_modules/,
options: {
presets: ['env']
}
},
{
test: /\.css$/,
@ -104,8 +108,9 @@ let base = {
_: 'lodash'
}),
new ExtractTextPlugin('css/[name].[hash].css'),
new CleanWebpackPlugin([STATIC_PATH, COVERAGE_PATH], {
new CleanWebpackPlugin([STATIC_PATH, COVERAGE_PATH, LANGUAGES_PATH], {
root: UI_PATH,
verbose: false
}),
new CopyWebpackPlugin([
{
@ -174,23 +179,23 @@ let base = {
],
resolve: {
alias: {
'@features': FEATURES_PATH,
'@models': MODELS_PATH,
'@services': SERVICES_PATH,
'@components': COMPONENTS_PATH,
'@modules': NODE_MODULES_PATH,
'@assets': ASSETS_PATH,
'd3$': '@modules/d3/d3.min.js',
'codemirror.jsonlint$': '@modules/codemirror/addon/lint/json-lint.js',
'jquery-resize$': '@modules/javascript-detect-element-resize/jquery.resize.js',
'select2$': '@modules/select2/dist/js/select2.full.min.js',
'js-yaml$': '@modules/js-yaml/dist/js-yaml.min.js',
'lr-infinite-scroll$': '@modules/lr-infinite-scroll/lrInfiniteScroll.js',
'angular-ui-router$': '@modules/angular-ui-router/release/angular-ui-router.js',
'angular-ui-router-state-events$': '@modules/angular-ui-router/release/stateEvents.js',
'ng-toast-provider$': '@modules/ng-toast/src/scripts/provider.js',
'ng-toast-directives$': '@modules/ng-toast/src/scripts/directives.js',
'ng-toast$': '@modules/ng-toast/src/scripts/module.js'
'~features': FEATURES_PATH,
'~models': MODELS_PATH,
'~services': SERVICES_PATH,
'~components': COMPONENTS_PATH,
'~modules': NODE_MODULES_PATH,
'~assets': ASSETS_PATH,
'd3$': '~modules/d3/d3.min.js',
'codemirror.jsonlint$': '~modules/codemirror/addon/lint/json-lint.js',
'jquery-resize$': '~modules/javascript-detect-element-resize/jquery.resize.js',
'select2$': '~modules/select2/dist/js/select2.full.min.js',
'js-yaml$': '~modules/js-yaml/dist/js-yaml.min.js',
'lr-infinite-scroll$': '~modules/lr-infinite-scroll/lrInfiniteScroll.js',
'angular-ui-router$': '~modules/angular-ui-router/release/angular-ui-router.js',
'angular-ui-router-state-events$': '~modules/angular-ui-router/release/stateEvents.js',
'ng-toast-provider$': '~modules/ng-toast/src/scripts/provider.js',
'ng-toast-directives$': '~modules/ng-toast/src/scripts/directives.js',
'ng-toast$': '~modules/ng-toast/src/scripts/module.js'
}
}
};

19
awx/ui/build/webpack.development.js
View File

@ -2,10 +2,27 @@ const path = require('path');
const _ = require('lodash');
const ESLINTRC_PATH = path.resolve(__dirname, '..', '.eslintrc.js');
const LINTED_PATHS = [
/.js$/
];
let base = require('./webpack.base');
let development = {
devtool: 'cheap-source-map'
devtool: 'cheap-source-map',
module: {
rules: [
{
test: /\.js$/,
enforce: 'pre',
exclude: /node_modules/,
loader: 'eslint-loader'
}
]
}
};
development.module.rules = base.module.rules.concat(development.module.rules)
module.exports = _.merge(base, development);

2
awx/ui/build/webpack.watch.js
View File

@ -17,7 +17,7 @@ let watch = {
],
devServer: {
contentBase: path.resolve(__dirname, '..', 'static'),
clientLogLevel: 'info',
stats: 'minimal',
publicPath: '/static/',
host: '127.0.0.1',
port: 3000,

13
awx/ui/client/features/credentials/add-credentials.controller.js
View File

@ -1,10 +1,7 @@
function AddCredentialsController (models, $state, strings) {
let vm = this || {};
const vm = this || {};
let me = models.me;
let credential = models.credential;
let credentialType = models.credentialType;
let organization = models.organization;
const { me, credential, credentialType, organization } = models;
vm.mode = 'add';
vm.strings = strings;
@ -12,7 +9,7 @@ function AddCredentialsController (models, $state, strings) {
vm.tab = {
details: { _active: true },
permissions:{ _disabled: true }
permissions: { _disabled: true }
};
vm.form = credential.createFormSchema('post', {
@ -25,14 +22,14 @@ function AddCredentialsController (models, $state, strings) {
vm.form.organization._route = 'credentials.add.organization';
vm.form.organization._model = organization;
vm.form.organization._placeholder = strings.get('inputs.ORGANIZATION_PLACEHOLDER');
vm.form.credential_type._resource = 'credential_type';
vm.form.credential_type._route = 'credentials.add.credentialType';
vm.form.credential_type._model = credentialType;
vm.form.credential_type._placeholder = strings.get('inputs.CREDENTIAL_TYPE_PLACEHOLDER');
vm.form.inputs = {
_get: id => {
_get: () => {
credentialType.mergeInputProperties();
return credentialType.get('inputs.fields');

6
awx/ui/client/features/credentials/credentials.strings.js
View File

@ -1,8 +1,8 @@
function CredentialsStrings (BaseString) {
BaseString.call(this, 'credentials');
let t = this.t;
let ns = this.credentials;
const { t } = this;
const ns = this.credentials;
ns.state = {
ADD_BREADCRUMB_LABEL: t.s('CREATE CREDENTIAL'),

31
awx/ui/client/features/credentials/edit-credentials.controller.js
View File

@ -1,25 +1,22 @@
function EditCredentialsController (models, $state, $scope, strings) {
let vm = this || {};
const vm = this || {};
let me = models.me;
let credential = models.credential;
let credentialType = models.credentialType;
let organization = models.organization;
const { me, credential, credentialType, organization } = models;
let omit = ['user', 'team', 'inputs'];
let isEditable = credential.isEditable();
const omit = ['user', 'team', 'inputs'];
const isEditable = credential.isEditable();
vm.mode = 'edit';
vm.strings = strings;
vm.panelTitle = credential.get('name');
vm.tab = {
details: {
details: {
_active: true,
_go: 'credentials.edit',
_params: { credential_id: credential.get('id') }
},
permissions:{
permissions: {
_go: 'credentials.edit.permissions',
_params: { credential_id: credential.get('id') }
}
@ -45,11 +42,11 @@ function EditCredentialsController (models, $state, $scope, strings) {
vm.form.disabled = !isEditable;
}
let isOrgAdmin = _.some(me.get('related.admin_of_organizations.results'), (org) => {return org.id === organization.get('id');});
let isSuperuser = me.get('is_superuser');
let isCurrentAuthor = Boolean(credential.get('summary_fields.created_by.id') === me.get('id'));
const isOrgAdmin = _.some(me.get('related.admin_of_organizations.results'), (org) => org.id === organization.get('id'));
const isSuperuser = me.get('is_superuser');
const isCurrentAuthor = Boolean(credential.get('summary_fields.created_by.id') === me.get('id'));
vm.form.organization._disabled = true;
if(isSuperuser || isOrgAdmin || (credential.get('organization') === null && isCurrentAuthor)){
if (isSuperuser || isOrgAdmin || (credential.get('organization') === null && isCurrentAuthor)) {
vm.form.organization._disabled = false;
}
@ -66,11 +63,11 @@ function EditCredentialsController (models, $state, $scope, strings) {
vm.form.credential_type._value = credentialType.get('id');
vm.form.credential_type._displayValue = credentialType.get('name');
vm.form.credential_type._placeholder = strings.get('inputs.CREDENTIAL_TYPE_PLACEHOLDER');
vm.form.inputs = {
_get (id) {
_get () {
credentialType.mergeInputProperties();
if (credentialType.get('id') === credential.get('credential_type')) {
return credential.assignInputGroupValues(credentialType.get('inputs.fields'));
}
@ -94,7 +91,7 @@ function EditCredentialsController (models, $state, $scope, strings) {
return credential.request('put', data);
};
vm.form.onSaveSuccess = res => {
vm.form.onSaveSuccess = () => {
$state.go('credentials.edit', { credential_id: credential.get('id') }, { reload: true });
};
}

30
awx/ui/client/features/credentials/index.js
View File

@ -1,35 +1,33 @@
import LegacyCredentials from './legacy.credentials';
import AddController from './add-credentials.controller';
import EditController from './edit-credentials.controller';
import CredentialsStrings from './credentials.strings'
import CredentialsStrings from './credentials.strings';
const addEditTemplate = require('@features/credentials/add-edit-credentials.view.html');
const addEditTemplate = require('~features/credentials/add-edit-credentials.view.html');
function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, Organization) {
let id = $stateParams.credential_id;
const id = $stateParams.credential_id;
let promises = {
me: new Me('get').then((me) => {
return me.extend('get', 'admin_of_organizations');
})
const promises = {
me: new Me('get').then((me) => me.extend('get', 'admin_of_organizations'))
};
if (!id) {
promises.credential = new Credential('options');
promises.credentialType = new CredentialType();
promises.organization = new Organization();
promises.credentialType = new CredentialType();
promises.organization = new Organization();
return $q.all(promises)
return $q.all(promises);
}
promises.credential = new Credential(['get', 'options'], [id, id]);
return $q.all(promises)
.then(models => {
let typeId = models.credential.get('credential_type');
let orgId = models.credential.get('organization');
const typeId = models.credential.get('credential_type');
const orgId = models.credential.get('organization');
let dependents = {
const dependents = {
credentialType: new CredentialType('get', typeId),
organization: new Organization('get', orgId)
};
@ -54,9 +52,9 @@ CredentialsResolve.$inject = [
];
function CredentialsConfig ($stateExtenderProvider, legacyProvider, stringProvider) {
let stateExtender = $stateExtenderProvider.$get();
let legacy = legacyProvider.$get();
let strings = stringProvider.$get();
const stateExtender = $stateExtenderProvider.$get();
const legacy = legacyProvider.$get();
const strings = stringProvider.$get();
stateExtender.addState({
name: 'credentials.add',

95
awx/ui/client/features/credentials/legacy.credentials.js
View File

@ -1,11 +1,7 @@
import PermissionsList from '../../src/access/permissions-list.controller';
import CredentialForm from '../../src/credentials/credentials.form';
import CredentialList from '../../src/credentials/credentials.list';
import OrganizationList from '../../src/organizations/organizations.list';
import ListController from '../../src/credentials/list/credentials-list.controller';
import { N_ } from '../../src/i18n';
const indexTemplate = require('@features/credentials/index.view.html');
const indexTemplate = require('~features/credentials/index.view.html');
function LegacyCredentialsService () {
this.list = {
@ -23,8 +19,8 @@ function LegacyCredentialsService () {
templateUrl: indexTemplate
},
'list@credentials': {
templateProvider: function(CredentialList, generateList) {
let html = generateList.build({
templateProvider (CredentialList, generateList) {
const html = generateList.build({
list: CredentialList,
mode: 'edit'
});
@ -37,15 +33,13 @@ function LegacyCredentialsService () {
searchPrefix: 'credential',
resolve: {
Dataset: ['CredentialList', 'QuerySet', '$stateParams', 'GetBasePath',
function(list, qs, $stateParams, GetBasePath) {
let path = GetBasePath(list.basePath) || GetBasePath(list.name);
(list, qs, $stateParams, GetBasePath) => {
const path = GetBasePath(list.basePath) || GetBasePath(list.name);
return qs.search(path, $stateParams[`${list.iterator}_search`]);
}
],
credentialType: ['CredentialTypeModel', CredentialType => {
return new CredentialType('get');
}]
credentialType: ['CredentialTypeModel', CredentialType => new CredentialType('get')]
}
};
@ -53,11 +47,10 @@ function LegacyCredentialsService () {
name: 'credentials.edit.permissions',
url: '/permissions?{permission_search:queryset}',
resolve: {
ListDefinition: () => {
return {
ListDefinition: () => ({
name: 'permissions',
disabled: 'organization === undefined',
ngClick: `organization === undefined || $state.go('credentials.edit.permissions')`,
ngClick: 'organization === undefined || $state.go(\'credentials.edit.permissions\')',
awToolTip: '{{permissionsTooltip}}',
dataTipWatch: 'permissionsTooltip',
awToolTipTabEnabledInEditMode: true,
@ -73,11 +66,11 @@ function LegacyCredentialsService () {
open: false,
actions: {
add: {
ngClick: `$state.go('.add')`,
ngClick: '$state.go(\'.add\')',
label: 'Add',
awToolTip: N_('Add a permission'),
actionClass: 'btn List-buttonSubmit',
buttonContent: '+ ' + N_('ADD'),
buttonContent: `+ ${N_('ADD')}`,
ngShow: '(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
}
},
@ -101,13 +94,12 @@ function LegacyCredentialsService () {
class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4'
}
}
};
},
}),
Dataset: ['QuerySet', '$stateParams', (qs, $stateParams) => {
let id = $stateParams.credential_id;
let path = `api/v2/credentials/${id}/access_list/`;
const id = $stateParams.credential_id;
const path = `api/v2/credentials/${id}/access_list/`;
return qs.search(path, $stateParams[`permission_search`]);
return qs.search(path, $stateParams.permission_search);
}
]
},
@ -117,8 +109,8 @@ function LegacyCredentialsService () {
page_size: '20',
order_by: 'username'
},
dynamic:true,
squash:''
dynamic: true,
squash: ''
}
},
ncyBreadcrumb: {
@ -126,12 +118,12 @@ function LegacyCredentialsService () {
label: N_('PERMISSIONS')
},
views: {
'related': {
templateProvider: function(CredentialForm, GenerateForm) {
let html = GenerateForm.buildCollection({
related: {
templateProvider (CredentialForm, GenerateForm) {
const html = GenerateForm.buildCollection({
mode: 'edit',
related: `permissions`,
form: typeof(CredentialForm) === 'function' ?
related: 'permissions',
form: typeof (CredentialForm) === 'function' ?
CredentialForm() : CredentialForm
});
return html;
@ -152,7 +144,7 @@ function LegacyCredentialsService () {
'GetBasePath',
'resourceData',
(list, qs, $stateParams, GetBasePath, resourceData) => {
let path = resourceData.data.organization ? GetBasePath('organizations') + `${resourceData.data.organization}/users` : ((list.basePath) || GetBasePath(list.name));
const path = resourceData.data.organization ? `${GetBasePath('organizations')}${resourceData.data.organization}/users` : ((list.basePath) || GetBasePath(list.name));
return qs.search(path, $stateParams.user_search);
}
],
@ -163,23 +155,18 @@ function LegacyCredentialsService () {
'GetBasePath',
'resourceData',
(list, qs, $stateParams, GetBasePath, resourceData) => {
let path = GetBasePath(list.basePath) || GetBasePath(list.name);
const path = GetBasePath(list.basePath) || GetBasePath(list.name);
if(!resourceData.data.organization) {
if (!resourceData.data.organization) {
return null;
}
else {
$stateParams[`${list.iterator}_search`].organization = resourceData.data.organization;
return qs.search(path, $stateParams.team_search);
}
}
],
resourceData: ['CredentialModel', '$stateParams', (Credential, $stateParams) => {
return new Credential('get', $stateParams.credential_id)
.then(credential => ({ data: credential.get() }));
}],
resourceData: ['CredentialModel', '$stateParams', (Credential, $stateParams) => new Credential('get', $stateParams.credential_id)
.then(credential => ({ data: credential.get() }))],
},
params: {
user_search: {
@ -224,7 +211,7 @@ function LegacyCredentialsService () {
};
this.lookupTemplateProvider = (ListDefinition, generateList) => {
let html = generateList.build({
const html = generateList.build({
mode: 'lookup',
list: ListDefinition,
input_type: 'radio'
@ -256,19 +243,15 @@ function LegacyCredentialsService () {
},
views: {},
resolve: {
ListDefinition: ['OrganizationList', list => {
return list;
}],
ListDefinition: ['OrganizationList', list => list],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath',
(list, qs, $stateParams, GetBasePath) => {
return qs.search(
(list, qs, $stateParams, GetBasePath) => qs.search(
GetBasePath('organizations'),
$stateParams[`${list.iterator}_search`]
);
}
)
]
},
onExit: function($state) {
onExit ($state) {
if ($state.transition) {
$('#form-modal').modal('hide');
$('.modal-backdrop').remove();
@ -299,19 +282,15 @@ function LegacyCredentialsService () {
},
views: {},
resolve: {
ListDefinition: ['CredentialTypesList', list => {
return list;
}],
ListDefinition: ['CredentialTypesList', list => list],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath',
(list, qs, $stateParams, GetBasePath) => {
return qs.search(
(list, qs, $stateParams, GetBasePath) => qs.search(
GetBasePath('credential_types'),
$stateParams[`${list.iterator}_search`]
);
}
)
]
},
onExit: function($state) {
onExit ($state) {
if ($state.transition) {
$('#form-modal').modal('hide');
$('.modal-backdrop').remove();
@ -359,7 +338,7 @@ function LegacyCredentialsService () {
default:
throw new Error(N_(`Legacy state configuration for ${name} does not exist`));
};
}
};
}

2
awx/ui/client/features/index.js
View File

@ -1,4 +1,4 @@
import './credentials';
import '~features/credentials';
angular.module('at.features', [
'at.features.credentials'

2
awx/ui/client/lib/components/action/action-group.directive.js
View File

@ -1,4 +1,4 @@
const templateUrl = require('@components/action/action-group.partial.html');
const templateUrl = require('~components/action/action-group.partial.html');
function atActionGroup () {
return {

10
awx/ui/client/lib/components/components.strings.js
View File

@ -1,8 +1,8 @@
function ComponentsStrings (BaseString) {
BaseString.call(this, 'components');
let t = this.t;
let ns = this.components;
const { t } = this;
const ns = this.components;
ns.REPLACE = t.s('REPLACE');
ns.REVERT = t.s('REVERT');
@ -18,7 +18,7 @@ function ComponentsStrings (BaseString) {
ns.form = {
SUBMISSION_ERROR_TITLE: t.s('Unable to Submit'),
SUBMISSION_ERROR_MESSAGE:t.s('Unexpected server error. View the console for more information'),
SUBMISSION_ERROR_MESSAGE: t.s('Unexpected server error. View the console for more information'),
SUBMISSION_ERROR_PREFACE: t.s('Unexpected Error')
};
@ -46,7 +46,7 @@ function ComponentsStrings (BaseString) {
ns.truncate = {
DEFAULT: t.s('Copy full revision to clipboard.'),
COPIED: t.s('Copied to clipboard.')
}
};
ns.layout = {
CURRENT_USER_LABEL: t.s('Logged in as'),
@ -71,7 +71,7 @@ function ComponentsStrings (BaseString) {
SETTINGS: t.s('Settings'),
FOOTER_ABOUT: t.s('About'),
FOOTER_COPYRIGHT: t.s('Copyright © 2017 Red Hat, Inc.')
}
};
}
ComponentsStrings.$inject = ['BaseStringService'];

27
awx/ui/client/lib/components/form/action.directive.js
View File

@ -1,25 +1,22 @@
const templateUrl = require('@components/form/action.partial.html');
const templateUrl = require('~components/form/action.partial.html');
function link (scope, element, attrs, controllers) {
let formController = controllers[0];
let actionController = controllers[1];
const [formController, actionController] = controllers;
actionController.init(formController, element, scope);
actionController.init(formController, scope);
}
function atFormActionController ($state, strings) {
let vm = this || {};
const vm = this || {};
let element;
let form;
let scope;
vm.init = (_form_, _element_, _scope_) => {
vm.init = (_form_, _scope_) => {
form = _form_;
element = _element_;
scope = _scope_;
switch(scope.type) {
switch (scope.type) {
case 'cancel':
vm.setCancelDefaults();
break;
@ -33,22 +30,18 @@ function atFormActionController ($state, strings) {
form.register('action', scope);
};
vm.setCustomDefaults = () => {
};
vm.setCancelDefaults = () => {
scope.text = strings.get('CANCEL'),
scope.text = strings.get('CANCEL');
scope.fill = 'Hollow';
scope.color = 'default';
scope.action = () => $state.go(scope.to || '^');
scope.action = () => { $state.go(scope.to || '^'); };
};
vm.setSaveDefaults = () => {
scope.text = strings.get('SAVE'),
scope.text = strings.get('SAVE');
scope.fill = '';
scope.color = 'success';
scope.action = () => form.submit();
scope.action = () => { form.submit(); };
};
}

55
awx/ui/client/lib/components/form/form.directive.js
View File

@ -1,8 +1,8 @@
const templateUrl = require('@components/form/form.partial.html');
const templateUrl = require('~components/form/form.partial.html');
function atFormLink (scope, el, attrs, controllers) {
let formController = controllers[0];
let form = el[0];
const formController = controllers[0];
const form = el[0];
scope.ns = 'form';
scope[scope.ns] = { modal: {} };
@ -11,7 +11,7 @@ function atFormLink (scope, el, attrs, controllers) {
}
function AtFormController (eventService, strings) {
let vm = this || {};
const vm = this || {};
let scope;
let modal;
@ -27,22 +27,22 @@ function AtFormController (eventService, strings) {
vm.init = (_scope_, _form_) => {
scope = _scope_;
form = _form_;
modal = scope[scope.ns].modal;
({ modal } = scope[scope.ns]);
vm.state.disabled = scope.state.disabled;
vm.setListeners();
};
vm.register = (category, component, el) => {
vm.register = (category, component) => {
component.category = category;
component.form = vm.state;
vm.components.push(component)
vm.components.push(component);
};
vm.setListeners = () => {
let listeners = eventService.addListeners([
const listeners = eventService.addListeners([
[form, 'keypress', vm.submitOnEnter]
]);
@ -58,14 +58,14 @@ function AtFormController (eventService, strings) {
scope.$apply(vm.submit);
};
vm.submit = event => {
vm.submit = () => {
if (!vm.state.isValid) {
return;
}
vm.state.disabled = true;
let data = vm.components
const data = vm.components
.filter(component => component.category === 'input')
.reduce((values, component) => {
if (!component.state._value) {
@ -87,7 +87,7 @@ function AtFormController (eventService, strings) {
scope.state.save(data)
.then(scope.state.onSaveSuccess)
.catch(err => vm.onSaveError(err))
.finally(() => vm.state.disabled = false);
.finally(() => { vm.state.disabled = false; });
};
vm.onSaveError = err => {
@ -103,22 +103,22 @@ function AtFormController (eventService, strings) {
if (!handled) {
let message;
let title = strings.get('form.SUBMISSION_ERROR_TITLE');
let preface = strings.get('form.SUBMISSION_ERROR_PREFACE');
const title = strings.get('form.SUBMISSION_ERROR_TITLE');
const preface = strings.get('form.SUBMISSION_ERROR_PREFACE');
if (typeof err.data === 'object') {
message = JSON.stringify(err.data);
message = JSON.stringify(err.data);
} else {
message = err.data;
}
modal.show(title, `${preface}: ${message}`)
modal.show(title, `${preface}: ${message}`);
}
};
vm.handleUnexpectedError = err => {
let title = strings.get('form.SUBMISSION_ERROR_TITLE');
let message = strings.get('form.SUBMISSION_ERROR_MESSAGE');
vm.handleUnexpectedError = () => {
const title = strings.get('form.SUBMISSION_ERROR_TITLE');
const message = strings.get('form.SUBMISSION_ERROR_MESSAGE');
modal.show(title, message);
@ -126,7 +126,7 @@ function AtFormController (eventService, strings) {
};
vm.handleValidationError = errors => {
let errorMessageSet = vm.setValidationMessages(errors);
const errorMessageSet = vm.setValidationMessages(errors);
if (errorMessageSet) {
vm.check();
@ -138,22 +138,23 @@ function AtFormController (eventService, strings) {
vm.setValidationMessages = (errors, errorSet) => {
let errorMessageSet = errorSet || false;
for (let id in errors) {
if (!Array.isArray(errors[id]) && typeof errors[id] === 'object') {
errorMessageSet = vm.setValidationMessages(errors[id], errorMessageSet);
continue;
Object.keys(errors).forEach(error => {
if (!Array.isArray(error) && typeof error === 'object') {
errorMessageSet = vm.setValidationMessages(error, errorMessageSet);
return;
}
vm.components
.filter(component => component.category === 'input')
.filter(component => errors[component.state.id])
.filter(component => error[component.state.id])
.forEach(component => {
errorMessageSet = true;
component.state._rejected = true;
component.state._message = errors[component.state.id].join(' ');
component.state._message = error[component.state.id].join(' ');
});
}
});
return errorMessageSet;
};
@ -176,7 +177,7 @@ function AtFormController (eventService, strings) {
};
vm.check = () => {
let isValid = vm.validate();
const isValid = vm.validate();
if (isValid !== vm.state.isValid) {
vm.state.isValid = isValid;

56
awx/ui/client/lib/components/index.js
View File

@ -1,32 +1,32 @@
import actionGroup from '@components/action/action-group.directive';
import divider from '@components/utility/divider.directive';
import form from '@components/form/form.directive';
import formAction from '@components/form/action.directive';
import inputCheckbox from '@components/input/checkbox.directive';
import inputGroup from '@components/input/group.directive';
import inputLabel from '@components/input/label.directive';
import inputLookup from '@components/input/lookup.directive';
import inputMessage from '@components/input/message.directive';
import inputSecret from '@components/input/secret.directive';
import inputSelect from '@components/input/select.directive';
import inputText from '@components/input/text.directive';
import inputTextarea from '@components/input/textarea.directive';
import inputTextareaSecret from '@components/input/textarea-secret.directive';
import layout from '@components/layout/layout.directive';
import modal from '@components/modal/modal.directive';
import panel from '@components/panel/panel.directive';
import panelBody from '@components/panel/body.directive';
import panelHeading from '@components/panel/heading.directive';
import popover from '@components/popover/popover.directive';
import sideNav from '@components/layout/side-nav.directive';
import sideNavItem from '@components/layout/side-nav-item.directive';
import tab from '@components/tabs/tab.directive';
import tabGroup from '@components/tabs/group.directive';
import topNavItem from '@components/layout/top-nav-item.directive';
import truncate from '@components/truncate/truncate.directive';
import actionGroup from '~components/action/action-group.directive';
import divider from '~components/utility/divider.directive';
import form from '~components/form/form.directive';
import formAction from '~components/form/action.directive';
import inputCheckbox from '~components/input/checkbox.directive';
import inputGroup from '~components/input/group.directive';
import inputLabel from '~components/input/label.directive';
import inputLookup from '~components/input/lookup.directive';
import inputMessage from '~components/input/message.directive';
import inputSecret from '~components/input/secret.directive';
import inputSelect from '~components/input/select.directive';
import inputText from '~components/input/text.directive';
import inputTextarea from '~components/input/textarea.directive';
import inputTextareaSecret from '~components/input/textarea-secret.directive';
import layout from '~components/layout/layout.directive';
import modal from '~components/modal/modal.directive';
import panel from '~components/panel/panel.directive';
import panelBody from '~components/panel/body.directive';
import panelHeading from '~components/panel/heading.directive';
import popover from '~components/popover/popover.directive';
import sideNav from '~components/layout/side-nav.directive';
import sideNavItem from '~components/layout/side-nav-item.directive';
import tab from '~components/tabs/tab.directive';
import tabGroup from '~components/tabs/group.directive';
import topNavItem from '~components/layout/top-nav-item.directive';
import truncate from '~components/truncate/truncate.directive';
import BaseInputController from '@components/input/base.controller';
import ComponentsStrings from '@components/components.strings';
import BaseInputController from '~components/input/base.controller';
import ComponentsStrings from '~components/components.strings';
angular
.module('at.lib.components', [])

14
awx/ui/client/lib/components/input/base.controller.js
View File

@ -4,7 +4,7 @@ function BaseInputController (strings) {
const ENCRYPTED_VALUE = '$encrypted$';
return function extend (type, scope, element, form) {
let vm = this;
const vm = this;
vm.strings = strings;
@ -50,10 +50,10 @@ function BaseInputController (strings) {
}
if (scope.state._required && !scope.state._value && !scope.state._displayValue) {
isValid = false;
isValid = false;
message = vm.strings.get('message.REQUIRED_INPUT_MISSING');
} else if (scope.state._validate) {
let result = scope.state._validate(scope.state._value);
const result = scope.state._validate(scope.state._value);
if (!result.isValid) {
isValid = false;
@ -111,18 +111,16 @@ function BaseInputController (strings) {
scope.state._activeModel = '_displayValue';
scope.state._disabled = true;
scope.state._enableToggle = false;
} else {
if (scope.state._isBeingReplaced === false) {
} else if (scope.state._isBeingReplaced === false) {
scope.state._disabled = true;
scope.state._enableToggle = true;
scope.state._value = scope.state._preEditValue;
} else {
scope.state._activeModel = '_value';
scope.state._disabled = false;
scope.state._value = '';
scope.state._value = '';
}
}
vm.check();
};
};

8
awx/ui/client/lib/components/input/checkbox.directive.js
View File

@ -1,8 +1,8 @@
const templateUrl = require('@components/input/checkbox.partial.html');
const templateUrl = require('~components/input/checkbox.partial.html');
function atInputCheckboxLink (scope, element, attrs, controllers) {
let formController = controllers[0];
let inputController = controllers[1];
const formController = controllers[0];
const inputController = controllers[1];
if (scope.tab === '1') {
element.find('input')[0].focus();
@ -12,7 +12,7 @@ function atInputCheckboxLink (scope, element, attrs, controllers) {
}
function AtInputCheckboxController (baseInputController) {
let vm = this || {};
const vm = this || {};
vm.init = (scope, element, form) => {
baseInputController.call(vm, 'input', scope, element, form);

46
awx/ui/client/lib/components/input/group.directive.js
View File

@ -1,15 +1,15 @@
const templateUrl = require('@components/input/group.partial.html');
const templateUrl = require('~components/input/group.partial.html');
function atInputGroupLink (scope, el, attrs, controllers) {
let groupController = controllers[0];
let formController = controllers[1];
let element = el[0].getElementsByClassName('at-InputGroup-container')[0];
const groupController = controllers[0];
const formController = controllers[1];
const element = el[0].getElementsByClassName('at-InputGroup-container')[0];
groupController.init(scope, formController, element);
}
function AtInputGroupController ($scope, $compile) {
let vm = this || {};
const vm = this || {};
let form;
let scope;
@ -31,7 +31,7 @@ function AtInputGroupController ($scope, $compile) {
if (!source._value || source._value === state._value) {
return false;
}
return true;
};
@ -46,15 +46,15 @@ function AtInputGroupController ($scope, $compile) {
state._value = source._value;
let inputs = state._get(source._value);
let group = vm.createComponentConfigs(inputs);
const inputs = state._get(source._value);
const group = vm.createComponentConfigs(inputs);
vm.insert(group);
state._group = group;
};
vm.createComponentConfigs = inputs => {
let group = [];
const group = [];
if (inputs) {
inputs.forEach((input, i) => {
@ -73,7 +73,7 @@ function AtInputGroupController ($scope, $compile) {
};
vm.getComponentType = input => {
let config = {};
const config = {};
if (input.type === 'string') {
if (!input.multiline) {
@ -105,17 +105,17 @@ function AtInputGroupController ($scope, $compile) {
config._data = input.choices;
config._exp = 'choice for (index, choice) in state._data';
} else {
let preface = vm.strings.get('group.UNSUPPORTED_ERROR_PREFACE');
throw new Error(`${preface}: ${input.type}`)
const preface = vm.strings.get('group.UNSUPPORTED_ERROR_PREFACE');
throw new Error(`${preface}: ${input.type}`);
}
return config;
};
vm.insert = group => {
let container = document.createElement('div');
const container = document.createElement('div');
let col = 1;
let colPerRow = 12 / scope.col;
const colPerRow = 12 / scope.col;
let isDivided = true;
group.forEach((input, i) => {
@ -125,7 +125,7 @@ function AtInputGroupController ($scope, $compile) {
container.appendChild(input._element[0]);
if ((input._expand || col % colPerRow === 0) && i !== group.length -1) {
if ((input._expand || col % colPerRow === 0) && i !== group.length - 1) {
container.appendChild(vm.createDivider()[0]);
isDivided = true;
col = 0;
@ -140,21 +140,19 @@ function AtInputGroupController ($scope, $compile) {
};
vm.createComponent = (input, index) => {
let tabindex = Number(scope.tab) + index;
let col = input._expand ? 12 : scope.col;
let component = angular.element(
`<${input._component} col="${col}" tab="${tabindex}"
const tabindex = Number(scope.tab) + index;
const col = input._expand ? 12 : scope.col;
const component = angular.element(`<${input._component} col="${col}" tab="${tabindex}"
state="${state._reference}._group[${index}]">
</${input._component}>`
);
</${input._component}>`);
$compile(component)(scope.$parent)
$compile(component)(scope.$parent);
return component;
};
vm.createDivider = () => {
let divider = angular.element('<at-divider></at-divider>');
const divider = angular.element('<at-divider></at-divider>');
$compile(divider[0])(scope.$parent);
return divider;

2
awx/ui/client/lib/components/input/label.directive.js
View File

@ -1,4 +1,4 @@
const templateUrl = require('@components/input/label.partial.html');
const templateUrl = require('~components/input/label.partial.html');
function atInputLabel () {
return {

29
awx/ui/client/lib/components/input/lookup.directive.js
View File

@ -1,11 +1,11 @@
const templateUrl = require('@components/input/lookup.partial.html');
const templateUrl = require('~components/input/lookup.partial.html');
const DEFAULT_DEBOUNCE = 250;
const DEFAULT_KEY = 'name';
function atInputLookupLink (scope, element, attrs, controllers) {
let formController = controllers[0];
let inputController = controllers[1];
const formController = controllers[0];
const inputController = controllers[1];
if (scope.tab === '1') {
element.find('input')[0].focus();
@ -14,8 +14,8 @@ function atInputLookupLink (scope, element, attrs, controllers) {
inputController.init(scope, element, formController);
}
function AtInputLookupController (baseInputController, $q, $state, $stateParams) {
let vm = this || {};
function AtInputLookupController (baseInputController, $q, $state) {
const vm = this || {};
let scope;
let model;
@ -52,7 +52,7 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams)
};
vm.lookup = () => {
let params = {};
const params = {};
if (scope.state._value && scope.state._isValid) {
params.selected = scope.state._value;
@ -77,7 +77,7 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams)
vm.resetDebounce = () => {
clearTimeout(vm.debounce);
vm.searchAfterDebounce();
vm.searchAfterDebounce();
};
vm.search = () => {
@ -90,7 +90,9 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams)
return model.search({ [search.key]: scope.state._displayValue }, search.config)
.then(found => {
if (!found) {
return vm.reset();
vm.reset();
return;
}
scope[scope.state._resource] = model.get('id');
@ -99,8 +101,8 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams)
})
.catch(() => vm.reset())
.finally(() => {
let isValid = scope.state._value !== undefined;
let message = isValid ? '' : vm.strings.get('lookup.NOT_FOUND');
const isValid = scope.state._value !== undefined;
const message = isValid ? '' : vm.strings.get('lookup.NOT_FOUND');
vm.check({ isValid, message });
});
@ -108,7 +110,9 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams)
vm.searchOnInput = () => {
if (vm.isDebouncing) {
return vm.resetDebounce();
vm.resetDebounce();
return;
}
vm.searchAfterDebounce();
@ -118,8 +122,7 @@ function AtInputLookupController (baseInputController, $q, $state, $stateParams)
AtInputLookupController.$inject = [
'BaseInputController',
'$q',
'$state',
'$stateParams'
'$state'
];
function atInputLookup () {

2
awx/ui/client/lib/components/input/message.directive.js
View File

@ -1,4 +1,4 @@
const templateUrl = require('@components/input/message.partial.html');
const templateUrl = require('~components/input/message.partial.html');
function atInputMessage () {
return {

8
awx/ui/client/lib/components/input/secret.directive.js
View File

@ -1,8 +1,8 @@
const templateUrl = require('@components/input/secret.partial.html');
const templateUrl = require('~components/input/secret.partial.html');
function atInputSecretLink (scope, element, attrs, controllers) {
let formController = controllers[0];
let inputController = controllers[1];
const formController = controllers[0];
const inputController = controllers[1];
if (scope.tab === '1') {
element.find('input')[0].focus();
@ -12,7 +12,7 @@ function atInputSecretLink (scope, element, attrs, controllers) {
}
function AtInputSecretController (baseInputController) {
let vm = this || {};
const vm = this || {};
let scope;

25
awx/ui/client/lib/components/input/select.directive.js
View File

@ -1,18 +1,13 @@
const templateUrl = require('@components/input/select.partial.html');
const templateUrl = require('~components/input/select.partial.html');
function atInputSelectLink (scope, element, attrs, controllers) {
let formController = controllers[0];
let inputController = controllers[1];
if (scope.tab === '1') {
elements.select.focus();
}
const [formController, inputController] = controllers;
inputController.init(scope, element, formController);
}
function AtInputSelectController (baseInputController, eventService) {
let vm = this || {};
const vm = this || {};
let scope;
let element;
@ -24,8 +19,12 @@ function AtInputSelectController (baseInputController, eventService) {
scope = _scope_;
element = _element_;
input = element.find('input')[0];
select = element.find('select')[0];
[input] = element.find('input');
[select] = element.find('select');
if (scope.tab === '1') {
select.focus();
}
if (!scope.state._data || scope.state._data.length === 0) {
scope.state._disabled = true;
@ -36,14 +35,14 @@ function AtInputSelectController (baseInputController, eventService) {
vm.check();
if (scope.state._value) {
vm.updateDisplayModel();
vm.updateDisplayModel();
}
};
vm.setListeners = () => {
let listeners = eventService.addListeners([
const listeners = eventService.addListeners([
[input, 'focus', () => select.focus],
[select, 'mousedown', () => scope.$apply(() => scope.open = !scope.open)],
[select, 'mousedown', () => scope.$apply(() => { scope.open = !scope.open; })],
[select, 'focus', () => input.classList.add('at-Input--focus')],
[select, 'change', () => scope.$apply(() => {
scope.open = false;

8
awx/ui/client/lib/components/input/text.directive.js
View File

@ -1,8 +1,8 @@
const templateUrl = require('@components/input/text.partial.html');
const templateUrl = require('~components/input/text.partial.html');
function atInputTextLink (scope, element, attrs, controllers) {
let formController = controllers[0];
let inputController = controllers[1];
const formController = controllers[0];
const inputController = controllers[1];
if (scope.tab === '1') {
element.find('input')[0].focus();
@ -12,7 +12,7 @@ function atInputTextLink (scope, element, attrs, controllers) {
}
function AtInputTextController (baseInputController) {
let vm = this || {};
const vm = this || {};
vm.init = (scope, element, form) => {
baseInputController.call(vm, 'input', scope, element, form);

39
awx/ui/client/lib/components/input/textarea-secret.directive.js
View File

@ -1,8 +1,7 @@
const templateUrl = require('@components/input/textarea-secret.partial.html');
const templateUrl = require('~components/input/textarea-secret.partial.html');
function atInputTextareaSecretLink (scope, element, attrs, controllers) {
let formController = controllers[0];
let inputController = controllers[1];
const [formController, inputController] = controllers;
if (scope.tab === '1') {
element.find('textarea')[0].focus();
@ -12,35 +11,31 @@ function atInputTextareaSecretLink (scope, element, attrs, controllers) {
}
function AtInputTextareaSecretController (baseInputController, eventService) {
let vm = this || {};
const vm = this || {};
let scope;
let textarea;
let container;
let input;
vm.init = (_scope_, element, form) => {
baseInputController.call(vm, 'input', _scope_, element, form);
scope = _scope_;
textarea = element.find('textarea')[0];
container = element[0];
[textarea] = element.find('textarea');
if (scope.state.format === 'ssh_private_key') {
scope.ssh = true;
scope.state._hint = scope.state._hint || vm.strings.get('textarea.SSH_KEY_HINT');
input = element.find('input')[0];
[input] = element.find('input');
}
if (scope.state._value) {
scope.state._buttonText = vm.strings.get('REPLACE');
scope.state._placeholder = vm.strings.get('ENCRYPTED');
} else {
if (scope.state.format === 'ssh_private_key') {
} else if (scope.state.format === 'ssh_private_key') {
vm.listeners = vm.setFileListeners(textarea, input);
scope.state._displayHint = true;
}
}
vm.check();
};
@ -59,34 +54,32 @@ function AtInputTextareaSecretController (baseInputController, eventService) {
}
};
vm.setFileListeners = (textarea, input) => {
return eventService.addListeners([
[textarea, 'dragenter', event => {
vm.setFileListeners = (textareaEl, inputEl) => eventService.addListeners([
[textareaEl, 'dragenter', event => {
event.stopPropagation();
event.preventDefault();
scope.$apply(() => scope.drag = true);
scope.$apply(() => { scope.drag = true; });
}],
[input, 'dragleave', event => {
[inputEl, 'dragleave', event => {
event.stopPropagation();
event.preventDefault();
scope.$apply(() => scope.drag = false);
scope.$apply(() => { scope.drag = false; });
}],
[input, 'change', event => {
let reader = new FileReader();
[inputEl, 'change', event => {
const reader = new FileReader();
reader.onload = () => vm.readFile(reader, event);
reader.readAsText(input.files[0]);
reader.readAsText(inputEl.files[0]);
}]
]);
};
vm.readFile = (reader, event) => {
vm.readFile = (reader) => {
scope.$apply(() => {
scope.state._value = reader.result;
vm.check();
scope.drag = false
scope.drag = false;
input.value = '';
});
};

8
awx/ui/client/lib/components/input/textarea.directive.js
View File

@ -1,8 +1,8 @@
const templateUrl = require('@components/input/textarea.partial.html');
const templateUrl = require('~components/input/textarea.partial.html');
function atInputTextareaLink (scope, element, attrs, controllers) {
let formController = controllers[0];
let inputController = controllers[1];
const formController = controllers[0];
const inputController = controllers[1];
if (scope.tab === '1') {
element.find('input')[0].focus();
@ -12,7 +12,7 @@ function atInputTextareaLink (scope, element, attrs, controllers) {
}
function AtInputTextareaController (baseInputController) {
let vm = this || {};
const vm = this || {};
vm.init = (scope, element, form) => {
baseInputController.call(vm, 'input', scope, element, form);

21
awx/ui/client/lib/components/layout/layout.directive.js
View File

@ -1,13 +1,13 @@
const templateUrl = require('@components/layout/layout.partial.html');
const templateUrl = require('~components/layout/layout.partial.html');
function AtLayoutController ($scope, strings) {
let vm = this || {};
const vm = this || {};
$scope.$on('$stateChangeSuccess', function(event, next) {
$scope.$on('$stateChangeSuccess', (event, next) => {
vm.currentState = next.name;
});
$scope.$watch('$root.current_user', function(val) {
$scope.$watch('$root.current_user', (val) => {
vm.isLoggedIn = val && val.username;
if (val) {
vm.isSuperUser = $scope.$root.user_is_superuser || $scope.$root.user_is_system_auditor;
@ -16,19 +16,19 @@ function AtLayoutController ($scope, strings) {
}
});
$scope.$watch('$root.socketStatus', function(newStatus) {
$scope.$watch('$root.socketStatus', (newStatus) => {
vm.socketState = newStatus;
vm.socketIconClass = "icon-socket-" + $scope.socketStatus;
vm.socketIconClass = `icon-socket-${$scope.socketStatus}`;
});
$scope.$watch('$root.licenseMissing', function(licenseMissing) {
$scope.$watch('$root.licenseMissing', (licenseMissing) => {
vm.licenseIsMissing = licenseMissing;
});
vm.getString = function(string) {
vm.getString = string => {
try {
return strings.get(`layout.${string}`);
} catch(err) {
} catch (err) {
return strings.get(string);
}
};
@ -44,8 +44,7 @@ function atLayout () {
templateUrl,
controller: AtLayoutController,
controllerAs: 'vm',
scope: {
}
scope: {}
};
}

21
awx/ui/client/lib/components/layout/side-nav-item.directive.js
View File

@ -1,18 +1,16 @@
const templateUrl = require('@components/layout/side-nav-item.partial.html');
const templateUrl = require('~components/layout/side-nav-item.partial.html');
function atSideNavItemLink (scope, element, attrs, ctrl) {
scope.navVm = ctrl[0];
scope.layoutVm = ctrl[1];
[scope.navVm, scope.layoutVm] = ctrl;
}
function AtSideNavItemController ($state, $scope, strings) {
let vm = this || {};
const vm = this || {};
$scope.$watch('layoutVm.currentState', function(current) {
$scope.$watch('layoutVm.currentState', current => {
if ($scope.name === 'portal mode') {
vm.isRoute = (current && current.indexOf('portalMode') === 0);
} else {
if (current && current.indexOf($scope.route) === 0) {
} else if (current && current.indexOf($scope.route) === 0) {
if (current.indexOf('jobs.schedules') === 0 && $scope.route === 'jobs') {
vm.isRoute = false;
} else {
@ -21,12 +19,11 @@ function AtSideNavItemController ($state, $scope, strings) {
} else {
vm.isRoute = false;
}
}
});
vm.go = function() {
$state.go($scope.route, {}, {reload: true});
}
vm.go = () => {
$state.go($scope.route, {}, { reload: true });
};
vm.tooltip = {
popover: {
@ -36,7 +33,7 @@ function AtSideNavItemController ($state, $scope, strings) {
position: 'right',
arrowHeight: 18
}
}
};
}
AtSideNavItemController.$inject = ['$state', '$scope', 'ComponentsStrings'];

6
awx/ui/client/lib/components/layout/side-nav.directive.js
View File

@ -1,17 +1,17 @@
const templateUrl = require('@components/layout/side-nav.partial.html');
const templateUrl = require('~components/layout/side-nav.partial.html');
function atSideNavLink (scope, element, attrs, ctrl) {
scope.layoutVm = ctrl;
}
function AtSideNavController () {
let vm = this || {};
const vm = this || {};
vm.isExpanded = false;
vm.toggleExpansion = () => {
vm.isExpanded = !vm.isExpanded;
}
};
}
function atSideNav () {

6
awx/ui/client/lib/components/layout/top-nav-item.directive.js
View File

@ -1,14 +1,14 @@
const templateUrl = require('@components/layout/top-nav-item.partial.html');
const templateUrl = require('~components/layout/top-nav-item.partial.html');
function atTopNavItemLink (scope, element, attrs, ctrl) {
scope.layoutVm = ctrl;
scope.isHidden = false;
var shownWhen = attrs.isShown;
const shownWhen = attrs.isShown;
if (shownWhen !== 'missingLicense') {
scope.$watch('layoutVm.licenseIsMissing', function(val) {
scope.$watch('layoutVm.licenseIsMissing', (val) => {
scope.isHidden = val;
});
}

30
awx/ui/client/lib/components/modal/modal.directive.js
View File

@ -1,19 +1,19 @@
const templateUrl = require('@components/modal/modal.partial.html');
const templateUrl = require('~components/modal/modal.partial.html');
const DEFAULT_ANIMATION_DURATION = 150;
function atModalLink (scope, el, attrs, controllers) {
let modalController = controllers[0];
let property = `scope.${scope.ns}.modal`;
const modalController = controllers[0];
const property = `scope.${scope.ns}.modal`;
let done = scope.$watch(property, () => {
const done = scope.$watch(property, () => {
modalController.init(scope, el);
done();
});
}
function AtModalController (eventService, strings) {
let vm = this;
const vm = this;
let overlay;
let modal;
@ -22,15 +22,15 @@ function AtModalController (eventService, strings) {
vm.strings = strings;
vm.init = (scope, el) => {
overlay = el[0];
modal = el.find('.at-Modal-window')[0];
[overlay] = el;
[modal] = el.find('.at-Modal-window');
vm.modal = scope[scope.ns].modal;
vm.modal.show = vm.show;
vm.modal.hide = vm.hide;
};
vm.show = (title, message) => {
vm.show = (title, message, event) => {
vm.modal.title = title;
vm.modal.message = message;
@ -49,7 +49,9 @@ function AtModalController (eventService, strings) {
eventService.remove(listeners);
setTimeout(() => overlay.style.display = 'none', DEFAULT_ANIMATION_DURATION);
setTimeout(() => {
overlay.style.display = 'none';
}, DEFAULT_ANIMATION_DURATION);
};
vm.clickToHide = event => {
@ -59,10 +61,10 @@ function AtModalController (eventService, strings) {
};
vm.clickIsOutsideModal = e => {
let m = modal.getBoundingClientRect();
let cx = e.clientX;
let cy = e.clientY;
const m = modal.getBoundingClientRect();
const cx = e.clientX;
const cy = e.clientY;
if (cx < m.left || cx > m.right || cy > m.bottom || cy < m.top) {
return true;
}
@ -74,7 +76,7 @@ function AtModalController (eventService, strings) {
AtModalController.$inject = [
'EventService',
'ComponentsStrings'
]
];
function atModal () {
return {

2
awx/ui/client/lib/components/panel/body.directive.js
View File

@ -1,4 +1,4 @@
const templateUrl = require('@components/panel/body.partial.html');
const templateUrl = require('~components/panel/body.partial.html');
function atPanelBody () {
return {

2
awx/ui/client/lib/components/panel/heading.directive.js
View File

@ -1,4 +1,4 @@
const templateUrl = require('@components/panel/heading.partial.html');
const templateUrl = require('~components/panel/heading.partial.html');
function link (scope, el, attrs, panel) {
panel.use(scope);

16
awx/ui/client/lib/components/panel/panel.directive.js
View File

@ -1,20 +1,18 @@
const templateUrl = require('@components/panel/panel.partial.html');
const templateUrl = require('~components/panel/panel.partial.html');
function atPanelLink (scope, el, attrs, controllers) {
let panelController = controllers[0];
function atPanelLink (scope, el, attrs, controller) {
const panelController = controller;
panelController.init(scope, el);
panelController.init(scope);
}
function AtPanelController ($state) {
let vm = this;
const vm = this;
let scope;
let el;
vm.init = (_scope_, _el_) => {
vm.init = (_scope_) => {
scope = _scope_;
el = _el_;
};
vm.dismiss = () => {
@ -32,7 +30,7 @@ function atPanel () {
return {
restrict: 'E',
replace: true,
require: ['atPanel'],
require: 'atPanel',
transclude: true,
templateUrl,
controller: AtPanelController,

100
awx/ui/client/lib/components/popover/popover.directive.js
View File

@ -1,4 +1,4 @@
const templateUrl = require('@components/popover/popover.partial.html');
const templateUrl = require('~components/popover/popover.partial.html');
const DEFAULT_POSITION = 'right';
const DEFAULT_ACTION = 'click';
@ -10,21 +10,20 @@ const DEFAULT_REFRESH_DELAY = 50;
const DEFAULT_RESET_ON_EXIT = false;
function atPopoverLink (scope, el, attr, controllers) {
let popoverController = controllers[0];
let container = el[0];
let popover = container.getElementsByClassName('at-Popover-container')[0];
let icon = container.getElementsByTagName('i')[0];
const popoverController = controllers[0];
const container = el[0];
const popover = container.getElementsByClassName('at-Popover-container')[0];
const icon = container.getElementsByTagName('i')[0];
let done = scope.$watch('state', () => {
const done = scope.$watch('state', () => {
popoverController.init(scope, container, icon, popover);
done();
});
}
function AtPopoverController () {
let vm = this;
const vm = this;
let container;
let icon;
let popover;
let scope;
@ -59,24 +58,22 @@ function AtPopoverController () {
}
};
vm.createDismissListener = (createEvent) => {
return event => {
event.stopPropagation();
vm.createDismissListener = () => event => {
event.stopPropagation();
if (vm.isClickWithinPopover(event, popover)) {
return;
}
if (vm.isClickWithinPopover(event, popover)) {
return;
}
vm.dismiss();
vm.dismiss();
if (scope.popover.on === 'mouseenter') {
icon.removeEventListener('mouseleave', vm.dismissListener);
} else {
window.addEventListener(scope.popover.on, vm.dismissListener);
}
if (scope.popover.on === 'mouseenter') {
icon.removeEventListener('mouseleave', vm.dismissListener);
} else {
window.addEventListener(scope.popover.on, vm.dismissListener);
}
window.removeEventListener('resize', vm.dismissListener);
};
window.removeEventListener('resize', vm.dismissListener);
};
vm.dismiss = (refresh) => {
@ -91,11 +88,11 @@ function AtPopoverController () {
popover.style.opacity = 0;
};
vm.isClickWithinPopover = (event, popover) => {
let box = popover.getBoundingClientRect();
vm.isClickWithinPopover = (event, popoverEl) => {
const box = popoverEl.getBoundingClientRect();
let x = event.clientX;
let y = event.clientY;
const x = event.clientX;
const y = event.clientY;
if ((x <= box.right && x >= box.left) && (y >= box.top && y <= box.bottom)) {
return true;
@ -104,26 +101,24 @@ function AtPopoverController () {
return false;
};
vm.createDisplayListener = () => {
return event => {
if (vm.open) {
return;
}
vm.createDisplayListener = () => event => {
if (vm.open) {
return;
}
event.stopPropagation();
event.stopPropagation();
vm.display();
vm.display();
vm.dismissListener = vm.createDismissListener(event);
vm.dismissListener = vm.createDismissListener(event);
if (scope.popover.on === 'mouseenter') {
icon.addEventListener('mouseleave', vm.dismissListener);
} else {
window.addEventListener(scope.popover.on, vm.dismissListener);
}
if (scope.popover.on === 'mouseenter') {
icon.addEventListener('mouseleave', vm.dismissListener);
} else {
window.addEventListener(scope.popover.on, vm.dismissListener);
}
window.addEventListener('resize', vm.dismissListener);
};
window.addEventListener('resize', vm.dismissListener);
};
vm.refresh = () => {
@ -136,12 +131,12 @@ function AtPopoverController () {
};
vm.getPositions = () => {
let arrow = popover.getElementsByClassName('at-Popover-arrow')[0];
const arrow = popover.getElementsByClassName('at-Popover-arrow')[0];
arrow.style.lineHeight = `${DEFAULT_ARROW_HEIGHT}px`;
arrow.children[0].style.lineHeight = `${scope.popover.arrowHeight}px`;
let data = {
const data = {
arrow,
icon: icon.getBoundingClientRect(),
popover: popover.getBoundingClientRect(),
@ -158,7 +153,7 @@ function AtPopoverController () {
vm.display = () => {
vm.open = true;
let positions = vm.getPositions();
const positions = vm.getPositions();
popover.style.visibility = 'visible';
popover.style.opacity = 1;
@ -171,19 +166,18 @@ function AtPopoverController () {
};
vm.displayRight = (pos) => {
let arrowHeight = pos.arrow.offsetHeight;
let arrowLeft = pos.rightBoundary + DEFAULT_PADDING;
const arrowHeight = pos.arrow.offsetHeight;
const arrowLeft = pos.rightBoundary + DEFAULT_PADDING;
const popoverLeft = arrowLeft + DEFAULT_PADDING - 1;
let popoverTop;
let popoverLeft = arrowLeft + DEFAULT_PADDING - 1;
if (pos.cy < (pos.popover.height / 2)) {
popoverTop = DEFAULT_PADDING;
} else {
popoverTop = Math.floor((pos.cy - pos.popover.height / 2));
}
let arrowTop = Math.floor(popoverTop + (pos.popover.height / 2) - (arrowHeight / 2));
const arrowTop = Math.floor(popoverTop + (pos.popover.height / 2) - (arrowHeight / 2));
pos.arrow.style.top = `${arrowTop}px`;
pos.arrow.style.left = `${arrowLeft}px`;
@ -193,11 +187,11 @@ function AtPopoverController () {
};
vm.displayTop = (pos) => {
let arrowTop = pos.icon.top - pos.icon.height - DEFAULT_PADDING;
let arrowLeft = Math.floor(pos.icon.right - pos.icon.width - (pos.arrow.style.width / 2));
const arrowTop = pos.icon.top - pos.icon.height - DEFAULT_PADDING;
const arrowLeft = Math.floor(pos.icon.right - pos.icon.width - (pos.arrow.style.width / 2));
let popoverTop = pos.icon.top - pos.popover.height - pos.icon.height - 5;
let popoverLeft = Math.floor(pos.cx - (pos.popover.width / 2));
const popoverTop = pos.icon.top - pos.popover.height - pos.icon.height - 5;
const popoverLeft = Math.floor(pos.cx - (pos.popover.width / 2));
pos.arrow.style.top = `${arrowTop}px`;
pos.arrow.style.left = `${arrowLeft}px`;

25
awx/ui/client/lib/components/tabs/group.directive.js
View File

@ -1,24 +1,10 @@
const templateUrl = require('@components/tabs/group.partial.html');
const templateUrl = require('~components/tabs/group.partial.html');
function atTabGroupLink (scope, el, attrs, controllers) {
let groupController = controllers[0];
groupController.init(scope, el);
}
function AtTabGroupController ($state) {
let vm = this;
function AtTabGroupController () {
const vm = this;
vm.tabs = [];
let scope;
let el;
vm.init = (_scope_, _el_) => {
scope = _scope_;
el = _el_;
};
vm.register = tab => {
tab.active = true;
@ -26,18 +12,15 @@ function AtTabGroupController ($state) {
};
}
AtTabGroupController.$inject = ['$state'];
function atTabGroup () {
return {
restrict: 'E',
replace: true,
require: ['atTabGroup'],
require: 'atTabGroup',
transclude: true,
templateUrl,
controller: AtTabGroupController,
controllerAs: 'vm',
link: atTabGroupLink,
scope: {
state: '='
}

14
awx/ui/client/lib/components/tabs/tab.directive.js
View File

@ -1,22 +1,20 @@
const templateUrl = require('@components/tabs/tab.partial.html');
const templateUrl = require('~components/tabs/tab.partial.html');
function atTabLink (scope, el, attrs, controllers) {
let groupController = controllers[0];
let tabController = controllers[1];
const groupController = controllers[0];
const tabController = controllers[1];
tabController.init(scope, el, groupController);
tabController.init(scope, groupController);
}
function AtTabController ($state) {
let vm = this;
const vm = this;
let scope;
let el;
let group;
vm.init = (_scope_, _el_, _group_) => {
vm.init = (_scope_, _group_) => {
scope = _scope_;
el = _el_;
group = _group_;
group.register(scope);

20
awx/ui/client/lib/components/truncate/truncate.directive.js
View File

@ -1,15 +1,15 @@
const templateUrl = require('@components/truncate/truncate.partial.html');
const templateUrl = require('~components/truncate/truncate.partial.html');
function atTruncateLink (scope, el, attr, ctrl) {
let truncateController = ctrl;
let string = attr.string;
let maxlength = attr.maxlength;
const truncateController = ctrl;
const { string } = attr;
const { maxlength } = attr;
truncateController.init(el, string, maxlength);
}
function AtTruncateController (strings) {
let vm = this;
const vm = this;
let el;
let string;
let maxlength;
@ -29,14 +29,14 @@ function AtTruncateController (strings) {
position: 'top',
icon: 'fa fa-clone',
resetOnExit: true,
click: copyToClipboard
click: vm.copyToClipboard
}
};
function copyToClipboard() {
vm.copyToClipboard = () => {
vm.tooltip.popover.text = vm.strings.get('truncate.COPIED');
let textarea = el[0].getElementsByClassName('at-Truncate-textarea')[0];
const textarea = el[0].getElementsByClassName('at-Truncate-textarea')[0];
textarea.value = string;
textarea.select();
@ -46,7 +46,7 @@ function AtTruncateController (strings) {
AtTruncateController.$inject = ['ComponentsStrings'];
function atTruncate() {
function atTruncate () {
return {
restrict: 'E',
replace: true,
@ -60,7 +60,7 @@ function atTruncate() {
maxLength: '@',
string: '@'
}
}
};
}
export default atTruncate;

2
awx/ui/client/lib/components/utility/divider.directive.js
View File

@ -1,4 +1,4 @@
const templateUrl = require('@components/utility/divider.partial.html');
const templateUrl = require('~components/utility/divider.partial.html');
function atPanelBody () {
return {

83
awx/ui/client/lib/models/Base.js
View File

@ -4,9 +4,8 @@ let cache;
function request (method, resource) {
if (Array.isArray(method)) {
let promises = method.map((_method_, i) => {
return this.request(_method_, Array.isArray(resource) ? resource[i] : resource);
});
const promises = method.map((_method_, i) =>
this.request(_method_, Array.isArray(resource) ? resource[i] : resource));
return $q.all(promises);
}
@ -14,12 +13,12 @@ function request (method, resource) {
if (this.isCacheable(method, resource)) {
return this.requestWithCache(method, resource);
}
return this.http[method](resource);
}
function requestWithCache (method, resource) {
let key = cache.createKey(method, this.path, resource);
const key = cache.createKey(method, this.path, resource);
return cache.get(key)
.then(data => {
@ -43,16 +42,16 @@ function requestWithCache (method, resource) {
* supported by the API.
*
* @arg {Object} params - An object of keys and values to to format and
* to the URL as a query string. Refer to the API documentation for the
* to the URL as a query string. Refer to the API documentation for the
* resource in use for specifics.
* @arg {Object} config - Configuration specific to the UI to accommodate
* common use cases.
*
* @yields {boolean} - Indicating a match has been found. If so, the results
* @yields {boolean} - Indicating a match has been found. If so, the results
* are set on the model.
*/
function search (params, config) {
let req = {
const req = {
method: 'GET',
url: this.path,
params
@ -69,7 +68,7 @@ function search (params, config) {
return false;
}
this.model.GET = data.results[0];
[this.model.GET] = data.results;
} else {
this.model.GET = data;
}
@ -79,7 +78,7 @@ function search (params, config) {
}
function httpGet (resource) {
let req = {
const req = {
method: 'GET',
url: this.path
};
@ -101,7 +100,7 @@ function httpGet (resource) {
}
function httpPost (data) {
let req = {
const req = {
method: 'POST',
url: this.path,
data
@ -115,9 +114,9 @@ function httpPost (data) {
}
function httpPut (changes) {
let model = Object.assign(this.get(), changes);
const model = Object.assign(this.get(), changes);
let req = {
const req = {
method: 'PUT',
url: `${this.path}${model.id}/`,
data: model
@ -127,7 +126,7 @@ function httpPut (changes) {
}
function httpOptions (resource) {
let req = {
const req = {
method: 'OPTIONS',
url: this.path
};
@ -157,7 +156,7 @@ function unset (method, keys) {
keys = method;
method = 'GET';
}
method = method.toUpperCase();
keys = keys.split('.');
@ -166,10 +165,10 @@ function unset (method, keys) {
} else if (keys.length === 1) {
delete this.model[method][keys[0]];
} else {
let property = keys.splice(-1);
const property = keys.splice(-1);
keys = keys.join('.');
let model = this.find(method, keys)
const model = this.find(method, keys);
delete model[property];
}
}
@ -180,29 +179,29 @@ function set (method, keys, value) {
keys = method;
method = 'GET';
}
keys = keys.split('.');
if (keys.length === 1) {
model[keys[0]] = value;
this.model[keys[0]] = value;
} else {
let property = keys.splice(-1);
const property = keys.splice(-1);
keys = keys.join('.');
let model = this.find(method, keys)
const model = this.find(method, keys);
model[property] = value;
}
}
function match (method, key, value) {
if(!value) {
if (!value) {
value = key;
key = method;
method = 'GET';
}
let model = this.model[method.toUpperCase()];
const model = this.model[method.toUpperCase()];
if (!model) {
return null;
@ -216,7 +215,7 @@ function match (method, key, value) {
return null;
}
let result = model.results.filter(result => result[key] === value);
const result = model.results.filter(object => object[key] === value);
return result.length === 0 ? null : result[0];
}
@ -232,8 +231,8 @@ function find (method, keys) {
keys = keys.split('.');
keys.forEach(key => {
let bracketIndex = key.indexOf('[');
let hasArray = bracketIndex !== -1;
const bracketIndex = key.indexOf('[');
const hasArray = bracketIndex !== -1;
if (!hasArray) {
value = value[key];
@ -245,8 +244,8 @@ function find (method, keys) {
return;
}
let prop = key.substring(0, bracketIndex);
let index = Number(key.substring(bracketIndex + 1, key.length - 1));
const prop = key.substring(0, bracketIndex);
const index = Number(key.substring(bracketIndex + 1, key.length - 1));
value = value[prop][index];
});
@ -279,38 +278,37 @@ function has (method, keys) {
function extend (method, related) {
if (!related) {
related = method
method = 'GET'
related = method;
method = 'GET';
} else {
method = method.toUpperCase()
method = method.toUpperCase();
}
if (this.has(method, `related.${related}`)) {
let id = this.get('id')
let req = {
const req = {
method,
url: this.get(`related.${related}`)
};
return $http(req)
.then(({data}) => {
.then(({ data }) => {
this.set(method, `related.${related}`, data);
return this;
})
});
}
return Promise.reject(new Error(`No related property, ${related}, exists`));
}
function normalizePath (resource) {
let version = '/api/v2/';
const version = '/api/v2/';
return `${version}${resource}/`;
}
function isEditable () {
let canEdit = this.get('summary_fields.user_capabilities.edit');
const canEdit = this.get('summary_fields.user_capabilities.edit');
if (canEdit) {
return true;
@ -321,7 +319,6 @@ function isEditable () {
}
return false;
}
function isCreatable () {
@ -361,20 +358,20 @@ function graft (id) {
* @arg {string=} method - Populate the model with `GET` or `OPTIONS` data.
* @arg {(string|Object)=} resource - An `id` reference to a particular
* resource or an existing model's data.
* @arg {boolean=} graft - Create a new instance from existing model data.
* @arg {boolean=} isGraft - Create a new instance from existing model data.
*
* @returns {(Object|Promise)} - Returns a reference to the model instance
* if an empty instance or graft is created. Otherwise, a promise yielding
* a model instance is returned.
*/
function create (method, resource, graft, config) {
function create (method, resource, isGraft, config) {
if (!method) {
return this;
}
this.promise = this.request(method, resource, config);
if (graft) {
if (isGraft) {
return this;
}
@ -421,7 +418,7 @@ function BaseModel (path, settings) {
this.model = {};
this.path = this.normalizePath(path);
this.settings = settings || {};
};
}
function BaseModelLoader (_$http_, _$q_, _cache_) {
$http = _$http_;

12
awx/ui/client/lib/models/Config.js
View File

@ -1,12 +1,13 @@
let $log;
let BaseModel;
function getTruncatedVersion () {
let version;
try {
version = this.get('version').split('-')[0];
[version] = this.get('version').split('-');
} catch (err) {
console.error(err);
$log.error(err);
}
return version;
@ -15,7 +16,7 @@ function getTruncatedVersion () {
function isOpen () {
return this.get('license_info.license_type') === 'open';
}
function ConfigModel (method, resource, graft) {
BaseModel.call(this, 'config', { cache: true });
@ -26,12 +27,13 @@ function ConfigModel (method, resource, graft) {
return this.create(method, resource, graft);
}
function ConfigModelLoader (_BaseModel_) {
function ConfigModelLoader (_BaseModel_, _$log_) {
BaseModel = _BaseModel_;
$log = _$log_;
return ConfigModel;
}
ConfigModelLoader.$inject = ['BaseModel'];
ConfigModelLoader.$inject = ['BaseModel', '$log'];
export default ConfigModelLoader;

10
awx/ui/client/lib/models/Credential.js
View File

@ -8,19 +8,19 @@ function createFormSchema (method, config) {
method = 'GET';
}
let schema = Object.assign({}, this.options(`actions.${method.toUpperCase()}`));
const schema = Object.assign({}, this.options(`actions.${method.toUpperCase()}`));
if (config && config.omit) {
config.omit.forEach(key => delete schema[key]);
}
for (let key in schema) {
Object.keys(schema).forEach(key => {
schema[key].id = key;
if (this.has(key)) {
schema[key]._value = this.get(key);
}
}
});
return schema;
}
@ -31,7 +31,7 @@ function assignInputGroupValues (inputs) {
}
return inputs.map(input => {
let value = this.get(`inputs.${input.id}`);
const value = this.get(`inputs.${input.id}`);
input._value = value;
input._encrypted = value === ENCRYPTED_VALUE;
@ -50,7 +50,7 @@ function CredentialModel (method, resource, graft) {
return this.create(method, resource, graft);
}
function CredentialModelLoader (_BaseModel_ ) {
function CredentialModelLoader (_BaseModel_) {
BaseModel = _BaseModel_;
return CredentialModel;

8
awx/ui/client/lib/models/CredentialType.js
View File

@ -1,7 +1,7 @@
let BaseModel;
function categorizeByKind () {
let group = {};
const group = {};
this.get('results').forEach(result => {
group[result.kind] = group[result.kind] || [];
@ -16,12 +16,12 @@ function categorizeByKind () {
function mergeInputProperties () {
if (!this.has('inputs.fields')) {
return;
return undefined;
}
let required = this.get('inputs.required');
const required = this.get('inputs.required');
return this.get('inputs.fields').map((field, i) => {
return this.get('inputs.fields').forEach((field, i) => {
if (!required || required.indexOf(field.id) === -1) {
this.set(`inputs.fields[${i}].required`, false);
} else {

12
awx/ui/client/lib/models/index.js
View File

@ -1,9 +1,9 @@
import Base from '@models/Base';
import Config from '@models/Config';
import Credential from '@models/Credential';
import CredentialType from '@models/CredentialType';
import Me from '@models/Me';
import Organization from '@models/Organization';
import Base from '~models/Base';
import Config from '~models/Config';
import Credential from '~models/Credential';
import CredentialType from '~models/CredentialType';
import Me from '~models/Me';
import Organization from '~models/Organization';
angular
.module('at.lib.models', [])

5
awx/ui/client/lib/services/app.strings.js
View File

@ -1,5 +1,6 @@
// The purpose of this file is to instantiate the BaseStringService
// for app-wide usage.
/**
* This service is used to access the app-wide strings defined in BaseStringService.
*/
function AppStrings (BaseString) {
BaseString.call(this, 'app');
}

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

@ -1,4 +1,4 @@
import defaults from '@assets/default.strings.json';
import defaults from '~assets/default.strings.json';
let i18n;
@ -45,7 +45,7 @@ function BaseStringService (namespace) {
*/
this.t.p = i18n.translatePlural;
let t = this.t;
const { t } = this;
/*
* These strings are globally relevant and configured to give priority to values in
@ -79,7 +79,7 @@ function BaseStringService (namespace) {
* @arg {object=} context - An object containing data to use in the interpolation of the string
*/
this.get = (name, ...args) => {
let keys = name.split('.');
const keys = name.split('.');
let value;
keys.forEach(key => {
@ -90,7 +90,7 @@ function BaseStringService (namespace) {
}
if (!value) {
throw new Error(ERROR_NO_STRING + `: ${name}`);
throw new Error(`${ERROR_NO_STRING}: ${name}`);
}
});

15
awx/ui/client/lib/services/cache.service.js
View File

@ -1,16 +1,11 @@
function CacheService ($cacheFactory, $q) {
let cache = $cacheFactory('api');
const cache = $cacheFactory('api');
this.put = (key, data) => {
return cache.put(key, data);
};
this.get = (key) => {
return $q.resolve(cache.get(key));
};
this.put = (key, data) => cache.put(key, data);
this.get = (key) => $q.resolve(cache.get(key));
this.remove = (key) => {
if (!key) {
if (!key) {
return cache.removeAll();
}
@ -29,7 +24,7 @@ function CacheService ($cacheFactory, $q) {
}
return key;
}
};
}
CacheService.$inject = ['$cacheFactory', '$q'];

4
awx/ui/client/lib/services/event.service.js
View File

@ -1,6 +1,6 @@
function EventService () {
this.addListeners = list => {
let listeners = [];
const listeners = [];
list.forEach(args => listeners.push(this.addListener(...args)));
@ -8,7 +8,7 @@ function EventService () {
};
this.addListener = (el, name, fn) => {
let listener = {
const listener = {
fn,
name,
el

8
awx/ui/client/lib/services/index.js
View File

@ -1,7 +1,7 @@
import CacheService from '@services/cache.service';
import EventService from '@services/event.service';
import BaseStringService from '@services/base-string.service';
import AppStrings from '@services/app.strings';
import CacheService from '~services/cache.service';
import EventService from '~services/event.service';
import BaseStringService from '~services/base-string.service';
import AppStrings from '~services/app.strings';
angular
.module('at.lib.services', [])

20
awx/ui/client/src/vendor.js
View File

@ -1,13 +1,13 @@
require('@assets/custom-theme/jquery-ui-1.10.3.custom.min.css');
require('@assets/ansible-bootstrap.min.css');
require('@assets/fontcustom/fontcustom.css');
require('@modules/components-font-awesome/css/font-awesome.min.css');
require('@modules/select2/dist/css/select2.css');
require('@modules/codemirror/lib/codemirror.css');
require('@modules/codemirror/theme/elegant.css');
require('@modules/codemirror/addon/lint/lint.css');
require('@modules/nvd3/build/nv.d3.css');
require('@modules/ng-toast/dist/ngToast.min.css');
require('~assets/custom-theme/jquery-ui-1.10.3.custom.min.css');
require('~assets/ansible-bootstrap.min.css');
require('~assets/fontcustom/fontcustom.css');
require('~modules/components-font-awesome/css/font-awesome.min.css');
require('~modules/select2/dist/css/select2.css');
require('~modules/codemirror/lib/codemirror.css');
require('~modules/codemirror/theme/elegant.css');
require('~modules/codemirror/addon/lint/lint.css');
require('~modules/nvd3/build/nv.d3.css');
require('~modules/ng-toast/dist/ngToast.min.css');
require('jquery');
require('jquery-resize');
require('jquery-ui');

23
awx/ui/package.json
View File

@ -24,13 +24,12 @@
"test": "karma start karma.conf.js",
"jshint": "grunt jshint:source --no-color",
"test:ci": "npm run test -- --single-run --reporter junit,dots --browsers=PhantomJS",
"lint": "./node_modules/.bin/eslint -c .eslintrc.js .",
"component-test": "./node_modules/.bin/karma start client/test/unit/karma.conf.js",
"lint-dev": "./node_modules/.bin/nodemon --exec \"./node_modules/.bin/eslint -c .eslintrc.js .\" --watch \"client/components/**/*.js\"",
"dev": "./node_modules/.bin/webpack --config build/webpack.development.js --progress",
"watch": "./node_modules/.bin/webpack-dev-server --config build/webpack.watch.js --progress",
"production": "./node_modules/.bin/webpack --config build/webpack.production.js",
"e2e": "./client/test/e2e/runner.js --config ./client/test/e2e/nightwatch.conf.js"
"e2e": "./client/test/e2e/runner.js --config ./client/test/e2e/nightwatch.conf.js",
"component-test": "karma start client/test/karma.conf.js",
"lint": "eslint -c .eslintrc.js .",
"dev": "webpack --config build/webpack.development.js --progress",
"watch": "webpack-dev-server --config build/webpack.watch.js --progress",
"production": "webpack --config build/webpack.production.js"
},
"devDependencies": {
"angular-mocks": "~1.4.14",
@ -38,14 +37,16 @@
"babel-istanbul": "^0.11.0",
"babel-loader": "^7.1.2",
"babel-plugin-istanbul": "^2.0.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-env": "^1.6.0",
"chromedriver": "^2.31.0",
"clean-webpack-plugin": "^0.1.16",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.5",
"eslint": "^3.18.0",
"eslint-config-airbnb-base": "^11.1.1",
"eslint-plugin-import": "^2.2.0",
"eslint": "^4.6.1",
"eslint-config-airbnb-base": "^12.0.0",
"eslint-import-resolver-webpack": "^0.8.3",
"eslint-loader": "^1.9.0",
"eslint-plugin-import": "^2.7.0",
"expose-loader": "^0.7.3",
"extract-text-webpack-plugin": "^3.0.0",
"grunt": "^1.0.1",