github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 15:25:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: allow disabling user activity tab for non admin users (#25540)

Browse Source 
* FEATURE: allow disabling user activity tab for non admin users

* add another test case
This commit is contained in:
Arpit Jalan 2024-02-05 14:30:36 +05:30 committed by GitHub
parent d460229ed8
commit badc390ebe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 115 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/discourse/app/components/user-nav.hbs
View File

@ -9,15 +9,16 @@
<span>{{i18n "user.summary.title"}}</span>
</DNavigationItem>
<DNavigationItem
@route="userActivity"
@ariaCurrentContext="parentNav"
class="user-nav__activity"
>
{{d-icon "stream"}}
<span>{{i18n "user.activity_stream"}}</span>
</DNavigationItem>
{{#if @showActivityTab}}
<DNavigationItem
@route="userActivity"
@ariaCurrentContext="parentNav"
class="user-nav__activity"
>
{{d-icon "stream"}}
<span>{{i18n "user.activity_stream"}}</span>
</DNavigationItem>
{{/if}}
{{/unless}}
{{#if @showNotificationsTab}}

5
app/assets/javascripts/discourse/app/controllers/user.js
View File

@ -122,6 +122,11 @@ export default Controller.extend(CanCheckEmails, {
);
},
@discourseComputed("viewingSelf", "currentUser.admin")
showActivityTab(viewingSelf, isAdmin) {
return viewingSelf || isAdmin || !this.siteSettings.hide_user_activity_tab;
},
@discourseComputed("viewingSelf", "currentUser.admin")
showNotificationsTab(viewingSelf, isAdmin) {
return viewingSelf || isAdmin;

1
app/assets/javascripts/discourse/app/templates/user.hbs
View File

@ -460,6 +460,7 @@
@user={{this.model}}
@isStaff={{this.currentUser.staff}}
@isMobileView={{this.site.mobileView}}
@showActivityTab={{this.showActivityTab}}
@showNotificationsTab={{this.showNotificationsTab}}
@showPrivateMessages={{this.showPrivateMessages}}
@canInviteToForum={{this.canInviteToForum}}

67
app/assets/javascripts/discourse/app/templates/user/summary.hbs
View File

@ -51,15 +51,25 @@
@label="user.summary.posts_read"
/>
</li>
<li class="stats-likes-given linked-stat">
<LinkTo @route="userActivity.likesGiven">
{{#if this.model.can_see_user_actions}}
<li class="stats-likes-given linked-stat">
<LinkTo @route="userActivity.likesGiven">
<UserStat
@value={{this.model.likes_given}}
@icon="heart"
@label="user.summary.likes_given"
/>
</LinkTo>
</li>
{{else}}
<li class="stats-likes-given">
<UserStat
@value={{this.model.likes_given}}
@icon="heart"
@label="user.summary.likes_given"
/>
</LinkTo>
</li>
</li>
{{/if}}
<li class="stats-likes-received">
<UserStat
@value={{this.model.likes_received}}
@ -68,31 +78,58 @@
/>
</li>
{{#if this.model.bookmark_count}}
<li class="stats-bookmark-count linked-stat">
<LinkTo @route="userActivity.bookmarks">
{{#if this.model.can_see_user_actions}}
<li class="stats-bookmark-count linked-stat">
<LinkTo @route="userActivity.bookmarks">
<UserStat
@value={{this.model.bookmark_count}}
@label="user.summary.bookmark_count"
/>
</LinkTo>
</li>
{{else}}
<li class="stats-bookmark-count">
<UserStat
@value={{this.model.bookmark_count}}
@label="user.summary.bookmark_count"
/>
</li>
{{/if}}
{{/if}}
{{#if this.model.can_see_user_actions}}
<li class="stats-topic-count linked-stat">
<LinkTo @route="userActivity.topics">
<UserStat
@value={{this.model.topic_count}}
@label="user.summary.topic_count"
/>
</LinkTo>
</li>
{{/if}}
<li class="stats-topic-count linked-stat">
<LinkTo @route="userActivity.topics">
{{else}}
<li class="stats-topic-count">
<UserStat
@value={{this.model.topic_count}}
@label="user.summary.topic_count"
/>
</LinkTo>
</li>
<li class="stats-post-count linked-stat">
<LinkTo @route="userActivity.replies">
</li>
{{/if}}
{{#if this.model.can_see_user_actions}}
<li class="stats-post-count linked-stat">
<LinkTo @route="userActivity.replies">
<UserStat
@value={{this.model.post_count}}
@label="user.summary.post_count"
/>
</LinkTo>
</li>
{{else}}
<li class="stats-post-count">
<UserStat
@value={{this.model.post_count}}
@label="user.summary.post_count"
/>
</LinkTo>
</li>
</li>
{{/if}}
<PluginOutlet
@name="user-summary-stat"
@connectorTagName="li"

7
app/serializers/user_summary_serializer.rb
View File

@ -94,12 +94,17 @@ class UserSummarySerializer < ApplicationSerializer
:time_read,
:recent_time_read,
:bookmark_count,
:can_see_summary_stats
:can_see_summary_stats,
:can_see_user_actions
def can_see_summary_stats
scope.can_see_summary_stats?(object.user)
end
def can_see_user_actions
scope.can_see_user_actions?(object.user, [])
end
def include_badges?
SiteSetting.enable_badges
end

1
config/locales/server.en.yml
View File

@ -2206,6 +2206,7 @@ en:
hide_user_profiles_from_public: "Disable user cards, user profiles and user directory for anonymous users."
allow_users_to_hide_profile: "Allow users to hide their profile and presence"
hide_user_activity_tab: "Hide the activity tab on user profiles except for Admin and self."
allow_featured_topic_on_user_profiles: "Allow users to feature a link to a topic on their user card and profile."

3
config/site_settings.yml
View File

@ -749,6 +749,9 @@ users:
default: false
use_name_for_username_suggestions:
default: true
hide_user_activity_tab:
default: false
client: true
groups:
enable_group_directory:

1
lib/guardian/user_guardian.rb
View File

@ -138,6 +138,7 @@ module UserGuardian
def can_see_user_actions?(user, action_types)
return true if !@user.anonymous? && (@user.id == user.id || is_admin?)
return false if SiteSetting.hide_user_activity_tab?
(action_types & UserAction.private_types).empty?
end

22
spec/lib/guardian/user_guardian_spec.rb
View File

@ -139,6 +139,28 @@ RSpec.describe UserGuardian do
end
end
describe "#can_see_user_actions?" do
it "is true by default" do
expect(Guardian.new.can_see_user_actions?(nil, [])).to eq(true)
end
context "with 'hide_user_activity_tab' setting" do
before { SiteSetting.hide_user_activity_tab = false }
it "returns true for self" do
expect(Guardian.new(user).can_see_user_actions?(user, [])).to eq(true)
end
it "returns true for admin" do
expect(Guardian.new(admin).can_see_user_actions?(user, [])).to eq(true)
end
it "returns false for regular user" do
expect(Guardian.new.can_see_user_actions?(user, [])).to eq(true)
end
end
end
describe "#allowed_user_field_ids" do
let! :fields do
[

16
spec/serializers/user_summary_serializer_spec.rb
View File

@ -1,14 +1,16 @@
# frozen_string_literal: true
RSpec.describe UserSummarySerializer do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:another_user) { Fabricate(:user, refresh_auto_groups: true) }
it "returns expected data" do
UserActionManager.enable
user = Fabricate(:user, refresh_auto_groups: true)
liked_user = Fabricate(:user, name: "John Doe", username: "john_doe", refresh_auto_groups: true)
liked_post = create_post(user: liked_user)
PostActionCreator.like(user, liked_post)
guardian = Guardian.new(user)
guardian = Guardian.new(another_user)
summary = UserSummary.new(user, guardian)
serializer = UserSummarySerializer.new(summary, scope: guardian, root: false)
json = serializer.as_json
@ -22,12 +24,22 @@ RSpec.describe UserSummarySerializer do
expect(json[:most_liked_users][0][:name]).to eq("John Doe")
expect(json[:most_liked_users][0][:username]).to eq("john_doe")
expect(json[:most_liked_users][0][:avatar_template]).to eq(liked_user.avatar_template)
expect(json[:can_see_user_actions]).to eq(true)
# do not include full name if disabled
SiteSetting.enable_names = false
expect(serializer.as_json[:most_liked_users][0][:name]).to eq(nil)
end
it "respects hide_user_activity_tab setting" do
SiteSetting.hide_user_activity_tab = true
guardian = Guardian.new(another_user)
summary = UserSummary.new(user, guardian)
serializer = UserSummarySerializer.new(summary, scope: guardian, root: false)
expect(serializer.as_json[:can_see_user_actions]).to eq(false)
end
it "returns correct links data ranking" do
topic = Fabricate(:topic, user: Fabricate(:user, refresh_auto_groups: true))
post = Fabricate(:post_with_external_links, user: topic.user, topic: topic)