Merge branch 'main' into lint

# Conflicts:
#	assets/javascripts/discourse/components/teambuild-target.js

Author: cvx

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

@@ -3,19 +3,24 @@ import { action, computed } from "@ember/object";
 import { equal, or } from "@ember/object/computed";
 import { underscore } from "@ember/string";
 import { tagName } from "@ember-decorators/component";
+import BufferedProxy from "ember-buffered-proxy/proxy";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { Types } from "discourse/plugins/discourse-teambuild/discourse/models/teambuild-target";
 
 @tagName("")
-export default class TeambuildTarget extends Component.extend(
-  bufferedProperty("target")
-) {
+export default class TeambuildTarget extends Component {
   editSelected = false;
 
   @equal("buffered.target_type_id", Types.USER_GROUP) needsGroup;
   @or("editSelected", "target.isNew") editing;
 
+  @computed("target")
+  get buffered() {
+    return BufferedProxy.create({
+      content: this.get("target"),
+    });
+  }
+
   @computed("editing", "index")
   get canMoveUp() {
     return !this.editing && this.index > 0;
@@ -71,7 +76,7 @@ export default class TeambuildTarget extends Component.extend(
       return this.removeTarget();
     } else {
       this.set("editSelected", false);
-      this.rollbackBuffer();
+      this.buffered.discardChanges();
     }
   }