From 31970bd6fc2fb025fe16eec313db186922d3ccfb Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Wed, 29 Sep 2021 15:24:55 +0400
Subject: [PATCH] DEV: little cleanup in the notifications-index component
 (#14464)

- There's no need to pass `filter` to `user-notifications-large`. The component doesn't use it.
- Rename css class to avoid confusion (this div has nothing to-do with the Select Kit)
- Remove duplicated declarations in test fixtures
---
 .../discourse/app/templates/user/notifications-index.hbs     | 4 ++--
 .../discourse/tests/acceptance/notifications-test.js         | 5 +----
 app/assets/stylesheets/common/base/user.scss                 | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
index 436f4fa2bc7..b138dfbe534 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
@@ -14,14 +14,14 @@
     </div>
   </div>
 {{else}}
-  <div class="user-notifications-filter-select-kit">
+  <div class="user-notifications-filter">
     {{notifications-filter value=filter onChange=(action (mut filter))}}
   </div>
 
   {{#if nothingFound}}
     <div class="alert alert-info">{{i18n "notifications.empty"}}</div>
   {{else}}
-    {{user-notifications-large notifications=model filter=filter}}
+    {{user-notifications-large notifications=model}}
     {{conditional-loading-spinner condition=loading}}
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js b/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js
index 53f00b9df23..3eda729a3bc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js
@@ -50,7 +50,6 @@ acceptance("User Notifications", function (needs) {
           id: 42,
           user_id: 1,
           notification_type: 5,
-          high_priority: true,
           read: false,
           high_priority: true,
           created_at: "2021-01-01 12:00:00 UTC",
@@ -99,7 +98,6 @@ acceptance("User Notifications", function (needs) {
           id: 43,
           user_id: 1,
           notification_type: 5,
-          high_priority: true,
           read: true,
           high_priority: false,
           created_at: "2021-01-01 12:00:00 UTC",
@@ -150,7 +148,6 @@ acceptance("User Notifications", function (needs) {
           id: 44,
           user_id: 1,
           notification_type: 5,
-          high_priority: true,
           read: true,
           high_priority: false,
           created_at: "2021-01-01 12:00:00 UTC",
@@ -221,7 +218,7 @@ acceptance(
     test("It does not render filter", async function (assert) {
       await visit("/u/eviltrout/notifications");
 
-      assert.notOk(exists("div.user-notifications-filter-select-kit"));
+      assert.notOk(exists("div.user-notifications-filter"));
     });
   }
 );
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 03628c50557..881a4ef8d7f 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -66,7 +66,7 @@
     color: var(--love);
   }
 
-  .user-notifications-filter-select-kit {
+  .user-notifications-filter {
     display: block;
     width: 100%;
     border-bottom: 0.5px solid var(--primary-low);