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
10ec9dfa
Commit
10ec9dfa
authored
Sep 29, 2020
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update boards modal tabs to gl-tabs
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43740
parent
ef885cd1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
16 deletions
+27
-16
app/assets/javascripts/boards/components/modal/tabs.vue
app/assets/javascripts/boards/components/modal/tabs.vue
+20
-14
changelogs/unreleased/230725-update-boards-modal-tabs.yml
changelogs/unreleased/230725-update-boards-modal-tabs.yml
+5
-0
spec/features/boards/add_issues_modal_spec.rb
spec/features/boards/add_issues_modal_spec.rb
+2
-2
No files found.
app/assets/javascripts/boards/components/modal/tabs.vue
View file @
10ec9dfa
<
script
>
<
script
>
/* eslint-disable @gitlab/vue-require-i18n-strings */
/* eslint-disable @gitlab/vue-require-i18n-strings */
import
{
GlTabs
,
GlTab
,
GlBadge
}
from
'
@gitlab/ui
'
;
import
ModalStore
from
'
../../stores/modal_store
'
;
import
ModalStore
from
'
../../stores/modal_store
'
;
import
modalMixin
from
'
../../mixins/modal_mixins
'
;
import
modalMixin
from
'
../../mixins/modal_mixins
'
;
export
default
{
export
default
{
components
:
{
GlTabs
,
GlTab
,
GlBadge
,
},
mixins
:
[
modalMixin
],
mixins
:
[
modalMixin
],
data
()
{
data
()
{
return
ModalStore
.
store
;
return
ModalStore
.
store
;
...
@@ -19,18 +25,18 @@ export default {
...
@@ -19,18 +25,18 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<
div
class=
"top-area gl-mt-3 gl-mb
-3"
>
<
gl-tabs
class=
"gl-mt
-3"
>
<
ul
class=
"nav-links issues-state-filters
"
>
<
gl-tab
@
click.prevent=
"changeTab('all')
"
>
<
li
:class=
"
{ active: activeTab == 'all' }
">
<
template
slot=
"title
"
>
<
a
href=
"#"
role=
"button"
@
click.prevent=
"changeTab('all')"
>
<
span>
Open issues
</span
>
Open issues
<span
class=
"badge badge-pill"
>
{{
issuesCount
}}
</span
>
<gl-badge
size=
"sm"
class=
"gl-tab-counter-badge"
>
{{
issuesCount
}}
</gl-badge
>
</a
>
</
template
>
</li
>
</gl-tab
>
<li
:class=
"
{ active: activeTab == 'selected' }
">
<gl-tab
@
click.prevent=
"changeTab('selected')
"
>
<a
href=
"#"
role=
"button"
@
click.prevent=
"changeTab('selected')
"
>
<
template
slot=
"title
"
>
Selected issues
<span
class=
"badge badge-pill"
>
{{
selectedCount
}}
</span>
<span>
Selected issues
</span>
<
/a
>
<
gl-badge
size=
"sm"
class=
"gl-tab-counter-badge"
>
{{
selectedCount
}}
</gl-badge
>
</
li
>
</
template
>
</
ul
>
</
gl-tab
>
</
div
>
</
gl-tabs
>
</template>
</template>
changelogs/unreleased/230725-update-boards-modal-tabs.yml
0 → 100644
View file @
10ec9dfa
---
title
:
Update issue boards modal to gl-tabs
merge_request
:
43740
author
:
type
:
changed
spec/features/boards/add_issues_modal_spec.rb
View file @
10ec9dfa
...
@@ -79,7 +79,7 @@ RSpec.describe 'Issue Boards add issue modal', :js do
...
@@ -79,7 +79,7 @@ RSpec.describe 'Issue Boards add issue modal', :js do
it
'loads issues'
do
it
'loads issues'
do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.
nav-link
s'
)
do
page
.
within
(
'.
gl-tab
s'
)
do
expect
(
page
).
to
have_content
(
'2'
)
expect
(
page
).
to
have_content
(
'2'
)
end
end
...
@@ -146,7 +146,7 @@ RSpec.describe 'Issue Boards add issue modal', :js do
...
@@ -146,7 +146,7 @@ RSpec.describe 'Issue Boards add issue modal', :js do
page
.
within
(
'.add-issues-modal'
)
do
page
.
within
(
'.add-issues-modal'
)
do
first
(
'.board-card .board-card-number'
).
click
first
(
'.board-card .board-card-number'
).
click
page
.
within
(
'.
nav-link
s'
)
do
page
.
within
(
'.
gl-tab
s'
)
do
expect
(
page
).
to
have_content
(
'Selected issues 1'
)
expect
(
page
).
to
have_content
(
'Selected issues 1'
)
end
end
end
end
...
...
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