From 2bcad128489524b172597644d55ddaa4f1ef5266 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 23 Aug 2022 13:17:59 +0800 Subject: [PATCH] DEV: Reorganize user and anonymous sidebar files into respective folders (#18039) This commit does not change any functionality --- .../discourse/app/components/sidebar.hbs | 4 +-- .../components/sidebar/anonymous-sections.js | 3 -- .../sections.hbs} | 0 .../components/sidebar/anonymous/sections.js | 3 ++ .../components/sidebar/hamburger-dropdown.hbs | 2 +- .../sidebar/{ => user}/categories-section.hbs | 0 .../sidebar/{ => user}/categories-section.js | 4 +-- .../sidebar/{ => user}/community-section.hbs | 0 .../sidebar/{ => user}/community-section.js | 20 +++++------ .../sidebar/{ => user}/messages-section.hbs | 0 .../sidebar/{ => user}/messages-section.js | 6 ++-- .../sidebar/{ => user}/sections.hbs | 8 ++--- .../components/sidebar/{ => user}/sections.js | 4 +-- .../sidebar/{ => user}/tags-section.hbs | 0 .../sidebar/{ => user}/tags-section.js | 6 ++-- .../discourse/app/lib/plugin-api.js | 8 ++--- .../base-custom-sidebar-section-link.js | 0 .../{ => user}/base-custom-sidebar-section.js | 0 .../category-section-link.js | 0 .../community-section/about-section-link.js | 2 +- .../community-section/admin-section-link.js | 2 +- .../community-section/base-section-link.js | 0 .../everything-section-link.js | 2 +- .../community-section/faq-section-link.js | 2 +- .../community-section/groups-section-link.js | 2 +- .../my-posts-section-link.js | 2 +- .../community-section/tracked-section-link.js | 2 +- .../community-section/users-section-link.js | 2 +- .../custom-community-section-links.js | 2 +- .../lib/sidebar/{ => user}/custom-sections.js | 4 +-- .../group-message-section-link.js | 2 +- .../messages-section/message-section-link.js | 2 +- .../personal-message-section-link.js | 2 +- .../tags-section/pm-tag-section-link.js | 0 .../tags-section/tag-section-link.js | 0 .../acceptance/sidebar-plugin-api-test.js | 2 +- ...> sidebar-user-categories-section-test.js} | 4 +-- ...=> sidebar-user-community-section-test.js} | 2 +- ... => sidebar-user-messages-section-test.js} | 4 +-- ...t.js => sidebar-user-tags-section-test.js} | 35 ++++++++++--------- .../{sidebar-test.js => sidebar-user-test.js} | 4 +-- .../discourse/tests/helpers/qunit-helpers.js | 4 +-- 42 files changed, 77 insertions(+), 74 deletions(-) delete mode 100644 app/assets/javascripts/discourse/app/components/sidebar/anonymous-sections.js rename app/assets/javascripts/discourse/app/components/sidebar/{anonymous-sections.hbs => anonymous/sections.hbs} (100%) create mode 100644 app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.js rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/categories-section.hbs (100%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/categories-section.js (87%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/community-section.hbs (100%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/community-section.js (71%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/messages-section.hbs (100%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/messages-section.js (91%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/sections.hbs (83%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/sections.js (85%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/tags-section.hbs (100%) rename app/assets/javascripts/discourse/app/components/sidebar/{ => user}/tags-section.js (86%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/base-custom-sidebar-section-link.js (100%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/base-custom-sidebar-section.js (100%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/categories-section/category-section-link.js (100%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/about-section-link.js (75%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/admin-section-link.js (75%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/base-section-link.js (100%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/everything-section-link.js (94%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/faq-section-link.js (77%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/groups-section-link.js (79%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/my-posts-section-link.js (93%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/tracked-section-link.js (94%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/community-section/users-section-link.js (78%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/custom-community-section-links.js (96%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/custom-sections.js (70%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/messages-section/group-message-section-link.js (94%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/messages-section/message-section-link.js (95%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/messages-section/personal-message-section-link.js (92%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/tags-section/pm-tag-section-link.js (100%) rename app/assets/javascripts/discourse/app/lib/sidebar/{ => user}/tags-section/tag-section-link.js (100%) rename app/assets/javascripts/discourse/tests/acceptance/{sidebar-categories-section-test.js => sidebar-user-categories-section-test.js} (98%) rename app/assets/javascripts/discourse/tests/acceptance/{sidebar-community-section-test.js => sidebar-user-community-section-test.js} (99%) rename app/assets/javascripts/discourse/tests/acceptance/{sidebar-messages-section-test.js => sidebar-user-messages-section-test.js} (98%) rename app/assets/javascripts/discourse/tests/acceptance/{sidebar-tags-section-test.js => sidebar-user-tags-section-test.js} (94%) rename app/assets/javascripts/discourse/tests/acceptance/{sidebar-test.js => sidebar-user-test.js} (95%) diff --git a/app/assets/javascripts/discourse/app/components/sidebar.hbs b/app/assets/javascripts/discourse/app/components/sidebar.hbs index 0b35ab32f34..b356cb8d442 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar.hbs +++ b/app/assets/javascripts/discourse/app/components/sidebar.hbs @@ -1,9 +1,9 @@
{{#if this.currentUser}} - + {{else}} - + {{/if}}
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous-sections.js b/app/assets/javascripts/discourse/app/components/sidebar/anonymous-sections.js deleted file mode 100644 index e7adf2382ca..00000000000 --- a/app/assets/javascripts/discourse/app/components/sidebar/anonymous-sections.js +++ /dev/null @@ -1,3 +0,0 @@ -import Component from "@glimmer/component"; - -export default class SidebarAnonymousSectuons extends Component {} diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous-sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/sidebar/anonymous-sections.hbs rename to app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.hbs diff --git a/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.js b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.js new file mode 100644 index 00000000000..0c70e042df6 --- /dev/null +++ b/app/assets/javascripts/discourse/app/components/sidebar/anonymous/sections.js @@ -0,0 +1,3 @@ +import Component from "@glimmer/component"; + +export default class SidebarAnonymousSections extends Component {} diff --git a/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs b/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs index 437f5ba090a..62778452301 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs +++ b/app/assets/javascripts/discourse/app/components/sidebar/hamburger-dropdown.hbs @@ -3,7 +3,7 @@
- +
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/categories-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/sidebar/categories-section.hbs rename to app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs diff --git a/app/assets/javascripts/discourse/app/components/sidebar/categories-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js similarity index 87% rename from app/assets/javascripts/discourse/app/components/sidebar/categories-section.js rename to app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js index 75c69bd2551..71b670f7280 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar/categories-section.js +++ b/app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js @@ -5,9 +5,9 @@ import { inject as service } from "@ember/service"; import { action } from "@ember/object"; import Component from "@glimmer/component"; -import CategorySectionLink from "discourse/lib/sidebar/categories-section/category-section-link"; +import CategorySectionLink from "discourse/lib/sidebar/user/categories-section/category-section-link"; -export default class SidebarCategoriesSection extends Component { +export default class SidebarUserCategoriesSection extends Component { @service router; @service topicTrackingState; @service currentUser; diff --git a/app/assets/javascripts/discourse/app/components/sidebar/community-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/sidebar/community-section.hbs rename to app/assets/javascripts/discourse/app/components/sidebar/user/community-section.hbs diff --git a/app/assets/javascripts/discourse/app/components/sidebar/community-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js similarity index 71% rename from app/assets/javascripts/discourse/app/components/sidebar/community-section.js rename to app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js index d2cd5b72965..175ad40812f 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar/community-section.js +++ b/app/assets/javascripts/discourse/app/components/sidebar/user/community-section.js @@ -5,15 +5,15 @@ import PermissionType from "discourse/models/permission-type"; import { customSectionLinks, secondaryCustomSectionLinks, -} from "discourse/lib/sidebar/custom-community-section-links"; -import EverythingSectionLink from "discourse/lib/sidebar/community-section/everything-section-link"; -import TrackedSectionLink from "discourse/lib/sidebar/community-section/tracked-section-link"; -import MyPostsSectionLink from "discourse/lib/sidebar/community-section/my-posts-section-link"; -import GroupsSectionLink from "discourse/lib/sidebar/community-section/groups-section-link"; -import UsersSectionLink from "discourse/lib/sidebar/community-section/users-section-link"; -import AboutSectionLink from "discourse/lib/sidebar/community-section/about-section-link"; -import FAQSectionLink from "discourse/lib/sidebar/community-section/faq-section-link"; -import AdminSectionLink from "discourse/lib/sidebar/community-section/admin-section-link"; +} from "discourse/lib/sidebar/user/custom-community-section-links"; +import EverythingSectionLink from "discourse/lib/sidebar/user/community-section/everything-section-link"; +import TrackedSectionLink from "discourse/lib/sidebar/user/community-section/tracked-section-link"; +import MyPostsSectionLink from "discourse/lib/sidebar/user/community-section/my-posts-section-link"; +import GroupsSectionLink from "discourse/lib/sidebar/user/community-section/groups-section-link"; +import UsersSectionLink from "discourse/lib/sidebar/user/community-section/users-section-link"; +import AboutSectionLink from "discourse/lib/sidebar/user/community-section/about-section-link"; +import FAQSectionLink from "discourse/lib/sidebar/user/community-section/faq-section-link"; +import AdminSectionLink from "discourse/lib/sidebar/user/community-section/admin-section-link"; import { inject as service } from "@ember/service"; import { action } from "@ember/object"; @@ -30,7 +30,7 @@ const ADMIN_MAIN_SECTION_LINKS = [AdminSectionLink]; const MORE_SECTION_LINKS = [GroupsSectionLink, UsersSectionLink]; const MORE_SECONDARY_SECTION_LINKS = [AboutSectionLink, FAQSectionLink]; -export default class SidebarCommunitySection extends Component { +export default class SidebarUserCommunitySection extends Component { @service router; @service topicTrackingState; @service currentUser; diff --git a/app/assets/javascripts/discourse/app/components/sidebar/messages-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/sidebar/messages-section.hbs rename to app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.hbs diff --git a/app/assets/javascripts/discourse/app/components/sidebar/messages-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js similarity index 91% rename from app/assets/javascripts/discourse/app/components/sidebar/messages-section.js rename to app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js index 21b132b5a6e..c96c60b961d 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar/messages-section.js +++ b/app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js @@ -3,8 +3,8 @@ import { cached } from "@glimmer/tracking"; import { getOwner } from "discourse-common/lib/get-owner"; import Component from "@glimmer/component"; import { bind } from "discourse-common/utils/decorators"; -import GroupMessageSectionLink from "discourse/lib/sidebar/messages-section/group-message-section-link"; -import PersonalMessageSectionLink from "discourse/lib/sidebar/messages-section/personal-message-section-link"; +import GroupMessageSectionLink from "discourse/lib/sidebar/user/messages-section/group-message-section-link"; +import PersonalMessageSectionLink from "discourse/lib/sidebar/user/messages-section/personal-message-section-link"; import { inject as service } from "@ember/service"; export const INBOX = "inbox"; @@ -23,7 +23,7 @@ export const PERSONAL_MESSAGES_INBOX_FILTERS = [ export const GROUP_MESSAGES_INBOX_FILTERS = [INBOX, NEW, UNREAD, ARCHIVE]; -export default class SidebarMessagesSection extends Component { +export default class SidebarUserMessagesSection extends Component { @service appEvents; @service pmTopicTrackingState; @service currentUser; diff --git a/app/assets/javascripts/discourse/app/components/sidebar/sections.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs similarity index 83% rename from app/assets/javascripts/discourse/app/components/sidebar/sections.hbs rename to app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs index 6c809460918..47044fd4e95 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar/sections.hbs +++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.hbs @@ -1,13 +1,13 @@
- - + + {{#if this.siteSettings.tagging_enabled}} - + {{/if}} {{#if this.siteSettings.enable_personal_messages}} - + {{/if}} {{#each this.customSections as |customSection|}} diff --git a/app/assets/javascripts/discourse/app/components/sidebar/sections.js b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js similarity index 85% rename from app/assets/javascripts/discourse/app/components/sidebar/sections.js rename to app/assets/javascripts/discourse/app/components/sidebar/user/sections.js index 93cbe0cc607..dfbda910117 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar/sections.js +++ b/app/assets/javascripts/discourse/app/components/sidebar/user/sections.js @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; -import { customSections as sidebarCustomSections } from "discourse/lib/sidebar/custom-sections"; +import { customSections as sidebarCustomSections } from "discourse/lib/sidebar/user/custom-sections"; import { getOwner, setOwner } from "@ember/application"; import { inject as service } from "@ember/service"; -export default class SidebarSections extends Component { +export default class SidebarUserSections extends Component { @service siteSettings; @service currentUser; diff --git a/app/assets/javascripts/discourse/app/components/sidebar/tags-section.hbs b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/sidebar/tags-section.hbs rename to app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs diff --git a/app/assets/javascripts/discourse/app/components/sidebar/tags-section.js b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js similarity index 86% rename from app/assets/javascripts/discourse/app/components/sidebar/tags-section.js rename to app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js index 55dc9a376e5..f3b11416cfd 100644 --- a/app/assets/javascripts/discourse/app/components/sidebar/tags-section.js +++ b/app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js @@ -5,10 +5,10 @@ import Component from "@glimmer/component"; import { inject as service } from "@ember/service"; import { action } from "@ember/object"; -import TagSectionLink from "discourse/lib/sidebar/tags-section/tag-section-link"; -import PMTagSectionLink from "discourse/lib/sidebar/tags-section/pm-tag-section-link"; +import TagSectionLink from "discourse/lib/sidebar/user/tags-section/tag-section-link"; +import PMTagSectionLink from "discourse/lib/sidebar/user/tags-section/pm-tag-section-link"; -export default class SidebarTagsSection extends Component { +export default class SidebarUserTagsSection extends Component { @service router; @service topicTrackingState; @service pmTopicTrackingState; diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index aed69342ce8..6d7e232645f 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -95,8 +95,8 @@ import { import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser"; import { downloadCalendar } from "discourse/lib/download-calendar"; import { consolePrefix } from "discourse/lib/source-identifier"; -import { addSectionLink as addCustomCommunitySectionLink } from "discourse/lib/sidebar/custom-community-section-links"; -import { addSidebarSection } from "discourse/lib/sidebar/custom-sections"; +import { addSectionLink as addCustomCommunitySectionLink } from "discourse/lib/sidebar/user/custom-community-section-links"; +import { addSidebarSection } from "discourse/lib/sidebar/user/custom-sections"; import DiscourseURL from "discourse/lib/url"; import { registerNotificationTypeRenderer } from "discourse/lib/notification-types-manager"; import { registerUserMenuTab } from "discourse/lib/user-menu/tab"; @@ -1674,7 +1674,7 @@ class PluginApi { /** * EXPERIMENTAL. Do not use. * Support for adding a navigation link to Sidebar Community section under the "More..." links drawer by returning a - * class which extends from the BaseSectionLink class interface. See `lib/sidebar/community-section/base-section-link.js` + * class which extends from the BaseSectionLink class interface. See `lib/sidebar/user/community-section/base-section-link.js` * for documentation on the BaseSectionLink class interface. * * ``` @@ -1733,7 +1733,7 @@ class PluginApi { /** * EXPERIMENTAL. Do not use. * Support for adding a Sidebar section by returning a class which extends from the BaseCustomSidebarSection - * class interface. See `lib/sidebar/base-custom-sidebar-section.js` for documentation on the BaseCustomSidebarSection class + * class interface. See `lib/sidebar/user/base-custom-sidebar-section.js` for documentation on the BaseCustomSidebarSection class * interface. * * ``` diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/base-custom-sidebar-section-link.js similarity index 100% rename from app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/base-custom-sidebar-section-link.js diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/base-custom-sidebar-section.js similarity index 100% rename from app/assets/javascripts/discourse/app/lib/sidebar/base-custom-sidebar-section.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/base-custom-sidebar-section.js diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/categories-section/category-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js similarity index 100% rename from app/assets/javascripts/discourse/app/lib/sidebar/categories-section/category-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/categories-section/category-section-link.js diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/about-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/about-section-link.js similarity index 75% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/about-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/about-section-link.js index 0fb4bd3dfbb..8952425c951 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/about-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/about-section-link.js @@ -1,6 +1,6 @@ import I18n from "I18n"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; export default class AboutSectionLink extends BaseSectionLink { get name() { diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/admin-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section-link.js similarity index 75% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/admin-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section-link.js index 48eedc94459..093e4360d99 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/admin-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/admin-section-link.js @@ -1,6 +1,6 @@ import I18n from "I18n"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; export default class AdminSectionLink extends BaseSectionLink { get name() { diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/base-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/base-section-link.js similarity index 100% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/base-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/base-section-link.js diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/everything-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/everything-section-link.js similarity index 94% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/everything-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/everything-section-link.js index 86ce91d06c8..1f1793497b0 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/everything-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/everything-section-link.js @@ -2,7 +2,7 @@ import I18n from "I18n"; import { tracked } from "@glimmer/tracking"; import { bind } from "discourse-common/utils/decorators"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; export default class EverythingSectionLink extends BaseSectionLink { @tracked totalUnread = 0; diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/faq-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/faq-section-link.js similarity index 77% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/faq-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/faq-section-link.js index 03078c4ff5b..4a496ffc10e 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/faq-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/faq-section-link.js @@ -1,6 +1,6 @@ import I18n from "I18n"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; export default class FAQSectionLink extends BaseSectionLink { get name() { diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/groups-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/groups-section-link.js similarity index 79% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/groups-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/groups-section-link.js index acd4e1f56d3..ddc97a5dd7e 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/groups-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/groups-section-link.js @@ -1,6 +1,6 @@ import I18n from "I18n"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; export default class GroupsSectionLink extends BaseSectionLink { get name() { diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/my-posts-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js similarity index 93% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/my-posts-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js index 72951911478..2caa96c6475 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/my-posts-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/my-posts-section-link.js @@ -1,7 +1,7 @@ import I18n from "I18n"; import { tracked } from "@glimmer/tracking"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; const USER_DRAFTS_CHANGED_EVENT = "user-drafts:changed"; diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/tracked-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js similarity index 94% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/tracked-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js index 25d751eba74..993efbc4880 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/tracked-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/tracked-section-link.js @@ -2,7 +2,7 @@ import I18n from "I18n"; import { tracked } from "@glimmer/tracking"; import { bind } from "discourse-common/utils/decorators"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; import { isTrackedTopic } from "discourse/lib/topic-list-tracked-filter"; export default class TrackedSectionLink extends BaseSectionLink { diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/users-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/users-section-link.js similarity index 78% rename from app/assets/javascripts/discourse/app/lib/sidebar/community-section/users-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/users-section-link.js index 696363c3e1b..b98ca6ea229 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/community-section/users-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/community-section/users-section-link.js @@ -1,6 +1,6 @@ import I18n from "I18n"; -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; export default class UsersSectionLink extends BaseSectionLink { get name() { diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/custom-community-section-links.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/custom-community-section-links.js similarity index 96% rename from app/assets/javascripts/discourse/app/lib/sidebar/custom-community-section-links.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/custom-community-section-links.js index 64b136d416c..09ae8bb7d22 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/custom-community-section-links.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/custom-community-section-links.js @@ -1,4 +1,4 @@ -import BaseSectionLink from "discourse/lib/sidebar/community-section/base-section-link"; +import BaseSectionLink from "discourse/lib/sidebar/user/community-section/base-section-link"; export let customSectionLinks = []; export let secondaryCustomSectionLinks = []; diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/custom-sections.js similarity index 70% rename from app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/custom-sections.js index 2284ca57fa2..141f8092948 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/custom-sections.js @@ -1,5 +1,5 @@ -import BaseCustomSidebarSection from "discourse/lib/sidebar/base-custom-sidebar-section"; -import BaseCustomSidebarSectionLink from "discourse/lib/sidebar/base-custom-sidebar-section-link"; +import BaseCustomSidebarSection from "discourse/lib/sidebar/user/base-custom-sidebar-section"; +import BaseCustomSidebarSectionLink from "discourse/lib/sidebar/user/base-custom-sidebar-section-link"; export const customSections = []; diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/messages-section/group-message-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/group-message-section-link.js similarity index 94% rename from app/assets/javascripts/discourse/app/lib/sidebar/messages-section/group-message-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/group-message-section-link.js index ce6ec8bc7de..ee59ddfbd59 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/messages-section/group-message-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/group-message-section-link.js @@ -1,7 +1,7 @@ import I18n from "I18n"; import { capitalize } from "@ember/string"; -import MessageSectionLink from "discourse/lib/sidebar/messages-section/message-section-link"; +import MessageSectionLink from "discourse/lib/sidebar/user/messages-section/message-section-link"; export default class GroupMessageSectionLink extends MessageSectionLink { routeNames = new Set([ diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/messages-section/message-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js similarity index 95% rename from app/assets/javascripts/discourse/app/lib/sidebar/messages-section/message-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js index bef0aef0951..41f70271369 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/messages-section/message-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/message-section-link.js @@ -4,7 +4,7 @@ import { INBOX, NEW, UNREAD, -} from "discourse/components/sidebar/messages-section"; +} from "discourse/components/sidebar/user/messages-section"; export default class MessageSectionLink { @tracked shouldDisplay = this._isInbox; diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/messages-section/personal-message-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/personal-message-section-link.js similarity index 92% rename from app/assets/javascripts/discourse/app/lib/sidebar/messages-section/personal-message-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/personal-message-section-link.js index bbf813f352e..f72d992eedb 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/messages-section/personal-message-section-link.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/user/messages-section/personal-message-section-link.js @@ -1,6 +1,6 @@ import I18n from "I18n"; -import MessageSectionLink from "discourse/lib/sidebar/messages-section/message-section-link"; +import MessageSectionLink from "discourse/lib/sidebar/user/messages-section/message-section-link"; export default class PersonalMessageSectionLink extends MessageSectionLink { routeNames = new Set([ diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/tags-section/pm-tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js similarity index 100% rename from app/assets/javascripts/discourse/app/lib/sidebar/tags-section/pm-tag-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/pm-tag-section-link.js diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/tags-section/tag-section-link.js b/app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js similarity index 100% rename from app/assets/javascripts/discourse/app/lib/sidebar/tags-section/tag-section-link.js rename to app/assets/javascripts/discourse/app/lib/sidebar/user/tags-section/tag-section-link.js diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js index 8e33ca9df22..ef91d6d3a6a 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-plugin-api-test.js @@ -9,7 +9,7 @@ import { queryAll, } from "discourse/tests/helpers/qunit-helpers"; import { withPluginApi } from "discourse/lib/plugin-api"; -import { resetSidebarSection } from "discourse/lib/sidebar/custom-sections"; +import { resetSidebarSection } from "discourse/lib/sidebar/user/custom-sections"; import { bind } from "discourse-common/utils/decorators"; acceptance("Sidebar - Plugin API", function (needs) { diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js similarity index 98% rename from app/assets/javascripts/discourse/tests/acceptance/sidebar-categories-section-test.js rename to app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js index abe3a647715..d68aa801e99 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-categories-section-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js @@ -17,7 +17,7 @@ import categoryFixture from "discourse/tests/fixtures/category-fixtures"; import { cloneJSON } from "discourse-common/lib/object"; acceptance( - "Sidebar - Categories Section - suppress_uncategorized_badge enabled", + "Sidebar - Logged on user - Categories Section - suppress_uncategorized_badge enabled", function (needs) { needs.settings({ suppress_uncategorized_badge: true, @@ -55,7 +55,7 @@ acceptance( } ); -acceptance("Sidebar - Categories Section", function (needs) { +acceptance("Sidebar - Logged on user - Categories Section", function (needs) { needs.user({ sidebar_category_ids: [], sidebar_tags: [], diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-community-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js similarity index 99% rename from app/assets/javascripts/discourse/tests/acceptance/sidebar-community-section-test.js rename to app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js index 5dcadd3cd5d..a71ae4e68c9 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-community-section-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-community-section-test.js @@ -21,7 +21,7 @@ import { withPluginApi } from "discourse/lib/plugin-api"; import Site from "discourse/models/site"; import { NotificationLevels } from "discourse/lib/notification-levels"; -acceptance("Sidebar - Community Section", function (needs) { +acceptance("Sidebar - Logged on user - Community Section", function (needs) { needs.user({ tracked_tags: ["tag1"], watched_tags: ["tag2"], diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-messages-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js similarity index 98% rename from app/assets/javascripts/discourse/tests/acceptance/sidebar-messages-section-test.js rename to app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js index 970a994fb59..ad18f04e126 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-messages-section-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-messages-section-test.js @@ -12,7 +12,7 @@ import { import { NotificationLevels } from "discourse/lib/notification-levels"; acceptance( - "Sidebar - Messages Section - enable_personal_messages disabled", + "Sidebar - Logged on user - Messages Section - enable_personal_messages disabled", function (needs) { needs.user(); @@ -34,7 +34,7 @@ acceptance( ); acceptance( - "Sidebar - Messages Section - enable_personal_messages enabled", + "Sidebar - Logged on user - Messages Section - enable_personal_messages enabled", function (needs) { needs.user(); diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-tags-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js similarity index 94% rename from app/assets/javascripts/discourse/tests/acceptance/sidebar-tags-section-test.js rename to app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js index bc8eee8f0e3..ed85daf0047 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-tags-section-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js @@ -13,26 +13,29 @@ import { import discoveryFixture from "discourse/tests/fixtures/discovery-fixtures"; import { cloneJSON } from "discourse-common/lib/object"; -acceptance("Sidebar - Tags section - tagging disabled", function (needs) { - needs.settings({ - tagging_enabled: false, - enable_experimental_sidebar_hamburger: true, - enable_sidebar: true, - }); +acceptance( + "Sidebar - Logged on user - Tags section - tagging disabled", + function (needs) { + needs.settings({ + tagging_enabled: false, + enable_experimental_sidebar_hamburger: true, + enable_sidebar: true, + }); - needs.user(); + needs.user(); - test("tags section is not shown", async function (assert) { - await visit("/"); + test("tags section is not shown", async function (assert) { + await visit("/"); - assert.ok( - !exists(".sidebar-section-tags"), - "does not display the tags section" - ); - }); -}); + assert.ok( + !exists(".sidebar-section-tags"), + "does not display the tags section" + ); + }); + } +); -acceptance("Sidebar - Tags section", function (needs) { +acceptance("Sidebar - Logged on user - Tags section", function (needs) { needs.settings({ tagging_enabled: true, enable_experimental_sidebar_hamburger: true, diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js similarity index 95% rename from app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js rename to app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js index 8f01c55695c..b724efd35ac 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-test.js @@ -5,7 +5,7 @@ import { click, visit } from "@ember/test-helpers"; import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers"; acceptance( - "Sidebar - Experimental sidebar and hamburger setting disabled", + "Sidebar - Logged on user - Experimental sidebar and hamburger setting disabled", function (needs) { needs.user(); @@ -23,7 +23,7 @@ acceptance( ); acceptance( - "Sidebar - Experimental sidebar and hamburger setting enabled - Sidebar disabled", + "Sidebar - Logged on user - Experimental sidebar and hamburger setting enabled - Sidebar disabled", function (needs) { needs.user(); diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js index aaf90f13f7f..00e8e1916f6 100644 --- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js +++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js @@ -62,7 +62,7 @@ import { setTestPresence, } from "discourse/lib/user-presence"; import PreloadStore from "discourse/lib/preload-store"; -import { resetDefaultSectionLinks as resetTopicsSectionLinks } from "discourse/lib/sidebar/custom-community-section-links"; +import { resetDefaultSectionLinks as resetTopicsSectionLinks } from "discourse/lib/sidebar/user/custom-community-section-links"; import { clearBlockDecorateCallbacks, clearTagDecorateCallbacks, @@ -71,7 +71,7 @@ import { import { clearTagsHtmlCallbacks } from "discourse/lib/render-tags"; import { clearToolbarCallbacks } from "discourse/components/d-editor"; import { clearExtraHeaderIcons } from "discourse/widgets/header"; -import { resetSidebarSection } from "discourse/lib/sidebar/custom-sections"; +import { resetSidebarSection } from "discourse/lib/sidebar/user/custom-sections"; import { resetNotificationTypeRenderers } from "discourse/lib/notification-types-manager"; import { resetUserMenuTabs } from "discourse/lib/user-menu/tab";