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
d3dacc2d
Commit
d3dacc2d
authored
Nov 02, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use labels widget on epic board and mr sidebar
Fix epic boards action
parent
9de94ac9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
98 additions
and
15 deletions
+98
-15
ee/app/assets/javascripts/boards/stores/actions.js
ee/app/assets/javascripts/boards/stores/actions.js
+33
-15
ee/spec/frontend/boards/mock_data.js
ee/spec/frontend/boards/mock_data.js
+6
-0
ee/spec/frontend/boards/stores/actions_spec.js
ee/spec/frontend/boards/stores/actions_spec.js
+59
-0
No files found.
ee/app/assets/javascripts/boards/stores/actions.js
View file @
d3dacc2d
...
@@ -12,6 +12,7 @@ import listsIssuesQuery from '~/boards/graphql/lists_issues.query.graphql';
...
@@ -12,6 +12,7 @@ import listsIssuesQuery from '~/boards/graphql/lists_issues.query.graphql';
import
projectBoardMembersQuery
from
'
~/boards/graphql/project_board_members.query.graphql
'
;
import
projectBoardMembersQuery
from
'
~/boards/graphql/project_board_members.query.graphql
'
;
import
actionsCE
from
'
~/boards/stores/actions
'
;
import
actionsCE
from
'
~/boards/stores/actions
'
;
import
*
as
typesCE
from
'
~/boards/stores/mutation_types
'
;
import
*
as
typesCE
from
'
~/boards/stores/mutation_types
'
;
import
{
getIdFromGraphQLId
}
from
'
~/graphql_shared/utils
'
;
import
{
historyPushState
,
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
{
historyPushState
,
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
{
mergeUrlParams
,
removeParams
,
queryToObject
}
from
'
~/lib/utils/url_utility
'
;
import
{
mergeUrlParams
,
removeParams
,
queryToObject
}
from
'
~/lib/utils/url_utility
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
...
@@ -583,26 +584,43 @@ export default {
...
@@ -583,26 +584,43 @@ export default {
setActiveEpicLabels
:
async
({
commit
,
getters
,
state
},
input
)
=>
{
setActiveEpicLabels
:
async
({
commit
,
getters
,
state
},
input
)
=>
{
const
{
activeBoardItem
}
=
getters
;
const
{
activeBoardItem
}
=
getters
;
const
{
data
}
=
await
gqlClient
.
mutate
({
mutation
:
updateEpicLabelsMutation
,
if
(
!
gon
.
features
?.
labelsWidget
)
{
variables
:
{
const
{
data
}
=
await
gqlClient
.
mutate
({
input
:
{
mutation
:
updateEpicLabelsMutation
,
iid
:
String
(
activeBoardItem
.
iid
),
variables
:
{
addLabelIds
:
input
.
addLabelIds
??
[],
input
:
{
removeLabelIds
:
input
.
removeLabelIds
??
[],
iid
:
String
(
activeBoardItem
.
iid
),
groupPath
:
state
.
fullPath
,
addLabelIds
:
input
.
addLabelIds
??
[],
removeLabelIds
:
input
.
removeLabelIds
??
[],
groupPath
:
state
.
fullPath
,
},
},
},
},
});
});
if
(
data
.
updateEpic
?.
errors
?.
length
>
0
)
{
if
(
data
.
updateEpic
?.
errors
?.
length
>
0
)
{
throw
new
Error
(
data
.
updateEpic
.
errors
);
throw
new
Error
(
data
.
updateEpic
.
errors
);
}
commit
(
typesCE
.
UPDATE_BOARD_ITEM_BY_ID
,
{
itemId
:
activeBoardItem
.
id
,
prop
:
'
labels
'
,
value
:
data
.
updateEpic
.
epic
.
labels
.
nodes
,
});
return
;
}
}
commit
(
typesCE
.
UPDATE_BOARD_ITEM_BY_ID
,
{
let
labels
=
input
?.
labels
||
[];
itemId
:
activeBoardItem
.
id
,
if
(
input
.
removeLabelIds
)
{
labels
=
activeBoardItem
.
labels
.
filter
(
(
label
)
=>
input
.
removeLabelIds
[
0
]
!==
getIdFromGraphQLId
(
label
.
id
),
);
}
commit
(
types
.
UPDATE_BOARD_ITEM_BY_ID
,
{
itemId
:
input
.
id
||
activeBoardItem
.
id
,
prop
:
'
labels
'
,
prop
:
'
labels
'
,
value
:
data
.
updateEpic
.
epic
.
labels
.
node
s
,
value
:
label
s
,
});
});
},
},
};
};
ee/spec/frontend/boards/mock_data.js
View file @
d3dacc2d
...
@@ -122,6 +122,12 @@ export const labels = [
...
@@ -122,6 +122,12 @@ export const labels = [
color
:
'
#34ebec
'
,
color
:
'
#34ebec
'
,
description
:
null
,
description
:
null
,
},
},
{
id
:
'
gid://gitlab/GroupLabel/6
'
,
title
:
'
Brock
'
,
color
:
'
#e082b6
'
,
description
:
null
,
},
];
];
export
const
rawIssue
=
{
export
const
rawIssue
=
{
...
...
ee/spec/frontend/boards/stores/actions_spec.js
View file @
d3dacc2d
...
@@ -14,6 +14,7 @@ import { mockMoveIssueParams, mockMoveData, mockMoveState } from 'jest/boards/mo
...
@@ -14,6 +14,7 @@ import { mockMoveIssueParams, mockMoveData, mockMoveState } from 'jest/boards/mo
import
{
formatListIssues
}
from
'
~/boards/boards_util
'
;
import
{
formatListIssues
}
from
'
~/boards/boards_util
'
;
import
listsIssuesQuery
from
'
~/boards/graphql/lists_issues.query.graphql
'
;
import
listsIssuesQuery
from
'
~/boards/graphql/lists_issues.query.graphql
'
;
import
*
as
typesCE
from
'
~/boards/stores/mutation_types
'
;
import
*
as
typesCE
from
'
~/boards/stores/mutation_types
'
;
import
{
getIdFromGraphQLId
}
from
'
~/graphql_shared/utils
'
;
import
*
as
commonUtils
from
'
~/lib/utils/common_utils
'
;
import
*
as
commonUtils
from
'
~/lib/utils/common_utils
'
;
import
{
mergeUrlParams
,
removeParams
}
from
'
~/lib/utils/url_utility
'
;
import
{
mergeUrlParams
,
removeParams
}
from
'
~/lib/utils/url_utility
'
;
import
{
import
{
...
@@ -1380,4 +1381,62 @@ describe('setActiveEpicLabels', () => {
...
@@ -1380,4 +1381,62 @@ describe('setActiveEpicLabels', () => {
await
expect
(
actions
.
setActiveEpicLabels
({
getters
},
input
)).
rejects
.
toThrow
(
Error
);
await
expect
(
actions
.
setActiveEpicLabels
({
getters
},
input
)).
rejects
.
toThrow
(
Error
);
});
});
describe
(
'
labels_widget FF on
'
,
()
=>
{
beforeEach
(()
=>
{
window
.
gon
=
{
features
:
{
labelsWidget
:
true
},
};
getters
.
activeBoardItem
=
{
...
mockIssue
,
labels
};
});
afterEach
(()
=>
{
window
.
gon
=
{
features
:
{},
};
});
it
(
'
should assign labels
'
,
()
=>
{
const
payload
=
{
itemId
:
getters
.
activeBoardItem
.
id
,
prop
:
'
labels
'
,
value
:
labels
,
};
testAction
(
actions
.
setActiveEpicLabels
,
input
,
{
...
state
,
...
getters
},
[
{
type
:
types
.
UPDATE_BOARD_ITEM_BY_ID
,
payload
,
},
],
[],
);
});
it
(
'
should remove label
'
,
()
=>
{
const
payload
=
{
itemId
:
getters
.
activeBoardItem
.
id
,
prop
:
'
labels
'
,
value
:
[
labels
[
1
]],
};
testAction
(
actions
.
setActiveEpicLabels
,
{
...
input
,
removeLabelIds
:
[
getIdFromGraphQLId
(
labels
[
0
].
id
)]
},
{
...
state
,
...
getters
},
[
{
type
:
types
.
UPDATE_BOARD_ITEM_BY_ID
,
payload
,
},
],
[],
);
});
});
});
});
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