1
0
Fork 0

Apply es-lint to javascripts/discourse

Dieser Commit ist enthalten in:
angusmcleod 2021-04-12 15:44:47 +10:00
Ursprung 9c17957b43
Commit 8171fc730c
22 geänderte Dateien mit 40 neuen und 60 gelöschten Zeilen

Datei anzeigen

@ -35,7 +35,7 @@ export default Component.extend({
}, },
@discourseComputed("field.klass") @discourseComputed("field.klass")
serializerContent(klass, p2) { serializerContent(klass) {
const serializers = this.get(`${klass}Serializers`); const serializers = this.get(`${klass}Serializers`);
if (serializers) { if (serializers) {
@ -78,10 +78,10 @@ export default Component.extend({
if (!current) {return false;} if (!current) {return false;}
if (attr == "serializers") { if (attr === "serializers") {
return this.compareArrays(current, original); return this.compareArrays(current, original);
} else { } else {
return current == original; return current === original;
} }
}); });
}, },

Datei anzeigen

@ -1,11 +1,10 @@
import { default as discourseComputed } from "discourse-common/utils/decorators"; import { default as discourseComputed } from "discourse-common/utils/decorators";
import { and, empty, equal, or } from "@ember/object/computed"; import { and, empty, equal, or } from "@ember/object/computed";
import { generateName, selectKitContent } from "../lib/wizard"; import { notificationLevels, selectKitContent } from "../lib/wizard";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import wizardSchema from "../lib/wizard-schema"; import wizardSchema from "../lib/wizard-schema";
import UndoChanges from "../mixins/undo-changes"; import UndoChanges from "../mixins/undo-changes";
import Component from "@ember/component"; import Component from "@ember/component";
import { notificationLevels } from "../lib/wizard";
import I18n from "I18n"; import I18n from "I18n";
export default Component.extend(UndoChanges, { export default Component.extend(UndoChanges, {
@ -43,7 +42,7 @@ export default Component.extend(UndoChanges, {
name: I18n.t(`admin.wizard.action.${type}.label`), name: I18n.t(`admin.wizard.action.${type}.label`),
}; };
}), }),
availableNotificationLevels: notificationLevels.map((type, index) => { availableNotificationLevels: notificationLevels.map((type) => {
return { return {
id: type, id: type,
name: I18n.t( name: I18n.t(

Datei anzeigen

@ -1,5 +1,4 @@
import Component from "@ember/component"; import Component from "@ember/component";
import { default as discourseComputed } from "discourse-common/utils/decorators";
export default Component.extend({ export default Component.extend({
classNames: "wizard-custom-step", classNames: "wizard-custom-step",

Datei anzeigen

@ -9,7 +9,7 @@ import {
default as wizardSchema, default as wizardSchema,
} from "../lib/wizard-schema"; } from "../lib/wizard-schema";
import { notEmpty } from "@ember/object/computed"; import { notEmpty } from "@ember/object/computed";
import { bind, scheduleOnce } from "@ember/runloop"; import { scheduleOnce } from "@ember/runloop";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import Component from "@ember/component"; import Component from "@ember/component";
import { A } from "@ember/array"; import { A } from "@ember/array";

Datei anzeigen

@ -3,7 +3,6 @@ import { gt } from "@ember/object/computed";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import { defaultConnector } from "../lib/wizard-mapper"; import { defaultConnector } from "../lib/wizard-mapper";
import { later } from "@ember/runloop"; import { later } from "@ember/runloop";
import { observes } from "discourse-common/utils/decorators";
import I18n from "I18n"; import I18n from "I18n";
export default Component.extend({ export default Component.extend({

Datei anzeigen

@ -1,6 +1,6 @@
import { connectorContent } from "../lib/wizard-mapper"; import { connectorContent } from "../lib/wizard-mapper";
import { alias, gt, or } from "@ember/object/computed"; import { alias, gt } from "@ember/object/computed";
import { computed, observes } from "@ember/object"; import { computed } from "@ember/object";
import Component from "@ember/component"; import Component from "@ember/component";
export default Component.extend({ export default Component.extend({

Datei anzeigen

@ -2,8 +2,7 @@ import { alias, gt, or } from "@ember/object/computed";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import { import {
default as discourseComputed, default as discourseComputed,
observes, observes
on,
} from "discourse-common/utils/decorators"; } from "discourse-common/utils/decorators";
import { getOwner } from "discourse-common/lib/get-owner"; import { getOwner } from "discourse-common/lib/get-owner";
import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper"; import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper";
@ -135,7 +134,7 @@ export default Component.extend({
}, },
documentClick(e) { documentClick(e) {
if (this._state == "destroying") {return;} if (this._state === "destroying") {return;}
let $target = $(e.target); let $target = $(e.target);
if (!$target.parents(".type-selector").length && this.showTypes) { if (!$target.parents(".type-selector").length && this.showTypes) {
@ -249,7 +248,7 @@ export default Component.extend({
}, },
@discourseComputed("activeType", "inputType") @discourseComputed("activeType", "inputType")
placeholderKey(activeType, inputType) { placeholderKey(activeType) {
if ( if (
activeType === "text" && activeType === "text" &&
this.options[`${this.selectorType}Placeholder`] this.options[`${this.selectorType}Placeholder`]
@ -281,8 +280,8 @@ export default Component.extend({
if (option === true) {return true;} if (option === true) {return true;}
if (typeof option !== "string") {return false;} if (typeof option !== "string") {return false;}
return option.split(",").filter((option) => { return option.split(",").filter((o) => {
return [this.selectorType, this.inputType].indexOf(option) !== -1; return [this.selectorType, this.inputType].indexOf(o) !== -1;
}).length; }).length;
}, },

Datei anzeigen

@ -1,10 +1,5 @@
import { getOwner } from "discourse-common/lib/get-owner";
import { newInput, selectionTypes } from "../lib/wizard-mapper"; import { newInput, selectionTypes } from "../lib/wizard-mapper";
import { import discourseComputed from "discourse-common/utils/decorators";
default as discourseComputed,
observes,
on,
} from "discourse-common/utils/decorators";
import { later } from "@ember/runloop"; import { later } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";
import { A } from "@ember/array"; import { A } from "@ember/array";

Datei anzeigen

@ -1,7 +1,4 @@
import { import discourseComputed from "discourse-common/utils/decorators";
default as discourseComputed,
on,
} from "discourse-common/utils/decorators";
import { notEmpty } from "@ember/object/computed"; import { notEmpty } from "@ember/object/computed";
import { userProperties } from "../lib/wizard"; import { userProperties } from "../lib/wizard";
import { scheduleOnce } from "@ember/runloop"; import { scheduleOnce } from "@ember/runloop";

Datei anzeigen

@ -146,7 +146,7 @@ export default Controller.extend({
const api = this.get("api"); const api = this.get("api");
const name = api.name; const name = api.name;
const authType = api.authType; const authType = api.authType;
let refreshList = false; let refreshList = false; // eslint-disable-line
let error; let error;
if (!name || !authType) {return;} if (!name || !authType) {return;}

Datei anzeigen

@ -1,9 +1,5 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import EmberObject from "@ember/object";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import CustomWizardCustomField from "../models/custom-wizard-custom-field"; import CustomWizardCustomField from "../models/custom-wizard-custom-field";
import { default as discourseComputed } from "discourse-common/utils/decorators";
export default Controller.extend({ export default Controller.extend({
messageKey: "create", messageKey: "create",
@ -49,7 +45,7 @@ export default Controller.extend({
}, },
removeField(field) { removeField(field) {
return CustomWizardCustomField.destroyField(field).then((result) => { return CustomWizardCustomField.destroyField(field).then(() => {
this.get("customFields").removeObject(field); this.get("customFields").removeObject(field);
}); });
}, },

Datei anzeigen

@ -1,6 +1,4 @@
import { default as computed } from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { ajax } from "discourse/lib/ajax";
import { notEmpty } from "@ember/object/computed"; import { notEmpty } from "@ember/object/computed";
import CustomWizardLogs from "../models/custom-wizard-logs"; import CustomWizardLogs from "../models/custom-wizard-logs";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
@ -27,7 +25,7 @@ export default Controller.extend({
.finally(() => this.set("refreshing", false)); .finally(() => this.set("refreshing", false));
}, },
@computed("hasLogs", "refreshing") @discourseComputed("hasLogs", "refreshing")
noResults(hasLogs, refreshing) { noResults(hasLogs, refreshing) {
return !hasLogs && !refreshing; return !hasLogs && !refreshing;
}, },

Datei anzeigen

@ -1,8 +1,5 @@
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { import { observes } from "discourse-common/utils/decorators";
default as discourseComputed,
observes,
} from "discourse-common/utils/decorators";
import { empty } from "@ember/object/computed"; import { empty } from "@ember/object/computed";
import CustomWizardManager from "../models/custom-wizard-manager"; import CustomWizardManager from "../models/custom-wizard-manager";
import { A } from "@ember/array"; import { A } from "@ember/array";
@ -196,7 +193,7 @@ export default Controller.extend({
}, },
destroy() { destroy() {
const destroyWizards = this.get("destroyWizards"); let destroyWizards = this.get("destroyWizards");
if (!destroyWizards.length) { if (!destroyWizards.length) {
this.setMessage("error", "none_selected"); this.setMessage("error", "none_selected");
@ -227,7 +224,7 @@ export default Controller.extend({
if (result.destroyed.length) { if (result.destroyed.length) {
const destroyedIds = result.destroyed.map((d) => d.id); const destroyedIds = result.destroyed.map((d) => d.id);
const destroyWizards = this.get("destroyWizards"); destroyWizards = this.get("destroyWizards");
const wizards = this.get("wizards"); const wizards = this.get("wizards");
wizards.removeObjects( wizards.removeObjects(

Datei anzeigen

@ -1,18 +1,14 @@
import { import {
default as discourseComputed, default as discourseComputed,
observes, observes
on,
} from "discourse-common/utils/decorators"; } from "discourse-common/utils/decorators";
import { alias, notEmpty } from "@ember/object/computed"; import { notEmpty } from "@ember/object/computed";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
import { generateId, wizardFieldList } from "../lib/wizard"; import { generateId, wizardFieldList } from "../lib/wizard";
import { buildProperties } from "../lib/wizard-json";
import { dasherize } from "@ember/string"; import { dasherize } from "@ember/string";
import EmberObject from "@ember/object";
import { later, scheduleOnce } from "@ember/runloop"; import { later, scheduleOnce } from "@ember/runloop";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import copyText from "discourse/lib/copy-text"; import copyText from "discourse/lib/copy-text";
import CustomWizard from "../models/custom-wizard";
import I18n from "I18n"; import I18n from "I18n";
export default Controller.extend({ export default Controller.extend({

Datei anzeigen

@ -1,4 +1,3 @@
import { withPluginApi } from "discourse/lib/plugin-api";
import DiscourseURL from "discourse/lib/url"; import DiscourseURL from "discourse/lib/url";
export default { export default {

Datei anzeigen

@ -1,4 +1,4 @@
import { camelCase, listProperties, snakeCase } from "../lib/wizard"; import { camelCase, listProperties } from "../lib/wizard";
import wizardSchema from "../lib/wizard-schema"; import wizardSchema from "../lib/wizard-schema";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { A } from "@ember/array"; import { A } from "@ember/array";

Datei anzeigen

@ -4,6 +4,13 @@ import I18n from "I18n";
// Inputs // Inputs
const selectableInputTypes = [
'conditional',
'assignment',
'association',
'validation'
];
function defaultInputType(options = {}) { function defaultInputType(options = {}) {
return options.inputTypes.split(",")[0]; return options.inputTypes.split(",")[0];
} }

Datei anzeigen

@ -225,7 +225,7 @@ if (Discourse.SiteSettings.wizard_apis_enabled) {
}; };
} }
export function setWizardDefaults(obj, itemType, opts = {}) { export function setWizardDefaults(obj, itemType) {
const objSchema = wizardSchema[itemType]; const objSchema = wizardSchema[itemType];
const basicDefaults = objSchema.basic; const basicDefaults = objSchema.basic;

Datei anzeigen

@ -9,7 +9,7 @@ function generateName(id) {
return id ? sentenceCase(id) : ""; return id ? sentenceCase(id) : "";
} }
function generateId(name, opts = {}) { function generateId(name) {
return name ? snakeCase(name) : ""; return name ? snakeCase(name) : "";
} }
@ -60,10 +60,10 @@ const notificationLevels = [
"muted", "muted",
]; ];
function listProperties(type, opts = {}) { function listProperties(itemType, opts = {}) {
let properties = Object.keys(wizardSchema[type].basic); let properties = Object.keys(wizardSchema[itemType].basic);
const types = wizardSchema[type].types; const types = wizardSchema[itemType].types;
if (types) { if (types) {
let typeProperties = []; let typeProperties = [];

Datei anzeigen

@ -2,7 +2,6 @@ import { listProperties } from "../lib/wizard";
import { default as wizardSchema } from "../lib/wizard-schema"; import { default as wizardSchema } from "../lib/wizard-schema";
import { get, set } from "@ember/object"; import { get, set } from "@ember/object";
import Mixin from "@ember/object/mixin"; import Mixin from "@ember/object/mixin";
import { observes } from "discourse-common/utils/decorators";
import { deepEqual } from "discourse-common/lib/object"; import { deepEqual } from "discourse-common/lib/object";
export default Mixin.create({ export default Mixin.create({
@ -97,7 +96,6 @@ export default Mixin.create({
actions: { actions: {
undoChanges() { undoChanges() {
const componentType = this.componentType; const componentType = this.componentType;
const original = this.get("originalObject");
const obj = this.get(componentType); const obj = this.get(componentType);
this.removeObservers(obj.type); this.removeObservers(obj.type);
@ -118,6 +116,7 @@ export default Mixin.create({
this.setupObservers(type); this.setupObservers(type);
}, },
// eslint-disable-next-line
mappedFieldUpdated(property, mappedComponent, type) { mappedFieldUpdated(property, mappedComponent, type) {
const obj = this.get(this.componentType); const obj = this.get(this.componentType);
obj.notifyPropertyChange(property); obj.notifyPropertyChange(property);

Datei anzeigen

@ -1,7 +1,7 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { buildProperties, mapped, present } from "../lib/wizard-json"; import { buildProperties, mapped, present } from "../lib/wizard-json";
import { camelCase, listProperties, snakeCase } from "../lib/wizard"; import { listProperties, snakeCase } from "../lib/wizard";
import wizardSchema from "../lib/wizard-schema"; import wizardSchema from "../lib/wizard-schema";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";

Datei anzeigen

@ -8,7 +8,7 @@ export default DiscourseRoute.extend({
setupController(controller, model) { setupController(controller, model) {
const showParams = this.paramsFor("adminWizardsApiShow"); const showParams = this.paramsFor("adminWizardsApiShow");
const apiName = showParams.name == "create" ? null : showParams.name; const apiName = showParams.name === "create" ? null : showParams.name;
const apiList = (model || []).map((api) => { const apiList = (model || []).map((api) => {
return { return {
id: api.name, id: api.name,