DEV: Update linting (#354)

Author: davidtaylorhq

assets/javascripts/discourse/connectors/composer-action-after/encrypt.hbs

@@ -1,19 +1,19 @@
-{{#if showEncryptControls}}
+{{#if this.showEncryptControls}}
   <div class="encrypt-controls">
-    {{#if isEncryptActive}}
+    {{#if this.isEncryptActive}}
       <a
         href
         {{action "clicked"}}
-        title={{title}}
+        title={{this.title}}
         class="btn btn-default btn-icon no-text encrypt-toggle
-          {{if model.isEncrypted 'enabled'}}
-          {{if disabled 'disabled'}}"
+          {{if this.model.isEncrypted 'enabled'}}
+          {{if this.disabled 'disabled'}}"
       >
-        {{d-icon (if model.isEncrypted "lock" "unlock")}}
+        {{d-icon (if this.model.isEncrypted "lock" "unlock")}}
       </a>
 
-      {{~#if model.isEncrypted}}
-        {{~#unless model.editingPost~}}
+      {{~#if this.model.isEncrypted}}
+        {{~#unless this.model.editingPost~}}
           <div
             class="composer-action-divider"
           ></div>{{! inline to avoid whitespace}}<EncryptedPostTimerDropdown
@@ -34,10 +34,10 @@
         {{/unless}}
       {{/if}}
 
-      {{#if model.showEncryptError}}
-        <span class="error">{{model.encryptError}}</span>
+      {{#if this.model.showEncryptError}}
+        <span class="error">{{this.model.encryptError}}</span>
       {{/if}}
-    {{else if isEncryptEnabled}}
+    {{else if this.isEncryptEnabled}}
       <span title={{i18n "encrypt.preferences.status_enabled_but_inactive"}}>
         {{d-icon "unlock" class="disabled"}}
       </span>

assets/javascripts/discourse/connectors/user-preferences-security/encrypt.hbs

@@ -1,20 +1,20 @@
-{{#if canEnableEncrypt}}
+{{#if this.canEnableEncrypt}}
   <div class="control-group pref-title">
     <label class="control-label">{{i18n "encrypt.title"}}</label>
 
-    {{#if capabilities.isIE11}}
+    {{#if this.capabilities.isIE11}}
       <div class="alert alert-error">
         <p>{{i18n "encrypt.preferences.ie11"}}</p>
       </div>
-    {{else if isInsecureContext}}
+    {{else if this.isInsecureContext}}
       <div class="alert alert-error">
         <p>{{i18n "encrypt.preferences.insecure_context"}}</p>
       </div>
     {{else}}
       <div class="controls">
-        {{#if isCurrentUser}}
-          {{#if isEncryptEnabled}}
-            {{#if isEncryptActive}}
+        {{#if this.isCurrentUser}}
+          {{#if this.isEncryptEnabled}}
+            {{#if this.isEncryptActive}}
               <p>{{i18n "encrypt.preferences.status_enabled"}}</p>
               <fieldset class="control-group">
                 <DButton
@@ -42,26 +42,26 @@
               </fieldset>
               <PreferenceCheckbox
                 @labelKey="encrypt.preferences.encrypt_pms_default"
-                @checked={{model.user_option.encrypt_pms_default}}
+                @checked={{this.model.user_option.encrypt_pms_default}}
               />
               <SaveControls
                 @id="encrypt_preference_save"
-                @model={{model}}
+                @model={{this.model}}
                 @action={{action "savePreference"}}
-                @saved={{saved}}
+                @saved={{this.saved}}
               />
             {{else}}
               <form>
                 <p>
                   {{i18n "encrypt.preferences.status_enabled_but_inactive"}}
                 </p>
 
-                {{#if importIdentity}}
+                {{#if this.importIdentity}}
                   {{html-safe (i18n "encrypt.preferences.notice_import")}}
                   <Textarea
                     class="imported-key-pair"
-                    @value={{identity}}
-                    placeholder={{identityPlaceholder}}
+                    @value={{this.identity}}
+                    placeholder={{this.identityPlaceholder}}
                   />
                 {{else}}
                   {{html-safe (i18n "encrypt.preferences.notice_active")}}
@@ -72,13 +72,13 @@
 
                     <Input
                       @type="password"
-                      @value={{passphrase}}
+                      @value={{this.passphrase}}
                       placeholder={{i18n
                         "encrypt.preferences.paper_key_placeholder"
                       }}
                       id="passphrase"
                       autocomplete="current-password"
-                      disabled={{inProgress}}
+                      disabled={{this.inProgress}}
                     />
                   </p>
                 {{/if}}
@@ -90,25 +90,25 @@
                     @icon="unlock"
                     @action={{action "activateEncrypt"}}
                     @type="submit"
-                    @disabled={{inProgress}}
+                    @disabled={{this.inProgress}}
                     @label="encrypt.preferences.activate"
                   />
                   <EncryptEnableDropdown
-                    @isEncryptEnabled={{isEncryptEnabled}}
-                    @importIdentity={{importIdentity}}
+                    @isEncryptEnabled={{this.isEncryptEnabled}}
+                    @importIdentity={{this.importIdentity}}
                     @onChange={{action "selectEncryptEnableDropdownAction"}}
                   />
                 </p>
               </form>
             {{/if}}
           {{else}}
             <p>{{i18n "encrypt.preferences.status_disabled"}}</p>
-            {{#if importIdentity}}
+            {{#if this.importIdentity}}
               {{html-safe (i18n "encrypt.preferences.notice_import")}}
               <Textarea
                 class="imported-key-pair"
-                @value={{identity}}
-                placeholder={{identityPlaceholder}}
+                @value={{this.identity}}
+                placeholder={{this.identityPlaceholder}}
               />
             {{/if}}
 
@@ -117,17 +117,17 @@
               id="enable-encrypted-messages"
               @icon="lock"
               @action={{action "enableEncrypt"}}
-              @disabled={{inProgress}}
+              @disabled={{this.inProgress}}
               @label="encrypt.preferences.enable"
             />
             <EncryptEnableDropdown
-              @isEncryptEnabled={{isEncryptEnabled}}
-              @importIdentity={{importIdentity}}
+              @isEncryptEnabled={{this.isEncryptEnabled}}
+              @importIdentity={{this.importIdentity}}
               @onChange={{action "selectEncryptEnableDropdownAction"}}
             />
           {{/if}}
         {{else}}
-          {{#if isEncryptEnabled}}
+          {{#if this.isEncryptEnabled}}
             <p>{{i18n "encrypt.preferences.status_enabled_other"}}</p>
             <p>
               <a

assets/javascripts/discourse/initializers/encrypt-drafts.js

@@ -48,9 +48,8 @@ export default {
           // TODO: https://github.com/emberjs/ember.js/issues/15291
           let { _super } = this;
 
-          const controller = getOwnerWithFallback(this).lookup(
-            "controller:composer"
-          );
+          const controller =
+            getOwnerWithFallback(this).lookup("service:composer");
           let encrypted = !!controller.get("model.isEncrypted");
           if (draftKey.indexOf("topic_") === 0) {
             const topicId = draftKey.substr("topic_".length);

assets/javascripts/discourse/initializers/encrypt-posts.js

@@ -216,7 +216,7 @@ export default {
           return Promise.all([getTopicKey(attrs.topic_id), getIdentity()])
             .then(([key, identity]) => {
               const metadata = addMetadata(
-                getOwner(this).lookup("controller:composer"),
+                getOwner(this).lookup("service:composer"),
                 {
                   raw: attrs.raw,
                 }

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "@discourse/lint-configs": "2.0.1",
+    "@discourse/lint-configs": "2.2.0",
     "ember-template-lint": "6.0.0",
     "eslint": "9.14.0",
     "prettier": "2.8.8"