DEV: Update linting

Author: CvX

Gemfile.lock

@@ -1,80 +1,93 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.3)
+    activesupport (8.0.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     drb (2.2.1)
-    i18n (1.14.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    minitest (5.23.1)
-    mutex_m (0.2.0)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.6.6)
+    minitest (5.25.5)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    racc (1.8.0)
-    rack (3.0.12)
+    racc (1.8.1)
+    rack (3.1.12)
     rainbow (3.1.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.9)
-    rubocop (1.64.0)
+    regexp_parser (2.10.0)
+    rubocop (1.74.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      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 (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-discourse (3.8.0)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-discourse (3.12.1)
       activesupport (>= 6.1)
-      rubocop (>= 1.59.0)
-      rubocop-capybara (>= 2.0.0)
-      rubocop-factory_bot (>= 2.0.0)
-      rubocop-rails (>= 2.25.0)
-      rubocop-rspec (>= 2.25.0)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-rails (2.25.0)
+      lint_roller (>= 1.1.0)
+      rubocop (>= 1.73.2)
+      rubocop-capybara (>= 2.22.0)
+      rubocop-factory_bot (>= 2.27.0)
+      rubocop-rails (>= 2.30.3)
+      rubocop-rspec (>= 3.0.1)
+      rubocop-rspec_rails (>= 2.31.0)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rails (2.30.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.2)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
 
 PLATFORMS
   ruby
@@ -84,4 +97,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-   2.5.10
+   2.6.6

assets/javascripts/discourse/adapters/teambuild-progress.js

@@ -2,6 +2,7 @@ import RestAdapter from "discourse/adapters/rest";
 
 export default class TeambuildProgressAdapter extends RestAdapter {
   jsonMode = true;
+
   pathFor(store, type, username) {
     return `/team-build/progress/${username}.json`;
   }

assets/javascripts/discourse/adapters/teambuild-target.js

@@ -2,6 +2,7 @@ import RestAdapter from "discourse/adapters/rest";
 
 export default class TeambuildTargetAdapter extends RestAdapter {
   jsonMode = true;
+
   pathFor(store, type, id) {
     if (id) {
       return `/team-build/targets/${id}.json`;

assets/javascripts/discourse/components/teambuild-target.js

@@ -1,72 +1,83 @@
 import Component from "@ember/component";
-import { computed } from "@ember/object";
+import { action, computed } from "@ember/object";
 import { equal, or } from "@ember/object/computed";
 import { underscore } from "@ember/string";
+import { tagName } from "@ember-decorators/component";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { Types } from "discourse/plugins/discourse-teambuild/discourse/models/teambuild-target";
 
-export default Component.extend(bufferedProperty("target"), {
-  tagName: "",
-  editSelected: false,
+@tagName("")
+export default class TeambuildTarget extends Component.extend(
+  bufferedProperty("target")
+) {
+  editSelected = false;
 
-  needsGroup: equal("buffered.target_type_id", Types.USER_GROUP),
+  @equal("buffered.target_type_id", Types.USER_GROUP) needsGroup;
+  @or("editSelected", "target.isNew") editing;
 
-  canMoveUp: computed("editing", "index", function () {
+  @computed("editing", "index")
+  get canMoveUp() {
     return !this.editing && this.index > 0;
-  }),
+  }
 
-  canMoveDown: computed("editing", "index", "length", function () {
+  @computed("editing", "index", "length")
+  get canMoveDown() {
     return !this.editing && this.index < this.length - 1;
-  }),
+  }
 
-  editing: or("editSelected", "target.isNew"),
-
-  targetTypes: computed(function () {
+  @computed
+  get targetTypes() {
     return Object.keys(Types).map((key) => {
       return { id: Types[key], name: underscore(key) };
     });
-  }),
+  }
 
-  saveDisabled: computed(
+  @computed(
     "buffered.name",
     "target.isSaving",
     "needsGroup",
-    "buffered.group_id",
-    function () {
-      if (this.target.isSaving) {
-        return true;
-      }
-      let name = this.get("buffered.name");
-      if (!name || name.length === 0) {
-        return true;
-      }
-      if (this.needsGroup && !this.get("buffered.group_id")) {
-        return true;
-      }
-      return false;
+    "buffered.group_id"
+  )
+  get saveDisabled() {
+    if (this.target.isSaving) {
+      return true;
+    }
+
+    let name = this.get("buffered.name");
+    if (!name || name.length === 0) {
+      return true;
+    }
+
+    if (this.needsGroup && !this.get("buffered.group_id")) {
+      return true;
     }
-  ),
 
-  actions: {
-    save() {
-      this.target
-        .save(this.buffered.getProperties("name", "target_type_id", "group_id"))
-        .then(() => {
-          this.set("editSelected", false);
-        })
-        .catch(popupAjaxError);
-    },
-    cancel() {
-      if (this.target.isNew) {
-        return this.removeTarget();
-      } else {
+    return false;
+  }
+
+  @action
+  save() {
+    this.target
+      .save(this.buffered.getProperties("name", "target_type_id", "group_id"))
+      .then(() => {
         this.set("editSelected", false);
-        this.rollbackBuffer();
-      }
-    },
-    destroy() {
-      this.target.destroyRecord().then(() => this.removeTarget());
-    },
-  },
-});
+      })
+      .catch(popupAjaxError);
+  }
+
+  @action
+  cancel() {
+    if (this.target.isNew) {
+      return this.removeTarget();
+    } else {
+      this.set("editSelected", false);
+      this.rollbackBuffer();
+    }
+  }
+
+  @action
+  destroy() {
+    this.target.destroyRecord().then(() => this.removeTarget());
+  }
+}

assets/stylesheets/team-build.scss

@@ -11,31 +11,39 @@
 
 .high-scores {
   min-width: 300px;
+
   td {
     padding: 0.25em;
   }
+
   .user {
     .avatar {
       margin-right: 0.5em;
     }
+
     a {
       font-weight: bold;
       color: var(--primary-high);
     }
   }
+
   .rank {
     padding-left: 1em;
+
     .emoji {
       margin-left: 0.5em;
     }
   }
+
   td.score {
     font-size: 1.5em;
     text-align: center;
   }
+
   th.score {
     text-align: center;
   }
+
   tr.me {
     background-color: var(--highlight-medium);
   }
@@ -50,12 +58,14 @@
     font-size: 1.25em;
   }
 }
+
 .completed-score {
   margin-top: 1em;
   margin-bottom: 1em;
   font-size: 1.2em;
   font-weight: bold;
   display: flex;
+
   .username {
     color: var(--primary-medium);
     margin-right: 0.5em;
@@ -64,6 +74,7 @@
 
 .multi-choice {
   flex-wrap: wrap;
+
   .teambuild-choice {
     width: 200px;
   }
@@ -81,6 +92,7 @@
   &.completed {
     font-weight: bold;
   }
+
   .controls,
   .display-done {
     margin-right: 0.5em;
@@ -113,27 +125,29 @@
   align-items: center;
   justify-content: space-between;
 
-  .target-details {
-  }
-
   .target-types {
     display: flex;
+
     label {
       margin-right: 1em;
     }
   }
+
   .target-group-name {
     font-weight: bold;
   }
+
   .target-name {
     label {
       display: block;
     }
     margin-top: 0.5em;
+
     input {
       width: 500px;
     }
   }
+
   .controls {
     margin-left: 1em;
   }