Skip to content

Commit

Permalink
Revert "FEATURE: Publish read state on group messages. (#7989) [Undo …
Browse files Browse the repository at this point in the history 
…revert] (#8024)"

This reverts commit 5dda5c2.
  • Loading branch information
@romanrizzi
romanrizzi committed Aug 20, 2019
1 parent 5dda5c2 commit 36425eb
Show file tree
Hide file tree
Showing 35 changed files with 21 additions and 531 deletions.
9 changes: 1 addition & 8 deletions app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
View file
Expand Up @@ -40,8 +40,7 @@ export default MountWidget.extend({
"gaps",
"selectedQuery",
"selectedPostsCount",
"searchService",
"showReadIndicator"
"searchService"
);
},

Expand Down Expand Up @@ -292,12 +291,6 @@ export default MountWidget.extend({
onRefresh: "refreshLikes"
});
}

if (args.refreshReaders) {
this.dirtyKeys.keyDirty(`post-menu-${args.id}`, {
onRefresh: "refreshReaders"
});
}
} else if (args.force) {
this.dirtyKeys.forceAll();
}
Expand Down
41 changes: 0 additions & 41 deletions app/assets/javascripts/discourse/components/topic-list-item.js.es6
View file
Expand Up @@ -35,47 +35,6 @@ export const ListItemDefaults = {
attributeBindings: ["data-topic-id"],
"data-topic-id": Ember.computed.alias("topic.id"),

didInsertElement() {
this._super(...arguments);

if (this.includeReadIndicator) {
this.messageBus.subscribe(this.readIndicatorChannel, data => {
const nodeClassList = document.querySelector(
`.indicator-topic-${data.topic_id}`
).classList;

if (data.show_indicator) {
nodeClassList.remove("unread");
} else {
nodeClassList.add("unread");
}
});
}
},

willDestroyElement() {
this._super(...arguments);

if (this.includeReadIndicator) {
this.messageBus.unsubscribe(this.readIndicatorChannel);
}
},

@computed("topic.id")
readIndicatorChannel(topicId) {
return `/private-messages/group-read/${topicId}`;
},

@computed("topic.read_by_group_member")
unreadClass(readByGroupMember) {
return readByGroupMember ? "" : "unread";
},

@computed("topic.read_by_group_member")
includeReadIndicator(readByGroupMember) {
return typeof readByGroupMember !== "undefined";
},

@computed
newDotText() {
return this.currentUser && this.currentUser.trust_level > 0
Expand Down
11 changes: 0 additions & 11 deletions app/assets/javascripts/discourse/controllers/topic.js.es6
View file
Expand Up @@ -1348,17 +1348,6 @@ export default Ember.Controller.extend(bufferedProperty("model"), {
})
.then(() => refresh({ id: data.id, refreshLikes: true }));
break;
case "read":
postStream
.triggerChangedPost(data.id, data.updated_at, {
preserveCooked: true
})
.then(() =>
refresh({
id: data.id,
refreshReaders: topic.show_read_indicator
})
);
case "revised":
case "rebaked": {
postStream
Expand Down
3 changes: 1 addition & 2 deletions app/assets/javascripts/discourse/lib/transform-post.js.es6
View file
Expand Up @@ -71,8 +71,7 @@ export function transformBasicPost(post) {
expandablePost: false,
replyCount: post.reply_count,
locked: post.locked,
userCustomFields: post.user_custom_fields,
readCount: post.readers_count
userCustomFields: post.user_custom_fields
};

_additionalAttributes.forEach(a => (postAtts[a] = post[a]));
Expand Down
3 changes: 1 addition & 2 deletions app/assets/javascripts/discourse/models/group.js.es6
View file
Expand Up @@ -178,8 +178,7 @@ const Group = RestModel.extend({
allow_membership_requests: this.allow_membership_requests,
full_name: this.full_name,
default_notification_level: this.default_notification_level,
membership_request_template: this.membership_request_template,
publish_read_state: this.publish_read_state
membership_request_template: this.membership_request_template
};

if (!this.id) {
Expand Down
10 changes: 0 additions & 10 deletions app/assets/javascripts/discourse/templates/components/groups-form-interaction-fields.hbs
View file
Expand Up @@ -52,16 +52,6 @@
class="groups-form-messageable-level"}}
</div>

<div class="control-group">
<label>
{{input type="checkbox"
checked=model.publish_read_state
class="groups-form-publish-read-state"}}

{{i18n 'admin.groups.manage.interaction.publish_read_state'}}
</label>
</div>

{{#if showEmailSettings}}
<div class="control-group">
<label class="control-label">{{i18n 'admin.groups.manage.interaction.email'}}</label>
Expand Down
5 changes: 0 additions & 5 deletions app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
View file
Expand Up @@ -23,11 +23,6 @@
{{~#if showTopicPostBadges}}
{{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
{{~/if}}
{{~#if includeReadIndicator}}
<span class='read-indicator indicator-topic-{{topic.id}} {{unreadClass}}'>
{{~d-icon "far-eye"}}
</span>
{{~/if}}
</span>
<div class="link-bottom-line">
{{#unless hideCategory}}
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/discourse/templates/topic.hbs
View file
Expand Up @@ -177,7 +177,6 @@
selectedPostsCount=selectedPostsCount
selectedQuery=selectedQuery
gaps=model.postStream.gaps
showReadIndicator=model.show_read_indicator
showFlags=(action "showPostFlags")
editPost=(action "editPost")
showHistory=(route-action "showHistory")
Expand Down
86 changes: 4 additions & 82 deletions app/assets/javascripts/discourse/widgets/post-menu.js.es6
View file
Expand Up @@ -52,36 +52,6 @@ export function buildButton(name, widget) {
}
}

registerButton("read-count", attrs => {
if (attrs.showReadIndicator) {
const count = attrs.readCount;
if (count > 0) {
return {
action: "toggleWhoRead",
title: "post.controls.read_indicator",
className: "button-count read-indicator",
contents: count,
iconRight: true,
addContainer: false
};
}
}
});

registerButton("read", attrs => {
const disabled = attrs.readCount === 0;
if (attrs.showReadIndicator) {
return {
action: "toggleWhoRead",
title: "post.controls.read_indicator",
icon: "far-eye",
before: "read-count",
addContainer: false,
disabled
};
}
});

function likeCount(attrs) {
const count = attrs.likeCount;

Expand Down Expand Up @@ -371,12 +341,7 @@ export default createWidget("post-menu", {
},

defaultState() {
return {
collapsed: true,
likedUsers: [],
readers: [],
adminVisible: false
};
return { collapsed: true, likedUsers: [], adminVisible: false };
},

buildKey: attrs => `post-menu-${attrs.id}`,
Expand Down Expand Up @@ -543,19 +508,6 @@ export default createWidget("post-menu", {
);
}

if (state.readers.length) {
const remaining = state.totalReaders - state.readers.length;
contents.push(
this.attach("small-user-list", {
users: state.readers,
addSelf: false,
listClassName: "who-read",
description: "post.actions.people.read",
count: remaining
})
);
}

return contents;
},

Expand All @@ -573,15 +525,9 @@ export default createWidget("post-menu", {

showMoreActions() {
this.state.collapsed = false;
const likesPromise = !this.state.likedUsers.length
? this.getWhoLiked()
: Ember.RSVP.resolve();

return likesPromise.then(() => {
if (!this.state.readers.length) {
return this.getWhoRead();
}
});
if (!this.state.likedUsers.length) {
return this.getWhoLiked();
}
},

like() {
Expand Down Expand Up @@ -616,12 +562,6 @@ export default createWidget("post-menu", {
}
},

refreshReaders() {
if (this.state.readers.length) {
return this.getWhoRead();
}
},

getWhoLiked() {
const { attrs, state } = this;

Expand All @@ -636,30 +576,12 @@ export default createWidget("post-menu", {
});
},

getWhoRead() {
const { attrs, state } = this;

return this.store.find("post-reader", { id: attrs.id }).then(users => {
state.readers = users.map(avatarAtts);
state.totalReaders = users.totalRows;
});
},

toggleWhoLiked() {
const state = this.state;
if (state.likedUsers.length) {
state.likedUsers = [];
} else {
return this.getWhoLiked();
}
},

toggleWhoRead() {
const state = this.state;
if (this.state.readers.length) {
state.readers = [];
} else {
return this.getWhoRead();
}
}
});
1 change: 0 additions & 1 deletion app/assets/javascripts/discourse/widgets/post-stream.js.es6
View file
Expand Up @@ -136,7 +136,6 @@ export default createWidget("post-stream", {
this.attach("post-small-action", transformed, { model: post })
);
} else {
transformed.showReadIndicator = attrs.showReadIndicator;
result.push(this.attach("post", transformed, { model: post }));
}

Expand Down
6 changes: 0 additions & 6 deletions app/assets/stylesheets/common/base/_topic-list.scss
View file
Expand Up @@ -133,12 +133,6 @@
.raw-topic-link > * {
pointer-events: none;
}

.read-indicator {
&.unread {
display: none;
}
}
}

.link-bottom-line {
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/common/base/topic-post.scss
View file
Expand Up @@ -641,8 +641,7 @@ blockquote > *:last-child {
font-size: $font-down-1;
}

.who-liked,
.who-read {
.who-liked {
transition: height 0.5s;
a {
margin: 0 0.25em 0.5em 0;
Expand Down
4 changes: 1 addition & 3 deletions app/assets/stylesheets/desktop/topic-post.scss
View file
Expand Up @@ -66,7 +66,6 @@ nav.post-controls {
margin-left: 0;
margin-right: 0;
&.my-likes,
&.read-indicator,
&.regular-likes {
// Like count on posts
.d-icon {
Expand Down Expand Up @@ -839,8 +838,7 @@ a.attachment:before {
}
}

.who-liked,
.who-read {
.who-liked {
margin-top: 20px;
margin-bottom: 0;
width: 100%;
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/mobile/topic-post.scss
View file
Expand Up @@ -38,7 +38,6 @@ span.badge-posts {
flex: 0 1 auto;
button {
&.like,
&.read-indicator,
&.create-flag {
flex: 1 1 auto;
}
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/admin/groups_controller.rb
View file
Expand Up @@ -153,8 +153,7 @@ def group_params
:default_notification_level,
:membership_request_template,
:owner_usernames,
:usernames,
:publish_read_state
:usernames
]
custom_fields = Group.editable_group_custom_fields
permitted << { custom_fields: custom_fields } unless custom_fields.blank?
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/groups_controller.rb
View file
Expand Up @@ -552,8 +552,7 @@ def group_params(automatic: false)
:name,
:grant_trust_level,
:automatic_membership_email_domains,
:automatic_membership_retroactive,
:publish_read_state
:automatic_membership_retroactive
])

custom_fields = Group.editable_group_custom_fields
Expand Down
26 changes: 0 additions & 26 deletions app/controllers/post_readers_controller.rb
View file

This file was deleted.

1 change: 0 additions & 1 deletion app/models/group.rb
View file
Expand Up @@ -897,7 +897,6 @@ def enqueue_update_mentions_job
# visibility_level :integer default(0), not null
# public_exit :boolean default(FALSE), not null
# public_admission :boolean default(FALSE), not null
# publish_read_state :boolean default(FALSE), not null
# membership_request_template :text
# messageable_level :integer default(0)
# mentionable_level :integer default(0)
Expand Down

1 comment on commit 36425eb

@discoursereviewbot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Roman Rizzi posted:

https://review.discourse.org/t/feature-publish-read-state-on-group-messages-originally-introduced-in-7989-8025/5399

Please sign in to comment.