diff --git a/.discourse-compatibility b/.discourse-compatibility
index 2f18db7..5590fdd 100644
--- a/.discourse-compatibility
+++ b/.discourse-compatibility
@@ -1,4 +1,5 @@
-3.1.999: 0cbf10b8055370445bd36536e51986bf48bdc57e
+< 3.2.0.beta2-dev: ac930c509e2a5b0c37b84bcea28d332e686add95
+3.1.999: a304cd2028ccf1f5b00f5137633aa7027a1fd334
 3.1.0.beta3: 9c270cac9abc1c2b30574d8c655fb3a90546236b
 2.9.0.beta8: 28bc8ab78a09551548c87f511ade3d64e1b04bc3
 2.9.0.beta3: 46f200935dc9e5750c3f2740abd993e27a9b3f6c
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 7898fbf..0000000
--- a/.eslintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "eslint-config-discourse"
-}
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
new file mode 100644
index 0000000..be1a9f3
--- /dev/null
+++ b/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/eslint");
diff --git a/.gitignore b/.gitignore
index d45a64e..91bbf8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.bundle/
-auto_generated
-.DS_Store
-node_modules/
+node_modules
+/gems
+/auto_generated
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 0967ef4..0000000
--- a/.prettierrc
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
new file mode 100644
index 0000000..57f647b
--- /dev/null
+++ b/.prettierrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/prettier");
diff --git a/.template-lintrc.cjs b/.template-lintrc.cjs
new file mode 100644
index 0000000..5355ea0
--- /dev/null
+++ b/.template-lintrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/template-lint");
diff --git a/.template-lintrc.js b/.template-lintrc.js
deleted file mode 100644
index a558b8e..0000000
--- a/.template-lintrc.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  plugins: ["ember-template-lint-plugin-discourse"],
-  extends: "discourse:recommended",
-};
diff --git a/Gemfile.lock b/Gemfile.lock
index 28b6f70..23ad67d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,43 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    json (2.6.3)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    parallel (1.24.0)
+    parser (3.3.0.3)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    racc (1.7.1)
+    racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rubocop (1.52.1)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rubocop (1.59.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-discourse (3.2.0)
-      rubocop (>= 1.1.0)
-      rubocop-rspec (>= 2.0.0)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
-    rubocop-rspec (2.22.0)
-      rubocop (~> 1.33)
+    rubocop-discourse (3.6.0)
+      rubocop (>= 1.59.0)
+      rubocop-rspec (>= 2.25.0)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
-    syntax_tree (6.1.1)
+    syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -48,4 +50,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-   2.3.4
+   2.5.4
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..baa5b89
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Civilized Discourse Construction Kit
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/app/controllers/discourse_assign/assign_controller.rb b/app/controllers/discourse_assign/assign_controller.rb
index 842b318..846faff 100644
--- a/app/controllers/discourse_assign/assign_controller.rb
+++ b/app/controllers/discourse_assign/assign_controller.rb
@@ -159,43 +159,6 @@ module DiscourseAssign
              }
     end
 
-    def user_menu_assigns
-      assign_notifications =
-        Notification.unread_type(current_user, Notification.types[:assigned], user_menu_limit)
-
-      if assign_notifications.size < user_menu_limit
-        opts = {}
-        ignored_assignment_ids =
-          assign_notifications.filter_map { |notification| notification.data_hash[:assignment_id] }
-        opts[:ignored_assignment_ids] = ignored_assignment_ids if ignored_assignment_ids.present?
-
-        assigns_list =
-          TopicQuery.new(
-            current_user,
-            per_page: user_menu_limit - assign_notifications.size,
-          ).list_messages_assigned(current_user, ignored_assignment_ids)
-      end
-
-      if assign_notifications.present?
-        serialized_notifications =
-          ActiveModel::ArraySerializer.new(
-            assign_notifications,
-            each_serializer: NotificationSerializer,
-            scope: guardian,
-          )
-      end
-
-      if assigns_list
-        serialized_assigns =
-          serialize_data(assigns_list, TopicListSerializer, scope: guardian, root: false)[:topics]
-      end
-
-      render json: {
-               notifications: serialized_notifications || [],
-               topics: serialized_assigns || [],
-             }
-    end
-
     private
 
     def translate_failure(reason, assign_to)
@@ -261,10 +224,6 @@ module DiscourseAssign
       raise Discourse::InvalidAccess.new unless current_user.can_assign?
     end
 
-    def user_menu_limit
-      UsersController::USER_MENU_LIST_LIMIT
-    end
-
     def recent_assignees
       User
         .where("users.id <> ?", current_user.id)
diff --git a/app/jobs/regular/assign_notification.rb b/app/jobs/regular/assign_notification.rb
index a2ada45..2bae14d 100644
--- a/app/jobs/regular/assign_notification.rb
+++ b/app/jobs/regular/assign_notification.rb
@@ -3,79 +3,8 @@
 module Jobs
   class AssignNotification < ::Jobs::Base
     def execute(args)
-      raise Discourse::InvalidParameters.new(:topic_id) if args[:topic_id].nil?
-      raise Discourse::InvalidParameters.new(:post_id) if args[:post_id].nil?
-      raise Discourse::InvalidParameters.new(:assigned_to_id) if args[:assigned_to_id].nil?
-      raise Discourse::InvalidParameters.new(:assigned_to_type) if args[:assigned_to_type].nil?
-      raise Discourse::InvalidParameters.new(:assigned_by_id) if args[:assigned_by_id].nil?
       raise Discourse::InvalidParameters.new(:assignment_id) if args[:assignment_id].nil?
-
-      if args[:skip_small_action_post].nil?
-        raise Discourse::InvalidParameters.new(:skip_small_action_post)
-      end
-
-      topic = Topic.find(args[:topic_id])
-      post = Post.find(args[:post_id])
-      assigned_by = User.find(args[:assigned_by_id])
-      assigned_to =
-        (
-          if args[:assigned_to_type] == "User"
-            User.find(args[:assigned_to_id])
-          else
-            Group.find(args[:assigned_to_id])
-          end
-        )
-      assigned_to_users = args[:assigned_to_type] == "User" ? [assigned_to] : assigned_to.users
-
-      assigned_to_users.each do |user|
-        Assigner.publish_topic_tracking_state(topic, user.id)
-
-        next if assigned_by == user
-
-        assigned_to_user = args[:assigned_to_type] == "User"
-
-        PostAlerter.new(post).create_notification_alert(
-          user: user,
-          post: post,
-          username: assigned_by.username,
-          notification_type: Notification.types[:assigned] || Notification.types[:custom],
-          excerpt:
-            I18n.t(
-              (
-                if assigned_to_user
-                  "discourse_assign.topic_assigned_excerpt"
-                else
-                  "discourse_assign.topic_group_assigned_excerpt"
-                end
-              ),
-              title: topic.title,
-              group: assigned_to.name,
-              locale: user.effective_locale,
-            ),
-        )
-
-        next if args[:skip_small_action_post]
-        Notification.create!(
-          notification_type: Notification.types[:assigned] || Notification.types[:custom],
-          user_id: user.id,
-          topic_id: topic.id,
-          post_number: post.post_number,
-          high_priority: true,
-          data: {
-            message:
-              (
-                if assigned_to_user
-                  "discourse_assign.assign_notification"
-                else
-                  "discourse_assign.assign_group_notification"
-                end
-              ),
-            display_username: assigned_to_user ? assigned_by.username : assigned_to.name,
-            topic_title: topic.title,
-            assignment_id: args[:assignment_id],
-          }.to_json,
-        )
-      end
+      Assignment.find(args[:assignment_id]).create_missing_notifications!
     end
   end
 end
diff --git a/app/jobs/regular/unassign_notification.rb b/app/jobs/regular/unassign_notification.rb
index cdbe4cf..6db3f14 100644
--- a/app/jobs/regular/unassign_notification.rb
+++ b/app/jobs/regular/unassign_notification.rb
@@ -3,34 +3,18 @@
 module Jobs
   class UnassignNotification < ::Jobs::Base
     def execute(args)
-      raise Discourse::InvalidParameters.new(:topic_id) if args[:topic_id].nil?
-      raise Discourse::InvalidParameters.new(:assigned_to_id) if args[:assigned_to_id].nil?
-      raise Discourse::InvalidParameters.new(:assigned_to_type) if args[:assigned_to_type].nil?
-
-      topic = Topic.find(args[:topic_id])
-      assigned_to_users =
-        (
-          if args[:assigned_to_type] == "User"
-            [User.find(args[:assigned_to_id])]
-          else
-            Group.find(args[:assigned_to_id]).users
-          end
-        )
-
-      assigned_to_users.each do |user|
-        Assigner.publish_topic_tracking_state(topic, user.id)
-
-        Notification
-          .where(
-            notification_type: Notification.types[:assigned] || Notification.types[:custom],
-            user_id: user.id,
-            topic_id: topic.id,
-          )
-          .where(
-            "data like '%discourse_assign.assign_notification%' OR data like '%discourse_assign.assign_group_notification%'",
-          )
-          .destroy_all
+      %i[topic_id assigned_to_id assigned_to_type assignment_id].each do |argument|
+        raise Discourse::InvalidParameters.new(argument) if args[argument].nil?
       end
+
+      assignment = Assignment.new(args.slice(:topic_id, :assigned_to_id, :assigned_to_type))
+      assignment.assigned_users.each do |user|
+        Assigner.publish_topic_tracking_state(assignment.topic, user.id)
+      end
+      Notification
+        .for_assignment(args[:assignment_id])
+        .where(user: assignment.assigned_users, topic: assignment.topic)
+        .destroy_all
     end
   end
 end
diff --git a/app/models/assignment.rb b/app/models/assignment.rb
index 8d0b897..58479e5 100644
--- a/app/models/assignment.rb
+++ b/app/models/assignment.rb
@@ -9,13 +9,15 @@ class Assignment < ActiveRecord::Base
   belongs_to :target, polymorphic: true
 
   scope :joins_with_topics,
-        -> {
+        -> do
           joins(
             "INNER JOIN topics ON topics.id = assignments.target_id AND assignments.target_type = 'Topic' AND topics.deleted_at IS NULL",
           )
-        }
+        end
 
-  scope :active_for_group, ->(group) { where(assigned_to: group, active: true) }
+  scope :active_for_group, ->(group) { active.where(assigned_to: group) }
+  scope :active, -> { where(active: true) }
+  scope :inactive, -> { where(active: false) }
 
   before_validation :default_status
 
@@ -38,11 +40,31 @@ class Assignment < ActiveRecord::Base
   end
 
   def assigned_to_user?
-    assigned_to_type == "User"
+    assigned_to.is_a?(User)
   end
 
   def assigned_to_group?
-    assigned_to_type == "Group"
+    assigned_to.is_a?(Group)
+  end
+
+  def assigned_users
+    Array.wrap(assigned_to.try(:users) || assigned_to)
+  end
+
+  def post
+    return target.posts.find_by(post_number: 1) if target.is_a?(Topic)
+    target
+  end
+
+  def create_missing_notifications!
+    assigned_users.each do |user|
+      next if user.notifications.for_assignment(self).exists?
+      DiscourseAssign::CreateNotification.call(
+        assignment: self,
+        user: user,
+        mark_as_read: assigned_by_user == user,
+      )
+    end
   end
 
   private
diff --git a/assets/javascripts/discourse/assigned-messages-route-map.js b/assets/javascripts/discourse/assigned-messages-route-map.js
index 8de2d1c..3d465b0 100644
--- a/assets/javascripts/discourse/assigned-messages-route-map.js
+++ b/assets/javascripts/discourse/assigned-messages-route-map.js
@@ -2,7 +2,7 @@ export default {
   resource: "user.userPrivateMessages",
 
   map() {
-    this.route("assigned", { path: "/assigned" }, function () {
+    this.route("assigned", function () {
       this.route("index", { path: "/" });
     });
   },
diff --git a/assets/javascripts/discourse/components/assign-actions-dropdown.js b/assets/javascripts/discourse/components/assign-actions-dropdown.js
index dd30bc4..2283049 100644
--- a/assets/javascripts/discourse/components/assign-actions-dropdown.js
+++ b/assets/javascripts/discourse/components/assign-actions-dropdown.js
@@ -1,6 +1,6 @@
+import { action } from "@ember/object";
 import I18n from "I18n";
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
-import { action } from "@ember/object";
 
 export default DropdownSelectBoxComponent.extend({
   classNames: ["assign-actions-dropdown"],
diff --git a/assets/javascripts/discourse/components/assign-user-form.hbs b/assets/javascripts/discourse/components/assign-user-form.hbs
index 2160f23..c9ced8f 100644
--- a/assets/javascripts/discourse/components/assign-user-form.hbs
+++ b/assets/javascripts/discourse/components/assign-user-form.hbs
@@ -36,7 +36,7 @@
       @id="assign-status"
       @content={{this.availableStatuses}}
       @value={{this.status}}
-      @onChange={{action (mut @model.status)}}
+      @onChange={{fn (mut @model.status)}}
     />
   </div>
 {{/if}}
@@ -51,7 +51,6 @@
   <Textarea
     id="assign-modal-note"
     @value={{@model.note}}
-    {{! template-lint-disable no-down-event-binding }}
     {{on "keydown" this.handleTextAreaKeydown}}
   />
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/assign-user-form.js b/assets/javascripts/discourse/components/assign-user-form.js
index ceb8184..0501018 100644
--- a/assets/javascripts/discourse/components/assign-user-form.js
+++ b/assets/javascripts/discourse/components/assign-user-form.js
@@ -9,8 +9,8 @@ export default class AssignUserForm extends Component {
   @service capabilities;
 
   @tracked assigneeError = false;
-  @tracked assigneeName =
-    this.args.model.username || this.args.model.group_name;
+  @tracked
+  assigneeName = this.args.model.username || this.args.model.group_name;
 
   constructor() {
     super(...arguments);
@@ -26,9 +26,7 @@ export default class AssignUserForm extends Component {
 
   get status() {
     return (
-      this.args.model.status ||
-      this.args.model.target.assignment_status ||
-      this.siteSettings.assign_statuses.split("|")[0]
+      this.args.model.status || this.siteSettings.assign_statuses.split("|")[0]
     );
   }
 
diff --git a/assets/javascripts/discourse/components/assigned-topic-list-column.gjs b/assets/javascripts/discourse/components/assigned-topic-list-column.gjs
new file mode 100644
index 0000000..970d334
--- /dev/null
+++ b/assets/javascripts/discourse/components/assigned-topic-list-column.gjs
@@ -0,0 +1,43 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import AssignActionsDropdown from "./assign-actions-dropdown";
+
+export default class AssignedTopicListColumn extends Component {
+  @service taskActions;
+  @service router;
+
+  @action
+  async unassign(targetId, targetType = "Topic") {
+    await this.taskActions.unassign(targetId, targetType);
+    this.router.refresh();
+  }
+
+  @action
+  reassign(topic) {
+    this.taskActions.showAssignModal(topic, {
+      onSuccess: () => this.router.refresh(),
+    });
+  }
+
+  <template>
+    {{#if @topic.assigned_to_user}}
+      <AssignActionsDropdown
+        @topic={{@topic}}
+        @assignee={{@topic.assigned_to_user.username}}
+        @unassign={{this.unassign}}
+        @reassign={{this.reassign}}
+      />
+    {{else if @topic.assigned_to_group}}
+      <AssignActionsDropdown
+        @topic={{@topic}}
+        @assignee={{@topic.assigned_to_group.name}}
+        @group={{true}}
+        @unassign={{this.unassign}}
+        @reassign={{this.reassign}}
+      />
+    {{else}}
+      <AssignActionsDropdown @topic={{@topic}} @unassign={{this.unassign}} />
+    {{/if}}
+  </template>
+}
diff --git a/assets/javascripts/discourse/components/assigned-topic-list-item.hbs b/assets/javascripts/discourse/components/assigned-topic-list-item.hbs
deleted file mode 100644
index c739615..0000000
--- a/assets/javascripts/discourse/components/assigned-topic-list-item.hbs
+++ /dev/null
@@ -1,86 +0,0 @@
-{{!
-  The `~` syntax strip spaces between the elements, making it produce
-  `<a class=topic-post-badges>Some text</a><span class=topic-post-badges>`,
-  with no space between them.
-  This causes the topic-post-badge to be considered the same word as "text"
-  at the end of the link, preventing it from line wrapping onto its own line.
-}}
-{{#if this.bulkSelectEnabled}}
-  <td class="bulk-select topic-list-data">
-    <input type="checkbox" class="bulk-select" />
-  </td>
-{{/if}}
-<td class="main-link clearfix topic-list-data" colspan="1">
-  <span class="link-top-line">
-    {{~raw "topic-status" topic=this.topic}}
-    {{~#if this.isPrivateMessage}}
-      {{~d-icon "envelope" class="private-message-icon"}}
-    {{~/if}}
-    {{~topic-link this.topic class="raw-link raw-topic-link"}}
-    {{~#if this.topic.featured_link}}
-      {{~topic-featured-link this.topic}}
-    {{~/if}}
-    {{~#if this.showTopicPostBadges}}
-      {{~raw
-        "topic-post-badges"
-        unread=this.topic.unread
-        unseen=this.topic.unseen
-        url=this.topic.lastUnreadUrl
-        newDotText=this.newDotText
-      }}
-    {{~/if}}
-  </span>
-  <div class="link-bottom-line">
-    {{#if (or (not this.hideCategory) (not this.topic.isPinnedUncategorized))}}
-      {{category-link this.topic.category}}
-    {{/if}}
-    {{discourse-tags this.topic mode="list" tagsForUser=this.tagsForUser}}
-    {{raw
-      "list/action-list"
-      topic=this.topic
-      postNumbers=this.topic.liked_post_numbers
-      className="likes"
-      icon="heart"
-    }}
-  </div>
-  {{#if this.expandPinned}}
-    {{raw "list/topic-excerpt" topic=this.topic}}
-  {{/if}}
-</td>
-
-{{#if this.showPosters}}
-  {{raw "list/posters-column" posters=this.topic.featuredUsers}}
-{{/if}}
-
-{{raw "list/posts-count-column" topic=this.topic}}
-
-<td class="num views {{this.topic.viewsHeat}} topic-list-data">{{number
-    this.topic.views
-    numberKey="views_long"
-  }}</td>
-{{raw
-  "list/activity-column"
-  topic=this.topic
-  class="num topic-list-data"
-  tagName="td"
-}}
-<td class="topic-list-data">
-  {{#if this.topic.assigned_to_user}}
-    <AssignActionsDropdown
-      @topic={{this.topic}}
-      @assignee={{this.topic.assigned_to_user.username}}
-      @unassign={{this.unassign}}
-      @reassign={{this.reassign}}
-    />
-  {{else if this.topic.assigned_to_group}}
-    <AssignActionsDropdown
-      @topic={{this.topic}}
-      @assignee={{this.topic.assigned_to_group.name}}
-      @group={{true}}
-      @unassign={{this.unassign}}
-      @reassign={{this.reassign}}
-    />
-  {{else}}
-    <AssignActionsDropdown @topic={{this.topic}} @unassign={{this.unassign}} />
-  {{/if}}
-</td>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/assigned-topic-list-item.js b/assets/javascripts/discourse/components/assigned-topic-list-item.js
deleted file mode 100644
index a112ea9..0000000
--- a/assets/javascripts/discourse/components/assigned-topic-list-item.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import TopicListItem from "discourse/components/topic-list-item";
-import { equal } from "@ember/object/computed";
-
-export default class AssignedTopicListItem extends TopicListItem {
-  classNames = ["assigned-topic-list-item"];
-
-  @equal("topic.archetype", "private_message") isPrivateMessage;
-}
diff --git a/assets/javascripts/discourse/components/assigned-topic-list.hbs b/assets/javascripts/discourse/components/assigned-topic-list.hbs
deleted file mode 100644
index 4d38c6a..0000000
--- a/assets/javascripts/discourse/components/assigned-topic-list.hbs
+++ /dev/null
@@ -1,46 +0,0 @@
-{{#unless this.skipHeader}}
-  <thead class="topic-list-header assigned-topic-list-header">
-    {{raw
-      "topic-list-header"
-      canBulkSelect=this.canBulkSelect
-      canDoBulkActions=this.canDoBulkActions
-      toggleInTitle=this.toggleInTitle
-      hideCategory=this.hideCategory
-      showPosters=true
-      showLikes=this.showLikes
-      showOpLikes=this.showOpLikes
-      order=this.order
-      ascending=this.ascending
-      sortable=this.sortable
-      listTitle=this.listTitle
-      bulkSelectEnabled=this.bulkSelectEnabled
-    }}
-  </thead>
-{{/unless}}
-
-<tbody class="topic-list-body assigned-topic-list-body">
-  {{#each this.filteredTopics as |topic|}}
-    <AssignedTopicListItem
-      @topic={{topic}}
-      @bulkSelectEnabled={{this.bulkSelectEnabled}}
-      @showTopicPostBadges={{this.showTopicPostBadges}}
-      @hideCategory={{this.hideCategory}}
-      @showPosters={{true}}
-      @showLikes={{this.showLikes}}
-      @showOpLikes={{this.showOpLikes}}
-      @expandGloballyPinned={{this.expandGloballyPinned}}
-      @expandAllPinned={{this.expandAllPinned}}
-      @lastVisitedTopic={{this.lastVisitedTopic}}
-      @selected={{this.selected}}
-      @tagsForUser={{this.tagsForUser}}
-      @unassign={{this.unassign}}
-      @reassign={{this.reassign}}
-    />
-
-    {{raw
-      "list/visited-line"
-      lastVisitedTopic=this.lastVisitedTopic
-      topic=topic
-    }}
-  {{/each}}
-</tbody>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/assigned-topic-list.js b/assets/javascripts/discourse/components/assigned-topic-list.js
deleted file mode 100644
index 057566b..0000000
--- a/assets/javascripts/discourse/components/assigned-topic-list.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import TopicList from "discourse/components/topic-list";
-
-export default class AssignedTopicList extends TopicList {}
diff --git a/assets/javascripts/discourse/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/components/basic-assigned-topic-list.hbs
deleted file mode 100644
index 16ca106..0000000
--- a/assets/javascripts/discourse/components/basic-assigned-topic-list.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<ConditionalLoadingSpinner @condition={{this.loading}}>
-  {{#if this.hasIncoming}}
-    <div class="show-mores">
-      <a href class="alert alert-info clickable" {{action this.showInserted}}>
-        <CountI18n
-          @key="topic_count_"
-          @suffix="latest"
-          @count={{this.incomingCount}}
-        />
-      </a>
-    </div>
-  {{/if}}
-
-  {{#if this.topics}}
-    <AssignedTopicList
-      @showPosters={{this.showPosters}}
-      @hideCategory={{this.hideCategory}}
-      @topics={{this.topics}}
-      @expandExcerpts={{this.expandExcerpts}}
-      @bulkSelectEnabled={{this.bulkSelectEnabled}}
-      @canBulkSelect={{this.canBulkSelect}}
-      @bulkSelectAction={{this.bulkSelectAction}}
-      @selected={{this.selected}}
-      @skipHeader={{this.skipHeader}}
-      @tagsForUser={{this.tagsForUser}}
-      @changeSort={{this.changeSort}}
-      @toggleBulkSelect={{this.toggleBulkSelect}}
-      @unassign={{this.unassign}}
-      @reassign={{this.reassign}}
-      @onScroll={{this.onScroll}}
-      @scrollOnLoad={{this.scrollOnLoad}}
-    />
-  {{else}}
-    {{#unless this.loadingMore}}
-      <div class="alert alert-info">
-        {{i18n "choose_topic.none_found"}}
-      </div>
-    {{/unless}}
-  {{/if}}
-</ConditionalLoadingSpinner>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/basic-assigned-topic-list.js b/assets/javascripts/discourse/components/basic-assigned-topic-list.js
deleted file mode 100644
index d667de3..0000000
--- a/assets/javascripts/discourse/components/basic-assigned-topic-list.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import BasicTopicList from "discourse/components/basic-topic-list";
-
-export default class BasicAssignedTopicList extends BasicTopicList {}
diff --git a/assets/javascripts/discourse/components/bulk-actions/assign-user.js b/assets/javascripts/discourse/components/bulk-actions/assign-user.js
index 3636fa3..6611212 100644
--- a/assets/javascripts/discourse/components/bulk-actions/assign-user.js
+++ b/assets/javascripts/discourse/components/bulk-actions/assign-user.js
@@ -1,8 +1,9 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
+import { TrackedObject } from "@ember-compat/tracked-built-ins";
 
 export default class AssignUser extends Component {
-  model = {};
+  model = new TrackedObject({});
 
   // `submit` property will be mutated by the `AssignUserForm` component
   formApi = {
@@ -14,6 +15,7 @@ export default class AssignUser extends Component {
     return this.args.performAndRefresh({
       type: "assign",
       username: this.model.username,
+      status: this.model.status,
       note: this.model.note,
     });
   }
diff --git a/assets/javascripts/discourse/components/modal/assign-user.hbs b/assets/javascripts/discourse/components/modal/assign-user.hbs
index bd73006..d543f90 100644
--- a/assets/javascripts/discourse/components/modal/assign-user.hbs
+++ b/assets/javascripts/discourse/components/modal/assign-user.hbs
@@ -1,7 +1,7 @@
 <DModal class="assign" @title={{this.title}} @closeModal={{@closeModal}}>
   <:body>
     <AssignUserForm
-      @model={{@model}}
+      @model={{this.model}}
       @onSubmit={{this.onSubmit}}
       @formApi={{this.formApi}}
     />
@@ -12,7 +12,7 @@
       class="btn-primary"
       @action={{this.formApi.submit}}
       @label={{if
-        @model.reassign
+        this.model.reassign
         "discourse_assign.reassign.title"
         "discourse_assign.assign_modal.assign"
       }}
diff --git a/assets/javascripts/discourse/components/modal/assign-user.js b/assets/javascripts/discourse/components/modal/assign-user.js
index 938a39a..fb68511 100644
--- a/assets/javascripts/discourse/components/modal/assign-user.js
+++ b/assets/javascripts/discourse/components/modal/assign-user.js
@@ -1,11 +1,14 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { TrackedObject } from "@ember-compat/tracked-built-ins";
 import I18n from "I18n";
 
 export default class AssignUser extends Component {
   @service taskActions;
 
+  model = new TrackedObject(this.args.model);
+
   // `submit` property will be mutated by the `AssignUserForm` component
   formApi = {
     submit() {},
@@ -14,7 +17,7 @@ export default class AssignUser extends Component {
   get title() {
     let i18nSuffix;
 
-    switch (this.args.model.targetType) {
+    switch (this.model.targetType) {
       case "Post":
         i18nSuffix = "_post_modal";
         break;
@@ -25,7 +28,7 @@ export default class AssignUser extends Component {
 
     return I18n.t(
       `discourse_assign.assign${i18nSuffix}.${
-        this.args.model.reassign ? "reassign_title" : "title"
+        this.model.reassign ? "reassign_title" : "title"
       }`
     );
   }
@@ -33,6 +36,6 @@ export default class AssignUser extends Component {
   @action
   async onSubmit() {
     this.args.closeModal();
-    await this.taskActions.assign(this.args.model);
+    await this.taskActions.assign(this.model);
   }
 }
diff --git a/assets/javascripts/discourse/components/remind-assigns-frequency.js b/assets/javascripts/discourse/components/remind-assigns-frequency.js
index 3260626..73016c2 100644
--- a/assets/javascripts/discourse/components/remind-assigns-frequency.js
+++ b/assets/javascripts/discourse/components/remind-assigns-frequency.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
-import I18n from "I18n";
 import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
 
 export default class RemindAssignsFrequency extends Component {
   @discourseComputed(
diff --git a/assets/javascripts/discourse/components/user-menu/assigns-list.js b/assets/javascripts/discourse/components/user-menu/assigns-list.js
index 6021568..10bff99 100644
--- a/assets/javascripts/discourse/components/user-menu/assigns-list.js
+++ b/assets/javascripts/discourse/components/user-menu/assigns-list.js
@@ -1,10 +1,7 @@
+import { set } from "@ember/object";
+import { sort } from "@ember/object/computed";
 import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list";
-import { ajax } from "discourse/lib/ajax";
-import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";
-import UserMenuAssignItem from "../../lib/user-menu/assign-item";
-import Notification from "discourse/models/notification";
 import I18n from "I18n";
-import Topic from "discourse/models/topic";
 import UserMenuAssignsListEmptyState from "./assigns-list-empty-state";
 
 export default class UserMenuAssignNotificationsList extends UserMenuNotificationsList {
@@ -56,25 +53,20 @@ export default class UserMenuAssignNotificationsList extends UserMenuNotificatio
   }
 
   async fetchItems() {
-    const data = await ajax("/assign/user-menu-assigns.json");
-    const content = [];
-
-    const notifications = data.notifications.map((n) => Notification.create(n));
-    await Notification.applyTransformations(notifications);
-    notifications.forEach((notification) => {
-      content.push(
-        new UserMenuNotificationItem({
-          notification,
-          currentUser: this.currentUser,
-          siteSettings: this.siteSettings,
-          site: this.site,
-        })
-      );
-    });
-
-    const topics = data.topics.map((t) => Topic.create(t));
-    await Topic.applyTransformations(topics);
-    content.push(...topics.map((assign) => new UserMenuAssignItem({ assign })));
-    return content;
+    return new SortedItems(await super.fetchItems()).sortedItems;
+  }
+}
+
+class SortedItems {
+  itemsSorting = [
+    "notification.read",
+    "notification.data.message:desc",
+    "notification.created_at:desc",
+  ];
+
+  @sort("items", "itemsSorting") sortedItems;
+
+  constructor(items) {
+    set(this, "items", items);
   }
 }
diff --git a/assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs b/assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
index b3bee98..0b04050 100644
--- a/assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
+++ b/assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
@@ -3,7 +3,7 @@
     {{i18n "discourse_assign.admin.groups.manage.interaction.assign"}}
   </label>
 
-  <label for="visiblity">
+  <label for="visibility">
     {{i18n
       "discourse_assign.admin.groups.manage.interaction.assignable_levels.title"
     }}
@@ -14,7 +14,7 @@
     @valueProperty="value"
     @value={{this.assignableLevel}}
     @content={{this.assignableLevelOptions}}
-    @class="groups-form-assignable-level"
     @onChange={{action (mut @outletArgs.model.assignable_level)}}
+    class="groups-form-assignable-level"
   />
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/connectors/topic-list-after-columns/assign-buttons.hbr b/assets/javascripts/discourse/connectors/topic-list-after-columns/assign-buttons.hbr
new file mode 100644
index 0000000..a0ec055
--- /dev/null
+++ b/assets/javascripts/discourse/connectors/topic-list-after-columns/assign-buttons.hbr
@@ -0,0 +1 @@
+{{raw "assign-topic-buttons" topic=context.topic}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/controllers/group-assigned-show.js b/assets/javascripts/discourse/controllers/group-assigned-show.js
index 9edba01..385d97c 100644
--- a/assets/javascripts/discourse/controllers/group-assigned-show.js
+++ b/assets/javascripts/discourse/controllers/group-assigned-show.js
@@ -1,13 +1,14 @@
-import UserTopicsList from "discourse/controllers/user-topics-list";
-import { alias } from "@ember/object/computed";
-import discourseDebounce from "discourse-common/lib/debounce";
-import { INPUT_DELAY } from "discourse-common/config/environment";
 import { inject as controller } from "@ember/controller";
-import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
+import { alias } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
+import UserTopicsList from "discourse/controllers/user-topics-list";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
 
 export default class GroupAssignedShow extends UserTopicsList {
   @service taskActions;
+  @service router;
   @controller user;
 
   queryParams = ["order", "ascending", "search"];
@@ -45,13 +46,13 @@ export default class GroupAssignedShow extends UserTopicsList {
   @action
   async unassign(targetId, targetType = "Topic") {
     await this.taskActions.unassign(targetId, targetType);
-    this.send("changeAssigned");
+    this.router.refresh();
   }
 
   @action
   reassign(topic) {
     this.taskActions.showAssignModal(topic, {
-      onSuccess: () => this.send("changeAssigned"),
+      onSuccess: () => this.router.refresh(),
     });
   }
 
diff --git a/assets/javascripts/discourse/controllers/group-assigned.js b/assets/javascripts/discourse/controllers/group-assigned.js
index 81188f1..7e0519a 100644
--- a/assets/javascripts/discourse/controllers/group-assigned.js
+++ b/assets/javascripts/discourse/controllers/group-assigned.js
@@ -1,10 +1,10 @@
-import { inject as service } from "@ember/service";
 import Controller, { inject as controller } from "@ember/controller";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
-import discourseComputed from "discourse-common/utils/decorators";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default class GroupAssigned extends Controller {
   @service router;
@@ -47,7 +47,11 @@ export default class GroupAssigned extends Controller {
     })
       .then((result) => {
         if (this.router.currentRoute.params.filter !== "everyone") {
-          this.transitionToRoute("group.assigned.show", groupName, "everyone");
+          this.router.transitionTo(
+            "group.assigned.show",
+            groupName,
+            "everyone"
+          );
         }
         this.set("members", result.members);
       })
diff --git a/assets/javascripts/discourse/controllers/user-activity-assigned.js b/assets/javascripts/discourse/controllers/user-activity-assigned.js
index 06d0e3b..7913651 100644
--- a/assets/javascripts/discourse/controllers/user-activity-assigned.js
+++ b/assets/javascripts/discourse/controllers/user-activity-assigned.js
@@ -1,14 +1,14 @@
-import UserTopicsList from "discourse/controllers/user-topics-list";
-import discourseComputed from "discourse-common/utils/decorators";
-import discourseDebounce from "discourse-common/lib/debounce";
-import { INPUT_DELAY } from "discourse-common/config/environment";
 import { inject as controller } from "@ember/controller";
-import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import UserTopicsList from "discourse/controllers/user-topics-list";
+import { INPUT_DELAY } from "discourse-common/config/environment";
+import discourseDebounce from "discourse-common/lib/debounce";
 import getURL from "discourse-common/lib/get-url";
 import { iconHTML } from "discourse-common/lib/icon-library";
+import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
-import { htmlSafe } from "@ember/template";
 
 export default class UserActivityAssigned extends UserTopicsList {
   @service taskActions;
@@ -56,19 +56,6 @@ export default class UserActivityAssigned extends UserTopicsList {
       });
   }
 
-  @action
-  async unassign(targetId, targetType = "Topic") {
-    await this.taskActions.unassign(targetId, targetType);
-    this.send("changeAssigned");
-  }
-
-  @action
-  reassign(topic) {
-    this.taskActions.showAssignModal(topic, {
-      onSuccess: () => this.send("changeAssigned"),
-    });
-  }
-
   @action
   changeSort(sortBy) {
     if (sortBy === this.order) {
diff --git a/assets/javascripts/discourse/initializers/assign-extend-user-messages.js b/assets/javascripts/discourse/initializers/assign-extend-user-messages.js
index fc51fea..c1de9d7 100644
--- a/assets/javascripts/discourse/initializers/assign-extend-user-messages.js
+++ b/assets/javascripts/discourse/initializers/assign-extend-user-messages.js
@@ -1,5 +1,5 @@
-import I18n from "I18n";
 import { withPluginApi } from "discourse/lib/plugin-api";
+import I18n from "I18n";
 
 export default {
   name: "assign-extend-user-messages",
diff --git a/assets/javascripts/discourse/initializers/assign-user-menu.js b/assets/javascripts/discourse/initializers/assign-user-menu.js
index 125aea9..6f82ee8 100644
--- a/assets/javascripts/discourse/initializers/assign-user-menu.js
+++ b/assets/javascripts/discourse/initializers/assign-user-menu.js
@@ -1,4 +1,7 @@
+import { htmlSafe } from "@ember/template";
 import { withPluginApi } from "discourse/lib/plugin-api";
+import { emojiUnescape } from "discourse/lib/text";
+import I18n from "I18n";
 import UserMenuAssignNotificationsList from "../components/user-menu/assigns-list";
 
 export default {
@@ -6,16 +9,74 @@ export default {
 
   initialize(container) {
     withPluginApi("1.2.0", (api) => {
-      if (api.registerUserMenuTab) {
-        const siteSettings = container.lookup("service:site-settings");
-        if (!siteSettings.assign_enabled) {
-          return;
-        }
+      const siteSettings = container.lookup("service:site-settings");
+      if (!siteSettings.assign_enabled) {
+        return;
+      }
 
-        const currentUser = api.getCurrentUser();
-        if (!currentUser?.can_assign) {
-          return;
-        }
+      const currentUser = api.getCurrentUser();
+      if (!currentUser?.can_assign) {
+        return;
+      }
+
+      if (api.registerNotificationTypeRenderer) {
+        api.registerNotificationTypeRenderer(
+          "assigned",
+          (NotificationItemBase) => {
+            return class extends NotificationItemBase {
+              get linkTitle() {
+                if (this.isGroup()) {
+                  return I18n.t(
+                    `user.assigned_to_group.${this.postOrTopic()}`,
+                    {
+                      group_name: this.notification.data.display_username,
+                    }
+                  );
+                }
+                return I18n.t(`user.assigned_to_you.${this.postOrTopic()}`);
+              }
+
+              get icon() {
+                return this.isGroup() ? "group-plus" : "user-plus";
+              }
+
+              get label() {
+                if (!this.isGroup()) {
+                  return "";
+                }
+                return this.notification.data.display_username;
+              }
+
+              get description() {
+                return htmlSafe(
+                  emojiUnescape(
+                    I18n.t(
+                      `user.assignment_description.${this.postOrTopic()}`,
+                      {
+                        topic_title: this.notification.fancy_title,
+                        post_number: this.notification.post_number,
+                      }
+                    )
+                  )
+                );
+              }
+
+              isGroup() {
+                return (
+                  this.notification.data.message ===
+                  "discourse_assign.assign_group_notification"
+                );
+              }
+
+              postOrTopic() {
+                return this.notification.post_number === 1 ? "topic" : "post";
+              }
+            };
+          }
+        );
+      }
+
+      if (api.registerUserMenuTab) {
         api.registerUserMenuTab((UserMenuTab) => {
           return class extends UserMenuTab {
             id = "assign-list";
diff --git a/assets/javascripts/discourse/initializers/extend-for-assigns.js b/assets/javascripts/discourse/initializers/extend-for-assigns.js
index 9a283c1..0f9d35b 100644
--- a/assets/javascripts/discourse/initializers/extend-for-assigns.js
+++ b/assets/javascripts/discourse/initializers/extend-for-assigns.js
@@ -1,17 +1,17 @@
+import { getOwner } from "@ember/application";
+import { htmlSafe } from "@ember/template";
+import { isEmpty } from "@ember/utils";
+import { h } from "virtual-dom";
+import SearchAdvancedOptions from "discourse/components/search-advanced-options";
 import { renderAvatar } from "discourse/helpers/user-avatar";
 import { withPluginApi } from "discourse/lib/plugin-api";
-import discourseComputed from "discourse-common/utils/decorators";
-import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
-import { escapeExpression } from "discourse/lib/utilities";
-import { h } from "virtual-dom";
-import { getOwner } from "discourse-common/lib/get-owner";
-import { htmlSafe } from "@ember/template";
-import getURL from "discourse-common/lib/get-url";
-import SearchAdvancedOptions from "discourse/components/search-advanced-options";
-import I18n from "I18n";
-import { isEmpty } from "@ember/utils";
 import { registerTopicFooterDropdown } from "discourse/lib/register-topic-footer-dropdown";
+import { escapeExpression } from "discourse/lib/utilities";
 import RawHtml from "discourse/widgets/raw-html";
+import getURL from "discourse-common/lib/get-url";
+import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
+import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
 import BulkAssign from "../components/bulk-actions/assign-user";
 
 const PLUGIN_ID = "discourse-assign";
@@ -409,7 +409,7 @@ function registerTopicFooterButtons(api) {
 }
 
 function initialize(api) {
-  const siteSettings = api.container.lookup("site-settings:main");
+  const siteSettings = api.container.lookup("service:site-settings");
   const currentUser = api.getCurrentUser();
 
   if (siteSettings.assigns_public || currentUser?.can_assign) {
@@ -616,7 +616,6 @@ function initialize(api) {
         topicAssignee,
         assignedToIndirectly.map((assigned) => ({
           assignee: assigned.assigned_to,
-          status: assigned.assignment_status,
           note: assigned.assignment_note,
         }))
       )
@@ -879,12 +878,12 @@ export default {
   name: "extend-for-assign",
 
   initialize(container) {
-    const siteSettings = container.lookup("site-settings:main");
+    const siteSettings = container.lookup("service:site-settings");
     if (!siteSettings.assign_enabled) {
       return;
     }
 
-    const currentUser = container.lookup("current-user:main");
+    const currentUser = container.lookup("service:current-user");
     if (currentUser?.can_assign) {
       SearchAdvancedOptions.reopen({
         updateSearchTermForAssignedUsername() {
@@ -928,57 +927,23 @@ export default {
 
       api.addUserSearchOption("assignableGroups");
 
-      if (api.addBulkActionButton) {
-        api.addBulkActionButton({
-          label: "topics.bulk.assign",
-          icon: "user-plus",
-          class: "btn-default assign-topics",
-          action({ setComponent }) {
-            setComponent(BulkAssign);
-          },
-        });
+      api.addBulkActionButton({
+        label: "topics.bulk.assign",
+        icon: "user-plus",
+        class: "btn-default assign-topics",
+        action({ setComponent }) {
+          setComponent(BulkAssign);
+        },
+      });
 
-        api.addBulkActionButton({
-          label: "topics.bulk.unassign",
-          icon: "user-times",
-          class: "btn-default unassign-topics",
-          action({ performAndRefresh }) {
-            performAndRefresh({ type: "unassign" });
-          },
-        });
-      } else {
-        // TODO: Remove this path after core 3.1.0.beta7 is released
-        const {
-          default: TopicButtonAction,
-          addBulkButton,
-        } = require("discourse/controllers/topic-bulk-actions");
-
-        TopicButtonAction.reopen({
-          actions: {
-            showReAssign() {
-              const controller = getOwner(this).lookup(
-                "controller:bulk-assign"
-              );
-              controller.set("model", { username: "", note: "" });
-              this.send("changeBulkTemplate", "modal/bulk-assign");
-            },
-
-            unassignTopics() {
-              this.performAndRefresh({ type: "unassign" });
-            },
-          },
-        });
-
-        addBulkButton("showReAssign", "assign", {
-          icon: "user-plus",
-          class: "btn-default assign-topics",
-        });
-
-        addBulkButton("unassignTopics", "unassign", {
-          icon: "user-times",
-          class: "btn-default unassign-topics",
-        });
-      }
+      api.addBulkActionButton({
+        label: "topics.bulk.unassign",
+        icon: "user-times",
+        class: "btn-default unassign-topics",
+        action({ performAndRefresh }) {
+          performAndRefresh({ type: "unassign" });
+        },
+      });
     });
   },
 };
diff --git a/assets/javascripts/discourse/lib/user-menu/assign-item.js b/assets/javascripts/discourse/lib/user-menu/assign-item.js
deleted file mode 100644
index 8440e82..0000000
--- a/assets/javascripts/discourse/lib/user-menu/assign-item.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import UserMenuBaseItem from "discourse/lib/user-menu/base-item";
-import { postUrl } from "discourse/lib/utilities";
-import { htmlSafe } from "@ember/template";
-import { emojiUnescape } from "discourse/lib/text";
-import I18n from "I18n";
-
-const ICON = "user-plus";
-const GROUP_ICON = "group-plus";
-
-export default class UserMenuAssignItem extends UserMenuBaseItem {
-  constructor({ assign }) {
-    super(...arguments);
-    this.assign = assign;
-  }
-
-  get className() {
-    return "assign";
-  }
-
-  get linkHref() {
-    return postUrl(
-      this.assign.slug,
-      this.assign.id,
-      (this.assign.last_read_post_number || 0) + 1
-    );
-  }
-
-  get linkTitle() {
-    if (this.assign.assigned_to_group) {
-      return I18n.t("user.assigned_to_group", {
-        group_name:
-          this.assign.assigned_to_group.full_name ||
-          this.assign.assigned_to_group.name,
-      });
-    } else {
-      return I18n.t("user.assigned_to_you");
-    }
-  }
-
-  get icon() {
-    if (this.assign.assigned_to_group) {
-      return GROUP_ICON;
-    } else {
-      return ICON;
-    }
-  }
-
-  get label() {
-    return null;
-  }
-
-  get description() {
-    return htmlSafe(emojiUnescape(this.assign.fancy_title));
-  }
-
-  get topicId() {
-    return this.assign.id;
-  }
-}
diff --git a/assets/javascripts/discourse/pre-initializers/extend-category-for-assign.js b/assets/javascripts/discourse/pre-initializers/extend-category-for-assign.js
index 2df3b14..1c59295 100644
--- a/assets/javascripts/discourse/pre-initializers/extend-category-for-assign.js
+++ b/assets/javascripts/discourse/pre-initializers/extend-category-for-assign.js
@@ -1,5 +1,5 @@
-import Category from "discourse/models/category";
 import { computed } from "@ember/object";
+import Category from "discourse/models/category";
 
 export default {
   name: "extend-category-for-assign",
diff --git a/assets/javascripts/discourse/raw-templates/assign-topic-buttons.hbr b/assets/javascripts/discourse/raw-templates/assign-topic-buttons.hbr
new file mode 100644
index 0000000..82b20e1
--- /dev/null
+++ b/assets/javascripts/discourse/raw-templates/assign-topic-buttons.hbr
@@ -0,0 +1 @@
+{{{view.html}}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/raw-views/assign-topic-buttons.gjs b/assets/javascripts/discourse/raw-views/assign-topic-buttons.gjs
new file mode 100644
index 0000000..cbf7340
--- /dev/null
+++ b/assets/javascripts/discourse/raw-views/assign-topic-buttons.gjs
@@ -0,0 +1,21 @@
+import EmberObject from "@ember/object";
+import { inject as service } from "@ember/service";
+import rawRenderGlimmer from "discourse/lib/raw-render-glimmer";
+import AssignedTopicListColumn from "../components/assigned-topic-list-column";
+
+const ASSIGN_LIST_ROUTES = ["userActivity.assigned", "group.assigned.show"];
+
+export default class extends EmberObject {
+  @service router;
+
+  get html() {
+    if (ASSIGN_LIST_ROUTES.includes(this.router.currentRouteName)) {
+      return rawRenderGlimmer(
+        this,
+        "td.assign-topic-buttons",
+        <template><AssignedTopicListColumn @topic={{@data.topic}} /></template>,
+        { topic: this.topic }
+      );
+    }
+  }
+}
diff --git a/assets/javascripts/discourse/routes/group-assigned-show.js b/assets/javascripts/discourse/routes/group-assigned-show.js
index e560b70..fddc378 100644
--- a/assets/javascripts/discourse/routes/group-assigned-show.js
+++ b/assets/javascripts/discourse/routes/group-assigned-show.js
@@ -1,13 +1,7 @@
-import DiscourseRoute from "discourse/routes/discourse";
 import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
+import DiscourseRoute from "discourse/routes/discourse";
 
 export default class GroupAssignedShow extends DiscourseRoute {
-  beforeModel(transition) {
-    if (transition.from?.localName === "show") {
-      this.session.set("topicListScrollPosition", 1);
-    }
-  }
-
   model(params) {
     let filter;
     if (["everyone", this.modelFor("group").name].includes(params.filter)) {
@@ -36,8 +30,4 @@ export default class GroupAssignedShow extends DiscourseRoute {
       search: this.currentModel.params.search,
     });
   }
-
-  renderTemplate() {
-    this.render("group-topics-list");
-  }
 }
diff --git a/assets/javascripts/discourse/routes/group-assigned.js b/assets/javascripts/discourse/routes/group-assigned.js
index c6352f2..64702e7 100644
--- a/assets/javascripts/discourse/routes/group-assigned.js
+++ b/assets/javascripts/discourse/routes/group-assigned.js
@@ -1,8 +1,10 @@
-import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
-import { action } from "@ember/object";
+import DiscourseRoute from "discourse/routes/discourse";
 
 export default class GroupAssigned extends DiscourseRoute {
+  @service router;
+
   model() {
     return ajax(`/assign/members/${this.modelFor("group").name}`);
   }
@@ -22,15 +24,8 @@ export default class GroupAssigned extends DiscourseRoute {
   }
 
   redirect(model, transition) {
-    if (transition.to.params.hasOwnProperty("filter")) {
-      this.transitionTo("group.assigned.show", transition.to.params.filter);
-    } else {
-      this.transitionTo("group.assigned.show", "everyone");
+    if (!transition.to.params.hasOwnProperty("filter")) {
+      this.router.transitionTo("group.assigned.show", "everyone");
     }
   }
-
-  @action
-  changeAssigned() {
-    this.refresh();
-  }
 }
diff --git a/assets/javascripts/discourse/routes/user-activity-assigned.js b/assets/javascripts/discourse/routes/user-activity-assigned.js
index daca621..0e1fd6d 100644
--- a/assets/javascripts/discourse/routes/user-activity-assigned.js
+++ b/assets/javascripts/discourse/routes/user-activity-assigned.js
@@ -1,9 +1,10 @@
-import I18n from "I18n";
-import UserTopicListRoute from "discourse/routes/user-topic-list";
+import { inject as service } from "@ember/service";
 import cookie from "discourse/lib/cookie";
-import { action } from "@ember/object";
+import UserTopicListRoute from "discourse/routes/user-topic-list";
+import I18n from "I18n";
 
 export default class UserActivityAssigned extends UserTopicListRoute {
+  @service router;
   templateName = "user-activity-assigned";
   controllerName = "user-activity-assigned";
 
@@ -13,7 +14,7 @@ export default class UserActivityAssigned extends UserTopicListRoute {
   beforeModel() {
     if (!this.currentUser) {
       cookie("destination_url", window.location.href);
-      this.transitionTo("login");
+      this.router.transitionTo("login");
     }
   }
 
@@ -34,9 +35,4 @@ export default class UserActivityAssigned extends UserTopicListRoute {
   titleToken() {
     return I18n.t("discourse_assign.assigned");
   }
-
-  @action
-  changeAssigned() {
-    this.refresh();
-  }
 }
diff --git a/assets/javascripts/discourse/services/task-actions.js b/assets/javascripts/discourse/services/task-actions.js
index aaf09fc..573de16 100644
--- a/assets/javascripts/discourse/services/task-actions.js
+++ b/assets/javascripts/discourse/services/task-actions.js
@@ -1,9 +1,9 @@
-import Service, { inject as service } from "@ember/service";
-import { ajax } from "discourse/lib/ajax";
-import AssignUser from "../components/modal/assign-user";
 import { tracked } from "@glimmer/tracking";
+import Service, { inject as service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
+import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import AssignUser from "../components/modal/assign-user";
 
 export default class TaskActions extends Service {
   @service modal;
diff --git a/assets/javascripts/discourse/templates/group-topics-list.hbs b/assets/javascripts/discourse/templates/group-assigned-show.hbs
similarity index 94%
rename from assets/javascripts/discourse/templates/group-topics-list.hbs
rename to assets/javascripts/discourse/templates/group-assigned-show.hbs
index ac5e0f4..8356269 100644
--- a/assets/javascripts/discourse/templates/group-topics-list.hbs
+++ b/assets/javascripts/discourse/templates/group-assigned-show.hbs
@@ -1,22 +1,22 @@
 <div class="topic-search-div">
   <div class="inline-form full-width">
     <Input
-      class="no-blur"
+      {{on "input" (action "onChangeFilter" value="target.value")}}
       @value={{readonly this.search}}
+      @type="search"
       placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
       autocomplete="off"
-      @type="search"
-      {{on "input" (action "onChangeFilter" value="target.value")}}
+      class="no-blur"
     />
   </div>
 </div>
 
 <LoadMore
-  @class="paginated-topics-list"
   @selector=".paginated-topics-list .topic-list tr"
   @action={{action "loadMore"}}
+  class="paginated-topics-list"
 >
-  <BasicAssignedTopicList
+  <BasicTopicList
     @topicList={{this.model}}
     @hideCategory={{this.hideCategory}}
     @showPosters={{this.showPosters}}
diff --git a/assets/javascripts/discourse/templates/group/assigned.hbs b/assets/javascripts/discourse/templates/group/assigned.hbs
index 05c1a75..2c8e22f 100644
--- a/assets/javascripts/discourse/templates/group/assigned.hbs
+++ b/assets/javascripts/discourse/templates/group/assigned.hbs
@@ -1,18 +1,18 @@
 <section class="user-secondary-navigation group-assignments">
   <MobileNav
-    @class="activity-nav"
     @desktopClass="action-list activity-list nav-stacked"
+    class="activity-nav"
   >
     {{#if this.isDesktop}}
       <div class="search-div">
         <Input
+          {{on "input" (action this.onChangeFilterName value="target.value")}}
           @type="text"
+          @value={{readonly this.filterName}}
           placeholder={{i18n
             "discourse_assign.sidebar_name_filter_placeholder"
           }}
-          @value={{readonly this.filterName}}
           class="search"
-          {{on "input" (action this.onChangeFilterName value="target.value")}}
         />
       </div>
     {{/if}}
diff --git a/assets/javascripts/discourse/templates/user-activity-assigned.hbs b/assets/javascripts/discourse/templates/user-activity-assigned.hbs
index 8f73799..494b6f2 100644
--- a/assets/javascripts/discourse/templates/user-activity-assigned.hbs
+++ b/assets/javascripts/discourse/templates/user-activity-assigned.hbs
@@ -7,22 +7,22 @@
   <div class="topic-search-div">
     <div class="inline-form full-width">
       <Input
+        {{on "input" (action "onChangeFilter" value="target.value")}}
         @value={{readonly this.search}}
         @type="search"
-        {{on "input" (action "onChangeFilter" value="target.value")}}
-        class="no-blur"
         placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
         autocomplete="off"
+        class="no-blur"
       />
     </div>
   </div>
 
   <LoadMore
-    @class="paginated-topics-list"
     @selector=".paginated-topics-list .topic-list tr"
     @action={{action "loadMore"}}
+    class="paginated-topics-list"
   >
-    <BasicAssignedTopicList
+    <BasicTopicList
       @topicList={{this.model}}
       @hideCategory={{this.hideCategory}}
       @showPosters={{true}}
diff --git a/assets/stylesheets/assigns.scss b/assets/stylesheets/assigns.scss
index 7cad73c..bc9db18 100644
--- a/assets/stylesheets/assigns.scss
+++ b/assets/stylesheets/assigns.scss
@@ -66,12 +66,8 @@
   margin-left: 5px;
 }
 
-.modal.assign {
-  .modal-inner-container {
-    width: 400px;
-  }
-
-  .modal-body {
+.d-modal.assign {
+  .d-modal__body {
     overflow-y: unset;
   }
 
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index d1f57af..df92efb 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 ar:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "تعيين Discourse"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ ar:
       assigned_to: "معيَّنة إلى"
       assigned_topic_to: "تم تعيين الموضوع إلى المستخدم <a href='%{path}'>%{username}</a>"
       assign_post_to: "تم تعيين المنشور #%{post_number} إلى المستخدم %{username}"
+      assign_post_to_multiple: "#%{post_number} إلى %{username}"
       assigned_to_w_ellipsis: "معيَّنة إلى..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "إلغاء التعيين"
         title_w_ellipsis: "إلغاء تعيين..."
@@ -99,13 +103,21 @@ ar:
       no_assignments_body: >
         سيتم إدراج الموضوعات والرسائل المعيَّنة إليك هنا. ستتلقى أيضًا إشعار تذكير دوريًا بتعييناتك، والذي يمكنك تعديله في <a href='%{preferencesUrl}'>تفضيلات المستخدم</a>. <br><br> لتعيين موضوع أو رسالة إلى نفسك أو إلى شخص آخر، ابحث عن %{icon} في الأسفل.
       dismiss_assigned_tooltip: "وضع علامة مقروءة على كل إشعارات التعيين"
-      assigned_to_group: "معيَّن إلى %{group_name}"
-      assigned_to_you: "معيَّنة إليك"
+      assigned_to_group:
+        post: "تم تعيين المنشور إلى %{group_name}"
+        topic: "تم تعيين الموضوع إلى %{group_name}"
+      assigned_to_you:
+        post: "تم تعيين المنشور إليك"
+        topic: "تم تعيين الموضوع إليك"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "تعيين الحدث"
-          details: "عندما يعيِّن مستخدم موضوعًا أو يلغي تعيينه."
+          group_name: "أحداث التعيين"
+          assigned: "عندما يقوم المستخدم بتعيين موضوع"
+          unassigned: "عندما يلغي المستخدم تعيين موضوع"
     search:
       advanced:
         in:
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 78a9f72..bebe511 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -23,6 +23,8 @@ be:
     user:
       messages:
         assigned: "прызначаны"
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       titles:
         assigned: "прызначаны"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index c1aaf95..f42163a 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -22,8 +22,6 @@ ca:
       group_everyone: "Tothom"
       assigned_to: "Assignat a"
       assigned_to_w_ellipsis: "Assignat a..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Desassigna"
         title_w_ellipsis: "Desassigna..."
@@ -60,6 +58,8 @@ ca:
       messages:
         assigned_title: "Assignats (%{count})"
         assigned: "Assignats"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 044a4ac..5da7ec2 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -5,13 +5,40 @@
 # https://translate.discourse.org/
 
 cs:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse Assign"
   js:
+    filters:
+      unassigned:
+        title: "Nepřiděleno"
+        help: "Témata, která nejsou přidělena"
     action_codes:
       assigned: "Zadáno %{who} %{when}"
       assigned_group: "Zadáno %{who} %{when}"
+      assigned_to_post: "Uživateli %{who} přidělen <a href='%{path}'>příspěvek</a> %{when}"
+      assigned_group_to_post: "Skupině %{who} přidělen <a href='%{path}'>příspěvek</a> %{when}"
+      unassigned: "%{who} zrušeno přidělení %{when}"
+      unassigned_group: "%{who} zrušeno přidělení %{when}"
+      unassigned_from_post: "Uživateli %{who} zrušeno přidělení <a href='%{path}'>příspěvku</a> %{when}"
+      unassigned_group_from_post: "Skupině %{who} zrušeno přidělení <a href='%{path}'>příspěvku</a> %{when}"
+      reassigned: "Uživateli %{who} znovu přiděleno %{when}"
+      reassigned_group: "Skupině %{who} znovu přiděleno %{when}"
+      details_change: "Změněny podrobnosti přidělení pro %{who} %{when}"
+      note_change: "Změněna poznámka přidělení pro %{who} %{when}"
+      status_change: "Změněn stav přidělení pro %{who} %{when}"
     discourse_assign:
+      add_unassigned_filter: "Přidat do kategorie filtr \"Nepřiděleno\""
+      cant_act: "Nemůžete reagovat na nahlášení, která byla přiřazena jiným uživatelům"
+      cant_act_unclaimed: "Než začnete reagovat na nahlášení, musíte si toto téma nárokovat."
+      topic_search_placeholder: "Hledat témata podle názvu nebo obsahu příspěvku"
+      sidebar_name_filter_placeholder: "Jméno/Uživatelské jméno"
       assigned: "Zadáno"
       group_everyone: "Všichni"
+      assigned_to: "Přiděleno"
+      assigned_topic_to: "Téma přiděleno <a href='%{path}'>%{username}</a>"
       unassign:
         title: "Odebrat zadání"
         title_w_ellipsis: "Odebrat zadání..."
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index c1d56fa..f37fe1a 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -27,8 +27,6 @@ da:
       group_everyone: "Alle"
       assigned_to: "Tildelt til"
       assigned_to_w_ellipsis: "Tildelt til..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Fjern tildeling"
         title_w_ellipsis: "Fjern tildeling..."
@@ -66,11 +64,8 @@ da:
       messages:
         assigned_title: "Tildelt (%{count})"
         assigned: "Tildelt"
-    admin:
-      web_hooks:
-        assign_event:
-          name: "Tildel Begivenhed"
-          details: "Når en bruger tildeler eller fradeler et emne."
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         in:
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index d282622..2f89d6e 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 de:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse – Zuordnen"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ de:
       assigned_to: "Zugeordnet zu"
       assigned_topic_to: "Thema zugeordnet zu <a href='%{path}'>%{username}</a>"
       assign_post_to: "#%{post_number} %{username} zugeordnet"
+      assign_post_to_multiple: "#%{post_number} zu %{username}"
       assigned_to_w_ellipsis: "Zugeordnet zu …"
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Zuordnung aufheben"
         title_w_ellipsis: "Zuordnung aufheben …"
@@ -99,13 +103,21 @@ de:
       no_assignments_body: >
         Deine zugeordneten Themen und Nachrichten werden hier aufgelistet. Außerdem erhältst du regelmäßig eine Erinnerungsbenachrichtigung betreffend deine Zuordnungen, die du in deinen <a href='%{preferencesUrl}'>Benutzereinstellungen</a> anpassen kannst. <br><br> Um dir selbst oder einer anderen Person ein Thema oder eine Nachricht zuzuordnen, verwende die Zuordnungsschaltfläche %{icon} unten.
       dismiss_assigned_tooltip: "Alle ungelesenen Zuordnungsbenachrichtigungen als gelesen markieren"
-      assigned_to_group: "%{group_name} zugeordnet"
-      assigned_to_you: "dir zugeordnet"
+      assigned_to_group:
+        post: "Beitrag zugeordnet zu %{group_name}"
+        topic: "Thema zugeordnet zu %{group_name}"
+      assigned_to_you:
+        post: "Beitrag wurde dir zugeordnet"
+        topic: "Thema wurde dir zugeordnet"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Ereignis zuordnen"
-          details: "Wenn ein Benutzer ein Thema zuordnet oder die Zuordnung aufhebt."
+          group_name: "Ereignisse zuordnen"
+          assigned: "Wenn ein Benutzer ein Thema zuordnet"
+          unassigned: "Wenn ein Benutzer die Zuordnung eines Themas aufhebt"
     search:
       advanced:
         in:
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 0d9feb2..c1fe847 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -22,5 +22,8 @@ el:
         weekly: "Εβδομαδιαία"
         monthly: "Μηνιαία"
         quarterly: "Τριμηνιαία"
+    user:
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       assigned: "<span>%{username}</span> %{description}"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 14b47b6..b079061 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1,4 +1,9 @@
 en:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse Assign"
   js:
     filters:
       unassigned:
@@ -32,8 +37,6 @@ en:
       # assign_post_to_multiple used in list form, example: "Assigned topic to username0, [#2 to username1], [#10 to username2]"
       assign_post_to_multiple: "#%{post_number} to %{username}"
       assigned_to_w_ellipsis: "Assigned to..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Unassign"
         title_w_ellipsis: "Unassign..."
@@ -97,13 +100,21 @@ en:
         <br><br>
         To assign a topic or message to yourself or to someone else, look for the %{icon} assign button at the bottom.
       dismiss_assigned_tooltip: "Mark all unread assign notifications as read"
-      assigned_to_group: "assigned to %{group_name}"
-      assigned_to_you: "assigned to you"
+      assigned_to_group:
+        post: "post assigned to %{group_name}"
+        topic: "topic assigned to %{group_name}"
+      assigned_to_you:
+        post: "post assigned to you"
+        topic: "topic assigned to you"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Assign Event"
-          details: "When a user assigns or unassigns a topic."
+          group_name: "Assign Events"
+          assigned: "When an user assigns a topic"
+          unassigned: "When an user unassigns a topic"
     search:
       advanced:
         in:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 4339f9d..5960254 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 es:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Asignación de Discourse"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ es:
       assigned_to: "Asignado a"
       assigned_topic_to: "Tema asignado a <a href='%{path}'>%{username}</a>"
       assign_post_to: "Asignado #%{post_number} a %{username}"
+      assign_post_to_multiple: "#%{post_number} a %{username}"
       assigned_to_w_ellipsis: "Asignado a..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Anular asignación"
         title_w_ellipsis: "Anular asignación..."
@@ -99,13 +103,21 @@ es:
       no_assignments_body: >
         Tus temas y mensajes asignados aparecerán aquí. También recibirás una notificación periódica de recordatorio de tus asignaciones, que puedes ajustar en tus <a href='%{preferencesUrl}'>preferencias de usuario</a>. <br><br> Para asignar un tema o mensaje a ti mismo o a otra persona, busca el botón %{icon} de asignar en la parte inferior.
       dismiss_assigned_tooltip: "Marcar todas las notificaciones de asignación no leídas como leídas"
-      assigned_to_group: "asignada a %{group_name}"
-      assigned_to_you: "asignada a ti"
+      assigned_to_group:
+        post: "publicación asignada a %{group_name}"
+        topic: "tema asignado a %{group_name}"
+      assigned_to_you:
+        post: "publicación asignada a ti"
+        topic: "tema asignado a ti"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Asignar evento"
-          details: "Cuando un usuario asigna o anula la asignación de un tema."
+          group_name: "Asignar eventos"
+          assigned: "Cuando un usuario asigna un tema"
+          unassigned: "Cuando un usuario anula la asignación de un tema"
     search:
       advanced:
         in:
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 2cb7a6c..02cd39d 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -42,6 +42,8 @@ et:
     user:
       messages:
         assigned: "Määratud"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index daf4f64..01e6058 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -31,5 +31,8 @@ fa_IR:
         weekly: "هفتگی"
         monthly: "ماهانه"
         quarterly: "فصلی"
+    user:
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       assigned: "<span>%{username}</span> %{description}"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index acf5e4d..389e1c5 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 fi:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse-osoitus"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ fi:
       assigned_to: "Osoitettu käyttäjälle"
       assigned_topic_to: "Osoitti ketjun käyttäjälle <a href='%{path}'>%{username}</a>"
       assign_post_to: "Osoitti viestin %{post_number} käyttäjälle %{username}"
+      assign_post_to_multiple: "#%{post_number} käyttäjälle %{username}"
       assigned_to_w_ellipsis: "Osoitettu käyttäjälle..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Peru osoitus"
         title_w_ellipsis: "Peru osoitus..."
@@ -99,13 +103,21 @@ fi:
       no_assignments_body: >
         Sinulle osoitetut ketjut ja viestit luetellaan tässä. Saat myös ajoittain muistutusilmoituksia osoituksistasi, joita voit muuttaa <a href='%{preferencesUrl}'>käyttäjäasetuksissasi</a>. <br><br> Jos haluat osoittaa ketjun tai viestin itsellesi tai jollekulle toiselle, etsi osoituspainike %{icon} alaosasta.
       dismiss_assigned_tooltip: "Merkitse kaikki lukemattomat osoitusilmoitukset luetuiksi"
-      assigned_to_group: "osoitettu ryhmälle %{group_name}"
-      assigned_to_you: "osoitettu sinulle"
+      assigned_to_group:
+        post: "viesti osoitettu ryhmälle %{group_name}"
+        topic: "ketju osoitettu ryhmälle %{group_name}"
+      assigned_to_you:
+        post: "viesti osoitettu sinulle"
+        topic: "ketju osoitettu sinulle"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Osoitustapahtuma"
-          details: "Kun käyttäjä osoittaa ketjun tai peruu ketjun osoituksen."
+          group_name: "Osoitustapahtumat"
+          assigned: "Kun käyttäjä osoittaa ketjun"
+          unassigned: "Kun käyttäjä peruu ketjun osoituksen"
     search:
       advanced:
         in:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 58bba2f..6107e5f 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 fr:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Affectation de Discourse"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ fr:
       assigned_to: "Attribué à"
       assigned_topic_to: "A attribué le message à <a href='%{path}'>%{username}</a>"
       assign_post_to: "A attribué %{post_number} à %{username}"
+      assign_post_to_multiple: "#%{post_number} à %{username}"
       assigned_to_w_ellipsis: "Attribué à…"
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Annuler l'attribution"
         title_w_ellipsis: "Annuler l'attribution…"
@@ -99,13 +103,21 @@ fr:
       no_assignments_body: >
         Vos sujets et messages attribués seront répertoriés ici. Vous recevrez également une notification de rappel périodique de vos attributions que vous pouvez ajuster dans vos <a href='%{preferencesUrl}'>préférences d'utilisateur</a>. <br><br> Pour attribuer un sujet ou un message à vous-même ou à quelqu'un d'autre, recherchez le bouton d'attribution %{icon} en bas de l'écran.
       dismiss_assigned_tooltip: "Marquer toutes les notifications d'attribution non lues comme lues"
-      assigned_to_group: "attribué à %{group_name}"
-      assigned_to_you: "attribué à vous"
+      assigned_to_group:
+        post: "message attribué à %{group_name}"
+        topic: "sujet attribué à %{group_name}"
+      assigned_to_you:
+        post: "message attribué à vous"
+        topic: "sujet attribué à vous"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Événement d'attribution"
-          details: "Lorsqu'un utilisateur attribue ou annule l'attribution d'un sujet."
+          group_name: "Événements d'attribution"
+          assigned: "Lorsqu'un utilisateur attribue un sujet"
+          unassigned: "Lorsqu'un utilisateur annule l'attribution d'un sujet"
     search:
       advanced:
         in:
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 1e72729..a3c9505 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -26,6 +26,8 @@ gl:
     user:
       messages:
         assigned: "Asignado"
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       assigned: "<span>%{username}</span> %{description}"
       titles:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 172b87d..50efb0e 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 he:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse הקצאה"
   js:
     filters:
       unassigned:
@@ -37,8 +42,6 @@ he:
       assign_post_to: "מס׳ %{post_number} הוקצה לטובת %{username}"
       assign_post_to_multiple: "מס׳ %{post_number} אל %{username}"
       assigned_to_w_ellipsis: "מוקצה לטובת..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "ביטול הקצאה"
         title_w_ellipsis: "ביטול הקצאה..."
@@ -100,13 +103,21 @@ he:
       no_assignments_body: >
         הנושאים שמוקצים אליך יופיעו כאן. תישלחנה אליך הודעות תזכורת מדי פעם בפעם כדי להזכיר לך את המטלות שלך, ניתן להגדיר אותן <a href='%{preferencesUrl}'>בהעדפות המשתמש</a> שלך. <br><br> כדי להקצות נושא או הודעה לעצמך או למישהו אחר יש לחפש את הכפתור %{icon} הקצאה למטה.
       dismiss_assigned_tooltip: "סימון כל התראות ההקצאה שלא נקראו כהתראות שנקראו"
-      assigned_to_group: "מוקצה לטובת %{group_name}"
-      assigned_to_you: "מוקצה לך"
+      assigned_to_group:
+        post: "הפוסט הוקצה לטובת %{group_name}"
+        topic: "הנושא הוקצה לטובת %{group_name}"
+      assigned_to_you:
+        post: "הפוסט הוקצה לך"
+        topic: "הנושא הוקצה לך"
+      assignment_description:
+        post: "%{topic_title} (מס׳ %{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "הקצאת אירוע"
-          details: "כאשר משתמש מקצה או מבטל הקצאה של נושא."
+          group_name: "הקצאת אירועים"
+          assigned: "בעת הקצאת נושא על ידי משתמש"
+          unassigned: "בעת ביטול הקצאת נושא על ידי משתמש"
     search:
       advanced:
         in:
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 0014491..3905dca 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -31,8 +31,6 @@ hu:
       group_everyone: "Mindenki"
       assigned_to: "Kiosztva:"
       assigned_to_w_ellipsis: "Kiosztva…"
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Elvétel"
         title_w_ellipsis: "Elvétel…"
@@ -87,11 +85,8 @@ hu:
       no_assignments_title: "Még nincsenek kiosztott feladatai"
       no_assignments_body: >
         A kiosztott témák és üzenetek itt jelennek meg. Rendszeresen kap egy emlékeztető értesítést is a kiosztott feladatokról, amelyeket a <a href='%{preferencesUrl}'>felhasználói beállításokban</a> módosíthat. <br><br>Téma vagy üzenet saját magának vagy valaki másnak történő kiosztásához keresse a lenti %{icon} kiosztás gombot.
-    admin:
-      web_hooks:
-        assign_event:
-          name: "Esemény kiosztása"
-          details: "Amikor egy felhasználó kioszt vagy elvesz egy témát."
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 504b856..eb61c80 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -52,6 +52,8 @@ hy:
       messages:
         assigned_title: "Վերագրված (%{count})"
         assigned: "Վերագրված"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 39be35c..74c504e 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 it:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Assegnazione Discourse"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ it:
       assigned_to: "Assegnato a"
       assigned_topic_to: "Argomento assegnato a <a href='%{path}'>%{username}</a>"
       assign_post_to: "#%{post_number} assegnato a %{username}"
+      assign_post_to_multiple: "n°%{post_number} a %{username}"
       assigned_to_w_ellipsis: "Assegnato a..."
-      assign_notification: "<p> <span>%{username}</span> %{description} </p>"
-      assign_group_notification: "<p> <span>%{username}</span> %{description} </p>"
       unassign:
         title: "Annulla assegnazione"
         title_w_ellipsis: "Annullamento assegnazione..."
@@ -99,13 +103,21 @@ it:
       no_assignments_body: >
         Gli argomenti e i messaggi a te assegnati verranno elencati qui. Riceverai anche una notifica di promemoria periodica delle tue assegnazioni, che puoi modificare nelle tue <a href='%{preferencesUrl}'>preferenze utente</a>. <br><br> Per assegnare un argomento o un messaggio a te stesso o a qualcun altro, cerca il pulsante Assegna %{icon} in fondo.
       dismiss_assigned_tooltip: "Imposta tutte le notifiche di assegnazione non lette come lette"
-      assigned_to_group: "assegnato a %{group_name}"
-      assigned_to_you: "assegnato a te"
+      assigned_to_group:
+        post: "messaggio assegnato a %{group_name}"
+        topic: "argomento assegnato a %{group_name}"
+      assigned_to_you:
+        post: "messaggio assegnato a te"
+        topic: "argomento assegnato a te"
+      assignment_description:
+        post: "%{topic_title} (n°%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Evento di assegnazione"
-          details: "Quando un utente assegna o annulla l'assegnazione di un argomento."
+          group_name: "Assegna eventi"
+          assigned: "Quando un utente assegna un argomento"
+          unassigned: "Quando un utente rimuove l'assegnazione di un argomento"
     search:
       advanced:
         in:
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 1b15a57..a35b37f 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 ja:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse 割り当て"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ ja:
       assigned_to: "割り当て先"
       assigned_topic_to: "トピックを <a href='%{path}'>%{username}</a> に割り当てました"
       assign_post_to: "#%{post_number} を %{username} に割り当てました"
+      assign_post_to_multiple: "#%{post_number} を %{username}"
       assigned_to_w_ellipsis: "割り当て先..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "割り当て解除"
         title_w_ellipsis: "割り当て解除..."
@@ -99,13 +103,21 @@ ja:
       no_assignments_body: >
         割り当てられたトピックとメッセージがここに一覧表示されます。また、割り当てのリマインダーが定期的に通知されます。この通知頻度は<a href='%{preferencesUrl}'>ユーザー設定</a>で変更できます。 <br><br>トピックまたはメッセージを自分または別のユーザーに割り当てるには、下にある %{icon} 割り当てボタンを探してください。
       dismiss_assigned_tooltip: "すべての未読の割り当てを既読にします"
-      assigned_to_group: "が %{group_name} に割り当てました"
-      assigned_to_you: "があなたに割り当てました"
+      assigned_to_group:
+        post: "%{group_name} に割り当てられた投稿"
+        topic: "%{group_name} に割り当てられたトピック"
+      assigned_to_you:
+        post: "あなたに割り当てられた投稿"
+        topic: "あなたに割り当てらたトピック"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "割り当てイベント"
-          details: "ユーザーがトピックを割り当てたか割り当てを解除したとき。"
+          group_name: "割り当てイベント"
+          assigned: "ユーザーがトピックを割り当てたとき"
+          unassigned: "ユーザーがトピックの割り当てを解除したとき"
     search:
       advanced:
         in:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 2c7c312..1741e43 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -59,11 +59,8 @@ ko:
       messages:
         assigned_title: "할당됨 (%{count})"
         assigned: "할당됨"
-    admin:
-      web_hooks:
-        assign_event:
-          name: "이벤트 할당"
-          details: "사용자가 주제를 할당 또는 할당 해제 할 때"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 817f2d6..18c6aaf 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -31,6 +31,8 @@ lt:
     user:
       messages:
         assigned: "Priskirta"
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       assigned: "<span>%{username}</span> %{description}"
       titles:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 64da141..ed1d9db 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 nl:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse-toewijzing"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ nl:
       assigned_to: "Toegewezen aan"
       assigned_topic_to: "Topic toegewezen aan <a href='%{path}'>%{username}</a>"
       assign_post_to: "#%{post_number} toegewezen aan %{username}"
+      assign_post_to_multiple: "#%{post_number} aan %{username}"
       assigned_to_w_ellipsis: "Toegewezen aan..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Toewijzing opheffen"
         title_w_ellipsis: "Toewijzing opheffen..."
@@ -99,13 +103,21 @@ nl:
       no_assignments_body: >
         Je toegewezen topics en berichten worden hier weergegeven. Ook ontvang je periodiek een herinneringsmelding over je toewijzingen, die je kunt aanpassen in je <a href='%{preferencesUrl}'>gebruikersvoorkeuren</a>. <br><br> Om een topic of bericht aan jezelf of iemand anders toe te wijzen, zoek je de knop %{icon} Toewijzen onderaan.
       dismiss_assigned_tooltip: "Alle ongelezen toewijzingsmeldingen markeren als gelezen"
-      assigned_to_group: "toegewezen aan %{group_name}"
-      assigned_to_you: "aan jou toegewezen"
+      assigned_to_group:
+        post: "bericht toegewezen aan %{group_name}"
+        topic: "topic toegewezen aan %{group_name}"
+      assigned_to_you:
+        post: "bericht toegewezen aan jou"
+        topic: "topic toegewezen aan jou"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Toewijzingsgebeurtenis"
-          details: "Wanneer een gebruiker een topic toewijst of de toewijzing ervan opheft."
+          group_name: "Toewijzingsgebeurtenissen"
+          assigned: "Wanneer een gebruiker een topic toewijst"
+          unassigned: "Wanneer een gebruiker de toewijzing van een topic opheft"
     search:
       advanced:
         in:
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 68d73c8..c0ddc69 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -36,8 +36,6 @@ pl_PL:
       assigned_topic_to: "Przypisano temat do <a href='%{path}'>%{username}</a>"
       assign_post_to: "Przypisano #%{post_number} do %{username}"
       assigned_to_w_ellipsis: "Przypisano do..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Cofnij przypisanie"
         title_w_ellipsis: "Cofnij przypisanie..."
@@ -98,13 +96,19 @@ pl_PL:
       no_assignments_body: >
         Tutaj zostaną wyświetlone Twoje przypisane tematy i wiadomości. Będziesz również otrzymywać okresowe przypomnienie o swoich przypisach, które możesz dostosować w swoich <a href='%{preferencesUrl}'>preferencjach użytkownika</a>. <br><br> Aby przypisać temat lub wiadomość do siebie lub innej osoby, poszukaj przycisku %{icon} przypisywania na dole.
       dismiss_assigned_tooltip: "Oznacz wszystkie nieprzeczytane powiadomienia o przypisaniu jako przeczytane"
-      assigned_to_group: "przypisany do %{group_name}"
-      assigned_to_you: "przypisany do Ciebie"
+      assigned_to_group:
+        post: "post przypisany do %{group_name}"
+        topic: "temat przypisany do %{group_name}"
+      assigned_to_you:
+        post: "post przypisany do Ciebie"
+        topic: "temat przypisany do Ciebie"
+      assignment_description:
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Przypisz wydarzenie"
-          details: "Gdy użytkownik przypisuje lub cofa przypisanie tematu."
+          assigned: "Gdy użytkownik przypisze temat"
+          unassigned: "Gdy użytkownik anuluje przypisanie tematu"
     search:
       advanced:
         in:
@@ -147,5 +151,6 @@ pl_PL:
       titles:
         assigned: "Przypisany"
     user_menu:
+      view_all_assigned: "wyświetl wszystkie przypisania"
       tabs:
         assign_list: "Lista przypisań"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 9c8b965..1ee386f 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -36,8 +36,6 @@ pt:
       assigned_topic_to: "Tópico atribuído a <a href='%{path}'>%{username}</a>"
       assign_post_to: "Atribuiu #%{post_number} a %{username}"
       assigned_to_w_ellipsis: "Atribuído(a) a..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Cancelar atribuição"
         title_w_ellipsis: "Cancelar atribuição..."
@@ -99,13 +97,8 @@ pt:
       no_assignments_body: >
         Seus tópicos e mensagens atribuídos serão listados aqui. Você receberá uma notificação periódica com um lembrete das suas atribuições, que pode ser ajustada nas suas <a href='%{preferencesUrl}'>preferências do(a) usuário(a)</a>. <br><br> Para atribuir um tópico ou mensagem a si ou a outra pessoa, procure o botão de atribuir %{icon} na parte inferior.
       dismiss_assigned_tooltip: "Marcar como lidas todas as notificações não atribuídas não lidas"
-      assigned_to_group: "atribuiu a %{group_name}"
-      assigned_to_you: "atribuiu a você"
-    admin:
-      web_hooks:
-        assign_event:
-          name: "Atribuir evento"
-          details: "Quando um(a) usuário(a) atribui ou cancela atribuição de um tópico."
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         in:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index f316a23..afdd80a 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 pt_BR:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Atribuição do Discourse"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ pt_BR:
       assigned_to: "Atribuiu a"
       assigned_topic_to: "Tópico atribuído a <a href='%{path}'>%{username}</a>"
       assign_post_to: "Atribuiu #%{post_number} a %{username}"
+      assign_post_to_multiple: "#%{post_number} para %{username}"
       assigned_to_w_ellipsis: "Atribuiu a..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Remover atribuição"
         title_w_ellipsis: "Remover atribuição..."
@@ -99,13 +103,21 @@ pt_BR:
       no_assignments_body: >
         Seus tópicos e mensagens atribuídas serão listados aqui. Você receberá uma notificação periódica de lembrete das suas atribuições, que você pode ajustar em suas <a href='%{preferencesUrl}'>preferências de usuário(a)/a>. <br><br> Para atribuir uma mensagem ou tópico a si ou a outra pessoa, procure o botão de atribuir %{icon} na parte inferior.
       dismiss_assigned_tooltip: "Marcar todas as notificações atribuídas não lidas como lidas"
-      assigned_to_group: "atribuiu a %{group_name}"
-      assigned_to_you: "atribuiu a você"
+      assigned_to_group:
+        post: "postagem atribuída a %{group_name}"
+        topic: "tópico atribuído a %{group_name}"
+      assigned_to_you:
+        post: "postagem atribuída a você"
+        topic: "tópico atribuído a você"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Evento Atribuir"
-          details: "Quando usuário(a) atribui ou remove atribuição de um tópico."
+          group_name: "Eventos de atribuição"
+          assigned: "Quando um(a) usuário(a) atribuir um tópico"
+          unassigned: "Quando um(a) usuário(a) cancelar a atribuição de um tópico"
     search:
       advanced:
         in:
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 03f5df1..f30c34a 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -22,5 +22,8 @@ ro:
         weekly: "Săptămânal"
         monthly: "Lunar"
         quarterly: "Trimestrial"
+    user:
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       assigned: "<span>%{username}</span> %{description}"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index c858cad..f81cbd1 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 ru:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Плагин Discourse «Назначение»"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ ru:
       assigned_to: "Назначено:"
       assigned_topic_to: "Назначил(а) тему пользователю <a href='%{path}'>%{username}</a>"
       assign_post_to: "Назначил(а) ответственным %{username} в сообщение #%{post_number}"
+      assign_post_to_multiple: "#%{post_number} для пользователя %{username}"
       assigned_to_w_ellipsis: "Назначено..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Снять ответственного"
         title_w_ellipsis: "Отменить назначение..."
@@ -99,13 +103,21 @@ ru:
       no_assignments_body: >
         Здесь будут перечислены назначенные вами темы и сообщения. Вы также будете получать периодические напоминания о ваших назначениях, которые вы можете изменить в <a href='%{preferencesUrl}'>настройках пользователя</a>. <br><br> Чтобы назначить тему или сообщение себе или кому-то ещё, используйте кнопку %{icon}, расположенную в нижней части темы.
       dismiss_assigned_tooltip: "Пометить все непрочитанные уведомления о назначении как прочитанные"
-      assigned_to_group: "назначен(а) группе %{group_name}"
-      assigned_to_you: "назначен(а) вам"
+      assigned_to_group:
+        post: "публикация назначена группе %{group_name}"
+        topic: "тема назначена группе %{group_name}"
+      assigned_to_you:
+        post: "публикация, назначенная вам"
+        topic: "тема, назначенная вам"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Событие назначения"
-          details: "При назначении или отмене назначения ответственного в тему"
+          group_name: "Назначение событий"
+          assigned: "Когда пользователь назначает тему"
+          unassigned: "Когда пользователь отменяет назначение темы"
     search:
       advanced:
         in:
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 131a90d..30d8939 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -48,6 +48,8 @@ sk:
     user:
       messages:
         assigned: "Priradené"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 315b101..cccb795 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -22,5 +22,8 @@ sl:
         weekly: "Tedensko"
         monthly: "Mesečno"
         quarterly: "V četrtletju"
+    user:
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       assigned: "<span>%{username}</span> %{description}"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index e0372e6..2c086ec 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -19,3 +19,6 @@ sq:
         weekly: "Javore"
         monthly: "Mujore"
         quarterly: "Tremujorsh"
+    user:
+      assignment_description:
+        topic: "%{topic_title}"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index ca65081..275bfaa 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -34,8 +34,6 @@ sv:
       group_everyone: "Alla"
       assigned_to: "Tilldelat till"
       assigned_to_w_ellipsis: "Tilldelad till..."
-      assign_notification: "<p><span>%{username}</span>%{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Otilldela"
         title_w_ellipsis: "Ta bort tilldelning..."
@@ -94,13 +92,8 @@ sv:
       no_assignments_body: >
         Dina tilldelade ämnen och meddelanden visas här i en lista. Du kommer också att få en periodisk påminnelse om dina tilldelningar, som du kan justera i dina <a href='%{preferencesUrl}'>användarinställningar</a>. <br><br> Om du vill tilldela ett ämne eller ett meddelande till dig själv eller till någon annan letar du efter tilldelningsknappen %{icon} längst ned.
       dismiss_assigned_tooltip: "Markera alla olästa tilldelningsmeddelanden som lästa"
-      assigned_to_group: "tilldelad till %{group_name}"
-      assigned_to_you: "tilldelad till dig"
-    admin:
-      web_hooks:
-        assign_event:
-          name: "Tilldela händelse"
-          details: "När en användare tilldelar eller återtar tilldelning för ett ämne."
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         in:
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 50bdf4f..ac3149a 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -51,6 +51,8 @@ sw:
       messages:
         assigned_title: "Amekabidhiwa (%{count})"
         assigned: "Imekabidhiwa"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 998c45d..96be6bf 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 tr_TR:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse Atama"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ tr_TR:
       assigned_to: "Şuraya atandı:"
       assigned_topic_to: "Konu <a href='%{path}'>%{username}</a> adlı kullanıcıya atandı"
       assign_post_to: "#%{post_number}, %{username} adlı kullanıcıya atandı"
+      assign_post_to_multiple: "%{username} adlı kullanıcıya #%{post_number}"
       assigned_to_w_ellipsis: "Şuraya atandı..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "Atamayı kaldır"
         title_w_ellipsis: "Atamayı kaldır..."
@@ -99,13 +103,21 @@ tr_TR:
       no_assignments_body: >
         Atanan konularınız ve mesajlarınız burada listelenir. Ayrıca, atamalarınızla ilgili periyodik bir anımsatma bildirimi alırsınız; bunu <a href='%{preferencesUrl}'>kullanıcı tercihlerinizden</a> ayarlayabilirsiniz. <br><br>Kendinize veya bir başkasına bir konu veya mesaj atamak için alttaki %{icon} ata düğmesini kullanın.
       dismiss_assigned_tooltip: "Okunmamış tüm atama bildirimlerini okundu olarak işaretle"
-      assigned_to_group: "%{group_name} adlı gruba atandı"
-      assigned_to_you: "size atandı"
+      assigned_to_group:
+        post: "gönderi %{group_name} adlı gruba atandı"
+        topic: "konu %{group_name} adlı gruba atandı"
+      assigned_to_you:
+        post: "gönderi size atandı"
+        topic: "konu size atandı"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "Etkinlik Ata"
-          details: "Bir kullanıcı bir konuyu atadığında veya atamasını kaldırdığında."
+          group_name: "Etkinlik Ata"
+          assigned: "Bir kullanıcı bir konu atadığında"
+          unassigned: "Bir kullanıcı bir konunun atamasını kaldırdığında"
     search:
       advanced:
         in:
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 11ae648..e9b6b1b 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -59,6 +59,8 @@ uk:
       messages:
         assigned_title: "Призначено (%{count})"
         assigned: "Призначено"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 3f69cc6..071e595 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -31,8 +31,6 @@ ur:
       group_everyone: "ہر کوئی"
       assigned_to: "جس کو اسائین کیا گیا"
       assigned_to_w_ellipsis: "کو تفویض..."
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "غیر اسائین کریں"
         title_w_ellipsis: "غیر تفویض کریں..."
@@ -87,11 +85,8 @@ ur:
       no_assignments_title: "آپ کے پاس ابھی تک کوئی اسائنمنٹ نہیں ہے"
       no_assignments_body: >
         آپ کے تفویض کردہ عنوانات اور پیغامات یہاں درج ہوں گے۔ آپ کو اپنے اسائنمنٹس کی وقفے وقفہ سے یاد دہانی کا نوٹیفکیشن بھی ملے گا ، جسے آپ اپنی <a href='%{preferencesUrl}'>صارف ترجیحات</a>میں ایڈجسٹ کرسکتے ہیں۔ <br><br> اپنے آپ کو یا کسی اور کو موضوع یا پیغام تفویض کرنے کے لئے ، %{icon} تفویض والے بٹن کو تلاش کریں۔
-    admin:
-      web_hooks:
-        assign_event:
-          name: "واقعہ تفویض کریں"
-          details: "جب کوئی صارف کسی موضوع کو تفویض یا غیر متعین کرتا ہے۔"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         in:
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index c289d1b..05f6165 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -29,6 +29,8 @@ vi:
     user:
       messages:
         assigned: "Được chỉ định"
+      assignment_description:
+        topic: "%{topic_title}"
     notifications:
       assigned: "<span>%{username}</span> %{description}"
       titles:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 9ff8ff8..e10d881 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 zh_CN:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_assign: "Discourse Assign"
   js:
     filters:
       unassigned:
@@ -35,9 +40,8 @@ zh_CN:
       assigned_to: "已分配给"
       assigned_topic_to: "将话题分配给 <a href='%{path}'>%{username}</a>"
       assign_post_to: "将 #%{post_number} 分配给 %{username}"
+      assign_post_to_multiple: "#%{post_number} 被分配给 %{username}"
       assigned_to_w_ellipsis: "已分配给…"
-      assign_notification: "<p><span>%{username}</span> %{description}</p>"
-      assign_group_notification: "<p><span>%{username}</span> %{description}</p>"
       unassign:
         title: "取消分配"
         title_w_ellipsis: "取消分配…"
@@ -99,13 +103,21 @@ zh_CN:
       no_assignments_body: >
         分配给您的话题和消息将在此处列出。您还将收到关于您的任务分配的定期提醒通知，您可以在<a href='%{preferencesUrl}'>用户偏好设置</a>中进行调整。 <br><br>要将话题或消息分配给自己或其他人，请查找底部的 %{icon} 分配按钮。
       dismiss_assigned_tooltip: "将所有未读分配通知标记为已读"
-      assigned_to_group: "已被分配至%{group_name}"
-      assigned_to_you: "已被分配给您"
+      assigned_to_group:
+        post: "帖子被分配给 %{group_name}"
+        topic: "话题被分配给 %{group_name}"
+      assigned_to_you:
+        post: "帖子被分配给您"
+        topic: "话题被分配给您"
+      assignment_description:
+        post: "%{topic_title} (#%{post_number})"
+        topic: "%{topic_title}"
     admin:
       web_hooks:
         assign_event:
-          name: "分配事件"
-          details: "当用户分配或取消分配话题时。"
+          group_name: "分配事件"
+          assigned: "当用户分配主题时"
+          unassigned: "当用户取消分配主题时"
     search:
       advanced:
         in:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 99e1712..2e0cc92 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -50,6 +50,8 @@ zh_TW:
     user:
       messages:
         assigned: "已指派"
+      assignment_description:
+        topic: "%{topic_title}"
     search:
       advanced:
         assigned:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index de73111..a33b1c7 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -43,6 +43,7 @@ pl_PL:
     flag_assigned: "Przepraszamy, temat, w którym jest ta flaga, został przypisany do innego użytkownika."
     flag_unclaimed: "Musisz przejąć ten temat, zanim zaczniesz działać na fladze."
     topic_assigned_excerpt: "przypisano ci temat '%{title}'"
+    topic_group_assigned_excerpt: "przypisano temat '%{title}' do @%{group}"
     reminders_frequency:
       never: "nigdy"
       daily: "dziennie"
diff --git a/config/routes.rb b/config/routes.rb
index 56fd94a..ef974f3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,6 @@ DiscourseAssign::Engine.routes.draw do
   get "/suggestions" => "assign#suggestions"
   get "/assigned" => "assign#assigned"
   get "/members/:group_name" => "assign#group_members"
-  get "/user-menu-assigns" => "assign#user_menu_assigns"
 end
 
 Discourse::Application.routes.draw do
diff --git a/config/settings.yml b/config/settings.yml
index 421fc9b..e7f97f7 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,4 +1,4 @@
-plugins:
+discourse_assign:
   assign_enabled:
     default: false
     client: true
diff --git a/db/post_migrate/20231011152903_ensure_notifications_consistency.rb b/db/post_migrate/20231011152903_ensure_notifications_consistency.rb
new file mode 100644
index 0000000..bf9efc5
--- /dev/null
+++ b/db/post_migrate/20231011152903_ensure_notifications_consistency.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+class EnsureNotificationsConsistency < ActiveRecord::Migration[7.0]
+  def up
+    DB.exec(<<~SQL)
+      DELETE FROM notifications
+      WHERE id IN (
+        SELECT notifications.id FROM notifications
+        LEFT OUTER JOIN assignments ON assignments.id = ((notifications.data::jsonb)->'assignment_id')::int
+        WHERE (notification_type = 34 AND assignments.id IS NULL OR assignments.active = FALSE)
+      )
+    SQL
+
+    DB.exec(<<~SQL)
+      WITH tmp AS (
+        SELECT
+          assignments.assigned_to_id AS user_id,
+          assignments.created_at,
+          assignments.updated_at,
+          assignments.topic_id,
+          (
+            CASE WHEN assignments.target_type = 'Topic' THEN 1
+                 ELSE (SELECT posts.post_number FROM posts WHERE posts.id = assignments.target_id)
+            END
+          ) AS post_number,
+          json_strip_nulls(json_build_object(
+            'message', 'discourse_assign.assign_notification',
+            'display_username', (SELECT users.username FROM users WHERE users.id = assignments.assigned_by_user_id),
+            'topic_title', topics.title,
+            'assignment_id', assignments.id
+          ))::text AS data
+        FROM assignments
+        LEFT OUTER JOIN topics ON topics.deleted_at IS NULL AND topics.id = assignments.topic_id
+        LEFT OUTER JOIN users ON users.id = assignments.assigned_to_id AND assignments.assigned_to_type = 'User'
+        LEFT OUTER JOIN notifications ON ((data::jsonb)->'assignment_id')::int = assignments.id
+        WHERE assignments.active = TRUE
+          AND NOT (topics.id IS NULL OR users.id IS NULL)
+          AND assignments.assigned_to_type = 'User'
+          AND notifications.id IS NULL
+      )
+      INSERT INTO notifications (notification_type, high_priority, read, user_id, created_at, updated_at, topic_id, post_number, data)
+        SELECT 34, TRUE, TRUE, tmp.* FROM tmp
+    SQL
+
+    DB.exec(<<~SQL)
+      WITH tmp AS (
+        SELECT
+          users.id AS user_id,
+          assignments.created_at,
+          assignments.updated_at,
+          assignments.topic_id,
+          (
+            CASE WHEN assignments.target_type = 'Topic' THEN 1
+                 ELSE (SELECT posts.post_number FROM posts WHERE posts.id = assignments.target_id)
+            END
+          ) AS post_number,
+          json_strip_nulls(json_build_object(
+            'message', 'discourse_assign.assign_group_notification',
+            'display_username', (SELECT groups.name FROM groups WHERE groups.id = assignments.assigned_to_id),
+            'topic_title', topics.title,
+            'assignment_id', assignments.id
+          ))::text AS data
+        FROM assignments
+        LEFT OUTER JOIN topics ON topics.deleted_at IS NULL AND topics.id = assignments.topic_id
+        LEFT OUTER JOIN groups ON groups.id = assignments.assigned_to_id AND assignments.assigned_to_type = 'Group'
+        LEFT OUTER JOIN group_users ON groups.id = group_users.group_id
+        LEFT OUTER JOIN users ON users.id = group_users.user_id
+        LEFT OUTER JOIN notifications ON ((data::jsonb)->'assignment_id')::int = assignments.id AND notifications.user_id = users.id
+        WHERE assignments.active = TRUE
+          AND NOT (topics.id IS NULL OR groups.id IS NULL)
+          AND assignments.assigned_to_type = 'Group'
+          AND notifications.id IS NULL
+      )
+      INSERT INTO notifications (notification_type, high_priority, read, user_id, created_at, updated_at, topic_id, post_number, data)
+        SELECT 34, TRUE, TRUE, tmp.* FROM tmp
+    SQL
+  end
+
+  def down
+  end
+end
diff --git a/lib/assigner.rb b/lib/assigner.rb
index 8e37978..65efca0 100644
--- a/lib/assigner.rb
+++ b/lib/assigner.rb
@@ -195,7 +195,7 @@ class ::Assigner
     topic.posts.where(post_number: 1).first
   end
 
-  def forbidden_reasons(assign_to:, type:, note:, status:)
+  def forbidden_reasons(assign_to:, type:, note:, status:, allow_self_reassign:)
     case
     when assign_to.is_a?(User) && !can_assignee_see_target?(assign_to)
       if topic.private_message?
@@ -211,7 +211,7 @@ class ::Assigner
       end
     when !can_be_assigned?(assign_to)
       assign_to.is_a?(User) ? :forbidden_assign_to : :forbidden_group_assign_to
-    when already_assigned?(assign_to, type, note, status)
+    when !allow_self_reassign && already_assigned?(assign_to, type, note, status)
       assign_to.is_a?(User) ? :already_assigned : :group_already_assigned
     when Assignment.where(topic: topic, active: true).count >= ASSIGNMENTS_PER_TOPIC_LIMIT &&
            !reassign?
@@ -223,14 +223,15 @@ class ::Assigner
 
   def update_details(assign_to, note, status, skip_small_action_post: false)
     case
-    when @target.assignment.note != note && @target.assignment.status != status && status.present?
+    when note.present? && status.present? && @target.assignment.note != note &&
+           @target.assignment.status != status
       small_action_text = <<~TEXT
         Status: #{@target.assignment.status} → #{status}
 
         #{note}
       TEXT
       change_type = "details"
-    when @target.assignment.note != note
+    when note.present? && @target.assignment.note != note
       small_action_text = note
       change_type = "note"
     when @target.assignment.status != status
@@ -239,11 +240,8 @@ class ::Assigner
     end
 
     @target.assignment.update!(note: note, status: status)
-
-    queue_notification(assign_to, skip_small_action_post, @target.assignment)
-
-    assignment = @target.assignment
-    publish_assignment(assignment, assign_to, note, status)
+    queue_notification(@target.assignment)
+    publish_assignment(@target.assignment, assign_to, note, status)
 
     # email is skipped, for now
 
@@ -255,7 +253,13 @@ class ::Assigner
     { success: true }
   end
 
-  def assign(assign_to, note: nil, skip_small_action_post: false, status: nil)
+  def assign(
+    assign_to,
+    note: nil,
+    skip_small_action_post: false,
+    status: nil,
+    allow_self_reassign: false
+  )
     assigned_to_type = assign_to.is_a?(User) ? "User" : "Group"
 
     if topic.private_message? && SiteSetting.invite_on_assign
@@ -263,7 +267,13 @@ class ::Assigner
     end
 
     forbidden_reason =
-      forbidden_reasons(assign_to: assign_to, type: assigned_to_type, note: note, status: status)
+      forbidden_reasons(
+        assign_to: assign_to,
+        type: assigned_to_type,
+        note: note,
+        status: status,
+        allow_self_reassign: allow_self_reassign,
+      )
     return { success: false, reason: forbidden_reason } if forbidden_reason
 
     if no_assignee_change?(assign_to) && details_change?(note, status)
@@ -274,33 +284,31 @@ class ::Assigner
     action_code[:user] = topic.assignment.present? ? "reassigned" : "assigned"
     action_code[:group] = topic.assignment.present? ? "reassigned_group" : "assigned_group"
 
-    skip_small_action_post = skip_small_action_post || no_assignee_change?(assign_to)
+    skip_small_action_post =
+      skip_small_action_post || (!allow_self_reassign && no_assignee_change?(assign_to))
 
-    if topic.assignment.present?
+    if @target.assignment
       Jobs.enqueue(
         :unassign_notification,
         topic_id: topic.id,
-        assigned_to_id: topic.assignment.assigned_to_id,
-        assigned_to_type: topic.assignment.assigned_to_type,
+        assigned_to_id: @target.assignment.assigned_to_id,
+        assigned_to_type: @target.assignment.assigned_to_type,
+        assignment_id: @target.assignment.id,
       )
+      @target.assignment.destroy!
     end
 
-    @target.assignment&.destroy!
-
     assignment =
       @target.create_assignment!(
-        assigned_to_id: assign_to.id,
-        assigned_to_type: assigned_to_type,
-        assigned_by_user_id: @assigned_by.id,
-        topic_id: topic.id,
+        assigned_to: assign_to,
+        assigned_by_user: @assigned_by,
+        topic: topic,
         note: note,
         status: status,
       )
 
     first_post.publish_change_to_clients!(:revised, reload_topic: true)
-
-    queue_notification(assign_to, skip_small_action_post, assignment)
-
+    queue_notification(assignment)
     publish_assignment(assignment, assign_to, note, status)
 
     if assignment.assigned_to_user?
@@ -335,7 +343,7 @@ class ::Assigner
     end
 
     # Create a webhook event
-    if WebHook.active_web_hooks(:assign).exists?
+    if WebHook.active_web_hooks(:assigned).exists?
       assigned_to_type = :assigned
       payload = {
         type: assigned_to_type,
@@ -370,24 +378,9 @@ class ::Assigner
         topic_id: topic.id,
         assigned_to_id: assignment.assigned_to.id,
         assigned_to_type: assignment.assigned_to_type,
+        assignment_id: assignment.id,
       )
 
-      if assignment.assigned_to_user?
-        if TopicUser.exists?(
-             user_id: assignment.assigned_to_id,
-             topic: topic,
-             notification_level: TopicUser.notification_levels[:watching],
-             notifications_reason_id: TopicUser.notification_reasons[:plugin_changed],
-           )
-          TopicUser.change(
-            assignment.assigned_to_id,
-            topic.id,
-            notification_level: TopicUser.notification_levels[:tracking],
-            notifications_reason_id: TopicUser.notification_reasons[:plugin_changed],
-          )
-        end
-      end
-
       assigned_to = assignment.assigned_to
 
       if SiteSetting.unassign_creates_tracking_post && !silent
@@ -413,7 +406,7 @@ class ::Assigner
       end
 
       # Create a webhook event
-      if WebHook.active_web_hooks(:assign).exists?
+      if WebHook.active_web_hooks(:unassigned).exists?
         type = :unassigned
         payload = {
           type: type,
@@ -477,17 +470,8 @@ class ::Assigner
     @guardian ||= Guardian.new(@assigned_by)
   end
 
-  def queue_notification(assign_to, skip_small_action_post, assignment)
-    Jobs.enqueue(
-      :assign_notification,
-      topic_id: topic.id,
-      post_id: topic_target? ? first_post.id : @target.id,
-      assigned_to_id: assign_to.id,
-      assigned_to_type: assign_to.is_a?(User) ? "User" : "Group",
-      assigned_by_id: @assigned_by.id,
-      skip_small_action_post: skip_small_action_post,
-      assignment_id: assignment.id,
-    )
+  def queue_notification(assignment)
+    Jobs.enqueue(:assign_notification, assignment_id: assignment.id)
   end
 
   def add_small_action_post(action_code, assign_to, text)
@@ -546,7 +530,7 @@ class ::Assigner
         ""
       end
     return "unassigned#{suffix}" if assignment.assigned_to_user?
-    return "unassigned_group#{suffix}" if assignment.assigned_to_group?
+    "unassigned_group#{suffix}" if assignment.assigned_to_group?
   end
 
   def already_assigned?(assign_to, type, note, status)
diff --git a/lib/discourse_assign/create_notification.rb b/lib/discourse_assign/create_notification.rb
new file mode 100644
index 0000000..171195b
--- /dev/null
+++ b/lib/discourse_assign/create_notification.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module DiscourseAssign
+  class CreateNotification
+    class UserAssignment
+      attr_reader :assignment
+
+      def initialize(assignment)
+        @assignment = assignment
+      end
+
+      def excerpt_key
+        "discourse_assign.topic_assigned_excerpt"
+      end
+
+      def notification_message
+        "discourse_assign.assign_notification"
+      end
+
+      def display_username
+        assignment.assigned_by_user.username
+      end
+    end
+
+    class GroupAssignment < UserAssignment
+      def excerpt_key
+        "discourse_assign.topic_group_assigned_excerpt"
+      end
+
+      def notification_message
+        "discourse_assign.assign_group_notification"
+      end
+
+      def display_username
+        assignment.assigned_to.name
+      end
+    end
+
+    def self.call(...)
+      new(...).call
+    end
+
+    attr_reader :assignment, :user, :mark_as_read, :assignment_type
+    alias mark_as_read? mark_as_read
+
+    delegate :topic,
+             :post,
+             :assigned_by_user,
+             :assigned_to,
+             :created_at,
+             :updated_at,
+             :assigned_to_user?,
+             :id,
+             to: :assignment,
+             private: true
+    delegate :excerpt_key,
+             :notification_message,
+             :display_username,
+             to: :assignment_type,
+             private: true
+
+    def initialize(assignment:, user:, mark_as_read:)
+      @assignment = assignment
+      @user = user
+      @mark_as_read = mark_as_read
+      @assignment_type =
+        "#{self.class}::#{assignment.assigned_to.class}Assignment".constantize.new(assignment)
+    end
+
+    def call
+      Assigner.publish_topic_tracking_state(topic, user.id)
+      unless mark_as_read?
+        PostAlerter.new(post).create_notification_alert(
+          user: user,
+          post: post,
+          username: assigned_by_user.username,
+          notification_type: Notification.types[:assigned],
+          excerpt:
+            I18n.t(
+              excerpt_key,
+              title: topic.title,
+              group: assigned_to.name,
+              locale: user.effective_locale,
+            ),
+        )
+      end
+      user.notifications.assigned.create!(
+        created_at: created_at,
+        updated_at: updated_at,
+        topic: topic,
+        post_number: post.post_number,
+        high_priority: true,
+        read: mark_as_read?,
+        data: {
+          message: notification_message,
+          display_username: display_username,
+          topic_title: topic.title,
+          assignment_id: id,
+        }.to_json,
+      )
+    end
+  end
+end
diff --git a/lib/discourse_assign/group_extension.rb b/lib/discourse_assign/group_extension.rb
index 628c882..66b311a 100644
--- a/lib/discourse_assign/group_extension.rb
+++ b/lib/discourse_assign/group_extension.rb
@@ -2,12 +2,15 @@
 
 module DiscourseAssign
   module GroupExtension
-    def self.prepended(base)
-      base.class_eval do
-        scope :assignable,
-              ->(user) {
-                where(
-                  "assignable_level in (:levels) OR
+    extend ActiveSupport::Concern
+
+    prepended do
+      has_many :assignments, as: :assigned_to
+
+      scope :assignable,
+            ->(user) do
+              where(
+                "assignable_level in (:levels) OR
                   (
                     assignable_level = #{Group::ALIAS_LEVELS[:members_mods_and_admins]} AND id in (
                     SELECT group_id FROM group_users WHERE user_id = :user_id)
@@ -15,11 +18,10 @@ module DiscourseAssign
                     assignable_level = #{Group::ALIAS_LEVELS[:owners_mods_and_admins]} AND id in (
                     SELECT group_id FROM group_users WHERE user_id = :user_id AND owner IS TRUE)
                   )",
-                  levels: alias_levels(user),
-                  user_id: user&.id,
-                )
-              }
-      end
+                levels: alias_levels(user),
+                user_id: user&.id,
+              )
+            end
     end
   end
 end
diff --git a/lib/discourse_assign/notification_extension.rb b/lib/discourse_assign/notification_extension.rb
new file mode 100644
index 0000000..ddb7e25
--- /dev/null
+++ b/lib/discourse_assign/notification_extension.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module DiscourseAssign
+  module NotificationExtension
+    extend ActiveSupport::Concern
+
+    prepended do
+      scope :assigned, -> { where(notification_type: Notification.types[:assigned]) }
+      scope :for_assignment,
+            ->(assignment) do
+              assigned.where("((data::jsonb)->'assignment_id')::int IN (?)", assignment)
+            end
+    end
+  end
+end
diff --git a/lib/discourse_assign/web_hook_extension.rb b/lib/discourse_assign/web_hook_extension.rb
index d685b4f..b80f4cf 100644
--- a/lib/discourse_assign/web_hook_extension.rb
+++ b/lib/discourse_assign/web_hook_extension.rb
@@ -5,9 +5,7 @@ module DiscourseAssign
     def self.prepended(base)
       base.class_eval do
         def self.enqueue_assign_hooks(event, payload)
-          if active_web_hooks("assign").exists?
-            WebHook.enqueue_hooks(:assign, event, payload: payload)
-          end
+          WebHook.enqueue_hooks(:assign, event, payload: payload) if active_web_hooks(event).exists?
         end
       end
     end
diff --git a/lib/random_assign_utils.rb b/lib/random_assign_utils.rb
index fc0edaa..470f96a 100644
--- a/lib/random_assign_utils.rb
+++ b/lib/random_assign_utils.rb
@@ -1,130 +1,190 @@
 # frozen_string_literal: true
 
 class RandomAssignUtils
-  def self.raise_error(automation, message)
-    raise("[discourse-automation id=#{automation.id}] #{message}.")
+  attr_reader :context, :fields, :automation, :topic, :group
+
+  def self.automation_script!(...)
+    new(...).automation_script!
   end
 
-  def self.log_info(automation, message)
-    Rails.logger.info("[discourse-automation id=#{automation.id}] #{message}.")
-  end
-
-  def self.automation_script!(context, fields, automation)
-    raise_error(automation, "discourse-assign is not enabled") unless SiteSetting.assign_enabled?
+  def initialize(context, fields, automation)
+    @context = context
+    @fields = fields
+    @automation = automation
 
+    raise_error("discourse-assign is not enabled") unless SiteSetting.assign_enabled?
     unless topic_id = fields.dig("assigned_topic", "value")
-      raise_error(automation, "`assigned_topic` not provided")
+      raise_error("`assigned_topic` not provided")
     end
-
-    unless topic = Topic.find_by(id: topic_id)
-      raise_error(automation, "Topic(#{topic_id}) not found")
-    end
-
-    min_hours = fields.dig("minimum_time_between_assignments", "value").presence
-    if min_hours &&
-         TopicCustomField
-           .where(name: "assigned_to_id", topic_id: topic_id)
-           .where("created_at < ?", min_hours.to_i.hours.ago)
-           .exists?
-      log_info(automation, "Topic(#{topic_id}) has already been assigned recently")
-      return
+    unless @topic = Topic.find_by(id: topic_id)
+      raise_error("Topic(#{topic_id}) not found")
     end
 
     unless group_id = fields.dig("assignees_group", "value")
-      raise_error(automation, "`assignees_group` not provided")
+      raise_error("`assignees_group` not provided")
     end
-
-    unless group = Group.find_by(id: group_id)
-      raise_error(automation, "Group(#{group_id}) not found")
+    unless @group = Group.find_by(id: group_id)
+      raise_error("Group(#{group_id}) not found")
     end
-
-    assignable_user_ids = User.assign_allowed.pluck(:id)
-    users_on_holiday =
-      Set.new(
-        User.where(
-          id: UserCustomField.where(name: "on_holiday", value: "t").select(:user_id),
-        ).pluck(:id),
-      )
-
-    group_users = group.group_users.joins(:user)
-    if skip_new_users_for_days = fields.dig("skip_new_users_for_days", "value").presence
-      group_users = group_users.where("users.created_at < ?", skip_new_users_for_days.to_i.days.ago)
-    end
-
-    group_users_ids =
-      group_users
-        .pluck("users.id")
-        .filter { |user_id| assignable_user_ids.include?(user_id) }
-        .reject { |user_id| users_on_holiday.include?(user_id) }
-
-    if group_users_ids.empty?
-      RandomAssignUtils.no_one!(topic_id, group.name)
-      return
-    end
-
-    max_recently_assigned_days =
-      (fields.dig("max_recently_assigned_days", "value").presence || 180).to_i.days.ago
-    last_assignees_ids =
-      RandomAssignUtils.recently_assigned_users_ids(topic_id, max_recently_assigned_days)
-    users_ids = group_users_ids - last_assignees_ids
-    if users_ids.blank?
-      min_recently_assigned_days =
-        (fields.dig("min_recently_assigned_days", "value").presence || 14).to_i.days.ago
-      recently_assigned_users_ids =
-        RandomAssignUtils.recently_assigned_users_ids(topic_id, min_recently_assigned_days)
-      users_ids = group_users_ids - recently_assigned_users_ids
-    end
-
-    if users_ids.blank?
-      RandomAssignUtils.no_one!(topic_id, group.name)
-      return
-    end
-
-    if fields.dig("in_working_hours", "value")
-      assign_to_user_id =
-        users_ids.shuffle.find { |user_id| RandomAssignUtils.in_working_hours?(user_id) }
-    end
-
-    assign_to_user_id ||= users_ids.sample
-    if assign_to_user_id.blank?
-      RandomAssignUtils.no_one!(topic_id, group.name)
-      return
-    end
-
-    assign_to = User.find(assign_to_user_id)
-    result = nil
-    if raw = fields.dig("post_template", "value").presence
-      post =
-        PostCreator.new(
-          Discourse.system_user,
-          raw: raw,
-          skip_validations: true,
-          topic_id: topic.id,
-        ).create!
-
-      result = Assigner.new(post, Discourse.system_user).assign(assign_to)
-
-      PostDestroyer.new(Discourse.system_user, post).destroy if !result[:success]
-    else
-      result = Assigner.new(topic, Discourse.system_user).assign(assign_to)
-    end
-
-    RandomAssignUtils.no_one!(topic_id, group.name) if !result[:success]
   end
 
-  def self.recently_assigned_users_ids(topic_id, from)
-    posts =
-      Post
-        .joins(:user)
-        .where(topic_id: topic_id, action_code: %w[assigned reassigned assigned_to_post])
-        .where("posts.created_at > ?", from)
-        .order(created_at: :desc)
+  def automation_script!
+    return log_info("Topic(#{topic.id}) has already been assigned recently") if assigned_recently?
+    return no_one! unless assigned_user
+    assign_user!
+  end
+
+  def recently_assigned_users_ids(from)
     usernames =
-      Post.custom_fields_for_ids(posts, [:action_code_who]).map { |_, v| v["action_code_who"] }.uniq
-    User.where(username: usernames).limit(100).pluck(:id)
+      PostCustomField
+        .joins(:post)
+        .where(
+          name: "action_code_who",
+          posts: {
+            topic: topic,
+            action_code: %w[assigned reassigned assigned_to_post],
+          },
+        )
+        .where("posts.created_at > ?", from)
+        .order("posts.created_at DESC")
+        .pluck(:value)
+        .uniq
+    User
+      .where(username: usernames)
+      .joins(
+        "JOIN unnest('{#{usernames.join(",")}}'::text[]) WITH ORDINALITY t(username, ord) USING(username)",
+      )
+      .limit(100)
+      .order("ord")
+      .pluck(:id)
   end
 
-  def self.user_tzinfo(user_id)
+  private
+
+  def assigned_user
+    @assigned_user ||=
+      begin
+        group_users_ids = group_users.pluck(:id)
+        return if group_users_ids.empty?
+
+        last_assignees_ids = recently_assigned_users_ids(max_recently_assigned_days)
+        users_ids = group_users_ids - last_assignees_ids
+        if users_ids.blank?
+          recently_assigned_users_ids = recently_assigned_users_ids(min_recently_assigned_days)
+          users_ids = group_users_ids - recently_assigned_users_ids
+        end
+        users_ids << last_assignees_ids.intersection(group_users_ids).last if users_ids.blank?
+        if fields.dig("in_working_hours", "value")
+          assign_to_user_id = users_ids.shuffle.detect { |user_id| in_working_hours?(user_id) }
+        end
+        assign_to_user_id ||= users_ids.sample
+
+        User.find(assign_to_user_id)
+      end
+  end
+
+  def assign_user!
+    return create_post_template if post_template
+    Assigner
+      .new(topic, Discourse.system_user)
+      .assign(assigned_user, allow_self_reassign: true)
+      .then do |result|
+        next if result[:success]
+        no_one!
+      end
+  end
+
+  def create_post_template
+    post =
+      PostCreator.new(
+        Discourse.system_user,
+        raw: post_template,
+        skip_validations: true,
+        topic_id: topic.id,
+      ).create!
+    Assigner
+      .new(post, Discourse.system_user)
+      .assign(assigned_user, allow_self_reassign: true)
+      .then do |result|
+        next if result[:success]
+        PostDestroyer.new(Discourse.system_user, post).destroy
+        no_one!
+      end
+  end
+
+  def group_users
+    users =
+      group
+        .users
+        .where(id: User.assign_allowed.select(:id))
+        .where.not(
+          id:
+            User
+              .joins(:_custom_fields)
+              .where(user_custom_fields: { name: "on_holiday", value: "t" })
+              .select(:id),
+        )
+    return users unless skip_new_users_for_days
+    users.where("users.created_at < ?", skip_new_users_for_days)
+  end
+
+  def raise_error(message)
+    raise("[discourse-automation id=#{automation.id}] #{message}.")
+  end
+
+  def log_info(message)
+    Rails.logger.info("[discourse-automation id=#{automation.id}] #{message}.")
+  end
+
+  def no_one!
+    PostCreator.create!(
+      Discourse.system_user,
+      topic_id: topic.id,
+      raw: I18n.t("discourse_automation.scriptables.random_assign.no_one", group: group.name),
+      validate: false,
+    )
+  end
+
+  def assigned_recently?
+    return unless min_hours
+    TopicCustomField
+      .where(name: "assigned_to_id", topic: topic)
+      .where("created_at < ?", min_hours)
+      .exists?
+  end
+
+  def skip_new_users_for_days
+    days = fields.dig("skip_new_users_for_days", "value").presence
+    return unless days
+    days.to_i.days.ago
+  end
+
+  def max_recently_assigned_days
+    @max_days ||= (fields.dig("max_recently_assigned_days", "value").presence || 180).to_i.days.ago
+  end
+
+  def min_recently_assigned_days
+    @min_days ||= (fields.dig("min_recently_assigned_days", "value").presence || 14).to_i.days.ago
+  end
+
+  def post_template
+    @post_template ||= fields.dig("post_template", "value").presence
+  end
+
+  def min_hours
+    hours = fields.dig("minimum_time_between_assignments", "value").presence
+    return unless hours
+    hours.to_i.hours.ago
+  end
+
+  def in_working_hours?(user_id)
+    tzinfo = user_tzinfo(user_id)
+    tztime = tzinfo.now
+
+    !tztime.saturday? && !tztime.sunday? && tztime.hour > 7 && tztime.hour < 11
+  end
+
+  def user_tzinfo(user_id)
     timezone = UserOption.where(user_id: user_id).pluck(:timezone).first || "UTC"
 
     tzinfo = nil
@@ -140,20 +200,4 @@ class RandomAssignUtils
 
     tzinfo
   end
-
-  def self.no_one!(topic_id, group)
-    PostCreator.create!(
-      Discourse.system_user,
-      topic_id: topic_id,
-      raw: I18n.t("discourse_automation.scriptables.random_assign.no_one", group: group),
-      validate: false,
-    )
-  end
-
-  def self.in_working_hours?(user_id)
-    tzinfo = RandomAssignUtils.user_tzinfo(user_id)
-    tztime = tzinfo.now
-
-    !tztime.saturday? && !tztime.sunday? && tztime.hour > 7 && tztime.hour < 11
-  end
 end
diff --git a/package.json b/package.json
index 7712f47..8d6da6c 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "discourse",
-  "version": "1.0.1",
-  "repository": "https://github.com/discourse/discourse-assign",
-  "author": "Discourse",
-  "license": "MIT",
+  "name": "discourse-assign",
+  "private": true,
   "devDependencies": {
-    "eslint-config-discourse": "^3.4.0"
+    "@discourse/lint-configs": "^1.3.5",
+    "ember-template-lint": "^5.13.0",
+    "eslint": "^8.56.0",
+    "prettier": "^2.8.8"
   }
 }
diff --git a/plugin.rb b/plugin.rb
index 5a82c95..b95ed8f 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # name: discourse-assign
-# about: Assign users to topics
+# about: Provides the ability to assign topics and individual posts to a user or group.
+# meta_topic_id: 58044
 # version: 1.0.1
 # authors: Sam Saffron
 # url: https://github.com/discourse/discourse-assign
@@ -26,10 +27,12 @@ after_initialize do
   require_relative "app/jobs/regular/unassign_notification"
   require_relative "app/jobs/scheduled/enqueue_reminders"
   require_relative "lib/assigner"
+  require_relative "lib/discourse_assign/create_notification"
   require_relative "lib/discourse_assign/discourse_calendar"
   require_relative "lib/discourse_assign/group_extension"
   require_relative "lib/discourse_assign/helpers"
   require_relative "lib/discourse_assign/list_controller_extension"
+  require_relative "lib/discourse_assign/notification_extension"
   require_relative "lib/discourse_assign/post_extension"
   require_relative "lib/discourse_assign/topic_extension"
   require_relative "lib/discourse_assign/web_hook_extension"
@@ -38,11 +41,12 @@ after_initialize do
   require_relative "lib/topic_assigner"
 
   reloadable_patch do |plugin|
-    Group.class_eval { prepend DiscourseAssign::GroupExtension }
-    ListController.class_eval { prepend DiscourseAssign::ListControllerExtension }
-    Post.class_eval { prepend DiscourseAssign::PostExtension }
-    Topic.class_eval { prepend DiscourseAssign::TopicExtension }
-    WebHook.class_eval { prepend DiscourseAssign::WebHookExtension }
+    Group.prepend(DiscourseAssign::GroupExtension)
+    ListController.prepend(DiscourseAssign::ListControllerExtension)
+    Post.prepend(DiscourseAssign::PostExtension)
+    Topic.prepend(DiscourseAssign::TopicExtension)
+    WebHook.prepend(DiscourseAssign::WebHookExtension)
+    Notification.prepend(DiscourseAssign::NotificationExtension)
   end
 
   register_group_param(:assignable_level)
@@ -52,7 +56,7 @@ after_initialize do
 
   frequency_field = PendingAssignsReminder::REMINDERS_FREQUENCY
   register_editable_user_custom_field frequency_field
-  User.register_custom_field_type frequency_field, :integer
+  register_user_custom_field_type(frequency_field, :integer, max_length: 10)
   DiscoursePluginRegistry.serialized_current_user_fields << frequency_field
   add_to_serializer(:user, :reminders_frequency) { RemindAssignsFrequencySiteSettings.values }
 
@@ -88,13 +92,10 @@ after_initialize do
   end
 
   add_to_class(:user, :can_assign?) do
-    @can_assign ||=
-      begin
-        return true if admin?
-        allowed_groups = SiteSetting.assign_allowed_on_groups.split("|").compact
-        allowed_groups.present? && groups.where(id: allowed_groups).exists? ? :true : :false
-      end
-    @can_assign == :true
+    return @can_assign if defined?(@can_assign)
+
+    allowed_groups = SiteSetting.assign_allowed_on_groups.split("|").compact
+    @can_assign = admin? || (allowed_groups.present? && groups.where(id: allowed_groups).exists?)
   end
 
   add_to_serializer(:current_user, :never_auto_track_topics) do
@@ -167,7 +168,12 @@ after_initialize do
 
   on(:unassign_topic) { |topic, unassigning_user| Assigner.new(topic, unassigning_user).unassign }
 
-  Site.preloaded_category_custom_fields << "enable_unassigned_filter"
+  if respond_to?(:register_preloaded_category_custom_fields)
+    register_preloaded_category_custom_fields("enable_unassigned_filter")
+  else
+    # TODO: Drop the if-statement and this if-branch in Discourse v3.2
+    Site.preloaded_category_custom_fields << "enable_unassigned_filter"
+  end
 
   BookmarkQuery.on_preload do |bookmarks, bookmark_query|
     if SiteSetting.assign_enabled?
@@ -201,7 +207,8 @@ after_initialize do
       allowed_access = SiteSetting.assigns_public || can_assign
 
       if allowed_access && topics.length > 0
-        assignments = Assignment.strict_loading.where(topic: topics, active: true).includes(:target)
+        assignments =
+          Assignment.strict_loading.active.where(topic: topics).includes(:target, :assigned_to)
         assignments_map = assignments.group_by(&:topic_id)
 
         user_ids =
@@ -503,7 +510,7 @@ after_initialize do
     :topic_view,
     :assigned_to_user,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to&.is_a?(User)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to.is_a?(User)
     end,
   ) { DiscourseAssign::Helpers.build_assigned_to_user(object.topic.assigned_to, object.topic) }
 
@@ -511,7 +518,7 @@ after_initialize do
     :topic_view,
     :assigned_to_group,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to&.is_a?(Group)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to.is_a?(Group)
     end,
   ) { DiscourseAssign::Helpers.build_assigned_to_group(object.topic.assigned_to, object.topic) }
 
@@ -551,7 +558,7 @@ after_initialize do
     :suggested_topic,
     :assigned_to_user,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(User)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(User)
     end,
   ) { DiscourseAssign::Helpers.build_assigned_to_user(object.assigned_to, object) }
 
@@ -559,7 +566,7 @@ after_initialize do
     :suggested_topic,
     :assigned_to_group,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(Group)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(Group)
     end,
   ) { DiscourseAssign::Helpers.build_assigned_to_group(object.assigned_to, object) }
 
@@ -584,7 +591,7 @@ after_initialize do
     :topic_list_item,
     :assigned_to_user,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(User)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(User)
     end,
   ) { BasicUserSerializer.new(object.assigned_to, scope: scope, root: false).as_json }
 
@@ -592,7 +599,7 @@ after_initialize do
     :topic_list_item,
     :assigned_to_group,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(Group)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(Group)
     end,
   ) { AssignedGroupSerializer.new(object.assigned_to, scope: scope, root: false).as_json }
 
@@ -610,7 +617,7 @@ after_initialize do
     :search_topic_list_item,
     :assigned_to_user,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(User)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(User)
     end,
   ) { DiscourseAssign::Helpers.build_assigned_to_user(object.assigned_to, object) }
 
@@ -618,7 +625,7 @@ after_initialize do
     :search_topic_list_item,
     :assigned_to_group,
     include_condition: -> do
-      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to&.is_a?(Group)
+      (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(Group)
     end,
   ) { AssignedGroupSerializer.new(object.assigned_to, scope: scope, root: false).as_json }
 
@@ -635,7 +642,11 @@ after_initialize do
     if @user.can_assign?
       assign_user = User.find_by_username(@operation[:username])
       topics.each do |topic|
-        Assigner.new(topic, @user).assign(assign_user, note: @operation[:note])
+        Assigner.new(topic, @user).assign(
+          assign_user,
+          status: @operation[:status],
+          note: @operation[:note],
+        )
       end
     end
   end
@@ -647,6 +658,7 @@ after_initialize do
   end
 
   register_permitted_bulk_action_parameter :username
+  register_permitted_bulk_action_parameter :status
   register_permitted_bulk_action_parameter :note
 
   add_to_class(:user_bookmark_base_serializer, :assigned_to) do
@@ -663,7 +675,7 @@ after_initialize do
     :assigned_to_user,
     include_condition: -> do
       return false if !can_have_assignment?
-      (SiteSetting.assigns_public || scope.can_assign?) && assigned_to&.is_a?(User)
+      (SiteSetting.assigns_public || scope.can_assign?) && assigned_to.is_a?(User)
     end,
   ) do
     return if !can_have_assignment?
@@ -675,7 +687,7 @@ after_initialize do
     :assigned_to_group,
     include_condition: -> do
       return false if !can_have_assignment?
-      (SiteSetting.assigns_public || scope.can_assign?) && assigned_to&.is_a?(Group)
+      (SiteSetting.assigns_public || scope.can_assign?) && assigned_to.is_a?(Group)
     end,
   ) do
     return if !can_have_assignment?
@@ -694,7 +706,7 @@ after_initialize do
     :assigned_to_user,
     include_condition: -> do
       (SiteSetting.assigns_public || scope.can_assign?) &&
-        object.assignment&.assigned_to&.is_a?(User) && object.assignment.active
+        object.assignment&.assigned_to.is_a?(User) && object.assignment.active
     end,
   ) { BasicUserSerializer.new(object.assignment.assigned_to, scope: scope, root: false).as_json }
 
@@ -703,7 +715,7 @@ after_initialize do
     :assigned_to_group,
     include_condition: -> do
       (SiteSetting.assigns_public || scope.can_assign?) &&
-        object.assignment&.assigned_to&.is_a?(Group) && object.assignment.active
+        object.assignment&.assigned_to.is_a?(Group) && object.assignment.active
     end,
   ) do
     AssignedGroupSerializer.new(object.assignment.assigned_to, scope: scope, root: false).as_json
@@ -733,13 +745,13 @@ after_initialize do
   add_to_serializer(
     :flagged_topic,
     :assigned_to_user,
-    include_condition: -> { object.assigned_to && object.assigned_to&.is_a?(User) },
+    include_condition: -> { object.assigned_to && object.assigned_to.is_a?(User) },
   ) { DiscourseAssign::Helpers.build_assigned_to_user(object.assigned_to, object) }
 
   add_to_serializer(
     :flagged_topic,
     :assigned_to_group,
-    include_condition: -> { object.assigned_to && object.assigned_to&.is_a?(Group) },
+    include_condition: -> { object.assigned_to && object.assigned_to.is_a?(Group) },
   ) { DiscourseAssign::Helpers.build_assigned_to_group(object.assigned_to, object) }
 
   # Reviewable
@@ -836,20 +848,12 @@ after_initialize do
     next if !info[:group]
 
     Assignment
-      .where(topic_id: topic.id, active: false)
+      .inactive
+      .where(topic: topic)
       .find_each do |assignment|
         next unless assignment.target
         assignment.update!(active: true)
-        Jobs.enqueue(
-          :assign_notification,
-          topic_id: topic.id,
-          post_id: assignment.target_type.is_a?(Topic) ? topic.first_post.id : assignment.target.id,
-          assigned_to_id: assignment.assigned_to_id,
-          assigned_to_type: assignment.assigned_to_type,
-          assigned_by_id: assignment.assigned_by_user_id,
-          skip_small_action_post: true,
-          assignment_id: assignment.id,
-        )
+        Jobs.enqueue(:assign_notification, assignment_id: assignment.id)
       end
   end
 
@@ -863,32 +867,30 @@ after_initialize do
     next if !info[:group]
 
     Assignment
-      .where(topic_id: topic.id, active: true)
+      .active
+      .where(topic: topic)
       .find_each do |assignment|
         assignment.update!(active: false)
         Jobs.enqueue(
           :unassign_notification,
           topic_id: topic.id,
-          assigned_to_id: assignment.assigned_to.id,
+          assigned_to_id: assignment.assigned_to_id,
           assigned_to_type: assignment.assigned_to_type,
+          assignment_id: assignment.id,
         )
       end
   end
 
-  on(:user_removed_from_group) do |user, group|
-    assign_allowed_groups = SiteSetting.assign_allowed_on_groups.split("|").map(&:to_i)
-
-    if assign_allowed_groups.include?(group.id)
-      groups = GroupUser.where(user: user).pluck(:group_id)
-
-      if (groups & assign_allowed_groups).empty?
-        topics = Topic.joins(:assignment).where("assignments.assigned_to_id = ?", user.id)
-
-        topics.each { |topic| Assigner.new(topic, Discourse.system_user).unassign }
-      end
+  on(:user_added_to_group) do |user, group, automatic:|
+    group.assignments.active.find_each do |assignment|
+      Jobs.enqueue(:assign_notification, assignment_id: assignment.id)
     end
   end
 
+  on(:user_removed_from_group) do |user, group|
+    user.notifications.for_assignment(group.assignments.select(:id)).destroy_all
+  end
+
   on(:post_moved) do |post, original_topic_id|
     assignment =
       Assignment.where(topic_id: original_topic_id, target_type: "Post", target_id: post.id).first
diff --git a/spec/fabricators/assign_hook_fabricator.rb b/spec/fabricators/assign_hook_fabricator.rb
index e331154..203e374 100644
--- a/spec/fabricators/assign_hook_fabricator.rb
+++ b/spec/fabricators/assign_hook_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:assign_web_hook, from: :web_hook) do
-  transient assign_hook: WebHookEventType.find_by(name: "assign")
-
-  after_build { |web_hook, transients| web_hook.web_hook_event_types = [transients[:assign_hook]] }
+  after_build do |web_hook|
+    web_hook.web_hook_event_types = WebHookEventType.where(name: %w[assigned unassigned])
+  end
 end
diff --git a/spec/fabricators/assignment_fabricator.rb b/spec/fabricators/assignment_fabricator.rb
index 5a3e6a4..9dfa97f 100644
--- a/spec/fabricators/assignment_fabricator.rb
+++ b/spec/fabricators/assignment_fabricator.rb
@@ -9,6 +9,7 @@ Fabricator(:topic_assignment, class_name: :assignment) do
 end
 
 Fabricator(:post_assignment, class_name: :assignment) do
+  transient :post
   topic { |attrs| attrs[:post]&.topic || Fabricate(:topic) }
   target { |attrs| attrs[:post] || Fabricate(:post, topic: attrs[:topic]) }
   target_type "Post"
diff --git a/spec/fabricators/notification_fabricator.rb b/spec/fabricators/notification_fabricator.rb
new file mode 100644
index 0000000..0ac16a5
--- /dev/null
+++ b/spec/fabricators/notification_fabricator.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+Fabricator(:assignment_notification, from: :notification) do
+  transient :group
+  notification_type Notification.types[:assigned]
+  post_number 1
+  data do |attrs|
+    {
+      message:
+        (
+          if attrs[:group]
+            "discourse_assign.assign_group_notification"
+          else
+            "discourse_assign.assign_notification"
+          end
+        ),
+      display_username: attrs[:group] ? "group" : "user",
+      assignment_id: rand(1..100),
+    }.to_json
+  end
+end
diff --git a/spec/jobs/regular/assign_notification_spec.rb b/spec/jobs/regular/assign_notification_spec.rb
index ed85e82..4ecbd57 100644
--- a/spec/jobs/regular/assign_notification_spec.rb
+++ b/spec/jobs/regular/assign_notification_spec.rb
@@ -4,199 +4,27 @@ require "rails_helper"
 
 RSpec.describe Jobs::AssignNotification do
   describe "#execute" do
-    fab!(:user1) { Fabricate(:user, last_seen_at: 1.day.ago) }
-    fab!(:user2) { Fabricate(:user, last_seen_at: 1.day.ago) }
-    fab!(:topic) { Fabricate(:topic, title: "Basic topic title") }
-    fab!(:post) { Fabricate(:post, topic: topic) }
-    fab!(:pm_post) { Fabricate(:private_message_post) }
-    fab!(:pm) { pm_post.topic }
-    fab!(:assign_allowed_group) { Group.find_by(name: "staff") }
+    subject(:execute_job) { described_class.new.execute(args) }
 
-    def assert_publish_topic_state(topic, user)
-      message = MessageBus.track_publish("/private-messages/assigned") { yield }.first
+    let(:args) { { assignment_id: assignment_id } }
 
-      expect(message.data[:topic_id]).to eq(topic.id)
-      expect(message.user_ids).to eq([user.id])
-    end
+    context "when `assignment_id` is not provided" do
+      let(:args) { {} }
 
-    before { assign_allowed_group.add(user1) }
-
-    describe "User" do
-      it "sends notification alert" do
-        messages =
-          MessageBus.track_publish("/notification-alert/#{user2.id}") do
-            described_class.new.execute(
-              {
-                topic_id: topic.id,
-                post_id: post.id,
-                assigned_to_id: user2.id,
-                assigned_to_type: "User",
-                assigned_by_id: user1.id,
-                skip_small_action_post: false,
-                assignment_id: 1093,
-              },
-            )
-          end
-
-        expect(messages.length).to eq(1)
-        expect(messages.first.data[:excerpt]).to eq(
-          I18n.t("discourse_assign.topic_assigned_excerpt", title: topic.title),
-        )
-      end
-
-      it "should publish the right message when private message" do
-        user = pm.allowed_users.first
-        assign_allowed_group.add(user)
-
-        assert_publish_topic_state(pm, user) do
-          described_class.new.execute(
-            {
-              topic_id: pm.id,
-              post_id: pm_post.id,
-              assigned_to_id: pm.allowed_users.first.id,
-              assigned_to_type: "User",
-              assigned_by_id: user1.id,
-              skip_small_action_post: false,
-              assignment_id: 9023,
-            },
-          )
-        end
-      end
-
-      it "sends a high priority notification to the assignee" do
-        Notification.expects(:create!).with(
-          notification_type: Notification.types[:assigned] || Notification.types[:custom],
-          user_id: user2.id,
-          topic_id: topic.id,
-          post_number: 1,
-          high_priority: true,
-          data: {
-            message: "discourse_assign.assign_notification",
-            display_username: user1.username,
-            topic_title: topic.title,
-            assignment_id: 3194,
-          }.to_json,
-        )
-        described_class.new.execute(
-          {
-            topic_id: topic.id,
-            post_id: post.id,
-            assigned_to_id: user2.id,
-            assigned_to_type: "User",
-            assigned_by_id: user1.id,
-            skip_small_action_post: false,
-            assignment_id: 3194,
-          },
-        )
+      it "raises an error" do
+        expect { execute_job }.to raise_error(Discourse::InvalidParameters, "assignment_id")
       end
     end
 
-    describe "Group" do
-      fab!(:user3) { Fabricate(:user, last_seen_at: 1.day.ago) }
-      fab!(:user4) { Fabricate(:user, suspended_till: 1.year.from_now) }
-      fab!(:group) { Fabricate(:group, name: "Developers") }
-      let(:assignment) do
-        Assignment.create!(topic: topic, assigned_by_user: user1, assigned_to: group)
-      end
+    context "when `assignment_id` is provided" do
+      let(:assignment_id) { Fabricate(:topic_assignment).id }
+      let(:assignment) { stub("assignment").responds_like_instance_of(Assignment) }
 
-      before do
-        group.add(user2)
-        group.add(user3)
-        group.add(user4)
-      end
+      before { Assignment.stubs(:find).with(assignment_id).returns(assignment) }
 
-      it "sends notification alert to all group members" do
-        messages =
-          MessageBus.track_publish("/notification-alert/#{user2.id}") do
-            described_class.new.execute(
-              {
-                topic_id: topic.id,
-                post_id: post.id,
-                assigned_to_id: group.id,
-                assigned_to_type: "Group",
-                assigned_by_id: user1.id,
-                skip_small_action_post: false,
-                assignment_id: 7839,
-              },
-            )
-          end
-        expect(messages.length).to eq(1)
-        expect(messages.first.data[:excerpt]).to eq(
-          I18n.t(
-            "discourse_assign.topic_group_assigned_excerpt",
-            title: topic.title,
-            group: group.name,
-          ),
-        )
-
-        messages =
-          MessageBus.track_publish("/notification-alert/#{user3.id}") do
-            described_class.new.execute(
-              {
-                topic_id: topic.id,
-                post_id: post.id,
-                assigned_to_id: group.id,
-                assigned_to_type: "Group",
-                assigned_by_id: user1.id,
-                skip_small_action_post: false,
-                assignment_id: 7763,
-              },
-            )
-          end
-        expect(messages.length).to eq(1)
-        expect(messages.first.data[:excerpt]).to eq(
-          I18n.t(
-            "discourse_assign.topic_group_assigned_excerpt",
-            title: topic.title,
-            group: group.name,
-          ),
-        )
-
-        messages =
-          MessageBus.track_publish("/notification-alert/#{user4.id}") do
-            described_class.new.execute(
-              {
-                topic_id: topic.id,
-                post_id: post.id,
-                assigned_to_id: group.id,
-                assigned_to_type: "Group",
-                assigned_by_id: user1.id,
-                skip_small_action_post: false,
-                assignment_id: 8883,
-              },
-            )
-          end
-        expect(messages.length).to eq(0)
-      end
-
-      it "sends a high priority notification to all group members" do
-        [user2, user3, user4].each do |user|
-          Notification.expects(:create!).with(
-            notification_type: Notification.types[:assigned] || Notification.types[:custom],
-            user_id: user.id,
-            topic_id: topic.id,
-            post_number: 1,
-            high_priority: true,
-            data: {
-              message: "discourse_assign.assign_group_notification",
-              display_username: group.name,
-              topic_title: topic.title,
-              assignment_id: 9429,
-            }.to_json,
-          )
-        end
-
-        described_class.new.execute(
-          {
-            topic_id: topic.id,
-            post_id: post.id,
-            assigned_to_id: group.id,
-            assigned_to_type: "Group",
-            assigned_by_id: user1.id,
-            skip_small_action_post: false,
-            assignment_id: 9429,
-          },
-        )
+      it "creates missing notifications for the provided assignment" do
+        assignment.expects(:create_missing_notifications!)
+        execute_job
       end
     end
   end
diff --git a/spec/jobs/regular/unassign_notification_spec.rb b/spec/jobs/regular/unassign_notification_spec.rb
index 14facff..352a100 100644
--- a/spec/jobs/regular/unassign_notification_spec.rb
+++ b/spec/jobs/regular/unassign_notification_spec.rb
@@ -22,19 +22,11 @@ RSpec.describe Jobs::UnassignNotification do
     end
 
     describe "User" do
-      it "deletes notifications" do
-        Jobs::AssignNotification.new.execute(
-          {
-            topic_id: topic.id,
-            post_id: post.id,
-            assigned_to_id: user2.id,
-            assigned_to_type: "User",
-            assigned_by_id: user1.id,
-            skip_small_action_post: false,
-            assignment_id: 4519,
-          },
-        )
+      fab!(:assignment) { Fabricate(:topic_assignment, topic: topic, assigned_to: user2) }
 
+      before { assignment.create_missing_notifications! }
+
+      it "deletes notifications" do
         expect {
           described_class.new.execute(
             {
@@ -42,6 +34,7 @@ RSpec.describe Jobs::UnassignNotification do
               post_id: post.id,
               assigned_to_id: user2.id,
               assigned_to_type: "User",
+              assignment_id: assignment.id,
             },
           )
         }.to change { user2.notifications.count }.by(-1)
@@ -58,6 +51,7 @@ RSpec.describe Jobs::UnassignNotification do
               post_id: pm_post.id,
               assigned_to_id: pm.allowed_users.first.id,
               assigned_to_type: "User",
+              assignment_id: 4519,
             },
           )
         end
@@ -68,25 +62,17 @@ RSpec.describe Jobs::UnassignNotification do
       fab!(:assign_allowed_group) { Group.find_by(name: "staff") }
       fab!(:user3) { Fabricate(:user) }
       fab!(:group) { Fabricate(:group) }
+      fab!(:assignment) do
+        Fabricate(:topic_assignment, topic: topic, assigned_to: group, assigned_by_user: user1)
+      end
 
       before do
         group.add(user2)
         group.add(user3)
+        assignment.create_missing_notifications!
       end
 
       it "deletes notifications" do
-        Jobs::AssignNotification.new.execute(
-          {
-            topic_id: topic.id,
-            post_id: post.id,
-            assigned_to_id: group.id,
-            assigned_to_type: "Group",
-            assigned_by_id: user1.id,
-            skip_small_action_post: false,
-            assignment_id: 9281,
-          },
-        )
-
         expect {
           described_class.new.execute(
             {
@@ -94,6 +80,7 @@ RSpec.describe Jobs::UnassignNotification do
               post_id: post.id,
               assigned_to_id: group.id,
               assigned_to_type: "Group",
+              assignment_id: assignment.id,
             },
           )
         }.to change { Notification.count }.by(-2)
diff --git a/spec/lib/assigner_spec.rb b/spec/lib/assigner_spec.rb
index 87e4f8b..fb2b8f5 100644
--- a/spec/lib/assigner_spec.rb
+++ b/spec/lib/assigner_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe Assigner do
       expect(TopicQuery.new(moderator, assigned: moderator.username).list_latest.topics).to eq([])
 
       expect(TopicUser.find_by(user: moderator).notification_level).to eq(
-        TopicUser.notification_levels[:tracking],
+        TopicUser.notification_levels[:watching],
       )
     end
 
@@ -122,23 +122,17 @@ RSpec.describe Assigner do
       }
     end
 
-    it "does not update notification level if it is not set by the plugin" do
+    it "does not update notification level when unassigned" do
       assigner.assign(moderator)
 
       expect(TopicUser.find_by(user: moderator).notification_level).to eq(
         TopicUser.notification_levels[:watching],
       )
 
-      TopicUser.change(
-        moderator.id,
-        topic.id,
-        notification_level: TopicUser.notification_levels[:muted],
-      )
-
       assigner.unassign
 
       expect(TopicUser.find_by(user: moderator, topic: topic).notification_level).to eq(
-        TopicUser.notification_levels[:muted],
+        TopicUser.notification_levels[:watching],
       )
     end
 
@@ -270,33 +264,47 @@ RSpec.describe Assigner do
         expect(second_assign[:success]).to eq(true)
       end
 
-      it "fails to assign when the assigned user and note is the same" do
-        assigner = described_class.new(topic, moderator_2)
-        assigner.assign(moderator, note: "note me down")
+      context "when 'allow_self_reassign' is false" do
+        subject(:assign) do
+          assigner.assign(moderator, note: other_note, allow_self_reassign: self_reassign)
+        end
 
-        assign = assigner.assign(moderator, note: "note me down")
+        let(:self_reassign) { false }
+        let(:assigner) { described_class.new(topic, moderator_2) }
+        let(:note) { "note me down" }
 
-        expect(assign[:success]).to eq(false)
-        expect(assign[:reason]).to eq(:already_assigned)
+        before { assigner.assign(moderator, note: note) }
+
+        context "when the assigned user and the note is the same" do
+          let(:other_note) { note }
+
+          it "fails to assign" do
+            expect(assign).to match(success: false, reason: :already_assigned)
+          end
+        end
+
+        context "when the assigned user is the same but the note is different" do
+          let(:other_note) { "note me down again" }
+
+          it "allows assignment" do
+            expect(assign).to match(success: true)
+          end
+        end
       end
 
-      it "fails to assign when the assigned user and note is the same" do
-        assigner = described_class.new(post, moderator_2)
-        assigner.assign(moderator, note: "note me down")
+      context "when 'allow_self_reassign' is true" do
+        subject(:assign) { assigner.assign(moderator, allow_self_reassign: self_reassign) }
 
-        assign = assigner.assign(moderator, note: "note me down")
+        let(:self_reassign) { true }
+        let(:assigner) { described_class.new(topic, moderator_2) }
 
-        expect(assign[:success]).to eq(false)
-        expect(assign[:reason]).to eq(:already_assigned)
-      end
+        context "when the assigned user is the same" do
+          before { assigner.assign(moderator) }
 
-      it "allows assign when the assigned user is same but note is different" do
-        assigner = described_class.new(topic, moderator_2)
-        assigner.assign(moderator, note: "note me down")
-
-        assign = assigner.assign(moderator, note: "note me down again")
-
-        expect(assign[:success]).to eq(true)
+          it "allows assignment" do
+            expect(assign).to match(success: true)
+          end
+        end
       end
 
       it "fails to assign when the assigned user cannot view the pm" do
@@ -765,7 +773,7 @@ RSpec.describe Assigner do
       assigner.assign(group2)
       assigner.assign(group3)
 
-      expect(topic.allowed_groups).to eq([group1, group2])
+      expect(topic.allowed_groups).to match_array([group1, group2])
     end
 
     it "doesn't invite group to the PM if it's not messageable" do
diff --git a/spec/lib/discourse_assign/create_notification_spec.rb b/spec/lib/discourse_assign/create_notification_spec.rb
new file mode 100644
index 0000000..3010251
--- /dev/null
+++ b/spec/lib/discourse_assign/create_notification_spec.rb
@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe DiscourseAssign::CreateNotification do
+  describe ".call" do
+    subject(:create_notification) do
+      described_class.call(assignment: assignment, user: user, mark_as_read: mark_as_read)
+    end
+
+    let(:assignment) { Fabricate(:topic_assignment, topic: post.topic, assigned_to: assigned_to) }
+    let(:post) { Fabricate(:post) }
+    let(:mark_as_read) { false }
+    let(:alerter) { stub_everything("alerter").responds_like_instance_of(PostAlerter) }
+
+    before { PostAlerter.stubs(:new).returns(alerter) }
+
+    context "when assigned to a single user" do
+      let(:assigned_to) { Fabricate(:user) }
+      let(:user) { assigned_to }
+
+      it "publishes topic tracking state" do
+        Assigner.expects(:publish_topic_tracking_state).with(assignment.topic, user.id)
+        create_notification
+      end
+
+      context "when `mark_as_read` is false" do
+        let(:excerpt) do
+          I18n.t(
+            "discourse_assign.topic_assigned_excerpt",
+            title: post.topic.title,
+            group: user.name,
+            locale: user.effective_locale,
+          )
+        end
+
+        it "creates a notification alert" do
+          alerter.expects(:create_notification_alert).with(
+            user: user,
+            post: post,
+            username: assignment.assigned_by_user.username,
+            notification_type: Notification.types[:assigned],
+            excerpt: excerpt,
+          )
+          create_notification
+        end
+      end
+
+      context "when `mark_as_read` is true" do
+        let(:mark_as_read) { true }
+
+        it "does not create a notification alert" do
+          alerter.expects(:create_notification_alert).never
+          create_notification
+        end
+      end
+
+      it "creates a notification" do
+        expect { create_notification }.to change { Notification.count }.by(1)
+        expect(Notification.assigned.last).to have_attributes(
+          created_at: assignment.created_at,
+          updated_at: assignment.updated_at,
+          user: user,
+          topic: post.topic,
+          post_number: post.post_number,
+          high_priority: true,
+          read: mark_as_read,
+          data_hash: {
+            message: "discourse_assign.assign_notification",
+            display_username: assignment.assigned_by_user.username,
+            topic_title: post.topic.title,
+            assignment_id: assignment.id,
+          },
+        )
+      end
+    end
+
+    context "when assigned to a group" do
+      let(:assigned_to) { Fabricate(:group) }
+      let(:user) { Fabricate(:user) }
+
+      before { assigned_to.users << user }
+
+      it "publishes topic tracking state" do
+        Assigner.expects(:publish_topic_tracking_state).with(assignment.topic, user.id)
+        create_notification
+      end
+
+      context "when `mark_as_read` is false" do
+        let(:excerpt) do
+          I18n.t(
+            "discourse_assign.topic_group_assigned_excerpt",
+            title: post.topic.title,
+            group: assigned_to.name,
+            locale: user.effective_locale,
+          )
+        end
+
+        it "creates a notification alert" do
+          alerter.expects(:create_notification_alert).with(
+            user: user,
+            post: post,
+            username: assignment.assigned_by_user.username,
+            notification_type: Notification.types[:assigned],
+            excerpt: excerpt,
+          )
+          create_notification
+        end
+      end
+
+      context "when `mark_as_read` is true" do
+        let(:mark_as_read) { true }
+
+        it "does not create a notification alert" do
+          alerter.expects(:create_notification_alert).never
+          create_notification
+        end
+      end
+
+      it "creates a notification" do
+        expect { create_notification }.to change { Notification.count }.by(1)
+        expect(Notification.assigned.last).to have_attributes(
+          created_at: assignment.created_at,
+          updated_at: assignment.updated_at,
+          user: user,
+          topic: post.topic,
+          post_number: post.post_number,
+          high_priority: true,
+          read: mark_as_read,
+          data_hash: {
+            message: "discourse_assign.assign_group_notification",
+            display_username: assigned_to.name,
+            topic_title: post.topic.title,
+            assignment_id: assignment.id,
+          },
+        )
+      end
+    end
+  end
+end
diff --git a/spec/lib/pending_assigns_reminder_spec.rb b/spec/lib/pending_assigns_reminder_spec.rb
index 04c1201..cadebf9 100644
--- a/spec/lib/pending_assigns_reminder_spec.rb
+++ b/spec/lib/pending_assigns_reminder_spec.rb
@@ -4,10 +4,12 @@ require "rails_helper"
 require_relative "../support/assign_allowed_group"
 
 def assert_reminder_not_created
-  expect { subject.remind(user) }.not_to change { Post.count }
+  expect { reminder.remind(user) }.not_to change { Post.count }
 end
 
 RSpec.describe PendingAssignsReminder do
+  subject(:reminder) { described_class.new }
+
   before { SiteSetting.assign_enabled = true }
 
   let(:user) { Fabricate(:user) }
@@ -48,7 +50,7 @@ RSpec.describe PendingAssignsReminder do
 
     it "creates a reminder for a particular user and sets the timestamp of the last reminder" do
       freeze_time
-      subject.remind(user)
+      reminder.remind(user)
 
       post = Post.last
 
@@ -71,8 +73,8 @@ RSpec.describe PendingAssignsReminder do
     end
 
     it "deletes previous reminders when creating a new one" do
-      subject.remind(user)
-      subject.remind(user)
+      reminder.remind(user)
+      reminder.remind(user)
 
       reminders_count =
         Topic
@@ -84,7 +86,7 @@ RSpec.describe PendingAssignsReminder do
     end
 
     it "doesn't delete reminders from a different user" do
-      subject.remind(user)
+      reminder.remind(user)
       another_user = Fabricate(:user)
       add_to_assign_allowed_group(another_user)
       3.times do
@@ -92,7 +94,7 @@ RSpec.describe PendingAssignsReminder do
         Assigner.new(post.topic, user).assign(another_user)
       end
 
-      subject.remind(another_user)
+      reminder.remind(another_user)
 
       reminders_count =
         Topic
@@ -104,9 +106,9 @@ RSpec.describe PendingAssignsReminder do
     end
 
     it "doesn't delete reminders if they have replies" do
-      subject.remind(user)
+      reminder.remind(user)
       Fabricate(:post, topic: Topic.last)
-      subject.remind(user)
+      reminder.remind(user)
 
       reminders_count =
         Topic
@@ -123,7 +125,7 @@ RSpec.describe PendingAssignsReminder do
       @post5 = Fabricate(:post)
       Assigner.new(@post5.topic, user).assign(user)
 
-      subject.remind(user)
+      reminder.remind(user)
 
       post = Post.last
       topic = post.topic
@@ -133,7 +135,7 @@ RSpec.describe PendingAssignsReminder do
       @post5.topic.update_status("closed", true, Discourse.system_user)
       expect(@post5.topic.closed).to eq(true)
 
-      subject.remind(user)
+      reminder.remind(user)
 
       post = Post.last
       topic = post.topic
diff --git a/spec/lib/random_assign_utils_spec.rb b/spec/lib/random_assign_utils_spec.rb
index ca96627..6c99d16 100644
--- a/spec/lib/random_assign_utils_spec.rb
+++ b/spec/lib/random_assign_utils_spec.rb
@@ -3,175 +3,124 @@
 require "rails_helper"
 require_relative "../support/assign_allowed_group"
 
-describe RandomAssignUtils do
-  before do
-    SiteSetting.assign_enabled = true
-
-    @orig_logger = Rails.logger
-    Rails.logger = @fake_logger = FakeLogger.new
-  end
-
-  after { Rails.logger = @orig_logger }
-
+RSpec.describe RandomAssignUtils do
   FakeAutomation = Struct.new(:id)
 
-  let(:post) { Fabricate(:post) }
   let!(:automation) { FakeAutomation.new(1) }
 
-  describe ".automation_script!" do
-    context "when all users of group are on holidays" do
-      fab!(:topic_1) { Fabricate(:topic) }
-      fab!(:group_1) { Fabricate(:group) }
-      fab!(:user_1) { Fabricate(:user) }
+  around do |example|
+    orig_logger = Rails.logger
+    Rails.logger = FakeLogger.new
+    example.run
+    Rails.logger = orig_logger
+  end
 
-      before do
-        group_1.add(user_1)
-        UserCustomField.create!(name: "on_holiday", value: "t", user_id: user_1.id)
+  before { SiteSetting.assign_enabled = true }
+
+  describe ".automation_script!" do
+    subject(:auto_assign) { described_class.automation_script!(ctx, fields, automation) }
+
+    fab!(:post_1) { Fabricate(:post) }
+    fab!(:topic_1) { post_1.topic }
+    fab!(:group_1) { Fabricate(:group) }
+    fab!(:user_1) { Fabricate(:user) }
+    fab!(:user_2) { Fabricate(:user) }
+    fab!(:user_3) { Fabricate(:user) }
+
+    let(:ctx) { {} }
+    let(:fields) { {} }
+
+    before do
+      SiteSetting.assign_allowed_on_groups = group_1.id.to_s
+      group_1.add(user_1)
+    end
+
+    context "when all users of group are on holidays" do
+      let(:fields) do
+        {
+          "assignees_group" => {
+            "value" => group_1.id,
+          },
+          "assigned_topic" => {
+            "value" => topic_1.id,
+          },
+        }
       end
 
+      before { UserCustomField.create!(name: "on_holiday", value: "t", user_id: user_1.id) }
+
       it "creates post on the topic" do
-        described_class.automation_script!(
-          {},
-          {
-            "assignees_group" => {
-              "value" => group_1.id,
-            },
-            "assigned_topic" => {
-              "value" => topic_1.id,
-            },
-          },
-          automation,
-        )
-        expect(topic_1.posts.first.raw).to match(
+        auto_assign
+        expect(topic_1.posts.last.raw).to match(
           I18n.t("discourse_automation.scriptables.random_assign.no_one", group: group_1.name),
         )
       end
     end
 
     context "when all users of group have been assigned recently" do
-      fab!(:topic_1) { Fabricate(:topic) }
-      fab!(:group_1) { Fabricate(:group) }
-      fab!(:user_1) { Fabricate(:user) }
-
-      before do
-        Assigner.new(topic_1, Discourse.system_user).assign(user_1)
-        group_1.add(user_1)
+      let(:fields) do
+        {
+          "assignees_group" => {
+            "value" => group_1.id,
+          },
+          "assigned_topic" => {
+            "value" => topic_1.id,
+          },
+        }
       end
 
-      it "creates post on the topic" do
-        described_class.automation_script!(
-          {},
-          {
-            "assignees_group" => {
-              "value" => group_1.id,
-            },
-            "assigned_topic" => {
-              "value" => topic_1.id,
-            },
-          },
-          automation,
-        )
-        expect(topic_1.posts.first.raw).to match(
-          I18n.t("discourse_automation.scriptables.random_assign.no_one", group: group_1.name),
-        )
+      before do
+        group_1.add(user_2)
+        group_1.add(user_3)
+        freeze_time(10.days.ago) { Assigner.new(topic_1, Discourse.system_user).assign(user_1) }
+        freeze_time(5.days.ago) { Assigner.new(topic_1, Discourse.system_user).assign(user_3) }
+        Assigner.new(topic_1, Discourse.system_user).assign(user_2)
+      end
+
+      it "assigns the least recently assigned user to the topic" do
+        expect { auto_assign }.to change { topic_1.reload.assignment.assigned_to }.to(user_1)
+      end
+
+      context "when a user is on holiday" do
+        before do
+          user_1.custom_fields["on_holiday"] = true
+          user_1.save!
+        end
+
+        it "doesn't assign them" do
+          expect { auto_assign }.to change { topic_1.reload.assignment.assigned_to }.to(user_3)
+        end
       end
     end
 
     context "when no users can be assigned because none are members of assign_allowed_on_groups groups" do
-      fab!(:topic_1) { Fabricate(:topic) }
-      fab!(:group_1) { Fabricate(:group) }
-      fab!(:user_1) { Fabricate(:user) }
+      let(:fields) do
+        {
+          "assignees_group" => {
+            "value" => group_1.id,
+          },
+          "assigned_topic" => {
+            "value" => topic_1.id,
+          },
+        }
+      end
 
-      before { group_1.add(user_1) }
+      before { SiteSetting.assign_allowed_on_groups = "" }
 
       it "creates post on the topic" do
-        described_class.automation_script!(
-          {},
-          {
-            "assignees_group" => {
-              "value" => group_1.id,
-            },
-            "assigned_topic" => {
-              "value" => topic_1.id,
-            },
-          },
-          automation,
-        )
-        expect(topic_1.posts.first.raw).to match(
+        auto_assign
+        expect(topic_1.posts.last.raw).to match(
           I18n.t("discourse_automation.scriptables.random_assign.no_one", group: group_1.name),
         )
       end
     end
 
     context "when user can be assigned" do
-      fab!(:group_1) { Fabricate(:group) }
-      fab!(:user_1) { Fabricate(:user) }
-      fab!(:topic_1) { Fabricate(:topic) }
-
-      before do
-        SiteSetting.assign_allowed_on_groups = [group_1.id.to_s].join("|")
-        group_1.add(user_1)
-      end
-
       context "when post_template is set" do
-        it "creates a post with the template and assign the user" do
-          described_class.automation_script!(
-            {},
-            {
-              "post_template" => {
-                "value" => "this is a post template",
-              },
-              "assignees_group" => {
-                "value" => group_1.id,
-              },
-              "assigned_topic" => {
-                "value" => topic_1.id,
-              },
-            },
-            automation,
-          )
-          expect(topic_1.posts.first.raw).to match("this is a post template")
-        end
-      end
-
-      context "when post_template is not set" do
-        fab!(:post_1) { Fabricate(:post, topic: topic_1) }
-
-        it "assigns the user to the topic" do
-          described_class.automation_script!(
-            {},
-            {
-              "assignees_group" => {
-                "value" => group_1.id,
-              },
-              "assigned_topic" => {
-                "value" => topic_1.id,
-              },
-            },
-            automation,
-          )
-          expect(topic_1.assignment.assigned_to_id).to eq(user_1.id)
-        end
-      end
-    end
-
-    context "when all users are in working hours" do
-      fab!(:topic_1) { Fabricate(:topic) }
-      fab!(:group_1) { Fabricate(:group) }
-      fab!(:user_1) { Fabricate(:user) }
-
-      before do
-        freeze_time("2022-10-01 02:00")
-        UserOption.find_by(user_id: user_1.id).update(timezone: "Europe/Paris")
-        group_1.add(user_1)
-      end
-
-      it "creates post on the topic" do
-        described_class.automation_script!(
-          {},
+        let(:fields) do
           {
-            "in_working_hours" => {
-              "value" => true,
+            "post_template" => {
+              "value" => "this is a post template",
             },
             "assignees_group" => {
               "value" => group_1.id,
@@ -179,73 +128,131 @@ describe RandomAssignUtils do
             "assigned_topic" => {
               "value" => topic_1.id,
             },
+          }
+        end
+
+        it "creates a post with the template and assign the user" do
+          auto_assign
+          expect(topic_1.posts.second.raw).to match("this is a post template")
+        end
+      end
+
+      context "when post_template is not set" do
+        let(:fields) do
+          {
+            "assignees_group" => {
+              "value" => group_1.id,
+            },
+            "assigned_topic" => {
+              "value" => topic_1.id,
+            },
+          }
+        end
+
+        it "assigns the user to the topic" do
+          auto_assign
+          expect(topic_1.assignment.assigned_to_id).to eq(user_1.id)
+        end
+      end
+    end
+
+    context "when all users are in working hours" do
+      let(:fields) do
+        {
+          "in_working_hours" => {
+            "value" => true,
           },
-          automation,
-        )
-        expect(topic_1.posts.first.raw).to match(
-          I18n.t("discourse_automation.scriptables.random_assign.no_one", group: group_1.name),
-        )
+          "assignees_group" => {
+            "value" => group_1.id,
+          },
+          "assigned_topic" => {
+            "value" => topic_1.id,
+          },
+        }
+      end
+
+      before do
+        freeze_time("2022-10-01 02:00")
+        UserOption.find_by(user_id: user_1.id).update(timezone: "Europe/Paris")
+      end
+
+      it "assigns the user to the topic" do
+        auto_assign
+        expect(topic_1.assignment.assigned_to).to eq(user_1)
+      end
+    end
+
+    context "when in a group of one person" do
+      let(:fields) do
+        {
+          "assignees_group" => {
+            "value" => group_1.id,
+          },
+          "assigned_topic" => {
+            "value" => topic_1.id,
+          },
+        }
+      end
+
+      context "when user is already assigned" do
+        before { described_class.automation_script!(ctx, fields, automation) }
+
+        it "reassigns them" do
+          expect { auto_assign }.to change { topic_1.reload.assignment.id }
+          expect(topic_1.assignment.assigned_to).to eq(user_1)
+        end
       end
     end
 
     context "when assignees_group is not provided" do
-      fab!(:topic_1) { Fabricate(:topic) }
+      let(:fields) { { "assigned_topic" => { "value" => topic_1.id } } }
 
       it "raises an error" do
-        expect {
-          described_class.automation_script!(
-            {},
-            { "assigned_topic" => { "value" => topic_1.id } },
-            automation,
-          )
-        }.to raise_error(/`assignees_group` not provided/)
+        expect { auto_assign }.to raise_error(/`assignees_group` not provided/)
       end
     end
 
     context "when assignees_group not found" do
-      fab!(:topic_1) { Fabricate(:topic) }
+      let(:fields) do
+        { "assigned_topic" => { "value" => topic_1.id }, "assignees_group" => { "value" => -1 } }
+      end
 
       it "raises an error" do
-        expect {
-          described_class.automation_script!(
-            {},
-            {
-              "assigned_topic" => {
-                "value" => topic_1.id,
-              },
-              "assignees_group" => {
-                "value" => -1,
-              },
-            },
-            automation,
-          )
-        }.to raise_error(/Group\(-1\) not found/)
+        expect { auto_assign }.to raise_error(/Group\(-1\) not found/)
       end
     end
 
     context "when assigned_topic not provided" do
       it "raises an error" do
-        expect { described_class.automation_script!({}, {}, automation) }.to raise_error(
-          /`assigned_topic` not provided/,
-        )
+        expect { auto_assign }.to raise_error(/`assigned_topic` not provided/)
       end
     end
 
     context "when assigned_topic is not found" do
+      let(:fields) do
+        { "assigned_topic" => { "value" => -1 }, "assignees_group" => { "value" => group_1.id } }
+      end
+
       it "raises an error" do
-        expect {
-          described_class.automation_script!(
-            {},
-            { "assigned_topic" => { "value" => 1 } },
-            automation,
-          )
-        }.to raise_error(/Topic\(1\) not found/)
+        expect { auto_assign }.to raise_error(/Topic\(-1\) not found/)
       end
     end
 
     context "when minimum_time_between_assignments is set" do
       context "when the topic has been assigned recently" do
-        fab!(:topic_1) { Fabricate(:topic) }
+        let(:fields) do
+          {
+            "assignees_group" => {
+              "value" => group_1.id,
+            },
+            "assigned_topic" => {
+              "value" => topic_1.id,
+            },
+            "minimum_time_between_assignments" => {
+              "value" => 10,
+            },
+          }
+        end
 
         before do
           freeze_time
@@ -257,18 +264,7 @@ describe RandomAssignUtils do
         end
 
         it "logs a warning" do
-          described_class.automation_script!(
-            {},
-            {
-              "assigned_topic" => {
-                "value" => topic_1.id,
-              },
-              "minimum_time_between_assignments" => {
-                "value" => 10,
-              },
-            },
-            automation,
-          )
+          auto_assign
           expect(Rails.logger.infos.first).to match(
             /Topic\(#{topic_1.id}\) has already been assigned recently/,
           )
@@ -277,40 +273,29 @@ describe RandomAssignUtils do
     end
 
     context "when skip_new_users_for_days is set" do
-      fab!(:topic_1) { Fabricate(:topic) }
-      fab!(:post_1) { Fabricate(:post, topic: topic_1) }
-      fab!(:group_1) { Fabricate(:group) }
-      fab!(:user_1) { Fabricate(:user) }
-
-      before do
-        SiteSetting.assign_allowed_on_groups = "#{group_1.id}"
-        group_1.add(user_1)
+      let(:fields) do
+        {
+          "assignees_group" => {
+            "value" => group_1.id,
+          },
+          "assigned_topic" => {
+            "value" => topic_1.id,
+          },
+          "skip_new_users_for_days" => {
+            "value" => "10",
+          },
+        }
       end
 
       it "creates post on the topic if all users are new" do
-        described_class.automation_script!(
-          {},
-          {
-            "assignees_group" => {
-              "value" => group_1.id,
-            },
-            "assigned_topic" => {
-              "value" => topic_1.id,
-            },
-            "skip_new_users_for_days" => {
-              "value" => "10",
-            },
-          },
-          automation,
-        )
+        auto_assign
         expect(topic_1.posts.last.raw).to match(
           I18n.t("discourse_automation.scriptables.random_assign.no_one", group: group_1.name),
         )
       end
 
-      it "assign topic if all users are old" do
-        described_class.automation_script!(
-          {},
+      context "when all users are old" do
+        let(:fields) do
           {
             "assignees_group" => {
               "value" => group_1.id,
@@ -321,46 +306,65 @@ describe RandomAssignUtils do
             "skip_new_users_for_days" => {
               "value" => "0",
             },
-          },
-          automation,
-        )
+          }
+        end
 
-        expect(topic_1.assignment).not_to eq(nil)
+        it "assigns topic" do
+          auto_assign
+          expect(topic_1.assignment).not_to be_nil
+        end
       end
     end
   end
 
-  describe ".recently_assigned_users_ids" do
+  describe "#recently_assigned_users_ids" do
+    subject(:assignees) { utils.recently_assigned_users_ids(2.months.ago) }
+
+    let(:utils) { described_class.new({}, fields, automation) }
+    let(:fields) do
+      {
+        "assignees_group" => {
+          "value" => assign_allowed_group.id,
+        },
+        "assigned_topic" => {
+          "value" => post.topic.id,
+        },
+      }
+    end
+    let(:post) { Fabricate(:post) }
+    let(:assign_allowed_group) { Group.find_by(name: "staff") }
+
     context "when no one has been assigned" do
       it "returns an empty array" do
-        assignees_ids = described_class.recently_assigned_users_ids(post.topic_id, 2.months.ago)
-        expect(assignees_ids).to eq([])
+        expect(assignees).to be_empty
       end
     end
 
     context "when users have been assigned" do
       let(:admin) { Fabricate(:admin) }
-      let(:assign_allowed_group) { Group.find_by(name: "staff") }
-      let(:user_1) { Fabricate(:user, groups: [assign_allowed_group]) }
-      let(:user_2) { Fabricate(:user, groups: [assign_allowed_group]) }
-      let(:user_3) { Fabricate(:user, groups: [assign_allowed_group]) }
-      let(:user_4) { Fabricate(:user, groups: [assign_allowed_group]) }
+      let!(:user_1) { Fabricate(:user, groups: [assign_allowed_group]) }
+      let!(:user_2) { Fabricate(:user, groups: [assign_allowed_group]) }
+      let!(:user_3) { Fabricate(:user, groups: [assign_allowed_group]) }
+      let!(:user_4) { Fabricate(:user, groups: [assign_allowed_group]) }
       let(:post_2) { Fabricate(:post, topic: post.topic) }
 
-      it "returns the recently assigned user ids" do
-        freeze_time 1.months.ago do
-          Assigner.new(post.topic, admin).assign(user_1)
-          Assigner.new(post.topic, admin).assign(user_2)
-          Assigner.new(post_2, admin).assign(user_4)
-        end
-
+      before do
         freeze_time 3.months.ago do
           Assigner.new(post.topic, admin).assign(user_3)
         end
+        freeze_time 45.days.ago do
+          Assigner.new(post_2, admin).assign(user_4)
+        end
+        freeze_time 30.days.ago do
+          Assigner.new(post.topic, admin).assign(user_1)
+        end
+        freeze_time 15.days.ago do
+          Assigner.new(post.topic, admin).assign(user_2)
+        end
+      end
 
-        assignees_ids = described_class.recently_assigned_users_ids(post.topic_id, 2.months.ago)
-
-        expect(assignees_ids).to contain_exactly(user_1.id, user_2.id, user_4.id)
+      it "returns the recently assigned user ids" do
+        expect(assignees).to eq([user_2, user_1, user_4].map(&:id))
       end
     end
   end
diff --git a/spec/models/assignment_spec.rb b/spec/models/assignment_spec.rb
index a223aa6..1b29305 100644
--- a/spec/models/assignment_spec.rb
+++ b/spec/models/assignment_spec.rb
@@ -2,26 +2,172 @@
 
 require "rails_helper"
 
-describe Assignment do
-  fab!(:group) { Fabricate(:group) }
-  fab!(:user1) { Fabricate(:user) }
-  fab!(:user2) { Fabricate(:user) }
-  fab!(:group_user1) { Fabricate(:group_user, user: user1, group: group) }
-  fab!(:group_user1) { Fabricate(:group_user, user: user2, group: group) }
-
-  fab!(:wrong_group) { Fabricate(:group) }
-
+RSpec.describe Assignment do
   before { SiteSetting.assign_enabled = true }
 
-  describe "#active_for_group" do
-    it "returns active assignments for the group" do
-      assignment1 = Fabricate(:topic_assignment, assigned_to: group)
-      assignment2 = Fabricate(:post_assignment, assigned_to: group)
+  describe ".active_for_group" do
+    subject(:assignments) { described_class.active_for_group(group) }
+
+    let!(:group) { Fabricate(:group) }
+    let!(:user1) { Fabricate(:user) }
+    let!(:user2) { Fabricate(:user) }
+    let!(:group_user1) { Fabricate(:group_user, user: user1, group: group) }
+    let!(:group_user2) { Fabricate(:group_user, user: user2, group: group) }
+    let!(:wrong_group) { Fabricate(:group) }
+    let!(:assignment1) { Fabricate(:topic_assignment, assigned_to: group) }
+    let!(:assignment2) { Fabricate(:post_assignment, assigned_to: group) }
+
+    before do
       Fabricate(:post_assignment, assigned_to: group, active: false)
       Fabricate(:post_assignment, assigned_to: user1)
       Fabricate(:topic_assignment, assigned_to: wrong_group)
+    end
 
-      expect(Assignment.active_for_group(group)).to contain_exactly(assignment1, assignment2)
+    it "returns active assignments for the group" do
+      expect(assignments).to contain_exactly(assignment1, assignment2)
+    end
+  end
+
+  describe "#assigned_users" do
+    subject(:assigned_users) { assignment.assigned_users }
+
+    let(:assignment) { Fabricate.build(:topic_assignment, assigned_to: assigned_to) }
+
+    context "when assigned to a group" do
+      let(:assigned_to) { Fabricate.build(:group) }
+
+      context "when group is empty" do
+        it "returns an empty collection" do
+          expect(assigned_users).to be_empty
+        end
+      end
+
+      context "when group is not empty" do
+        before { assigned_to.users = Fabricate.build_times(2, :user) }
+
+        it "returns users from that group" do
+          expect(assigned_users).to eq(assigned_to.users)
+        end
+      end
+    end
+
+    context "when assigned to a user" do
+      let(:assigned_to) { Fabricate.build(:user) }
+
+      it "returns that user" do
+        expect(assigned_users).to eq([assigned_to])
+      end
+    end
+  end
+
+  describe "#post" do
+    subject(:post) { assignment.post }
+
+    context "when target is a topic" do
+      let!(:initial_post) { Fabricate(:post) }
+      let(:assignment) { Fabricate.build(:topic_assignment, topic: target) }
+      let(:target) { initial_post.topic }
+
+      it "returns the first post of that topic" do
+        expect(post).to eq(initial_post)
+      end
+    end
+
+    context "when target is a post" do
+      let(:assignment) { Fabricate.build(:post_assignment) }
+
+      it "returns that post" do
+        expect(post).to eq(assignment.target)
+      end
+    end
+  end
+
+  describe "#create_missing_notifications!" do
+    subject(:create_missing_notifications) { assignment.create_missing_notifications! }
+
+    let(:assignment) do
+      Fabricate(:topic_assignment, assigned_to: assigned_to, assigned_by_user: assigned_by_user)
+    end
+    let(:assigned_by_user) { Fabricate(:user) }
+
+    context "when assigned to a user" do
+      let(:assigned_to) { Fabricate(:user) }
+
+      context "when notification already exists for that user" do
+        before do
+          Fabricate(
+            :notification,
+            notification_type: Notification.types[:assigned],
+            user: assigned_to,
+            data: { assignment_id: assignment.id }.to_json,
+          )
+        end
+
+        it "does nothing" do
+          DiscourseAssign::CreateNotification.expects(:call).never
+          create_missing_notifications
+        end
+      end
+
+      context "when notification does not exist yet" do
+        context "when user is the one that assigned" do
+          let(:assigned_by_user) { assigned_to }
+
+          it "creates the missing notification" do
+            DiscourseAssign::CreateNotification.expects(:call).with(
+              assignment: assignment,
+              user: assigned_to,
+              mark_as_read: true,
+            )
+            create_missing_notifications
+          end
+        end
+
+        context "when user is not the one that assigned" do
+          it "creates the missing notification" do
+            DiscourseAssign::CreateNotification.expects(:call).with(
+              assignment: assignment,
+              user: assigned_to,
+              mark_as_read: false,
+            )
+            create_missing_notifications
+          end
+        end
+      end
+    end
+
+    context "when assigned to a group" do
+      let(:assigned_to) { Fabricate(:group) }
+      let(:users) { Fabricate.times(3, :user) }
+      let(:assigned_by_user) { users.last }
+
+      before do
+        assigned_to.users = users
+        Fabricate(
+          :notification,
+          notification_type: Notification.types[:assigned],
+          user: users.first,
+          data: { assignment_id: assignment.id }.to_json,
+        )
+      end
+
+      it "creates missing notifications for group users" do
+        DiscourseAssign::CreateNotification
+          .expects(:call)
+          .with(assignment: assignment, user: users.first, mark_as_read: false)
+          .never
+        DiscourseAssign::CreateNotification.expects(:call).with(
+          assignment: assignment,
+          user: users.second,
+          mark_as_read: false,
+        )
+        DiscourseAssign::CreateNotification.expects(:call).with(
+          assignment: assignment,
+          user: users.last,
+          mark_as_read: true,
+        )
+        create_missing_notifications
+      end
     end
   end
 end
diff --git a/spec/plugin_spec.rb b/spec/plugin_spec.rb
index 6faddfe..1537b1f 100644
--- a/spec/plugin_spec.rb
+++ b/spec/plugin_spec.rb
@@ -2,38 +2,57 @@
 
 require "rails_helper"
 
-describe DiscourseAssign do
+RSpec.describe DiscourseAssign do
   before { SiteSetting.assign_enabled = true }
 
-  describe "events" do
-    describe "on user_removed_from_group" do
+  describe "Events" do
+    describe "on 'user_removed_from_group'" do
+      let(:group) { Fabricate(:group) }
+      let(:user) { Fabricate(:user) }
+      let(:first_assignment) { Fabricate(:topic_assignment, assigned_to: group) }
+      let(:second_assignment) { Fabricate(:post_assignment, assigned_to: group) }
+
       before do
-        @topic = Fabricate(:post).topic
-        @user = Fabricate(:user)
-        @group_a = Fabricate(:group)
-        @group_a.add(@user)
+        group.users << user
+        Fabricate(
+          :notification,
+          notification_type: Notification.types[:assigned],
+          user: user,
+          data: { assignment_id: first_assignment.id }.to_json,
+        )
+        Fabricate(
+          :notification,
+          notification_type: Notification.types[:assigned],
+          user: user,
+          data: { assignment_id: second_assignment.id }.to_json,
+        )
       end
 
-      it "unassigns the user" do
-        SiteSetting.assign_allowed_on_groups = @group_a.id.to_s
-
-        Assigner.new(@topic, Discourse.system_user).assign(@user)
-        @group_a.remove(@user)
-
-        expect(Assignment.count).to eq(0)
+      it "removes user's notifications related to group assignments" do
+        expect { group.remove(user) }.to change { user.notifications.assigned.count }.by(-2)
       end
+    end
 
-      it "doesn't unassign the user if it still has access through another group" do
-        @group_b = Fabricate(:group)
-        @group_b.add(@user)
-        SiteSetting.assign_allowed_on_groups = [@group_a.id.to_s, @group_b.id.to_s].join("|")
+    describe "on 'user_added_to_group'" do
+      let(:group) { Fabricate(:group) }
+      let(:user) { Fabricate(:user) }
+      let!(:first_assignment) { Fabricate(:topic_assignment, assigned_to: group) }
+      let!(:second_assignment) { Fabricate(:post_assignment, assigned_to: group) }
+      let!(:third_assignment) { Fabricate(:topic_assignment, assigned_to: group, active: false) }
 
-        Assigner.new(@topic, Discourse.system_user).assign(@user)
-        @group_a.remove(@user)
-
-        assignment = Assignment.first
-        expect(assignment.assigned_to_id).to eq(@user.id)
-        expect(assignment.assigned_by_user_id).to eq(Discourse::SYSTEM_USER_ID)
+      it "creates missing notifications for added user" do
+        group.add(user)
+        [first_assignment, second_assignment].each do |assignment|
+          expect_job_enqueued(job: Jobs::AssignNotification, args: { assignment_id: assignment.id })
+        end
+        expect(
+          job_enqueued?(
+            job: Jobs::AssignNotification,
+            args: {
+              assignment_id: third_assignment.id,
+            },
+          ),
+        ).to eq(false)
       end
     end
   end
diff --git a/spec/requests/assign_controller_spec.rb b/spec/requests/assign_controller_spec.rb
index 35870d2..5b938b2 100644
--- a/spec/requests/assign_controller_spec.rb
+++ b/spec/requests/assign_controller_spec.rb
@@ -379,7 +379,7 @@ RSpec.describe DiscourseAssign::AssignController do
 
         it "doesn't include members with no assignments" do
           sign_in(admin)
-          allowed_group.add(non_admin_staff)
+          allowed_group.users << non_admin_staff
 
           get "/assign/members/#{allowed_group.name}.json"
           expect(response.status).to eq(200)
@@ -458,138 +458,4 @@ RSpec.describe DiscourseAssign::AssignController do
       expect(response.status).to eq(200)
     end
   end
-
-  describe "#user_menu_assigns" do
-    fab!(:non_member_admin) { Fabricate(:admin) }
-
-    fab!(:unread_assigned_topic) { Fabricate(:post).topic }
-    fab!(:read_assigned_topic) { Fabricate(:post).topic }
-
-    fab!(:unread_assigned_post) { Fabricate(:post, topic: Fabricate(:post).topic) }
-    fab!(:read_assigned_post) { Fabricate(:post, topic: Fabricate(:post).topic) }
-
-    fab!(:read_assigned_post_in_same_topic) { Fabricate(:post, topic: Fabricate(:post).topic) }
-    fab!(:unread_assigned_post_in_same_topic) do
-      Fabricate(:post, topic: read_assigned_post_in_same_topic.topic)
-    end
-
-    fab!(:another_user_unread_assigned_topic) { Fabricate(:post).topic }
-    fab!(:another_user_read_assigned_topic) { Fabricate(:post).topic }
-
-    before do
-      Jobs.run_immediately!
-
-      [
-        unread_assigned_topic,
-        read_assigned_topic,
-        unread_assigned_post,
-        read_assigned_post,
-        unread_assigned_post_in_same_topic,
-        read_assigned_post_in_same_topic,
-      ].each { |target| Assigner.new(target, non_member_admin).assign(admin) }
-
-      Notification
-        .where(
-          notification_type: Notification.types[:assigned],
-          read: false,
-          user_id: admin.id,
-          topic_id: [
-            read_assigned_topic.id,
-            read_assigned_post.topic.id,
-            read_assigned_post_in_same_topic.topic.id,
-          ],
-        )
-        .where.not(
-          topic_id: read_assigned_post_in_same_topic.topic.id,
-          post_number: unread_assigned_post_in_same_topic.post_number,
-        )
-        .update_all(read: true)
-
-      Assigner.new(another_user_read_assigned_topic, non_member_admin).assign(allowed_user)
-      Assigner.new(another_user_unread_assigned_topic, non_member_admin).assign(allowed_user)
-      Notification.where(
-        notification_type: Notification.types[:assigned],
-        read: false,
-        user_id: allowed_user.id,
-        topic_id: another_user_read_assigned_topic,
-      ).update_all(read: true)
-    end
-
-    context "when logged out" do
-      it "responds with 403" do
-        get "/assign/user-menu-assigns.json"
-        expect(response.status).to eq(403)
-      end
-    end
-
-    context "when logged in" do
-      before { sign_in(admin) }
-
-      it "responds with 403 if the current user can't assign" do
-        admin.update!(admin: false)
-        admin.group_users.where(group_id: staff_group.id).destroy_all
-        get "/assign/user-menu-assigns.json"
-        expect(response.status).to eq(403)
-      end
-
-      it "responds with 404 if the assign_enabled setting is disabled" do
-        SiteSetting.assign_enabled = false
-        get "/assign/user-menu-assigns.json"
-        expect(response.status).to eq(404)
-      end
-
-      it "sends an array of unread assigned notifications" do
-        get "/assign/user-menu-assigns.json"
-        expect(response.status).to eq(200)
-
-        notifications = response.parsed_body["notifications"]
-        expect(notifications.map { |n| [n["topic_id"], n["post_number"]] }).to match_array(
-          [
-            [unread_assigned_topic.id, 1],
-            [unread_assigned_post.topic.id, unread_assigned_post.post_number],
-            [
-              unread_assigned_post_in_same_topic.topic.id,
-              unread_assigned_post_in_same_topic.post_number,
-            ],
-          ],
-        )
-      end
-
-      it "responds with an array of assigned topics that are not associated with any of the unread assigned notifications" do
-        get "/assign/user-menu-assigns.json"
-        expect(response.status).to eq(200)
-
-        topics = response.parsed_body["topics"]
-        expect(topics.map { |t| t["id"] }).to eq(
-          [
-            read_assigned_post_in_same_topic.topic.id,
-            read_assigned_post.topic.id,
-            read_assigned_topic.id,
-          ],
-        )
-      end
-
-      it "fills up the remaining of the UsersController::USER_MENU_LIST_LIMIT limit with assigned topics" do
-        stub_const(UsersController, "USER_MENU_LIST_LIMIT", 3) do
-          get "/assign/user-menu-assigns.json"
-        end
-        expect(response.status).to eq(200)
-
-        notifications = response.parsed_body["notifications"]
-        expect(notifications.size).to eq(3)
-        topics = response.parsed_body["topics"]
-        expect(topics.size).to eq(0)
-
-        stub_const(UsersController, "USER_MENU_LIST_LIMIT", 4) do
-          get "/assign/user-menu-assigns.json"
-        end
-        expect(response.status).to eq(200)
-
-        notifications = response.parsed_body["notifications"]
-        expect(notifications.size).to eq(3)
-        topics = response.parsed_body["topics"]
-        expect(topics.size).to eq(1)
-      end
-    end
-  end
 end
diff --git a/spec/system/assign_topic_spec.rb b/spec/system/assign_topic_spec.rb
index 29b8e14..873ea5c 100644
--- a/spec/system/assign_topic_spec.rb
+++ b/spec/system/assign_topic_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Assign | Assigning topics", type: :system, js: true do
+describe "Assign | Assigning topics", type: :system, capture_log: true do
   let(:topic_page) { PageObjects::Pages::Topic.new }
   let(:assign_modal) { PageObjects::Modals::Assign.new }
   fab!(:staff_user) { Fabricate(:user, groups: [Group[:staff]]) }
@@ -10,6 +10,10 @@ describe "Assign | Assigning topics", type: :system, js: true do
 
   before do
     SiteSetting.assign_enabled = true
+
+    # The system tests in this file are flaky and auth token related so turning this on
+    SiteSetting.verbose_auth_token_logging = true
+
     sign_in(admin)
   end
 
@@ -73,7 +77,7 @@ describe "Assign | Assigning topics", type: :system, js: true do
         expect(page).to have_no_css("#topic .assigned-to")
       end
 
-      xit "can assign the previous assignee" do
+      it "can assign the previous assignee" do
         visit "/t/#{topic.id}"
 
         topic_page.click_assign_topic
@@ -103,7 +107,7 @@ describe "Assign | Assigning topics", type: :system, js: true do
       context "when reassign_on_open is set to true" do
         before { SiteSetting.reassign_on_open = true }
 
-        skip "reassigns the topic on open" do
+        it "reassigns the topic on open" do
           visit "/t/#{topic.id}"
 
           topic_page.click_assign_topic
diff --git a/spec/system/page_objects/modals/assign.rb b/spec/system/page_objects/modals/assign.rb
index afe51e9..91e4fea 100644
--- a/spec/system/page_objects/modals/assign.rb
+++ b/spec/system/page_objects/modals/assign.rb
@@ -19,7 +19,7 @@ module PageObjects
       end
 
       def confirm
-        find(".modal-footer .btn-primary").click
+        find(".d-modal__footer .btn-primary").click
       end
     end
   end
diff --git a/spec/system/page_objects/pages/user_menu.rb b/spec/system/page_objects/pages/user_menu.rb
new file mode 100644
index 0000000..e75f5d5
--- /dev/null
+++ b/spec/system/page_objects/pages/user_menu.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class UserMenu < PageObjects::Components::Base
+      def click_assignments_tab
+        click_link("user-menu-button-assign-list")
+        has_css?("#quick-access-assign-list")
+        self
+      end
+
+      def has_assignments_in_order?(assignments)
+        expect(all(".notification.assigned .item-description").map(&:text)).to eq(assignments)
+      end
+    end
+  end
+end
diff --git a/spec/system/user_menu_spec.rb b/spec/system/user_menu_spec.rb
new file mode 100644
index 0000000..73f22b3
--- /dev/null
+++ b/spec/system/user_menu_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+RSpec.describe "Assign | User Menu", type: :system, js: true do
+  fab!(:admin) { Fabricate(:admin) }
+
+  let(:user_menu) { PageObjects::Components::UserMenu.new }
+
+  before do
+    SiteSetting.assign_enabled = true
+    sign_in(admin)
+  end
+
+  describe "Assign tab ordering" do
+    let!(:unread_user_assign) { Fabricate(:assignment_notification, user: admin) }
+    let!(:unread_user_assign_2) { Fabricate(:assignment_notification, user: admin) }
+    let!(:read_user_assign) { Fabricate(:assignment_notification, user: admin, read: true) }
+    let!(:read_user_assign_2) { Fabricate(:assignment_notification, user: admin, read: true) }
+    let!(:unread_group_assign) { Fabricate(:assignment_notification, user: admin, group: true) }
+    let!(:read_group_assign) do
+      Fabricate(:assignment_notification, user: admin, read: true, group: true)
+    end
+    let(:expected_order) do
+      [
+        unread_user_assign_2,
+        unread_user_assign,
+        unread_group_assign,
+        read_user_assign_2,
+        read_user_assign,
+        read_group_assign,
+      ].map { _1.topic.fancy_title }
+    end
+
+    it "orders the items properly" do
+      visit "/"
+      user_menu.open
+      user_menu.click_assignments_tab
+      expect(user_menu).to have_assignments_in_order(expected_order)
+    end
+  end
+end
diff --git a/test/javascripts/acceptance/assign-disabled-test.js b/test/javascripts/acceptance/assign-disabled-test.js
index 206e2dd..9fefca2 100644
--- a/test/javascripts/acceptance/assign-disabled-test.js
+++ b/test/javascripts/acceptance/assign-disabled-test.js
@@ -1,7 +1,7 @@
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("Discourse Assign | Assign disabled mobile", function (needs) {
   needs.user({ can_assign: true });
diff --git a/test/javascripts/acceptance/assign-enabled-test.js b/test/javascripts/acceptance/assign-enabled-test.js
index 13ed78a..9c0d211 100644
--- a/test/javascripts/acceptance/assign-enabled-test.js
+++ b/test/javascripts/acceptance/assign-enabled-test.js
@@ -1,16 +1,16 @@
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { cloneJSON } from "discourse-common/lib/object";
-import userFixtures from "discourse/tests/fixtures/user-fixtures";
-import {
-  acceptance,
-  updateCurrentUser,
-} from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
+import userFixtures from "discourse/tests/fixtures/user-fixtures";
 import pretender, {
   parsePostData,
   response,
 } from "discourse/tests/helpers/create-pretender";
+import {
+  acceptance,
+  updateCurrentUser,
+} from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { cloneJSON } from "discourse-common/lib/object";
 
 acceptance("Discourse Assign | Assign mobile", function (needs) {
   needs.user();
@@ -44,7 +44,7 @@ acceptance("Discourse Assign | Assign mobile", function (needs) {
 
     assert.true(menu.rowByValue("assign").exists());
     await menu.selectRowByValue("assign");
-    assert.dom(".assign.modal").exists("assign modal opens");
+    assert.dom(".assign.d-modal").exists("assign modal opens");
   });
 });
 
@@ -86,12 +86,12 @@ acceptance("Discourse Assign | Assign desktop", function (needs) {
       .exists("assign to post button exists");
 
     await click("#post_2 .extra-buttons .d-icon-user-plus");
-    assert.dom(".assign.modal").exists("assign modal opens");
+    assert.dom(".assign.d-modal").exists("assign modal opens");
 
-    const menu = selectKit(".assign.modal .user-chooser");
+    const menu = selectKit(".assign.d-modal .user-chooser");
     assert.true(menu.isExpanded(), "user selector is expanded");
 
-    await click(".assign.modal .btn-primary");
+    await click(".assign.d-modal .btn-primary");
     assert.dom(".error-label").includesText("Choose a user to assign");
 
     await menu.expand();
@@ -108,16 +108,16 @@ acceptance("Discourse Assign | Assign desktop", function (needs) {
     });
 
     await fillIn("#assign-modal-note", "a note!");
-    await click(".assign.modal .btn-primary");
+    await click(".assign.d-modal .btn-primary");
 
-    assert.dom(".assign.modal").doesNotExist("assign modal closes");
+    assert.dom(".assign.d-modal").doesNotExist("assign modal closes");
   });
 
   test("Footer dropdown contains button", async function (assert) {
     await visit("/t/internationalization-localization/280");
     await click("#topic-footer-button-assign");
 
-    assert.dom(".assign.modal").exists("assign modal opens");
+    assert.dom(".assign.d-modal").exists("assign modal opens");
   });
 });
 
@@ -151,12 +151,35 @@ acceptance("Discourse Assign | Assign Status enabled", function (needs) {
   });
 
   test("Modal contains status dropdown", async function (assert) {
+    pretender.put("/assign/assign", ({ requestBody }) => {
+      const body = parsePostData(requestBody);
+      assert.strictEqual(body.target_type, "Topic");
+      assert.strictEqual(body.target_id, "280");
+      assert.strictEqual(body.username, "eviltrout");
+      assert.strictEqual(body.status, "In Progress");
+
+      return response({ success: true });
+    });
+
     await visit("/t/internationalization-localization/280");
     await click("#topic-footer-button-assign");
 
     assert
-      .dom(".assign.modal #assign-status")
+      .dom(".assign.d-modal #assign-status")
       .exists("assign status dropdown exists");
+
+    const statusDropdown = selectKit("#assign-status");
+    assert.strictEqual(statusDropdown.header().value(), "New");
+
+    await statusDropdown.expand();
+    await statusDropdown.selectRowByValue("In Progress");
+    assert.strictEqual(statusDropdown.header().value(), "In Progress");
+
+    const menu = selectKit(".assign.d-modal .user-chooser");
+    await menu.expand();
+    await menu.selectRowByIndex(0);
+
+    await click(".assign.d-modal .btn-primary");
   });
 });
 
@@ -190,7 +213,7 @@ acceptance("Discourse Assign | Assign Status disabled", function (needs) {
     await click("#topic-footer-button-assign");
 
     assert
-      .dom(".assign.modal #assign-status")
+      .dom(".assign.d-modal #assign-status")
       .doesNotExist("assign status dropdown doesn't exists");
   });
 });
diff --git a/test/javascripts/acceptance/assigned-topic-test.js b/test/javascripts/acceptance/assigned-topic-test.js
index ffc0fa5..3a96678 100644
--- a/test/javascripts/acceptance/assigned-topic-test.js
+++ b/test/javascripts/acceptance/assigned-topic-test.js
@@ -1,14 +1,14 @@
+import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
+import topicFixtures from "discourse/tests/fixtures/topic";
 import {
   acceptance,
   query,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import { cloneJSON } from "discourse-common/lib/object";
 import I18n from "I18n";
-import topicFixtures from "discourse/tests/fixtures/topic";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
 import NotificationFixture from "../fixtures/notifications-fixtures";
 
 function assignCurrentUserToTopic(needs) {
@@ -159,11 +159,11 @@ acceptance("Discourse Assign | Assigned topic", function (needs) {
     await visit("/u/eviltrout/notifications");
 
     const notification = query(
-      "section.user-content ul.notifications li.item.notification"
+      "section.user-content .user-notifications-list li.notification"
     );
 
     assert.true(
-      notification.children[0].classList.contains("assigned"),
+      notification.classList.contains("assigned"),
       "with correct assigned class"
     );
 
diff --git a/test/javascripts/acceptance/assigns-tab-user-menu-test.js b/test/javascripts/acceptance/assigns-tab-user-menu-test.js
index 25c762a..394dc22 100644
--- a/test/javascripts/acceptance/assigns-tab-user-menu-test.js
+++ b/test/javascripts/acceptance/assigns-tab-user-menu-test.js
@@ -1,13 +1,12 @@
+import { click, currentURL, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 import {
   acceptance,
   query,
   queryAll,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { click, currentURL, visit } from "@ember/test-helpers";
-import { test } from "qunit";
 import I18n from "I18n";
-import { withPluginApi } from "discourse/lib/plugin-api";
 
 const USER_MENU_ASSIGN_RESPONSE = {
   notifications: [
@@ -20,179 +19,32 @@ const USER_MENU_ASSIGN_RESPONSE = {
       created_at: "2022-08-11T21:32:32.404Z",
       post_number: 1,
       topic_id: 227,
-      fancy_title: "Test poll topic please bear with me",
+      fancy_title: "Test poll topic please bear with me :heart:",
       slug: "test-poll-topic-please-bear-with-me",
       data: {
         message: "discourse_assign.assign_notification",
         display_username: "tony",
-        topic_title: "Test poll topic please bear with me",
+        topic_title: "Test poll topic please bear with me :heart:",
         assignment_id: 2,
       },
     },
-  ],
-  topics: [
     {
-      id: 209,
-      title: "Howdy this a test topic!",
-      fancy_title: "Howdy this <b>my test topic</b> with emoji :heart:!",
-      slug: "howdy-this-a-test-topic",
-      posts_count: 1,
-      reply_count: 0,
-      highest_post_number: 1,
-      image_url: null,
-      created_at: "2022-03-10T20:09:25.772Z",
-      last_posted_at: "2022-03-10T20:09:25.959Z",
-      bumped: true,
-      bumped_at: "2022-03-10T20:09:25.959Z",
-      archetype: "regular",
-      unseen: false,
-      last_read_post_number: 2,
-      unread: 0,
-      new_posts: 0,
-      unread_posts: 0,
-      pinned: false,
-      unpinned: null,
-      visible: true,
-      closed: false,
-      archived: false,
-      notification_level: 3,
-      bookmarked: false,
-      liked: false,
-      thumbnails: null,
-      tags: [],
-      tags_descriptions: {},
-      views: 11,
-      like_count: 7,
-      has_summary: false,
-      last_poster_username: "osama",
-      category_id: 1,
-      pinned_globally: false,
-      featured_link: null,
-      assigned_to_user: {
-        id: 1,
-        username: "osama",
-        name: "Osama.OG",
-        avatar_template: "/letter_avatar_proxy/v4/letter/o/f05b48/{size}.png",
-        assign_icon: "user-plus",
-        assign_path: "/u/osama/activity/assigned",
+      id: 1717,
+      user_id: 1,
+      notification_type: 34,
+      read: true,
+      high_priority: true,
+      created_at: "2022-08-11T21:32:32.404Z",
+      post_number: 1,
+      topic_id: 228,
+      fancy_title: "Test poll topic please bear with me 2 :ok_hand:",
+      slug: "test-poll-topic-please-bear-with-me-2",
+      data: {
+        message: "discourse_assign.assign_group_notification",
+        display_username: "Team",
+        topic_title: "Test poll topic please bear with me 2 :ok_hand:",
+        assignment_id: 3,
       },
-      posters: [
-        {
-          extras: "latest single",
-          description: "Original Poster, Most Recent Poster",
-          user_id: 1,
-          primary_group_id: 45,
-          flair_group_id: 45,
-        },
-      ],
-    },
-    {
-      id: 173,
-      title: "Owners elegance entrance startled spirits losing",
-      fancy_title:
-        "Owners <i>elegance entrance :car: startled</i> spirits losing",
-      slug: "owners-elegance-entrance-startled-spirits-losing",
-      posts_count: 7,
-      reply_count: 0,
-      highest_post_number: 7,
-      image_url: null,
-      created_at: "2021-07-11T04:50:17.029Z",
-      last_posted_at: "2021-12-24T17:21:03.418Z",
-      bumped: true,
-      bumped_at: "2021-12-24T17:21:03.418Z",
-      archetype: "regular",
-      unseen: false,
-      last_read_post_number: 3,
-      unread: 0,
-      new_posts: 0,
-      unread_posts: 0,
-      pinned: false,
-      unpinned: null,
-      visible: true,
-      closed: false,
-      archived: false,
-      notification_level: 1,
-      bookmarked: false,
-      liked: false,
-      thumbnails: null,
-      tags: ["music", "job-application"],
-      tags_descriptions: {},
-      views: 23,
-      like_count: 24,
-      has_summary: false,
-      last_poster_username: "ambrose.bradtke",
-      category_id: 1,
-      pinned_globally: false,
-      featured_link: null,
-      assigned_to_group: {
-        id: 45,
-        automatic: false,
-        name: "Team",
-        user_count: 4,
-        mentionable_level: 99,
-        messageable_level: 99,
-        visibility_level: 0,
-        primary_group: true,
-        title: "",
-        grant_trust_level: null,
-        incoming_email: null,
-        has_messages: true,
-        flair_url: null,
-        flair_bg_color: "",
-        flair_color: "",
-        bio_raw: "",
-        bio_cooked: null,
-        bio_excerpt: null,
-        public_admission: true,
-        public_exit: true,
-        allow_membership_requests: false,
-        full_name: "",
-        default_notification_level: 3,
-        membership_request_template: "",
-        members_visibility_level: 0,
-        can_see_members: true,
-        can_admin_group: true,
-        publish_read_state: true,
-        assign_icon: "group-plus",
-        assign_path: "/g/Team/assigned/everyone",
-      },
-      posters: [
-        {
-          extras: null,
-          description: "Original Poster",
-          user_id: 26,
-          primary_group_id: null,
-          flair_group_id: null,
-        },
-        {
-          extras: null,
-          description: "Frequent Poster",
-          user_id: 16,
-          primary_group_id: null,
-          flair_group_id: null,
-        },
-        {
-          extras: null,
-          description: "Frequent Poster",
-          user_id: 22,
-          primary_group_id: null,
-          flair_group_id: null,
-        },
-        {
-          extras: null,
-          description: "Frequent Poster",
-          user_id: 12,
-          primary_group_id: null,
-          flair_group_id: null,
-        },
-        {
-          extras: "latest",
-          description: "Most Recent Poster",
-          user_id: 13,
-          primary_group_id: null,
-          flair_group_id: null,
-        },
-      ],
     },
   ],
 };
@@ -250,9 +102,9 @@ acceptance("Discourse Assign | user menu", function (needs) {
   let requestBody;
 
   needs.pretender((server, helper) => {
-    server.get("/assign/user-menu-assigns.json", () => {
+    server.get("/notifications", () => {
       if (forceEmptyState) {
-        return helper.response({ notifications: [], topics: [] });
+        return helper.response({ notifications: [] });
       } else {
         return helper.response(USER_MENU_ASSIGN_RESPONSE);
       }
@@ -321,7 +173,9 @@ acceptance("Discourse Assign | user menu", function (needs) {
     await click(".d-header-icons .current-user");
     await click("#user-menu-button-assign-list");
 
-    const notifications = queryAll("#quick-access-assign-list .notification");
+    const notifications = queryAll(
+      "#quick-access-assign-list .notification.unread"
+    );
     assert.strictEqual(
       notifications.length,
       1,
@@ -336,7 +190,7 @@ acceptance("Discourse Assign | user menu", function (needs) {
       "the notification is of type assigned"
     );
 
-    const assigns = queryAll("#quick-access-assign-list .assign");
+    const assigns = queryAll("#quick-access-assign-list .assigned");
     assert.strictEqual(assigns.length, 2, "there are 2 assigns");
 
     const userAssign = assigns[0];
@@ -353,59 +207,44 @@ acceptance("Discourse Assign | user menu", function (needs) {
     assert.true(
       userAssign
         .querySelector("a")
-        .href.endsWith("/t/howdy-this-a-test-topic/209/3"),
-      "user assign links to the first unread post (last read post + 1)"
+        .href.endsWith("/t/test-poll-topic-please-bear-with-me/227"),
+      "user assign links to the assigned topic"
     );
     assert.true(
       groupAssign
         .querySelector("a")
-        .href.endsWith(
-          "/t/owners-elegance-entrance-startled-spirits-losing/173/4"
-        ),
-      "group assign links to the first unread post (last read post + 1)"
+        .href.endsWith("/t/test-poll-topic-please-bear-with-me-2/228"),
+      "group assign links to the assigned topic"
     );
 
     assert.strictEqual(
       userAssign.textContent.trim(),
-      "Howdy this my test topic with emoji !",
+      "Test poll topic please bear with me",
       "user assign contains the topic title"
     );
     assert.ok(
       userAssign.querySelector(".item-description img.emoji"),
       "emojis are rendered in user assign"
     );
-    assert.strictEqual(
-      userAssign.querySelector(".item-description b").textContent.trim(),
-      "my test topic",
-      "user assign topic title is trusted"
-    );
 
     assert.strictEqual(
       groupAssign.textContent.trim().replaceAll(/\s+/g, " "),
-      "Owners elegance entrance startled spirits losing",
+      "Team Test poll topic please bear with me 2",
       "group assign contains the topic title"
     );
     assert.ok(
-      groupAssign.querySelector(".item-description i img.emoji"),
+      groupAssign.querySelector(".item-description img.emoji"),
       "emojis are rendered in group assign"
     );
-    assert.strictEqual(
-      groupAssign
-        .querySelector(".item-description i")
-        .textContent.trim()
-        .replaceAll(/\s+/g, " "),
-      "elegance entrance startled",
-      "group assign topic title is trusted"
-    );
 
     assert.strictEqual(
       userAssign.querySelector("a").title,
-      I18n.t("user.assigned_to_you"),
+      I18n.t("user.assigned_to_you.topic"),
       "user assign has the right title"
     );
     assert.strictEqual(
       groupAssign.querySelector("a").title,
-      I18n.t("user.assigned_to_group", { group_name: "Team" }),
+      I18n.t("user.assigned_to_group.topic", { group_name: "Team" }),
       "group assign has the right title"
     );
   });
@@ -423,13 +262,13 @@ acceptance("Discourse Assign | user menu", function (needs) {
     assert.false(markRead, "mark-read request isn't sent");
     assert.strictEqual(
       query(
-        ".dismiss-notification-confirmation .modal-body"
+        ".dismiss-notification-confirmation .d-modal__body"
       ).textContent.trim(),
       I18n.t("notifications.dismiss_confirmation.body.assigns", { count: 173 }),
       "dismiss confirmation modal is shown"
     );
 
-    await click(".modal-footer .btn-primary");
+    await click(".d-modal__footer .btn-primary");
     assert.true(markRead, "mark-read request is sent");
     assert.dom(".notifications-dismiss").doesNotExist("dismiss button is gone");
     assert
@@ -466,37 +305,6 @@ acceptance("Discourse Assign | user menu", function (needs) {
     );
   });
 
-  test("assigns tab applies model transformations", async function (assert) {
-    withPluginApi("0.1", (api) => {
-      api.registerModelTransformer("notification", (notifications) => {
-        notifications.forEach((notification) => {
-          notification.fancy_title = `notificationModelTransformer ${notification.fancy_title}`;
-        });
-      });
-      api.registerModelTransformer("topic", (topics) => {
-        topics.forEach((topic) => {
-          topic.fancy_title = `topicModelTransformer ${topic.fancy_title}`;
-        });
-      });
-    });
-
-    await visit("/");
-    await click(".d-header-icons .current-user");
-    await click("#user-menu-button-assign-list");
-
-    const notification = query("#quick-access-assign-list ul li.notification");
-    assert.strictEqual(
-      notification.textContent.replace(/\s+/g, " ").trim(),
-      "tony notificationModelTransformer Test poll topic please bear with me"
-    );
-
-    const assign = query("#quick-access-assign-list ul li.assign");
-    assert.strictEqual(
-      assign.textContent.replace(/\s+/g, " ").trim(),
-      "topicModelTransformer Howdy this my test topic with emoji !"
-    );
-  });
-
   test("renders the confirmation modal when dismiss assign notifications", async function (assert) {
     await visit("/");
     await click(".d-header-icons .current-user");
@@ -504,7 +312,7 @@ acceptance("Discourse Assign | user menu", function (needs) {
     await click(".notifications-dismiss");
     assert.false(markRead, "a request to the server is not made");
     assert
-      .dom(".dismiss-notification-confirmation .modal-body")
+      .dom(".dismiss-notification-confirmation .d-modal__body")
       .exists("the dismiss notification confirmation modal is present");
   });
 });
diff --git a/test/javascripts/acceptance/bulk-actions-test.js b/test/javascripts/acceptance/bulk-actions-test.js
index 5745339..a79005d 100644
--- a/test/javascripts/acceptance/bulk-actions-test.js
+++ b/test/javascripts/acceptance/bulk-actions-test.js
@@ -1,11 +1,11 @@
-import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
 import { click, fillIn, visit } from "@ember/test-helpers";
-import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
 import pretender, {
   parsePostData,
   response,
 } from "discourse/tests/helpers/create-pretender";
+import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 import I18n from "I18n";
 
 acceptance("Discourse Assign | Bulk actions", function (needs) {
@@ -13,7 +13,10 @@ acceptance("Discourse Assign | Bulk actions", function (needs) {
     moderator: true,
     can_assign: true,
   });
-  needs.settings({ assign_enabled: true });
+  needs.settings({
+    assign_enabled: true,
+    enable_assign_status: true,
+  });
 
   needs.pretender((server, helper) => {
     server.get("/assign/suggestions", () => {
@@ -35,6 +38,22 @@ acceptance("Discourse Assign | Bulk actions", function (needs) {
   });
 
   test("Assigning users to topics", async function (assert) {
+    pretender.put("/topics/bulk", ({ requestBody }) => {
+      const body = parsePostData(requestBody);
+      assert.deepEqual(body.operation, {
+        type: "assign",
+        username: "eviltrout",
+        status: "In Progress",
+        note: "a note!",
+      });
+      assert.deepEqual(body["topic_ids[]"], [
+        topic1.dataset.topicId,
+        topic2.dataset.topicId,
+      ]);
+
+      return response({ success: true });
+    });
+
     await visit("/latest");
     await click("button.bulk-select");
 
@@ -61,22 +80,15 @@ acceptance("Discourse Assign | Bulk actions", function (needs) {
     await menu.selectRowByIndex(0);
     assert.strictEqual(menu.header().value(), "eviltrout");
 
-    pretender.put("/topics/bulk", ({ requestBody }) => {
-      const body = parsePostData(requestBody);
-      assert.deepEqual(body.operation, {
-        type: "assign",
-        username: "eviltrout",
-        note: "a note!",
-      });
-      assert.deepEqual(body["topic_ids[]"], [
-        topic1.dataset.topicId,
-        topic2.dataset.topicId,
-      ]);
-
-      return response({ success: true });
-    });
-
     await fillIn("#assign-modal-note", "a note!");
+
+    const statusDropdown = selectKit("#assign-status");
+    assert.strictEqual(statusDropdown.header().value(), "New");
+
+    await statusDropdown.expand();
+    await statusDropdown.selectRowByValue("In Progress");
+    assert.strictEqual(statusDropdown.header().value(), "In Progress");
+
     await click(".topic-bulk-actions-modal .btn-primary");
   });
 });
diff --git a/test/javascripts/acceptance/category-test.js b/test/javascripts/acceptance/category-test.js
index ce9dd89..e393cc7 100644
--- a/test/javascripts/acceptance/category-test.js
+++ b/test/javascripts/acceptance/category-test.js
@@ -1,8 +1,8 @@
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
-import I18n from "I18n";
 import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import I18n from "I18n";
 
 function stubCategory(needs, customFields) {
   needs.site({
diff --git a/test/javascripts/acceptance/group-assignments-test.js b/test/javascripts/acceptance/group-assignments-test.js
index ffe886a..4cee446 100644
--- a/test/javascripts/acceptance/group-assignments-test.js
+++ b/test/javascripts/acceptance/group-assignments-test.js
@@ -1,8 +1,8 @@
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import AssignedTopics from "../fixtures/assigned-group-assignments-fixtures";
 import GroupMembers from "../fixtures/group-members-fixtures";
-import { test } from "qunit";
 
 acceptance("Discourse Assign | GroupAssignments", function (needs) {
   needs.user();
diff --git a/test/javascripts/acceptance/never-track-assign-reason-test.js b/test/javascripts/acceptance/never-track-assign-reason-test.js
index 767ac84..54279ab 100644
--- a/test/javascripts/acceptance/never-track-assign-reason-test.js
+++ b/test/javascripts/acceptance/never-track-assign-reason-test.js
@@ -1,11 +1,11 @@
+import { visit } from "@ember/test-helpers";
 import { test } from "qunit";
+import topicFixtures from "discourse/tests/fixtures/topic";
 import {
   acceptance,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
 import { cloneJSON } from "discourse-common/lib/object";
-import topicFixtures from "discourse/tests/fixtures/topic";
 
 acceptance(
   "Discourse Assign | Never track topics assign reason",
diff --git a/test/javascripts/acceptance/search-full-test.js b/test/javascripts/acceptance/search-full-test.js
index 2d049cc..43ffaee 100644
--- a/test/javascripts/acceptance/search-full-test.js
+++ b/test/javascripts/acceptance/search-full-test.js
@@ -1,7 +1,7 @@
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { fillIn, visit } from "@ember/test-helpers";
 import { test } from "qunit";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("Discourse Assign | Search - Full Page", function (needs) {
   needs.settings({ assign_enabled: true });
diff --git a/test/javascripts/acceptance/user-assignments-list-test.js b/test/javascripts/acceptance/user-assignments-list-test.js
index 713f9d9..f2352ca 100644
--- a/test/javascripts/acceptance/user-assignments-list-test.js
+++ b/test/javascripts/acceptance/user-assignments-list-test.js
@@ -1,9 +1,9 @@
-import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 import { visit } from "@ember/test-helpers";
-import AssignedTopics from "../fixtures/assigned-topics-fixtures";
-import { cloneJSON } from "discourse-common/lib/object";
 import { test } from "qunit";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { cloneJSON } from "discourse-common/lib/object";
+import AssignedTopics from "../fixtures/assigned-topics-fixtures";
 
 acceptance(
   "Discourse Assign | Unassign/reassign from the topics list",
diff --git a/test/javascripts/acceptance/user-private-messages-assigned-test.js b/test/javascripts/acceptance/user-private-messages-assigned-test.js
index 0112b29..e6945b2 100644
--- a/test/javascripts/acceptance/user-private-messages-assigned-test.js
+++ b/test/javascripts/acceptance/user-private-messages-assigned-test.js
@@ -1,13 +1,13 @@
-import I18n from "I18n";
+import { currentURL, visit } from "@ember/test-helpers";
+import { test } from "qunit";
 import {
   acceptance,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import { currentURL, visit } from "@ember/test-helpers";
-import AssignedTopics from "../fixtures/assigned-topics-fixtures";
-import { cloneJSON } from "discourse-common/lib/object";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { test } from "qunit";
+import { cloneJSON } from "discourse-common/lib/object";
+import I18n from "I18n";
+import AssignedTopics from "../fixtures/assigned-topics-fixtures";
 
 acceptance("Discourse Assign | User Private Messages", function (needs) {
   needs.user({
diff --git a/test/javascripts/integration/components/group-assigned-filter-test.js b/test/javascripts/integration/components/group-assigned-filter-test.js
index 325cd19..6472301 100644
--- a/test/javascripts/integration/components/group-assigned-filter-test.js
+++ b/test/javascripts/integration/components/group-assigned-filter-test.js
@@ -1,8 +1,8 @@
+import hbs from "htmlbars-inline-precompile";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
 import { discourseModule, query } from "discourse/tests/helpers/qunit-helpers";
-import hbs from "htmlbars-inline-precompile";
 
 discourseModule(
   "Discourse Assign | Integration | Component | group-assigned-filter",
diff --git a/test/javascripts/integrations/components/group-assigned-filter-test.js b/test/javascripts/integrations/components/group-assigned-filter-test.js
index 325cd19..6472301 100644
--- a/test/javascripts/integrations/components/group-assigned-filter-test.js
+++ b/test/javascripts/integrations/components/group-assigned-filter-test.js
@@ -1,8 +1,8 @@
+import hbs from "htmlbars-inline-precompile";
 import componentTest, {
   setupRenderingTest,
 } from "discourse/tests/helpers/component-test";
 import { discourseModule, query } from "discourse/tests/helpers/qunit-helpers";
-import hbs from "htmlbars-inline-precompile";
 
 discourseModule(
   "Discourse Assign | Integration | Component | group-assigned-filter",
diff --git a/yarn.lock b/yarn.lock
index 89f6f59..bec4c80 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
 "@ampproject/remapping@^2.2.0":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
@@ -10,54 +15,99 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
-  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
+"@babel/code-frame@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
   dependencies:
-    "@babel/highlight" "^7.22.5"
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
 
-"@babel/compat-data@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
-  integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
+"@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
 
-"@babel/core@^7.18.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
-  integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
+"@babel/compat-data@^7.22.9":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
+  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
+
+"@babel/compat-data@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
+  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+
+"@babel/core@^7.18.6", "@babel/core@^7.20.12":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
+  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helpers" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
-    "@babel/types" "^7.22.5"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helpers" "^7.23.2"
+    "@babel/parser" "^7.23.0"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
-"@babel/eslint-parser@^7.18.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz#fa032503b9e2d188e25b1b95d29e8b8431042d78"
-  integrity sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==
+"@babel/core@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f"
+  integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.23.7"
+    "@babel/parser" "^7.23.6"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.7"
+    "@babel/types" "^7.23.6"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/eslint-parser@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.23.3.tgz#7bf0db1c53b54da0c8a12627373554a0828479ca"
+  integrity sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
-"@babel/generator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
-  integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
+"@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.23.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
+"@babel/generator@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+  dependencies:
+    "@babel/types" "^7.23.6"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -69,44 +119,70 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02"
-  integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
+"@babel/helper-compilation-targets@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
+  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
   dependencies:
-    "@babel/compat-data" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    browserslist "^4.21.3"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.15"
+    browserslist "^4.21.9"
     lru-cache "^5.1.1"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c"
-  integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==
+"@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+  dependencies:
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4"
+  integrity sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-environment-visitor" "^7.22.5"
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
     "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    semver "^6.3.0"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
 
-"@babel/helper-environment-visitor@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
-  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
-
-"@babel/helper-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
-  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
+"@babel/helper-create-class-features-plugin@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d"
+  integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
+"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
+"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
@@ -115,33 +191,41 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
-  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
+"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-module-imports@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
-  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+"@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef"
-  integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==
+"@babel/helper-module-transforms@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
+  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
+
+"@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/helper-optimise-call-expression@^7.22.5":
   version "7.22.5"
@@ -155,17 +239,14 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-replace-supers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
-  integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==
+"@babel/helper-replace-supers@^7.22.20", "@babel/helper-replace-supers@^7.22.9":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
     "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
-    "@babel/types" "^7.22.5"
 
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
@@ -181,10 +262,10 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
-  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
@@ -193,103 +274,201 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
-  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+"@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-validator-option@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
-  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helpers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820"
-  integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
+"@babel/helper-validator-option@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
+  integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
+
+"@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+
+"@babel/helpers@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
+  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
 
-"@babel/highlight@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
-  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
+"@babel/helpers@^7.23.7":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34"
+  integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.5"
-    chalk "^2.0.0"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.7"
+    "@babel/types" "^7.23.6"
+
+"@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
-  integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
-
-"@babel/plugin-proposal-decorators@^7.18.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz#dc8cdda048e5aea947efda920e030199806b868d"
-  integrity sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    "@babel/plugin-syntax-decorators" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
 
-"@babel/plugin-syntax-decorators@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz#329fe2907c73de184033775637dbbc507f09116a"
-  integrity sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+
+"@babel/parser@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
+  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
+
+"@babel/plugin-proposal-decorators@^7.18.6":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.2.tgz#0b345a5754f48309fa50b7cd99075ef0295b12c8"
+  integrity sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/plugin-syntax-decorators" "^7.22.10"
+
+"@babel/plugin-proposal-decorators@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.7.tgz#1d827902cbd3d9054e54fb2f2056cdd1eaa0e368"
+  integrity sha512-b1s5JyeMvqj7d9m9KhJNHKc18gEJiSyVzVX3bwbiPalQBQpuvfPh6lA9F7Kk/dWH0TIiXRpB9yicwijY6buPng==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.23.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-decorators" "^7.23.3"
+
+"@babel/plugin-syntax-decorators@^7.22.10":
+  version "7.22.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz#7d83ea04d893c442b78ebf4c3cbac59a7211deff"
+  integrity sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-decorators@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz#a1d351d6c25bfdcf2e16f99b039101bc0ffcb0ca"
+  integrity sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/runtime@^7.21.0":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
-  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
+  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
   dependencies:
-    regenerator-runtime "^0.13.11"
+    regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
-  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+"@babel/template@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
   dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
-  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
+"@babel/traverse@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
   dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
-  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
+"@babel/traverse@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305"
+  integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.6"
+    "@babel/types" "^7.23.6"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
+"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
   dependencies:
     "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
+  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
+"@discourse/lint-configs@^1.3.5":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@discourse/lint-configs/-/lint-configs-1.3.5.tgz#894b5a224e8f3ef48b8baa5eee5dd42a2238bf12"
+  integrity sha512-GY/m3V3DWQAAY4DrY0puRsW50g/aA+QYqYwggi6RGU8LPjYTJIaSzf5z3+R5Z5SRn06+hBWuP5fTdT0AbXgRew==
+  dependencies:
+    "@babel/core" "^7.23.7"
+    "@babel/eslint-parser" "^7.23.3"
+    "@babel/plugin-proposal-decorators" "^7.23.7"
+    ember-template-lint "^5.13.0"
+    eslint "^8.56.0"
+    eslint-plugin-decorator-position "^5.0.2"
+    eslint-plugin-ember "^12.0.0"
+    eslint-plugin-qunit "^8.0.1"
+    eslint-plugin-simple-import-sort "^10.0.0"
+    eslint-plugin-sort-class-members "^1.19.0"
+    globals "^13.24.0"
+    prettier "^2.8.8"
+    prettier-plugin-ember-template-tag "^0.3.2"
+
 "@ember-data/rfc395-data@^0.0.4":
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
   integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
 
+"@ember/edition-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
+  integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
+
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -297,19 +476,19 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
-  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+"@eslint-community/regexpp@^4.6.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4"
+  integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==
 
-"@eslint/eslintrc@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
-  integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.5.2"
+    espree "^9.6.0"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -317,10 +496,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.43.0":
-  version "8.43.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0"
-  integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==
+"@eslint/js@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
+  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
@@ -341,6 +520,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@^0.85.13":
+  version "0.85.13"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.85.13.tgz#02ec31a29977cf06af5d1bb9f685f0ad453ae613"
+  integrity sha512-qOEdvFgCQX1g+Gfi/nA2zbKYPmEkEbhFgzZ5esgmlQNOSQx4j8nyGiBvnG/vepHrh4wUzTvIynrCQpfr3SiKXg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@^0.84.3":
   version "0.84.3"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.84.3.tgz#6420ad9c102633ac83939fd1b2457269d21fb632"
@@ -352,7 +538,7 @@
     "@glimmer/util" "0.84.3"
     "@glimmer/validator" "0.84.3"
 
-"@glimmer/syntax@^0.84.3":
+"@glimmer/syntax@^0.84.2", "@glimmer/syntax@^0.84.3":
   version "0.84.3"
   resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.3.tgz#4045a1708cef7fd810cff42fe6deeba40c7286d0"
   integrity sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==
@@ -362,6 +548,17 @@
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
+"@glimmer/syntax@^0.85.13":
+  version "0.85.13"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.85.13.tgz#841e6da0a555252f087145f83f92cf0d9cf76cb5"
+  integrity sha512-zMGkJh6JcHdCTx1emmBbhBrGO04gqD6CS5khmDwSJCIpVHnGH0Ejxp9rpnSMc5IW71/hFoQY6RlMgVYF2hrHhA==
+  dependencies:
+    "@glimmer/interfaces" "^0.85.13"
+    "@glimmer/util" "^0.85.13"
+    "@glimmer/wire-format" "^0.85.13"
+    "@handlebars/parser" "~2.0.0"
+    simple-html-tokenizer "^0.5.11"
+
 "@glimmer/util@0.84.3":
   version "0.84.3"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.3.tgz#9ae0166982c0b48aa94b02d6ba8c2c81976ade4b"
@@ -371,6 +568,14 @@
     "@glimmer/interfaces" "0.84.3"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@^0.85.13":
+  version "0.85.13"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.85.13.tgz#a17824e5fd91e4e3f3847f38f600ecd3c1508dad"
+  integrity sha512-ogj65iukNKEPPqQ2bOD6CLsqxsFwmiGvTQbAsg1eh1MoPjxhNZMpLsT5CdQ10XE7yUALHGJ71SwxBSpAOGDmxg==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "^0.85.13"
+
 "@glimmer/validator@0.84.3", "@glimmer/validator@^0.84.3":
   version "0.84.3"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.84.3.tgz#cd83b7f9ab78953f23cc11a32d83d7f729c54df2"
@@ -379,17 +584,25 @@
     "@glimmer/env" "^0.1.7"
     "@glimmer/global-context" "0.84.3"
 
+"@glimmer/wire-format@^0.85.13":
+  version "0.85.13"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.85.13.tgz#a8df8c44646b8f0d09dda187ac64f45c33904b63"
+  integrity sha512-q6bHPfjSYE9jH27L75lUzyhSpBA+iONzsJVXewdwO4GdYYCC4s+pfUaJg7ZYNFDcHDuVKUcLhBb/NICDzMA5Uw==
+  dependencies:
+    "@glimmer/interfaces" "^0.85.13"
+    "@glimmer/util" "^0.85.13"
+
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
-"@humanwhocodes/config-array@^0.11.10":
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
-  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
+    "@humanwhocodes/object-schema" "^2.0.1"
     debug "^4.1.1"
     minimatch "^3.0.5"
 
@@ -398,10 +611,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
 
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.3"
@@ -412,45 +625,40 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
 
 "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/sourcemap-codec@1.4.14":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
-  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
+  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
   dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@lint-todo/utils@^13.0.3":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@lint-todo/utils/-/utils-13.1.0.tgz#bb99b479e357f20fbf5fa200c59cafda2a02f849"
-  integrity sha512-uzcZPIPH7hcs+hKMiHfp58MosJpI9sTTgl1pGYau4zq34q1ppswJ6nLeohv/cDhqEBrHjtvldt8zDnVJXRvBlA==
+"@lint-todo/utils@^13.1.1":
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/@lint-todo/utils/-/utils-13.1.1.tgz#5c054d61ee037b9e552add118264771122cc1166"
+  integrity sha512-F5z53uvRIF4dYfFfJP3a2Cqg+4P1dgJchJsFnsZE0eZp0LK8X7g2J0CsJHRgns+skpXOlM7n5vFGwkWCWj8qJg==
   dependencies:
-    "@types/eslint" "^7.2.13"
+    "@types/eslint" "^8.4.9"
     find-up "^5.0.0"
     fs-extra "^9.1.0"
     proper-lockfile "^4.1.2"
     slash "^3.0.0"
-    tslib "^2.4.0"
+    tslib "^2.4.1"
     upath "^2.0.1"
 
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
@@ -486,23 +694,23 @@
   resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
   integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
 
-"@types/eslint@^7.2.13":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
-  integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==
+"@types/eslint@^8.4.9":
+  version "8.44.4"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.4.tgz#28eaff82e1ca0a96554ec5bb0188f10ae1a74c2f"
+  integrity sha512-lOzjyfY/D9QR4hY9oblZ76B90MYTB3RrQ4z2vBIJKj9ROCRqdkYl2gSUx1x1a4IWPjKJZLL4Aw1Zfay7eMnmnA==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
 "@types/estree@*":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
-  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.2.tgz#ff02bc3dc8317cd668dfec247b750ba1f1d62453"
+  integrity sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==
 
 "@types/json-schema@*":
-  version "7.0.12"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
-  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+  version "7.0.13"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85"
+  integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
 
 "@types/minimatch@^3.0.3":
   version "3.0.5"
@@ -514,17 +722,43 @@
   resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
   integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
 
+"@typescript-eslint/scope-manager@^6.15.0":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.1.tgz#28c31c60f6e5827996aa3560a538693cb4bd3848"
+  integrity sha512-BgdBwXPFmZzaZUuw6wKiHKIovms97a7eTImjkXCZE04TGHysG+0hDQPmygyvgtkoB/aOQwSM/nWv3LzrOIQOBw==
+  dependencies:
+    "@typescript-eslint/types" "6.18.1"
+    "@typescript-eslint/visitor-keys" "6.18.1"
+
+"@typescript-eslint/types@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.1.tgz#91617d8080bcd99ac355d9157079970d1d49fefc"
+  integrity sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==
+
+"@typescript-eslint/visitor-keys@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.1.tgz#704d789bda2565a15475e7d22f145b8fe77443f4"
+  integrity sha512-/kvt0C5lRqGoCfsbmm7/CwMqoSkY3zzHLIjdhHZQW3VFrnz7ATecOHR7nb7V+xn4286MBxfnQfQhAmCI0u+bJA==
+  dependencies:
+    "@typescript-eslint/types" "6.18.1"
+    eslint-visitor-keys "^3.4.1"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.8.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
-  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
+acorn@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -558,10 +792,10 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^5.0.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.2.1.tgz#bc285d9d654d1df121bcd0c134880d415ca67c15"
-  integrity sha512-7uFg4b+lETFgdaJyETnILsXgnnzVnkHcgRbwbPwevm5x/LmUlt3MjczMRe1zg824iBgXZNRPTBftNYyRSKLp2g==
+aria-query@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
   dependencies:
     dequal "^2.0.3"
 
@@ -583,6 +817,19 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
+
 async-disk-cache@^1.2.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
@@ -596,6 +843,19 @@ async-disk-cache@^1.2.1:
     rsvp "^3.0.18"
     username-sync "^1.0.2"
 
+async-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-2.1.0.tgz#e0f37b187ed8c41a5991518a9556d206ae2843a2"
+  integrity sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.3"
+    istextorbinary "^2.5.1"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    rsvp "^4.8.5"
+    username-sync "^1.0.2"
+
 async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
@@ -626,6 +886,37 @@ babel-import-util@^0.2.0:
   resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
   integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
 
+babel-import-util@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-2.0.1.tgz#263a2963ee9208428c04f05326c6ea32b2206ac6"
+  integrity sha512-N1ZfNprtf/37x0R05J0QCW/9pCAcuI+bjZIK9tlu0JEkwEST7ssdD++gxHRbD58AiG5QE5OuNYhRoEFsc1wESw==
+
+babel-plugin-ember-modules-api-polyfill@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
+  integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+
+babel-plugin-ember-template-compilation@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.2.0.tgz#b119fadcd5c831299fbd706420d2ea742848a659"
+  integrity sha512-1I7f5gf06h5wKdKUvaYEIaoSFur5RLUvTMQG4ak0c5Y11DWUxcoX9hrun1xe9fqfY2dtGFK+ZUM6sn6z8sqK/w==
+  dependencies:
+    "@glimmer/syntax" "^0.84.3"
+    babel-import-util "^2.0.0"
+
+babel-plugin-htmlbars-inline-precompile@^5.3.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.3.1.tgz#5ba272e2e4b6221522401f5f1d98a73b1de38787"
+  integrity sha512-QWjjFgSKtSRIcsBhJmEwS2laIdrA6na8HAlc/pEAhjHgQsah/gMiBFRZvbQTy//hWxR4BMwV7/Mya7q5H8uHeA==
+  dependencies:
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.5"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -636,7 +927,7 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-"binaryextensions@1 || 2":
+"binaryextensions@1 || 2", binaryextensions@^2.1.2:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
   integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
@@ -717,6 +1008,25 @@ broccoli-merge-trees@^3.0.1:
     broccoli-plugin "^1.3.0"
     merge-trees "^2.0.0"
 
+broccoli-node-api@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
+  integrity sha512-QIqLSVJWJUVOhclmkmypJJH9u9s/aWH4+FH6Q6Ju5l+Io4dtwqdPUNmDfw40o6sxhbZHhqGujDJuHTML1wG8Yw==
+
+broccoli-node-info@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.2.0.tgz#feb01c13020792f429e01d7f7845dc5b3a7932b3"
+  integrity sha512-VabSGRpKIzpmC+r+tJueCE5h8k6vON7EIMMWu6d/FyPdtijwLQ7QvzShEw+m3mHoDzUaj/kiZsDYrS8X2adsBg==
+
+broccoli-output-wrapper@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.5.tgz#514b17801c92922a2c2f87fd145df2a25a11bc5f"
+  integrity sha512-bQAtwjSrF4Nu0CK0JOy5OZqw9t5U0zzv2555EA/cF8/a8SLDTIetk9UgrtMVw7qKLKdSpOZ2liZNeZZDaKgayw==
+  dependencies:
+    fs-extra "^8.1.0"
+    heimdalljs-logger "^0.1.10"
+    symlink-or-copy "^1.2.0"
+
 broccoli-persistent-filter@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
@@ -737,6 +1047,23 @@ broccoli-persistent-filter@^2.3.0:
     sync-disk-cache "^1.3.3"
     walk-sync "^1.0.0"
 
+broccoli-persistent-filter@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz#aca815bf3e3b0247bd0a7b567fdb0d0e08c99cc2"
+  integrity sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==
+  dependencies:
+    async-disk-cache "^2.0.0"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^4.0.3"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    promise-map-series "^0.2.1"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^2.0.0"
+
 broccoli-plugin@^1.0.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
@@ -757,6 +1084,19 @@ broccoli-plugin@^2.1.0:
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
+broccoli-plugin@^4.0.3:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
+  integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-output-wrapper "^3.2.5"
+    fs-merger "^3.2.1"
+    promise-map-series "^0.3.0"
+    quick-temp "^0.1.8"
+    rimraf "^3.0.2"
+    symlink-or-copy "^1.3.1"
+
 broccoli-stew@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-3.0.0.tgz#fd1d19d162ad9490b42e5c563b78c26eb1e80b95"
@@ -777,15 +1117,25 @@ broccoli-stew@^3.0.0:
     symlink-or-copy "^1.2.0"
     walk-sync "^1.1.3"
 
-browserslist@^4.21.3:
-  version "4.21.9"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
-  integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
+browserslist@^4.21.9:
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
+  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
   dependencies:
-    caniuse-lite "^1.0.30001503"
-    electron-to-chromium "^1.4.431"
-    node-releases "^2.0.12"
-    update-browserslist-db "^1.0.11"
+    caniuse-lite "^1.0.30001541"
+    electron-to-chromium "^1.4.535"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.13"
+
+browserslist@^4.22.2:
+  version "4.22.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
+  integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
+  dependencies:
+    caniuse-lite "^1.0.30001565"
+    electron-to-chromium "^1.4.601"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
 
 buffer@^5.5.0:
   version "5.7.1"
@@ -815,12 +1165,17 @@ can-symlink@^1.0.0:
   dependencies:
     tmp "0.0.28"
 
-caniuse-lite@^1.0.30001503:
-  version "1.0.30001505"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001505.tgz#10a343e49d31cbbfdae298ef73cb0a9f46670dc5"
-  integrity sha512-jaAOR5zVtxHfL0NjZyflVTtXm3D3J9P15zSJ7HmQF8dSKGA6tqzQq+0ZI3xkjyQj46I4/M0K2GbMpcAFOcbr3A==
+caniuse-lite@^1.0.30001541:
+  version "1.0.30001549"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz#7d1a3dce7ea78c06ed72c32c2743ea364b3615aa"
+  integrity sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==
 
-chalk@^2.0.0, chalk@^2.4.1:
+caniuse-lite@^1.0.30001565:
+  version "1.0.30001576"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz#893be772cf8ee6056d6c1e2d07df365b9ec0a5c4"
+  integrity sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==
+
+chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -829,7 +1184,7 @@ chalk@^2.0.0, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -837,10 +1192,15 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-ci-info@^3.4.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+chalk@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
+ci-info@^3.8.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
 clean-up-path@^1.0.0:
   version "1.0.0"
@@ -855,9 +1215,9 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-spinners@^2.5.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db"
-  integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.1.tgz#9c0b9dad69a6d47cbb4333c14319b060ed395a35"
+  integrity sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==
 
 cliui@^8.0.1:
   version "8.0.1"
@@ -912,10 +1272,20 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+content-tag@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/content-tag/-/content-tag-1.2.2.tgz#8cbc3cdb9957a81f7c425b138e334330dd6fd78d"
+  integrity sha512-9guqKIx2H+78N17otBpl8yLZbQGL5q1vBO/jDb3gF2JjixtcVpC62jDUNxjVMNoaZ09oxRX84ZOD6VX02qkVvg==
+
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
+core-js@^3.4.1:
+  version "3.33.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.1.tgz#ef3766cfa382482d0a2c2bc5cb52c6d88805da52"
+  integrity sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==
 
 cross-spawn@^7.0.2:
   version "7.0.3"
@@ -926,7 +1296,7 @@ cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css-tree@^2.0.4:
+css-tree@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
   integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
@@ -934,7 +1304,7 @@ css-tree@^2.0.4:
     mdn-data "2.0.30"
     source-map-js "^1.0.1"
 
-date-fns@^2.29.2:
+date-fns@^2.30.0:
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
   integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
@@ -948,7 +1318,7 @@ debug@^2.1.3, debug@^2.2.0, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -967,11 +1337,21 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+define-data-property@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
   dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+  dependencies:
+    define-data-property "^1.0.1"
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
@@ -1007,16 +1387,49 @@ editions@^1.1.1:
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
   integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
 
-electron-to-chromium@^1.4.431:
-  version "1.4.434"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.434.tgz#4bdef7b5b18d8dac177ec0d31dab9f92eebf22a1"
-  integrity sha512-5Gvm09UZTQRaWrimRtWRO5rvaX6Kpk5WHAPKDa7A4Gj6NIPuJ8w8WNpnxCXdd+CJJt6RBU6tUw0KyULoW6XuHw==
+editions@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-2.3.1.tgz#3bc9962f1978e801312fbd0aebfed63b49bfe698"
+  integrity sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==
+  dependencies:
+    errlop "^2.0.0"
+    semver "^6.3.0"
+
+electron-to-chromium@^1.4.535:
+  version "1.4.554"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz#04e09c2ee31dc0f1546174033809b54cc372740b"
+  integrity sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ==
+
+electron-to-chromium@^1.4.601:
+  version "1.4.630"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.630.tgz#1d9f4169653784997bec98975e11a2c05214ce39"
+  integrity sha512-osHqhtjojpCsACVnuD11xO5g9xaCyw7Qqn/C2KParkMv42i8jrJJgx3g7mkHfpxwhy9MnOJr8+pKOdZ7qzgizg==
 
 ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
+ember-cli-htmlbars@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz#ac85f2bbd09788992ab7f9ca832cd044fb8e5798"
+  integrity sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-ember-template-compilation "^2.0.0"
+    babel-plugin-htmlbars-inline-precompile "^5.3.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    js-string-escape "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    walk-sync "^2.2.0"
+
 ember-cli-version-checker@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
@@ -1026,12 +1439,24 @@ ember-cli-version-checker@^5.1.2:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
-ember-rfc176-data@^0.3.15:
+ember-eslint-parser@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/ember-eslint-parser/-/ember-eslint-parser-0.2.5.tgz#3c2cddcbf5134aebd0d88018357797a1b66a455d"
+  integrity sha512-ht3kkY6h+kWb6yW2OrqFG9TpC4pgdiTflDYMmJtHgZbbrIPD8fCeo8jVPBYCIO5HCHqxVwmT1H0rNlRRhWfUJg==
+  dependencies:
+    "@babel/eslint-parser" "^7.23.3"
+    "@glimmer/syntax" "^0.85.13"
+    "@typescript-eslint/scope-manager" "^6.15.0"
+    content-tag "^1.2.2"
+    eslint-scope "^7.2.2"
+    html-tags "^3.3.1"
+
+ember-rfc176-data@^0.3.17, ember-rfc176-data@^0.3.18:
   version "0.3.18"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.18.tgz#bb6fdcef49999981317ea81b6cc9210fb4108d65"
   integrity sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==
 
-ember-template-imports@^3.4.0:
+ember-template-imports@^3.4.1, ember-template-imports@^3.4.2:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/ember-template-imports/-/ember-template-imports-3.4.2.tgz#6cf7de7d4b8348a0fddf3aaec4947aa1211289e6"
   integrity sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==
@@ -1046,35 +1471,31 @@ ember-template-imports@^3.4.0:
     string.prototype.matchall "^4.0.6"
     validate-peer-dependencies "^1.1.0"
 
-ember-template-lint-plugin-discourse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ember-template-lint-plugin-discourse/-/ember-template-lint-plugin-discourse-3.0.0.tgz#9212226e4d2f6dce2e35b480aaf240067d736246"
-  integrity sha512-4zi/qN+vXs0ZpJZrwdMfZ5hMThJbeVCFdof6iek4PmgIJhnlA0lzqIa1BrKpSKhr3ckd5K0rUMNcCAm0uKNOtg==
-
-ember-template-lint@^4.10.0:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-4.18.2.tgz#18e5e5fc6ea7301e7a075e024008271d2a781e1e"
-  integrity sha512-yI8kQ8IQ2x5HVq0tQAISXABOHr0Is5sAg6rwceO6M8CYozq7HMxUPEj0VbdcbyIE70SWw/8d24M1rBI4km544Q==
+ember-template-lint@^5.13.0:
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-5.13.0.tgz#e9e3864646b9e16ce77a2ec8a91a5204be85d4c4"
+  integrity sha512-AYxz9S9fVZfHPmTsymc7NwsD7FVmDUZyfC+KYpxDlK0wic7JSQx2FNQNqQSBFRLOuzn7VQ0/+1pX6DGqKDGswg==
   dependencies:
-    "@lint-todo/utils" "^13.0.3"
-    aria-query "^5.0.2"
-    chalk "^4.1.2"
-    ci-info "^3.4.0"
-    date-fns "^2.29.2"
-    ember-template-imports "^3.4.0"
-    ember-template-recast "^6.1.3"
+    "@lint-todo/utils" "^13.1.1"
+    aria-query "^5.3.0"
+    chalk "^5.3.0"
+    ci-info "^3.8.0"
+    date-fns "^2.30.0"
+    ember-template-imports "^3.4.2"
+    ember-template-recast "^6.1.4"
+    eslint-formatter-kakoune "^1.0.0"
     find-up "^6.3.0"
     fuse.js "^6.5.3"
     get-stdin "^9.0.0"
-    globby "^13.1.2"
+    globby "^13.2.2"
     is-glob "^4.0.3"
-    language-tags "^1.0.5"
+    language-tags "^1.0.8"
     micromatch "^4.0.5"
-    resolve "^1.22.1"
+    resolve "^1.22.3"
     v8-compile-cache "^2.3.0"
-    yargs "^17.5.1"
+    yargs "^17.7.2"
 
-ember-template-recast@^6.1.3:
+ember-template-recast@^6.1.4:
   version "6.1.4"
   resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-6.1.4.tgz#e964c184adfd876878009f8aa0b84c95633fce20"
   integrity sha512-fCh+rOK6z+/tsdkTbOE+e7f84P6ObnIRQrCCrnu21E4X05hPeradikIkRMhJdxn4NWrxitfZskQDd37TR/lsNQ==
@@ -1101,18 +1522,24 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.1.0:
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
   integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.21.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
-  integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
+errlop@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b"
+  integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw==
+
+es-abstract@^1.22.1:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.2.tgz#90f7282d91d0ad577f505e423e52d4c1d93c1b8a"
+  integrity sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==
   dependencies:
     array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.2"
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
     es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.0"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.1"
     get-symbol-description "^1.0.0"
     globalthis "^1.0.3"
     gopd "^1.0.1"
@@ -1127,19 +1554,23 @@ es-abstract@^1.19.0, es-abstract@^1.20.4:
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.12"
     is-weakref "^1.0.2"
     object-inspect "^1.12.3"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
     safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.11"
 
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
@@ -1174,76 +1605,55 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-discourse@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-3.4.0.tgz#636a1824bca48c90aeac5bee2f8d7b993609191f"
-  integrity sha512-9jwu8GQPDOxAO0ByV6RbInu5r39HrFvbAHQRJ8YoGg2fuvHcX+p7fYcxEWj64LhmF4qD55cAGhN0Gmj10RVjoQ==
-  dependencies:
-    "@babel/core" "^7.18.5"
-    "@babel/eslint-parser" "^7.18.2"
-    "@babel/plugin-proposal-decorators" "^7.18.2"
-    ember-template-lint "^4.10.0"
-    ember-template-lint-plugin-discourse "^3.0.0"
-    eslint "^8.17.0"
-    eslint-plugin-discourse-ember latest
-    eslint-plugin-ember "^10.6.1"
-    eslint-plugin-lodash "^7.1.0"
-    eslint-plugin-node "^11.1.0"
-    eslint-plugin-sort-class-members "^1.14.1"
-    prettier "2.8.1"
+eslint-formatter-kakoune@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-formatter-kakoune/-/eslint-formatter-kakoune-1.0.0.tgz#a95cc4fe1fbc06b84e0f2397e83f5f0b68340125"
+  integrity sha512-Uk/TVLt6Nf6Xoz7C1iYuZjOSdJxe5aaauGRke8JhKeJwD66Y61/pY2FjtLP04Ooq9PwV34bzrkKkU2UZ5FtDRA==
 
-eslint-plugin-discourse-ember@latest:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-discourse-ember/-/eslint-plugin-discourse-ember-0.0.3.tgz#69e5876c2ece38ab3d6c4a05f0a20a7dc4c21e37"
-  integrity sha512-EFwWU4FlOSLBa4RolKZL8QD1eGOnvSkACLt4Big+o1ZUIpW7gGvfnJPtxkbaQ4XmhtZ5HetYt6862vVqhUMv9A==
+eslint-plugin-decorator-position@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-decorator-position/-/eslint-plugin-decorator-position-5.0.2.tgz#c96f46d8ef0f7dbd519ff91a67ccc4b6ba30693b"
+  integrity sha512-wFcRfrB9zljOP1n5udg16h6ITX1jG8cnUvuFVtIqVxw5O9BTOXFHB9hvsTaqpb8JFX2dq19fH3i/ipUeFSF87w==
   dependencies:
-    requireindex "~1.1.0"
+    "@babel/core" "^7.18.6"
+    "@babel/plugin-proposal-decorators" "^7.18.6"
+    "@ember-data/rfc395-data" "^0.0.4"
+    ember-rfc176-data "^0.3.17"
+    snake-case "^3.0.4"
 
-eslint-plugin-ember@^10.6.1:
-  version "10.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.6.1.tgz#04ea84cc82307f64a2faa4f2855b30e5ebf9f722"
-  integrity sha512-R+TN3jwhYQ2ytZCA1VkfJDZSGgHFOHjsHU1DrBlRXYRepThe56PpuGxywAyDvQ7inhoAz3e6G6M60PzpvjzmNg==
+eslint-plugin-ember@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-12.0.0.tgz#e53df2865bde1af47c218ad65dcf35f4dbebb7b0"
+  integrity sha512-+GQTzL925GeKM8lUmSVskc3HqSspz7UwvW9TV0h3Z9BoSxki0qLe0RN4dfwQBxirpHu1+/4b1tLs2BKu3UEOXQ==
   dependencies:
     "@ember-data/rfc395-data" "^0.0.4"
-    css-tree "^2.0.4"
-    ember-rfc176-data "^0.3.15"
+    css-tree "^2.3.1"
+    ember-eslint-parser "^0.2.5"
+    ember-rfc176-data "^0.3.18"
     eslint-utils "^3.0.0"
-    estraverse "^5.2.0"
+    estraverse "^5.3.0"
+    lodash.camelcase "^4.3.0"
     lodash.kebabcase "^4.1.1"
     requireindex "^1.2.0"
     snake-case "^3.0.3"
 
-eslint-plugin-es@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"
-  integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==
+eslint-plugin-qunit@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-8.0.1.tgz#4969c2a5a13c7362cee1b38a2c0c06b60437a931"
+  integrity sha512-3bFOPryXoQOez95oP/JfWTxHBc/bgDQQZqTuv9uYTwH5sdIvSM2TES1iHDcy/F/LvqiqIpscDAOPAjlqSCnNPg==
   dependencies:
-    eslint-utils "^2.0.0"
-    regexpp "^3.0.0"
+    eslint-utils "^3.0.0"
+    requireindex "^1.2.0"
 
-eslint-plugin-lodash@^7.1.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz#14a761547f126c92ff56789662a20a44f8bb6290"
-  integrity sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==
-  dependencies:
-    lodash "^4.17.21"
+eslint-plugin-simple-import-sort@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
+  integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
 
-eslint-plugin-node@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
-  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
-  dependencies:
-    eslint-plugin-es "^3.0.0"
-    eslint-utils "^2.0.0"
-    ignore "^5.1.1"
-    minimatch "^3.0.4"
-    resolve "^1.10.1"
-    semver "^6.1.0"
-
-eslint-plugin-sort-class-members@^1.14.1:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-sort-class-members/-/eslint-plugin-sort-class-members-1.18.0.tgz#561746eb30abc4e8bb8d582d359c652299e450d8"
-  integrity sha512-y4r5OC3LJNHJZCWfVwFnnRiNrQ/LRf7Pb1wD6/CP8Y4qmUvjtmkwrLvyY755p8SFTOOXVd33HgFuF3XxVW1xbg==
+eslint-plugin-sort-class-members@^1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sort-class-members/-/eslint-plugin-sort-class-members-1.19.0.tgz#9ad7a674c4cb477fceaddb8162515372d381c733"
+  integrity sha512-YayvASA1bavdPeRU9FMPnale2+Oi3aMcHGVC5EUm9b671oxm7ahvR+q8BfsU2aV+KAFezNfu47VPgdZK6gwYPw==
 
 eslint-scope@5.1.1:
   version "5.1.1"
@@ -1253,21 +1663,14 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
-  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-utils@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
 eslint-utils@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
@@ -1275,42 +1678,38 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
 eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.17.0:
-  version "8.43.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094"
-  integrity sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==
+eslint@^8.56.0:
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
+  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.3"
-    "@eslint/js" "8.43.0"
-    "@humanwhocodes/config-array" "^0.11.10"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.56.0"
+    "@humanwhocodes/config-array" "^0.11.13"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.1"
-    espree "^9.5.2"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -1320,7 +1719,6 @@ eslint@^8.17.0:
     globals "^13.19.0"
     graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
@@ -1330,17 +1728,16 @@ eslint@^8.17.0:
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.5.2:
-  version "9.5.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
-  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
@@ -1363,7 +1760,7 @@ estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -1378,10 +1775,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@^3.2.9, fast-glob@^3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -1444,17 +1841,18 @@ find-up@^6.3.0:
     path-exists "^5.0.0"
 
 flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
+  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flatted@^3.2.9:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -1463,7 +1861,7 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-fs-extra@^8.0.1:
+fs-extra@^8.0.1, fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
   integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
@@ -1482,6 +1880,17 @@ fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-merger@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.2.1.tgz#a225b11ae530426138294b8fbb19e82e3d4e0b3b"
+  integrity sha512-AN6sX12liy0JE7C2evclwoo0aCG3PFulLjrTLsJpWh/2mM+DinhpSGqYLbHBBbIW1PLRNcFhJG8Axtz8mQW3ug==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    walk-sync "^2.2.0"
+
 fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
@@ -1492,7 +1901,7 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.6:
     path-posix "^1.0.0"
     symlink-or-copy "^1.1.8"
 
-fs-tree-diff@^2.0.0:
+fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
   integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==
@@ -1520,21 +1929,21 @@ fs.realpath@^1.0.0:
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
-functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -1554,7 +1963,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
   integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
@@ -1620,9 +2029,16 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
+  dependencies:
+    type-fest "^0.20.2"
+
+globals@^13.24.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -1645,14 +2061,14 @@ globby@^11.0.3:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^13.1.2:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.0.tgz#7dd5678d765c4680c2e6d106230d86cb727cb1af"
-  integrity sha512-jWsQfayf13NvqKUIL3Ta+CIqMnvlaIDFveWE/dpOZ9+3AMEJozsxDvKA02zync9UuvOM8rOXzsD5GqKP4OnWPQ==
+globby@^13.2.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
+  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
   dependencies:
     dir-glob "^3.0.1"
-    fast-glob "^3.2.11"
-    ignore "^5.2.0"
+    fast-glob "^3.3.0"
+    ignore "^5.2.4"
     merge2 "^1.4.1"
     slash "^4.0.0"
 
@@ -1713,13 +2129,11 @@ has-tostringtag@^1.0.0:
     has-symbols "^1.0.2"
 
 has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
 
-hash-for-dep@^1.5.0:
+hash-for-dep@^1.5.0, hash-for-dep@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
   integrity sha512-/dQ/A2cl7FBPI2pO0CANkvuuVi/IFS5oTyJ0PsOb6jW6WbVW1js5qJXMJTNbWHXBIPdFTWFbabjB+mE0d+gelw==
@@ -1731,7 +2145,7 @@ hash-for-dep@^1.5.0:
     resolve "^1.10.0"
     resolve-package-path "^1.0.11"
 
-heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
+heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz#90cad58aabb1590a3c7e640ddc6a4cd3a43faaf7"
   integrity sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==
@@ -1746,17 +2160,22 @@ heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heim
   dependencies:
     rsvp "~3.2.1"
 
+html-tags@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
+  integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
+
 ieee754@^1.1.13:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.1, ignore@^5.2.0:
+ignore@^5.2.0, ignore@^5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -1782,7 +2201,7 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-internal-slot@^1.0.3, internal-slot@^1.0.5:
+internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
   integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
@@ -1820,10 +2239,10 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.11.0:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
-  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+is-core-module@^2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
+  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
   dependencies:
     has "^1.0.3"
 
@@ -1907,16 +2326,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
-  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
+    which-typed-array "^1.1.11"
 
 is-unicode-supported@^0.1.0:
   version "0.1.0"
@@ -1935,6 +2350,11 @@ isarray@1.0.0, isarray@^1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -1956,6 +2376,20 @@ istextorbinary@2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
+istextorbinary@^2.5.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.6.0.tgz#60776315fb0fa3999add276c02c69557b9ca28ab"
+  integrity sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==
+  dependencies:
+    binaryextensions "^2.1.2"
+    editions "^2.2.0"
+    textextensions "^2.5.0"
+
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -1973,6 +2407,11 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -1983,7 +2422,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json5@^2.2.2:
+json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -2004,15 +2443,22 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 language-subtag-registry@^0.3.20:
   version "0.3.22"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
   integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
 
-language-tags@^1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.8.tgz#042b4bdb0d4e771a9f8cc2fdc9bb26a52a367312"
-  integrity sha512-aWAZwgPLS8hJ20lNPm9HNVs4inexz6S2sQa3wx/+ycuutMNE5/IfYxiWYBbi+9UWCQVaXYCOPUl6gFrPR7+jGg==
+language-tags@^1.0.8:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.9.tgz#1ffdcd0ec0fafb4b1be7f8b11f306ad0f9c08777"
+  integrity sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==
   dependencies:
     language-subtag-registry "^0.3.20"
 
@@ -2046,6 +2492,11 @@ locate-path@^7.1.0:
   dependencies:
     p-locate "^6.0.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -2056,7 +2507,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.14, lodash@^4.17.21:
+lodash@^4.17.14:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -2104,6 +2555,14 @@ matcher-collection@^1.0.0, matcher-collection@^1.1.1:
   dependencies:
     minimatch "^3.0.2"
 
+matcher-collection@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
+  integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    minimatch "^3.0.2"
+
 mdn-data@2.0.30:
   version "2.0.30"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
@@ -2182,10 +2641,15 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-releases@^2.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
-  integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 object-assign@^4.1.0:
   version "4.1.1"
@@ -2193,9 +2657,9 @@ object-assign@^4.1.0:
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.12.3, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.0.tgz#42695d3879e1cd5bda6df5062164d80c996e23e2"
+  integrity sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -2226,17 +2690,17 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 ora@^5.4.0:
   version "5.4.1"
@@ -2360,10 +2824,22 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
-  integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
+prettier-plugin-ember-template-tag@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-ember-template-tag/-/prettier-plugin-ember-template-tag-0.3.2.tgz#dcf4e402951d6766a9880308ea6a405c9ea5a5f1"
+  integrity sha512-L/15ujsvuOpuIB9y9XJJs/QOPgdot76T0U1Q34C19igS1lsaL/cdRw8rXIVC5Z2x362yZI33Qodo//7kK7ItkA==
+  dependencies:
+    "@babel/core" "^7.20.12"
+    "@glimmer/syntax" "^0.84.2"
+    ember-cli-htmlbars "^6.2.0"
+    ember-template-imports "^3.4.1"
+    prettier "^2.8.3"
+    ts-replace-all "^1.0.0"
+
+prettier@^2.8.3, prettier@^2.8.8:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 promise-map-series@^0.2.1:
   version "0.2.3"
@@ -2372,6 +2848,11 @@ promise-map-series@^0.2.1:
   dependencies:
     rsvp "^3.0.14"
 
+promise-map-series@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
+  integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
+
 proper-lockfile@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
@@ -2391,7 +2872,7 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-quick-temp@^0.1.3, quick-temp@^0.1.5:
+quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
   integrity sha512-YsmIFfD9j2zaFwJkzI6eMG7y0lQP7YeWzgtFgNl38pGWZBSXJooZbOWwkcRot7Vt0Fg9L23pX0tqWU3VvLDsiA==
@@ -2409,24 +2890,19 @@ readable-stream@^3.4.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-regenerator-runtime@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+regenerator-runtime@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
+  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
 
-regexp.prototype.flags@^1.4.3:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
-  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    functions-have-names "^1.2.3"
-
-regexpp@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+    set-function-name "^2.0.0"
 
 require-directory@^2.1.1:
   version "2.1.1"
@@ -2438,11 +2914,6 @@ requireindex@^1.2.0:
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
   integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==
 
-requireindex@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"
-  integrity sha512-LBnkqsDE7BZKvqylbmn7lTIVdpx4K/QCduRATpO5R+wtPmky/a8pN1bO2D6wXppn1497AJF9mNjqAXr6bdl9jg==
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -2464,12 +2935,12 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.17.0, resolve@^1.22.1:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+resolve@^1.10.0, resolve@^1.11.1, resolve@^1.17.0, resolve@^1.22.3:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
-    is-core-module "^2.11.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -2527,6 +2998,16 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -2541,7 +3022,7 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-semver@^6.1.0, semver@^6.3.0:
+semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -2553,6 +3034,15 @@ semver@^7.3.2, semver@^7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -2601,7 +3091,7 @@ slash@^4.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
-snake-case@^3.0.3:
+snake-case@^3.0.3, snake-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
   integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
@@ -2620,9 +3110,9 @@ sourcemap-codec@^1.4.8:
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
 sprintf-js@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
 
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
@@ -2633,46 +3123,47 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.matchall@^4.0.6:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
-  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
+string.prototype.matchall@^4.0.5, string.prototype.matchall@^4.0.6:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100"
+  integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.4.3"
+    internal-slot "^1.0.5"
+    regexp.prototype.flags "^1.5.0"
+    set-function-name "^2.0.0"
     side-channel "^1.0.4"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -2688,7 +3179,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -2712,7 +3203,7 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
   integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
@@ -2728,12 +3219,23 @@ sync-disk-cache@^1.3.3:
     rimraf "^2.2.8"
     username-sync "^1.0.2"
 
+sync-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz#01e879edc41c34a01fcdda5b39d47dd496e154a6"
+  integrity sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.6"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    username-sync "^1.0.2"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-"textextensions@1 || 2":
+"textextensions@1 || 2", textextensions@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
   integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
@@ -2775,10 +3277,17 @@ tree-sync@^1.2.2:
     quick-temp "^0.1.5"
     walk-sync "^0.3.3"
 
-tslib@^2.0.3, tslib@^2.4.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
-  integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
+ts-replace-all@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ts-replace-all/-/ts-replace-all-1.0.0.tgz#ef28283ccdb4da7d69fb03cf543e09e51711659b"
+  integrity sha512-6uBtdkw3jHXkPtx/e9xB/5vcngMm17CyJYsS2YZeQ+9FdRnt6Ev5g931Sg2p+dxbtMGoCm13m3ax/obicTZIkQ==
+  dependencies:
+    core-js "^3.4.1"
+
+tslib@^2.0.3, tslib@^2.4.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -2792,6 +3301,36 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -2834,10 +3373,10 @@ upath@^2.0.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -2860,9 +3399,9 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 v8-compile-cache@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
+  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
 
 validate-peer-dependencies@^1.1.0:
   version "1.2.0"
@@ -2889,6 +3428,16 @@ walk-sync@^1.0.0, walk-sync@^1.1.3:
     ensure-posix-path "^1.1.0"
     matcher-collection "^1.1.1"
 
+walk-sync@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
+  integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.0"
+    minimatch "^3.0.4"
+
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
@@ -2907,17 +3456,16 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-typed-array@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
+  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
   dependencies:
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
     for-each "^0.3.3"
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
 
 which@^2.0.1:
   version "2.0.2"
@@ -2926,15 +3474,10 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
-
 workerpool@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
-  integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
+  integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -2970,7 +3513,7 @@ yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@^17.5.1:
+yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==