From 3ab2420c7e030bd172cc76dd67612151de53b64a Mon Sep 17 00:00:00 2001
From: Tzahi12345 <tzahi2@hotmail.com>
Date: Mon, 22 May 2023 23:31:18 -0400
Subject: [PATCH] Combined download stage and download progress columns

---
 .../downloads/downloads.component.html        | 19 ++++++++-----------
 .../downloads/downloads.component.ts          |  4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/app/components/downloads/downloads.component.html b/src/app/components/downloads/downloads.component.html
index 006dbcc..fc26145 100644
--- a/src/app/components/downloads/downloads.component.html
+++ b/src/app/components/downloads/downloads.component.html
@@ -31,25 +31,22 @@
             </mat-cell>
           </ng-container>
       
-          <!-- Stage Column -->
-          <ng-container matColumnDef="step_index">
-            <mat-header-cell *matHeaderCellDef mat-sort-header> <ng-container i18n="Stage">Stage</ng-container> </mat-header-cell>
-            <mat-cell *matCellDef="let element">
-              <ng-container *ngIf="!element.error">{{STEP_INDEX_TO_LABEL[element.step_index]}}</ng-container>
-              <ng-container *ngIf="element.error" i18n="Error">Error</ng-container>
-            </mat-cell>
-          </ng-container>
-      
           <!-- Progress Column -->
           <ng-container matColumnDef="percent_complete">
             <mat-header-cell *matHeaderCellDef mat-sort-header> <ng-container i18n="Progress">Progress</ng-container> </mat-header-cell>
             <mat-cell *matCellDef="let element">
+              <ng-container *ngIf="!element.error && element.step_index !== 2">
+                {{STEP_INDEX_TO_LABEL[element.step_index]}}
+              </ng-container>
+              <ng-container *ngIf="!element.error && element.step_index === 2">
                 <ng-container *ngIf="element.percent_complete">
-                    {{+(element.percent_complete) > 100 ? '100' : element.percent_complete}}%
+                  {{+(element.percent_complete) > 100 ? '100' : element.percent_complete}}%
                 </ng-container>
                 <ng-container *ngIf="!element.percent_complete">
-                    N/A
+                  N/A
                 </ng-container>
+              </ng-container>
+              <ng-container *ngIf="element.error" i18n="Error">Error</ng-container>
             </mat-cell>
           </ng-container>
 
diff --git a/src/app/components/downloads/downloads.component.ts b/src/app/components/downloads/downloads.component.ts
index 1dee2d1..dafb692 100644
--- a/src/app/components/downloads/downloads.component.ts
+++ b/src/app/components/downloads/downloads.component.ts
@@ -39,8 +39,8 @@ export class DownloadsComponent implements OnInit, OnDestroy {
   }
 
   actionsFlex = 2;
-  displayedColumnsBig: string[] = ['timestamp_start', 'title', 'step_index', 'sub_name', 'percent_complete', 'actions'];
-  displayedColumnsSmall: string[] = ['title', 'step_index', 'percent_complete', 'actions'];
+  displayedColumnsBig: string[] = ['timestamp_start', 'title', 'sub_name', 'percent_complete', 'actions'];
+  displayedColumnsSmall: string[] = ['title', 'percent_complete', 'actions'];
   displayedColumns: string[] = this.displayedColumnsBig;
   dataSource = null; // new MatTableDataSource<Download>();