diff options
5 files changed, 11 insertions, 15 deletions
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 4ae5fc64a86..42183a04484 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 @@ -139,10 +139,9 @@ export default { v-for="result in results" :key="result.id" > - <a - href="#" - @click.prevent="setMachineType(result.name)" - >{{ result.name }}</a> + <button @click.prevent="setMachineType(result.name)"> + {{ result.name }} + </button> </li> </ul> </div> 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 c4547aa4709..7319a254e0f 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 @@ -159,10 +159,9 @@ export default { v-for="result in results" :key="result.project_number" > - <a - href="#" - @click.prevent="setProject(result)" - >{{ result.name }}</a> + <button @click.prevent="setProject(result)"> + {{ result.name }} + </button> </li> </ul> </div> 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 103d49fab4c..5bb45e8e3b2 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 @@ -124,10 +124,9 @@ export default { v-for="result in results" :key="result.id" > - <a - href="#" - @click.prevent="setZone(result.name)" - >{{ result.name }}</a> + <button @click.prevent="setZone(result.name)"> + {{ result.name }} + </button> </li> </ul> </div> diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js b/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js index dac2cc38c89..79255e654f2 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js @@ -58,7 +58,6 @@ const initializeGapiClient = () => { const el = document.querySelector('.js-gke-cluster-creation'); gapi.client.setToken({ access_token: el.dataset.token }); - delete el.dataset.token; gapi.client .load(CONSTANTS.GCP_API_CLOUD_RESOURCE_MANAGER_ENDPOINT) diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue index 7862b204f20..c159333d89a 100644 --- a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue @@ -31,7 +31,7 @@ export default { class="dropdown-menu-toggle dropdown-menu-full-width" type="button" data-toggle="dropdown" - aria-expanded="true" + aria-expanded="false" :disabled="isDisabled || isLoading" > <loading-icon @@ -50,6 +50,6 @@ export default { aria-hidden="true" data-hidden="true" ></i> - </span> + </span> </button> </template> |