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
6777ad8b
Commit
6777ad8b
authored
Jul 29, 2020
by
Jiaan Louw
Committed by
Denys Mishunov
Jul 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply reviewer suggestions
Add a specific test for tabs and also match the tab title in the snapshot.
parent
2319c95e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
178 additions
and
128 deletions
+178
-128
ee/app/assets/javascripts/compliance_dashboard/components/dashboard.vue
...javascripts/compliance_dashboard/components/dashboard.vue
+55
-39
ee/changelogs/unreleased/220328-restructure-compliance-dashboard-to-use-tabs.yml
...d/220328-restructure-compliance-dashboard-to-use-tabs.yml
+5
-0
ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap
...dashboard/components/__snapshots__/dashboard_spec.js.snap
+107
-89
ee/spec/frontend/compliance_dashboard/components/dashboard_spec.js
...rontend/compliance_dashboard/components/dashboard_spec.js
+11
-0
No files found.
ee/app/assets/javascripts/compliance_dashboard/components/dashboard.vue
View file @
6777ad8b
<
script
>
<
script
>
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlT
abs
,
GlTab
,
GlT
ooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
isEmpty
}
from
'
lodash
'
;
import
{
isEmpty
}
from
'
lodash
'
;
import
{
sprintf
,
__
,
s__
}
from
'
~/locale
'
;
import
{
sprintf
,
__
,
s__
}
from
'
~/locale
'
;
...
@@ -26,6 +26,8 @@ export default {
...
@@ -26,6 +26,8 @@ export default {
MergeRequest
,
MergeRequest
,
Pagination
,
Pagination
,
PipelineStatus
,
PipelineStatus
,
GlTab
,
GlTabs
,
},
},
mixins
:
[
timeagoMixin
],
mixins
:
[
timeagoMixin
],
props
:
{
props
:
{
...
@@ -71,6 +73,7 @@ export default {
...
@@ -71,6 +73,7 @@ export default {
approvalStatusLabel
:
__
(
'
Approval Status
'
),
approvalStatusLabel
:
__
(
'
Approval Status
'
),
pipelineStatusLabel
:
__
(
'
Pipeline
'
),
pipelineStatusLabel
:
__
(
'
Pipeline
'
),
updatesLabel
:
__
(
'
Updates
'
),
updatesLabel
:
__
(
'
Updates
'
),
mergeRequestsTabLabel
:
__
(
'
Merge Requests
'
),
},
},
};
};
</
script
>
</
script
>
...
@@ -81,10 +84,21 @@ export default {
...
@@ -81,10 +84,21 @@ export default {
<h4>
{{
$options
.
strings
.
heading
}}
</h4>
<h4>
{{
$options
.
strings
.
heading
}}
</h4>
<p>
{{
$options
.
strings
.
subheading
}}
</p>
<p>
{{
$options
.
strings
.
subheading
}}
</p>
</header>
</header>
<gl-tabs>
<gl-tab>
<template
#title
>
<span>
{{
$options
.
strings
.
mergeRequestsTabLabel
}}
</span>
</
template
>
<div
class=
"dashboard-grid"
>
<div
class=
"dashboard-grid"
>
<grid-column-heading
:heading=
"$options.strings.mergeRequestLabel"
/>
<grid-column-heading
:heading=
"$options.strings.mergeRequestLabel"
/>
<grid-column-heading
:heading=
"$options.strings.approvalStatusLabel"
class=
"gl-text-center"
/>
<grid-column-heading
<grid-column-heading
:heading=
"$options.strings.pipelineStatusLabel"
class=
"gl-text-center"
/>
:heading=
"$options.strings.approvalStatusLabel"
class=
"gl-text-center"
/>
<grid-column-heading
:heading=
"$options.strings.pipelineStatusLabel"
class=
"gl-text-center"
/>
<grid-column-heading
:heading=
"$options.strings.updatesLabel"
class=
"gl-text-right"
/>
<grid-column-heading
:heading=
"$options.strings.updatesLabel"
class=
"gl-text-right"
/>
<
template
v-for=
"mergeRequest in mergeRequests"
>
<
template
v-for=
"mergeRequest in mergeRequests"
>
...
@@ -123,6 +137,8 @@ export default {
...
@@ -123,6 +137,8 @@ export default {
</
template
>
</
template
>
</div>
</div>
<pagination
:is-last-page=
"isLastPage"
/>
<pagination
:is-last-page=
"isLastPage"
/>
</gl-tab>
</gl-tabs>
</div>
</div>
<empty-state
v-else
:image-path=
"emptyStateSvgPath"
/>
<empty-state
v-else
:image-path=
"emptyStateSvgPath"
/>
</template>
</template>
ee/changelogs/unreleased/220328-restructure-compliance-dashboard-to-use-tabs.yml
0 → 100644
View file @
6777ad8b
---
title
:
Update Compliance Dashboard to use tabs
merge_request
:
37959
author
:
type
:
changed
ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap
View file @
6777ad8b
...
@@ -16,6 +16,16 @@ exports[`ComplianceDashboard component when there are merge requests matches the
...
@@ -16,6 +16,16 @@ exports[`ComplianceDashboard component when there are merge requests matches the
</p>
</p>
</header>
</header>
<gl-tabs-stub
theme="indigo"
>
<b-tab-stub
tag="div"
title=""
titlelinkclass="gl-tab-nav-item"
>
<template>
<div
<div
class="dashboard-grid"
class="dashboard-grid"
>
>
...
@@ -107,6 +117,14 @@ exports[`ComplianceDashboard component when there are merge requests matches the
...
@@ -107,6 +117,14 @@ exports[`ComplianceDashboard component when there are merge requests matches the
</div>
</div>
<pagination-stub />
<pagination-stub />
</template>
<template>
<span>
Merge Requests
</span>
</template>
</b-tab-stub>
</gl-tabs-stub>
</div>
</div>
`;
`;
...
...
ee/spec/frontend/compliance_dashboard/components/dashboard_spec.js
View file @
6777ad8b
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlTabs
,
GlTab
}
from
'
@gitlab/ui
'
;
import
ComplianceDashboard
from
'
ee/compliance_dashboard/components/dashboard.vue
'
;
import
ComplianceDashboard
from
'
ee/compliance_dashboard/components/dashboard.vue
'
;
import
ApprovalStatus
from
'
ee/compliance_dashboard/components/approval_status.vue
'
;
import
ApprovalStatus
from
'
ee/compliance_dashboard/components/approval_status.vue
'
;
...
@@ -14,6 +15,7 @@ describe('ComplianceDashboard component', () => {
...
@@ -14,6 +15,7 @@ describe('ComplianceDashboard component', () => {
const
findApprovalStatus
=
()
=>
wrapper
.
find
(
ApprovalStatus
);
const
findApprovalStatus
=
()
=>
wrapper
.
find
(
ApprovalStatus
);
const
findPipelineStatus
=
()
=>
wrapper
.
find
(
PipelineStatus
);
const
findPipelineStatus
=
()
=>
wrapper
.
find
(
PipelineStatus
);
const
findApprovers
=
()
=>
wrapper
.
find
(
Approvers
);
const
findApprovers
=
()
=>
wrapper
.
find
(
Approvers
);
const
findDashboardTabs
=
()
=>
wrapper
.
find
(
GlTabs
);
const
createComponent
=
(
props
=
{},
options
=
{})
=>
{
const
createComponent
=
(
props
=
{},
options
=
{})
=>
{
return
shallowMount
(
ComplianceDashboard
,
{
return
shallowMount
(
ComplianceDashboard
,
{
...
@@ -24,6 +26,7 @@ describe('ComplianceDashboard component', () => {
...
@@ -24,6 +26,7 @@ describe('ComplianceDashboard component', () => {
...
props
,
...
props
,
},
},
stubs
:
{
stubs
:
{
GlTab
,
MergeRequest
:
{
MergeRequest
:
{
props
:
{
mergeRequest
:
Object
},
props
:
{
mergeRequest
:
Object
},
template
:
`<div data-testid="merge-request">{{ mergeRequest.title }}</div>`
,
template
:
`<div data-testid="merge-request">{{ mergeRequest.title }}</div>`
,
...
@@ -49,6 +52,10 @@ describe('ComplianceDashboard component', () => {
...
@@ -49,6 +52,10 @@ describe('ComplianceDashboard component', () => {
expect
(
findMergeRequests
().
length
).
toEqual
(
2
);
expect
(
findMergeRequests
().
length
).
toEqual
(
2
);
});
});
it
(
'
renders the dashboard tabs
'
,
()
=>
{
expect
(
findDashboardTabs
().
exists
()).
toEqual
(
true
);
});
describe
(
'
approval status
'
,
()
=>
{
describe
(
'
approval status
'
,
()
=>
{
it
(
'
does not render if there is no approval status
'
,
()
=>
{
it
(
'
does not render if there is no approval status
'
,
()
=>
{
expect
(
findApprovalStatus
().
exists
()).
toBe
(
false
);
expect
(
findApprovalStatus
().
exists
()).
toBe
(
false
);
...
@@ -92,5 +99,9 @@ describe('ComplianceDashboard component', () => {
...
@@ -92,5 +99,9 @@ describe('ComplianceDashboard component', () => {
it
(
'
does not render merge requests
'
,
()
=>
{
it
(
'
does not render merge requests
'
,
()
=>
{
expect
(
findMergeRequests
().
exists
()).
toEqual
(
false
);
expect
(
findMergeRequests
().
exists
()).
toEqual
(
false
);
});
});
it
(
'
does not render the dashboard tabs
'
,
()
=>
{
expect
(
findDashboardTabs
().
exists
()).
toEqual
(
false
);
});
});
});
});
});
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