IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 11:44:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: do not show user tab preference when disabled (#23188)

Browse Source 
Prior to this fix we would only check if the user is allowed to chat and not if chat is enabled.
This commit is contained in:
Joffrey JAFFEUX 2023-08-22 18:22:25 +02:00 committed by GitHub
parent b5b4a3f233
commit 0e00784218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/user-nav__preferences-chat.hbs → plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.hbs
View File

@ -1,6 +1,6 @@
{{#if (or this.model.can_chat this.currentUser.admin)}}
<li class="user-nav__preferences-chat">
<LinkTo @route="preferences.chat">
{{d-icon "d-chat"}}
<span>{{i18n "chat.title_capitalized"}}</span>
</LinkTo>
{{/if}}
</li>

7
plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.js Normal file
View File

@ -0,0 +1,7 @@
import Component from "@glimmer/component";
export default class ChatPreferences extends Component {
static shouldRender(model, { siteSettings, currentUser }) {
return siteSettings.chat_enabled && (model.can_chat || currentUser?.admin);
}
}

6
plugins/chat/spec/system/user_chat_preferences_spec.rb
View File

@ -16,6 +16,12 @@ RSpec.describe "User chat preferences", type: :system do
sign_in(current_user)
end
it "doesn’t show the tab" do
visit("/u/#{current_user.username}/preferences")
expect(page).to have_no_css(".user-nav__preferences-chat", visible: :all)
end
it "shows a not found page" do
visit("/u/#{current_user.username}/preferences/chat")