From 0a6cbd1364d1fe18c4a7e6fbac43d1b3f18fa035 Mon Sep 17 00:00:00 2001
From: Julia Miocene <jmiocene@gitlab.com>
Date: Mon, 26 Feb 2024 20:22:49 +0100
Subject: [PATCH 1/2] Update admin audit events empty state

---
 .../components/stream/stream_empty_state.vue          | 11 +----------
 ee/app/assets/javascripts/audit_events/constants.js   |  5 ++---
 ee/app/helpers/audit_events_helper.rb                 |  2 +-
 ee/app/views/groups/audit_events/index.html.haml      |  2 +-
 ee/spec/helpers/audit_events_helper_spec.rb           |  3 ++-
 locale/gitlab.pot                                     |  5 +----
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/ee/app/assets/javascripts/audit_events/components/stream/stream_empty_state.vue b/ee/app/assets/javascripts/audit_events/components/stream/stream_empty_state.vue
index d332852bafad65..00f63fb4349896 100644
--- a/ee/app/assets/javascripts/audit_events/components/stream/stream_empty_state.vue
+++ b/ee/app/assets/javascripts/audit_events/components/stream/stream_empty_state.vue
@@ -60,19 +60,10 @@ export default {
 <template>
   <gl-empty-state
     :title="$options.i18n.TITLE"
+    :description="$options.i18n.DESCRIPTION"
     :svg-path="emptyStateSvgPath"
-    :svg-height="72"
     class="gl-mt-5"
   >
-    <template #title>
-      <h3 class="h4 gl-font-size-h-display gl-line-height-36 gl-mt-n3">
-        {{ $options.i18n.TITLE }}
-      </h3>
-    </template>
-    <template #description>
-      <p>{{ $options.i18n.DESCRIPTION_1 }}</p>
-      <p>{{ $options.i18n.DESCRIPTION_2 }}</p>
-    </template>
     <template #actions>
       <gl-disclosure-dropdown
         :toggle-text="$options.i18n.ADD_STREAM"
diff --git a/ee/app/assets/javascripts/audit_events/constants.js b/ee/app/assets/javascripts/audit_events/constants.js
index 4224fc7b49fb77..a1c78839ae4f9b 100644
--- a/ee/app/assets/javascripts/audit_events/constants.js
+++ b/ee/app/assets/javascripts/audit_events/constants.js
@@ -158,10 +158,9 @@ export const ADD_STREAM_EDITOR_I18N = {
 
 export const AUDIT_STREAMS_EMPTY_STATE_I18N = {
   TITLE: s__('AuditStreams|Setup streaming for audit events'),
-  DESCRIPTION_1: s__(
-    'AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems.',
+  DESCRIPTION: s__(
+    'AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems. This is great for keeping everything one place.',
   ),
-  DESCRIPTION_2: s__('AuditStreams|This is great for keeping everything one place.'),
 };
 
 export const AUDIT_STREAMS_NETWORK_ERRORS = {
diff --git a/ee/app/helpers/audit_events_helper.rb b/ee/app/helpers/audit_events_helper.rb
index 9003f5190fb3b7..5b3028e1d08526 100644
--- a/ee/app/helpers/audit_events_helper.rb
+++ b/ee/app/helpers/audit_events_helper.rb
@@ -57,7 +57,7 @@ def audit_log_app_data(is_last_page, events, audit_event_definitions)
       export_url: export_url
     }.tap do |data|
       data.merge!({
-        empty_state_svg_path: image_path('illustrations/cloud.svg'),
+        empty_state_svg_path: image_path('illustrations/empty-state/empty-radar-md.svg'),
         group_path: 'instance',
         show_streams: License.feature_available?(:external_audit_events).to_s,
         audit_event_definitions: audit_event_definitions.to_json
diff --git a/ee/app/views/groups/audit_events/index.html.haml b/ee/app/views/groups/audit_events/index.html.haml
index 470ffb2ea23481..a8abc9a6c97482 100644
--- a/ee/app/views/groups/audit_events/index.html.haml
+++ b/ee/app/views/groups/audit_events/index.html.haml
@@ -10,7 +10,7 @@
   is_last_page: @is_last_page.to_json,
   group_path: @group.full_path,
   show_streams: show_streams_for_group?(@group).to_s,
-  empty_state_svg_path: image_path('illustrations/cloud.svg'),
+  empty_state_svg_path: image_path('illustrations/empty-state/empty-radar-md.svg'),
   filter_token_options: group_audit_event_tokens(@group.id).to_json,
   filter_token_values: filter_view_only_own_events_token_values(view_only).to_json,
   filter_view_only: view_only.to_s,
diff --git a/ee/spec/helpers/audit_events_helper_spec.rb b/ee/spec/helpers/audit_events_helper_spec.rb
index dad6388e1c0f7e..1128601c863be0 100644
--- a/ee/spec/helpers/audit_events_helper_spec.rb
+++ b/ee/spec/helpers/audit_events_helper_spec.rb
@@ -176,7 +176,8 @@ def setup_permission(model, permission, current_user, has_permission)
         [:is_last_page, "true"],
         [:filter_token_options, admin_audit_event_tokens.to_json],
         [:export_url, export_url],
-        [:empty_state_svg_path, ActionController::Base.helpers.image_path('illustrations/cloud.svg')],
+        [:empty_state_svg_path,
+          ActionController::Base.helpers.image_path('illustrations/empty-state/empty-radar-md.svg')],
         [:group_path, "instance"],
         [:show_streams, "true"],
         [:audit_event_definitions, audit_event_definitions.to_json]
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5ded2c35627ec5..dc1a50ae4741b5 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7015,7 +7015,7 @@ msgstr ""
 msgid "AuditStreams|Add a new secret access key"
 msgstr ""
 
-msgid "AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems."
+msgid "AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems. This is great for keeping everything one place."
 msgstr ""
 
 msgid "AuditStreams|Add another custom header"
@@ -7144,9 +7144,6 @@ msgstr ""
 msgid "AuditStreams|This could include sensitive information. Make sure you trust the destination endpoint."
 msgstr ""
 
-msgid "AuditStreams|This is great for keeping everything one place."
-msgstr ""
-
 msgid "AuditStreams|Use the AWS console to view the secret access key. To change the secret access key, replace it with a new secret access key."
 msgstr ""
 
-- 
GitLab


From f1e538c709261bbdb1e97f0515bf75ff4d9e9234 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 28 Feb 2024 00:07:42 +0000
Subject: [PATCH 2/2] Apply a typo fix to the l10n constants and the full .pot
 file

---
 ee/app/assets/javascripts/audit_events/constants.js | 2 +-
 locale/gitlab.pot                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ee/app/assets/javascripts/audit_events/constants.js b/ee/app/assets/javascripts/audit_events/constants.js
index a1c78839ae4f9b..0e25c39f8e6d19 100644
--- a/ee/app/assets/javascripts/audit_events/constants.js
+++ b/ee/app/assets/javascripts/audit_events/constants.js
@@ -159,7 +159,7 @@ export const ADD_STREAM_EDITOR_I18N = {
 export const AUDIT_STREAMS_EMPTY_STATE_I18N = {
   TITLE: s__('AuditStreams|Setup streaming for audit events'),
   DESCRIPTION: s__(
-    'AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems. This is great for keeping everything one place.',
+    'AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems. This is great for keeping everything in one place.',
   ),
 };
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index dc1a50ae4741b5..bd2b1f0fc105a6 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7015,7 +7015,7 @@ msgstr ""
 msgid "AuditStreams|Add a new secret access key"
 msgstr ""
 
-msgid "AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems. This is great for keeping everything one place."
+msgid "AuditStreams|Add an HTTP endpoint to manage audit logs in third-party systems. This is great for keeping everything in one place."
 msgstr ""
 
 msgid "AuditStreams|Add another custom header"
-- 
GitLab