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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
27aeaccb
Commit
27aeaccb
authored
Aug 29, 2018
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename to IssuableFilteredSearchTokenKeys
it's used for both issues and merge requests
parent
145925a5
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
23 additions
and
23 deletions
+23
-23
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+2
-2
app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
...ts/filtered_search/issuable_filtered_search_token_keys.js
+2
-2
app/assets/javascripts/pages/groups/issues/index.js
app/assets/javascripts/pages/groups/issues/index.js
+2
-2
app/assets/javascripts/pages/groups/merge_requests/index.js
app/assets/javascripts/pages/groups/merge_requests/index.js
+2
-2
app/assets/javascripts/pages/projects/issues/index/index.js
app/assets/javascripts/pages/projects/issues/index/index.js
+2
-2
app/assets/javascripts/pages/projects/merge_requests/index/index.js
.../javascripts/pages/projects/merge_requests/index/index.js
+2
-2
spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
...earch/components/recent_searches_dropdown_content_spec.js
+3
-3
spec/javascripts/filtered_search/dropdown_user_spec.js
spec/javascripts/filtered_search/dropdown_user_spec.js
+2
-2
spec/javascripts/filtered_search/dropdown_utils_spec.js
spec/javascripts/filtered_search/dropdown_utils_spec.js
+2
-2
spec/javascripts/filtered_search/filtered_search_manager_spec.js
...vascripts/filtered_search/filtered_search_manager_spec.js
+2
-2
spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js
...scripts/filtered_search/filtered_search_tokenizer_spec.js
+2
-2
No files found.
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
27aeaccb
...
@@ -3,7 +3,7 @@ import {
...
@@ -3,7 +3,7 @@ import {
getParameterByName
,
getParameterByName
,
getUrlParamsArray
,
getUrlParamsArray
,
}
from
'
~/lib/utils/common_utils
'
;
}
from
'
~/lib/utils/common_utils
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
import
{
visitUrl
}
from
'
../lib/utils/url_utility
'
;
import
{
visitUrl
}
from
'
../lib/utils/url_utility
'
;
import
Flash
from
'
../flash
'
;
import
Flash
from
'
../flash
'
;
import
FilteredSearchContainer
from
'
./container
'
;
import
FilteredSearchContainer
from
'
./container
'
;
...
@@ -23,7 +23,7 @@ export default class FilteredSearchManager {
...
@@ -23,7 +23,7 @@ export default class FilteredSearchManager {
isGroup
=
false
,
isGroup
=
false
,
isGroupAncestor
=
true
,
isGroupAncestor
=
true
,
isGroupDecendent
=
false
,
isGroupDecendent
=
false
,
filteredSearchTokenKeys
=
Issu
es
FilteredSearchTokenKeys
,
filteredSearchTokenKeys
=
Issu
able
FilteredSearchTokenKeys
,
stateFiltersSelector
=
'
.issues-state-filters
'
,
stateFiltersSelector
=
'
.issues-state-filters
'
,
})
{
})
{
this
.
isGroup
=
isGroup
;
this
.
isGroup
=
isGroup
;
...
...
app/assets/javascripts/filtered_search/issu
es
_filtered_search_token_keys.js
→
app/assets/javascripts/filtered_search/issu
able
_filtered_search_token_keys.js
View file @
27aeaccb
...
@@ -71,7 +71,7 @@ const conditions = [{
...
@@ -71,7 +71,7 @@ const conditions = [{
value
:
'
none
'
,
value
:
'
none
'
,
}];
}];
const
Issu
es
FilteredSearchTokenKeys
=
const
Issu
able
FilteredSearchTokenKeys
=
new
FilteredSearchTokenKeys
(
tokenKeys
,
alternativeTokenKeys
,
conditions
);
new
FilteredSearchTokenKeys
(
tokenKeys
,
alternativeTokenKeys
,
conditions
);
export
default
Issu
es
FilteredSearchTokenKeys
;
export
default
Issu
able
FilteredSearchTokenKeys
;
app/assets/javascripts/pages/groups/issues/index.js
View file @
27aeaccb
import
projectSelect
from
'
~/project_select
'
;
import
projectSelect
from
'
~/project_select
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initFilteredSearch
({
initFilteredSearch
({
page
:
FILTERED_SEARCH
.
ISSUES
,
page
:
FILTERED_SEARCH
.
ISSUES
,
isGroupDecendent
:
true
,
isGroupDecendent
:
true
,
filteredSearchTokenKeys
:
Issu
es
FilteredSearchTokenKeys
,
filteredSearchTokenKeys
:
Issu
able
FilteredSearchTokenKeys
,
});
});
projectSelect
();
projectSelect
();
});
});
app/assets/javascripts/pages/groups/merge_requests/index.js
View file @
27aeaccb
import
projectSelect
from
'
~/project_select
'
;
import
projectSelect
from
'
~/project_select
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initFilteredSearch
({
initFilteredSearch
({
page
:
FILTERED_SEARCH
.
MERGE_REQUESTS
,
page
:
FILTERED_SEARCH
.
MERGE_REQUESTS
,
isGroupDecendent
:
true
,
isGroupDecendent
:
true
,
filteredSearchTokenKeys
:
Issu
es
FilteredSearchTokenKeys
,
filteredSearchTokenKeys
:
Issu
able
FilteredSearchTokenKeys
,
});
});
projectSelect
();
projectSelect
();
});
});
app/assets/javascripts/pages/projects/issues/index/index.js
View file @
27aeaccb
...
@@ -4,14 +4,14 @@ import IssuableIndex from '~/issuable_index';
...
@@ -4,14 +4,14 @@ import IssuableIndex from '~/issuable_index';
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
UsersSelect
from
'
~/users_select
'
;
import
UsersSelect
from
'
~/users_select
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
{
ISSUABLE_INDEX
}
from
'
~/pages/projects/constants
'
;
import
{
ISSUABLE_INDEX
}
from
'
~/pages/projects/constants
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initFilteredSearch
({
initFilteredSearch
({
page
:
FILTERED_SEARCH
.
ISSUES
,
page
:
FILTERED_SEARCH
.
ISSUES
,
filteredSearchTokenKeys
:
Issu
es
FilteredSearchTokenKeys
,
filteredSearchTokenKeys
:
Issu
able
FilteredSearchTokenKeys
,
});
});
new
IssuableIndex
(
ISSUABLE_INDEX
.
ISSUE
);
new
IssuableIndex
(
ISSUABLE_INDEX
.
ISSUE
);
...
...
app/assets/javascripts/pages/projects/merge_requests/index/index.js
View file @
27aeaccb
...
@@ -2,14 +2,14 @@ import IssuableIndex from '~/issuable_index';
...
@@ -2,14 +2,14 @@ import IssuableIndex from '~/issuable_index';
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
UsersSelect
from
'
~/users_select
'
;
import
UsersSelect
from
'
~/users_select
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
{
ISSUABLE_INDEX
}
from
'
~/pages/projects/constants
'
;
import
{
ISSUABLE_INDEX
}
from
'
~/pages/projects/constants
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initFilteredSearch
({
initFilteredSearch
({
page
:
FILTERED_SEARCH
.
MERGE_REQUESTS
,
page
:
FILTERED_SEARCH
.
MERGE_REQUESTS
,
filteredSearchTokenKeys
:
Issu
es
FilteredSearchTokenKeys
,
filteredSearchTokenKeys
:
Issu
able
FilteredSearchTokenKeys
,
});
});
new
IssuableIndex
(
ISSUABLE_INDEX
.
MERGE_REQUEST
);
// eslint-disable-line no-new
new
IssuableIndex
(
ISSUABLE_INDEX
.
MERGE_REQUEST
);
// eslint-disable-line no-new
new
ShortcutsNavigation
();
// eslint-disable-line no-new
new
ShortcutsNavigation
();
// eslint-disable-line no-new
...
...
spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
View file @
27aeaccb
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
eventHub
from
'
~/filtered_search/event_hub
'
;
import
eventHub
from
'
~/filtered_search/event_hub
'
;
import
RecentSearchesDropdownContent
from
'
~/filtered_search/components/recent_searches_dropdown_content.vue
'
;
import
RecentSearchesDropdownContent
from
'
~/filtered_search/components/recent_searches_dropdown_content.vue
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
const
createComponent
=
(
propsData
)
=>
{
const
createComponent
=
(
propsData
)
=>
{
const
Component
=
Vue
.
extend
(
RecentSearchesDropdownContent
);
const
Component
=
Vue
.
extend
(
RecentSearchesDropdownContent
);
...
@@ -18,14 +18,14 @@ const trimMarkupWhitespace = text => text.replace(/(\n|\s)+/gm, ' ').trim();
...
@@ -18,14 +18,14 @@ const trimMarkupWhitespace = text => text.replace(/(\n|\s)+/gm, ' ').trim();
describe
(
'
RecentSearchesDropdownContent
'
,
()
=>
{
describe
(
'
RecentSearchesDropdownContent
'
,
()
=>
{
const
propsDataWithoutItems
=
{
const
propsDataWithoutItems
=
{
items
:
[],
items
:
[],
allowedKeys
:
Issu
es
FilteredSearchTokenKeys
.
getKeys
(),
allowedKeys
:
Issu
able
FilteredSearchTokenKeys
.
getKeys
(),
};
};
const
propsDataWithItems
=
{
const
propsDataWithItems
=
{
items
:
[
items
:
[
'
foo
'
,
'
foo
'
,
'
author:@root label:~foo bar
'
,
'
author:@root label:~foo bar
'
,
],
],
allowedKeys
:
Issu
es
FilteredSearchTokenKeys
.
getKeys
(),
allowedKeys
:
Issu
able
FilteredSearchTokenKeys
.
getKeys
(),
};
};
let
vm
;
let
vm
;
...
...
spec/javascripts/filtered_search/dropdown_user_spec.js
View file @
27aeaccb
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
DropdownUser
from
'
~/filtered_search/dropdown_user
'
;
import
DropdownUser
from
'
~/filtered_search/dropdown_user
'
;
import
FilteredSearchTokenizer
from
'
~/filtered_search/filtered_search_tokenizer
'
;
import
FilteredSearchTokenizer
from
'
~/filtered_search/filtered_search_tokenizer
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
describe
(
'
Dropdown User
'
,
()
=>
{
describe
(
'
Dropdown User
'
,
()
=>
{
describe
(
'
getSearchInput
'
,
()
=>
{
describe
(
'
getSearchInput
'
,
()
=>
{
...
@@ -14,7 +14,7 @@ describe('Dropdown User', () => {
...
@@ -14,7 +14,7 @@ describe('Dropdown User', () => {
spyOn
(
DropdownUtils
,
'
getSearchInput
'
).
and
.
callFake
(()
=>
{});
spyOn
(
DropdownUtils
,
'
getSearchInput
'
).
and
.
callFake
(()
=>
{});
dropdownUser
=
new
DropdownUser
({
dropdownUser
=
new
DropdownUser
({
tokenKeys
:
Issu
esFilteredSearch
TokenKeys
,
tokenKeys
:
Issu
ableFiltered
TokenKeys
,
});
});
});
});
...
...
spec/javascripts/filtered_search/dropdown_utils_spec.js
View file @
27aeaccb
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
FilteredSearchDropdownManager
from
'
~/filtered_search/filtered_search_dropdown_manager
'
;
import
FilteredSearchDropdownManager
from
'
~/filtered_search/filtered_search_dropdown_manager
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
import
FilteredSearchSpecHelper
from
'
../helpers/filtered_search_spec_helper
'
;
import
FilteredSearchSpecHelper
from
'
../helpers/filtered_search_spec_helper
'
;
describe
(
'
Dropdown Utils
'
,
()
=>
{
describe
(
'
Dropdown Utils
'
,
()
=>
{
...
@@ -137,7 +137,7 @@ describe('Dropdown Utils', () => {
...
@@ -137,7 +137,7 @@ describe('Dropdown Utils', () => {
`
);
`
);
input
=
document
.
getElementById
(
'
test
'
);
input
=
document
.
getElementById
(
'
test
'
);
allowedKeys
=
Issu
es
FilteredSearchTokenKeys
.
getKeys
();
allowedKeys
=
Issu
able
FilteredSearchTokenKeys
.
getKeys
();
});
});
function
config
()
{
function
config
()
{
...
...
spec/javascripts/filtered_search/filtered_search_manager_spec.js
View file @
27aeaccb
import
RecentSearchesService
from
'
~/filtered_search/services/recent_searches_service
'
;
import
RecentSearchesService
from
'
~/filtered_search/services/recent_searches_service
'
;
import
RecentSearchesServiceError
from
'
~/filtered_search/services/recent_searches_service_error
'
;
import
RecentSearchesServiceError
from
'
~/filtered_search/services/recent_searches_service_error
'
;
import
RecentSearchesRoot
from
'
~/filtered_search/recent_searches_root
'
;
import
RecentSearchesRoot
from
'
~/filtered_search/recent_searches_root
'
;
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
import
'
~/lib/utils/common_utils
'
;
import
'
~/lib/utils/common_utils
'
;
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
DropdownUtils
from
'
~/filtered_search/dropdown_utils
'
;
import
FilteredSearchVisualTokens
from
'
~/filtered_search/filtered_search_visual_tokens
'
;
import
FilteredSearchVisualTokens
from
'
~/filtered_search/filtered_search_visual_tokens
'
;
...
@@ -86,7 +86,7 @@ describe('Filtered Search Manager', function () {
...
@@ -86,7 +86,7 @@ describe('Filtered Search Manager', function () {
expect
(
RecentSearchesService
.
isAvailable
).
toHaveBeenCalled
();
expect
(
RecentSearchesService
.
isAvailable
).
toHaveBeenCalled
();
expect
(
RecentSearchesStoreSpy
).
toHaveBeenCalledWith
({
expect
(
RecentSearchesStoreSpy
).
toHaveBeenCalledWith
({
isLocalStorageAvailable
,
isLocalStorageAvailable
,
allowedKeys
:
Issu
es
FilteredSearchTokenKeys
.
getKeys
(),
allowedKeys
:
Issu
able
FilteredSearchTokenKeys
.
getKeys
(),
});
});
});
});
});
});
...
...
spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js
View file @
27aeaccb
import
Issu
esFilteredSearchTokenKeys
from
'
~/filtered_search/issues
_filtered_search_token_keys
'
;
import
Issu
ableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable
_filtered_search_token_keys
'
;
import
FilteredSearchTokenizer
from
'
~/filtered_search/filtered_search_tokenizer
'
;
import
FilteredSearchTokenizer
from
'
~/filtered_search/filtered_search_tokenizer
'
;
describe
(
'
Filtered Search Tokenizer
'
,
()
=>
{
describe
(
'
Filtered Search Tokenizer
'
,
()
=>
{
const
allowedKeys
=
Issu
es
FilteredSearchTokenKeys
.
getKeys
();
const
allowedKeys
=
Issu
able
FilteredSearchTokenKeys
.
getKeys
();
describe
(
'
processTokens
'
,
()
=>
{
describe
(
'
processTokens
'
,
()
=>
{
it
(
'
returns for input containing only search value
'
,
()
=>
{
it
(
'
returns for input containing only search value
'
,
()
=>
{
...
...
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