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
This commit is contained in:
parent
fc432a9cab
commit
31970bd6fc
|
@ -14,14 +14,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="user-notifications-filter-select-kit">
|
<div class="user-notifications-filter">
|
||||||
{{notifications-filter value=filter onChange=(action (mut filter))}}
|
{{notifications-filter value=filter onChange=(action (mut filter))}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{#if nothingFound}}
|
{{#if nothingFound}}
|
||||||
<div class="alert alert-info">{{i18n "notifications.empty"}}</div>
|
<div class="alert alert-info">{{i18n "notifications.empty"}}</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{user-notifications-large notifications=model filter=filter}}
|
{{user-notifications-large notifications=model}}
|
||||||
{{conditional-loading-spinner condition=loading}}
|
{{conditional-loading-spinner condition=loading}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -50,7 +50,6 @@ acceptance("User Notifications", function (needs) {
|
||||||
id: 42,
|
id: 42,
|
||||||
user_id: 1,
|
user_id: 1,
|
||||||
notification_type: 5,
|
notification_type: 5,
|
||||||
high_priority: true,
|
|
||||||
read: false,
|
read: false,
|
||||||
high_priority: true,
|
high_priority: true,
|
||||||
created_at: "2021-01-01 12:00:00 UTC",
|
created_at: "2021-01-01 12:00:00 UTC",
|
||||||
|
@ -99,7 +98,6 @@ acceptance("User Notifications", function (needs) {
|
||||||
id: 43,
|
id: 43,
|
||||||
user_id: 1,
|
user_id: 1,
|
||||||
notification_type: 5,
|
notification_type: 5,
|
||||||
high_priority: true,
|
|
||||||
read: true,
|
read: true,
|
||||||
high_priority: false,
|
high_priority: false,
|
||||||
created_at: "2021-01-01 12:00:00 UTC",
|
created_at: "2021-01-01 12:00:00 UTC",
|
||||||
|
@ -150,7 +148,6 @@ acceptance("User Notifications", function (needs) {
|
||||||
id: 44,
|
id: 44,
|
||||||
user_id: 1,
|
user_id: 1,
|
||||||
notification_type: 5,
|
notification_type: 5,
|
||||||
high_priority: true,
|
|
||||||
read: true,
|
read: true,
|
||||||
high_priority: false,
|
high_priority: false,
|
||||||
created_at: "2021-01-01 12:00:00 UTC",
|
created_at: "2021-01-01 12:00:00 UTC",
|
||||||
|
@ -221,7 +218,7 @@ acceptance(
|
||||||
test("It does not render filter", async function (assert) {
|
test("It does not render filter", async function (assert) {
|
||||||
await visit("/u/eviltrout/notifications");
|
await visit("/u/eviltrout/notifications");
|
||||||
|
|
||||||
assert.notOk(exists("div.user-notifications-filter-select-kit"));
|
assert.notOk(exists("div.user-notifications-filter"));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
color: var(--love);
|
color: var(--love);
|
||||||
}
|
}
|
||||||
|
|
||||||
.user-notifications-filter-select-kit {
|
.user-notifications-filter {
|
||||||
display: block;
|
display: block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-bottom: 0.5px solid var(--primary-low);
|
border-bottom: 0.5px solid var(--primary-low);
|
||||||
|
|
Loading…
Reference in New Issue