Skip to content

Commit

Permalink
chore: show bulk upload status icons + tooltip
Browse files Browse the repository at this point in the history
  • Loading branch information
amirch1 committed Jul 19, 2020
1 parent ff3c1f5 commit 2994fbc
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@
</td>

<td class="ui-resizable-column">
<i [class]="bulkLogItem.status | kBulkLogTableStatusIcon"></i>
<span class="kTableColumn" [kTooltip]="bulkLogItem.status | kBulkLogTableStatus" [showOnEllipsis]="true">
{{bulkLogItem.status | kBulkLogTableStatus}}
</span>
<div class="kStatusRow">
<i [class]="bulkLogItem.status | kBulkLogTableStatusIcon" [kTooltip]="bulkLogItem.error ? bulkLogItem.error : ''"></i>
<span class="kTableColumn" [kTooltip]="bulkLogItem.status | kBulkLogTableStatus" [showOnEllipsis]="true">
{{bulkLogItem.status | kBulkLogTableStatus}}
</span>
</div>
</td>

<td [ngStyle]="{'width': '80px'}" *ngIf="_actionsAllowed">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@
.kBulkLogTableFailed {
color: $kDandger;
}
.kStatusRow {
display: flex;
align-items: center;
.kStatusIcon {
margin-right: 8px;
cursor: pointer;
}
}

}

:host {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ export class BulkLogStatusIconPipe implements PipeTransform {
case KalturaBatchJobStatus.pending:
case KalturaBatchJobStatus.queued:
case KalturaBatchJobStatus.dontProcess:
return 'kIconUpload2 kBulkLogTablePending';
return 'kStatusIcon kIconupload2 kBulkLogTablePending';

case KalturaBatchJobStatus.processing:
case KalturaBatchJobStatus.almostDone:
return 'kIconSync kBulkLogTableProgress';
return 'kStatusIcon kIconsync kBulkLogTableProgress';

case KalturaBatchJobStatus.finished:
case KalturaBatchJobStatus.finishedPartially: // waiting for icon
return 'kIconComplete kBulkLogTableSuccess';
return 'kStatusIcon kIconcomplete kBulkLogTableSuccess';

case KalturaBatchJobStatus.failed:
case KalturaBatchJobStatus.fatal:
case KalturaBatchJobStatus.aborted: // waiting for icon
case KalturaBatchJobStatus.retry: // waiting for icon
return 'kIconError kBulkLogTableFailed';
return 'kStatusIcon kIconerror kBulkLogTableFailed';

default:
return '';
Expand Down

0 comments on commit 2994fbc

Please sign in to comment.