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
4829e27a
Commit
4829e27a
authored
Oct 19, 2021
by
Reuben Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '341121-fix-sidebar-labels-bug' into 'master'"
This reverts merge request !72111
parent
a9dbb0ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/mutations.js
...d/components/sidebar/labels_select_vue/store/mutations.js
+1
-2
spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/mutations_spec.js
...ponents/sidebar/labels_select_vue/store/mutations_spec.js
+4
-6
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/mutations.js
View file @
4829e27a
...
@@ -69,8 +69,7 @@ export default {
...
@@ -69,8 +69,7 @@ export default {
if
(
isScopedLabel
(
candidateLabel
))
{
if
(
isScopedLabel
(
candidateLabel
))
{
const
scopedKeyWithDelimiter
=
`
${
scopedLabelKey
(
candidateLabel
)}${
SCOPED_LABEL_DELIMITER
}
`
;
const
scopedKeyWithDelimiter
=
`
${
scopedLabelKey
(
candidateLabel
)}${
SCOPED_LABEL_DELIMITER
}
`
;
const
currentActiveScopedLabel
=
state
.
labels
.
find
(
const
currentActiveScopedLabel
=
state
.
labels
.
find
(
({
set
,
title
})
=>
({
title
})
=>
title
.
startsWith
(
scopedKeyWithDelimiter
)
&&
title
!==
candidateLabel
.
title
,
set
&&
title
.
startsWith
(
scopedKeyWithDelimiter
)
&&
title
!==
candidateLabel
.
title
,
);
);
if
(
currentActiveScopedLabel
)
{
if
(
currentActiveScopedLabel
)
{
...
...
spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/mutations_spec.js
View file @
4829e27a
...
@@ -159,9 +159,8 @@ describe('LabelsSelect Mutations', () => {
...
@@ -159,9 +159,8 @@ describe('LabelsSelect Mutations', () => {
labels
=
[
labels
=
[
{
id
:
1
,
title
:
'
scoped
'
},
{
id
:
1
,
title
:
'
scoped
'
},
{
id
:
2
,
title
:
'
scoped::one
'
,
set
:
false
},
{
id
:
2
,
title
:
'
scoped::one
'
,
set
:
false
},
{
id
:
3
,
title
:
'
scoped::two
'
,
set
:
false
},
{
id
:
3
,
title
:
'
scoped::test
'
,
set
:
true
},
{
id
:
4
,
title
:
'
scoped::three
'
,
set
:
true
},
{
id
:
4
,
title
:
''
},
{
id
:
5
,
title
:
''
},
];
];
});
});
...
@@ -192,9 +191,8 @@ describe('LabelsSelect Mutations', () => {
...
@@ -192,9 +191,8 @@ describe('LabelsSelect Mutations', () => {
expect
(
state
.
labels
).
toEqual
([
expect
(
state
.
labels
).
toEqual
([
{
id
:
1
,
title
:
'
scoped
'
},
{
id
:
1
,
title
:
'
scoped
'
},
{
id
:
2
,
title
:
'
scoped::one
'
,
set
:
true
,
touched
:
true
},
{
id
:
2
,
title
:
'
scoped::one
'
,
set
:
true
,
touched
:
true
},
{
id
:
3
,
title
:
'
scoped::two
'
,
set
:
false
},
{
id
:
3
,
title
:
'
scoped::test
'
,
set
:
false
},
{
id
:
4
,
title
:
'
scoped::three
'
,
set
:
false
},
{
id
:
4
,
title
:
''
},
{
id
:
5
,
title
:
''
},
]);
]);
});
});
});
});
...
...
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