Commit 7f68de06 authored by Jiaan Louw's avatar Jiaan Louw Committed by Kushal Pandya

Update group-level compliance framework to match project settings

Update the group-level compliance framework setting empty state
to match the project-level compliance framework setting.

Changelog: changed
EE: true
parent c39c275b
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div :class="{ 'gl-border-t-1 gl-border-t-solid gl-border-t-gray-100': isEmpty }"> <div>
<gl-alert <gl-alert
v-if="alertMessage" v-if="alertMessage"
class="gl-mt-5" class="gl-mt-5"
......
...@@ -19,8 +19,8 @@ export default { ...@@ -19,8 +19,8 @@ export default {
}, },
}, },
i18n: { i18n: {
heading: s__('ComplianceFrameworks|No compliance frameworks are configured'), heading: s__('ComplianceFrameworks|No compliance frameworks are set up yet'),
description: s__('ComplianceFrameworks|Configured compliance frameworks appear here.'), description: s__('ComplianceFrameworks|Frameworks that have been added will appear here.'),
addButton: s__('ComplianceFrameworks|Add framework'), addButton: s__('ComplianceFrameworks|Add framework'),
}, },
}; };
...@@ -28,13 +28,15 @@ export default { ...@@ -28,13 +28,15 @@ export default {
<template> <template>
<gl-empty-state <gl-empty-state
:title="$options.i18n.heading"
:description="$options.i18n.description" :description="$options.i18n.description"
:svg-path="imagePath" :svg-path="imagePath"
:primary-button-link="addFrameworkPath" :primary-button-link="addFrameworkPath"
:primary-button-text="$options.i18n.addButton" :primary-button-text="$options.i18n.addButton"
compact compact
:svg-height="110" :svg-height="100"
class="gl-mt-5" >
/> <template #title>
<h5 class="gl-mt-0">{{ $options.i18n.heading }}</h5>
</template>
</gl-empty-state>
</template> </template>
...@@ -25,13 +25,18 @@ describe('ListEmptyState', () => { ...@@ -25,13 +25,18 @@ describe('ListEmptyState', () => {
createComponent(); createComponent();
expect(findEmptyState().props()).toMatchObject({ expect(findEmptyState().props()).toMatchObject({
title: 'No compliance frameworks are configured', description: 'Frameworks that have been added will appear here.',
description: 'Configured compliance frameworks appear here.',
svgPath: 'dir/image.svg', svgPath: 'dir/image.svg',
primaryButtonLink: 'group/framework/new', primaryButtonLink: 'group/framework/new',
primaryButtonText: 'Add framework', primaryButtonText: 'Add framework',
svgHeight: 110, svgHeight: 100,
compact: true, compact: true,
}); });
}); });
it('displays the correct title', () => {
createComponent();
expect(findEmptyState().find('h5').text()).toBe('No compliance frameworks are set up yet');
});
}); });
...@@ -9050,9 +9050,6 @@ msgstr "" ...@@ -9050,9 +9050,6 @@ msgstr ""
msgid "ComplianceFrameworks|Configuration not found" msgid "ComplianceFrameworks|Configuration not found"
msgstr "" msgstr ""
msgid "ComplianceFrameworks|Configured compliance frameworks appear here."
msgstr ""
msgid "ComplianceFrameworks|Delete compliance framework %{framework}" msgid "ComplianceFrameworks|Delete compliance framework %{framework}"
msgstr "" msgstr ""
...@@ -9077,6 +9074,9 @@ msgstr "" ...@@ -9077,6 +9074,9 @@ msgstr ""
msgid "ComplianceFrameworks|Error fetching compliance frameworks data. Please refresh the page or try a different framework" msgid "ComplianceFrameworks|Error fetching compliance frameworks data. Please refresh the page or try a different framework"
msgstr "" msgstr ""
msgid "ComplianceFrameworks|Frameworks that have been added will appear here."
msgstr ""
msgid "ComplianceFrameworks|Invalid format" msgid "ComplianceFrameworks|Invalid format"
msgstr "" msgstr ""
...@@ -9086,7 +9086,7 @@ msgstr "" ...@@ -9086,7 +9086,7 @@ msgstr ""
msgid "ComplianceFrameworks|Name is required" msgid "ComplianceFrameworks|Name is required"
msgstr "" msgstr ""
msgid "ComplianceFrameworks|No compliance frameworks are configured" msgid "ComplianceFrameworks|No compliance frameworks are set up yet"
msgstr "" msgstr ""
msgid "ComplianceFrameworks|Required format: %{codeStart}path/file.y[a]ml@group-name/project-name%{codeEnd}. %{linkStart}Learn more.%{linkEnd}" msgid "ComplianceFrameworks|Required format: %{codeStart}path/file.y[a]ml@group-name/project-name%{codeEnd}. %{linkStart}Learn more.%{linkEnd}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment