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
5764f85c
Commit
5764f85c
authored
Mar 01, 2018
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add group related config and endpoint methods to be consistent with EE
parent
ec2e54b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
11 deletions
+36
-11
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
...ripts/filtered_search/filtered_search_dropdown_manager.js
+24
-3
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+12
-8
No files found.
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @
5764f85c
...
...
@@ -10,13 +10,22 @@ import DropdownUser from './dropdown_user';
import
FilteredSearchVisualTokens
from
'
./filtered_search_visual_tokens
'
;
export
default
class
FilteredSearchDropdownManager
{
constructor
(
baseEndpoint
=
''
,
tokenizer
,
page
,
isGroup
,
filteredSearchTokenKeys
)
{
constructor
({
baseEndpoint
=
''
,
tokenizer
,
page
,
isGroup
,
isGroupAncestor
,
filteredSearchTokenKeys
,
})
{
this
.
container
=
FilteredSearchContainer
.
container
;
this
.
baseEndpoint
=
baseEndpoint
.
replace
(
/
\/
$/
,
''
);
this
.
tokenizer
=
tokenizer
;
this
.
filteredSearchTokenKeys
=
filteredSearchTokenKeys
||
FilteredSearchTokenKeys
;
this
.
filteredSearchInput
=
this
.
container
.
querySelector
(
'
.filtered-search
'
);
this
.
page
=
page
;
this
.
groupsOnly
=
isGroup
;
this
.
groupAncestor
=
isGroupAncestor
;
this
.
setupMapping
();
...
...
@@ -59,7 +68,7 @@ export default class FilteredSearchDropdownManager {
reference
:
null
,
gl
:
DropdownNonUser
,
extraArguments
:
{
endpoint
:
`
${
this
.
baseEndpoint
}
/milestones.json`
,
endpoint
:
this
.
getMilestoneEndpoint
()
,
symbol
:
'
%
'
,
},
element
:
this
.
container
.
querySelector
(
'
#js-dropdown-milestone
'
),
...
...
@@ -68,7 +77,7 @@ export default class FilteredSearchDropdownManager {
reference
:
null
,
gl
:
DropdownNonUser
,
extraArguments
:
{
endpoint
:
`
${
this
.
baseEndpoint
}
/labels.json`
,
endpoint
:
this
.
getLabelsEndpoint
()
,
symbol
:
'
~
'
,
preprocessing
:
DropdownUtils
.
duplicateLabelPreprocessing
,
},
...
...
@@ -90,6 +99,18 @@ export default class FilteredSearchDropdownManager {
this
.
mapping
=
allowedMappings
;
}
getMilestoneEndpoint
()
{
const
endpoint
=
`
${
this
.
baseEndpoint
}
/milestones.json`
;
return
endpoint
;
}
getLabelsEndpoint
()
{
const
endpoint
=
`
${
this
.
baseEndpoint
}
/labels.json`
;
return
endpoint
;
}
static
addWordToInput
(
tokenName
,
tokenValue
=
''
,
clicked
=
false
)
{
const
input
=
FilteredSearchContainer
.
container
.
querySelector
(
'
.filtered-search
'
);
...
...
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
5764f85c
...
...
@@ -20,10 +20,13 @@ import DropdownUtils from './dropdown_utils';
export
default
class
FilteredSearchManager
{
constructor
({
page
,
isGroup
=
false
,
isGroupAncestor
=
false
,
filteredSearchTokenKeys
=
FilteredSearchTokenKeys
,
stateFiltersSelector
=
'
.issues-state-filters
'
,
})
{
this
.
isGroup
=
false
;
this
.
isGroup
=
isGroup
;
this
.
isGroupAncestor
=
isGroupAncestor
;
this
.
states
=
[
'
opened
'
,
'
closed
'
,
'
merged
'
,
'
all
'
];
this
.
page
=
page
;
...
...
@@ -75,13 +78,14 @@ export default class FilteredSearchManager {
if
(
this
.
filteredSearchInput
)
{
this
.
tokenizer
=
FilteredSearchTokenizer
;
this
.
dropdownManager
=
new
FilteredSearchDropdownManager
(
this
.
filteredSearchInput
.
getAttribute
(
'
data-base-endpoint
'
)
||
''
,
this
.
tokenizer
,
this
.
page
,
this
.
isGroup
,
this
.
filteredSearchTokenKeys
,
);
this
.
dropdownManager
=
new
FilteredSearchDropdownManager
({
baseEndpoint
:
this
.
filteredSearchInput
.
getAttribute
(
'
data-base-endpoint
'
)
||
''
,
tokenizer
:
this
.
tokenizer
,
page
:
this
.
page
,
isGroup
:
this
.
isGroup
,
isGroupAncestor
:
this
.
isGroupAncestor
,
filteredSearchTokenKeys
:
this
.
filteredSearchTokenKeys
,
});
this
.
recentSearchesRoot
=
new
RecentSearchesRoot
(
this
.
recentSearchesStore
,
...
...
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