DEV: Migrate sidebar site settings (#19336)

This new site setting replaces the
`enable_experimental_sidebar_hamburger` and `enable_sidebar` site
settings as the sidebar feature exits the experimental phase.

Note that we're replacing this without depreciation since the previous
site setting was considered experimental.

Internal Ref: /t/86563
This commit is contained in:
Alan Guo Xiang Tan
2022-12-08 09:44:29 +08:00
committed by GitHub
parent f7f0ca801b
commit fde9e6bc25
77 changed files with 254 additions and 265 deletions

View File

@@ -17,9 +17,6 @@ export default class ChatController extends Controller {
}
get shouldUseCoreSidebar() {
return (
this.siteSettings.enable_sidebar &&
this.siteSettings.enable_experimental_sidebar_hamburger
);
return this.siteSettings.navigation_menu === "sidebar";
}
}

View File

@@ -151,10 +151,9 @@ RSpec.describe "Navigation", type: :system, js: true do
end
end
context "when sidebar is enabled" do
context "when sidebar is configured as the navigation menu" do
before do
SiteSetting.enable_experimental_sidebar_hamburger = true
SiteSetting.enable_sidebar = true
SiteSetting.navigation_menu = "sidebar"
end
context "when opening channel from sidebar with drawer preferred" do

View File

@@ -20,8 +20,7 @@ RSpec.describe "Receiving message", type: :system, js: true do
context "when core sidebar is enabled" do
before do
SiteSetting.enable_sidebar = true
SiteSetting.enable_experimental_sidebar_hamburger = true
SiteSetting.navigation_menu = "sidebar"
end
context "when receiving a direct message" do

View File

@@ -14,10 +14,9 @@ RSpec.describe "Navigation", type: :system, js: true do
sign_in(user)
end
context "when core sidebar is enabled" do
context "when sidebar is enabled as the navigation menu" do
before do
SiteSetting.enable_sidebar = true
SiteSetting.enable_experimental_sidebar_hamburger = true
SiteSetting.navigation_menu = "sidebar"
end
it "uses core sidebar" do

View File

@@ -15,8 +15,7 @@ acceptance(
needs.settings({
chat_enabled: true,
enable_sidebar: false,
enable_experimental_sidebar_hamburger: false,
navigation_menu: "legacy",
});
needs.pretender((server, helper) => {

View File

@@ -15,8 +15,7 @@ acceptance("Discourse Chat - Sidebar - User Status", function (needs) {
needs.settings({
chat_enabled: true,
enable_experimental_sidebar_hamburger: true,
enable_sidebar: true,
navigation_menu: "sidebar",
});
needs.pretender((server, helper) => {

View File

@@ -61,7 +61,6 @@ acceptance(
needs.settings({
chat_enabled: true,
chat_allow_archiving_channels: true,
enable_sidebar: false,
});
needs.pretender((server, helper) => {

View File

@@ -65,7 +65,7 @@ acceptance("Discourse Chat - without unread", function (needs) {
has_chat_enabled: true,
});
needs.settings({
enable_sidebar: false,
navigation_menu: "legacy",
chat_enabled: true,
});
needs.pretender((server, helper) => {

View File

@@ -18,8 +18,7 @@ acceptance("Discourse Chat - Core Sidebar", function (needs) {
needs.settings({
chat_enabled: true,
enable_experimental_sidebar_hamburger: true,
enable_sidebar: true,
navigation_menu: "sidebar",
});
needs.pretender((server, helper) => {
@@ -528,7 +527,7 @@ acceptance("Discourse Chat - Plugin Sidebar", function (needs) {
needs.settings({
chat_enabled: true,
enable_sidebar: false,
navigation_menu: "legacy",
});
needs.pretender((server, helper) => {
@@ -613,8 +612,7 @@ acceptance(
needs.settings({
chat_enabled: true,
enable_experimental_sidebar_hamburger: true,
enable_sidebar: true,
navigation_menu: "sidebar",
});
needs.pretender((server, helper) => {
@@ -656,8 +654,7 @@ acceptance(
needs.settings({
chat_enabled: true,
enable_experimental_sidebar_hamburger: true,
enable_sidebar: true,
navigation_menu: "sidebar",
});
needs.pretender((server, helper) => {
@@ -698,8 +695,7 @@ acceptance(
needs.settings({
chat_enabled: true,
enable_experimental_sidebar_hamburger: true,
enable_sidebar: true,
navigation_menu: "sidebar",
direct_message_enabled_groups: "13", // trust_level_3 auto group ID;
});
@@ -741,8 +737,7 @@ acceptance(
needs.settings({
chat_enabled: true,
enable_experimental_sidebar_hamburger: true,
enable_sidebar: true,
navigation_menu: "sidebar",
direct_message_enabled_groups: "13", // trust_level_3 auto group ID;
});