diff --git a/.rubocop.yml b/.rubocop.yml index 3c5771da32d..bec305da54c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -225,6 +225,7 @@ Gitlab/Json: - 'scripts/**/*' - 'lib/rspec_flaky/**/*' - 'lib/quality/**/*' + - 'lib/gitlab/danger/**/*' GitlabSecurity/PublicSend: Enabled: true diff --git a/app/assets/javascripts/alert_management/components/alert_management_list.vue b/app/assets/javascripts/alert_management/components/alert_management_list.vue index 1909840ed19..7c0c456daa1 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_list.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_list.vue @@ -26,7 +26,6 @@ const bodyTrClass = 'gl-border-1 gl-border-t-solid gl-border-gray-100 hover-bg-blue-50 hover-gl-cursor-pointer hover-gl-border-b-solid hover-gl-border-blue-200'; export default { - bodyTrClass, i18n: { noAlertsMsg: s__( "AlertManagement|No alerts available to display. If you think you're seeing this message in error, refresh the page.", @@ -132,7 +131,6 @@ export default { }, data() { return { - alerts: null, errored: false, isAlertDismissed: false, isErrorAlertDismissed: false, @@ -149,6 +147,12 @@ export default { loading() { return this.$apollo.queries.alerts.loading; }, + hasAlerts() { + return this.alerts?.length; + }, + tbodyTrClass() { + return !this.loading && this.hasAlerts ? bodyTrClass : ''; + }, }, methods: { filterAlertsByStatus(tabIndex) { @@ -210,7 +214,7 @@ export default { :show-empty="true" :busy="loading" stacked="md" - :tbody-tr-class="$options.bodyTrClass" + :tbody-tr-class="tbodyTrClass" @row-clicked="navigateToAlertDetails" >