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
c8814c35
Commit
c8814c35
authored
Feb 19, 2020
by
jerasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add responsivity to environments table
Added responsivity to the cluster environments table
parent
e8ac9eef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
6 deletions
+19
-6
changelogs/unreleased/13810-cluster-environments-table.yml
changelogs/unreleased/13810-cluster-environments-table.yml
+5
-0
ee/app/assets/javascripts/clusters/components/environments.vue
...p/assets/javascripts/clusters/components/environments.vue
+10
-6
ee/spec/frontend/clusters/components/environments_spec.js
ee/spec/frontend/clusters/components/environments_spec.js
+4
-0
No files found.
changelogs/unreleased/13810-cluster-environments-table.yml
0 → 100644
View file @
c8814c35
---
title
:
Add responsivity to cluster environments table
merge_request
:
25501
author
:
type
:
fixed
ee/app/assets/javascripts/clusters/components/environments.vue
View file @
c8814c35
...
@@ -71,14 +71,14 @@ export default {
...
@@ -71,14 +71,14 @@ export default {
},
},
created
()
{
created
()
{
this
.
$options
.
fields
=
[
this
.
$options
.
fields
=
[
{
key
:
'
project
'
,
label
:
__
(
'
Project
'
),
class
:
'
pl-
0 pr
-5 text-nowrap
'
},
{
key
:
'
project
'
,
label
:
__
(
'
Project
'
),
class
:
'
pl-
md-0 pr-md
-5 text-nowrap
'
},
{
key
:
'
name
'
,
label
:
__
(
'
Environment
'
),
class
:
'
pl-
0 pr
-5
'
},
{
key
:
'
name
'
,
label
:
__
(
'
Environment
'
),
class
:
'
pl-
md-0 pr-md
-5
'
},
{
key
:
'
lastDeployment
'
,
label
:
__
(
'
Job
'
),
class
:
'
pl-
0 pr
-5 text-nowrap
'
},
{
key
:
'
lastDeployment
'
,
label
:
__
(
'
Job
'
),
class
:
'
pl-
md-0 pr-md
-5 text-nowrap
'
},
{
key
:
'
rolloutStatus
'
,
label
:
__
(
'
Pods in use
'
),
class
:
'
pl-
0 pr
-5
'
},
{
key
:
'
rolloutStatus
'
,
label
:
__
(
'
Pods in use
'
),
class
:
'
pl-
md-0 pr-md
-5
'
},
{
{
key
:
'
updatedAt
'
,
key
:
'
updatedAt
'
,
label
:
__
(
'
Last updated
'
),
label
:
__
(
'
Last updated
'
),
class
:
'
pl-
0 pr
-0 text-md-right text-nowrap
'
,
class
:
'
pl-
md-0 pr-md
-0 text-md-right text-nowrap
'
,
},
},
];
];
},
},
...
@@ -105,6 +105,7 @@ export default {
...
@@ -105,6 +105,7 @@ export default {
:fields=
"$options.fields"
:fields=
"$options.fields"
:items=
"environments"
:items=
"environments"
head-variant=
"white"
head-variant=
"white"
stacked=
"md"
>
>
<!-- column: Project -->
<!-- column: Project -->
<template
#cell(project)=
"data"
>
<template
#cell(project)=
"data"
>
...
@@ -134,7 +135,10 @@ export default {
...
@@ -134,7 +135,10 @@ export default {
/>
/>
<!-- Rollout Instances -->
<!-- Rollout Instances -->
<div
v-else-if=
"hasInstances(row.item.rolloutStatus)"
class=
"d-flex flex-wrap flex-row"
>
<div
v-else-if=
"hasInstances(row.item.rolloutStatus)"
class=
"d-flex flex-wrap flex-row justify-content-end justify-content-md-start"
>
<template
v-for=
"(instance, i) in row.item.rolloutStatus.instances"
>
<template
v-for=
"(instance, i) in row.item.rolloutStatus.instances"
>
<deployment-instance
<deployment-instance
:key=
"i"
:key=
"i"
...
...
ee/spec/frontend/clusters/components/environments_spec.js
View file @
c8814c35
...
@@ -60,6 +60,10 @@ describe('Environments', () => {
...
@@ -60,6 +60,10 @@ describe('Environments', () => {
tableHeaders
.
forEach
((
headerText
,
i
)
=>
expect
(
headers
.
at
(
i
).
text
()).
toEqual
(
headerText
));
tableHeaders
.
forEach
((
headerText
,
i
)
=>
expect
(
headers
.
at
(
i
).
text
()).
toEqual
(
headerText
));
});
});
it
(
'
should stack on smaller devices
'
,
()
=>
{
expect
(
table
.
classes
()).
toContain
(
'
b-table-stacked-md
'
);
});
describe
(
'
deployment instances
'
,
()
=>
{
describe
(
'
deployment instances
'
,
()
=>
{
let
tableRows
;
let
tableRows
;
...
...
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