DEV: Update linting config and run gjs-codemod

Author: CvX

.discourse-compatibility

@@ -1,3 +1,4 @@
+< 3.5.0.beta5-dev: bd9af0b9a577bfd2c01cc8b81a782a4e8b81b9c5
 < 3.5.0.beta1-dev: 6ceba62e985223c269782c4bc9a1bdc4a5adba28
 < 3.4.0.beta2-dev: 7685ebf396c93e8accc5a76a81fcec4384a73fa3
 < 3.4.0.beta1-dev: da38a4c053b68d7076db4441cfe86b473979945d

Gemfile.lock

@@ -14,42 +14,44 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    ast (2.4.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    drb (2.2.1)
+    connection_pool (2.5.3)
+    drb (2.2.3)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    logger (1.6.6)
+    logger (1.7.0)
     minitest (5.25.5)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
+    prism (1.4.0)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.15)
     rainbow (3.1.1)
     regexp_parser (2.10.0)
-    rubocop (1.74.0)
+    rubocop (1.75.8)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
@@ -65,13 +67,13 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.30.3)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.72.1, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rspec (3.5.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)
@@ -97,4 +99,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-   2.6.6
+   2.6.9

admin/assets/javascripts/discourse/adplugin-route-map.js renamed to admin/assets/javascripts/admin/adplugin-route-map.js

@@ -0,0 +1,34 @@
+import { action } from "@ember/object";
+import { mapBy } from "@ember/object/computed";
+import { classNames } from "@ember-decorators/component";
+import DButton from "discourse/components/d-button";
+import { makeArray } from "discourse/lib/helpers";
+import HouseAdsChooser from "./house-ads-chooser";
+import HouseAdsSetting from "./house-ads-setting";
+
+@classNames("house-ads-setting house-ads-list-setting")
+export default class HouseAdsListSetting extends HouseAdsSetting {
+  @mapBy("allAds", "name") adNames;
+
+  @action
+  changeAdValue(value) {
+    const settingValue = makeArray(value).join("|");
+    this.set("adValue", settingValue);
+  }
+
+  <template>
+    <label for={{this.name}}>{{this.title}}</label>
+    <HouseAdsChooser
+      @settingValue={{this.adValue}}
+      @choices={{this.adNames}}
+      @onChange={{this.changeAdValue}}
+    />
+    <div class="setting-controls">
+      {{#if this.changed}}
+        <DButton class="ok" @action={{action "save"}} @icon="check" />
+        <DButton class="cancel" @action={{action "cancel"}} @icon="xmark" />
+      {{/if}}
+    </div>
+    <p class="help">{{this.help}}</p>
+  </template>
+}

admin/assets/javascripts/discourse/components/house-ads-category-selector.gjs renamed to admin/assets/javascripts/admin/components/house-ads-category-selector.gjs

@@ -1,6 +1,8 @@
 import Component from "@ember/component";
 import { action } from "@ember/object";
 import { classNames } from "@ember-decorators/component";
+import DButton from "discourse/components/d-button";
+import TextField from "discourse/components/text-field";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { i18n as computedI18n, propertyNotEqual } from "discourse/lib/computed";
@@ -55,4 +57,16 @@ export default class HouseAdsSetting extends Component {
   cancel() {
     this.set("adValue", this.get("value"));
   }
+
+  <template>
+    <label for={{this.name}}>{{this.title}}</label>
+    <TextField @value={{this.adValue}} @classNames="house-ads-text-input" />
+    <div class="setting-controls">
+      {{#if this.changed}}
+        <DButton class="ok" @action={{action "save"}} @icon="check" />
+        <DButton class="cancel" @action={{action "cancel"}} @icon="xmark" />
+      {{/if}}
+    </div>
+    <p class="help">{{this.help}}</p>
+  </template>
 }