Add latest changes from gitlab-org/gitlab@master

9 files changed, 2 insertions, 297 deletions

diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/cluster_form_dropdown.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/cluster_form_dropdown.vue
deleted file mode 100644
index 2f7fcfcb755..00000000000
--- a/app/assets/javascripts/create_cluster/eks_cluster/components/cluster_form_dropdown.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<script>
-import $ from 'jquery';
-import { GlIcon } from '@gitlab/ui';
-import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue';
-import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue';
-import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue';
-
-const toArray = value => [].concat(value);
-const itemsProp = (items, prop) => items.map(item => item[prop]);
-const defaultSearchFn = (searchQuery, labelProp) => item =>
-  item[labelProp].toLowerCase().indexOf(searchQuery) > -1;
-
-export default {
-  components: {
-    DropdownButton,
-    DropdownSearchInput,
-    DropdownHiddenInput,
-    GlIcon,
-  },
-  props: {
-    fieldName: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    defaultValue: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    value: {
-      type: [Object, Array, String],
-      required: false,
-      default: () => null,
-    },
-    labelProperty: {
-      type: String,
-      required: false,
-      default: 'name',
-    },
-    valueProperty: {
-      type: String,
-      required: false,
-      default: 'value',
-    },
-    items: {
-      type: Array,
-      required: false,
-      default: () => [],
-    },
-    loading: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    disabled: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    loadingText: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    disabledText: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    hasErrors: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    multiple: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    errorMessage: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    searchFieldPlaceholder: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    emptyText: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    searchFn: {
-      type: Function,
-      required: false,
-      default: defaultSearchFn,
-    },
-  },
-  data() {
-    return {
-      searchQuery: '',
-      focusOnSearch: false,
-    };
-  },
-  computed: {
-    toggleText() {
-      if (this.loading && this.loadingText) {
-        return this.loadingText;
-      }
-
-      if (this.disabled && this.disabledText) {
-        return this.disabledText;
-      }
-
-      if (!this.selectedItems.length) {
-        return this.placeholder;
-      }
-
-      return this.selectedItemsLabels;
-    },
-    results() {
-      return this.getItemsOrEmptyList().filter(this.searchFn(this.searchQuery, this.labelProperty));
-    },
-    selectedItems() {
-      const valueProp = this.valueProperty;
-      const valueList = toArray(this.value);
-      const items = this.getItemsOrEmptyList();
-
-      return items.filter(item => valueList.some(value => item[valueProp] === value));
-    },
-    selectedItemsLabels() {
-      return itemsProp(this.selectedItems, this.labelProperty).join(', ');
-    },
-    selectedItemsValues() {
-      return itemsProp(this.selectedItems, this.valueProperty).join(', ');
-    },
-  },
-  mounted() {
-    $(this.$refs.dropdown)
-      .on('shown.bs.dropdown', () => {
-        this.focusOnSearch = true;
-      })
-      .on('hidden.bs.dropdown', () => {
-        this.focusOnSearch = false;
-      });
-  },
-  beforeDestroy() {
-    $(this.$refs.dropdown).off();
-  },
-  methods: {
-    getItemsOrEmptyList() {
-      return this.items || [];
-    },
-    selectSingle(item) {
-      this.$emit('input', item[this.valueProperty]);
-    },
-    selectMultiple(item) {
-      const value = toArray(this.value);
-      const itemValue = item[this.valueProperty];
-      const itemValueIndex = value.indexOf(itemValue);
-
-      if (itemValueIndex > -1) {
-        value.splice(itemValueIndex, 1);
-      } else {
-        value.push(itemValue);
-      }
-
-      this.$emit('input', value);
-    },
-    isSelected(item) {
-      return this.selectedItems.includes(item);
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <div ref="dropdown" class="dropdown">
-      <dropdown-hidden-input :name="fieldName" :value="selectedItemsValues" />
-      <dropdown-button
-        :class="{ 'border-danger': hasErrors }"
-        :is-disabled="disabled"
-        :is-loading="loading"
-        :toggle-text="toggleText"
-      />
-      <div class="dropdown-menu dropdown-select">
-        <dropdown-search-input
-          v-model="searchQuery"
-          :focused="focusOnSearch"
-          :placeholder-text="searchFieldPlaceholder"
-        />
-        <div class="dropdown-content">
-          <ul>
-            <li v-if="!results.length">
-              <span class="js-empty-text menu-item">{{ emptyText }}</span>
-            </li>
-            <li v-for="item in results" :key="item.id">
-              <button
-                v-if="multiple"
-                class="js-dropdown-item d-flex align-items-center"
-                type="button"
-                @click.stop.prevent="selectMultiple(item)"
-              >
-                <gl-icon
-                  :class="[{ invisible: !isSelected(item) }, 'mr-1']"
-                  name="mobile-issue-close"
-                />
-                <slot name="item" :item="item">{{ item.name }}</slot>
-              </button>
-              <button
-                v-else
-                class="js-dropdown-item"
-                type="button"
-                @click.prevent="selectSingle(item)"
-              >
-                <slot name="item" :item="item">{{ item.name }}</slot>
-              </button>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-    <span
-      v-if="hasErrors && errorMessage"
-      :class="[
-        'form-text js-eks-dropdown-error-message',
-        {
-          'text-danger': hasErrors,
-          'text-muted': !hasErrors,
-        },
-      ]"
-      >{{ errorMessage }}</span
-    >
-  </div>
-</template>
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
index 4996ce3d342..d187730030d 100644
--- a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
+++ b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
@@ -3,7 +3,7 @@ import { createNamespacedHelpers, mapState, mapActions } from 'vuex';
 import _ from 'underscore';
 import { GlFormInput, GlFormCheckbox } from '@gitlab/ui';
 import { sprintf, s__ } from '~/locale';
-import ClusterFormDropdown from './cluster_form_dropdown.vue';
+import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue';
 import { KUBERNETES_VERSIONS } from '../constants';
 import LoadingButton from '~/vue_shared/components/loading_button.vue';
 
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/actions.js b/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/actions.js
deleted file mode 100644
index 5d250b2e29e..00000000000
--- a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/actions.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as types from './mutation_types';
-
-export default fetchItems => ({
-  requestItems: ({ commit }) => commit(types.REQUEST_ITEMS),
-  receiveItemsSuccess: ({ commit }, payload) => commit(types.RECEIVE_ITEMS_SUCCESS, payload),
-  receiveItemsError: ({ commit }, payload) => commit(types.RECEIVE_ITEMS_ERROR, payload),
-  fetchItems: ({ dispatch }, payload) => {
-    dispatch('requestItems');
-
-    return fetchItems(payload)
-      .then(items => dispatch('receiveItemsSuccess', { items }))
-      .catch(error => dispatch('receiveItemsError', { error }));
-  },
-});
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/getters.js b/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/getters.js
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/getters.js
+++ /dev/null
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/index.js b/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/index.js
deleted file mode 100644
index 0b19589215c..00000000000
--- a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as getters from './getters';
-import actions from './actions';
-import mutations from './mutations';
-import state from './state';
-
-const createStore = ({ fetchFn, initialState }) => ({
-  actions: actions(fetchFn),
-  getters,
-  mutations,
-  state: Object.assign(state(), initialState || {}),
-});
-
-export default createStore;
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/mutation_types.js b/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/mutation_types.js
deleted file mode 100644
index 48959a73924..00000000000
--- a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/mutation_types.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const REQUEST_ITEMS = 'REQUEST_ITEMS';
-export const RECEIVE_ITEMS_SUCCESS = 'REQUEST_ITEMS_SUCCESS';
-export const RECEIVE_ITEMS_ERROR = 'RECEIVE_ITEMS_ERROR';
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/mutations.js b/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/mutations.js
deleted file mode 100644
index d09689f1f6c..00000000000
--- a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/mutations.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as types from './mutation_types';
-
-export default {
-  [types.REQUEST_ITEMS](state) {
-    state.isLoadingItems = true;
-    state.loadingItemsError = null;
-  },
-  [types.RECEIVE_ITEMS_SUCCESS](state, { items }) {
-    state.isLoadingItems = false;
-    state.items = items;
-  },
-  [types.RECEIVE_ITEMS_ERROR](state, { error }) {
-    state.isLoadingItems = false;
-    state.loadingItemsError = error;
-  },
-};
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/state.js b/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/state.js
deleted file mode 100644
index b949a24216e..00000000000
--- a/app/assets/javascripts/create_cluster/eks_cluster/store/cluster_dropdown/state.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default () => ({
-  isLoadingItems: false,
-  items: [],
-  loadingItemsError: null,
-});
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/index.js b/app/assets/javascripts/create_cluster/eks_cluster/store/index.js
index 09fd560240d..8dc55506dc2 100644
--- a/app/assets/javascripts/create_cluster/eks_cluster/store/index.js
+++ b/app/assets/javascripts/create_cluster/eks_cluster/store/index.js
@@ -4,7 +4,7 @@ import * as getters from './getters';
 import mutations from './mutations';
 import state from './state';
 
-import clusterDropdownStore from './cluster_dropdown';
+import clusterDropdownStore from '~/create_cluster/store/cluster_dropdown';
 
 import {
   fetchRoles,