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

4 files changed, 5 insertions, 235 deletions

diff --git a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue b/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue
deleted file mode 100644
index 460a10e08ed..00000000000
--- a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script>
-import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
-
-export default {
-  name: 'CollapsedCalendarIcon',
-  directives: {
-    GlTooltip: GlTooltipDirective,
-  },
-  components: {
-    GlIcon,
-  },
-  props: {
-    containerClass: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    text: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    showIcon: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
-    tooltipText: {
-      type: String,
-      required: false,
-      default: '',
-    },
-  },
-  methods: {
-    click() {
-      this.$emit('click');
-    },
-  },
-};
-</script>
-
-<template>
-  <div v-gl-tooltip.left.viewport="tooltipText" :class="containerClass" @click="click">
-    <gl-icon v-if="showIcon" name="calendar" />
-    <slot>
-      <span> {{ text }} </span>
-    </slot>
-  </div>
-</template>
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue b/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
deleted file mode 100644
index 4531fafbf72..00000000000
--- a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<script>
-import { GlLoadingIcon } from '@gitlab/ui';
-import { __ } from '~/locale';
-import { dateInWords } from '../../../lib/utils/datetime_utility';
-import datePicker from '../pikaday.vue';
-import collapsedCalendarIcon from './collapsed_calendar_icon.vue';
-import toggleSidebar from './toggle_sidebar.vue';
-
-export default {
-  name: 'SidebarDatePicker',
-  components: {
-    datePicker,
-    toggleSidebar,
-    collapsedCalendarIcon,
-    GlLoadingIcon,
-  },
-  props: {
-    blockClass: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    collapsed: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
-    showToggleSidebar: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    isLoading: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    label: {
-      type: String,
-      required: false,
-      default: __('Date picker'),
-    },
-    selectedDate: {
-      type: Date,
-      required: false,
-      default: null,
-    },
-    minDate: {
-      type: Date,
-      required: false,
-      default: null,
-    },
-    maxDate: {
-      type: Date,
-      required: false,
-      default: null,
-    },
-  },
-  data() {
-    return {
-      editing: false,
-    };
-  },
-  computed: {
-    selectedAndEditable() {
-      return this.selectedDate && this.editable;
-    },
-    selectedDateWords() {
-      return dateInWords(this.selectedDate, true);
-    },
-    collapsedText() {
-      return this.selectedDateWords ? this.selectedDateWords : __('None');
-    },
-  },
-  methods: {
-    stopEditing() {
-      this.editing = false;
-    },
-    toggleDatePicker() {
-      this.editing = !this.editing;
-    },
-    newDateSelected(date = null) {
-      this.date = date;
-      this.editing = false;
-      this.$emit('saveDate', date);
-    },
-    toggleSidebar() {
-      this.$emit('toggleCollapse');
-    },
-  },
-};
-</script>
-
-<template>
-  <div :class="blockClass" class="block">
-    <div class="issuable-sidebar-header">
-      <toggle-sidebar :collapsed="collapsed" @toggle="toggleSidebar" />
-    </div>
-    <collapsed-calendar-icon :text="collapsedText" class="sidebar-collapsed-icon" />
-    <div class="title">
-      {{ label }}
-      <gl-loading-icon v-if="isLoading" size="sm" :inline="true" />
-      <div class="float-right">
-        <button
-          v-if="editable && !editing"
-          type="button"
-          class="btn-blank btn-link btn-primary-hover-link btn-sidebar-action"
-          @click="toggleDatePicker"
-        >
-          {{ __('Edit') }}
-        </button>
-        <toggle-sidebar v-if="showToggleSidebar" :collapsed="collapsed" @toggle="toggleSidebar" />
-      </div>
-    </div>
-    <div class="value">
-      <date-picker
-        v-if="editing"
-        :selected-date="selectedDate"
-        :min-date="minDate"
-        :max-date="maxDate"
-        :label="label"
-        @newDateSelected="newDateSelected"
-        @hidePicker="stopEditing"
-      />
-      <span v-else class="value-content">
-        <template v-if="selectedDate">
-          <strong>{{ selectedDateWords }}</strong>
-          <span v-if="selectedAndEditable" class="no-value">
-            -
-            <button
-              type="button"
-              class="btn-blank btn-link btn-secondary-hover-link"
-              @click="newDateSelected(null)"
-            >
-              {{ __('remove') }}
-            </button>
-          </span>
-        </template>
-        <span v-else class="no-value">{{ __('None') }}</span>
-      </span>
-    </div>
-  </div>
-</template>
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue
index b99083713a8..88977652556 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view.vue
@@ -117,7 +117,11 @@ export default {
                 labelCreate: { label },
               },
             },
-          ) => this.updateLabelsInCache(store, label),
+          ) => {
+            if (label) {
+              this.updateLabelsInCache(store, label);
+            }
+          },
         });
         if (labelCreate.errors.length) {
           [this.error] = labelCreate.errors;
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/multiselect_dropdown.vue b/app/assets/javascripts/vue_shared/components/sidebar/multiselect_dropdown.vue
deleted file mode 100644
index 17904f20341..00000000000
--- a/app/assets/javascripts/vue_shared/components/sidebar/multiselect_dropdown.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<script>
-import { GlDropdown, GlDropdownForm, GlDropdownDivider } from '@gitlab/ui';
-
-export default {
-  components: {
-    GlDropdownForm,
-    GlDropdown,
-    GlDropdownDivider,
-  },
-  props: {
-    headerText: {
-      type: String,
-      required: true,
-    },
-    text: {
-      type: String,
-      required: true,
-    },
-  },
-};
-</script>
-
-<template>
-  <gl-dropdown class="show" :text="text" @toggle="$emit('toggle')">
-    <template #header>
-      <p class="gl-font-weight-bold gl-text-center gl-mt-2 gl-mb-4">{{ headerText }}</p>
-      <gl-dropdown-divider />
-      <slot name="search"></slot>
-    </template>
-    <gl-dropdown-form>
-      <slot name="items"></slot>
-    </gl-dropdown-form>
-    <template #footer>
-      <slot name="footer"></slot>
-    </template>
-  </gl-dropdown>
-</template>