refactor dropdown reusable components

4 files changed, 3 insertions, 54 deletions

diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue
deleted file mode 100644
index 7df8c467965..00000000000
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/dropdown_button.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<script>
-import { s__ } from '~/locale';
-import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
-
-export default {
-  components: {
-    LoadingIcon,
-  },
-  props: {
-    isDisabled: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    isLoading: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    toggleText: {
-      type: String,
-      required: true,
-      default: s__('ClusterIntegration|Select'),
-    },
-  },
-};
-</script>
-
-<template>
-  <button
-    class="dropdown-menu-toggle dropdown-menu-full-width"
-    type="button"
-    data-toggle="dropdown"
-    aria-expanded="true"
-    :disabled="isDisabled || isLoading"
-  >
-    <loading-icon
-      v-show="isLoading"
-      :inline="true"
-    />
-    <span class="dropdown-toggle-text">
-      {{ toggleText }}
-    </span>
-    <i
-      aria-hidden="true"
-      data-hidden="true"
-      v-show="!isLoading"
-      class="fa fa-chevron-down"
-    ></i>
-  </button>
-</template>
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
index 5a4dca0b69d..4ae5fc64a86 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
@@ -5,10 +5,10 @@ import { mapState, mapGetters, mapActions } from 'vuex';
 import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
 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';
 
 import eventHub from '../eventhub';
 import store from '../stores';
-import DropdownButton from './dropdown_button.vue';
 
 export default {
   name: 'GkeMachineTypeDropdown',
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
index e5364c3278a..c4547aa4709 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
@@ -5,9 +5,9 @@ import { mapState, mapGetters, mapActions } from 'vuex';
 import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
 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';
 
 import store from '../stores';
-import DropdownButton from './dropdown_button.vue';
 
 export default {
   name: 'GkeProjectIdDropdown',
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
index 71d8c5491ae..103d49fab4c 100644
--- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
+++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
@@ -5,10 +5,10 @@ import { mapState, mapGetters, mapActions } from 'vuex';
 import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
 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';
 
 import eventHub from '../eventhub';
 import store from '../stores';
-import DropdownButton from './dropdown_button.vue';
 
 export default {
   name: 'GkeZoneDropdown',