Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't override other sidebar panels when opening/closing the chat drawer (#29144) 

This commit fixes an issue where the following happens:

1. The user opens a page where an alternative sidebar panel is displayed like /admin or other page where a plugin is displaying an alternative sidebar like the `docs-categories` plugin
2. Clicking the chat icon in the header and opening the drawer, or if you just minimize chat into drawer after it opens full-screen
3. The alternative sidebar panel is lost and reverted to the main panel.
This commit is contained in:
Sérgio Saquetim 2024-10-09 20:29:19 -03:00 committed by GitHub
parent 85fa4b4cb1
commit 08d5cf01cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/chat/assets/javascripts/discourse/lib/init-sidebar-state.js
View File

@ -1,4 +1,4 @@
import { ADMIN_PANEL, MAIN_PANEL } from "discourse/lib/sidebar/panels"; import { MAIN_PANEL } from "discourse/lib/sidebar/panels";
import { getUserChatSeparateSidebarMode } from "discourse/plugins/chat/discourse/lib/get-user-chat-separate-sidebar-mode"; import { getUserChatSeparateSidebarMode } from "discourse/plugins/chat/discourse/lib/get-user-chat-separate-sidebar-mode";
export const CHAT_PANEL = "chat"; export const CHAT_PANEL = "chat";
@ -15,7 +15,10 @@ export function initSidebarState(api, user) {
api.hideSidebarSwitchPanelButtons(); api.hideSidebarSwitchPanelButtons();
} }
if (api.getSidebarPanel()?.key === ADMIN_PANEL) { if (
api.getSidebarPanel()?.key !== MAIN_PANEL &&
api.getSidebarPanel()?.key !== CHAT_PANEL
) {
return; return;
} }

25
plugins/chat/assets/javascripts/discourse/services/chat-state-manager.js
View File

@ -5,6 +5,7 @@ import { withPluginApi } from "discourse/lib/plugin-api";
import { MAIN_PANEL } from "discourse/lib/sidebar/panels"; import { MAIN_PANEL } from "discourse/lib/sidebar/panels";
import { defaultHomepage } from "discourse/lib/utilities"; import { defaultHomepage } from "discourse/lib/utilities";
import { getUserChatSeparateSidebarMode } from "discourse/plugins/chat/discourse/lib/get-user-chat-separate-sidebar-mode"; import { getUserChatSeparateSidebarMode } from "discourse/plugins/chat/discourse/lib/get-user-chat-separate-sidebar-mode";
import { CHAT_PANEL } from "discourse/plugins/chat/discourse/lib/init-sidebar-state";
const PREFERRED_MODE_KEY = "preferred_mode"; const PREFERRED_MODE_KEY = "preferred_mode";
const PREFERRED_MODE_STORE_NAMESPACE = "discourse_chat_"; const PREFERRED_MODE_STORE_NAMESPACE = "discourse_chat_";
@ -62,13 +63,9 @@ export default class ChatStateManager extends Service {
didOpenDrawer(url = null) { didOpenDrawer(url = null) {
withPluginApi("1.8.0", (api) => { withPluginApi("1.8.0", (api) => {
const adminSidebarStateManager = api.container.lookup(
"service:admin-sidebar-state-manager"
);
if ( if (
adminSidebarStateManager === undefined || api.getSidebarPanel()?.key === MAIN_PANEL ||
!adminSidebarStateManager.maybeForceAdminSidebar() api.getSidebarPanel()?.key === CHAT_PANEL
) { ) {
if (getUserChatSeparateSidebarMode(this.currentUser).always) { if (getUserChatSeparateSidebarMode(this.currentUser).always) {
api.setSeparatedSidebarMode(); api.setSeparatedSidebarMode();
@ -92,18 +89,14 @@ export default class ChatStateManager extends Service {
didCloseDrawer() { didCloseDrawer() {
withPluginApi("1.8.0", (api) => { withPluginApi("1.8.0", (api) => {
const adminSidebarStateManager = api.container.lookup(
"service:admin-sidebar-state-manager"
);
const chatSeparateSidebarMode = getUserChatSeparateSidebarMode(
this.currentUser
);
if ( if (
adminSidebarStateManager === undefined || api.getSidebarPanel()?.key === MAIN_PANEL ||
!adminSidebarStateManager.maybeForceAdminSidebar() api.getSidebarPanel()?.key === CHAT_PANEL
) { ) {
const chatSeparateSidebarMode = getUserChatSeparateSidebarMode(
this.currentUser
);
api.setSidebarPanel(MAIN_PANEL); api.setSidebarPanel(MAIN_PANEL);
if (chatSeparateSidebarMode.fullscreen) { if (chatSeparateSidebarMode.fullscreen) {