openstack
/
fuel-ui
Code Issues Proposed changes

Force eqeqeq eslint rule for Fuel UI code 

Implements: blueprint converge-to-eslint-config-openstack

Change-Id: I65a93964192170e3c83c8415ff137dec4ba6d816
This commit is contained in:
Julia Aranovich 2016-01-27 15:47:40 +03:00
parent 1c77465f9e
commit a6edf11ac1
6 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc
View File

@ -11,9 +11,6 @@
no-undefined: 0 # we're ok with using undefined
no-process-env: 0 # we use it in a few places and are ok with it
# to be fixed and enabled
eqeqeq: 0
# extra rules
no-unexpected-multiline: 2
dot-location: [2, property]

2
gulpfile.js
View File

@ -316,7 +316,7 @@ gulp.task('build', function(cb) {
if (stats.hasErrors()) return cb('Build failed');
if (targetDir != sourceDir) {
if (targetDir !== sourceDir) {
var indexFilter = filter('index.html');
gulp
.src([

12
static/app.js
View File

@ -70,24 +70,24 @@ class Router extends Backbone.Router {
var specialRoutes = [
{name: 'login', condition: () => {
var result = app.version.get('auth_required') && !app.user.get('authenticated');
if (result && currentUrl != 'login' && currentUrl != 'logout') {
if (result && currentUrl !== 'login' && currentUrl !== 'logout') {
this.returnUrl = currentUrl;
}
return result;
}},
{name: 'welcome', condition: (previousUrl) => {
return previousUrl != 'logout' &&
return previousUrl !== 'logout' &&
!app.fuelSettings.get('statistics.user_choice_saved.value');
}}
];
_.each(specialRoutes, (route) => {
if (route.condition(currentRouteName)) {
if (currentRouteName != route.name) {
if (currentRouteName !== route.name) {
preventRouting = true;
this.navigate(route.name, {trigger: true, replace: true});
}
return false;
} else if (currentRouteName == route.name) {
} else if (currentRouteName === route.name) {
preventRouting = true;
this.navigate('', {trigger: true});
return false;
@ -253,7 +253,7 @@ class App {
if (originalSyncMethod.patched) return;
Backbone.sync = function(method, model, options = {}) {
// our server doesn't support PATCH, so use PUT instead
if (method == 'patch') {
if (method === 'patch') {
method = 'update';
}
// add auth token to header if auth is enabled
@ -266,7 +266,7 @@ class App {
return originalSyncMethod.call(this, method, model, options);
})
.fail((response) => {
if (response && response.status == 401) {
if (response && response.status === 401) {
app.logout();
}
});

2
static/component_mixins.js
View File

@ -52,7 +52,7 @@ export var unsavedChangesMixin = {
},
onLeave(e) {
var href = $(e.currentTarget).attr('href');
if (Backbone.history.getHash() != href.substr(1) && _.result(this, 'hasChanges')) {
if (Backbone.history.getHash() !== href.substr(1) && _.result(this, 'hasChanges')) {
e.preventDefault();
DiscardSettingsChangesDialog

78
static/models.js
View File

@ -230,7 +230,7 @@ var restrictionMixin = models.restrictionMixin = {
.filter({type: limitType})
.sortBy('value')
.value();
if (limitType != 'max') {
if (limitType !== 'max') {
message = message.reverse();
}
if (message[0]) {
@ -285,7 +285,7 @@ models.Roles = BaseCollection.extend(restrictionMixin).extend({
var roleConflicts = role.get('conflicts');
var roleName = role.get('name');
if (roleConflicts == '*') {
if (roleConflicts === '*') {
role.conflicts = _.map(this.reject({name: roleName}), (role) => role.get('name'));
} else {
role.conflicts = _.chain(role.conflicts)
@ -334,7 +334,7 @@ models.Cluster = BaseModel.extend({
},
validate(attrs) {
var errors = {};
if (!_.trim(attrs.name) || _.trim(attrs.name).length == 0) {
if (!_.trim(attrs.name) || !_.trim(attrs.name).length) {
errors.name = 'Environment name cannot be empty';
}
if (!attrs.release) {
@ -352,7 +352,7 @@ models.Cluster = BaseModel.extend({
},
needsRedeployment() {
return this.get('nodes').any({pending_addition: false, status: 'error'}) &&
this.get('status') != 'update_error';
this.get('status') !== 'update_error';
},
fetchRelated(related, options) {
return this.get(related).fetch(_.extend({data: {cluster_id: this.id}}, options));
@ -362,7 +362,7 @@ models.Cluster = BaseModel.extend({
},
isDeploymentPossible() {
var nodes = this.get('nodes');
return this.get('release').get('state') != 'unavailable' && !!nodes.length &&
return this.get('release').get('state') !== 'unavailable' && !!nodes.length &&
(nodes.hasChanges() || this.needsRedeployment()) &&
!this.task({group: 'deployment', active: true});
}
@ -393,21 +393,21 @@ models.Node = BaseModel.extend({
resource(resourceName) {
var resource = 0;
try {
if (resourceName == 'cores') {
if (resourceName === 'cores') {
resource = this.get('meta').cpu.real;
} else if (resourceName == 'ht_cores') {
} else if (resourceName === 'ht_cores') {
resource = this.get('meta').cpu.total;
} else if (resourceName == 'hdd') {
} else if (resourceName === 'hdd') {
resource = _.reduce(this.get('meta').disks, (hdd, disk) => {
return _.isNumber(disk.size) ? hdd + disk.size : hdd;
}, 0);
} else if (resourceName == 'ram') {
} else if (resourceName === 'ram') {
resource = this.get('meta').memory.total;
} else if (resourceName == 'disks') {
} else if (resourceName === 'disks') {
resource = _.pluck(this.get('meta').disks, 'size').sort((a, b) => a - b);
} else if (resourceName == 'disks_amount') {
} else if (resourceName === 'disks_amount') {
resource = this.get('meta').disks.length;
} else if (resourceName == 'interfaces') {
} else if (resourceName === 'interfaces') {
resource = this.get('meta').interfaces.length;
}
} catch (ignore) {}
@ -421,7 +421,7 @@ models.Node = BaseModel.extend({
isSelectable() {
// forbid removing node from adding to environments
// and useless management of roles, disks, interfaces, etc.
return this.get('status') != 'removing';
return this.get('status') !== 'removing';
},
hasRole(role, onlyDeployedRoles) {
var roles = onlyDeployedRoles ? this.get('roles') :
@ -435,11 +435,11 @@ models.Node = BaseModel.extend({
},
areDisksConfigurable() {
var status = this.get('status');
return status == 'discover' || status == 'error';
return status === 'discover' || status === 'error';
},
areInterfacesConfigurable() {
var status = this.get('status');
return status == 'discover' || status == 'error' || status == 'provisioned';
return status === 'discover' || status === 'error' || status === 'provisioned';
},
getRolesSummary(releaseRoles) {
return _.map(this.sortedRoles(releaseRoles.pluck('name')), (role) => {
@ -525,7 +525,7 @@ models.Nodes = BaseCollection.extend({
},
areInterfacesConfigurable() {
if (!this.length) return false;
return _.uniq(this.invoke('resource', 'interfaces')).length == 1;
return _.uniq(this.invoke('resource', 'interfaces')).length === 1;
}
});
@ -638,7 +638,7 @@ models.Settings = Backbone.DeepModel
return false;
},
isPlugin(section) {
return (section.metadata || {}).class == 'plugin';
return (section.metadata || {}).class === 'plugin';
},
parse(response) {
return response[this.root];
@ -647,7 +647,7 @@ models.Settings = Backbone.DeepModel
_.each(this.attributes, (section, sectionName) => {
if (this.isPlugin(section)) {
var chosenVersionData = section.metadata.versions.find(
(version) => version.metadata.plugin_id == section.metadata.chosen_id
(version) => version.metadata.plugin_id === section.metadata.chosen_id
);
// merge metadata of a chosen plugin version
_.extend(section.metadata,
@ -666,12 +666,12 @@ models.Settings = Backbone.DeepModel
_.each(settings, (section, sectionName) => {
if (this.isPlugin(section)) {
var chosenVersionData = section.metadata.versions.find(
(version) => version.metadata.plugin_id == section.metadata.chosen_id
(version) => version.metadata.plugin_id === section.metadata.chosen_id
);
section.metadata = _.omit(section.metadata,
_.without(_.keys(chosenVersionData.metadata), 'plugin_id', 'plugin_version'));
_.each(section, (setting, settingName) => {
if (settingName != 'metadata') chosenVersionData[settingName].value = setting.value;
if (settingName !== 'metadata') chosenVersionData[settingName].value = setting.value;
});
settings[sectionName] = _.pick(section, 'metadata');
}
@ -711,7 +711,7 @@ models.Settings = Backbone.DeepModel
return args.join('.');
},
getValueAttribute(settingName) {
return settingName == 'metadata' ? 'enabled' : 'value';
return settingName === 'metadata' ? 'enabled' : 'value';
},
hasChanges(initialAttributes, models) {
return _.any(this.attributes, (section, sectionName) => {
@ -720,10 +720,10 @@ models.Settings = Backbone.DeepModel
if (metadata) {
if (this.checkRestrictions(models, null, metadata).result) return result;
if (!_.isUndefined(metadata.enabled)) {
result = metadata.enabled != initialAttributes[sectionName].metadata.enabled;
result = metadata.enabled !== initialAttributes[sectionName].metadata.enabled;
}
if (!result && this.isPlugin(section)) {
result = metadata.chosen_id != initialAttributes[sectionName].metadata.chosen_id;
result = metadata.chosen_id !== initialAttributes[sectionName].metadata.chosen_id;
}
}
return result || (metadata || {}).enabled !== false &&
@ -744,7 +744,7 @@ models.Settings = Backbone.DeepModel
groups.push(this.sanitizeGroup(section.metadata.group));
} else {
_.each(section, (setting, settingName) => {
if (settingName != 'metadata') groups.push(this.sanitizeGroup(setting.group));
if (settingName !== 'metadata') groups.push(this.sanitizeGroup(setting.group));
});
}
});
@ -777,7 +777,7 @@ models.Disk = BaseModel.extend({
options = options || {};
var volumes = options.volumes || this.get('volumes');
var allocatedSpace = volumes.reduce((sum, volume) => {
return volume.get('name') == options.skip ? sum : sum + volume.get('size');
return volume.get('name') === options.skip ? sum : sum + volume.get('size');
}, 0);
return this.get('size') - allocatedSpace;
},
@ -807,7 +807,7 @@ models.Volume = BaseModel.extend({
var groupAllocatedSpace = 0;
if (currentDisk && currentDisk.collection)
groupAllocatedSpace = currentDisk.collection.reduce((sum, disk) => {
return disk.id == currentDisk.id ? sum : sum +
return disk.id === currentDisk.id ? sum : sum +
disk.get('volumes').findWhere({name: this.get('name')}).get('size');
}, 0);
return minimum - groupAllocatedSpace;
@ -815,7 +815,7 @@ models.Volume = BaseModel.extend({
getMaxSize() {
var volumes = this.collection.disk.get('volumes');
var diskAllocatedSpace = volumes.reduce((total, volume) => {
return this.get('name') == volume.get('name') ? total : total + volume.get('size');
return this.get('name') === volume.get('name') ? total : total + volume.get('size');
}, 0);
return this.collection.disk.get('size') - diskAllocatedSpace;
},
@ -848,7 +848,7 @@ models.Interface = BaseModel.extend({
}), 'checked');
},
isBond() {
return this.get('type') == 'bond';
return this.get('type') === 'bond';
},
getSlaveInterfaces() {
if (!this.isBond()) return [this];
@ -980,7 +980,7 @@ models.NetworkConfiguration = BaseModel.extend(cacheMixin).extend({
return false;
},
validateNetworkIpRanges(network, cidr) {
if (network.get('meta').notation == 'ip_ranges') {
if (network.get('meta').notation === 'ip_ranges') {
var errors = utils.validateIPRanges(network.get('ip_ranges'), cidr);
return errors.length ? {ip_ranges: errors} : null;
}
@ -1024,7 +1024,7 @@ models.NetworkConfiguration = BaseModel.extend(cacheMixin).extend({
_.extend(networkErrors, this.validateNetworkGateway(network, cidrError ? null : cidr));
//FIXME (morale): same VLAN IDs are not permitted for nova-network for now
var forbiddenVlans = novaNetManager ? networksToCheck.map((net) => {
return net.id != network.id ? net.get('vlan_start') : null;
return net.id !== network.id ? net.get('vlan_start') : null;
}) : [];
_.extend(networkErrors,
utils.validateVlan(network.get('vlan_start'), forbiddenVlans, 'vlan_start'));
@ -1033,7 +1033,7 @@ models.NetworkConfiguration = BaseModel.extend(cacheMixin).extend({
nodeNetworkGroupErrors[network.id] = networkErrors;
}
if (network.get('name') == 'baremetal') {
if (network.get('name') === 'baremetal') {
var baremetalGateway = networkParameters.get('baremetal_gateway');
if (!utils.validateIP(baremetalGateway)) {
networkingParametersErrors.baremetal_gateway = i18n(ns + 'invalid_gateway');
@ -1069,7 +1069,7 @@ models.NetworkConfiguration = BaseModel.extend(cacheMixin).extend({
networkingParametersErrors.fixed_networks_amount = i18n(ns + 'invalid_amount');
}
var vlanErrors = utils.validateVlan(fixedVlan, networks.pluck('vlan_start'),
'fixed_networks_vlan_start', novaNetManager == 'VlanManager');
'fixed_networks_vlan_start', novaNetManager === 'VlanManager');
_.extend(networkingParametersErrors, vlanErrors);
if (_.isEmpty(vlanErrors)) {
if (!networkingParametersErrors.fixed_networks_amount && fixedAmount > 4095 - fixedVlan) {
@ -1092,8 +1092,8 @@ models.NetworkConfiguration = BaseModel.extend(cacheMixin).extend({
} else {
var idRangeErrors = ['', ''];
var segmentation = networkParameters.get('segmentation_type');
var idRangeAttr = segmentation == 'vlan' ? 'vlan_range' : 'gre_id_range';
var maxId = segmentation == 'vlan' ? 4094 : 65535;
var idRangeAttr = segmentation === 'vlan' ? 'vlan_range' : 'gre_id_range';
var maxId = segmentation === 'vlan' ? 4094 : 65535;
var idRange = networkParameters.get(idRangeAttr);
var idStart = Number(idRange[0]);
var idEnd = Number(idRange[1]);
@ -1103,9 +1103,9 @@ models.NetworkConfiguration = BaseModel.extend(cacheMixin).extend({
idRangeErrors[1] = i18n(ns + 'invalid_id_end');
} else if (idStart > idEnd) {
idRangeErrors[0] = idRangeErrors[1] = i18n(ns + 'invalid_id_range');
} else if (idStart == idEnd) {
} else if (idStart === idEnd) {
idRangeErrors[0] = idRangeErrors[1] = i18n(ns + 'not_enough_id');
} else if (segmentation == 'vlan') {
} else if (segmentation === 'vlan') {
_.each(_.compact(networks.pluck('vlan_start')), (vlan) => {
if (utils.validateVlanRange(idStart, idEnd, vlan)) {
idRangeErrors[0] = i18n(ns + 'vlan_intersection');
@ -1435,7 +1435,7 @@ class ComponentPattern {
}
match(componentName) {
if (!this.hasWildcard) {
return this.pattern == componentName;
return this.pattern === componentName;
}
var componentParts = componentName.split(':');
@ -1444,8 +1444,8 @@ class ComponentPattern {
}
var matched = true;
_.each(this.parts, (part, index) => {
if (part != '*') {
if (part != componentParts[index]) {
if (part !== '*') {
if (part !== componentParts[index]) {
matched = false;
return matched;
}

8
static/utils.js
View File

@ -44,7 +44,7 @@ var utils = {
var nodeIds = utils.deserializeTabOptions(options.screenOptions[0]).nodes;
var ids = nodeIds ? nodeIds.split(',').map((id) => parseInt(id, 10)) : [];
var nodes = new models.Nodes(options.cluster.get('nodes').getByIds(ids));
if (nodes.length == ids.length) return nodes;
if (nodes.length === ids.length) return nodes;
},
renderMultilineText(text) {
if (!text) return null;
@ -281,15 +281,15 @@ var utils = {
var properties = _.keys(entry);
return _.sortBy(properties, (property) => {
var index = _.indexOf(sortOrder, property);
return index == -1 ? properties.length : index;
return index === -1 ? properties.length : index;
});
},
getResponseText(response, defaultText) {
var serverErrorMessage = defaultText || i18n('dialog.error_dialog.server_error');
var serverUnavailableMessage = i18n('dialog.error_dialog.server_unavailable');
if (response && (!response.status || response.status >= 400)) {
if (!response.status || response.status == 502) return serverUnavailableMessage;
if (response.status == 500) return serverErrorMessage;
if (!response.status || response.status === 502) return serverUnavailableMessage;
if (response.status === 500) return serverErrorMessage;
// parsing new backend response format in responseText
response = response.responseText || response;
try {