diff options
Diffstat (limited to 'app/assets/javascripts/design_management')
5 files changed, 13 insertions, 31 deletions
diff --git a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue index b1c37b0687f..78ba586ce37 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue @@ -221,7 +221,7 @@ export default { @click.stop="toggleResolvedStatus" > <gl-icon v-if="!isResolving" :name="resolveIconName" data-testid="resolve-icon" /> - <gl-loading-icon v-else inline /> + <gl-loading-icon v-else size="sm" inline /> </button> </template> <template v-if="discussion.resolved" #resolved-status> diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue index 833d7081a2c..1e1f5135290 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue @@ -1,6 +1,7 @@ <script> import { GlTooltipDirective, GlIcon, GlLink, GlSafeHtmlDirective } from '@gitlab/ui'; import { ApolloMutation } from 'vue-apollo'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { __ } from '~/locale'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; @@ -48,6 +49,9 @@ export default { author() { return this.note.author; }, + authorId() { + return getIdFromGraphQLId(this.author.id); + }, noteAnchorId() { return findNoteId(this.note.id); }, @@ -94,7 +98,7 @@ export default { v-once :href="author.webUrl" class="js-user-link" - :data-user-id="author.id" + :data-user-id="authorId" :data-username="author.username" > <span class="note-header-author-name gl-font-weight-bold">{{ author.name }}</span> diff --git a/app/assets/javascripts/design_management/components/design_todo_button.vue b/app/assets/javascripts/design_management/components/design_todo_button.vue index da492f03801..013dd1d89f3 100644 --- a/app/assets/javascripts/design_management/components/design_todo_button.vue +++ b/app/assets/javascripts/design_management/components/design_todo_button.vue @@ -1,6 +1,6 @@ <script> import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql'; -import TodoButton from '~/vue_shared/components/todo_button.vue'; +import TodoButton from '~/vue_shared/components/sidebar/todo_toggle/todo_button.vue'; import createDesignTodoMutation from '../graphql/mutations/create_design_todo.mutation.graphql'; import getDesignQuery from '../graphql/queries/get_design.query.graphql'; import allVersionsMixin from '../mixins/all_versions'; @@ -60,22 +60,6 @@ export default { }, }, methods: { - updateGlobalTodoCount(additionalTodoCount) { - const currentCount = parseInt(document.querySelector('.js-todos-count').innerText, 10); - const todoToggleEvent = new CustomEvent('todo:toggle', { - detail: { - count: Math.max(currentCount + additionalTodoCount, 0), - }, - }); - - document.dispatchEvent(todoToggleEvent); - }, - incrementGlobalTodoCount() { - this.updateGlobalTodoCount(1); - }, - decrementGlobalTodoCount() { - this.updateGlobalTodoCount(-1); - }, createTodo() { this.todoLoading = true; return this.$apollo @@ -92,9 +76,6 @@ export default { } }, }) - .then(() => { - this.incrementGlobalTodoCount(); - }) .catch((err) => { this.$emit('error', Error(CREATE_DESIGN_TODO_ERROR)); throw err; @@ -130,9 +111,6 @@ export default { } }, }) - .then(() => { - this.decrementGlobalTodoCount(); - }) .catch((err) => { this.$emit('error', Error(DELETE_DESIGN_TODO_ERROR)); throw err; diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue index ad78433c7ce..19bfa123487 100644 --- a/app/assets/javascripts/design_management/pages/design/index.vue +++ b/app/assets/javascripts/design_management/pages/design/index.vue @@ -41,7 +41,7 @@ import { TOGGLE_TODO_ERROR, designDeletionError, } from '../../utils/error_messages'; -import { trackDesignDetailView, usagePingDesignDetailView } from '../../utils/tracking'; +import { trackDesignDetailView, servicePingDesignDetailView } from '../../utils/tracking'; const DEFAULT_SCALE = 1; @@ -292,7 +292,7 @@ export default { ); if (this.glFeatures.usageDataDesignAction) { - usagePingDesignDetailView(); + servicePingDesignDetailView(); } }, updateActiveDiscussion(id, source = ACTIVE_DISCUSSION_SOURCE_TYPES.discussion) { diff --git a/app/assets/javascripts/design_management/utils/tracking.js b/app/assets/javascripts/design_management/utils/tracking.js index 905134fa985..23aec46c152 100644 --- a/app/assets/javascripts/design_management/utils/tracking.js +++ b/app/assets/javascripts/design_management/utils/tracking.js @@ -14,7 +14,7 @@ export const DESIGN_SNOWPLOW_EVENT_TYPES = { UPDATE_DESIGN: 'update_design', }; -export const DESIGN_USAGE_PING_EVENT_TYPES = { +export const DESIGN_SERVICE_PING_EVENT_TYPES = { DESIGN_ACTION: 'design_action', }; @@ -52,8 +52,8 @@ export function trackDesignUpdate() { } /** - * Track "design detail" view via usage ping + * Track "design detail" view via service ping */ -export function usagePingDesignDetailView() { - Api.trackRedisHllUserEvent(DESIGN_USAGE_PING_EVENT_TYPES.DESIGN_ACTION); +export function servicePingDesignDetailView() { + Api.trackRedisHllUserEvent(DESIGN_SERVICE_PING_EVENT_TYPES.DESIGN_ACTION); } |