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
19379283
Commit
19379283
authored
Sep 09, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update board list settings drawer style
Changelog: changed
parent
08cd6b69
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
12 deletions
+25
-12
app/assets/javascripts/boards/components/board_settings_sidebar.vue
.../javascripts/boards/components/board_settings_sidebar.vue
+19
-12
spec/frontend/boards/components/board_settings_sidebar_spec.js
...frontend/boards/components/board_settings_sidebar_spec.js
+6
-0
No files found.
app/assets/javascripts/boards/components/board_settings_sidebar.vue
View file @
19379283
...
...
@@ -36,7 +36,7 @@ export default {
return
this
.
glFeatures
.
wipLimits
&&
!
this
.
isEpicBoard
;
},
activeList
()
{
return
this
.
boardLists
[
this
.
activeId
];
return
this
.
boardLists
[
this
.
activeId
]
||
{}
;
},
activeListLabel
()
{
return
this
.
activeList
.
label
;
...
...
@@ -81,9 +81,26 @@ export default {
v-bind=
"$attrs"
class=
"js-board-settings-sidebar gl-absolute"
:open=
"isSidebarOpen"
variant=
"sidebar"
@
close=
"unsetActiveId"
>
<template
#title
>
{{
$options
.
listSettingsText
}}
</
template
>
<template
#title
>
<h2
class=
"gl-my-0 gl-font-size-h2 gl-line-height-24"
>
{{
$options
.
listSettingsText
}}
</h2>
</
template
>
<
template
#header
>
<div
v-if=
"canAdminList && activeList.id"
class=
"gl-mt-3"
>
<gl-button
variant=
"danger"
category=
"secondary"
size=
"small"
data-testid=
"remove-list"
@
click.stop=
"deleteBoard"
>
{{
__
(
'
Remove list
'
)
}}
</gl-button>
</div>
</
template
>
<
template
v-if=
"isSidebarOpen"
>
<div
v-if=
"boardListType === ListType.label"
>
<label
class=
"js-list-label gl-display-block"
>
{{
listTypeTitle
}}
</label>
...
...
@@ -103,16 +120,6 @@ export default {
v-if=
"isWipLimitsOn"
:max-issue-count=
"activeList.maxIssueCount"
/>
<div
v-if=
"canAdminList && !activeList.preset && activeList.id"
class=
"gl-mt-4"
>
<gl-button
variant=
"danger"
category=
"secondary"
icon=
"remove"
data-testid=
"remove-list"
@
click.stop=
"deleteBoard"
>
{{
__
(
'
Remove list
'
)
}}
</gl-button>
</div>
</
template
>
</gl-drawer>
</mounting-portal>
...
...
spec/frontend/boards/components/board_settings_sidebar_spec.js
View file @
19379283
...
...
@@ -3,6 +3,7 @@ import { shallowMount } from '@vue/test-utils';
import
{
MountingPortal
}
from
'
portal-vue
'
;
import
Vue
from
'
vue
'
;
import
Vuex
from
'
vuex
'
;
import
{
stubComponent
}
from
'
helpers/stub_component
'
;
import
{
extendedWrapper
}
from
'
helpers/vue_test_utils_helper
'
;
import
BoardSettingsSidebar
from
'
~/boards/components/board_settings_sidebar.vue
'
;
import
{
inactiveId
,
LIST
}
from
'
~/boards/constants
'
;
...
...
@@ -45,6 +46,11 @@ describe('BoardSettingsSidebar', () => {
canAdminList
,
scopedLabelsAvailable
:
false
,
},
stubs
:
{
GlDrawer
:
stubComponent
(
GlDrawer
,
{
template
:
'
<div><slot name="header"></slot><slot></slot></div>
'
,
}),
},
}),
);
};
...
...
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