From 4328b4c6dadf6609a1b32ccb8154b90fdbc43622 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Wed, 27 Oct 2021 17:23:18 -0400
Subject: [PATCH 1/4] tweak filter i18n label

---
 addons/core/translations/actions/en-us.yaml            | 2 --
 ui/admin/app/templates/scopes/scope/sessions/index.hbs | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml
index 49cd11a23..144ced636 100644
--- a/addons/core/translations/actions/en-us.yaml
+++ b/addons/core/translations/actions/en-us.yaml
@@ -35,5 +35,3 @@ close: Close
 toggle-secret: Toggle secret visibility
 minimize: Minimize
 fullscreen: Fullscreen
-filter: 
- status: status
diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index c3653a062..e3fa0e32b 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -19,7 +19,7 @@
         <Rose::Toolbar>
           <Rose::Form as |form|>
             <Rose::Dropdown
-              @text={{t 'actions.filter.status'}}
+              @text={{t 'form.status.label'}}
               @ignoreClickInside={{true}}
               as |dropdown|
             >
@@ -125,4 +125,4 @@
 
   </page.body>
 
-</Rose::Layout::Page>
\ No newline at end of file
+</Rose::Layout::Page>

From ca03aca886201ad0c6c5b2eedc96d48c29f3463f Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Wed, 27 Oct 2021 17:35:00 -0400
Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20tweak=20tests=20and?=
 =?UTF-8?q?=20remove=20unused=20class=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/rose/addon/components/rose/toolbar/index.js        | 8 --------
 .../tests/integration/components/rose/toolbar-test.js     | 3 ++-
 ui/admin/app/templates/scopes/scope/sessions/index.hbs    | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 addons/rose/addon/components/rose/toolbar/index.js

diff --git a/addons/rose/addon/components/rose/toolbar/index.js b/addons/rose/addon/components/rose/toolbar/index.js
deleted file mode 100644
index 1ae2378ca..000000000
--- a/addons/rose/addon/components/rose/toolbar/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Component from '@glimmer/component';
-import { generateComponentID } from '../../../utilities/component-auto-id';
-
-export default class RoseToolbarComponent extends Component {
-  // =attributes
-
-  id = generateComponentID();
-}
diff --git a/addons/rose/tests/integration/components/rose/toolbar-test.js b/addons/rose/tests/integration/components/rose/toolbar-test.js
index 3a9166ef7..9c91e6c7a 100644
--- a/addons/rose/tests/integration/components/rose/toolbar-test.js
+++ b/addons/rose/tests/integration/components/rose/toolbar-test.js
@@ -7,12 +7,13 @@ module('Integration | Component | rose/toolbar', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function (assert) {
+    assert.expect(1);
     await render(hbs`<Rose::Toolbar />`);
-    assert.ok(find('div'));
     assert.ok(find('.rose-toolbar'));
   });
 
   test('it renders with attributes', async function (assert) {
+    assert.expect(1);
     await render(hbs`<Rose::Toolbar id="toolbar"/>`);
     assert.ok(find('#toolbar'));
   });
diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index e3fa0e32b..31f079f2e 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -125,4 +125,4 @@
 
   </page.body>
 
-</Rose::Layout::Page>
+</Rose::Layout::Page>
\ No newline at end of file

From 324c5dd98cde9183ffaa9c2ed4659ae02b8a2844 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 28 Oct 2021 11:53:31 -0400
Subject: [PATCH 3/4] chore: fix formatting and update yarn lock

---
 .../app/templates/scopes/scope/sessions/index.hbs    |  2 +-
 yarn.lock                                            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index e6714ecef..31f079f2e 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -17,7 +17,7 @@
     {{#if @model}}
       {{#if (feature-flag 'filter')}}
         <Rose::Toolbar>
-        <Rose::Form as |form|>
+          <Rose::Form as |form|>
             <Rose::Dropdown
               @text={{t 'form.status.label'}}
               @ignoreClickInside={{true}}
diff --git a/yarn.lock b/yarn.lock
index c3824f22a..931bbdb30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7670,7 +7670,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001271:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001265:
   version "1.0.30001271"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz#0dda0c9bcae2cf5407cd34cac304186616cc83e8"
   integrity sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==
@@ -9510,10 +9510,10 @@ electron-rebuild@^2.0.3:
     tar "^6.0.5"
     yargs "^16.0.0"
 
-electron-to-chromium@^1.3.878:
-  version "1.3.878"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.878.tgz#baa9fb5c24b9b580f08fb245cbb52a22f8fc8fa8"
-  integrity sha512-O6yxWCN9ph2AdspAIszBnd9v8s11hQx8ub9w4UGApzmNRnoKhbulOWqbO8THEQec/aEHtvy+donHZMlh6l1rbA==
+electron-to-chromium@^1.3.867:
+  version "1.3.883"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.883.tgz#cc409921469b3aa6ab6efd65cc2a4375128bb703"
+  integrity sha512-goyjNx4wB9j911PBteb+AXNbErug7rJVkmDXWdw5SCVn2JlARBwsqucPkvp1h5mXWxHUbBRK3bwXTrqSxSiAIQ==
 
 element-resize-detector@^1.2.2:
   version "1.2.3"
@@ -17059,7 +17059,7 @@ node-pre-gyp@^0.11.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^2.0.1:
+node-releases@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
   integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==

From 6ed14cb1f1c0a62a4d0cda021ab78d4e99b94329 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 28 Oct 2021 12:46:56 -0400
Subject: [PATCH 4/4] chore: linting

---
 ui/admin/app/templates/scopes/scope/sessions/index.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index e3fa0e32b..31f079f2e 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -125,4 +125,4 @@
 
   </page.body>
 
-</Rose::Layout::Page>
+</Rose::Layout::Page>
\ No newline at end of file