Merge branch '354490-update-group-level-compliance-framework-settings' into 'master'

Update group-level compliance frameworks empty state

See merge request gitlab-org/gitlab!82492

ee/app/assets/javascripts/groups/settings/compliance_frameworks/components/list.vue

@@ -145,7 +145,7 @@ export default {
 };
 </script>
 <template>
-  <div :class="{ 'gl-border-t-1 gl-border-t-solid gl-border-t-gray-100': isEmpty }">
+  <div>
     <gl-alert
       v-if="alertMessage"
       class="gl-mt-5"

ee/app/assets/javascripts/groups/settings/compliance_frameworks/components/list_empty_state.vue

@@ -19,8 +19,8 @@ export default {
     },
   },
   i18n: {
-    heading: s__('ComplianceFrameworks|No compliance frameworks are configured'),
-    description: s__('ComplianceFrameworks|Configured compliance frameworks appear here.'),
+    heading: s__('ComplianceFrameworks|No compliance frameworks are set up yet'),
+    description: s__('ComplianceFrameworks|Frameworks that have been added will appear here.'),
     addButton: s__('ComplianceFrameworks|Add framework'),
   },
 };
@@ -28,13 +28,15 @@ export default {
 
 <template>
   <gl-empty-state
-    :title="$options.i18n.heading"
     :description="$options.i18n.description"
     :svg-path="imagePath"
     :primary-button-link="addFrameworkPath"
     :primary-button-text="$options.i18n.addButton"
     compact
-    :svg-height="110"
-    class="gl-mt-5"
-  />
+    :svg-height="100"
+  >
+    <template #title>
+      <h5 class="gl-mt-0">{{ $options.i18n.heading }}</h5>
+    </template>
+  </gl-empty-state>
 </template>

ee/spec/frontend/groups/settings/compliance_frameworks/components/list_empty_state_spec.js

@@ -25,13 +25,18 @@ describe('ListEmptyState', () => {
     createComponent();
 
     expect(findEmptyState().props()).toMatchObject({
-      title: 'No compliance frameworks are configured',
-      description: 'Configured compliance frameworks appear here.',
+      description: 'Frameworks that have been added will appear here.',
       svgPath: 'dir/image.svg',
       primaryButtonLink: 'group/framework/new',
       primaryButtonText: 'Add framework',
-      svgHeight: 110,
+      svgHeight: 100,
       compact: true,
     });
   });
+
+  it('displays the correct title', () => {
+    createComponent();
+
+    expect(findEmptyState().find('h5').text()).toBe('No compliance frameworks are set up yet');
+  });
 });

locale/gitlab.pot

@@ -9050,9 +9050,6 @@ msgstr ""
 msgid "ComplianceFrameworks|Configuration not found"
 msgstr ""
 
-msgid "ComplianceFrameworks|Configured compliance frameworks appear here."
-msgstr ""
-
 msgid "ComplianceFrameworks|Delete compliance framework %{framework}"
 msgstr ""
 
@@ -9077,6 +9074,9 @@ msgstr ""
 msgid "ComplianceFrameworks|Error fetching compliance frameworks data. Please refresh the page or try a different framework"
 msgstr ""
 
+msgid "ComplianceFrameworks|Frameworks that have been added will appear here."
+msgstr ""
+
 msgid "ComplianceFrameworks|Invalid format"
 msgstr ""
 
@@ -9086,7 +9086,7 @@ msgstr ""
 msgid "ComplianceFrameworks|Name is required"
 msgstr ""
 
-msgid "ComplianceFrameworks|No compliance frameworks are configured"
+msgid "ComplianceFrameworks|No compliance frameworks are set up yet"
 msgstr ""
 
 msgid "ComplianceFrameworks|Required format: %{codeStart}path/file.y[a]ml@group-name/project-name%{codeEnd}. %{linkStart}Learn more.%{linkEnd}"