A platform for community discussion. Free, open, simple.
FEATURE: Change dismiss to combo button in unified new (#38745)
Martin Brennan2f423165e99f
diff --git a/app/assets/stylesheets/common/base/uc-dismiss.scss b/app/assets/stylesheets/common/base/uc-dismiss.scssindex 1186c41cbea..319f3a7f130 100644--- a/app/assets/stylesheets/common/base/uc-dismiss.scss+++ b/app/assets/stylesheets/common/base/uc-dismiss.scss@@ -12,10 +12,14 @@.dismiss-read {box-shadow: var(--shadow-dropdown);+ }++ .topic-dismiss-buttons__button .d-icon {+ display: none;+ }- .d-icon {- display: none;- }+ .topic-dismiss-buttons__menu .d-icon {+ display: inline-flex;}.footer-nav-visible & {@@ -25,5 +29,17 @@);}}++ .dismiss-container-bottom {+ .topic-dismiss-buttons__menu {+ display: none;+ }++ .topic-dismiss-buttons__button {+ border-top-right-radius: var(--d-button-border-radius);+ border-bottom-right-radius: var(--d-button-border-radius);+ border-right: var(--d-button-default-border);+ }+ }}}diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 947ebf785dc..e48574dc747 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -3805,6 +3805,11 @@ en:other: "Dismiss (%{count})…"dismiss_tooltip: "Dismiss just new posts or stop tracking topics"also_dismiss_topics: "Stop tracking these topics so they never show up as unread for me again"+ dismiss_all: "Dismiss all"+ dismiss_new_topics: "Dismiss new topics"+ dismiss_new_replies: "Dismiss new replies"+ dismiss_new_menu: "Dismiss options"+ dismiss_and_stop_tracking: "Dismiss and stop tracking"dismiss_new: "Dismiss New"dismiss_new_modal:title: "Dismiss new"diff --git a/frontend/discourse/app/components/d-navigation.gjs b/frontend/discourse/app/components/d-navigation.gjsindex 77e5bee8829..1fa82b1a044 100644--- a/frontend/discourse/app/components/d-navigation.gjs+++ b/frontend/discourse/app/components/d-navigation.gjs@@ -202,6 +202,15 @@ export default class DNavigation extends Component {});}+ @computed("showResetNew", "filterType", "currentUser.new_new_view_enabled")+ get showNewDismissCombo() {+ return (+ this.showResetNew &&+ this.filterType === "new" &&+ this.currentUser.new_new_view_enabled+ );+ }+@computed("filterType")get notCategoriesRoute() {return this.filterType !== "categories";@@ -314,6 +323,7 @@ export default class DNavigation extends Component {@selectedTopics={{@bulkSelectHelper.selected}}@model={{@model}}@showResetNew={{@showResetNew}}+ @showNewDismissCombo={{this.showNewDismissCombo}}@showDismissRead={{@showDismissRead}}@resetNew={{@resetNew}}@dismissRead={{@dismissRead}}diff --git a/frontend/discourse/app/components/discovery/topics.gjs b/frontend/discourse/app/components/discovery/topics.gjsindex ffd6ed74f12..f2fb20068f4 100644--- a/frontend/discourse/app/components/discovery/topics.gjs+++ b/frontend/discourse/app/components/discovery/topics.gjs@@ -144,6 +144,10 @@ export default class DiscoveryTopics extends Component {return this.args.tag || this.args.category;}+ get showBottomDismissButtons() {+ return this.allLoaded;+ }+@actionloadMore() {applyBehaviorTransformer(@@ -304,15 +308,18 @@ export default class DiscoveryTopics extends Component {model=@model}}>- <TopicDismissButtons- @position="bottom"- @selectedTopics={{@bulkSelectHelper.selected}}- @model={{@model}}- @showResetNew={{@showResetNew}}- @showDismissRead={{@showDismissRead}}- @resetNew={{@resetNew}}- @dismissRead={{@dismissRead}}- />+ {{#if this.showBottomDismissButtons}}+ <TopicDismissButtons+ @position="bottom"+ @selectedTopics={{@bulkSelectHelper.selected}}+ @model={{@model}}+ @showResetNew={{@showResetNew}}+ @showNewDismissCombo={{this.showTopicsAndRepliesToggle}}+ @showDismissRead={{@showDismissRead}}+ @resetNew={{@resetNew}}+ @dismissRead={{@dismissRead}}+ />+ {{/if}}{{#if this.showEmptyFilterEducationInFooter}}<EmptyTopicFilterdiff --git a/frontend/discourse/app/components/topic-dismiss-buttons.gjs b/frontend/discourse/app/components/topic-dismiss-buttons.gjsindex b2127ddae0c..0238d2eb137 100644--- a/frontend/discourse/app/components/topic-dismiss-buttons.gjs+++ b/frontend/discourse/app/components/topic-dismiss-buttons.gjs@@ -3,11 +3,16 @@ import { action } from "@ember/object";import { service } from "@ember/service";import DismissReadModal from "discourse/components/modal/dismiss-read";import DButton from "discourse/ui-kit/d-button";+import DComboButton from "discourse/ui-kit/d-combo-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";export default class TopicDismissButtons extends Component {@service currentUser;@service modal;+ @service site;++ dMenu;get showBasedOnPosition() {return this.args.position === "top" || this.args.model.topics.length > 5;@@ -25,7 +30,14 @@ export default class TopicDismissButtons extends Component {get dismissNewLabel() {if (this.currentUser?.new_new_view_enabled) {- return i18n("topics.bulk.dismiss_button");+ switch (this.newListSubset) {+ case "topics":+ return i18n("topics.bulk.dismiss_new_topics");+ case "replies":+ return i18n("topics.bulk.dismiss_new_replies");+ default:+ return i18n("topics.bulk.dismiss_all");+ }}if (this.args.selectedTopics.length === 0) {@@ -37,6 +49,41 @@ export default class TopicDismissButtons extends Component {});}+ get newListSubset() {+ return (+ this.args.model?.params?.subset ?? this.args.model?.listParams?.subset+ );+ }++ get showDismissNewStopTracking() {+ return this.newListSubset !== "topics";+ }++ get showDismissNewMenu() {+ // On mobile the bottom dismiss button is the floating control, so the+ // stop-tracking menu only renders on the top button.+ return (+ this.showDismissNewStopTracking &&+ !(this.site.mobileView && this.args.position === "bottom")+ );+ }++ get dismissNewOptions() {+ const options = {+ dismissPosts: true,+ dismissTopics: true,+ untrack: false,+ };++ if (this.newListSubset === "topics") {+ options.dismissPosts = false;+ } else if (this.newListSubset === "replies") {+ options.dismissTopics = false;+ }++ return options;+ }+@actiondismissReadPosts() {this.modal.show(DismissReadModal, {@@ -50,6 +97,22 @@ export default class TopicDismissButtons extends Component {});}+ @action+ registerDMenu(api) {+ this.dMenu = api;+ }++ @action+ dismissNew(untrack = false) {+ this.args.resetNew({ ...this.dismissNewOptions, untrack });+ }++ @action+ async dismissNewAndStopTracking() {+ await this.dMenu?.close();+ this.dismissNew(true);+ }+<template>{{~#if this.showBasedOnPosition~}}<div class="row dismiss-container-{{@position}}">@@ -63,13 +126,51 @@ export default class TopicDismissButtons extends Component {/>{{~/if~}}{{~#if @showResetNew~}}- <DButton- @action={{@resetNew}}- @translatedLabel={{this.dismissNewLabel}}- @icon="check"- id="dismiss-new-{{@position}}"- class="btn-default dismiss-read"- />+ {{#if @showNewDismissCombo}}+ <DComboButton+ class="--has-menu topic-dismiss-buttons__combo"+ as |combo|+ >+ <combo.Button+ @action={{this.dismissNew}}+ @translatedLabel={{this.dismissNewLabel}}+ id="dismiss-new-{{@position}}"+ class="btn-default dismiss-read topic-dismiss-buttons__button"+ />++ {{#if this.showDismissNewMenu}}+ <combo.Menu+ @identifier="dismiss-new-menu"+ @onRegisterApi={{this.registerDMenu}}+ @modalForMobile={{true}}+ @placement="bottom-end"+ aria-label={{i18n "topics.bulk.dismiss_new_menu"}}+ id="dismiss-new-menu-{{@position}}"+ class="btn-default dismiss-read topic-dismiss-buttons__menu"+ >+ <DDropdownMenu as |dropdown|>+ <dropdown.item class="topic-dismiss-buttons__menu-item">+ <DButton+ @action={{this.dismissNewAndStopTracking}}+ @translatedLabel={{i18n+ "topics.bulk.dismiss_and_stop_tracking"+ }}+ class="btn-secondary dismiss-new-stop-tracking"+ />+ </dropdown.item>+ </DDropdownMenu>+ </combo.Menu>+ {{/if}}+ </DComboButton>+ {{else}}+ <DButton+ @action={{@resetNew}}+ @translatedLabel={{this.dismissNewLabel}}+ @icon="check"+ id="dismiss-new-{{@position}}"+ class="btn-default dismiss-read"+ />+ {{/if}}{{~/if~}}</div>{{~/if~}}diff --git a/frontend/discourse/app/controllers/discovery/list.js b/frontend/discourse/app/controllers/discovery/list.jsindex 44fefb3df19..2e738f4d767 100644--- a/frontend/discourse/app/controllers/discovery/list.js+++ b/frontend/discourse/app/controllers/discovery/list.js@@ -2,7 +2,6 @@ import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action } from "@ember/object";import { service } from "@ember/service";-import DismissNew from "discourse/components/modal/dismiss-new";import { popupAjaxError } from "discourse/lib/ajax-error";import BulkSelectHelper from "discourse/lib/bulk-select-helper";import { filterTypeForMode } from "discourse/lib/filter-mode";@@ -55,7 +54,6 @@ export default class DiscoveryListController extends Controller {@service router;@service store;@service topicTrackingState;- @service modal;@tracked model;@tracked showTagInfo = false;@@ -175,21 +173,36 @@ export default class DiscoveryListController extends Controller {this.router.refresh();}+ get dismissNewSubset() {+ return this.model.list?.listParams?.subset ?? this.subset;+ }++ buildResetNewOptions(overrides = {}) {+ const options = {+ dismissPosts: true,+ dismissTopics: true,+ untrack: false,+ };++ if (this.dismissNewSubset === "topics") {+ options.dismissPosts = false;+ } else if (this.dismissNewSubset === "replies") {+ options.dismissTopics = false;+ }++ return { ...options, ...overrides };+ }+@action- resetNew() {+ resetNew(overrides = {}) {if (!this.currentUser.new_new_view_enabled) {return this.callResetNew();}- this.modal.show(DismissNew, {- model: {- selectedTopics: this.bulkSelectHelper.selected,- subset: this.model.list?.listParams?.subset,- dismissCallback: ({ dismissPosts, dismissTopics, untrack }) => {- this.callResetNew(dismissPosts, dismissTopics, untrack);- },- },- });+ const { dismissPosts, dismissTopics, untrack } =+ this.buildResetNewOptions(overrides);++ return this.callResetNew(dismissPosts, dismissTopics, untrack);}@actiondiff --git a/frontend/discourse/app/controllers/user-topics-list.js b/frontend/discourse/app/controllers/user-topics-list.jsindex 9521f63409d..75eb10933b7 100644--- a/frontend/discourse/app/controllers/user-topics-list.js+++ b/frontend/discourse/app/controllers/user-topics-list.js@@ -2,6 +2,7 @@ import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";+import { service } from "@ember/service";import { isNone } from "@ember/utils";import { popupAjaxError } from "discourse/lib/ajax-error";import BulkSelectHelper from "discourse/lib/bulk-select-helper";@@ -15,6 +16,9 @@ import { QUERY_PARAMS } from "discourse/routes/user-topic-list";// Lists of topics on a user's page.export default class UserTopicsListController extends Controller {+ @service site;+ @service siteSettings;+@tracked model;@tracked listContext = "user-activity";@@ -56,6 +60,14 @@ export default class UserTopicsListController extends Controller {return this.bulkSelectHelper.selected;}+ get showBottomDismissButtons() {+ return (+ !this.site.mobileView ||+ (this.site.mobileView &&+ !this.siteSettings.floating_dismiss_topics_on_mobile)+ );+ }+@computed("model.topics.length", "incomingCount")get noContent() {return this.model?.topics?.length === 0 && this.incomingCount === 0;diff --git a/frontend/discourse/app/templates/user-topics-list.gjs b/frontend/discourse/app/templates/user-topics-list.gjsindex 4946037d0b5..a0c282bd735 100644--- a/frontend/discourse/app/templates/user-topics-list.gjs+++ b/frontend/discourse/app/templates/user-topics-list.gjs@@ -72,19 +72,20 @@ export default <template>@listContext={{@controller.listContext}}/>- <TopicDismissButtons- @position="bottom"- @selectedTopics={{@controller.bulkSelectHelper.selected}}- @model={{@controller.model}}- @showResetNew={{@controller.showResetNew}}- @showDismissRead={{@controller.showDismissRead}}- @resetNew={{@controller.resetNew}}- @dismissRead={{if- @controller.showDismissRead- (routeAction "dismissReadTopics")- }}- />-+ {{#if @controller.showBottomDismissButtons}}+ <TopicDismissButtons+ @position="bottom"+ @selectedTopics={{@controller.bulkSelectHelper.selected}}+ @model={{@controller.model}}+ @showResetNew={{@controller.showResetNew}}+ @showDismissRead={{@controller.showDismissRead}}+ @resetNew={{@controller.resetNew}}+ @dismissRead={{if+ @controller.showDismissRead+ (routeAction "dismissReadTopics")+ }}+ />+ {{/if}}<DConditionalLoadingSpinner@condition={{@controller.model.loadingMore}}/>diff --git a/frontend/discourse/tests/acceptance/mobile-new-dismiss-test.js b/frontend/discourse/tests/acceptance/mobile-new-dismiss-test.jsnew file mode 100644index 00000000000..f362edeecff--- /dev/null+++ b/frontend/discourse/tests/acceptance/mobile-new-dismiss-test.js@@ -0,0 +1,28 @@+import { visit } from "@ember/test-helpers";+import { test } from "qunit";+import { cloneJSON } from "discourse/lib/object";+import topicFixtures from "discourse/tests/fixtures/discovery-fixtures";+import { acceptance } from "discourse/tests/helpers/qunit-helpers";++acceptance("New dismiss - Mobile", function (needs) {+ needs.mobileView();+ needs.settings({ floating_dismiss_topics_on_mobile: true });+ needs.user({ new_new_view_enabled: true });+ needs.pretender((server, helper) => {+ const topicList = cloneJSON(topicFixtures["/latest.json"]);+ topicList.topic_list.more_topics_url = null;++ server.get("/new.json", () => {+ return helper.response(topicList);+ });+ });++ test("shows the floating dismiss split-button but hides the bottom chevron on mobile", async function (assert) {+ await visit("/new");++ assert.dom("#dismiss-new-top").exists();+ assert.dom("#dismiss-new-menu-top .d-icon-chevron-down").exists();+ assert.dom("#dismiss-new-bottom").exists();+ assert.dom("#dismiss-new-menu-bottom").isNotVisible();+ });+});diff --git a/frontend/discourse/tests/integration/components/topic-dismiss-buttons-test.gjs b/frontend/discourse/tests/integration/components/topic-dismiss-buttons-test.gjsnew file mode 100644index 00000000000..4adb096c086--- /dev/null+++ b/frontend/discourse/tests/integration/components/topic-dismiss-buttons-test.gjs@@ -0,0 +1,199 @@+import { click, render } from "@ember/test-helpers";+import { module, test } from "qunit";+import TopicDismissButtons from "discourse/components/topic-dismiss-buttons";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import { i18n } from "discourse-i18n";++module("Integration | Component | topic-dismiss-buttons", function (hooks) {+ setupRenderingTest(hooks);++ hooks.beforeEach(function () {+ this.model = {+ topics: [{}],+ params: {},+ };+ this.selectedTopics = [];+ this.showResetNew = true;+ this.showNewDismissCombo = false;+ this.resetNewCalls = [];+ this.resetNew = (options) => this.resetNewCalls.push(options);+ });++ test("renders a direct dismiss all combo button in the experimental new view", async function (assert) {+ this.currentUser.new_new_view_enabled = true;+ this.showNewDismissCombo = true;++ await render(+ <template>+ <TopicDismissButtons+ @position="top"+ @model={{this.model}}+ @selectedTopics={{this.selectedTopics}}+ @showResetNew={{this.showResetNew}}+ @showNewDismissCombo={{this.showNewDismissCombo}}+ @showDismissRead={{false}}+ @resetNew={{this.resetNew}}+ />+ </template>+ );++ assert.dom("#dismiss-new-top").hasText(i18n("topics.bulk.dismiss_all"));+ assert.dom("#dismiss-new-menu-top").exists();+ });++ test("dismisses the active subset directly in the experimental new view", async function (assert) {+ this.currentUser.new_new_view_enabled = true;+ this.showNewDismissCombo = true;+ this.model.params.subset = "replies";++ await render(+ <template>+ <TopicDismissButtons+ @position="top"+ @model={{this.model}}+ @selectedTopics={{this.selectedTopics}}+ @showResetNew={{this.showResetNew}}+ @showNewDismissCombo={{this.showNewDismissCombo}}+ @showDismissRead={{false}}+ @resetNew={{this.resetNew}}+ />+ </template>+ );++ assert+ .dom("#dismiss-new-top")+ .hasText(i18n("topics.bulk.dismiss_new_replies"));++ await click("#dismiss-new-top");++ assert.deepEqual(this.resetNewCalls, [+ {+ dismissPosts: true,+ dismissTopics: false,+ untrack: false,+ },+ ]);+ });++ test("dismiss and stop tracking runs the same subset with untrack enabled", async function (assert) {+ this.currentUser.new_new_view_enabled = true;+ this.showNewDismissCombo = true;+ this.model.params.subset = "replies";++ await render(+ <template>+ <TopicDismissButtons+ @position="top"+ @model={{this.model}}+ @selectedTopics={{this.selectedTopics}}+ @showResetNew={{this.showResetNew}}+ @showNewDismissCombo={{this.showNewDismissCombo}}+ @showDismissRead={{false}}+ @resetNew={{this.resetNew}}+ />+ </template>+ );++ await click("#dismiss-new-menu-top");++ assert+ .dom(".fk-d-menu .dismiss-new-stop-tracking .d-button-label")+ .hasText(i18n("topics.bulk.dismiss_and_stop_tracking"));++ await click(".fk-d-menu .dismiss-new-stop-tracking");++ assert.deepEqual(this.resetNewCalls, [+ {+ dismissPosts: true,+ dismissTopics: false,+ untrack: true,+ },+ ]);+ });++ test("does not show stop tracking on the topics subset", async function (assert) {+ this.currentUser.new_new_view_enabled = true;+ this.showNewDismissCombo = true;+ this.model.params.subset = "topics";++ await render(+ <template>+ <TopicDismissButtons+ @position="top"+ @model={{this.model}}+ @selectedTopics={{this.selectedTopics}}+ @showResetNew={{this.showResetNew}}+ @showNewDismissCombo={{this.showNewDismissCombo}}+ @showDismissRead={{false}}+ @resetNew={{this.resetNew}}+ />+ </template>+ );++ assert+ .dom("#dismiss-new-top")+ .hasText(i18n("topics.bulk.dismiss_new_topics"));+ assert.dom("#dismiss-new-menu-top").doesNotExist();++ await click("#dismiss-new-top");++ assert.deepEqual(this.resetNewCalls, [+ {+ dismissPosts: false,+ dismissTopics: true,+ untrack: false,+ },+ ]);+ });++ test("does not render the combo menu on mobile bottom dismiss", async function (assert) {+ this.currentUser.new_new_view_enabled = true;+ this.showNewDismissCombo = true;+ this.model.topics = new Array(6).fill({});++ this.owner.unregister("service:site");+ this.owner.register(+ "service:site",+ { mobileView: true },+ {+ instantiate: false,+ }+ );++ await render(+ <template>+ <TopicDismissButtons+ @position="bottom"+ @model={{this.model}}+ @selectedTopics={{this.selectedTopics}}+ @showResetNew={{this.showResetNew}}+ @showNewDismissCombo={{this.showNewDismissCombo}}+ @showDismissRead={{false}}+ @resetNew={{this.resetNew}}+ />+ </template>+ );++ assert.dom("#dismiss-new-bottom").exists();+ assert.dom("#dismiss-new-menu-bottom").doesNotExist();+ });++ test("keeps the legacy dismiss new button outside the experimental new view", async function (assert) {+ await render(+ <template>+ <TopicDismissButtons+ @position="top"+ @model={{this.model}}+ @selectedTopics={{this.selectedTopics}}+ @showResetNew={{this.showResetNew}}+ @showNewDismissCombo={{this.showNewDismissCombo}}+ @showDismissRead={{false}}+ @resetNew={{this.resetNew}}+ />+ </template>+ );++ assert.dom("#dismiss-new-top").hasText(i18n("topics.bulk.dismiss_new"));+ assert.dom("#dismiss-new-menu-top").doesNotExist();+ });+});diff --git a/spec/system/dismissing_new_spec.rb b/spec/system/dismissing_new_spec.rbindex cdcd3effc85..dd41f45ac51 100644--- a/spec/system/dismissing_new_spec.rb+++ b/spec/system/dismissing_new_spec.rb@@ -6,7 +6,6 @@ RSpec.describe "Dismissing New" dolet(:discovery) { PageObjects::Pages::Discovery.new }let(:topic_list_controls) { PageObjects::Components::TopicListControls.new }let(:topic_list) { PageObjects::Components::TopicList.new }- let(:dismiss_new_modal) { PageObjects::Modals::DismissNew.new }let(:topic_view) { PageObjects::Components::TopicView.new }describe "when a user has an unread post" do@@ -113,9 +112,7 @@ RSpec.describe "Dismissing New" doswitch_to_window(tab_1)topic_list_controls.dismiss_new- dismiss_new_modal.click_dismiss- expect(dismiss_new_modal).to be_closedexpect(topic_list_controls).to have_new(count: 0)switch_to_window(tab_2)@@ -127,7 +124,7 @@ RSpec.describe "Dismissing New" doexpect(topic_list_controls).to have_new(count: 0)end- it "displays confirmation modal with preselected options" do+ it "dismisses all topics and replies from the all subset" dosign_in(user)visit("/new")@@ -137,16 +134,10 @@ RSpec.describe "Dismissing New" dotopic_list_controls.dismiss_new- expect(dismiss_new_modal).to have_dismiss_topics_checked- expect(dismiss_new_modal).to have_dismiss_posts_checked- expect(dismiss_new_modal).to have_untrack_unchecked-- dismiss_new_modal.click_dismiss-expect(topic_list).to have_no_topicsend- it "displays confirmation modal with replies preselected" do+ it "dismisses only replies from the replies subset" dosign_in(user)visit("/new?subset=replies")@@ -155,16 +146,13 @@ RSpec.describe "Dismissing New" dotopic_list_controls.dismiss_new- expect(dismiss_new_modal).to have_dismiss_topics_unchecked- expect(dismiss_new_modal).to have_dismiss_posts_checked- expect(dismiss_new_modal).to have_untrack_unchecked-- dismiss_new_modal.click_dismiss-expect(topic_list).to have_no_topics++ visit("/new?subset=topics")+ expect(topic_list).to have_topic(new_topic)end- it "displays confirmation modal with topics preselected" do+ it "dismisses only topics from the topics subset" dosign_in(user)visit("/new?subset=topics")@@ -173,11 +161,18 @@ RSpec.describe "Dismissing New" dotopic_list_controls.dismiss_new- expect(dismiss_new_modal).to have_dismiss_topics_checked- expect(dismiss_new_modal).to have_dismiss_posts_unchecked- expect(dismiss_new_modal).to have_untrack_unchecked+ expect(topic_list).to have_no_topics++ visit("/new?subset=replies")+ expect(topic_list).to have_topic(post1.topic)+ end++ it "can dismiss and stop tracking from the dropdown action" do+ sign_in(user)++ visit("/new")- dismiss_new_modal.click_dismiss+ topic_list_controls.dismiss_new_and_stop_trackingexpect(topic_list).to have_no_topicsend@@ -196,7 +191,6 @@ RSpec.describe "Dismissing New" doexpect(topic_list).to have_topic(tagged_first_post.topic)topic_list_controls.dismiss_new- dismiss_new_modal.click_dismissexpect(topic_list).to have_no_topics@@ -218,7 +212,6 @@ RSpec.describe "Dismissing New" dodiscovery.nav_item("new").clicktopic_list_controls.dismiss_new- dismiss_new_modal.click_dismissexpect(topic_list).to have_no_topicsenddiff --git a/spec/system/page_objects/components/topic_list_controls.rb b/spec/system/page_objects/components/topic_list_controls.rbindex d5066343eac..06fd8172a72 100644--- a/spec/system/page_objects/components/topic_list_controls.rb+++ b/spec/system/page_objects/components/topic_list_controls.rb@@ -37,6 +37,12 @@ module PageObjectsselfend+ def dismiss_new_and_stop_tracking+ click_button("dismiss-new-menu-top")+ find(".dismiss-new-stop-tracking").click+ self+ end+def click_latestfind(".nav-item_latest").clickself