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
Boxiang Sun
gitlab-ce
Commits
29ed911d
Commit
29ed911d
authored
May 11, 2018
by
Dennis Tang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more component cleanup
parent
3daa298d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
27 deletions
+24
-27
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
...luster_dropdowns/components/gke_machine_type_dropdown.vue
+8
-9
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
..._cluster_dropdowns/components/gke_project_id_dropdown.vue
+8
-9
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
...ts/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
+8
-9
No files found.
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
View file @
29ed911d
...
@@ -7,12 +7,6 @@ import gkeDropdownMixin from './gke_dropdown_mixin';
...
@@ -7,12 +7,6 @@ import gkeDropdownMixin from './gke_dropdown_mixin';
export
default
{
export
default
{
name
:
'
GkeMachineTypeDropdown
'
,
name
:
'
GkeMachineTypeDropdown
'
,
mixins
:
[
gkeDropdownMixin
],
mixins
:
[
gkeDropdownMixin
],
data
()
{
return
{
searchPlaceholderText
:
s__
(
'
ClusterIntegration|Search machine types
'
),
noSearchResultsText
:
s__
(
'
ClusterIntegration|No machine types matched your search
'
),
};
},
computed
:
{
computed
:
{
...
mapState
([
'
selectedProject
'
,
'
selectedZone
'
,
'
selectedMachineType
'
]),
...
mapState
([
'
selectedProject
'
,
'
selectedZone
'
,
'
selectedMachineType
'
]),
...
mapState
({
items
:
'
machineTypes
'
}),
...
mapState
({
items
:
'
machineTypes
'
}),
...
@@ -87,18 +81,23 @@ export default {
...
@@ -87,18 +81,23 @@ export default {
<div
class=
"dropdown-menu dropdown-select"
>
<div
class=
"dropdown-menu dropdown-select"
>
<dropdown-search-input
<dropdown-search-input
v-model=
"searchQuery"
v-model=
"searchQuery"
:placeholder-text=
"s
earchPlaceholderText
"
:placeholder-text=
"s
__('ClusterIntegration|Search machine types')
"
/>
/>
<div
class=
"dropdown-content"
>
<div
class=
"dropdown-content"
>
<ul>
<ul>
<li
v-show=
"!results.length"
>
<li
v-show=
"!results.length"
>
<span
class=
"menu-item"
>
{{
noSearchResultsText
}}
</span>
<span
class=
"menu-item"
>
{{
s__
(
'
ClusterIntegration|No machine types matched your search
'
)
}}
</span>
</li>
</li>
<li
<li
v-for=
"result in results"
v-for=
"result in results"
:key=
"result.id"
:key=
"result.id"
>
>
<button
@
click.prevent=
"setItem(result.name)"
>
<button
type=
"button"
@
click.prevent=
"setItem(result.name)"
>
{{
result
.
name
}}
{{
result
.
name
}}
</button>
</button>
</li>
</li>
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
View file @
29ed911d
...
@@ -14,12 +14,6 @@ export default {
...
@@ -14,12 +14,6 @@ export default {
required
:
true
,
required
:
true
,
},
},
},
},
data
()
{
return
{
searchPlaceholderText
:
s__
(
'
ClusterIntegration|Search projects
'
),
noSearchResultsText
:
s__
(
'
ClusterIntegration|No projects matched your search
'
),
};
},
computed
:
{
computed
:
{
...
mapState
([
'
selectedProject
'
]),
...
mapState
([
'
selectedProject
'
]),
...
mapState
({
items
:
'
projects
'
}),
...
mapState
({
items
:
'
projects
'
}),
...
@@ -116,18 +110,23 @@ export default {
...
@@ -116,18 +110,23 @@ export default {
<div
class=
"dropdown-menu dropdown-select"
>
<div
class=
"dropdown-menu dropdown-select"
>
<dropdown-search-input
<dropdown-search-input
v-model=
"searchQuery"
v-model=
"searchQuery"
:placeholder-text=
"s
earchPlaceholderText
"
:placeholder-text=
"s
__('ClusterIntegration|Search projects')
"
/>
/>
<div
class=
"dropdown-content"
>
<div
class=
"dropdown-content"
>
<ul>
<ul>
<li
v-show=
"!results.length"
>
<li
v-show=
"!results.length"
>
<span
class=
"menu-item"
>
{{
noSearchResultsText
}}
</span>
<span
class=
"menu-item"
>
{{
s__
(
'
ClusterIntegration|No projects matched your search
'
)
}}
</span>
</li>
</li>
<li
<li
v-for=
"result in results"
v-for=
"result in results"
:key=
"result.project_number"
:key=
"result.project_number"
>
>
<button
@
click.prevent=
"setItem(result)"
>
<button
type=
"button"
@
click.prevent=
"setItem(result)"
>
{{
result
.
name
}}
{{
result
.
name
}}
</button>
</button>
</li>
</li>
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
View file @
29ed911d
...
@@ -7,12 +7,6 @@ import gkeDropdownMixin from './gke_dropdown_mixin';
...
@@ -7,12 +7,6 @@ import gkeDropdownMixin from './gke_dropdown_mixin';
export
default
{
export
default
{
name
:
'
GkeZoneDropdown
'
,
name
:
'
GkeZoneDropdown
'
,
mixins
:
[
gkeDropdownMixin
],
mixins
:
[
gkeDropdownMixin
],
data
()
{
return
{
searchPlaceholderText
:
s__
(
'
ClusterIntegration|Search zones
'
),
noSearchResultsText
:
s__
(
'
ClusterIntegration|No zones matched your search
'
),
};
},
computed
:
{
computed
:
{
...
mapState
([
'
selectedProject
'
,
'
selectedZone
'
]),
...
mapState
([
'
selectedProject
'
,
'
selectedZone
'
]),
...
mapState
({
items
:
'
zones
'
}),
...
mapState
({
items
:
'
zones
'
}),
...
@@ -68,18 +62,23 @@ export default {
...
@@ -68,18 +62,23 @@ export default {
<div
class=
"dropdown-menu dropdown-select"
>
<div
class=
"dropdown-menu dropdown-select"
>
<dropdown-search-input
<dropdown-search-input
v-model=
"searchQuery"
v-model=
"searchQuery"
:placeholder-text=
"s
earchPlaceholderText
"
:placeholder-text=
"s
__('ClusterIntegration|Search zones')
"
/>
/>
<div
class=
"dropdown-content"
>
<div
class=
"dropdown-content"
>
<ul>
<ul>
<li
v-show=
"!results.length"
>
<li
v-show=
"!results.length"
>
<span
class=
"menu-item"
>
{{
noSearchResultsText
}}
</span>
<span
class=
"menu-item"
>
{{
s__
(
'
ClusterIntegration|No zones matched your search
'
)
}}
</span>
</li>
</li>
<li
<li
v-for=
"result in results"
v-for=
"result in results"
:key=
"result.id"
:key=
"result.id"
>
>
<button
@
click.prevent=
"setItem(result.name)"
>
<button
type=
"button"
@
click.prevent=
"setItem(result.name)"
>
{{
result
.
name
}}
{{
result
.
name
}}
</button>
</button>
</li>
</li>
...
...
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