Skip to content

Commit

Permalink
[Finishes #149703867] Remediating erronious styles (as per standardjs)
Browse files Browse the repository at this point in the history
  • Loading branch information
@AllenBW
AllenBW committed Aug 26, 2017
1 parent 9b92d28 commit e7c13af
Show file tree
Hide file tree
Showing 125 changed files with 4,578 additions and 4,417 deletions.
117 changes: 58 additions & 59 deletions client/app.js
View file
Original file line number Diff line number Diff line change
@@ -1,80 +1,79 @@
/* eslint-disable angular/window-service */

// The webpack entrypoint
function requireAll(context) {
context.keys().forEach(context);
function requireAll (context) {
context.keys().forEach(context)
}

// Globals that are expected in application code and some libraries
window.$ = window.jQuery = require('jquery');
window._ = require('lodash');
window.moment = require('moment');
window.sprintf = require('sprintf-js').sprintf;
window.c3 = require('c3/c3.js');
window.d3 = require('d3/d3.js');
window.$ = window.jQuery = require('jquery')
window._ = require('lodash')
window.moment = require('moment')
window.sprintf = require('sprintf-js').sprintf
window.c3 = require('c3/c3.js')
window.d3 = require('d3/d3.js')

// Vendor libraries, order matters
require('jquery-ui-bundle');
require('moment-timezone');
require('es6-shim');
require('angular');
require('angular-animate');
require('angular-cookies');
require('angular-resource');
require('angular-messages');
require('angular-sanitize');
require('angular-base64');
require('angular-bootstrap-switch');
require('angular-file-saver');
require('angular-ui-bootstrap');
require('angular-ui-sortable');
require('angular-gettext');
require('bootstrap');
require('angular-dragdrop');
require('angular-drag-and-drop-lists/angular-drag-and-drop-lists');
require('bootstrap-combobox');
require('bootstrap-datepicker');
require('bootstrap-select');
require('bootstrap-switch');
require('bootstrap-touchspin');
require('angular-svg-base-fix');
require('angular-ui-router');
require('angular-ui-router/release/stateEvents');
require('patternfly/dist/js/patternfly.js');
require('@manageiq/ui-components/dist/js/ui-components.js');
require('ngprogress/build/ngprogress.min.js');
require('ngstorage');
require('datatables.net/js/jquery.dataTables');
require('datatables.net-select/js/dataTables.select');
require('angular-datatables');
require('angular-datatables/dist/plugins/select/angular-datatables.select');
require('ui-select');
require('patternfly-timeline/dist/timeline');
require('jquery-ui-bundle')
require('moment-timezone')
require('es6-shim')
require('angular')
require('angular-animate')
require('angular-cookies')
require('angular-resource')
require('angular-messages')
require('angular-sanitize')
require('angular-base64')
require('angular-bootstrap-switch')
require('angular-file-saver')
require('angular-ui-bootstrap')
require('angular-ui-sortable')
require('angular-gettext')
require('bootstrap')
require('angular-dragdrop')
require('angular-drag-and-drop-lists/angular-drag-and-drop-lists')
require('bootstrap-combobox')
require('bootstrap-datepicker')
require('bootstrap-select')
require('bootstrap-switch')
require('bootstrap-touchspin')
require('angular-svg-base-fix')
require('angular-ui-router')
require('angular-ui-router/release/stateEvents')
require('patternfly/dist/js/patternfly.js')
require('@manageiq/ui-components/dist/js/ui-components.js')
require('ngprogress/build/ngprogress.min.js')
require('ngstorage')
require('datatables.net/js/jquery.dataTables')
require('datatables.net-select/js/dataTables.select')
require('angular-datatables')
require('angular-datatables/dist/plugins/select/angular-datatables.select')
require('ui-select')
require('patternfly-timeline/dist/timeline')

// Needs imports loader because it expects `this` to be `window`
require('imports-loader?this=>window!actioncable');
// eslint-disable-next-line import/no-webpack-loader-syntax
require('imports-loader?this=>window!actioncable')

// Must be required last because of its dependencies
require('angular-patternfly/dist/angular-patternfly');
require('angular-patternfly/dist/angular-patternfly')

// Application scripts, order matters
require('./app/app.module.js');
require('./app/app.module.js')

// Vendor styles, order matters
require('patternfly/dist/css/patternfly-additions.css');
require('angular-patternfly/dist/styles/angular-patternfly.css');
require('@manageiq/ui-components/dist/css/ui-components.css');
require('ngprogress/ngProgress.css');
require('datatables.net-dt/css/jquery.dataTables.css');
require('ui-select/dist/select.css');
require('patternfly-timeline/dist/timeline.css');

require('patternfly/dist/css/patternfly-additions.css')
require('angular-patternfly/dist/styles/angular-patternfly.css')
require('@manageiq/ui-components/dist/css/ui-components.css')
require('ngprogress/ngProgress.css')
require('datatables.net-dt/css/jquery.dataTables.css')
require('ui-select/dist/select.css')
require('patternfly-timeline/dist/timeline.css')

// Application styles
require('./assets/sass/styles.sass');
require('./assets/sass/styles.sass')

// Angular templates
requireAll(require.context('./app', true, /\.html$/));
requireAll(require.context('./app', true, /\.html$/))

// Skin overrides, require all js and css files within `client/skin`
requireAll(require.context('./', true, /skin\/.*\.(js|css)$/));
requireAll(require.context('./', true, /skin\/.*\.(js|css)$/))
30 changes: 15 additions & 15 deletions client/app/app.controller.js
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
export class AppController {
constructor($scope, ngProgressFactory) {
'ngInject';
constructor ($scope, ngProgressFactory) {
'ngInject'

this.progressbar = ngProgressFactory.createInstance();
this.progressbar.setColor('#0088ce');
this.progressbar.setHeight('3px');
this.progressbar = ngProgressFactory.createInstance()
this.progressbar.setColor('#0088ce')
this.progressbar.setHeight('3px')

this.$scope = $scope;
this.$scope = $scope
}

$onInit() {
$onInit () {
this.$scope.$on('$stateChangeStart', (_event, toState) => {
if (toState.resolve) {
this.progressbar.start();
this.progressbar.start()
}
});
})

this.$scope.$on('$stateChangeSuccess', (_event, toState) => {
if (toState.resolve) {
this.progressbar.complete();
this.progressbar.complete()
}
});
})
}

keyDown(evt) {
this.$scope.$broadcast('bodyKeyDown', {origEvent: evt});
keyDown (evt) {
this.$scope.$broadcast('bodyKeyDown', {origEvent: evt})
}

keyUp(evt) {
this.$scope.$broadcast('bodyKeyUp', {origEvent: evt});
keyUp (evt) {
this.$scope.$broadcast('bodyKeyUp', {origEvent: evt})
}
}
20 changes: 10 additions & 10 deletions client/app/app.module.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import './globals.js';
import './components/components.module.js';
import './globals.js'
import './components/components.module.js'

import { AppController } from './app.controller.js';
import { AppRoutingModule } from './states/states.module.js';
import { CatalogsModule } from './catalogs/catalogs.module.js';
import { CoreModule } from './core/core.module.js';
import { RequestsModule } from './requests/requests.module.js';
import { ServicesModule } from './services/services.module.js';
import { AppController } from './app.controller.js'
import { AppRoutingModule } from './states/states.module.js'
import { CatalogsModule } from './catalogs/catalogs.module.js'
import { CoreModule } from './core/core.module.js'
import { RequestsModule } from './requests/requests.module.js'
import { ServicesModule } from './services/services.module.js'

export default angular
.module('app', [
Expand All @@ -18,7 +18,7 @@ export default angular
// Feature Modules
CatalogsModule,
RequestsModule,
ServicesModule,
ServicesModule
])
.controller('AppController', AppController)
.name;
.name
116 changes: 58 additions & 58 deletions client/app/catalogs/catalog-explorer.component.js
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/* eslint camelcase: "off" */
import '../../assets/sass/_explorer.sass';
import templateUrl from './catalog-explorer.html';
import '../../assets/sass/_explorer.sass'
import templateUrl from './catalog-explorer.html'

export const CatalogExplorerComponent = {
templateUrl,
controller: ComponentController,
controllerAs: 'vm',
};
controllerAs: 'vm'
}

/** @ngInject */
function ComponentController($state, CatalogsState, ListView, EventNotifications) {
const vm = this;
vm.permissions = CatalogsState.getPermissions();
function ComponentController ($state, CatalogsState, ListView, EventNotifications) {
const vm = this
vm.permissions = CatalogsState.getPermissions()

vm.$onInit = function() {
vm.$onInit = function () {
angular.extend(vm, {
title: __('Catalogs'),
loading: false,
Expand All @@ -32,101 +32,101 @@ function ComponentController($state, CatalogsState, ListView, EventNotifications
toolbarConfig: {
sortConfig: getSortConfig(),
filterConfig: {},
isTableView: false,
},
});
resolveServiceTemplates(vm.limit, 0);
};
isTableView: false
}
})
resolveServiceTemplates(vm.limit, 0)
}

// Config

function getCardConfig() {
function getCardConfig () {
return {
showSelectBox: false,
selectionMatchProp: 'id',
onClick: viewDetails,
};
onClick: viewDetails
}
}

function getFilterConfig() {
const catalogNames = vm.catalogsList.map((catalog) => catalog.name);
function getFilterConfig () {
const catalogNames = vm.catalogsList.map((catalog) => catalog.name)

return {
fields: [
ListView.createFilterField('name', __('Name'), __('Filter by Name'), 'text'),
ListView.createFilterField('description', __('Description'), __('Filter by Description'), 'text'),
ListView.createFilterField('service_template_catalog.name', __('Catalog Name'), __('Filter by Catalog Name'), 'select', catalogNames),
ListView.createFilterField('service_template_catalog.name', __('Catalog Name'), __('Filter by Catalog Name'), 'select', catalogNames)
],
resultsCount: 0,
totalCount: 0,
appliedFilters: CatalogsState.getFilters(),
onFilterChange: filterChange,
};
onFilterChange: filterChange
}
}

function filterChange(filters) {
CatalogsState.setFilters(filters);
resolveServiceTemplates(vm.limit, 0);
function filterChange (filters) {
CatalogsState.setFilters(filters)
resolveServiceTemplates(vm.limit, 0)
}

function getSortConfig() {
function getSortConfig () {
return {
fields: [
ListView.createSortField('name', __('Name'), 'alpha'),
ListView.createSortField('tenant_id', __('Tenant'), 'numeric'),
ListView.createSortField('tenant_id', __('Tenant'), 'numeric')
// ListView.createSortField('service_templates.count', __('Catalog Items'), 'numeric'),
],
onSortChange: sortChange,
isAscending: CatalogsState.getSort().isAscending,
currentField: CatalogsState.getSort().currentField,
};
currentField: CatalogsState.getSort().currentField
}
}

// Private
function resolveServiceTemplates(limit, offset) {
vm.loading = true;
vm.offset = offset;
function resolveServiceTemplates (limit, offset) {
vm.loading = true
vm.offset = offset

return CatalogsState.getServiceTemplates(limit, offset).then(success, failure);
return CatalogsState.getServiceTemplates(limit, offset).then(success, failure)

function success(response) {
vm.serviceTemplateList = response.resources;
function success (response) {
vm.serviceTemplateList = response.resources

CatalogsState.getCatalogs(limit, offset).then((response) => {
vm.catalogsList = response.resources;
vm.loading = false;
vm.toolbarConfig.filterConfig = getFilterConfig();
getFilterCount();
});

function getFilterCount() {
CatalogsState.getMinimal('service_templates').then(success, failure);

function success(result) {
vm.filterCount = result.subcount;
vm.toolbarConfig.filterConfig.resultsCount = result.subcount;
vm.catalogsList = response.resources
vm.loading = false
vm.toolbarConfig.filterConfig = getFilterConfig()
getFilterCount()
})

function getFilterCount () {
CatalogsState.getMinimal('service_templates').then(success, failure)

function success (result) {
vm.filterCount = result.subcount
vm.toolbarConfig.filterConfig.resultsCount = result.subcount
}
}
}

function failure(_error) {
vm.loading = false;
EventNotifications.error(__('There was an error loading catalogs.'));
function failure (_error) {
vm.loading = false
EventNotifications.error(__('There was an error loading catalogs.'))
}
}

function sortChange(sortId, isAscending) {
CatalogsState.setSort(sortId, isAscending);
resolveServiceTemplates(vm.limit, 0);
function sortChange (sortId, isAscending) {
CatalogsState.setSort(sortId, isAscending)
resolveServiceTemplates(vm.limit, 0)
}

function viewDetails(template) {
$state.go('catalogs.details', {serviceTemplateId: template.id});
function viewDetails (template) {
$state.go('catalogs.details', {serviceTemplateId: template.id})
}

function updatePagination(limit, offset) {
vm.limit = limit;
vm.offset = offset;
vm.resolveServiceTemplates(limit, offset);
function updatePagination (limit, offset) {
vm.limit = limit
vm.offset = offset
vm.resolveServiceTemplates(limit, offset)
}
}
Loading

0 comments on commit e7c13af

Please sign in to comment.