ci/cd + any fixes

jambotron-ui/src/app/modules/admin-module/components/json-dump.component/json-dump.component.html

@@ -1,8 +1,8 @@
-<div class="json-dump-container" *ngIf="!loading; else loadingTpl">
-  <h2>JSON Dump Management</h2>
-
-  <!-- Entity-specific Export/Import -->
- <!-- <div class="entity-actions" *ngFor="let entity of entityTypes">
+@if (!loading) {
+  <div class="json-dump-container">
+    <h2>JSON Dump Management</h2>
+    <!-- Entity-specific Export/Import -->
+    <!-- <div class="entity-actions" *ngFor="let entity of entityTypes">
     <h3>{{ entity | titlecase }}</h3>
     <button mat-raised-button color="primary" (click)="exportEntity(entity)">
       <mat-icon>download</mat-icon> Export {{ entity }}
@@ -38,51 +38,48 @@
           accept=".json"
           (change)="onFileSelected($event, entity)"
           hidden
-        />
-      </mat-toolbar-row>
-    }
-  </mat-toolbar>
-  <!-- Files Table -->
-  <h3>Available JSON Files</h3>
-  <mat-table [dataSource]="files">
-    <ng-container matColumnDef="fileName">
-      <mat-header-cell *matHeaderCellDef> File Name </mat-header-cell>
-      <mat-cell *matCellDef="let file">{{ file.fileName }}</mat-cell>
-    </ng-container>
-
-    <ng-container matColumnDef="size">
-      <mat-header-cell *matHeaderCellDef> Size </mat-header-cell>
-      <mat-cell *matCellDef="let file">{{ jsonDumpService.formatFileSize(file.size) }}</mat-cell>
-    </ng-container>
-
-    <ng-container matColumnDef="lastModified">
-      <mat-header-cell *matHeaderCellDef> Last Modified </mat-header-cell>
-      <mat-cell *matCellDef="let file">{{ jsonDumpService.formatDate(file.lastModified) }}</mat-cell>
-    </ng-container>
-
-    <ng-container matColumnDef="actions">
-      <mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
-      <mat-cell *matCellDef="let file">
-        <button mat-icon-button (click)="downloadFile(file.fileName)" matTooltip="Download">
-          <mat-icon>download</mat-icon>
-        </button>
-        <button mat-icon-button color="warn" (click)="deleteFile(file.fileName)" matTooltip="Delete">
-          <mat-icon>delete</mat-icon>
-        </button>
-      </mat-cell>
-    </ng-container>
-
-    <mat-header-row *matHeaderRowDef="['fileName', 'size', 'lastModified', 'actions']"></mat-header-row>
-    <mat-row *matRowDef="let row; columns: ['fileName', 'size', 'lastModified', 'actions']"></mat-row>
-  </mat-table>
-
-  <!-- Archives -->
-  <h3>Archives</h3>
-  <mat-list>
-    <mat-list-item *ngFor="let archive of archives">{{ archive }}</mat-list-item>
-  </mat-list>
-</div>
-
-<ng-template #loadingTpl>
+          />
+        </mat-toolbar-row>
+      }
+    </mat-toolbar>
+    <!-- Files Table -->
+    <h3>Available JSON Files</h3>
+    <mat-table [dataSource]="files">
+      <ng-container matColumnDef="fileName">
+        <mat-header-cell *matHeaderCellDef> File Name </mat-header-cell>
+        <mat-cell *matCellDef="let file">{{ file.fileName }}</mat-cell>
+      </ng-container>
+      <ng-container matColumnDef="size">
+        <mat-header-cell *matHeaderCellDef> Size </mat-header-cell>
+        <mat-cell *matCellDef="let file">{{ jsonDumpService.formatFileSize(file.size) }}</mat-cell>
+      </ng-container>
+      <ng-container matColumnDef="lastModified">
+        <mat-header-cell *matHeaderCellDef> Last Modified </mat-header-cell>
+        <mat-cell *matCellDef="let file">{{ jsonDumpService.formatDate(file.lastModified) }}</mat-cell>
+      </ng-container>
+      <ng-container matColumnDef="actions">
+        <mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
+        <mat-cell *matCellDef="let file">
+          <button mat-icon-button (click)="downloadFile(file.fileName)" matTooltip="Download">
+            <mat-icon>download</mat-icon>
+          </button>
+          <button mat-icon-button color="warn" (click)="deleteFile(file.fileName)" matTooltip="Delete">
+            <mat-icon>delete</mat-icon>
+          </button>
+        </mat-cell>
+      </ng-container>
+      <mat-header-row *matHeaderRowDef="['fileName', 'size', 'lastModified', 'actions']"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: ['fileName', 'size', 'lastModified', 'actions']"></mat-row>
+    </mat-table>
+    <!-- Archives -->
+    <h3>Archives</h3>
+    <mat-list>
+      @for (archive of archives; track archive) {
+        <mat-list-item>{{ archive }}</mat-list-item>
+      }
+    </mat-list>
+  </div>
+} @else {
   <mat-spinner></mat-spinner>
-</ng-template>
+}
+

jambotron-ui/src/app/modules/admin-module/components/json-dump.component/json-dump.component.ts

@@ -12,7 +12,7 @@ import {
   MatRowDef, MatTable
 } from '@angular/material/table';
 import {MatIconButton} from '@angular/material/button';
-import {NgForOf, NgIf, TitleCasePipe} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {MatProgressSpinner} from '@angular/material/progress-spinner';
 import {MatIcon} from '@angular/material/icon';
 import {MatTooltip} from '@angular/material/tooltip';
@@ -41,12 +41,10 @@ import {MatLabel} from '@angular/material/input';
     MatCellDef,
     MatTable,
     TitleCasePipe,
-    NgIf,
-    NgForOf,
     MatToolbar,
     MatToolbarRow,
     MatLabel
-  ],
+],
   styleUrls: ['./json-dump.component.scss'],
   schemas:[CUSTOM_ELEMENTS_SCHEMA]
 })

jambotron-ui/src/app/modules/main-module/main.component/main.component.ts

@@ -7,7 +7,7 @@ import {Subscription} from 'rxjs';
 import {TokenStorageService} from '../../../services/token-storage.service';
 import {AuthService} from '../../../services/auth.service';
 import {EventBusService} from '../../../_shared/event-bus.service';
-import {CommonModule} from '@angular/common';
+
 import {MatIcon} from '@angular/material/icon';
 import {MatMenu, MatMenuItem, MatMenuTrigger} from '@angular/material/menu';
 import {MatTooltip} from '@angular/material/tooltip';
@@ -26,7 +26,6 @@ import {GlobalConstants} from '../../../global-constants';
     MatButton,
     RouterLink,
     RouterOutlet,
-    CommonModule,
     MatIcon,
     MatMiniFabButton,
     MatMenuTrigger,
@@ -34,7 +33,7 @@ import {GlobalConstants} from '../../../global-constants';
     MatMenuItem,
     MatTooltip,
     MatLabel
-  ],
+],
   schemas: [ CUSTOM_ELEMENTS_SCHEMA ],
   templateUrl: './main.component.html',
   styleUrl: './main.component.scss'

jambotron-ui/src/app/modules/user-module/docker-management-component/docker-management-component.html

@@ -6,33 +6,36 @@
     <h3>Running Containers</h3>
     <button (click)="refreshContainers()" class="btn btn-secondary">Refresh</button>
 
-    <div class="container-list" *ngIf="containers.length > 0; else noContainers">
-      <div class="container-item" *ngFor="let container of containers">
-        <div class="container-info">
-          <strong>{{container.name}}</strong>
-          <span class="image">{{container.image}}</span>
-          <span class="status" [class.running]="container.status.includes('Up')">
+    @if (containers.length > 0) {
+      <div class="container-list">
+        @for (container of containers; track container) {
+          <div class="container-item">
+            <div class="container-info">
+              <strong>{{container.name}}</strong>
+              <span class="image">{{container.image}}</span>
+              <span class="status" [class.running]="container.status.includes('Up')">
                 {{container.status}}
               </span>
-        </div>
-        <div class="container-actions">
-          <button (click)="stopContainer(container.name)"
-                  [disabled]="!container.status.includes('Up')"
-                  class="btn btn-warning">Stop</button>
-          <button (click)="startContainer(container.name)"
-                  [disabled]="container.status.includes('Up')"
-                  class="btn btn-success">Start</button>
-          <button (click)="removeContainer(container.name)"
-                  class="btn btn-danger">Remove</button>
-          <button (click)="viewLogs(container.name)"
-                  class="btn btn-info">Logs</button>
-        </div>
+            </div>
+            <div class="container-actions">
+              <button (click)="stopContainer(container.name)"
+                [disabled]="!container.status.includes('Up')"
+              class="btn btn-warning">Stop</button>
+              <button (click)="startContainer(container.name)"
+                [disabled]="container.status.includes('Up')"
+              class="btn btn-success">Start</button>
+              <button (click)="removeContainer(container.name)"
+              class="btn btn-danger">Remove</button>
+              <button (click)="viewLogs(container.name)"
+              class="btn btn-info">Logs</button>
+            </div>
+          </div>
+        }
       </div>
-    </div>
-
-    <ng-template #noContainers>
+    } @else {
       <p>No containers found</p>
-    </ng-template>
+    }
+
   </div>
 
   <!-- Run New Container -->
@@ -42,68 +45,72 @@
       <div class="form-group">
         <label>Image Name:</label>
         <input type="text" formControlName="imageName"
-               placeholder="e.g., nginx:latest" class="form-control">
-      </div>
+          placeholder="e.g., nginx:latest" class="form-control">
+        </div>
 
-      <div class="form-group">
-        <label>Container Name:</label>
-        <input type="text" formControlName="containerName"
-               placeholder="Optional container name" class="form-control">
-      </div>
+        <div class="form-group">
+          <label>Container Name:</label>
+          <input type="text" formControlName="containerName"
+            placeholder="Optional container name" class="form-control">
+          </div>
 
-      <div class="form-group">
-        <label>Ports:</label>
-        <input type="text" formControlName="ports"
-               placeholder="e.g., 8080:80" class="form-control">
-      </div>
+          <div class="form-group">
+            <label>Ports:</label>
+            <input type="text" formControlName="ports"
+              placeholder="e.g., 8080:80" class="form-control">
+            </div>
 
-      <div class="form-group">
-        <label>Environment Variables:</label>
-        <input type="text" formControlName="environmentVars"
-               placeholder="e.g., -e NODE_ENV=production" class="form-control">
-      </div>
+            <div class="form-group">
+              <label>Environment Variables:</label>
+              <input type="text" formControlName="environmentVars"
+                placeholder="e.g., -e NODE_ENV=production" class="form-control">
+              </div>
 
-      <button type="submit" [disabled]="runContainerForm.invalid || loading"
-              class="btn btn-primary">
-        {{loading ? 'Starting...' : 'Run Container'}}
-      </button>
-    </form>
-  </div>
+              <button type="submit" [disabled]="runContainerForm.invalid || loading"
+                class="btn btn-primary">
+                {{loading ? 'Starting...' : 'Run Container'}}
+              </button>
+            </form>
+          </div>
 
-  <!-- Execute Command -->
-  <div class="execute-command-section">
-    <h3>Execute Docker Command</h3>
-    <form [formGroup]="commandForm" (ngSubmit)="executeCommand()">
-      <div class="form-group">
-        <label>Docker Command:</label>
-        <input type="text" formControlName="command"
-               placeholder="e.g., docker ps -a" class="form-control">
-      </div>
-      <button type="submit" [disabled]="commandForm.invalid || loading"
-              class="btn btn-primary">Execute</button>
-    </form>
-  </div>
+          <!-- Execute Command -->
+          <div class="execute-command-section">
+            <h3>Execute Docker Command</h3>
+            <form [formGroup]="commandForm" (ngSubmit)="executeCommand()">
+              <div class="form-group">
+                <label>Docker Command:</label>
+                <input type="text" formControlName="command"
+                  placeholder="e.g., docker ps -a" class="form-control">
+                </div>
+                <button type="submit" [disabled]="commandForm.invalid || loading"
+                class="btn btn-primary">Execute</button>
+              </form>
+            </div>
 
-  <!-- Command Output -->
-  <div class="output-section" *ngIf="lastCommandResult">
-    <h3>Command Output</h3>
-    <div class="output-box"
-         [class.success]="lastCommandResult.success"
-         [class.error]="!lastCommandResult.success">
-      <pre>{{getOutputText(lastCommandResult.output)}}</pre>
-    </div>
-  </div>
+            <!-- Command Output -->
+            @if (lastCommandResult) {
+              <div class="output-section">
+                <h3>Command Output</h3>
+                <div class="output-box"
+                  [class.success]="lastCommandResult.success"
+                  [class.error]="!lastCommandResult.success">
+                  <pre>{{getOutputText(lastCommandResult.output)}}</pre>
+                </div>
+              </div>
+            }
 
-  <!-- Container Logs Modal -->
-  <div class="logs-modal" *ngIf="selectedContainerLogs">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h3>Container Logs: {{selectedContainer}}</h3>
-        <button (click)="closeLogs()" class="close-btn">&times;</button>
-      </div>
-      <div class="modal-body">
-        <pre class="logs-content">{{selectedContainerLogs.join('\n')}}</pre>
-      </div>
-    </div>
-  </div>
-</div>
+            <!-- Container Logs Modal -->
+            @if (selectedContainerLogs) {
+              <div class="logs-modal">
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <h3>Container Logs: {{selectedContainer}}</h3>
+                    <button (click)="closeLogs()" class="close-btn">&times;</button>
+                  </div>
+                  <div class="modal-body">
+                    <pre class="logs-content">{{selectedContainerLogs.join('\n')}}</pre>
+                  </div>
+                </div>
+              </div>
+            }
+          </div>

jambotron-ui/src/app/modules/user-module/docker-management-component/docker-management-component.ts

@@ -1,5 +1,5 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
-import {NgForOf, NgIf} from '@angular/common';
+
 import {Subject, takeUntil} from 'rxjs';
 import {FormBuilder, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
 import {ContainerInfo, DockerResult, DockerService} from '../docker.service';
@@ -7,10 +7,8 @@ import {ContainerInfo, DockerResult, DockerService} from '../docker.service';
 @Component({
   selector: 'app-docker-management-component',
   imports: [
-    NgIf,
-    ReactiveFormsModule,
-    NgForOf
-  ],
+    ReactiveFormsModule
+],
   templateUrl: './docker-management-component.html',
   styleUrl: './docker-management-component.scss'
 })