Merge pull request #297 from paviliondev/fix_tests_and_deprecations

FIX: tests and deprecations

Author: angusmcleod

.eslintrc

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/prettier");

.prettierrc

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/template-lint");

.prettierrc.cjs

@@ -1,19 +1,19 @@
-{{#if showInputs}}
+{{#if this.showInputs}}
   <td>
     {{wizard-subscription-selector
-      value=field.klass
+      value=this.field.klass
       feature="custom_field"
       attribute="klass"
-      onChange=(action (mut field.klass))
+      onChange=(action (mut this.field.klass))
       options=(hash none="admin.wizard.custom_field.klass.select")
     }}
   </td>
   <td>
     {{wizard-subscription-selector
-      value=field.type
+      value=this.field.type
       feature="custom_field"
       attribute="type"
-      onChange=(action (mut field.type))
+      onChange=(action (mut this.field.type))
       options=(hash none="admin.wizard.custom_field.type.select")
     }}
   </td>
@@ -25,48 +25,52 @@
   </td>
   <td class="multi-select">
     {{multi-select
-      value=field.serializers
-      content=serializerContent
-      onChange=(action (mut field.serializers))
+      value=this.field.serializers
+      content=this.serializerContent
+      onChange=(action (mut this.field.serializers))
       options=(hash none="admin.wizard.custom_field.serializers.select")
     }}
   </td>
   <td class="actions">
-    {{#if loading}}
+    {{#if this.loading}}
       {{loading-spinner size="small"}}
     {{else}}
-      {{#if saveIcon}}
-        {{d-icon saveIcon}}
+      {{#if this.saveIcon}}
+        {{d-icon this.saveIcon}}
       {{/if}}
     {{/if}}
     {{d-button
       action=(action "destroy")
       icon="trash-alt"
       class="destroy"
-      disabled=destroyDisabled
+      disabled=this.destroyDisabled
     }}
     {{d-button
       icon="save"
       action=(action "save")
-      disabled=saveDisabled
+      disabled=this.saveDisabled
       class="save"
     }}
-    {{d-button action=(action "close") icon="times" disabled=closeDisabled}}
+    {{d-button
+      action=(action "close")
+      icon="times"
+      disabled=this.closeDisabled
+    }}
   </td>
 {{else}}
-  <td><label>{{field.klass}}</label></td>
-  <td><label>{{field.type}}</label></td>
-  <td class="input"><label>{{field.name}}</label></td>
+  <td><label>{{this.field.klass}}</label></td>
+  <td><label>{{this.field.type}}</label></td>
+  <td class="input"><label>{{this.field.name}}</label></td>
   <td class="multi-select">
-    {{#if isExternal}}
+    {{#if this.isExternal}}
       &mdash;
     {{else}}
-      {{#each field.serializers as |serializer|}}
+      {{#each this.field.serializers as |serializer|}}
         <label>{{serializer}}</label>
       {{/each}}
     {{/if}}
   </td>
-  {{#if isExternal}}
+  {{#if this.isExternal}}
     <td class="external">
       <label title={{i18n "admin.wizard.custom_field.external.title"}}>
         {{i18n "admin.wizard.custom_field.external.label"}}

.template-lintrc.cjs

@@ -1,6 +1,6 @@
 import Component from "@ember/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { alias, equal, or } from "@ember/object/computed";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 export default Component.extend({
@@ -17,6 +17,7 @@ export default Component.extend({
   isExternal: equal("field.id", "external"),
 
   didInsertElement() {
+    this._super(...arguments);
     this.set("originalField", JSON.parse(JSON.stringify(this.field)));
   },
 
@@ -119,7 +120,12 @@ export default Component.extend({
         } else {
           this.set("saveIcon", "times");
         }
-        setTimeout(() => this.set("saveIcon", null), 10000);
+        setTimeout(() => {
+          if (this.isDestroyed) {
+            return;
+          }
+          this.set("saveIcon", null);
+        }, 10000);
       });
     },
   },

.template-lintrc.js

@@ -1,13 +1,14 @@
+import { isEmpty } from "@ember/utils";
+import Handlebars from "handlebars";
+import $ from "jquery";
+import TextField from "discourse/components/text-field";
+import { renderAvatar } from "discourse/helpers/user-avatar";
+import userSearch from "discourse/lib/user-search";
 import {
   default as computed,
   observes,
 } from "discourse-common/utils/decorators";
-import { renderAvatar } from "discourse/helpers/user-avatar";
-import userSearch from "discourse/lib/user-search";
 import I18n from "I18n";
-import Handlebars from "handlebars";
-import { isEmpty } from "@ember/utils";
-import TextField from "discourse/components/text-field";
 
 const template = function (params) {
   const options = params.options;

.travis.yml

@@ -1,6 +1,6 @@
-import CategorySelector from "select-kit/components/category-selector";
 import { computed } from "@ember/object";
 import { makeArray } from "discourse-common/lib/helpers";
+import CategorySelector from "select-kit/components/category-selector";
 
 export default CategorySelector.extend({
   classNames: ["category-selector", "wizard-category-selector"],