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
3fc41db3
Commit
3fc41db3
authored
Dec 09, 2020
by
Brandon Labuschagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Filter groups in devops modal
We add the functionality to filter the group values in this commit.
parent
032de703
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
96 additions
and
2 deletions
+96
-2
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_segment_modal.vue
...v_ops_report/components/devops_adoption_segment_modal.vue
+26
-1
ee/app/assets/javascripts/admin/dev_ops_report/constants.js
ee/app/assets/javascripts/admin/dev_ops_report/constants.js
+2
-0
ee/spec/frontend/admin/dev_ops_report/components/devops_adoption_segment_modal_spec.js
...s_report/components/devops_adoption_segment_modal_spec.js
+60
-1
ee/spec/frontend/admin/dev_ops_report/mock_data.js
ee/spec/frontend/admin/dev_ops_report/mock_data.js
+2
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
ee/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_segment_modal.vue
View file @
3fc41db3
...
@@ -6,6 +6,7 @@ import {
...
@@ -6,6 +6,7 @@ import {
GlModal
,
GlModal
,
GlSprintf
,
GlSprintf
,
GlAlert
,
GlAlert
,
GlIcon
,
}
from
'
@gitlab/ui
'
;
}
from
'
@gitlab/ui
'
;
import
{
getIdFromGraphQLId
,
convertToGraphQLIds
,
TYPE_GROUP
}
from
'
~/graphql_shared/utils
'
;
import
{
getIdFromGraphQLId
,
convertToGraphQLIds
,
TYPE_GROUP
}
from
'
~/graphql_shared/utils
'
;
import
*
as
Sentry
from
'
~/sentry/wrapper
'
;
import
*
as
Sentry
from
'
~/sentry/wrapper
'
;
...
@@ -23,6 +24,7 @@ export default {
...
@@ -23,6 +24,7 @@ export default {
GlFormCheckboxTree
,
GlFormCheckboxTree
,
GlSprintf
,
GlSprintf
,
GlAlert
,
GlAlert
,
GlIcon
,
},
},
props
:
{
props
:
{
segment
:
{
segment
:
{
...
@@ -40,6 +42,7 @@ export default {
...
@@ -40,6 +42,7 @@ export default {
return
{
return
{
name
:
this
.
segment
?.
name
||
''
,
name
:
this
.
segment
?.
name
||
''
,
checkboxValues
:
this
.
segment
?
this
.
checkboxValuesFromSegment
()
:
[],
checkboxValues
:
this
.
segment
?
this
.
checkboxValuesFromSegment
()
:
[],
filter
:
''
,
loading
:
false
,
loading
:
false
,
errors
:
[],
errors
:
[],
};
};
...
@@ -78,6 +81,13 @@ export default {
...
@@ -78,6 +81,13 @@ export default {
modalTitle
()
{
modalTitle
()
{
return
this
.
segment
?
this
.
$options
.
i18n
.
editingTitle
:
this
.
$options
.
i18n
.
addingTitle
;
return
this
.
segment
?
this
.
$options
.
i18n
.
editingTitle
:
this
.
$options
.
i18n
.
addingTitle
;
},
},
filteredOptions
()
{
return
this
.
filter
?
this
.
checkboxOptions
.
filter
(
option
=>
option
.
label
.
toLowerCase
().
includes
(
this
.
filter
.
toLowerCase
()),
)
:
this
.
checkboxOptions
;
},
},
},
methods
:
{
methods
:
{
async
createSegment
()
{
async
createSegment
()
{
...
@@ -180,15 +190,30 @@ export default {
...
@@ -180,15 +190,30 @@ export default {
:disabled=
"loading"
:disabled=
"loading"
/>
/>
</gl-form-group>
</gl-form-group>
<gl-form-group
class=
"gl-mb-3"
data-testid=
"filter"
>
<gl-icon
name=
"search"
:size=
"18"
class=
"gl-text-gray-300 gl-absolute gl-mt-3 gl-ml-3"
/>
<gl-form-input
v-model=
"filter"
class=
"gl-pl-7!"
type=
"text"
:placeholder=
"$options.i18n.filterPlaceholder"
:disabled=
"loading"
/>
</gl-form-group>
<gl-form-group
class=
"gl-mb-0"
>
<gl-form-group
class=
"gl-mb-0"
>
<gl-form-checkbox-tree
<gl-form-checkbox-tree
v-if=
"filteredOptions.length"
:key=
"filteredOptions.length"
v-model=
"checkboxValues"
v-model=
"checkboxValues"
data-testid=
"groups"
data-testid=
"groups"
:options=
"
checkbox
Options"
:options=
"
filtered
Options"
:hide-toggle-all=
"true"
:hide-toggle-all=
"true"
:disabled=
"loading"
:disabled=
"loading"
class=
"gl-p-3 gl-pb-0 gl-mb-2 gl-border-1 gl-border-solid gl-border-gray-100 gl-rounded-base"
class=
"gl-p-3 gl-pb-0 gl-mb-2 gl-border-1 gl-border-solid gl-border-gray-100 gl-rounded-base"
/>
/>
<gl-alert
v-else
variant=
"info"
:dismissible=
"false"
data-testid=
"filter-warning"
>
{{
$options
.
i18n
.
noResults
}}
</gl-alert>
<div
class=
"gl-text-gray-400"
data-testid=
"groupsHelperText"
>
<div
class=
"gl-text-gray-400"
data-testid=
"groupsHelperText"
>
<gl-sprintf
<gl-sprintf
:message=
"
:message=
"
...
...
ee/app/assets/javascripts/admin/dev_ops_report/constants.js
View file @
3fc41db3
...
@@ -42,10 +42,12 @@ export const DEVOPS_ADOPTION_STRINGS = {
...
@@ -42,10 +42,12 @@ export const DEVOPS_ADOPTION_STRINGS = {
editingButton
:
s__
(
'
DevopsAdoption|Save changes
'
),
editingButton
:
s__
(
'
DevopsAdoption|Save changes
'
),
cancel
:
__
(
'
Cancel
'
),
cancel
:
__
(
'
Cancel
'
),
namePlaceholder
:
s__
(
'
DevopsAdoption|My segment
'
),
namePlaceholder
:
s__
(
'
DevopsAdoption|My segment
'
),
filterPlaceholder
:
s__
(
'
DevopsAdoption|Filter by name
'
),
nameLabel
:
s__
(
'
DevopsAdoption|Name
'
),
nameLabel
:
s__
(
'
DevopsAdoption|Name
'
),
selectedGroupsTextSingular
:
s__
(
'
DevopsAdoption|%{selectedCount} group selected (20 max)
'
),
selectedGroupsTextSingular
:
s__
(
'
DevopsAdoption|%{selectedCount} group selected (20 max)
'
),
selectedGroupsTextPlural
:
s__
(
'
DevopsAdoption|%{selectedCount} groups selected (20 max)
'
),
selectedGroupsTextPlural
:
s__
(
'
DevopsAdoption|%{selectedCount} groups selected (20 max)
'
),
error
:
s__
(
'
DevopsAdoption|An error occured while saving the segment. Please try again.
'
),
error
:
s__
(
'
DevopsAdoption|An error occured while saving the segment. Please try again.
'
),
noResults
:
s__
(
'
DevopsAdoption|No filter results.
'
),
},
},
table
:
{
table
:
{
editButton
:
s__
(
'
DevopsAdoption|Edit segment
'
),
editButton
:
s__
(
'
DevopsAdoption|Edit segment
'
),
...
...
ee/spec/frontend/admin/dev_ops_report/components/devops_adoption_segment_modal_spec.js
View file @
3fc41db3
import
{
ApolloMutation
}
from
'
vue-apollo
'
;
import
{
ApolloMutation
}
from
'
vue-apollo
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlModal
,
GlFormInput
,
GlSprintf
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
GlModal
,
GlFormInput
,
GlSprintf
,
GlAlert
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
getByText
}
from
'
@testing-library/dom
'
;
import
{
getByText
}
from
'
@testing-library/dom
'
;
import
{
nextTick
}
from
'
vue
'
;
import
{
nextTick
}
from
'
vue
'
;
import
waitForPromises
from
'
helpers/wait_for_promises
'
;
import
waitForPromises
from
'
helpers/wait_for_promises
'
;
...
@@ -15,6 +15,7 @@ import {
...
@@ -15,6 +15,7 @@ import {
genericErrorMessage
,
genericErrorMessage
,
dataErrorMessage
,
dataErrorMessage
,
devopsAdoptionSegmentsData
,
devopsAdoptionSegmentsData
,
groupNodeLabelValues
,
}
from
'
../mock_data
'
;
}
from
'
../mock_data
'
;
const
mockEvent
=
{
preventDefault
:
jest
.
fn
()
};
const
mockEvent
=
{
preventDefault
:
jest
.
fn
()
};
...
@@ -133,6 +134,64 @@ describe('DevopsAdoptionSegmentModal', () => {
...
@@ -133,6 +134,64 @@ describe('DevopsAdoptionSegmentModal', () => {
});
});
});
});
describe
(
'
filtering
'
,
()
=>
{
describe
(
'
filter input field
'
,
()
=>
{
it
(
'
contains the filter input
'
,
()
=>
{
const
filter
=
findByTestId
(
'
filter
'
);
expect
(
filter
.
exists
()).
toBe
(
true
);
expect
(
filter
.
find
(
GlFormInput
).
exists
()).
toBe
(
true
);
});
it
(
'
contains the filter icon
'
,
()
=>
{
const
icon
=
findByTestId
(
'
filter
'
).
find
(
GlIcon
);
expect
(
icon
.
exists
()).
toBe
(
true
);
expect
(
icon
.
props
(
'
name
'
)).
toBe
(
'
search
'
);
});
});
it
.
each
`
filter | results
${
''
}
|
${
groupNodeLabelValues
}
${
'
fo
'
}
|
${[
groupNodeLabelValues
[
0
]]}
${
'
ar
'
}
|
${[
groupNodeLabelValues
[
1
]]}
`
(
'
displays the correct results when filtering for value "$filter"
'
,
async
({
filter
,
results
})
=>
{
wrapper
.
setData
({
filter
});
await
nextTick
();
const
checkboxes
=
findByTestId
(
'
groups
'
);
expect
(
checkboxes
.
props
(
'
options
'
)).
toStrictEqual
(
results
);
},
);
describe
(
'
when there are no filter results
'
,
()
=>
{
beforeEach
(
async
()
=>
{
wrapper
.
setData
({
filter
:
'
lalalala
'
});
await
nextTick
();
});
it
(
'
displays a warning message when there are no results
'
,
async
()
=>
{
const
warning
=
findByTestId
(
'
filter-warning
'
);
expect
(
warning
.
exists
()).
toBe
(
true
);
expect
(
warning
.
text
()).
toBe
(
'
No filter results.
'
);
expect
(
warning
.
props
(
'
variant
'
)).
toBe
(
'
info
'
);
});
it
(
'
hides the checkboxes
'
,
()
=>
{
const
checkboxes
=
findByTestId
(
'
groups
'
);
expect
(
checkboxes
.
exists
()).
toBe
(
false
);
});
});
});
it
(
'
does not display an error
'
,
()
=>
{
it
(
'
does not display an error
'
,
()
=>
{
expect
(
findAlert
().
exists
()).
toBe
(
false
);
expect
(
findAlert
().
exists
()).
toBe
(
false
);
});
});
...
...
ee/spec/frontend/admin/dev_ops_report/mock_data.js
View file @
3fc41db3
...
@@ -17,6 +17,8 @@ export const groupNodes = [
...
@@ -17,6 +17,8 @@ export const groupNodes = [
},
},
];
];
export
const
groupNodeLabelValues
=
[{
label
:
'
Foo
'
,
value
:
'
1
'
},
{
label
:
'
Bar
'
,
value
:
'
2
'
}];
export
const
groupIds
=
[
'
1
'
,
'
2
'
];
export
const
groupIds
=
[
'
1
'
,
'
2
'
];
export
const
groupGids
=
[
'
gid://gitlab/Group/1
'
,
'
gid://gitlab/Group/2
'
];
export
const
groupGids
=
[
'
gid://gitlab/Group/1
'
,
'
gid://gitlab/Group/2
'
];
...
...
locale/gitlab.pot
View file @
3fc41db3
...
@@ -9640,6 +9640,9 @@ msgstr ""
...
@@ -9640,6 +9640,9 @@ msgstr ""
msgid "DevopsAdoption|Feature adoption is based on usage in the last calendar month. Last updated: %{timestamp}."
msgid "DevopsAdoption|Feature adoption is based on usage in the last calendar month. Last updated: %{timestamp}."
msgstr ""
msgstr ""
msgid "DevopsAdoption|Filter by name"
msgstr ""
msgid "DevopsAdoption|Issues"
msgid "DevopsAdoption|Issues"
msgstr ""
msgstr ""
...
@@ -9655,6 +9658,9 @@ msgstr ""
...
@@ -9655,6 +9658,9 @@ msgstr ""
msgid "DevopsAdoption|New segment"
msgid "DevopsAdoption|New segment"
msgstr ""
msgstr ""
msgid "DevopsAdoption|No filter results."
msgstr ""
msgid "DevopsAdoption|Pipelines"
msgid "DevopsAdoption|Pipelines"
msgstr ""
msgstr ""
...
...
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