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
33eb6de8
Commit
33eb6de8
authored
Jun 24, 2020
by
Adam Alvis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renamed dashboard empty state to dashboard_not_configured
parent
759ad2d9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
ee/app/assets/javascripts/security_dashboard/components/empty_states/dashboard_not_configured.vue
...oard/components/empty_states/dashboard_not_configured.vue
+0
-0
ee/app/assets/javascripts/security_dashboard/components/first_class_instance_security_dashboard.vue
...rd/components/first_class_instance_security_dashboard.vue
+3
-3
ee/spec/frontend/security_dashboard/components/empty_states/dashboard_not_configured_spec.js
.../components/empty_states/dashboard_not_configured_spec.js
+2
-2
ee/spec/frontend/security_dashboard/components/first_class_instance_security_dashboard_spec.js
...omponents/first_class_instance_security_dashboard_spec.js
+3
-3
No files found.
ee/app/assets/javascripts/security_dashboard/components/empty_states/
first_class_instance_security_dashboar
d.vue
→
ee/app/assets/javascripts/security_dashboard/components/empty_states/
dashboard_not_configure
d.vue
View file @
33eb6de8
File moved
ee/app/assets/javascripts/security_dashboard/components/first_class_instance_security_dashboard.vue
View file @
33eb6de8
...
...
@@ -11,7 +11,7 @@ import projectsQuery from 'ee/security_dashboard/graphql/get_instance_security_d
import
ProjectManager
from
'
./first_class_project_manager/project_manager.vue
'
;
import
CsvExportButton
from
'
./csv_export_button.vue
'
;
import
vulnerabilityHistoryQuery
from
'
../graphql/instance_vulnerability_history.graphql
'
;
import
EmptyState
from
'
./empty_states/first_class_instance_security_dashboar
d.vue
'
;
import
DashboardNotConfigured
from
'
./empty_states/dashboard_not_configure
d.vue
'
;
export
default
{
components
:
{
...
...
@@ -24,7 +24,7 @@ export default {
Filters
,
GlLoadingIcon
,
GlButton
,
EmptyState
,
DashboardNotConfigured
,
},
props
:
{
dashboardDocumentation
:
{
...
...
@@ -129,7 +129,7 @@ export default {
:filters=
"filters"
/>
<div
v-else-if=
"shouldShowEmptyState"
>
<
empty-state
<
dashboard-not-configured
:svg-path=
"emptyStateSvgPath"
:dashboard-documentation=
"dashboardDocumentation"
@
handleAddProjectsClick=
"toggleProjectSelector"
...
...
ee/spec/frontend/security_dashboard/components/empty_states/
first_class_instance_security_dashboar
d_spec.js
→
ee/spec/frontend/security_dashboard/components/empty_states/
dashboard_not_configure
d_spec.js
View file @
33eb6de8
import
{
mount
}
from
'
@vue/test-utils
'
;
import
{
GlEmptyState
,
GlButton
,
GlLink
}
from
'
@gitlab/ui
'
;
import
EmptyState
from
'
ee/security_dashboard/components/empty_states/first_class_instance_security_dashboar
d.vue
'
;
import
DashboardNotConfigured
from
'
ee/security_dashboard/components/empty_states/dashboard_not_configure
d.vue
'
;
describe
(
'
first class instance security dashboard empty state
'
,
()
=>
{
let
wrapper
;
...
...
@@ -8,7 +8,7 @@ describe('first class instance security dashboard empty state', () => {
const
svgPath
=
'
/placeholder.svg
'
;
const
createWrapper
=
()
=>
mount
(
EmptyState
,
{
mount
(
DashboardNotConfigured
,
{
propsData
:
{
svgPath
,
dashboardDocumentation
},
});
const
findGlEmptyState
=
()
=>
wrapper
.
find
(
GlEmptyState
);
...
...
ee/spec/frontend/security_dashboard/components/first_class_instance_security_dashboard_spec.js
View file @
33eb6de8
...
...
@@ -8,7 +8,7 @@ import VulnerabilityChart from 'ee/security_dashboard/components/first_class_vul
import
CsvExportButton
from
'
ee/security_dashboard/components/csv_export_button.vue
'
;
import
Filters
from
'
ee/security_dashboard/components/first_class_vulnerability_filters.vue
'
;
import
ProjectManager
from
'
ee/security_dashboard/components/first_class_project_manager/project_manager.vue
'
;
import
EmptyState
from
'
ee/security_dashboard/components/empty_states/first_class_instance_security_dashboar
d.vue
'
;
import
DashboardNotConfigured
from
'
ee/security_dashboard/components/empty_states/dashboard_not_configure
d.vue
'
;
describe
(
'
First Class Instance Dashboard Component
'
,
()
=>
{
let
wrapper
;
...
...
@@ -25,7 +25,7 @@ describe('First Class Instance Dashboard Component', () => {
const
findVulnerabilityChart
=
()
=>
wrapper
.
find
(
VulnerabilityChart
);
const
findCsvExportButton
=
()
=>
wrapper
.
find
(
CsvExportButton
);
const
findProjectManager
=
()
=>
wrapper
.
find
(
ProjectManager
);
const
findEmptyState
=
()
=>
wrapper
.
find
(
EmptyState
);
const
findEmptyState
=
()
=>
wrapper
.
find
(
DashboardNotConfigured
);
const
findFilters
=
()
=>
wrapper
.
find
(
Filters
);
const
createWrapper
=
({
data
=
{},
stubs
})
=>
{
...
...
@@ -103,7 +103,7 @@ describe('First Class Instance Dashboard Component', () => {
data
:
{
isManipulatingProjects
:
false
,
stubs
:
{
EmptyState
,
DashboardNotConfigured
,
GlButton
,
},
},
...
...
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