Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
707f8746
Commit
707f8746
authored
Feb 15, 2021
by
Dheeraj Joshi
Committed by
Kushal Pandya
Feb 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add copy enhancements for On-demandScans
* Adds tooltip for more actions * Update copy for empty profiles list
parent
05e48297
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
4 deletions
+25
-4
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue
..._configuration/dast_profiles/components/dast_profiles.vue
+1
-0
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles_list.vue
...iguration/dast_profiles/components/dast_profiles_list.vue
+8
-1
ee/app/assets/javascripts/security_configuration/dast_profiles/settings/profiles.js
...security_configuration/dast_profiles/settings/profiles.js
+3
-0
ee/app/presenters/projects/security/configuration_presenter.rb
...p/presenters/projects/security/configuration_presenter.rb
+1
-1
ee/spec/frontend/security_configuration/dast_profiles/components/dast_profiles_list_spec.js
...ation/dast_profiles/components/dast_profiles_list_spec.js
+1
-0
ee/spec/frontend/security_configuration/dast_profiles/components/dast_saved_scans_list_spec.js
...on/dast_profiles/components/dast_saved_scans_list_spec.js
+1
-0
ee/spec/frontend/security_configuration/dast_profiles/components/dast_scanner_profiles_list_spec.js
...st_profiles/components/dast_scanner_profiles_list_spec.js
+1
-0
ee/spec/frontend/security_configuration/dast_profiles/components/dast_site_profiles_list_spec.js
.../dast_profiles/components/dast_site_profiles_list_spec.js
+1
-0
locale/gitlab.pot
locale/gitlab.pot
+8
-2
No files found.
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue
View file @
707f8746
...
@@ -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"
...
...
ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles_list.vue
View file @
707f8746
...
@@ -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
...
...
ee/app/assets/javascripts/security_configuration/dast_profiles/settings/profiles.js
View file @
707f8746
...
@@ -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
'
),
},
},
},
},
});
});
ee/app/presenters/projects/security/configuration_presenter.rb
View file @
707f8746
...
@@ -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
Profile
s'
),
dast_profiles:
_
(
'DAST
Scan
s'
),
dependency_scanning:
_
(
'Dependency Scanning'
),
dependency_scanning:
_
(
'Dependency Scanning'
),
license_management:
'License Management'
,
license_management:
'License Management'
,
license_scanning:
_
(
'License Compliance'
),
license_scanning:
_
(
'License Compliance'
),
...
...
ee/spec/frontend/security_configuration/dast_profiles/components/dast_profiles_list_spec.js
View file @
707f8746
...
@@ -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
:
''
,
...
...
ee/spec/frontend/security_configuration/dast_profiles/components/dast_saved_scans_list_spec.js
View file @
707f8746
...
@@ -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
,
...
...
ee/spec/frontend/security_configuration/dast_profiles/components/dast_scanner_profiles_list_spec.js
View file @
707f8746
...
@@ -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
,
...
...
ee/spec/frontend/security_configuration/dast_profiles/components/dast_site_profiles_list_spec.js
View file @
707f8746
...
@@ -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
'
,
...
...
locale/gitlab.pot
View file @
707f8746
...
@@ -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
Profile
s"
msgid "DAST
Scan
s"
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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment