From 5bb034a6646e59da15720fa66f242e73016ca560 Mon Sep 17 00:00:00 2001
From: Phil Gengler <phil@pgengler.net>
Date: Wed, 18 Aug 2021 19:43:06 -0400
Subject: [PATCH 1/5] Upgrade ember-concurrency

---
 package.json |  5 +++--
 yarn.lock    | 17 ++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 31110666..1a16a923 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.1",
     "ember-cli-test-loader": "^2.2.0",
-    "ember-concurrency": "^1.1.3",
+    "ember-concurrency": "^2.1.2",
     "ember-data": "~3.25.0",
     "ember-decorators": "^6.1.1",
     "ember-export-application-global": "^2.0.1",
@@ -102,6 +102,7 @@
     "edition": "octane"
   },
   "resolutions": {
-    "ember-basic-dropdown": "3.0.16"
+    "ember-basic-dropdown": "3.0.16",
+    "ember-concurrency": "^2.1.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 69a799eb..2f16820f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5928,10 +5928,10 @@ ember-concurrency-decorators@^2.0.0:
     ember-cli-htmlbars "^4.3.1"
     ember-cli-typescript "^3.1.4"
 
-"ember-concurrency@>=1.0.0 <3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-2.0.3.tgz#d8ac917fdf013a277bfc7b26e417937ee0638455"
-  integrity sha512-+fOOFt32odnunDL3Du0LqMgnRzDDNKnzo1ry9ppICpvLXekJzYFwU1RniVivfJ+9nbpHMJZQUlZJAm1ZAnTExw==
+"ember-concurrency@>=1.0.0 <3", ember-concurrency@^1.0.0, ember-concurrency@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-2.1.2.tgz#a27178fb24951933fa72dd7cf1dca852693cc5c1"
+  integrity sha512-xC6L/SKuM08e9TK5igkSEwbAtkX2sqrj9Xap9G3zYSYdAIO7fcS6ZNEaD5e+dVXwPqH3tOIq41ZT7fqQ7mQ0KQ==
   dependencies:
     "@glimmer/tracking" "^1.0.2"
     ember-cli-babel "^7.22.1"
@@ -5939,15 +5939,6 @@ ember-concurrency-decorators@^2.0.0:
     ember-compatibility-helpers "^1.2.0"
     ember-destroyable-polyfill "^2.0.2"
 
-ember-concurrency@^1.0.0, ember-concurrency@^1.1.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-1.3.0.tgz#66f90fb792687470bcee1172adc0ebf33f5e8b9c"
-  integrity sha512-DwGlfWFpYyAkTwsedlEtK4t1DznJSculAW6Vq5S1C0shVPc5b6tTpHB2FFYisannSYkm+wpm1f1Pd40qiNPtOQ==
-  dependencies:
-    ember-cli-babel "^7.7.3"
-    ember-compatibility-helpers "^1.2.0"
-    ember-maybe-import-regenerator "^0.1.6"
-
 ember-data@~3.25.0:
   version "3.25.0"
   resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.25.0.tgz#fe9bbff26563aa61dfc4430f61c16141e5d57d30"

From 79b94e807cc5cfb0e9ae26a4386d2c2afd95fc56 Mon Sep 17 00:00:00 2001
From: Phil Gengler <phil@pgengler.net>
Date: Wed, 18 Aug 2021 19:48:33 -0400
Subject: [PATCH 2/5] Convert <AdminAddon/> to be a Glimmer component

---
 app/components/admin-addon.hbs | 78 +++++++++++++++++-----------------
 app/components/admin-addon.js  | 52 +++++++++++------------
 2 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/app/components/admin-addon.hbs b/app/components/admin-addon.hbs
index 45a7fd2a..7c4d1ce2 100644
--- a/app/components/admin-addon.hbs
+++ b/app/components/admin-addon.hbs
@@ -1,10 +1,10 @@
 <h2>
-  <LinkTo @route="addons.show" @model={{this.addon.name}} class="test-addon-link">
-    {{this.addon.name}}
-    {{#if this.addon.isOfficial}}
+  <LinkTo @route="addons.show" @model={{@addon.name}} class="test-addon-link">
+    {{@addon.name}}
+    {{#if @addon.isOfficial}}
       <OfficialIcon @class="test-official-icon" />
     {{/if}}
-    {{#if this.addon.isCliDependency}}
+    {{#if @addon.isCliDependency}}
       <DependencyIcon @class="test-cli-dep-icon" />
     {{/if}}
   </LinkTo>
@@ -12,74 +12,74 @@
 
 <section class="addon-info">
   <div class="test-last-updated">
-    <b>{{this.addon.latestAddonVersion.version}}</b> from <RelativeTime @date={{this.addon.latestVersionDate}} />
+    <b>{{@addon.latestAddonVersion.version}}</b> from <RelativeTime @date={{@addon.latestVersionDate}} />
   </div>
-  <div class="test-description"><b>description</b> {{this.addon.description}}</div>
-  {{#if this.addon.demoUrl}}
+  <div class="test-description"><b>description</b> {{@addon.description}}</div>
+  {{#if @addon.demoUrl}}
     <div class="test-addon-demo-url">
-      <b>demo</b> <a href={{this.addon.demoUrl}}>{{this.addon.demoUrl}}</a>
+      <b>demo</b> <a href={{@addon.demoUrl}}>{{@addon.demoUrl}}</a>
     </div>
   {{/if}}
   <div class="test-addon-package-url">
-    <b>package</b> <a href={{this.addon.npmUrl}}>{{this.addon.npmUrl}}</a>
+    <b>package</b> <a href={{@addon.npmUrl}}>{{@addon.npmUrl}}</a>
   </div>
   <div class="test-addon-license">
-    <b>license</b> {{this.addon.license}}
+    <b>license</b> {{@addon.license}}
   </div>
   <div>
     <b>npm keywords</b>
-    {{#each this.addon.keywords as |keyword|}}
-      <CommaSeparated @list={{this.addon.keywords}} @item={{keyword}} as |value separator|>
+    {{#each @addon.keywords as |keyword|}}
+      <CommaSeparated @list={{@addon.keywords}} @item={{keyword}} as |value separator|>
         {{value.keyword}}{{separator}}
       </CommaSeparated>
     {{/each}}
   </div>
-  {{#if this.addon.ranking}}
-    <span><LinkTo @route="addons.top">Ranks #{{this.addon.ranking}} of the top 100 addons!</LinkTo></span>
+  {{#if @addon.ranking}}
+    <span><LinkTo @route="addons.top">Ranks #{{@addon.ranking}} of the top 100 addons!</LinkTo></span>
   {{/if}}
 </section>
 
 <section>
-  <ScoreDisplay @addon={{this.addon}} as |val|>
+  <ScoreDisplay @addon={{@addon}} as |val|>
     Score <b class="test-score">{{val}}</b>
   </ScoreDisplay>
 </section>
 
 <section>
   <label>Repo URL</label>
-  {{#if this.addon.repositoryUrl}}
-    <a href={{this.addon.repositoryUrl}} target="repo" class="test-repo-url">{{this.addon.repositoryUrl}}</a>
+  {{#if @addon.repositoryUrl}}
+    <a href={{@addon.repositoryUrl}} target="repo" class="test-repo-url">{{@addon.repositoryUrl}}</a>
   {{else}}
     <em>Missing</em>
   {{/if}}
-  <a href="https://www.google.com/search?q=%22{{this.addon.name}}%22" target="_blank" rel="noopener noreferrer" title="Search Google">&nbsp;{{svg-icon "google"}}</a>
+  <a href="https://www.google.com/search?q=%22{{@addon.name}}%22" target="_blank" rel="noopener noreferrer" title="Search Google">&nbsp;{{svg-icon "google"}}</a>
   |
-  <a href="https://github.com/search?q=%22{{this.addon.name}}%22" target="_blank" rel="noopener noreferrer" title="Search GitHub">{{svg-icon "github"}}</a>
-  <ToggleSwitch @label={{if this.addon.hasInvalidGithubRepo "Has invalid Repo URL" "Has valid Repo URL"}} @isChecked={{not this.addon.hasInvalidGithubRepo}} @onToggle={{this.updateInvalidRepoFlag}} @name="repo" class="test-toggle-repo-validity" />
+  <a href="https://github.com/search?q=%22{{@addon.name}}%22" target="_blank" rel="noopener noreferrer" title="Search GitHub">{{svg-icon "github"}}</a>
+  <ToggleSwitch @label={{if @addon.hasInvalidGithubRepo "Has invalid Repo URL" "Has valid Repo URL"}} @isChecked={{not @addon.hasInvalidGithubRepo}} @onToggle={{this.updateInvalidRepoFlag}} @name="repo" class="test-toggle-repo-validity" />
 </section>
 
 <section class="toggles">
-  <ToggleSwitch @label={{if this.addon.isWip "Is a WIP" "Not a WIP"}} @isChecked={{not this.addon.isWip}} @onToggle={{this.updateIsWipFlag}} @name="wip" class="test-toggle-is-wip" />
-  <ToggleSwitch @label={{if this.addon.isDeprecated "Deprecated" "Active"}} @isChecked={{not this.addon.isDeprecated}} @onToggle={{this.updateIsDeprecatedFlag}} @name="deprecated" class="test-toggle-is-deprecated" />
-  <ToggleSwitch @label={{if this.addon.isHidden "Hidden" "Visible"}} @isChecked={{not this.addon.isHidden}} @onToggle={{this.updateIsHiddenFlag}} @name="hidden" class="hidden-toggle test-toggle-is-hidden" />
-  <ToggleSwitch @label="Is Official?" @isChecked={{this.addon.isOfficial}} @onToggle={{fn (mut this.addon.isOfficial)}} @name="official" class="test-toggle-is-official" />
-  <ToggleSwitch @label="Is CLI Dependency?" @isChecked={{this.addon.isCliDependency}} @onToggle={{fn (mut this.addon.isCliDependency)}} @name="cli-dep" class="test-toggle-is-cli-dep" />
-  <ToggleSwitch @label="Extends Ember?" @isChecked={{this.addon.extendsEmber}} @onToggle={{fn (mut this.addon.extendsEmber)}} @name="extends-ember" class="test-toggle-extends-ember" />
-  <ToggleSwitch @label="Extends Ember CLI?" @isChecked={{this.addon.extendsEmberCli}} @onToggle={{fn (mut this.addon.extendsEmberCli)}} @name="extends-ember-cli" class="test-toggle-extends-ember-cli" />
-  <ToggleSwitch @label="Is Monorepo?" @isChecked={{this.addon.isMonorepo}} @onToggle={{fn (mut this.addon.isMonorepo)}} @name="is-monorepo" class="test-toggle-is-monorepo" />
+  <ToggleSwitch @label={{if @addon.isWip "Is a WIP" "Not a WIP"}} @isChecked={{not @addon.isWip}} @onToggle={{this.updateIsWipFlag}} @name="wip" class="test-toggle-is-wip" />
+  <ToggleSwitch @label={{if @addon.isDeprecated "Deprecated" "Active"}} @isChecked={{not @addon.isDeprecated}} @onToggle={{this.updateIsDeprecatedFlag}} @name="deprecated" class="test-toggle-is-deprecated" />
+  <ToggleSwitch @label={{if @addon.isHidden "Hidden" "Visible"}} @isChecked={{not @addon.isHidden}} @onToggle={{this.updateIsHiddenFlag}} @name="hidden" class="hidden-toggle test-toggle-is-hidden" />
+  <ToggleSwitch @label="Is Official?" @isChecked={{@addon.isOfficial}} @onToggle={{fn (mut @addon.isOfficial)}} @name="official" class="test-toggle-is-official" />
+  <ToggleSwitch @label="Is CLI Dependency?" @isChecked={{@addon.isCliDependency}} @onToggle={{fn (mut @addon.isCliDependency)}} @name="cli-dep" class="test-toggle-is-cli-dep" />
+  <ToggleSwitch @label="Extends Ember?" @isChecked={{@addon.extendsEmber}} @onToggle={{fn (mut @addon.extendsEmber)}} @name="extends-ember" class="test-toggle-extends-ember" />
+  <ToggleSwitch @label="Extends Ember CLI?" @isChecked={{@addon.extendsEmberCli}} @onToggle={{fn (mut @addon.extendsEmberCli)}} @name="extends-ember-cli" class="test-toggle-extends-ember-cli" />
+  <ToggleSwitch @label="Is Monorepo?" @isChecked={{@addon.isMonorepo}} @onToggle={{fn (mut @addon.isMonorepo)}} @name="is-monorepo" class="test-toggle-is-monorepo" />
 </section>
 
 <section class="with-default-styling">
   <label>Override Repo URL</label>
-  <Input @value={{this.addon.overrideRepositoryUrl}} class="test-override-repo-url-input" @autocomplete="off" />
+  <Input @value={{@addon.overrideRepositoryUrl}} class="test-override-repo-url-input" @autocomplete="off" />
 </section>
 
 <section class="with-default-styling">
   <label>Note</label>
-  <Textarea @value={{this.addon.note}} @rows="3" class="note-input test-note-input" @autocomplete="off" /></section>
+  <Textarea @value={{@addon.note}} @rows="3" class="note-input test-note-input" @autocomplete="off" /></section>
 
 <section>
-  <CategoryChooser @categories={{this.categories}} @addon={{this.addon}} @onchange={{fn (mut this.addon.categories)}} />
+  <CategoryChooser @categories={{this.categories}} @addon={{@addon}} @onchange={{fn (mut @addon.categories)}} />
 </section>
 
 <section>
@@ -88,17 +88,17 @@
   {{else}}
     <button type="button" class="button test-save-addon" {{on "click" (perform this.saveAddon)}}>Save</button>
   {{/if}}
-  <div class="note">Last saved <RelativeTime @date={{this.addon.updatedAt}} /> ({{moment-format this.addon.updatedAt "MMMM DD, YYYY h:mm:ss" allowEmpty=true}})</div>
+  <div class="note">Last saved <RelativeTime @date={{@addon.updatedAt}} /> ({{moment-format @addon.updatedAt "MMMM DD, YYYY h:mm:ss" allowEmpty=true}})</div>
 </section>
 
 <section class="latest-review">
   <h5 class="header">Latest Review</h5>
   <div class="contents">
-    {{#if this.addon.latestReview}}
-      {{#if (not-eq this.addon.latestReview.version.version this.addon.latestAddonVersion.version)}}
+    {{#if @addon.latestReview}}
+      {{#if (not-eq @addon.latestReview.version.version @addon.latestAddonVersion.version)}}
         <em class="test-review-new-version-warning">{{svg-icon "new-releases"}} New versions of this addon have been released since this review was undertaken.</em>
       {{/if}}
-      <AddonReview @review={{this.addon.latestReview}} />
+      <AddonReview @review={{@addon.latestReview}} />
       {{#if this.renewLatestReview.isIdle}}
         <button type="button" {{on "click" (perform this.renewLatestReview)}} class="button test-renew-latest-review">Renew Review</button>
       {{else}}
@@ -112,18 +112,18 @@
     {{/if}}
     <hr>
     <section class="with-default-styling">
-      <AdminAddonReviewForm @addon={{this.addon}} />
+      <AdminAddonReviewForm @addon={{@addon}} />
     </section>
   </div>
 </section>
 
 <section>
-  {{#if this.addon.readme}}
-    {{#unless this.addon.hasInvalidGithubRepo}}
+  {{#if @addon.readme}}
+    {{#unless @addon.hasInvalidGithubRepo}}
       <section class="readme">
         <p class="header">README.md</p>
         <p class="test-addon-readme contents">
-          <MarkdownToSanitizedHtml @markdown={{this.addon.readme.contents}} @tables={{true}} @ghCodeBlocks={{true}} @tasklists={{true}} @simplifiedAutoLink={{true}} />
+          <MarkdownToSanitizedHtml @markdown={{@addon.readme.contents}} @tables={{true}} @ghCodeBlocks={{true}} @tasklists={{true}} @simplifiedAutoLink={{true}} />
         </p>
       </section>
     {{/unless}}
diff --git a/app/components/admin-addon.js b/app/components/admin-addon.js
index ecac42da..c816013a 100644
--- a/app/components/admin-addon.js
+++ b/app/components/admin-addon.js
@@ -1,75 +1,71 @@
-import classic from 'ember-classic-decorator';
-import { tagName } from '@ember-decorators/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
-import { task, timeout } from 'ember-concurrency';
+import Component from '@glimmer/component';
+import { dropTask, timeout } from 'ember-concurrency';
 import { questions } from '../models/review';
+import { tracked } from '@glimmer/tracking';
 
-@classic
-@tagName('')
 export default class AdminAddon extends Component {
   @service
   store;
 
-  addon = null;
-  recentlyRenewed = false;
+  @tracked recentlyRenewed = false;
 
   @action
   updateInvalidRepoFlag(value) {
-    this.set('addon.hasInvalidGithubRepo', !value);
+    this.args.addon.set('hasInvalidGithubRepo', !value);
   }
 
   @action
   updateIsWipFlag(value) {
-    this.set('addon.isWip', !value);
+    this.args.addon.set('isWip', !value);
   }
 
   @action
   updateIsDeprecatedFlag(value) {
-    this.set('addon.isDeprecated', !value);
+    this.args.addon('isDeprecated', !value);
   }
 
   @action
   updateIsHiddenFlag(value) {
-    this.set('addon.isHidden', !value);
+    this.args.addon('isHidden', !value);
   }
 
-  @(task(function* () {
+  @dropTask
+  *saveAddon() {
     try {
-      yield this.addon.save();
+      yield this.args.addon.save();
     } catch (e) {
       window.alert('Failed to save addon');
     }
-  }).drop())
-  saveAddon;
+  }
 
-  @(task(function* () {
+  @dropTask
+  *renewLatestReview() {
     let newReview = this.store.createRecord('review');
-    let latestReview = this.get('addon.latestReview');
+    let latestReview = this.args.addon.latestReview;
 
     questions.forEach(function (question) {
       newReview.set(question.fieldName, latestReview.get(question.fieldName));
     });
     newReview.set('review', latestReview.get('review'));
-    newReview.set('version', this.get('addon.latestAddonVersion'));
+    newReview.set('version', this.args.addon.get('latestAddonVersion'));
 
     try {
       yield newReview.save();
-      this.addon.set('latestReview', newReview);
-      yield this.addon.save();
+      this.args.addon.set('latestReview', newReview);
+      yield this.args.addon.save();
       this.completeRenew.perform();
     } catch (e) {
       console.error(e); // eslint-disable-line no-console
       window.alert('Failed to renew review');
     }
-  }).drop())
-  renewLatestReview;
+  }
 
-  @(task(function* () {
-    this.set('recentlyRenewed', true);
+  @dropTask
+  *completeRenew() {
+    this.recentlyRenewed = true;
     yield timeout(2000);
-    this.set('recentlyRenewed', false);
-  }).drop())
-  completeRenew;
+    this.recentlyRenewed = false;
+  }
 }

From eab4cdd6f8d05c96d51b74b11305a3b18fe46eb7 Mon Sep 17 00:00:00 2001
From: Phil Gengler <phil@pgengler.net>
Date: Wed, 18 Aug 2021 20:09:31 -0400
Subject: [PATCH 3/5] Add 'tracked-built-ins'

---
 package.json |  3 ++-
 yarn.lock    | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1a16a923..a7f37c9c 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,8 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
     "qunit": "^2.14.0",
-    "qunit-dom": "^1.6.0"
+    "qunit-dom": "^1.6.0",
+    "tracked-built-ins": "^1.1.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/yarn.lock b/yarn.lock
index 2f16820f..2e741614 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1414,7 +1414,7 @@
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/tracking@^1.0.2", "@glimmer/tracking@^1.0.3", "@glimmer/tracking@^1.0.4":
+"@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.2", "@glimmer/tracking@^1.0.3", "@glimmer/tracking@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.4.tgz#f1bc1412fe5e2236d0f8d502994a8f88af1bbb21"
   integrity sha512-F+oT8I55ba2puSGIzInmVrv/8QA2PcK1VD+GWgFMhF6WC97D+uZX7BFg+a3s/2N4FVBq5KHE+QxZzgazM151Yw==
@@ -5371,6 +5371,39 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cl
     rimraf "^3.0.1"
     semver "^5.5.0"
 
+ember-cli-babel@^7.26.3:
+  version "7.26.6"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
+  integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.12.0"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-code-coverage@^1.0.0-beta.8:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ember-cli-code-coverage/-/ember-cli-code-coverage-1.0.2.tgz#615fc7af8bc7d9388a28371c2825c224a936d73f"
@@ -12895,6 +12928,23 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
+tracked-built-ins@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tracked-built-ins/-/tracked-built-ins-1.1.1.tgz#d472142b268f2e03de719e33c0407b4c8b8ce5fa"
+  integrity sha512-ZPGvTu+7d2tkUe4fJPgKkW8Bh512ZBih1S+DhuCSuT4VGj5qLwKbabSMqRiPSYOwWeM5aER0HMRGUvpWARPaHQ==
+  dependencies:
+    ember-cli-babel "^7.26.3"
+    ember-cli-typescript "^4.1.0"
+    tracked-maps-and-sets "^2.0.0"
+
+tracked-maps-and-sets@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tracked-maps-and-sets/-/tracked-maps-and-sets-2.2.1.tgz#323dd40540c561e8b0ffdec8bf129c68ec5025f9"
+  integrity sha512-XYrXh6L/GpGmVmG3KcN/qoDyi4FxHh8eZY/BA/RuoxynskV+GZSfwrX3R+5DR2CIkzkCx4zi4kkDRg1AMDfDhg==
+  dependencies:
+    "@glimmer/tracking" "^1.0.0"
+    ember-cli-babel "^7.17.2"
+
 tree-sync@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"

From 771d61d046d67947b423c0b4f07fe7f26c8e2772 Mon Sep 17 00:00:00 2001
From: Phil Gengler <phil@pgengler.net>
Date: Wed, 18 Aug 2021 20:11:08 -0400
Subject: [PATCH 4/5] Convert <AdminAddonReviewForm/> to be a Glimmer component

---
 app/components/admin-addon-review-form.hbs | 24 ++++------
 app/components/admin-addon-review-form.js  | 53 ++++++++++------------
 2 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/app/components/admin-addon-review-form.hbs b/app/components/admin-addon-review-form.hbs
index 1fb4ba2d..955415cd 100644
--- a/app/components/admin-addon-review-form.hbs
+++ b/app/components/admin-addon-review-form.hbs
@@ -1,22 +1,18 @@
 <h5>Review this addon</h5>
-<form class="review-form" {{on "submit" (prevent-default (perform this.saveReview))}}>
+<form
+  class="review-form"
+  {{on "submit" (prevent-default (perform this.saveReview))}}
+  {{did-update this.reset @addon}}
+>
   <ol>
     {{#each this.questions as |question|}}
       <li class="test-review-question">
         <div class="question">{{question.text}}</div>
-        <ExclusiveButtonGroup @selectedValue={{get this.reviewProperties question.fieldName}} @updateSelectedValue={{fn this.selectOption question.fieldName}} as |btn|>
-          {{component btn
-                      value=1
-                      label="Yes"}}
-          {{component btn
-                      value=2
-                      label="No"}}
-          {{component btn
-                      value=3
-                      label="N/A"}}
-          {{component btn
-                      value=4
-                      label="Unknown"}}
+        <ExclusiveButtonGroup @selectedValue={{get this.reviewProperties question.fieldName}} @updateSelectedValue={{fn this.selectOption question.fieldName}} as |Button|>
+          <Button @value={{1}} @label="Yes" />
+          <Button @value={{2}} @label="No" />
+          <Button @value={{3}} @label="N/A" />
+          <Button @value={{4}} @label="Unknown" />
         </ExclusiveButtonGroup>
       </li>
     {{/each}}
diff --git a/app/components/admin-addon-review-form.js b/app/components/admin-addon-review-form.js
index dec3cb87..e0a29a30 100644
--- a/app/components/admin-addon-review-form.js
+++ b/app/components/admin-addon-review-form.js
@@ -1,55 +1,52 @@
-/* eslint-disable ember/no-component-lifecycle-hooks */
-import classic from 'ember-classic-decorator';
-import { inject } from '@ember/service';
-import Component from '@ember/component';
 import { action } from '@ember/object';
-import { task, timeout } from 'ember-concurrency';
-import { questions } from '../models/review';
+import { inject as service } from '@ember/service';
+import Component from '@glimmer/component';
+import { tracked } from 'tracked-built-ins';
+import { dropTask, timeout } from 'ember-concurrency';
+import { questions } from 'ember-observer/models/review';
 
-@classic
 export default class AdminAddonReviewForm extends Component {
-  addon = null;
-  reviewProperties = null;
+  @tracked reviewProperties = tracked({});
+
+  @tracked
+  recentlySaved = false;
+
   questions = questions;
 
-  @inject()
+  @service
   store;
 
-  didReceiveAttrs() {
-    super.didReceiveAttrs(...arguments);
-    this.reset();
-  }
-
+  @action
   reset() {
-    this.set('reviewProperties', {});
+    this.reviewProperties = tracked({});
   }
 
   @action
   selectOption(fieldName, value) {
-    this.set(`reviewProperties.${fieldName}`, value);
+    this.reviewProperties[fieldName] = value;
   }
 
-  @(task(function* () {
+  @dropTask
+  *saveReview() {
     let newReview = this.store.createRecord('review', this.reviewProperties);
     newReview.set('review', this.reviewText);
-    newReview.set('version', this.get('addon.latestAddonVersion'));
+    newReview.set('version', this.args.addon.get('latestAddonVersion'));
     try {
       yield newReview.save();
-      this.addon.set('latestReview', newReview);
-      yield this.addon.save();
+      this.args.addon.set('latestReview', newReview);
+      yield this.args.addon.save();
       this.reset();
       this.complete.perform();
     } catch (e) {
       console.error(e); // eslint-disable-line no-console
       window.alert('Failed to create review');
     }
-  }).drop())
-  saveReview;
+  }
 
-  @(task(function* () {
-    this.set('recentlySaved', true);
+  @dropTask
+  *complete() {
+    this.recentlySaved = true;
     yield timeout(2000);
-    this.set('recentlySaved', false);
-  }).drop())
-  complete;
+    this.recentlySaved = false;
+  }
 }

From 88874507690abfc32f5f157944fcf150f4378b5d Mon Sep 17 00:00:00 2001
From: Phil Gengler <phil@pgengler.net>
Date: Wed, 18 Aug 2021 20:11:53 -0400
Subject: [PATCH 5/5] Clear review text field when changing between addons

---
 app/components/admin-addon-review-form.js   |  4 +++
 app/helpers/prevent-default.js              |  2 +-
 tests/acceptance/admin-review-addon-test.js | 30 +++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/components/admin-addon-review-form.js b/app/components/admin-addon-review-form.js
index e0a29a30..993b3888 100644
--- a/app/components/admin-addon-review-form.js
+++ b/app/components/admin-addon-review-form.js
@@ -11,6 +11,9 @@ export default class AdminAddonReviewForm extends Component {
   @tracked
   recentlySaved = false;
 
+  @tracked
+  reviewText = null;
+
   questions = questions;
 
   @service
@@ -19,6 +22,7 @@ export default class AdminAddonReviewForm extends Component {
   @action
   reset() {
     this.reviewProperties = tracked({});
+    this.reviewText = null;
   }
 
   @action
diff --git a/app/helpers/prevent-default.js b/app/helpers/prevent-default.js
index f718181b..57f72562 100644
--- a/app/helpers/prevent-default.js
+++ b/app/helpers/prevent-default.js
@@ -3,6 +3,6 @@ import { helper } from '@ember/component/helper';
 export default helper(function preventDefaultHelper([fn]) {
   return (event) => {
     event.preventDefault();
-    fn();
+    fn(event);
   };
 });
diff --git a/tests/acceptance/admin-review-addon-test.js b/tests/acceptance/admin-review-addon-test.js
index 7ab6b20e..35de7ef4 100644
--- a/tests/acceptance/admin-review-addon-test.js
+++ b/tests/acceptance/admin-review-addon-test.js
@@ -654,6 +654,36 @@ module('Acceptance | admin review addon', function (hooks) {
     assert.equal(actualMessage, 'Failed to create review');
   });
 
+  test('resets toggles/fields when changing addons', async function (assert) {
+    let firstAddon = server.create('addon', { note: null });
+    let secondAddon = server.create('addon', { note: null });
+
+    await visitAddon(firstAddon, '?list=needing-review');
+    await toggle('.test-toggle-is-wip');
+    await fillIn('.test-note-input', 'Some notes about this addon');
+    await click('.test-save-addon');
+
+    await answerQuestion('Are there meaningful tests?', 'Yes');
+    await answerQuestion('Is the README filled out?', 'Yes');
+    await answerQuestion('Does the addon have a build?', 'No');
+    await fillIn('.test-addon-review-notes', 'A note on the review');
+    await click('.test-addon-review-save');
+
+    // go to the other addon
+    await click(findByText('.test-review-list-item', secondAddon.name));
+    assertToggleState(assert, '.test-toggle-is-wip', {
+      checked: true,
+      text: 'Not a WIP',
+    });
+    assert.dom('.test-note-input').hasNoValue('clears addon note field');
+    assert
+      .dom('.test-review-question button.selected')
+      .doesNotExist('clears review questions');
+    assert
+      .dom('.test-addon-review-notes')
+      .hasNoValue('clears review note field');
+  });
+
   module('lists', function () {
     test('Visiting list without a list param defaults to needing-review', async function (assert) {
       let addon = server.create('addon', {