Merge branch 'djadmin-dast-scans-copy' into 'master'

Update DAST scans copy and add tooltip

See merge request gitlab-org/gitlab!54194

ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue

@@ -260,6 +260,7 @@ export default {
           :data-testid="`${profileType}List`"
           :error-message="profileTypes[profileType].errorMessage"
           :error-details="profileTypes[profileType].errorDetails"
+          :no-profiles-message="settings.i18n.noProfilesMessage"
           :has-more-profiles-to-load="hasMoreProfiles(profileType)"
           :is-loading="isLoadingProfiles(profileType)"
           :profiles-per-page="$options.profilesPerPage"

ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles_list.vue

@@ -50,6 +50,11 @@ export default {
       required: false,
       default: () => [],
     },
+    noProfilesMessage: {
+      type: String,
+      required: false,
+      default: '',
+    },
     isLoading: {
       type: Boolean,
       required: false,
@@ -171,11 +176,13 @@ export default {
             <slot name="actions" :profile="item"></slot>
 
             <gl-dropdown
+              v-gl-tooltip
               class="gl-display-none gl-md-display-inline-flex!"
               toggle-class="gl-border-0! gl-shadow-none!"
               no-caret
               right
               category="tertiary"
+              :title="__('More actions')"
             >
               <template #button-content>
                 <gl-icon name="ellipsis_v" />
@@ -242,7 +249,7 @@ export default {
     </div>
 
     <p v-else class="gl-my-4">
-      {{ s__('DastProfiles|No profiles created yet') }}
+      {{ noProfilesMessage }}
     </p>
 
     <gl-modal

ee/app/assets/javascripts/security_configuration/dast_profiles/settings/profiles.js

@@ -53,6 +53,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab
               ),
               deletionBackendError: s__('DastProfiles|Could not delete saved scans:'),
             },
+            noProfilesMessage: s__('DastProfiles|No scans saved yet'),
           },
         },
       }
@@ -88,6 +89,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab
         ),
         deletionBackendError: s__('DastProfiles|Could not delete site profiles:'),
       },
+      noProfilesMessage: s__('DastProfiles|No site profiles created yet'),
     },
   },
   scannerProfiles: {
@@ -120,6 +122,7 @@ export const getProfileSettings = ({ createNewProfilePaths, isDastSavedScansEnab
         ),
         deletionBackendError: s__('DastProfiles|Could not delete scanner profiles:'),
       },
+      noProfilesMessage: s__('DastProfiles|No scanner profiles created yet'),
     },
   },
 });

ee/app/presenters/projects/security/configuration_presenter.rb

@@ -41,7 +41,7 @@ module Projects
         {
           container_scanning: _('Container Scanning'),
           dast: _('Dynamic Application Security Testing (DAST)'),
-          dast_profiles: _('DAST Profiles'),
+          dast_profiles: _('DAST Scans'),
           dependency_scanning: _('Dependency Scanning'),
           license_management: 'License Management',
           license_scanning: _('License Compliance'),

ee/spec/frontend/security_configuration/dast_profiles/components/dast_profiles_list_spec.js

@@ -16,6 +16,7 @@ describe('EE - DastProfilesList', () => {
       profiles: [],
       tableLabel: 'Profiles Table',
       fields: [{ key: 'profileName' }, { key: 'targetUrl' }, { key: 'validationStatus' }],
+      noProfilesMessage: 'no profiles created yet',
       hasMorePages: false,
       profilesPerPage: 10,
       errorMessage: '',

ee/spec/frontend/security_configuration/dast_profiles/components/dast_saved_scans_list_spec.js

@@ -26,6 +26,7 @@ describe('EE - DastSavedScansList', () => {
     profilesPerPage: 10,
     errorMessage: '',
     errorDetails: [],
+    noProfilesMessage: 'No scans saved yet',
     fullPath: '/namespace/project',
     hasMoreProfilesToLoad: false,
     isLoading: false,

ee/spec/frontend/security_configuration/dast_profiles/components/dast_scanner_profiles_list_spec.js

@@ -13,6 +13,7 @@ describe('EE - DastScannerProfileList', () => {
     fields: [{ key: 'profileName' }, { key: 'scanType' }],
     profilesPerPage: 10,
     errorMessage: '',
+    noProfilesMessage: 'no scanner profiles created yet',
     errorDetails: [],
     fullPath: '/namespace/project',
     hasMoreProfilesToLoad: false,

ee/spec/frontend/security_configuration/dast_profiles/components/dast_site_profiles_list_spec.js

@@ -30,6 +30,7 @@ describe('EE - DastSiteProfileList', () => {
     tableLabel: 'Site profiles',
     fields: [{ key: 'profileName' }, { key: 'targetUrl' }, { key: 'validationStatus' }],
     profilesPerPage: 10,
+    noProfilesMessage: 'no site profiles created yet',
     errorMessage: '',
     errorDetails: [],
     fullPath: '/namespace/project',

locale/gitlab.pot

@@ -9059,7 +9059,7 @@ msgstr ""
 msgid "DAG visualization requires at least 3 dependent jobs."
 msgstr ""
 
-msgid "DAST Profiles"
+msgid "DAST Scans"
 msgstr ""
 
 msgid "DNS"
@@ -9215,7 +9215,13 @@ msgstr ""
 msgid "DastProfiles|New site profile"
 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 ""
 
 msgid "DastProfiles|Not Validated"