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
acc25ab8
Commit
acc25ab8
authored
Nov 12, 2020
by
Michael Le
Committed by
Kushal Pandya
Nov 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use closed icons for issue and epics
parent
3f68c499
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
7 deletions
+31
-7
ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue
...ascripts/related_items_tree/components/tree_item_body.vue
+4
-1
ee/app/assets/stylesheets/components/related_items_tree.scss
ee/app/assets/stylesheets/components/related_items_tree.scss
+1
-1
ee/changelogs/unreleased/218477-update-epic-issue-closed-icons.yml
...logs/unreleased/218477-update-epic-issue-closed-icons.yml
+5
-0
ee/spec/frontend/related_items_tree/components/tree_item_body_spec.js
...tend/related_items_tree/components/tree_item_body_spec.js
+21
-5
No files found.
ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue
View file @
acc25ab8
...
...
@@ -80,7 +80,10 @@ export default {
return
this
.
isOpen
?
__
(
'
Opened
'
)
:
__
(
'
Closed
'
);
},
stateIconName
()
{
return
this
.
item
.
type
===
ChildType
.
Epic
?
'
epic
'
:
'
issues
'
;
if
(
this
.
item
.
type
===
ChildType
.
Epic
)
{
return
this
.
isOpen
?
'
epic
'
:
'
epic-closed
'
;
}
return
this
.
isOpen
?
'
issues
'
:
'
issue-closed
'
;
},
stateIconClass
()
{
return
this
.
isOpen
...
...
ee/app/assets/stylesheets/components/related_items_tree.scss
View file @
acc25ab8
...
...
@@ -30,7 +30,7 @@
}
&
.item-closed
{
background-color
:
$
gray-10
;
background-color
:
$
white
;
}
}
...
...
ee/changelogs/unreleased/218477-update-epic-issue-closed-icons.yml
0 → 100644
View file @
acc25ab8
---
title
:
Use closed icons for issues and epics when closed
merge_request
:
47176
author
:
type
:
changed
ee/spec/frontend/related_items_tree/components/tree_item_body_spec.js
View file @
acc25ab8
...
...
@@ -242,10 +242,10 @@ describe('RelatedItemsTree', () => {
});
describe
.
each
`
createItem | itemType | isEpic
| stateIconName
${
createEpicItem
}
|
${
'
epic
'
}
|
${
true
}
|
${
'
epic
'
}
${
createIssueItem
}
|
${
'
issue
'
}
|
${
false
}
|
${
'
issues
'
}
`
(
`when dependent on item type`
,
({
createItem
,
isEpic
,
stateIconName
,
itemType
})
=>
{
createItem | itemType | isEpic
${
createEpicItem
}
|
${
'
epic
'
}
|
${
true
}
${
createIssueItem
}
|
${
'
issue
'
}
|
${
false
}
`
(
`when dependent on item type`
,
({
createItem
,
isEpic
,
itemType
})
=>
{
beforeEach
(()
=>
{
mockItem
=
createItem
();
wrapper
=
createComponent
();
...
...
@@ -256,9 +256,25 @@ describe('RelatedItemsTree', () => {
expect
(
wrapper
.
vm
.
isEpic
).
toBe
(
isEpic
);
});
});
});
describe
.
each
`
createItem | testDesc | stateIconName
${
createEpicItem
(
mockOpenEpic
)}
|
${
'
epic is `open`
'
}
|
${
'
epic
'
}
${
createEpicItem
(
mockClosedEpic
)}
|
${
'
epic is `closed`
'
}
|
${
'
epic-closed
'
}
${
createIssueItem
(
mockIssue1
)}
|
${
'
issue is `open`
'
}
|
${
'
issues
'
}
${
createIssueItem
(
mockClosedIssue
)}
|
${
'
issue is `closed`
'
}
|
${
'
issue-closed
'
}
`
(
`when dependent on item type and state`
,
({
createItem
,
testDesc
,
stateIconName
})
=>
{
beforeEach
(()
=>
{
mockItem
=
createItem
;
});
describe
(
'
stateIconName
'
,
()
=>
{
it
(
`returns string
${
stateIconName
}
`
,
async
()
=>
{
it
(
`returns string \`
${
stateIconName
}
\` when
${
testDesc
}
`
,
async
()
=>
{
wrapper
.
setProps
({
item
:
mockItem
,
});
await
wrapper
.
vm
.
$nextTick
();
expect
(
wrapper
.
vm
.
stateIconName
).
toBe
(
stateIconName
);
...
...
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