Commit 707f8746 authored by Dheeraj Joshi's avatar Dheeraj Joshi Committed by Kushal Pandya

Add copy enhancements for On-demandScans

  * Adds tooltip for more actions
  * Update copy for empty profiles list
parent 05e48297
...@@ -260,6 +260,7 @@ export default { ...@@ -260,6 +260,7 @@ export default {
:data-testid="`${profileType}List`" :data-testid="`${profileType}List`"
:error-message="profileTypes[profileType].errorMessage" :error-message="profileTypes[profileType].errorMessage"
:error-details="profileTypes[profileType].errorDetails" :error-details="profileTypes[profileType].errorDetails"
:no-profiles-message="settings.i18n.noProfilesMessage"
:has-more-profiles-to-load="hasMoreProfiles(profileType)" :has-more-profiles-to-load="hasMoreProfiles(profileType)"
:is-loading="isLoadingProfiles(profileType)" :is-loading="isLoadingProfiles(profileType)"
:profiles-per-page="$options.profilesPerPage" :profiles-per-page="$options.profilesPerPage"
......
...@@ -50,6 +50,11 @@ export default { ...@@ -50,6 +50,11 @@ export default {
required: false, required: false,
default: () => [], default: () => [],
}, },
noProfilesMessage: {
type: String,
required: false,
default: '',
},
isLoading: { isLoading: {
type: Boolean, type: Boolean,
required: false, required: false,
...@@ -171,11 +176,13 @@ export default { ...@@ -171,11 +176,13 @@ export default {
<slot name="actions" :profile="item"></slot> <slot name="actions" :profile="item"></slot>
<gl-dropdown <gl-dropdown
v-gl-tooltip
class="gl-display-none gl-md-display-inline-flex!" class="gl-display-none gl-md-display-inline-flex!"
toggle-class="gl-border-0! gl-shadow-none!" toggle-class="gl-border-0! gl-shadow-none!"
no-caret no-caret
right right
category="tertiary" category="tertiary"
:title="__('More actions')"
> >
<template #button-content> <template #button-content>
<gl-icon name="ellipsis_v" /> <gl-icon name="ellipsis_v" />
...@@ -242,7 +249,7 @@ export default { ...@@ -242,7 +249,7 @@ export default {
</div> </div>
<p v-else class="gl-my-4"> <p v-else class="gl-my-4">
{{ s__('DastProfiles|No profiles created yet') }} {{ noProfilesMessage }}
</p> </p>
<gl-modal <gl-modal
......
...@@ -53,6 +53,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab ...@@ -53,6 +53,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab
), ),
deletionBackendError: s__('DastProfiles|Could not delete saved scans:'), deletionBackendError: s__('DastProfiles|Could not delete saved scans:'),
}, },
noProfilesMessage: s__('DastProfiles|No scans saved yet'),
}, },
}, },
} }
...@@ -88,6 +89,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab ...@@ -88,6 +89,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab
), ),
deletionBackendError: s__('DastProfiles|Could not delete site profiles:'), deletionBackendError: s__('DastProfiles|Could not delete site profiles:'),
}, },
noProfilesMessage: s__('DastProfiles|No site profiles created yet'),
}, },
}, },
scannerProfiles: { scannerProfiles: {
...@@ -120,6 +122,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab ...@@ -120,6 +122,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab
), ),
deletionBackendError: s__('DastProfiles|Could not delete scanner profiles:'), deletionBackendError: s__('DastProfiles|Could not delete scanner profiles:'),
}, },
noProfilesMessage: s__('DastProfiles|No scanner profiles created yet'),
}, },
}, },
}); });
...@@ -41,7 +41,7 @@ module Projects ...@@ -41,7 +41,7 @@ module Projects
{ {
container_scanning: _('Container Scanning'), container_scanning: _('Container Scanning'),
dast: _('Dynamic Application Security Testing (DAST)'), dast: _('Dynamic Application Security Testing (DAST)'),
dast_profiles: _('DAST Profiles'), dast_profiles: _('DAST Scans'),
dependency_scanning: _('Dependency Scanning'), dependency_scanning: _('Dependency Scanning'),
license_management: 'License Management', license_management: 'License Management',
license_scanning: _('License Compliance'), license_scanning: _('License Compliance'),
......
...@@ -16,6 +16,7 @@ describe('EE - DastProfilesList', () => { ...@@ -16,6 +16,7 @@ describe('EE - DastProfilesList', () => {
profiles: [], profiles: [],
tableLabel: 'Profiles Table', tableLabel: 'Profiles Table',
fields: [{ key: 'profileName' }, { key: 'targetUrl' }, { key: 'validationStatus' }], fields: [{ key: 'profileName' }, { key: 'targetUrl' }, { key: 'validationStatus' }],
noProfilesMessage: 'no profiles created yet',
hasMorePages: false, hasMorePages: false,
profilesPerPage: 10, profilesPerPage: 10,
errorMessage: '', errorMessage: '',
......
...@@ -26,6 +26,7 @@ describe('EE - DastSavedScansList', () => { ...@@ -26,6 +26,7 @@ describe('EE - DastSavedScansList', () => {
profilesPerPage: 10, profilesPerPage: 10,
errorMessage: '', errorMessage: '',
errorDetails: [], errorDetails: [],
noProfilesMessage: 'No scans saved yet',
fullPath: '/namespace/project', fullPath: '/namespace/project',
hasMoreProfilesToLoad: false, hasMoreProfilesToLoad: false,
isLoading: false, isLoading: false,
......
...@@ -13,6 +13,7 @@ describe('EE - DastScannerProfileList', () => { ...@@ -13,6 +13,7 @@ describe('EE - DastScannerProfileList', () => {
fields: [{ key: 'profileName' }, { key: 'scanType' }], fields: [{ key: 'profileName' }, { key: 'scanType' }],
profilesPerPage: 10, profilesPerPage: 10,
errorMessage: '', errorMessage: '',
noProfilesMessage: 'no scanner profiles created yet',
errorDetails: [], errorDetails: [],
fullPath: '/namespace/project', fullPath: '/namespace/project',
hasMoreProfilesToLoad: false, hasMoreProfilesToLoad: false,
......
...@@ -30,6 +30,7 @@ describe('EE - DastSiteProfileList', () => { ...@@ -30,6 +30,7 @@ describe('EE - DastSiteProfileList', () => {
tableLabel: 'Site profiles', tableLabel: 'Site profiles',
fields: [{ key: 'profileName' }, { key: 'targetUrl' }, { key: 'validationStatus' }], fields: [{ key: 'profileName' }, { key: 'targetUrl' }, { key: 'validationStatus' }],
profilesPerPage: 10, profilesPerPage: 10,
noProfilesMessage: 'no site profiles created yet',
errorMessage: '', errorMessage: '',
errorDetails: [], errorDetails: [],
fullPath: '/namespace/project', fullPath: '/namespace/project',
......
...@@ -9059,7 +9059,7 @@ msgstr "" ...@@ -9059,7 +9059,7 @@ msgstr ""
msgid "DAG visualization requires at least 3 dependent jobs." msgid "DAG visualization requires at least 3 dependent jobs."
msgstr "" msgstr ""
msgid "DAST Profiles" msgid "DAST Scans"
msgstr "" msgstr ""
msgid "DNS" msgid "DNS"
...@@ -9215,7 +9215,13 @@ msgstr "" ...@@ -9215,7 +9215,13 @@ msgstr ""
msgid "DastProfiles|New site profile" msgid "DastProfiles|New site profile"
msgstr "" msgstr ""
msgid "DastProfiles|No profiles created yet" msgid "DastProfiles|No scanner profiles created yet"
msgstr ""
msgid "DastProfiles|No scans saved yet"
msgstr ""
msgid "DastProfiles|No site profiles created yet"
msgstr "" msgstr ""
msgid "DastProfiles|Not Validated" msgid "DastProfiles|Not Validated"
......
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