Result comments issues

This commit is contained in:
Giga Chubinidze 2023-09-21 06:21:50 +04:00
parent 825f0e839f
commit f0fdfe2ea3
5 changed files with 27 additions and 2 deletions

View file

@ -98,3 +98,18 @@
}
}
.comments-counter {
align-items: center;
background: var(--sn-grey);
border-radius: .5rem;
color: $color-white;
display: flex;
font-size: 10px;
height: 16px;
justify-content: center;
margin: 2px;
min-width: 16px;
position: absolute;
right: 0;
top: 0;
}

View file

@ -38,6 +38,7 @@
flex-basis: calc(100% - 40px);
flex-grow: 1;
height: 2em;
max-width: 13em;
line-height: 2em;
overflow: hidden;
text-overflow: ellipsis;

View file

@ -65,7 +65,7 @@ module CommentHelper
when 'Step'
can_create_comments_in_my_module_steps?(object.my_module)
when 'Result'
can_create_my_module_result_comments?(object.my_module)
can_create_my_module_result_comments?(object.my_module) && object.active?
when 'Project'
can_create_project_comments?(object)
else

View file

@ -47,7 +47,12 @@
data-object-type="Result"
:data-object-id="result.id">
<i class="sn-icon sn-icon-comments"></i>
<span class="comments-counter" v-if="result.attributes.comments_count"
:id="`comment-count-${result.id}`">
{{ result.attributes.comments_count }}
</span>
</a>
<MenuDropdown
v-if="!locked"
:listItems="this.actionsMenu"

View file

@ -10,7 +10,7 @@ class ResultSerializer < ActiveModel::Serializer
attributes :name, :id, :urls, :updated_at, :created_at_formatted, :updated_at_formatted, :user,
:my_module_id, :attachments_manageble, :marvinjs_enabled, :marvinjs_context, :type,
:wopi_enabled, :wopi_context, :created_at, :created_by, :archived, :assets_order,
:open_vector_editor_context
:open_vector_editor_context, :comments_count
def marvinjs_enabled
MarvinJsService.enabled?
@ -64,6 +64,10 @@ class ResultSerializer < ActiveModel::Serializer
can_manage_result?(object)
end
def comments_count
object.comments.count
end
def wopi_enabled
wopi_enabled?
end