Skip to content

Commit

Permalink
DEV: manually ignore files as .eslintignore is not working
Browse files Browse the repository at this point in the history
  • Loading branch information
jjaffeux committed Sep 10, 2020
1 parent 89cec36 commit ef101df
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 37 deletions.
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

4 changes: 4 additions & 0 deletions assets/docker-manager-app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions assets/docker-manager-vendor.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions manager-client/app/components/x-console.js
@@ -1,11 +1,13 @@
/* eslint-disable */

import Component from "@ember/component";
import { observer } from "@ember/object";
import { scheduleOnce } from "@ember/runloop";

export default Component.extend({
classNameBindings: [":logs"],

_outputChanged: observer("output", function() {
_outputChanged: observer("output", function () {
scheduleOnce("afterRender", this, "_scrollBottom");
}),

Expand All @@ -18,5 +20,7 @@ export default Component.extend({
didInsertElement() {
this._super(...arguments);
this._scrollBottom();
}
},
});

/* eslint-enable */
38 changes: 21 additions & 17 deletions manager-client/app/controllers/upgrade.js
@@ -1,3 +1,5 @@
/* eslint-disable */

/* global MessageBus, bootbox */
import Repo from "manager-client/models/repo";
import Controller from "@ember/controller";
Expand All @@ -15,20 +17,20 @@ export default Controller.extend({
complete: equal("status", "complete"),
failed: equal("status", "failed"),

multiUpgrade: computed("model.length", function() {
multiUpgrade: computed("model.length", function () {
return this.get("model.length") !== 1;
}),

title: computed("model.@each.name", function() {
title: computed("model.@each.name", function () {
return this.get("multiUpgrade") ? "All" : this.get("model")[0].get("name");
}),

isUpToDate: computed("model.@each.upToDate", function() {
return this.get("model").every(repo => repo.get("upToDate"));
isUpToDate: computed("model.@each.upToDate", function () {
return this.get("model").every((repo) => repo.get("upToDate"));
}),

upgrading: computed("model.@each.upgrading", function() {
return this.get("model").some(repo => repo.get("upgrading"));
upgrading: computed("model.@each.upgrading", function () {
return this.get("model").some((repo) => repo.get("upgrading"));
}),

repos() {
Expand All @@ -37,7 +39,7 @@ export default Controller.extend({
},

updateAttribute(key, value, valueIsKey = false) {
this.get("model").forEach(repo => {
this.get("model").forEach((repo) => {
value = valueIsKey ? repo.get(value) : value;
repo.set(key, value);
});
Expand All @@ -56,8 +58,8 @@ export default Controller.extend({

if (msg.value === "complete") {
this.get("model")
.filter(repo => repo.get("upgrading"))
.forEach(repo => {
.filter((repo) => repo.get("upgrading"))
.forEach((repo) => {
repo.set("version", repo.get("latest.version"));
});
}
Expand All @@ -70,7 +72,7 @@ export default Controller.extend({
}
},

upgradeButtonText: computed("upgrading", function() {
upgradeButtonText: computed("upgrading", function () {
if (this.get("upgrading")) {
return "Upgrading...";
} else {
Expand All @@ -79,7 +81,7 @@ export default Controller.extend({
}),

startBus() {
MessageBus.subscribe("/docker/upgrade", msg => {
MessageBus.subscribe("/docker/upgrade", (msg) => {
this.messageReceived(msg);
});
},
Expand All @@ -98,8 +100,8 @@ export default Controller.extend({

if (this.get("multiUpgrade")) {
this.get("model")
.filter(repo => !repo.get("upToDate"))
.forEach(repo => repo.set("upgrading", true));
.filter((repo) => !repo.get("upToDate"))
.forEach((repo) => repo.set("upgrading", true));
return Repo.upgradeAll();
}

Expand All @@ -114,11 +116,11 @@ export default Controller.extend({
bootbox.confirm(
"WARNING: You should only reset upgrades that have failed and are not running.\n\n" +
"This will NOT cancel currently running builds and should only be used as a last resort.",
result => {
(result) => {
if (result) {
if (this.get("multiUpgrade")) {
return Repo.resetAll(
this.get("model").filter(repo => !repo.get("upToDate"))
this.get("model").filter((repo) => !repo.get("upToDate"))
).finally(() => {
this.reset();
this.updateAttribute("upgrading", false);
Expand All @@ -132,6 +134,8 @@ export default Controller.extend({
}
}
);
}
}
},
},
});

/* eslint-enable */
6 changes: 5 additions & 1 deletion manager-client/app/discourse.js
@@ -1,3 +1,5 @@
/* eslint-disable */

function init() {
const data = Em.$("#preloaded-data").data("preload");
Em.$.extend(Discourse, data);
Expand All @@ -17,7 +19,9 @@ const Discourse = {
if (url[0] !== "/") url = "/" + url;

return this.rootUrl + url;
}
},
};

export default Discourse;

/* eslint-enable */
18 changes: 9 additions & 9 deletions manager-client/app/routes/upgrade.js
Expand Up @@ -13,9 +13,9 @@ export default Route.extend({

afterModel(model) {
if (Array.isArray(model)) {
return Repo.findLatestAll().then(response => {
JSON.parse(response).repos.forEach(_repo => {
const repo = model.find(repo => repo.get("path") === _repo.path);
return Repo.findLatestAll().then((response) => {
JSON.parse(response).repos.forEach((_repo) => {
const repo = model.find((repo) => repo.get("path") === _repo.path);
if (!repo) {
return;
}
Expand All @@ -24,19 +24,19 @@ export default Route.extend({
});

return Repo.findAllProgress(
model.filter(repo => !repo.get("upToDate"))
).then(progress => {
model.filter((repo) => !repo.get("upToDate"))
).then((progress) => {
this.set("progress", JSON.parse(progress).progress);
});
});
}

return Repo.findUpgrading().then(u => {
return Repo.findUpgrading().then((u) => {
if (u && u !== model) {
return Promise.reject("wat");
}
return model.findLatest().then(() => {
return model.findProgress().then(progress => {
return model.findProgress().then((progress) => {
this.set("progress", progress);
});
});
Expand All @@ -48,12 +48,12 @@ export default Route.extend({
controller.setProperties({
model: Array.isArray(model) ? model : [model],
output: this.get("progress.logs"),
percent: this.get("progress.percentage")
percent: this.get("progress.percentage"),
});
controller.startBus();
},

deactivate() {
this.controllerFor("upgrade").stopBus();
}
},
});
11 changes: 7 additions & 4 deletions manager-client/config/environment.js
@@ -1,6 +1,7 @@
/* eslint-disable */
/* jshint node: true */

module.exports = function(environment) {
module.exports = function (environment) {
var ENV = {
modulePrefix: "manager-client",
environment: environment,
Expand All @@ -13,14 +14,14 @@ module.exports = function(environment) {
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false
}
Date: false,
},
},

APP: {
// Here you can pass flags/options to your application instance
// when it is created
}
},
};

if (environment === "development") {
Expand Down Expand Up @@ -48,3 +49,5 @@ module.exports = function(environment) {

return ENV;
};

/* eslint-enable */
9 changes: 6 additions & 3 deletions manager-client/ember-cli-build.js
@@ -1,13 +1,14 @@
/* eslint-disable */
/*jshint node:true*/
/* global require, module */
var EmberApp = require("ember-cli/lib/broccoli/ember-app");

module.exports = function(defaults) {
module.exports = function (defaults) {
var app = new EmberApp(defaults, {
// Add options here
fingerprint: {
enabled: false
}
enabled: false,
},
});

// Use `app.import` to add additional libraries to the generated
Expand All @@ -29,3 +30,5 @@ module.exports = function(defaults) {

return app.toTree();
};

/* eslint-enable */

0 comments on commit ef101df

Please sign in to comment.