diff --git a/app/components/collection-table-row/styles.scss b/app/components/collection-table-row/styles.scss
index cb476c988..0458d89e4 100644
--- a/app/components/collection-table-row/styles.scss
+++ b/app/components/collection-table-row/styles.scss
@@ -1,3 +1,28 @@
-.events-thumbnail {
- width: 100%;
+& {
+ .events-thumbnail {
+ width: 100%;
+ }
+
+ .branch {
+ i {
+ vertical-align: middle;
+ }
+
+ span {
+ display: inline-block;
+ max-width: 70%;
+ vertical-align: middle;
+ }
+ }
+
+ .app-id a {
+ max-width: 95%;
+ }
+
+ .branch span,
+ .app-id a {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
diff --git a/app/components/collection-table-row/template.hbs b/app/components/collection-table-row/template.hbs
index 2beb875ef..cc2338ad8 100644
--- a/app/components/collection-table-row/template.hbs
+++ b/app/components/collection-table-row/template.hbs
@@ -4,11 +4,16 @@
{{/if}}
|
- {{#link-to "pipeline" pipeline.id}}{{pipeline.scmRepo.name}}{{/link-to}}
+ {{#link-to "pipeline" pipeline.id title=pipeline.scmRepo.name}}{{pipeline.scmRepo.name}}{{/link-to}}
+ |
+
+ {{fa-icon "code-fork"}}
+ {{pipeline.branch}}
|
-{{fa-icon "code-fork"}}{{pipeline.branch}} |
- {{fa-icon lastEventInfo.icon class=lastEventInfo.statusColor}}
+ {{#link-to "pipeline" pipeline.id title=pipeline.scmRepo.name}}
+ {{fa-icon lastEventInfo.icon class=lastEventInfo.statusColor}}
+ {{/link-to}}
{{lastEventInfo.sha}}
@@ -22,7 +27,7 @@
|
{{events-thumbnail
events=eventsInfo
- pipeline=pipeline.id
+ pipelineId=pipeline.id
class="events-thumbnail"
}}
|
diff --git a/app/components/collection-view/component.js b/app/components/collection-view/component.js
index d5e25d364..1ec680726 100644
--- a/app/components/collection-view/component.js
+++ b/app/components/collection-view/component.js
@@ -96,8 +96,10 @@ export default Component.extend({
return 'ban';
case 'unstable':
return 'exclamation-circle';
+ case 'frozen':
+ return 'minus-circle';
default:
- return '';
+ return 'question-circle';
}
};
@@ -116,8 +118,10 @@ export default Component.extend({
return 'build-running';
case 'unstable':
return 'build-unstable';
+ case 'frozen':
+ return 'build-frozen';
default:
- return '';
+ return 'build-unknown';
}
};
@@ -175,13 +179,13 @@ export default Component.extend({
.padStart(2, '0');
ret.eventsInfo = metrics.map(event => ({
- duration: event.duration,
+ duration: event.duration || 0,
statusColor: getColor(event.status.toLowerCase())
}));
ret.lastEventInfo = {
startTime: `${lastEventStartMonth}/${lastEventStartDay}/${lastEventStartYear}`,
statusColor: getColor(lastEvent.status.toLowerCase()),
- durationText: formatTime(lastEvent.duration),
+ durationText: lastEvent.duration ? formatTime(lastEvent.duration) : '--',
sha: getSha(lastEvent.sha),
icon: getIcon(lastEvent.status.toLowerCase()),
commitMessage: lastEvent.commit.message,
diff --git a/app/components/collection-view/styles.scss b/app/components/collection-view/styles.scss
index 5b07324a4..ecb7c63d2 100644
--- a/app/components/collection-view/styles.scss
+++ b/app/components/collection-view/styles.scss
@@ -1,6 +1,8 @@
.collection-view {
overflow-y: scroll;
+ overflow-x: hidden;
height: calc(100vh - 56px);
+ width: 100%;
button {
border: none;
@@ -162,15 +164,18 @@
}
.app-id {
- width: 22%;
+ width: 20%;
+ max-width: 400px;
}
.branch {
- width: 15%;
+ width: 12%;
+ max-width: 200px;
}
.status {
- width: 10%;
+ width: 15%;
+ min-width: 120px;
a {
display: inline;
@@ -291,6 +296,67 @@
}
}
+ @media screen and (max-width: 900px) {
+ .pipeline-card {
+ width: 100%;
+ }
+
+ .app-id {
+ max-width: 180px;
+ width: 21%;
+ }
+
+ .branch {
+ max-width: 180px;
+ width: 21%;
+ }
+
+ .status {
+ width: 20%;
+ }
+
+ .start {
+ width: 15%;
+ }
+
+ .duration {
+ width: 15%;
+ }
+
+ .history {
+ display: none;
+ }
+ }
+
+ @media screen and (max-width: 768px) {
+ .header__organize {
+ justify-content: flex-start;
+ }
+
+ .duration {
+ display: none;
+ }
+
+ .app-id {
+ max-width: 120px;
+ width: 26%;
+ }
+
+ .branch {
+ max-width: 120px;
+ width: 26%;
+ }
+
+ .status {
+ width: 23%;
+ min-width: 120px;
+ }
+
+ .start {
+ width: 17%;
+ }
+ }
+
// sass-lint:disable class-name-format
.collection-pipeline__remove {
opacity: 0;
@@ -322,10 +388,18 @@
color: $sd-unstable;
}
+ .build-frozen {
+ color: $sd-frozen;
+ }
+
.build-empty {
color: $sd-no-build;
}
+ .build-unknown {
+ color: $sd-no-build;
+ }
+
.description-placeholder {
opacity: 0.5;
}
diff --git a/app/components/collection-view/template.hbs b/app/components/collection-view/template.hbs
index 0b68c4a36..bb327e309 100644
--- a/app/components/collection-view/template.hbs
+++ b/app/components/collection-view/template.hbs
@@ -9,7 +9,7 @@
{{info-message message=linkCopied type="success" icon="check"}}
{{/if}}