2020-06-23 00:09:42 +05:30
|
|
|
<script>
|
|
|
|
import Cookies from 'js-cookie';
|
|
|
|
import { GlCollapse, GlButton, GlPopover } from '@gitlab/ui';
|
2020-10-24 23:57:45 +05:30
|
|
|
import { s__ } from '~/locale';
|
|
|
|
import { parseBoolean } from '~/lib/utils/common_utils';
|
2020-06-23 00:09:42 +05:30
|
|
|
import updateActiveDiscussionMutation from '../graphql/mutations/update_active_discussion.mutation.graphql';
|
|
|
|
import { extractDiscussions, extractParticipants } from '../utils/design_management_utils';
|
|
|
|
import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../constants';
|
|
|
|
import DesignDiscussion from './design_notes/design_discussion.vue';
|
|
|
|
import Participants from '~/sidebar/components/participants/participants.vue';
|
2020-11-24 15:15:51 +05:30
|
|
|
import DesignTodoButton from './design_todo_button.vue';
|
|
|
|
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
|
2020-06-23 00:09:42 +05:30
|
|
|
|
|
|
|
export default {
|
|
|
|
components: {
|
|
|
|
DesignDiscussion,
|
|
|
|
Participants,
|
|
|
|
GlCollapse,
|
|
|
|
GlButton,
|
|
|
|
GlPopover,
|
2020-11-24 15:15:51 +05:30
|
|
|
DesignTodoButton,
|
2020-06-23 00:09:42 +05:30
|
|
|
},
|
2020-11-24 15:15:51 +05:30
|
|
|
mixins: [glFeatureFlagsMixin()],
|
2020-06-23 00:09:42 +05:30
|
|
|
props: {
|
|
|
|
design: {
|
|
|
|
type: Object,
|
|
|
|
required: true,
|
|
|
|
},
|
|
|
|
resolvedDiscussionsExpanded: {
|
|
|
|
type: Boolean,
|
|
|
|
required: true,
|
|
|
|
},
|
|
|
|
markdownPreviewPath: {
|
|
|
|
type: String,
|
|
|
|
required: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
isResolvedCommentsPopoverHidden: parseBoolean(Cookies.get(this.$options.cookieKey)),
|
|
|
|
discussionWithOpenForm: '',
|
|
|
|
};
|
|
|
|
},
|
2020-11-24 15:15:51 +05:30
|
|
|
inject: {
|
|
|
|
projectPath: {
|
|
|
|
default: '',
|
|
|
|
},
|
|
|
|
issueIid: {
|
|
|
|
default: '',
|
|
|
|
},
|
|
|
|
},
|
2020-06-23 00:09:42 +05:30
|
|
|
computed: {
|
|
|
|
discussions() {
|
|
|
|
return extractDiscussions(this.design.discussions);
|
|
|
|
},
|
|
|
|
issue() {
|
|
|
|
return {
|
|
|
|
...this.design.issue,
|
|
|
|
webPath: this.design.issue.webPath.substr(1),
|
|
|
|
};
|
|
|
|
},
|
|
|
|
discussionParticipants() {
|
2020-10-24 23:57:45 +05:30
|
|
|
return extractParticipants(this.issue.participants.nodes);
|
2020-06-23 00:09:42 +05:30
|
|
|
},
|
|
|
|
resolvedDiscussions() {
|
|
|
|
return this.discussions.filter(discussion => discussion.resolved);
|
|
|
|
},
|
|
|
|
unresolvedDiscussions() {
|
|
|
|
return this.discussions.filter(discussion => !discussion.resolved);
|
|
|
|
},
|
|
|
|
resolvedCommentsToggleIcon() {
|
|
|
|
return this.resolvedDiscussionsExpanded ? 'chevron-down' : 'chevron-right';
|
|
|
|
},
|
2020-11-24 15:15:51 +05:30
|
|
|
showTodoButton() {
|
|
|
|
return this.glFeatures.designManagementTodoButton;
|
|
|
|
},
|
|
|
|
sidebarWrapperClass() {
|
|
|
|
return {
|
|
|
|
'gl-pt-0': this.showTodoButton,
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
watch: {
|
|
|
|
isResolvedCommentsPopoverHidden(newVal) {
|
|
|
|
if (!newVal) {
|
|
|
|
this.$refs.resolvedComments.scrollIntoView();
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
mounted() {
|
|
|
|
if (!this.isResolvedCommentsPopoverHidden && this.$refs.resolvedComments) {
|
|
|
|
this.$refs.resolvedComments.$el.scrollIntoView();
|
|
|
|
}
|
2020-06-23 00:09:42 +05:30
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
handleSidebarClick() {
|
|
|
|
this.isResolvedCommentsPopoverHidden = true;
|
|
|
|
Cookies.set(this.$options.cookieKey, 'true', { expires: 365 * 10 });
|
|
|
|
this.updateActiveDiscussion();
|
|
|
|
},
|
|
|
|
updateActiveDiscussion(id) {
|
|
|
|
this.$apollo.mutate({
|
|
|
|
mutation: updateActiveDiscussionMutation,
|
|
|
|
variables: {
|
|
|
|
id,
|
|
|
|
source: ACTIVE_DISCUSSION_SOURCE_TYPES.discussion,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
},
|
|
|
|
closeCommentForm() {
|
|
|
|
this.comment = '';
|
|
|
|
this.$emit('closeCommentForm');
|
|
|
|
},
|
|
|
|
updateDiscussionWithOpenForm(id) {
|
|
|
|
this.discussionWithOpenForm = id;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
resolveCommentsToggleText: s__('DesignManagement|Resolved Comments'),
|
|
|
|
cookieKey: 'hide_design_resolved_comments_popover',
|
|
|
|
};
|
|
|
|
</script>
|
|
|
|
|
|
|
|
<template>
|
2020-11-24 15:15:51 +05:30
|
|
|
<div class="image-notes" :class="sidebarWrapperClass" @click="handleSidebarClick">
|
|
|
|
<div
|
|
|
|
v-if="showTodoButton"
|
|
|
|
class="gl-py-4 gl-mb-4 gl-display-flex gl-justify-content-space-between gl-align-items-center gl-border-b-1 gl-border-b-solid gl-border-b-gray-100"
|
|
|
|
>
|
|
|
|
<span>{{ __('To-Do') }}</span>
|
|
|
|
<design-todo-button :design="design" @error="$emit('todoError', $event)" />
|
|
|
|
</div>
|
2020-06-23 00:09:42 +05:30
|
|
|
<h2 class="gl-font-weight-bold gl-mt-0">
|
|
|
|
{{ issue.title }}
|
|
|
|
</h2>
|
|
|
|
<a
|
2020-10-24 23:57:45 +05:30
|
|
|
class="gl-text-gray-400 gl-text-decoration-none gl-mb-6 gl-display-block"
|
2020-06-23 00:09:42 +05:30
|
|
|
:href="issue.webUrl"
|
|
|
|
>{{ issue.webPath }}</a
|
|
|
|
>
|
|
|
|
<participants
|
|
|
|
:participants="discussionParticipants"
|
|
|
|
:show-participant-label="false"
|
|
|
|
class="gl-mb-4"
|
|
|
|
/>
|
|
|
|
<h2
|
|
|
|
v-if="unresolvedDiscussions.length === 0"
|
|
|
|
class="new-discussion-disclaimer gl-font-base gl-m-0 gl-mb-4"
|
|
|
|
data-testid="new-discussion-disclaimer"
|
|
|
|
>
|
|
|
|
{{ s__("DesignManagement|Click the image where you'd like to start a new discussion") }}
|
|
|
|
</h2>
|
|
|
|
<design-discussion
|
|
|
|
v-for="discussion in unresolvedDiscussions"
|
|
|
|
:key="discussion.id"
|
|
|
|
:discussion="discussion"
|
|
|
|
:design-id="$route.params.id"
|
|
|
|
:noteable-id="design.id"
|
|
|
|
:markdown-preview-path="markdownPreviewPath"
|
|
|
|
:resolved-discussions-expanded="resolvedDiscussionsExpanded"
|
|
|
|
:discussion-with-open-form="discussionWithOpenForm"
|
|
|
|
data-testid="unresolved-discussion"
|
2020-11-24 15:15:51 +05:30
|
|
|
@create-note-error="$emit('onDesignDiscussionError', $event)"
|
|
|
|
@update-note-error="$emit('updateNoteError', $event)"
|
|
|
|
@resolve-discussion-error="$emit('resolveDiscussionError', $event)"
|
2020-06-23 00:09:42 +05:30
|
|
|
@click.native.stop="updateActiveDiscussion(discussion.notes[0].id)"
|
2020-11-24 15:15:51 +05:30
|
|
|
@open-form="updateDiscussionWithOpenForm"
|
2020-06-23 00:09:42 +05:30
|
|
|
/>
|
|
|
|
<template v-if="resolvedDiscussions.length > 0">
|
|
|
|
<gl-button
|
|
|
|
id="resolved-comments"
|
2020-11-24 15:15:51 +05:30
|
|
|
ref="resolvedComments"
|
2020-06-23 00:09:42 +05:30
|
|
|
data-testid="resolved-comments"
|
|
|
|
:icon="resolvedCommentsToggleIcon"
|
|
|
|
variant="link"
|
2020-10-24 23:57:45 +05:30
|
|
|
class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-mb-4"
|
2020-06-23 00:09:42 +05:30
|
|
|
@click="$emit('toggleResolvedComments')"
|
|
|
|
>{{ $options.resolveCommentsToggleText }} ({{ resolvedDiscussions.length }})
|
|
|
|
</gl-button>
|
|
|
|
<gl-popover
|
|
|
|
v-if="!isResolvedCommentsPopoverHidden"
|
|
|
|
:show="!isResolvedCommentsPopoverHidden"
|
|
|
|
target="resolved-comments"
|
|
|
|
container="popovercontainer"
|
|
|
|
placement="top"
|
|
|
|
:title="s__('DesignManagement|Resolved Comments')"
|
|
|
|
>
|
|
|
|
<p>
|
|
|
|
{{
|
|
|
|
s__(
|
|
|
|
'DesignManagement|Comments you resolve can be viewed and unresolved by going to the "Resolved Comments" section below',
|
|
|
|
)
|
|
|
|
}}
|
|
|
|
</p>
|
2020-11-24 15:15:51 +05:30
|
|
|
<a
|
|
|
|
href="https://docs.gitlab.com/ee/user/project/issues/design_management.html#resolve-design-threads"
|
|
|
|
rel="noopener noreferrer"
|
|
|
|
target="_blank"
|
|
|
|
>{{ s__('DesignManagement|Learn more about resolving comments') }}</a
|
|
|
|
>
|
2020-06-23 00:09:42 +05:30
|
|
|
</gl-popover>
|
|
|
|
<gl-collapse :visible="resolvedDiscussionsExpanded" class="gl-mt-3">
|
|
|
|
<design-discussion
|
|
|
|
v-for="discussion in resolvedDiscussions"
|
|
|
|
:key="discussion.id"
|
|
|
|
:discussion="discussion"
|
|
|
|
:design-id="$route.params.id"
|
|
|
|
:noteable-id="design.id"
|
|
|
|
:markdown-preview-path="markdownPreviewPath"
|
|
|
|
:resolved-discussions-expanded="resolvedDiscussionsExpanded"
|
|
|
|
:discussion-with-open-form="discussionWithOpenForm"
|
|
|
|
data-testid="resolved-discussion"
|
|
|
|
@error="$emit('onDesignDiscussionError', $event)"
|
|
|
|
@updateNoteError="$emit('updateNoteError', $event)"
|
|
|
|
@openForm="updateDiscussionWithOpenForm"
|
|
|
|
@click.native.stop="updateActiveDiscussion(discussion.notes[0].id)"
|
|
|
|
/>
|
|
|
|
</gl-collapse>
|
|
|
|
</template>
|
|
|
|
<slot name="replyForm"></slot>
|
|
|
|
</div>
|
|
|
|
</template>
|