From 959c50001d969673b6e86258be15cacb8eb377b3 Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Thu, 15 Jun 2023 11:36:38 +1000 Subject: [PATCH] FIX: rename everything link to topics (#22076) Rename everything link in community sidebar section to topics, which is a bit more descriptive. --- .../app/lib/sidebar/community-section.js | 1 - ...idebar-anonymous-community-section-test.js | 6 ++--- .../tests/fixtures/session-fixtures.js | 2 +- .../discourse/tests/fixtures/site-fixtures.js | 2 +- app/models/sidebar_url.rb | 2 +- config/locales/client.ar.yml | 3 --- config/locales/client.bg.yml | 2 -- config/locales/client.bs_BA.yml | 2 -- config/locales/client.ca.yml | 2 -- config/locales/client.cs.yml | 2 -- config/locales/client.da.yml | 2 -- config/locales/client.de.yml | 3 --- config/locales/client.el.yml | 3 --- config/locales/client.en.yml | 4 ++-- config/locales/client.es.yml | 3 --- config/locales/client.fa_IR.yml | 3 --- config/locales/client.fi.yml | 3 --- config/locales/client.fr.yml | 3 --- config/locales/client.gl.yml | 2 -- config/locales/client.he.yml | 3 --- config/locales/client.hr.yml | 3 --- config/locales/client.hu.yml | 3 --- config/locales/client.hy.yml | 2 -- config/locales/client.id.yml | 2 -- config/locales/client.it.yml | 3 --- config/locales/client.ja.yml | 3 --- config/locales/client.ko.yml | 3 --- config/locales/client.lt.yml | 3 --- config/locales/client.lv.yml | 2 -- config/locales/client.nb_NO.yml | 2 -- config/locales/client.nl.yml | 3 --- config/locales/client.pl_PL.yml | 3 --- config/locales/client.pt.yml | 2 -- config/locales/client.pt_BR.yml | 3 --- config/locales/client.ro.yml | 2 -- config/locales/client.ru.yml | 3 --- config/locales/client.sk.yml | 2 -- config/locales/client.sl.yml | 2 -- config/locales/client.sv.yml | 3 --- config/locales/client.th.yml | 2 -- config/locales/client.tr_TR.yml | 3 --- config/locales/client.uk.yml | 3 --- config/locales/client.ur.yml | 2 -- config/locales/client.vi.yml | 3 --- config/locales/client.zh_CN.yml | 3 --- config/locales/client.zh_TW.yml | 3 --- ...034711_rename_everything_to_topics_link.rb | 24 +++++++++++++++++++ spec/models/sidebar_section_spec.rb | 2 +- .../sidebar_sections_controller_spec.rb | 16 ++++--------- spec/system/custom_sidebar_sections_spec.rb | 8 +++---- .../components/sidebar_header_dropdown.rb | 2 +- .../modals/sidebar_section_form.rb | 4 ++-- spec/system/viewing_sidebar_mobile_spec.rb | 2 +- 53 files changed, 46 insertions(+), 133 deletions(-) create mode 100644 db/migrate/20230602034711_rename_everything_to_topics_link.rb diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section.js b/app/assets/javascripts/discourse/app/lib/sidebar/community-section.js index 38840c5d357..bef71704244 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/community-section.js @@ -24,7 +24,6 @@ import showModal from "discourse/lib/show-modal"; const SPECIAL_LINKS_MAP = { "/latest": EverythingSectionLink, - "/new": EverythingSectionLink, "/about": AboutSectionLink, "/u": UsersSectionLink, "/faq": FAQSectionLink, diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js index c38f84bebbc..9dcab19f8c3 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-anonymous-community-section-test.js @@ -17,7 +17,7 @@ acceptance("Sidebar - Anonymous user - Community Section", function (needs) { needs.site({}); - test("everything section link is shown by default ", async function (assert) { + test("topics section link is shown by default ", async function (assert) { await visit("/"); const sectionLinks = queryAll( @@ -26,8 +26,8 @@ acceptance("Sidebar - Anonymous user - Community Section", function (needs) { assert.strictEqual( sectionLinks[0].textContent.trim(), - I18n.t("sidebar.sections.community.links.everything.content"), - "displays the everything section link first" + I18n.t("sidebar.sections.community.links.topics.content"), + "displays the topics section link first" ); }); diff --git a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js index 01d015a253d..55cf334d026 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js @@ -59,7 +59,7 @@ export default { links: [ { id: 329, - name: "Everything", + name: "Topics", value: "/latest", icon: "layer-group", external: false, diff --git a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js index 86225054781..2f419f2610f 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js @@ -707,7 +707,7 @@ export default { links: [ { id: 329, - name: "Everything", + name: "Topics", value: "/latest", icon: "layer-group", external: false, diff --git a/app/models/sidebar_url.rb b/app/models/sidebar_url.rb index f46e6188df0..174ae2da361 100644 --- a/app/models/sidebar_url.rb +++ b/app/models/sidebar_url.rb @@ -9,7 +9,7 @@ class SidebarUrl < ActiveRecord::Base MAX_VALUE_LENGTH = 200 COMMUNITY_SECTION_LINKS = [ { - name: "Everything", + name: "Topics", path: "/latest", icon: "layer-group", segment: SidebarUrl.segments["primary"], diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index cf3ade481c3..5aaa3795f7c 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -4766,9 +4766,6 @@ ar: badges: content: "الشارات" title: "كل الشارات الممكن منحها لك" - everything: - content: "كل شيء" - title: "كل الموضوعات" faq: content: "الأسئلة الشائعة" title: "إرشادات لاستخدام هذا الموقع" diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml index cc257f1f061..7c1036a65dc 100644 --- a/config/locales/client.bg.yml +++ b/config/locales/client.bg.yml @@ -3414,8 +3414,6 @@ bg: content: "Администратор" badges: content: "Значки" - everything: - content: "Всичко" faq: content: "FAQ" groups: diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index ce911c34186..fa1afbf41e7 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -3076,8 +3076,6 @@ bs_BA: content: "Admin" badges: content: "Bedž" - everything: - content: "Sve" faq: content: "Česta pitanja" groups: diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml index ff24dc3354d..b0bc5070c82 100644 --- a/config/locales/client.ca.yml +++ b/config/locales/client.ca.yml @@ -2912,8 +2912,6 @@ ca: content: "Administració" badges: content: "Insígnies" - everything: - content: "Qualsevol cosa" faq: content: "PMF" groups: diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index fddd70a483e..8ea272c4c26 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -3126,8 +3126,6 @@ cs: content: "Administrace" badges: content: "Odznaky" - everything: - content: "Vše" faq: content: "FAQ" groups: diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index ea393df488e..8f31712911d 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -3617,8 +3617,6 @@ da: content: "Admin" badges: content: "Emblemer" - everything: - content: "Alting" faq: content: "OSS" groups: diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index edaa74b6219..46018d60901 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -4128,9 +4128,6 @@ de: badges: content: "Abzeichen" title: "Alle Abzeichen, die es zu verdienen gibt" - everything: - content: "Alles" - title: "Alle Themen" faq: content: "FAQ" title: "Richtlinien für die Nutzung dieser Website" diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml index ca26d36fce4..8239d8d7a7a 100644 --- a/config/locales/client.el.yml +++ b/config/locales/client.el.yml @@ -3350,9 +3350,6 @@ el: content: "Διαχείριση" badges: content: "Παράσημα" - everything: - content: "Τα πάνΤα" - title: "Όλα τα θέματα" faq: content: "Συχνές ερωτήσεις" groups: diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index ca6142ccbcb..a539650cf0b 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -4477,8 +4477,8 @@ en: badges: content: "Badges" title: "All the badges available to earn" - everything: - content: "Everything" + topics: + content: "Topics" title: "All topics" faq: content: "FAQ" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index d1230e342d9..c9c849853eb 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -4055,9 +4055,6 @@ es: badges: content: "Insignias" title: "Todas las insignias disponibles para ganar" - everything: - content: "Todo" - title: "Todos los temas" faq: content: "Preguntas frecuentes" title: "Normas de uso de este sitio" diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 92bceed864e..98f7b2cccac 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -3415,9 +3415,6 @@ fa_IR: title: "تنظیمات و گزارش‌های سایت" badges: content: "نشان‌ها" - everything: - content: "همه چیز" - title: "همه موضوعات" faq: content: "پرسش‌های متداول" title: "راهنمای استفاده از این سایت" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index c5b7e6a2bfd..984b23948be 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -4039,9 +4039,6 @@ fi: badges: content: "Kunniamerkit" title: "Kaikki ansaittavissa olevat kunniamerkit" - everything: - content: "Kaikki" - title: "Kaikki ketjut" faq: content: "UKK" title: "Ohjeet tämän sivuston käyttöön" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 5be8bdb765c..0f10aaf8cd4 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -4009,9 +4009,6 @@ fr: badges: content: "Badges" title: "Tous les badges disponibles à gagner" - everything: - content: "Tout" - title: "Tous les sujets" faq: content: "FAQ" title: "Lignes directrices pour l'utilisation de ce site" diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index 94b3bbb424c..7a3833eb2d8 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -3352,8 +3352,6 @@ gl: content: "Administración" badges: content: "Insignias" - everything: - content: "Todo" faq: content: "PMF" groups: diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index cfffbad5c8b..e634db00b7c 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -4534,9 +4534,6 @@ he: badges: content: "עיטורים" title: "כל העיטורים שאפשר לקבל" - everything: - content: "הכול" - title: "כל הנושאים" faq: content: "שאלות נפוצות" title: "הנחיות לשימוש באתר הזה" diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml index 8364f39a0b6..2433fbd8205 100644 --- a/config/locales/client.hr.yml +++ b/config/locales/client.hr.yml @@ -4198,9 +4198,6 @@ hr: badges: content: "Značke" title: "Sve značke dostupne za osvajanje" - everything: - content: "Sve" - title: "Sve teme" faq: content: "ČPP" title: "Smjernice za korištenje ove stranice" diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml index d046c186004..d696b40290a 100644 --- a/config/locales/client.hu.yml +++ b/config/locales/client.hu.yml @@ -3714,9 +3714,6 @@ hu: badges: content: "Jelvények" title: "Az összes megszerezhető jelvény" - everything: - content: "Összes" - title: "Minden téma" faq: content: "GYIK" title: "Útmutató az oldal használatához" diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml index 934e423a9e8..0fce1e2097d 100644 --- a/config/locales/client.hy.yml +++ b/config/locales/client.hy.yml @@ -2887,8 +2887,6 @@ hy: content: "Ադմին" badges: content: "Կրծքանշաններ" - everything: - content: "Բոլորը" faq: content: "ՀՏՀ" groups: diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 7dfe8540852..6a9213218c9 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -1962,8 +1962,6 @@ id: content: "Tentang" admin: content: "Admin" - everything: - content: "Semuanya" faq: content: "FAQ" groups: diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 08aebeaf755..129b4e55977 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -4002,9 +4002,6 @@ it: badges: content: "Distintivi" title: "Tutti i distintivi disponibili" - everything: - content: "Tutti" - title: "Tutti gli argomenti" faq: content: "FAQ" title: "Linee guida per l'utilizzo di questo sito" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 09a312fc8e1..cce11843155 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -3807,9 +3807,6 @@ ja: badges: content: "バッジ" title: "獲得可能なすべてのバッジ" - everything: - content: "すべて" - title: "すべてのトピック" faq: content: "FAQ" title: "このサイトの利用に関するガイドライン" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index cf125e05caf..9ce9b9e8fc1 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -3568,9 +3568,6 @@ ko: content: "관리자" badges: content: "배지" - everything: - content: "모두" - title: "모든 글" faq: content: "자주하는 질문" groups: diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml index a8e298418cd..fcd51656f7b 100644 --- a/config/locales/client.lt.yml +++ b/config/locales/client.lt.yml @@ -3570,9 +3570,6 @@ lt: content: "Adminas" badges: content: "Trofėjai" - everything: - content: "Viskas" - title: "Visos temos" faq: content: "DUK" groups: diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml index f7834c8c55b..118f1264af8 100644 --- a/config/locales/client.lv.yml +++ b/config/locales/client.lv.yml @@ -2815,8 +2815,6 @@ lv: content: "Administrators" badges: content: "Žetoni" - everything: - content: "Viss" faq: content: "BUJ" groups: diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 4becd0ee614..5e5d95d323e 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -3411,8 +3411,6 @@ nb_NO: content: "Administrator" badges: content: "Merker" - everything: - content: "Alt" faq: content: "O-S-S" groups: diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 39615171842..73f131727fb 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -4002,9 +4002,6 @@ nl: badges: content: "Badges" title: "Alle beschikbare badges om te verdienen" - everything: - content: "Alles" - title: "Alle topics" faq: content: "FAQ" title: "Richtlijnen voor het gebruik van deze site" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 3504cee33a5..3f7ca47b4de 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -4527,9 +4527,6 @@ pl_PL: badges: content: "Odznaki" title: "Wszystkie odznaki dostępne do zdobycia" - everything: - content: "Wszystko" - title: "Wszystkie tematy" faq: content: "FAQ" title: "Wskazówki dotyczące korzystania z tej witryny" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 79ba897e45c..c1777051fde 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -3499,8 +3499,6 @@ pt: content: "Administrador" badges: content: "Crachás" - everything: - content: "Tudo" faq: content: "FAQ" groups: diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index fe2cd606aa1..5e2a4b0cce1 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -4040,9 +4040,6 @@ pt_BR: badges: content: "Emblemas" title: "Todos os emblemas disponíveis para ganhar" - everything: - content: "Tudo" - title: "Todos os Tópicos" faq: content: "FAQ" title: "Diretrizes para usar este site" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 5b28825907b..d515cee8f15 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -2957,8 +2957,6 @@ ro: content: "Administrator" badges: content: "Ecusoane" - everything: - content: "Totul" faq: content: "Întrebări frecvente" groups: diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index a220746be53..2e61af59623 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -4390,9 +4390,6 @@ ru: badges: content: "Награды" title: "Все награды, которые можно получить" - everything: - content: "Все" - title: "Все темы" faq: content: "Правила" title: "Рекомендации по использованию сайта" diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index 3d826477227..bf1f07d6d10 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -2327,8 +2327,6 @@ sk: content: "Administrátor" badges: content: "Odznaky" - everything: - content: "Všetko" faq: content: "Časté otázky" groups: diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml index 1bb7ace3682..ec4b33722f7 100644 --- a/config/locales/client.sl.yml +++ b/config/locales/client.sl.yml @@ -3393,8 +3393,6 @@ sl: content: "Admin" badges: content: "Značke" - everything: - content: "Vse" faq: content: "Pravila skupnosti" groups: diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 341c62d764f..e199e32777a 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -4128,9 +4128,6 @@ sv: badges: content: "Utmärkelser" title: "Alla utmärkelser som kan förtjänas" - everything: - content: "Allting" - title: "Alla ämnen" faq: content: "Vanliga frågor och svar" title: "Riktlinjer för att använda denna webbplats" diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml index aa1c91cd325..5d3e201c7b5 100644 --- a/config/locales/client.th.yml +++ b/config/locales/client.th.yml @@ -2457,8 +2457,6 @@ th: content: "แอดมิน" badges: content: "เหรียญ" - everything: - content: "ทุกสิ่ง" faq: content: "คำถามที่พบบ่อย" groups: diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index e4ba8feac6e..5ebaea8f4df 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -4061,9 +4061,6 @@ tr_TR: badges: content: "Rozetler" title: "Kazanılabilecek tüm rozetler" - everything: - content: "Her şey" - title: "Tüm konular" faq: content: "SSS" title: "Bu siteyi kullanmak için kılavuz" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 9d061063389..5735118c5f1 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -4532,9 +4532,6 @@ uk: badges: content: "Нагороди" title: "Всі значки доступні для отримання" - everything: - content: "Усе" - title: "Всі теми" faq: content: "Часті запитання" title: "Правила використання цього сайту" diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml index fd1d118d734..3c1d6002191 100644 --- a/config/locales/client.ur.yml +++ b/config/locales/client.ur.yml @@ -3626,8 +3626,6 @@ ur: content: "ایڈمن" badges: content: "بَیج" - everything: - content: "تمام" faq: content: "عمومی سوالات" groups: diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index 766265fca54..127b61187d4 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -3583,9 +3583,6 @@ vi: content: "Quản trị" badges: content: "Huy hiệu" - everything: - content: "Mọi thứ" - title: "Tất cả các chủ đề" faq: content: "Câu hỏi thường gặp" groups: diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index c7a17770d7f..0edc5270356 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -3909,9 +3909,6 @@ zh_CN: badges: content: "徽章" title: "所有可获得的徽章" - everything: - content: "一切" - title: "所有话题" faq: content: "常见问题解答" title: "使用此站点的准则" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index a605577a317..8ce5e81f55b 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -2909,9 +2909,6 @@ zh_TW: content: "管理員" badges: content: "徽章" - everything: - content: "所有" - title: "所有話題" faq: content: "常見問答" groups: diff --git a/db/migrate/20230602034711_rename_everything_to_topics_link.rb b/db/migrate/20230602034711_rename_everything_to_topics_link.rb new file mode 100644 index 00000000000..040bd5df478 --- /dev/null +++ b/db/migrate/20230602034711_rename_everything_to_topics_link.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true +class RenameEverythingToTopicsLink < ActiveRecord::Migration[7.0] + def up + DB.exec <<~SQL + UPDATE sidebar_urls su1 + SET name = 'Topics' + FROM sidebar_urls su2 + INNER JOIN sidebar_section_links ON sidebar_section_links.linkable_id = su2.id + INNER JOIN sidebar_sections ON sidebar_sections.id = sidebar_section_links.sidebar_section_id AND sidebar_sections.section_type = 0 + WHERE su1.id = su2.id AND su2.value = '/latest' AND su2.name = 'Everything' + SQL + end + + def down + DB.exec <<~SQL + UPDATE sidebar_urls su1 + SET name = 'Everything' + FROM sidebar_urls su2 + INNER JOIN sidebar_section_links ON sidebar_section_links.linkable_id = su2.id + INNER JOIN sidebar_sections ON sidebar_sections.id = sidebar_section_links.sidebar_section_id AND sidebar_sections.section_type = 0 + WHERE su1.id = su2.id AND su2.value = '/topics' AND su2.name = 'Topics' + SQL + end +end diff --git a/spec/models/sidebar_section_spec.rb b/spec/models/sidebar_section_spec.rb index f30168ffb0a..557e2a3d262 100644 --- a/spec/models/sidebar_section_spec.rb +++ b/spec/models/sidebar_section_spec.rb @@ -22,7 +22,7 @@ RSpec.describe SidebarSection do expect(community_section.reload.title).to eq("Community") expect(community_section.sidebar_section_links.all.map { |link| link.linkable.name }).to eq( - ["Everything", "My Posts", "Review", "Admin", "Users", "About", "FAQ", "Groups", "Badges"], + ["Topics", "My Posts", "Review", "Admin", "Users", "About", "FAQ", "Groups", "Badges"], ) end end diff --git a/spec/requests/sidebar_sections_controller_spec.rb b/spec/requests/sidebar_sections_controller_spec.rb index d593dcc682d..61124d3e7e4 100644 --- a/spec/requests/sidebar_sections_controller_spec.rb +++ b/spec/requests/sidebar_sections_controller_spec.rb @@ -303,12 +303,12 @@ RSpec.describe SidebarSectionsController do it "allows admin to edit community section" do sign_in(admin) - everything_link = community_section.sidebar_urls.find_by(name: "Everything") + topics_link = community_section.sidebar_urls.find_by(name: "Topics") my_posts_link = community_section.sidebar_urls.find_by(name: "My Posts") community_section .sidebar_section_links - .where.not(linkable_id: [everything_link.id, my_posts_link.id]) + .where.not(linkable_id: [topics_link.id, my_posts_link.id]) .destroy_all put "/sidebar_sections/#{community_section.id}.json", @@ -316,12 +316,7 @@ RSpec.describe SidebarSectionsController do title: "community section edited", links: [ { icon: "link", id: my_posts_link.id, name: "my posts edited", value: "/my_posts" }, - { - icon: "link", - id: everything_link.id, - name: "everything edited", - value: "/everything", - }, + { icon: "link", id: topics_link.id, name: "topics edited", value: "/new" }, ], } @@ -330,8 +325,8 @@ RSpec.describe SidebarSectionsController do expect(community_section.reload.title).to eq("community section edited") expect(community_section.sidebar_urls[0].name).to eq("my posts edited") expect(community_section.sidebar_urls[0].value).to eq("/my_posts") - expect(community_section.sidebar_urls[1].name).to eq("everything edited") - expect(community_section.sidebar_urls[1].value).to eq("/everything") + expect(community_section.sidebar_urls[1].name).to eq("topics edited") + expect(community_section.sidebar_urls[1].value).to eq("/new") end end @@ -461,7 +456,6 @@ RSpec.describe SidebarSectionsController do let(:community_section) do SidebarSection.find_by(section_type: SidebarSection.section_types[:community]) end - let(:everything_link) { community_section.sidebar_section_links.first } it "doesn't allow user to reset community section" do sign_in(user) diff --git a/spec/system/custom_sidebar_sections_spec.rb b/spec/system/custom_sidebar_sections_spec.rb index 52c1e39f708..0492b823f2d 100644 --- a/spec/system/custom_sidebar_sections_spec.rb +++ b/spec/system/custom_sidebar_sections_spec.rb @@ -202,14 +202,14 @@ describe "Custom sidebar sections", type: :system do ) sidebar.edit_custom_section("Community") - section_modal.fill_link("Everything", "/latest", "paper-plane") + section_modal.fill_link("Topics", "/latest", "paper-plane") section_modal.fill_name("Edited community section") - section_modal.everything_link.drag_to(section_modal.review_link, delay: 0.4) + section_modal.topics_link.drag_to(section_modal.review_link, delay: 0.4) section_modal.save expect(sidebar).to have_section("Edited community section") expect(sidebar.primary_section_links("edited-community-section")).to eq( - ["My Posts", "Everything", "Review", "Admin", "More"], + ["My Posts", "Topics", "Review", "Admin", "More"], ) expect(sidebar.primary_section_icons("edited-community-section")).to eq( %w[user paper-plane flag wrench ellipsis-v], @@ -220,7 +220,7 @@ describe "Custom sidebar sections", type: :system do expect(sidebar).to have_section("Community") expect(sidebar.primary_section_links("community")).to eq( - ["Everything", "My Posts", "Review", "Admin", "More"], + ["Topics", "My Posts", "Review", "Admin", "More"], ) expect(sidebar.primary_section_icons("community")).to eq( %w[layer-group user flag wrench ellipsis-v], diff --git a/spec/system/page_objects/components/sidebar_header_dropdown.rb b/spec/system/page_objects/components/sidebar_header_dropdown.rb index e855bcbcbb9..35e7984adba 100644 --- a/spec/system/page_objects/components/sidebar_header_dropdown.rb +++ b/spec/system/page_objects/components/sidebar_header_dropdown.rb @@ -30,7 +30,7 @@ module PageObjects ) end - def click_everything_link + def click_topics_link find(".sidebar-section-link[data-link-name='everything']").click end diff --git a/spec/system/page_objects/modals/sidebar_section_form.rb b/spec/system/page_objects/modals/sidebar_section_form.rb index 800f7827217..9aba0336441 100644 --- a/spec/system/page_objects/modals/sidebar_section_form.rb +++ b/spec/system/page_objects/modals/sidebar_section_form.rb @@ -52,8 +52,8 @@ module PageObjects find_button("Save", disabled: false) end - def everything_link - find(".draggable[data-link-name='Everything']") + def topics_link + find(".draggable[data-link-name='Topics']") end def review_link diff --git a/spec/system/viewing_sidebar_mobile_spec.rb b/spec/system/viewing_sidebar_mobile_spec.rb index 192fe4d07e4..8d2da9befad 100644 --- a/spec/system/viewing_sidebar_mobile_spec.rb +++ b/spec/system/viewing_sidebar_mobile_spec.rb @@ -41,7 +41,7 @@ describe "Viewing sidebar mobile", type: :system, mobile: true do expect(sidebar_dropdown).to be_visible - sidebar_dropdown.click_everything_link + sidebar_dropdown.click_topics_link expect(sidebar_dropdown).to be_hidden end