diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/monitoring/components | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/monitoring/components')
7 files changed, 32 insertions, 32 deletions
diff --git a/app/assets/javascripts/monitoring/components/alert_widget.vue b/app/assets/javascripts/monitoring/components/alert_widget.vue index c18c13f2574..e5d7e2ea2eb 100644 --- a/app/assets/javascripts/monitoring/components/alert_widget.vue +++ b/app/assets/javascripts/monitoring/components/alert_widget.vue @@ -227,7 +227,7 @@ export default { <template> <div class="prometheus-alert-widget dropdown flex-grow-2 overflow-hidden"> - <gl-loading-icon v-if="shouldShowLoadingIcon" :inline="true" /> + <gl-loading-icon v-if="shouldShowLoadingIcon" :inline="true" size="sm" /> <span v-else-if="errorMessage" ref="alertErrorMessage" class="alert-error-message">{{ errorMessage }}</span> diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index 99008d047af..12f5e7efc96 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -402,22 +402,20 @@ export default { @created="onChartCreated" @updated="onChartUpdated" > - <template v-if="tooltip.type === 'deployments'"> - <template slot="tooltip-title"> + <template #tooltip-title> + <template v-if="tooltip.type === 'deployments'"> {{ __('Deployed') }} </template> - <div slot="tooltip-content" class="d-flex align-items-center"> + <div v-else class="text-nowrap"> + {{ tooltip.title }} + </div> + </template> + <template #tooltip-content> + <div v-if="tooltip.type === 'deployments'" class="d-flex align-items-center"> <gl-icon name="commit" class="mr-2" /> <gl-link :href="tooltip.commitUrl">{{ tooltip.sha }}</gl-link> </div> - </template> - <template v-else> - <template slot="tooltip-title"> - <div class="text-nowrap"> - {{ tooltip.title }} - </div> - </template> - <template slot="tooltip-content" :tooltip="tooltip"> + <template v-else> <div v-for="(content, key) in tooltip.content" :key="key" diff --git a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue index 94cfb562ce3..8e5a0b5cda2 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue @@ -138,10 +138,10 @@ export default { </script> <template> - <!-- + <!-- This component should be replaced with a variant developed as part of https://gitlab.com/gitlab-org/gitlab-ui/-/issues/936 - The variant will create a dropdown with an icon, no text and no caret + The variant will create a dropdown with an icon, no text and no caret --> <gl-dropdown v-gl-tooltip @@ -177,20 +177,22 @@ export default { @formValidation="setFormValidity" /> </form> - <div slot="modal-footer"> - <gl-button @click="hideAddMetricModal"> - {{ __('Cancel') }} - </gl-button> - <gl-button - v-track-event="getAddMetricTrackingOptions()" - data-testid="add-metric-modal-submit-button" - :disabled="!customMetricsFormIsValid" - variant="success" - @click="submitCustomMetricsForm" - > - {{ __('Save changes') }} - </gl-button> - </div> + <template #modal-footer> + <div> + <gl-button @click="hideAddMetricModal"> + {{ __('Cancel') }} + </gl-button> + <gl-button + v-track-event="getAddMetricTrackingOptions()" + data-testid="add-metric-modal-submit-button" + :disabled="!customMetricsFormIsValid" + variant="success" + @click="submitCustomMetricsForm" + > + {{ __('Save changes') }} + </gl-button> + </div> + </template> </gl-modal> </template> diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue index 05b5b760f0a..f53f78a3f13 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_header.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue @@ -197,7 +197,7 @@ export default { <gl-dropdown-section-header>{{ __('Environment') }}</gl-dropdown-section-header> <gl-search-box-by-type @input="debouncedEnvironmentsSearch" /> - <gl-loading-icon v-if="environmentsLoading" :inline="true" /> + <gl-loading-icon v-if="environmentsLoading" size="sm" :inline="true" /> <div v-else class="flex-fill overflow-auto"> <gl-dropdown-item v-for="environment in filteredEnvironments" diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue index 202d18ac721..b786d015f3b 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue @@ -389,7 +389,7 @@ export default { /> <div class="flex-grow-1"></div> <div v-if="graphDataIsLoading" class="mx-1 mt-1"> - <gl-loading-icon /> + <gl-loading-icon size="sm" /> </div> <div v-if="isContextualMenuShown" diff --git a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue index 49d7e3a48a7..fd07a41ec37 100644 --- a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue +++ b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue @@ -88,7 +88,7 @@ export default { @change="formChange" /> <template #modal-ok> - <gl-loading-icon v-if="loading" inline color="light" /> + <gl-loading-icon v-if="loading" size="sm" inline color="light" /> {{ okButtonText }} </template> </gl-modal> diff --git a/app/assets/javascripts/monitoring/components/graph_group.vue b/app/assets/javascripts/monitoring/components/graph_group.vue index ecb8ef4a0d0..5b73fb4e10d 100644 --- a/app/assets/javascripts/monitoring/components/graph_group.vue +++ b/app/assets/javascripts/monitoring/components/graph_group.vue @@ -61,7 +61,7 @@ export default { <div v-if="showPanels" ref="graph-group" class="card prometheus-panel"> <div class="card-header d-flex align-items-center"> <h4 class="flex-grow-1">{{ name }}</h4> - <gl-loading-icon v-if="isLoading" name="loading" /> + <gl-loading-icon v-if="isLoading" size="sm" name="loading" /> <a data-testid="group-toggle-button" :aria-label="__('Toggle collapse')" |