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
e3b165a3
Commit
e3b165a3
authored
Nov 10, 2020
by
Scott Stern
Committed by
Phil Hughes
Nov 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename assignees_dropdown to multiselect_dropdown
parent
77a55ca5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
app/assets/javascripts/boards/components/board_assignee_dropdown.vue
...javascripts/boards/components/board_assignee_dropdown.vue
+4
-4
app/assets/javascripts/vue_shared/components/sidebar/multiselect_dropdown.vue
...ts/vue_shared/components/sidebar/multiselect_dropdown.vue
+0
-0
spec/frontend/boards/components/board_assignee_dropdown_spec.js
...rontend/boards/components/board_assignee_dropdown_spec.js
+3
-3
spec/frontend/vue_shared/components/multiselect_dropdown_spec.js
...ontend/vue_shared/components/multiselect_dropdown_spec.js
+3
-3
No files found.
app/assets/javascripts/boards/components/board_assignee_dropdown.vue
View file @
e3b165a3
...
@@ -4,7 +4,7 @@ import { GlDropdownItem, GlDropdownDivider, GlAvatarLabeled, GlAvatarLink } from
...
@@ -4,7 +4,7 @@ import { GlDropdownItem, GlDropdownDivider, GlAvatarLabeled, GlAvatarLink } from
import
{
__
,
n__
}
from
'
~/locale
'
;
import
{
__
,
n__
}
from
'
~/locale
'
;
import
IssuableAssignees
from
'
~/sidebar/components/assignees/issuable_assignees.vue
'
;
import
IssuableAssignees
from
'
~/sidebar/components/assignees/issuable_assignees.vue
'
;
import
BoardEditableItem
from
'
~/boards/components/sidebar/board_editable_item.vue
'
;
import
BoardEditableItem
from
'
~/boards/components/sidebar/board_editable_item.vue
'
;
import
AssigneesDropdown
from
'
~/vue_shared/components/sidebar/assignees
_dropdown.vue
'
;
import
MultiSelectDropdown
from
'
~/vue_shared/components/sidebar/multiselect
_dropdown.vue
'
;
import
getIssueParticipants
from
'
~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql
'
;
import
getIssueParticipants
from
'
~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql
'
;
export
default
{
export
default
{
...
@@ -17,7 +17,7 @@ export default {
...
@@ -17,7 +17,7 @@ export default {
components
:
{
components
:
{
BoardEditableItem
,
BoardEditableItem
,
IssuableAssignees
,
IssuableAssignees
,
Assignees
Dropdown
,
MultiSelect
Dropdown
,
GlDropdownItem
,
GlDropdownItem
,
GlDropdownDivider
,
GlDropdownDivider
,
GlAvatarLabeled
,
GlAvatarLabeled
,
...
@@ -92,7 +92,7 @@ export default {
...
@@ -92,7 +92,7 @@ export default {
</
template
>
</
template
>
<
template
#default
>
<
template
#default
>
<
assignees
-dropdown
<
multi-select
-dropdown
class=
"w-100"
class=
"w-100"
:text=
"$options.i18n.assignees"
:text=
"$options.i18n.assignees"
:header-text=
"$options.i18n.assignTo"
:header-text=
"$options.i18n.assignTo"
...
@@ -138,7 +138,7 @@ export default {
...
@@ -138,7 +138,7 @@ export default {
</gl-avatar-link>
</gl-avatar-link>
</gl-dropdown-item>
</gl-dropdown-item>
</
template
>
</
template
>
</
assignees
-dropdown>
</
multi-select
-dropdown>
</template>
</template>
</board-editable-item>
</board-editable-item>
</template>
</template>
app/assets/javascripts/vue_shared/components/sidebar/
assignees
_dropdown.vue
→
app/assets/javascripts/vue_shared/components/sidebar/
multiselect
_dropdown.vue
View file @
e3b165a3
File moved
spec/frontend/boards/components/board_assignee_dropdown_spec.js
View file @
e3b165a3
...
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
...
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
import
{
GlDropdownItem
,
GlAvatarLink
,
GlAvatarLabeled
}
from
'
@gitlab/ui
'
;
import
{
GlDropdownItem
,
GlAvatarLink
,
GlAvatarLabeled
}
from
'
@gitlab/ui
'
;
import
BoardAssigneeDropdown
from
'
~/boards/components/board_assignee_dropdown.vue
'
;
import
BoardAssigneeDropdown
from
'
~/boards/components/board_assignee_dropdown.vue
'
;
import
IssuableAssignees
from
'
~/sidebar/components/assignees/issuable_assignees.vue
'
;
import
IssuableAssignees
from
'
~/sidebar/components/assignees/issuable_assignees.vue
'
;
import
AssigneesDropdown
from
'
~/vue_shared/components/sidebar/assignees
_dropdown.vue
'
;
import
MultiSelectDropdown
from
'
~/vue_shared/components/sidebar/multiselect
_dropdown.vue
'
;
import
BoardEditableItem
from
'
~/boards/components/sidebar/board_editable_item.vue
'
;
import
BoardEditableItem
from
'
~/boards/components/sidebar/board_editable_item.vue
'
;
import
store
from
'
~/boards/stores
'
;
import
store
from
'
~/boards/stores
'
;
import
getIssueParticipants
from
'
~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql
'
;
import
getIssueParticipants
from
'
~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql
'
;
...
@@ -109,7 +109,7 @@ describe('BoardCardAssigneeDropdown', () => {
...
@@ -109,7 +109,7 @@ describe('BoardCardAssigneeDropdown', () => {
createComponent
();
createComponent
();
expect
(
wrapper
.
find
(
IssuableAssignees
).
isVisible
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
IssuableAssignees
).
isVisible
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
Assignees
Dropdown
).
isVisible
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
MultiSelect
Dropdown
).
isVisible
()).
toBe
(
false
);
});
});
});
});
...
@@ -122,7 +122,7 @@ describe('BoardCardAssigneeDropdown', () => {
...
@@ -122,7 +122,7 @@ describe('BoardCardAssigneeDropdown', () => {
it
(
'
shows assignees dropdown
'
,
async
()
=>
{
it
(
'
shows assignees dropdown
'
,
async
()
=>
{
expect
(
wrapper
.
find
(
IssuableAssignees
).
isVisible
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
IssuableAssignees
).
isVisible
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
Assignees
Dropdown
).
isVisible
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
MultiSelect
Dropdown
).
isVisible
()).
toBe
(
true
);
});
});
it
(
'
shows the issue returned as the activeIssue
'
,
async
()
=>
{
it
(
'
shows the issue returned as the activeIssue
'
,
async
()
=>
{
...
...
spec/frontend/vue_shared/components/
assignees
_dropdown_spec.js
→
spec/frontend/vue_shared/components/
multiselect
_dropdown_spec.js
View file @
e3b165a3
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
getByText
}
from
'
@testing-library/dom
'
;
import
{
getByText
}
from
'
@testing-library/dom
'
;
import
AssigneesDropdown
from
'
~/vue_shared/components/sidebar/assignees
_dropdown.vue
'
;
import
MultiSelectDropdown
from
'
~/vue_shared/components/sidebar/multiselect
_dropdown.vue
'
;
describe
(
'
Assignees
Dropdown Component
'
,
()
=>
{
describe
(
'
MultiSelect
Dropdown Component
'
,
()
=>
{
it
(
'
renders items slot
'
,
()
=>
{
it
(
'
renders items slot
'
,
()
=>
{
const
wrapper
=
shallowMount
(
Assignees
Dropdown
,
{
const
wrapper
=
shallowMount
(
MultiSelect
Dropdown
,
{
propsData
:
{
propsData
:
{
text
:
''
,
text
:
''
,
headerText
:
''
,
headerText
:
''
,
...
...
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