From 9c17957b4324ccf92a24f49dc0d98ad0f6ef4e0c Mon Sep 17 00:00:00 2001 From: angusmcleod Date: Mon, 12 Apr 2021 15:10:02 +1000 Subject: [PATCH 1/2] Apply to javascripts/discourse --- .../discourse/components/custom-field-input.js.es6 | 9 +++++---- .../components/wizard-advanced-toggle.js.es6 | 2 +- .../components/wizard-custom-action.js.es6 | 4 ++-- .../components/wizard-custom-field.js.es6 | 2 +- .../discourse/components/wizard-links.js.es6 | 8 ++++---- .../components/wizard-mapper-input.js.es6 | 8 ++++---- .../discourse/components/wizard-mapper-pair.js.es6 | 2 +- .../components/wizard-mapper-selector.js.es6 | 12 ++++++------ .../components/wizard-realtime-validations.js.es6 | 2 +- .../controllers/admin-wizards-api-show.js.es6 | 14 +++++++------- .../controllers/admin-wizards-logs.js.es6 | 2 +- .../controllers/admin-wizards-wizard-show.js.es6 | 4 ++-- .../initializers/custom-wizard-edits.js.es6 | 2 +- .../initializers/custom-wizard-redirect.js.es6 | 2 +- .../javascripts/discourse/lib/wizard-json.js.es6 | 2 +- .../javascripts/discourse/lib/wizard-mapper.js.es6 | 10 +++++----- .../javascripts/discourse/lib/wizard-schema.js.es6 | 2 +- .../discourse/mixins/undo-changes.js.es6 | 2 +- .../discourse/models/custom-wizard.js.es6 | 6 +++--- 19 files changed, 48 insertions(+), 47 deletions(-) diff --git a/assets/javascripts/discourse/components/custom-field-input.js.es6 b/assets/javascripts/discourse/components/custom-field-input.js.es6 index 1ad0b152..12d93e12 100644 --- a/assets/javascripts/discourse/components/custom-field-input.js.es6 +++ b/assets/javascripts/discourse/components/custom-field-input.js.es6 @@ -1,6 +1,7 @@ import Component from "@ember/component"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; -import { or, alias } from "@ember/object/computed"; +import { alias, or } from "@ember/object/computed"; +import I18n from "I18n"; const generateContent = function (array, type) { return array.map((key) => ({ @@ -66,16 +67,16 @@ export default Component.extend({ "field.serializers" ) saveDisabled(saving) { - if (saving) return true; + if (saving) {return true;} const originalField = this.originalField; - if (!originalField) return false; + if (!originalField) {return false;} return ["name", "klass", "type", "serializers"].every((attr) => { let current = this.get(attr); let original = originalField[attr]; - if (!current) return false; + if (!current) {return false;} if (attr == "serializers") { return this.compareArrays(current, original); diff --git a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6 b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6 index b03a7ce5..2c5b3434 100644 --- a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6 +++ b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6 @@ -7,7 +7,7 @@ export default Component.extend({ @discourseComputed("showAdvanced") toggleClass(showAdvanced) { let classes = "btn"; - if (showAdvanced) classes += " btn-primary"; + if (showAdvanced) {classes += " btn-primary";} return classes; }, diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6 index 3dcc85d1..9ea64caa 100644 --- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 +++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6 @@ -1,5 +1,5 @@ import { default as discourseComputed } from "discourse-common/utils/decorators"; -import { equal, empty, or, and } from "@ember/object/computed"; +import { and, empty, equal, or } from "@ember/object/computed"; import { generateName, selectKitContent } from "../lib/wizard"; import { computed } from "@ember/object"; import wizardSchema from "../lib/wizard-schema"; @@ -92,7 +92,7 @@ export default Component.extend(UndoChanges, { @discourseComputed("apis", "action.api") availableEndpoints(apis, api) { - if (!api) return []; + if (!api) {return [];} return apis.find((a) => a.name === api).endpoints; }, }); diff --git a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 b/assets/javascripts/discourse/components/wizard-custom-field.js.es6 index 85c26677..09896a6c 100644 --- a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 +++ b/assets/javascripts/discourse/components/wizard-custom-field.js.es6 @@ -1,5 +1,5 @@ import { default as discourseComputed } from "discourse-common/utils/decorators"; -import { equal, or, alias } from "@ember/object/computed"; +import { alias, equal, or } from "@ember/object/computed"; import { computed } from "@ember/object"; import { selectKitContent } from "../lib/wizard"; import UndoChanges from "../mixins/undo-changes"; diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js.es6 index 6f2ca117..9f9d6a01 100644 --- a/assets/javascripts/discourse/components/wizard-links.js.es6 +++ b/assets/javascripts/discourse/components/wizard-links.js.es6 @@ -1,15 +1,15 @@ import { default as discourseComputed, - on, observes, + on, } from "discourse-common/utils/decorators"; import { generateName } from "../lib/wizard"; import { - default as wizardSchema, setWizardDefaults, + default as wizardSchema, } from "../lib/wizard-schema"; import { notEmpty } from "@ember/object/computed"; -import { scheduleOnce, bind } from "@ember/runloop"; +import { bind, scheduleOnce } from "@ember/runloop"; import EmberObject from "@ember/object"; import Component from "@ember/component"; import { A } from "@ember/array"; @@ -53,7 +53,7 @@ export default Component.extend({ "items.@each.title" ) links(current, items) { - if (!items) return; + if (!items) {return;} return items.map((item) => { if (item) { diff --git a/assets/javascripts/discourse/components/wizard-mapper-input.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-input.js.es6 index c7327fbc..021f2084 100644 --- a/assets/javascripts/discourse/components/wizard-mapper-input.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper-input.js.es6 @@ -1,11 +1,11 @@ import { computed, set } from "@ember/object"; -import { alias, equal, or, not } from "@ember/object/computed"; +import { alias, equal, not, or } from "@ember/object/computed"; import { - newPair, connectorContent, - inputTypesContent, - defaultSelectionType, defaultConnector, + defaultSelectionType, + inputTypesContent, + newPair, } from "../lib/wizard-mapper"; import Component from "@ember/component"; import { observes } from "discourse-common/utils/decorators"; diff --git a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 index bc7e9be9..19d7071f 100644 --- a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 @@ -1,5 +1,5 @@ import { connectorContent } from "../lib/wizard-mapper"; -import { gt, or, alias } from "@ember/object/computed"; +import { alias, gt, or } from "@ember/object/computed"; import { computed, observes } from "@ember/object"; import Component from "@ember/component"; diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 index e70708c9..349e7d7d 100644 --- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 @@ -1,4 +1,4 @@ -import { alias, or, gt } from "@ember/object/computed"; +import { alias, gt, or } from "@ember/object/computed"; import { computed } from "@ember/object"; import { default as discourseComputed, @@ -7,7 +7,7 @@ import { } from "discourse-common/utils/decorators"; import { getOwner } from "discourse-common/lib/get-owner"; import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper"; -import { snakeCase, generateName, userProperties } from "../lib/wizard"; +import { generateName, snakeCase, userProperties } from "../lib/wizard"; import Component from "@ember/component"; import { bind, later } from "@ember/runloop"; import I18n from "I18n"; @@ -135,7 +135,7 @@ export default Component.extend({ }, documentClick(e) { - if (this._state == "destroying") return; + if (this._state == "destroying") {return;} let $target = $(e.target); if (!$target.parents(".type-selector").length && this.showTypes) { @@ -275,11 +275,11 @@ export default Component.extend({ optionEnabled(type) { const options = this.options; - if (!options) return false; + if (!options) {return false;} const option = options[type]; - if (option === true) return true; - if (typeof option !== "string") return false; + if (option === true) {return true;} + if (typeof option !== "string") {return false;} return option.split(",").filter((option) => { return [this.selectorType, this.inputType].indexOf(option) !== -1; diff --git a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 index b9b36e6f..55f98cdb 100644 --- a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 +++ b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 @@ -19,7 +19,7 @@ export default Component.extend({ init() { this._super(...arguments); - if (!this.validations) return; + if (!this.validations) {return;} if (!this.field.validations) { const validations = {}; diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 index f330c00c..f13652e5 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 @@ -2,7 +2,7 @@ import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import CustomWizardApi from "../models/custom-wizard-api"; import { default as discourseComputed } from "discourse-common/utils/decorators"; -import { not, and, equal } from "@ember/object/computed"; +import { and, equal, not } from "@ember/object/computed"; import { selectKitContent } from "../lib/wizard"; import Controller from "@ember/controller"; import I18n from "I18n"; @@ -64,8 +64,8 @@ export default Controller.extend({ threeLeggedOauth ) { if (saveDisabled || !authType || !tokenUrl || !clientId || !clientSecret) - return true; - if (threeLeggedOauth) return !authUrl; + {return true;} + if (threeLeggedOauth) {return !authUrl;} return false; }, @@ -149,13 +149,13 @@ export default Controller.extend({ let refreshList = false; let error; - if (!name || !authType) return; + if (!name || !authType) {return;} let data = { auth_type: authType, }; - if (api.title) data["title"] = api.title; + if (api.title) {data["title"] = api.title;} const originalTitle = this.get("api.originalTitle"); if (api.get("isNew") || (originalTitle && api.title !== originalTitle)) { @@ -232,7 +232,7 @@ export default Controller.extend({ remove() { const name = this.get("api.name"); - if (!name) return; + if (!name) {return;} this.set("updating", true); @@ -250,7 +250,7 @@ export default Controller.extend({ clearLogs() { const name = this.get("api.name"); - if (!name) return; + if (!name) {return;} ajax(`/admin/wizards/api/${name.underscore()}/logs`, { type: "DELETE", diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 index 5a03f064..bc720ffd 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 @@ -13,7 +13,7 @@ export default Controller.extend({ logs: [], loadLogs() { - if (!this.canLoadMore) return; + if (!this.canLoadMore) {return;} this.set("refreshing", true); diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 index 68dee12e..f975c2f0 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 @@ -3,13 +3,13 @@ import { observes, on, } from "discourse-common/utils/decorators"; -import { notEmpty, alias } from "@ember/object/computed"; +import { alias, notEmpty } from "@ember/object/computed"; import showModal from "discourse/lib/show-modal"; import { generateId, wizardFieldList } from "../lib/wizard"; import { buildProperties } from "../lib/wizard-json"; import { dasherize } from "@ember/string"; import EmberObject from "@ember/object"; -import { scheduleOnce, later } from "@ember/runloop"; +import { later, scheduleOnce } from "@ember/runloop"; import Controller from "@ember/controller"; import copyText from "discourse/lib/copy-text"; import CustomWizard from "../models/custom-wizard"; diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 index 73eae8b9..0b725d41 100644 --- a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 +++ b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 @@ -6,7 +6,7 @@ export default { initialize(container) { const siteSettings = container.lookup("site-settings:main"); - if (!siteSettings.custom_wizard_enabled) return; + if (!siteSettings.custom_wizard_enabled) {return;} const existing = DiscourseURL.routeTo; DiscourseURL.routeTo = function (path, opts) { diff --git a/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6 index ae4db35b..22afd4de 100644 --- a/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6 +++ b/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6 @@ -8,7 +8,7 @@ export default { const messageBus = container.lookup("message-bus:main"); const siteSettings = container.lookup("site-settings:main"); - if (!siteSettings.custom_wizard_enabled || !messageBus) return; + if (!siteSettings.custom_wizard_enabled || !messageBus) {return;} messageBus.subscribe("/redirect_to_wizard", function (wizardId) { const wizardUrl = window.location.origin + "/w/" + wizardId; diff --git a/assets/javascripts/discourse/lib/wizard-json.js.es6 b/assets/javascripts/discourse/lib/wizard-json.js.es6 index ec85bb19..ff2c5a5b 100644 --- a/assets/javascripts/discourse/lib/wizard-json.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-json.js.es6 @@ -1,4 +1,4 @@ -import { listProperties, camelCase, snakeCase } from "../lib/wizard"; +import { camelCase, listProperties, snakeCase } from "../lib/wizard"; import wizardSchema from "../lib/wizard-schema"; import EmberObject from "@ember/object"; import { A } from "@ember/array"; diff --git a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 b/assets/javascripts/discourse/lib/wizard-mapper.js.es6 index 8af93297..a8cc8e34 100644 --- a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-mapper.js.es6 @@ -43,13 +43,13 @@ function defaultConnector(connectorType, inputType, options = {}) { return defaultInputType(options); } if (connectorType === "pair") { - if (inputType === "conditional") return "equal"; - if (inputType === "association") return "association"; - if (inputType === "validation") return "equal"; + if (inputType === "conditional") {return "equal";} + if (inputType === "association") {return "association";} + if (inputType === "validation") {return "equal";} } if (connectorType === "output") { - if (inputType === "conditional") return "then"; - if (inputType === "assignment") return "set"; + if (inputType === "conditional") {return "then";} + if (inputType === "assignment") {return "set";} } return "equal"; } diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6 index 1a1455f8..54d3b255 100644 --- a/assets/javascripts/discourse/lib/wizard-schema.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6 @@ -1,4 +1,4 @@ -import { set, get } from "@ember/object"; +import { get, set } from "@ember/object"; const wizard = { basic: { diff --git a/assets/javascripts/discourse/mixins/undo-changes.js.es6 b/assets/javascripts/discourse/mixins/undo-changes.js.es6 index 61608cf2..c8d42c52 100644 --- a/assets/javascripts/discourse/mixins/undo-changes.js.es6 +++ b/assets/javascripts/discourse/mixins/undo-changes.js.es6 @@ -1,6 +1,6 @@ import { listProperties } from "../lib/wizard"; import { default as wizardSchema } from "../lib/wizard-schema"; -import { set, get } from "@ember/object"; +import { get, set } from "@ember/object"; import Mixin from "@ember/object/mixin"; import { observes } from "discourse-common/utils/decorators"; import { deepEqual } from "discourse-common/lib/object"; diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js.es6 index aa9c1145..d47df6db 100644 --- a/assets/javascripts/discourse/models/custom-wizard.js.es6 +++ b/assets/javascripts/discourse/models/custom-wizard.js.es6 @@ -1,7 +1,7 @@ import { ajax } from "discourse/lib/ajax"; import EmberObject from "@ember/object"; -import { buildProperties, present, mapped } from "../lib/wizard-json"; -import { listProperties, camelCase, snakeCase } from "../lib/wizard"; +import { buildProperties, mapped, present } from "../lib/wizard-json"; +import { camelCase, listProperties, snakeCase } from "../lib/wizard"; import wizardSchema from "../lib/wizard-schema"; import { Promise } from "rsvp"; import { popupAjaxError } from "discourse/lib/ajax-error"; @@ -132,7 +132,7 @@ const CustomWizard = EmberObject.extend({ }, buildMappedJson(inputs) { - if (!inputs || !inputs.length) return false; + if (!inputs || !inputs.length) {return false;} let result = []; From 8171fc730cc6c96b74a1a19ae56a75a7f30078ca Mon Sep 17 00:00:00 2001 From: angusmcleod Date: Mon, 12 Apr 2021 15:44:47 +1000 Subject: [PATCH 2/2] Apply es-lint to javascripts/discourse --- .../discourse/components/custom-field-input.js.es6 | 6 +++--- .../discourse/components/wizard-custom-action.js.es6 | 5 ++--- .../discourse/components/wizard-custom-step.js.es6 | 1 - .../discourse/components/wizard-links.js.es6 | 2 +- .../components/wizard-mapper-connector.js.es6 | 1 - .../discourse/components/wizard-mapper-pair.js.es6 | 4 ++-- .../components/wizard-mapper-selector.js.es6 | 11 +++++------ .../discourse/components/wizard-mapper.js.es6 | 7 +------ .../discourse/components/wizard-text-editor.js.es6 | 5 +---- .../controllers/admin-wizards-api-show.js.es6 | 2 +- .../controllers/admin-wizards-custom-fields.js.es6 | 6 +----- .../discourse/controllers/admin-wizards-logs.js.es6 | 6 ++---- .../controllers/admin-wizards-manager.js.es6 | 9 +++------ .../controllers/admin-wizards-wizard-show.js.es6 | 8 ++------ .../discourse/initializers/custom-wizard-edits.js.es6 | 1 - assets/javascripts/discourse/lib/wizard-json.js.es6 | 2 +- assets/javascripts/discourse/lib/wizard-mapper.js.es6 | 7 +++++++ assets/javascripts/discourse/lib/wizard-schema.js.es6 | 2 +- assets/javascripts/discourse/lib/wizard.js.es6 | 8 ++++---- .../javascripts/discourse/mixins/undo-changes.js.es6 | 3 +-- .../javascripts/discourse/models/custom-wizard.js.es6 | 2 +- .../discourse/routes/admin-wizards-api.js.es6 | 2 +- 22 files changed, 40 insertions(+), 60 deletions(-) diff --git a/assets/javascripts/discourse/components/custom-field-input.js.es6 b/assets/javascripts/discourse/components/custom-field-input.js.es6 index 12d93e12..8be7e24b 100644 --- a/assets/javascripts/discourse/components/custom-field-input.js.es6 +++ b/assets/javascripts/discourse/components/custom-field-input.js.es6 @@ -35,7 +35,7 @@ export default Component.extend({ }, @discourseComputed("field.klass") - serializerContent(klass, p2) { + serializerContent(klass) { const serializers = this.get(`${klass}Serializers`); if (serializers) { @@ -78,10 +78,10 @@ export default Component.extend({ if (!current) {return false;} - if (attr == "serializers") { + if (attr === "serializers") { return this.compareArrays(current, original); } else { - return current == original; + return current === original; } }); }, diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6 index 9ea64caa..6d21eaaf 100644 --- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 +++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6 @@ -1,11 +1,10 @@ import { default as discourseComputed } from "discourse-common/utils/decorators"; 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 wizardSchema from "../lib/wizard-schema"; import UndoChanges from "../mixins/undo-changes"; import Component from "@ember/component"; -import { notificationLevels } from "../lib/wizard"; import I18n from "I18n"; export default Component.extend(UndoChanges, { @@ -43,7 +42,7 @@ export default Component.extend(UndoChanges, { name: I18n.t(`admin.wizard.action.${type}.label`), }; }), - availableNotificationLevels: notificationLevels.map((type, index) => { + availableNotificationLevels: notificationLevels.map((type) => { return { id: type, name: I18n.t( diff --git a/assets/javascripts/discourse/components/wizard-custom-step.js.es6 b/assets/javascripts/discourse/components/wizard-custom-step.js.es6 index 102af717..5715bbda 100644 --- a/assets/javascripts/discourse/components/wizard-custom-step.js.es6 +++ b/assets/javascripts/discourse/components/wizard-custom-step.js.es6 @@ -1,5 +1,4 @@ import Component from "@ember/component"; -import { default as discourseComputed } from "discourse-common/utils/decorators"; export default Component.extend({ classNames: "wizard-custom-step", diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js.es6 index 9f9d6a01..dde84e95 100644 --- a/assets/javascripts/discourse/components/wizard-links.js.es6 +++ b/assets/javascripts/discourse/components/wizard-links.js.es6 @@ -9,7 +9,7 @@ import { default as wizardSchema, } from "../lib/wizard-schema"; import { notEmpty } from "@ember/object/computed"; -import { bind, scheduleOnce } from "@ember/runloop"; +import { scheduleOnce } from "@ember/runloop"; import EmberObject from "@ember/object"; import Component from "@ember/component"; import { A } from "@ember/array"; diff --git a/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6 index 36c0ec20..3ec2d502 100644 --- a/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6 @@ -3,7 +3,6 @@ import { gt } from "@ember/object/computed"; import { computed } from "@ember/object"; import { defaultConnector } from "../lib/wizard-mapper"; import { later } from "@ember/runloop"; -import { observes } from "discourse-common/utils/decorators"; import I18n from "I18n"; export default Component.extend({ diff --git a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 index 19d7071f..cb237056 100644 --- a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 @@ -1,6 +1,6 @@ import { connectorContent } from "../lib/wizard-mapper"; -import { alias, gt, or } from "@ember/object/computed"; -import { computed, observes } from "@ember/object"; +import { alias, gt } from "@ember/object/computed"; +import { computed } from "@ember/object"; import Component from "@ember/component"; export default Component.extend({ diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 index 349e7d7d..7e7e9b67 100644 --- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 @@ -2,8 +2,7 @@ import { alias, gt, or } from "@ember/object/computed"; import { computed } from "@ember/object"; import { default as discourseComputed, - observes, - on, + observes } from "discourse-common/utils/decorators"; import { getOwner } from "discourse-common/lib/get-owner"; import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper"; @@ -135,7 +134,7 @@ export default Component.extend({ }, documentClick(e) { - if (this._state == "destroying") {return;} + if (this._state === "destroying") {return;} let $target = $(e.target); if (!$target.parents(".type-selector").length && this.showTypes) { @@ -249,7 +248,7 @@ export default Component.extend({ }, @discourseComputed("activeType", "inputType") - placeholderKey(activeType, inputType) { + placeholderKey(activeType) { if ( activeType === "text" && this.options[`${this.selectorType}Placeholder`] @@ -281,8 +280,8 @@ export default Component.extend({ if (option === true) {return true;} if (typeof option !== "string") {return false;} - return option.split(",").filter((option) => { - return [this.selectorType, this.inputType].indexOf(option) !== -1; + return option.split(",").filter((o) => { + return [this.selectorType, this.inputType].indexOf(o) !== -1; }).length; }, diff --git a/assets/javascripts/discourse/components/wizard-mapper.js.es6 b/assets/javascripts/discourse/components/wizard-mapper.js.es6 index 7581adbd..95aabb1c 100644 --- a/assets/javascripts/discourse/components/wizard-mapper.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper.js.es6 @@ -1,10 +1,5 @@ -import { getOwner } from "discourse-common/lib/get-owner"; import { newInput, selectionTypes } from "../lib/wizard-mapper"; -import { - default as discourseComputed, - observes, - on, -} from "discourse-common/utils/decorators"; +import discourseComputed from "discourse-common/utils/decorators"; import { later } from "@ember/runloop"; import Component from "@ember/component"; import { A } from "@ember/array"; diff --git a/assets/javascripts/discourse/components/wizard-text-editor.js.es6 b/assets/javascripts/discourse/components/wizard-text-editor.js.es6 index 2866537d..88d7200c 100644 --- a/assets/javascripts/discourse/components/wizard-text-editor.js.es6 +++ b/assets/javascripts/discourse/components/wizard-text-editor.js.es6 @@ -1,7 +1,4 @@ -import { - default as discourseComputed, - on, -} from "discourse-common/utils/decorators"; +import discourseComputed from "discourse-common/utils/decorators"; import { notEmpty } from "@ember/object/computed"; import { userProperties } from "../lib/wizard"; import { scheduleOnce } from "@ember/runloop"; diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 index f13652e5..16493715 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 @@ -146,7 +146,7 @@ export default Controller.extend({ const api = this.get("api"); const name = api.name; const authType = api.authType; - let refreshList = false; + let refreshList = false; // eslint-disable-line let error; if (!name || !authType) {return;} diff --git a/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6 index c1254d3b..2081cfe3 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6 @@ -1,9 +1,5 @@ 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 { default as discourseComputed } from "discourse-common/utils/decorators"; export default Controller.extend({ messageKey: "create", @@ -49,7 +45,7 @@ export default Controller.extend({ }, removeField(field) { - return CustomWizardCustomField.destroyField(field).then((result) => { + return CustomWizardCustomField.destroyField(field).then(() => { this.get("customFields").removeObject(field); }); }, diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 index bc720ffd..3002b95a 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 @@ -1,6 +1,4 @@ -import { default as computed } from "discourse-common/utils/decorators"; -import { popupAjaxError } from "discourse/lib/ajax-error"; -import { ajax } from "discourse/lib/ajax"; +import discourseComputed from "discourse-common/utils/decorators"; import { notEmpty } from "@ember/object/computed"; import CustomWizardLogs from "../models/custom-wizard-logs"; import Controller from "@ember/controller"; @@ -27,7 +25,7 @@ export default Controller.extend({ .finally(() => this.set("refreshing", false)); }, - @computed("hasLogs", "refreshing") + @discourseComputed("hasLogs", "refreshing") noResults(hasLogs, refreshing) { return !hasLogs && !refreshing; }, diff --git a/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6 index 840d68b1..7228d164 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6 @@ -1,8 +1,5 @@ import Controller from "@ember/controller"; -import { - default as discourseComputed, - observes, -} from "discourse-common/utils/decorators"; +import { observes } from "discourse-common/utils/decorators"; import { empty } from "@ember/object/computed"; import CustomWizardManager from "../models/custom-wizard-manager"; import { A } from "@ember/array"; @@ -196,7 +193,7 @@ export default Controller.extend({ }, destroy() { - const destroyWizards = this.get("destroyWizards"); + let destroyWizards = this.get("destroyWizards"); if (!destroyWizards.length) { this.setMessage("error", "none_selected"); @@ -227,7 +224,7 @@ export default Controller.extend({ if (result.destroyed.length) { const destroyedIds = result.destroyed.map((d) => d.id); - const destroyWizards = this.get("destroyWizards"); + destroyWizards = this.get("destroyWizards"); const wizards = this.get("wizards"); wizards.removeObjects( diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 index f975c2f0..773fed24 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 @@ -1,18 +1,14 @@ import { default as discourseComputed, - observes, - on, + observes } 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 { generateId, wizardFieldList } from "../lib/wizard"; -import { buildProperties } from "../lib/wizard-json"; import { dasherize } from "@ember/string"; -import EmberObject from "@ember/object"; import { later, scheduleOnce } from "@ember/runloop"; import Controller from "@ember/controller"; import copyText from "discourse/lib/copy-text"; -import CustomWizard from "../models/custom-wizard"; import I18n from "I18n"; export default Controller.extend({ diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 index 0b725d41..610b80bc 100644 --- a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 +++ b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 @@ -1,4 +1,3 @@ -import { withPluginApi } from "discourse/lib/plugin-api"; import DiscourseURL from "discourse/lib/url"; export default { diff --git a/assets/javascripts/discourse/lib/wizard-json.js.es6 b/assets/javascripts/discourse/lib/wizard-json.js.es6 index ff2c5a5b..4b0aaa3d 100644 --- a/assets/javascripts/discourse/lib/wizard-json.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-json.js.es6 @@ -1,4 +1,4 @@ -import { camelCase, listProperties, snakeCase } from "../lib/wizard"; +import { camelCase, listProperties } from "../lib/wizard"; import wizardSchema from "../lib/wizard-schema"; import EmberObject from "@ember/object"; import { A } from "@ember/array"; diff --git a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 b/assets/javascripts/discourse/lib/wizard-mapper.js.es6 index a8cc8e34..5fe35996 100644 --- a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-mapper.js.es6 @@ -4,6 +4,13 @@ import I18n from "I18n"; // Inputs +const selectableInputTypes = [ + 'conditional', + 'assignment', + 'association', + 'validation' +]; + function defaultInputType(options = {}) { return options.inputTypes.split(",")[0]; } diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6 index 54d3b255..effd8a5c 100644 --- a/assets/javascripts/discourse/lib/wizard-schema.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6 @@ -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 basicDefaults = objSchema.basic; diff --git a/assets/javascripts/discourse/lib/wizard.js.es6 b/assets/javascripts/discourse/lib/wizard.js.es6 index 4746fda1..1896b1fe 100644 --- a/assets/javascripts/discourse/lib/wizard.js.es6 +++ b/assets/javascripts/discourse/lib/wizard.js.es6 @@ -9,7 +9,7 @@ function generateName(id) { return id ? sentenceCase(id) : ""; } -function generateId(name, opts = {}) { +function generateId(name) { return name ? snakeCase(name) : ""; } @@ -60,10 +60,10 @@ const notificationLevels = [ "muted", ]; -function listProperties(type, opts = {}) { - let properties = Object.keys(wizardSchema[type].basic); +function listProperties(itemType, opts = {}) { + let properties = Object.keys(wizardSchema[itemType].basic); - const types = wizardSchema[type].types; + const types = wizardSchema[itemType].types; if (types) { let typeProperties = []; diff --git a/assets/javascripts/discourse/mixins/undo-changes.js.es6 b/assets/javascripts/discourse/mixins/undo-changes.js.es6 index c8d42c52..b2ab322d 100644 --- a/assets/javascripts/discourse/mixins/undo-changes.js.es6 +++ b/assets/javascripts/discourse/mixins/undo-changes.js.es6 @@ -2,7 +2,6 @@ import { listProperties } from "../lib/wizard"; import { default as wizardSchema } from "../lib/wizard-schema"; import { get, set } from "@ember/object"; import Mixin from "@ember/object/mixin"; -import { observes } from "discourse-common/utils/decorators"; import { deepEqual } from "discourse-common/lib/object"; export default Mixin.create({ @@ -97,7 +96,6 @@ export default Mixin.create({ actions: { undoChanges() { const componentType = this.componentType; - const original = this.get("originalObject"); const obj = this.get(componentType); this.removeObservers(obj.type); @@ -118,6 +116,7 @@ export default Mixin.create({ this.setupObservers(type); }, + // eslint-disable-next-line mappedFieldUpdated(property, mappedComponent, type) { const obj = this.get(this.componentType); obj.notifyPropertyChange(property); diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js.es6 index d47df6db..07bdb7b0 100644 --- a/assets/javascripts/discourse/models/custom-wizard.js.es6 +++ b/assets/javascripts/discourse/models/custom-wizard.js.es6 @@ -1,7 +1,7 @@ import { ajax } from "discourse/lib/ajax"; import EmberObject from "@ember/object"; 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 { Promise } from "rsvp"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 index 927af8c8..541ab028 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 @@ -8,7 +8,7 @@ export default DiscourseRoute.extend({ setupController(controller, model) { 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) => { return { id: api.name,