Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 7 insertions, 8 deletions

diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
index a9c4203af22..eabba619af5 100644
--- a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
+++ b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
@@ -59,6 +59,10 @@ export default {
         return data.workspace?.issuable?.currentUserTodos.nodes[0]?.id;
       },
       result({ data }) {
+        if (!data) {
+          return;
+        }
+
         const currentUserTodos = data.workspace?.issuable?.currentUserTodos?.nodes ?? [];
         this.todoId = currentUserTodos[0]?.id;
         this.$emit('todoUpdated', currentUserTodos.length > 0);
@@ -177,19 +181,14 @@ export default {
     />
     <gl-button
       v-if="isClassicSidebar"
+      v-gl-tooltip.left.viewport
+      :title="tootltipTitle"
       category="tertiary"
       type="reset"
       class="sidebar-collapsed-icon sidebar-collapsed-container gl-rounded-0! gl-shadow-none!"
       @click.stop.prevent="toggleTodo"
     >
-      <gl-icon
-        v-gl-tooltip.left.viewport
-        :title="tootltipTitle"
-        :size="16"
-        :class="{ 'todo-undone': hasTodo }"
-        :name="collapsedButtonIcon"
-        :aria-label="collapsedButtonIcon"
-      />
+      <gl-icon :class="{ 'todo-undone': hasTodo }" :name="collapsedButtonIcon" />
     </gl-button>
   </div>
 </template>