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

UX: Show the score status

Browse Source 
If a review review score has been Approved/Rejected/Ignored then show it
This commit is contained in:
Robin Ward 2019-04-08 12:02:04 -04:00
parent e50e4b6cc6
commit 0fc798c2ef
8 changed files with 78 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/assets/javascripts/discourse/helpers/reviewable-status.js.es6
View File

@ -9,23 +9,39 @@ import {
DELETED
} from "discourse/models/reviewable";
export function htmlStatus(status) {
function dataFor(status) {
switch (status) {
case PENDING:
return I18n.t("review.statuses.pending.title");
return { name: "pending" };
case APPROVED:
return `${iconHTML("check")} ${I18n.t("review.statuses.approved.title")}`;
return { icon: "check", name: "approved" };
case REJECTED:
return `${iconHTML("times")} ${I18n.t("review.statuses.rejected.title")}`;
return { icon: "times", name: "rejected" };
case IGNORED:
return `${iconHTML("external-link-alt")} ${I18n.t(
"review.statuses.ignored.title"
)}`;
return { icon: "external-link-alt", name: "ignored" };
case DELETED:
return `${iconHTML("trash")} ${I18n.t("review.statuses.deleted.title")}`;
return { icon: "trash", name: "review.statuses.deleted.title" };
}
}
export function htmlStatus(status) {
let data = dataFor(status);
if (!data) {
return;
}
let icon = data.icon ? iconHTML(data.icon) : "";
return `
<span class='status'>
<span class="${data.name}">
${icon}
${I18n.t("review.statuses." + data.name + ".title")}
</span>
</span>
`;
}
export default htmlHelper(status => {
return htmlStatus(status);
});

5
app/assets/javascripts/discourse/models/reviewable.js.es6
View File

@ -10,11 +10,6 @@ export const IGNORED = 3;
export const DELETED = 4;
export default RestModel.extend({
pending: Ember.computed.equal("status", PENDING),
approved: Ember.computed.equal("status", APPROVED),
rejected: Ember.computed.equal("status", REJECTED),
ignored: Ember.computed.equal("status", IGNORED),
@computed("type")
humanType(type) {
return I18n.t(`review.types.${type.underscore()}.title`, {

8
app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
View File

@ -9,13 +9,7 @@
{{#link-to 'review.show' reviewable.id}}{{age-with-tooltip reviewable.created_at}}{{/link-to}}
</span>
<span class='status'>
{{#if reviewable.approved}}
<span class="approved"> {{d-icon "check"}} {{i18n "review.statuses.approved.title"}} </span>
{{else if reviewable.rejected}}
<span class="rejected"> {{d-icon "times"}} {{i18n "review.statuses.rejected.title"}} </span>
{{else if reviewable.ignored}}
<span class="ignored"> {{d-icon "external-link-alt"}} {{i18n "review.statuses.ignored.title"}} </span>
{{/if}}
{{reviewable-status reviewable.status}}
</span>
</div>

36
app/assets/javascripts/discourse/templates/components/reviewable-score.hbs Normal file
View File

@ -0,0 +1,36 @@
<tr class='reviewable-score'>
<td>
{{d-icon rs.score_type.icon}} {{rs.score_type.title}} <span class="badge-notification new-posts score">{{format-score rs.score}}</span>
</td>
<td class='user'>
{{#user-link user=rs.user}}
{{avatar rs.user imageSize="tiny"}}
{{rs.user.username}}
{{/user-link}}
</td>
<td>
{{user-flag-percentage
agreed=rs.agree_stats.agreed
disagreed=rs.agree_stats.disagreed
ignored=rs.agree_stats.ignored}}
</td>
<td>
{{reviewable-status rs.status}}
</td>
</tr>
{{#if rs.reviewable_conversation}}
<tr>
<td colspan='3'>
<div class='reviewable-conversation'>
{{#each rs.reviewable_conversation.conversation_posts as |p|}}
{{reviewable-conversation-post post=p}}
{{/each}}
<div class='controls'>
<a href={{rs.reviewable_conversation.permalink}} class='btn btn-small'>
{{i18n "review.conversation.view_full"}}
</a>
</div>
</div>
</td>
</tr>
{{/if}}

34
app/assets/javascripts/discourse/templates/components/reviewable-scores.hbs
View File

@ -2,39 +2,7 @@
<table class='reviewable-scores'>
<tbody>
{{#each scores as |rs|}}
<tr class='reviewable-score'>
<td>{{d-icon "flag"}} {{rs.score_type.title}} <span class="badge-notification new-posts score">{{format-score rs.score}}</span></td>
<td class='user'>
{{#user-link user=rs.user}}
{{avatar rs.user imageSize="tiny"}}
{{rs.user.username}}
{{/user-link}}
</td>
<td>
{{user-flag-percentage
agreed=rs.agree_stats.agreed
disagreed=rs.agree_stats.disagreed
ignored=rs.agree_stats.ignored}}
</td>
</tr>
{{#if rs.reviewable_conversation}}
<tr>
<td colspan='3'>
<div class='reviewable-conversation'>
{{#each rs.reviewable_conversation.conversation_posts as |p|}}
{{reviewable-conversation-post post=p}}
{{/each}}
<div class='controls'>
<a href={{rs.reviewable_conversation.permalink}} class='btn btn-small'>
{{i18n "review.conversation.view_full"}}
</a>
</div>
</div>
</td>
</tr>
{{/if}}
{{reviewable-score rs=rs tagName=''}}
{{/each}}
</tbody>
</table>

20
app/assets/stylesheets/common/base/reviewables.scss
View File

@ -1,4 +1,14 @@
.reviewable {
.status {
color: $primary-medium;
span.approved {
color: $success;
}
span.rejected {
color: $danger;
}
}
.nav-pills {
margin-bottom: 1em;
}
@ -182,15 +192,6 @@
.score {
font-size: $font-down-1;
}
.status {
color: $primary-medium;
span.approved {
color: $success;
}
span.rejected {
color: $danger;
}
}
}
.reviewable-contents {
@ -244,7 +245,6 @@
.d-icon {
font-size: $font-down-1;
color: $primary-high;
}
.badge-notification {

2
app/serializers/reviewable_score_serializer.rb
View File

@ -2,7 +2,7 @@ require_dependency 'reviewable_score_type_serializer'
class ReviewableScoreSerializer < ApplicationSerializer
attributes :id, :score, :agree_stats
attributes :id, :score, :agree_stats, :status
has_one :user, serializer: BasicUserSerializer, root: 'users'
has_one :score_type, serializer: ReviewableScoreTypeSerializer
has_one :reviewable_conversation, serializer: ReviewableConversationSerializer

6
app/serializers/reviewable_score_type_serializer.rb
View File

@ -1,5 +1,5 @@
class ReviewableScoreTypeSerializer < ApplicationSerializer
attributes :id, :title, :score_bonus
attributes :id, :title, :score_bonus, :icon
# Allow us to share post action type translations for backwards compatibility
def title
@ -15,4 +15,8 @@ class ReviewableScoreTypeSerializer < ApplicationSerializer
object.respond_to?(:score_bonus)
end
def icon
"flag"
end
end