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
ad2b0ee6
Commit
ad2b0ee6
authored
Jul 28, 2020
by
Arthur de Lapertosa Lisboa
Committed by
Phil Hughes
Jul 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug in group Runners filtered search
parent
9a1a4e25
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
2 deletions
+48
-2
app/assets/javascripts/filtered_search/group_runners_filtered_search_token_keys.js
...ltered_search/group_runners_filtered_search_token_keys.js
+27
-0
app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js
...ets/javascripts/pages/groups/settings/ci_cd/show/index.js
+2
-2
changelogs/unreleased/fix-filtered-search-group-runners-list-view.yml
...nreleased/fix-filtered-search-group-runners-list-view.yml
+5
-0
spec/features/runners_spec.rb
spec/features/runners_spec.rb
+14
-0
No files found.
app/assets/javascripts/filtered_search/group_runners_filtered_search_token_keys.js
0 → 100644
View file @
ad2b0ee6
import
{
__
}
from
'
~/locale
'
;
import
FilteredSearchTokenKeys
from
'
./filtered_search_token_keys
'
;
const
tokenKeys
=
[
{
formattedKey
:
__
(
'
Status
'
),
key
:
'
status
'
,
type
:
'
string
'
,
param
:
'
status
'
,
symbol
:
''
,
icon
:
'
messages
'
,
tag
:
'
status
'
,
},
{
formattedKey
:
__
(
'
Type
'
),
key
:
'
type
'
,
type
:
'
string
'
,
param
:
'
type
'
,
symbol
:
''
,
icon
:
'
cube
'
,
tag
:
'
type
'
,
},
];
const
GroupRunnersFilteredSearchTokenKeys
=
new
FilteredSearchTokenKeys
(
tokenKeys
);
export
default
GroupRunnersFilteredSearchTokenKeys
;
app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js
View file @
ad2b0ee6
...
@@ -2,7 +2,7 @@ import initSettingsPanels from '~/settings_panels';
...
@@ -2,7 +2,7 @@ import initSettingsPanels from '~/settings_panels';
import
AjaxVariableList
from
'
~/ci_variable_list/ajax_variable_list
'
;
import
AjaxVariableList
from
'
~/ci_variable_list/ajax_variable_list
'
;
import
initVariableList
from
'
~/ci_variable_list
'
;
import
initVariableList
from
'
~/ci_variable_list
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
AdminRunnersFilteredSearchTokenKeys
from
'
~/filtered_search/admin
_runners_filtered_search_token_keys
'
;
import
GroupRunnersFilteredSearchTokenKeys
from
'
~/filtered_search/group
_runners_filtered_search_token_keys
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
import
{
FILTERED_SEARCH
}
from
'
~/pages/constants
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
...
@@ -11,7 +11,7 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -11,7 +11,7 @@ document.addEventListener('DOMContentLoaded', () => {
initFilteredSearch
({
initFilteredSearch
({
page
:
FILTERED_SEARCH
.
ADMIN_RUNNERS
,
page
:
FILTERED_SEARCH
.
ADMIN_RUNNERS
,
filteredSearchTokenKeys
:
Admin
RunnersFilteredSearchTokenKeys
,
filteredSearchTokenKeys
:
Group
RunnersFilteredSearchTokenKeys
,
anchor
:
FILTERED_SEARCH
.
GROUP_RUNNERS_ANCHOR
,
anchor
:
FILTERED_SEARCH
.
GROUP_RUNNERS_ANCHOR
,
});
});
...
...
changelogs/unreleased/fix-filtered-search-group-runners-list-view.yml
0 → 100644
View file @
ad2b0ee6
---
title
:
Fix bug in group runners filtered search
merge_request
:
37626
author
:
Arthur de Lapertosa Lisboa
type
:
fixed
spec/features/runners_spec.rb
View file @
ad2b0ee6
...
@@ -450,5 +450,19 @@ RSpec.describe 'Runners' do
...
@@ -450,5 +450,19 @@ RSpec.describe 'Runners' do
expect
(
all
(
:link
,
href:
group_runner_path
(
group
,
runner
)).
length
).
to
eq
(
1
)
expect
(
all
(
:link
,
href:
group_runner_path
(
group
,
runner
)).
length
).
to
eq
(
1
)
end
end
end
end
context
'filtered search'
do
it
'allows user to search by status and type'
,
:js
do
visit
group_settings_ci_cd_path
(
group
)
find
(
'.filtered-search'
).
click
page
.
within
(
'#js-dropdown-hint'
)
do
expect
(
page
).
to
have_content
(
'Status'
)
expect
(
page
).
to
have_content
(
'Type'
)
expect
(
page
).
not_to
have_content
(
'Tag'
)
end
end
end
end
end
end
end
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