ogLive improvements. Groups UX
testing/ogGui-multibranch/pipeline/head This commit is unstable Details

pull/10/head
Manuel Aranda Rosales 2024-12-11 17:04:27 +01:00
parent 0550c1b25d
commit 2631469b71
9 changed files with 11 additions and 18 deletions

View File

@ -280,7 +280,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="oglive"> <ng-container matColumnDef="oglive">
<th mat-header-cell *matHeaderCellDef mat-sort-header> OG Live </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> OG Live </th>
<td mat-cell *matCellDef="let client"> {{ (client.ogLive?.name || '').slice(0, 15) }}{{ (client.ogLive?.name?.length > 15) ? '...' : '' }} </td> <td mat-cell *matCellDef="let client"> {{ (client.ogLive?.filename || '').slice(0, 15) }}{{ (client.ogLive?.filename?.length > 15) ? '...' : '' }} </td>
</ng-container> </ng-container>
<ng-container matColumnDef="status"> <ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'status' | translate }} </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'status' | translate }} </th>

View File

@ -61,7 +61,7 @@
<mat-label>{{ 'ogLiveLabel' | translate }}</mat-label> <mat-label>{{ 'ogLiveLabel' | translate }}</mat-label>
<mat-select formControlName="ogLive"> <mat-select formControlName="ogLive">
<mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']"> <mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']">
{{ oglive.name }} {{ oglive.filename }}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>

View File

@ -21,7 +21,7 @@
<mat-label>{{ 'ogLiveLabel' | translate }}</mat-label> <mat-label>{{ 'ogLiveLabel' | translate }}</mat-label>
<mat-select formControlName="ogLive"> <mat-select formControlName="ogLive">
<mat-option *ngFor="let ogLive of ogLives" [value]="ogLive['@id']"> <mat-option *ngFor="let ogLive of ogLives" [value]="ogLive['@id']">
{{ ogLive.name }} {{ ogLive.filename }}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>

View File

@ -88,7 +88,7 @@
<mat-label>{{ 'ogLiveLabel' | translate }}</mat-label> <mat-label>{{ 'ogLiveLabel' | translate }}</mat-label>
<mat-select formControlName="oglive" (selectionChange)="onOgLiveChange($event)"> <mat-select formControlName="oglive" (selectionChange)="onOgLiveChange($event)">
<mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']"> <mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']">
{{ oglive.name }} {{ oglive.filename }}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>

View File

@ -85,7 +85,7 @@
<mat-label>{{ 'ogLiveLabel' | translate }}</mat-label> <mat-label>{{ 'ogLiveLabel' | translate }}</mat-label>
<mat-select formControlName="ogLive" (selectionChange)="onOgLiveChange($event)"> <mat-select formControlName="ogLive" (selectionChange)="onOgLiveChange($event)">
<mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']"> <mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']">
{{ oglive.name }} {{ oglive.filename }}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>

View File

@ -1,9 +1,5 @@
<h2 mat-dialog-title>{{ isEditMode ? 'Editar' : 'Añadir' }} imagen ogLive</h2> <h2 mat-dialog-title>{{ isEditMode ? 'Editar' : 'Añadir' }} imagen ogLive</h2>
<mat-dialog-content> <mat-dialog-content>
<mat-form-field appearance="fill" class="full-width">
<mat-label>Nombre</mat-label>
<input matInput [(ngModel)]="name">
</mat-form-field>
<mat-spinner class="spinner" *ngIf="loading"></mat-spinner> <mat-spinner class="spinner" *ngIf="loading"></mat-spinner>
<mat-form-field *ngIf="!loading" appearance="fill" class="full-width"> <mat-form-field *ngIf="!loading" appearance="fill" class="full-width">

View File

@ -10,7 +10,6 @@ import { ToastrService } from 'ngx-toastr';
}) })
export class CreatePXEImageComponent implements OnInit { export class CreatePXEImageComponent implements OnInit {
baseUrl: string = import.meta.env.NG_APP_BASE_API_URL; baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
name: string = '';
downloads: any[] = []; downloads: any[] = [];
selectedDownload: any; selectedDownload: any;
isEditMode: boolean = false; isEditMode: boolean = false;
@ -28,7 +27,6 @@ export class CreatePXEImageComponent implements OnInit {
this.fetchDownloads(); this.fetchDownloads();
if (this.data) { if (this.data) {
this.isEditMode = true; this.isEditMode = true;
this.name = this.data.name;
this.selectedDownload = this.data.downloadUrl; this.selectedDownload = this.data.downloadUrl;
this.imageId = this.data.uuid; // Assuming UUID is used for edit this.imageId = this.data.uuid; // Assuming UUID is used for edit
} }
@ -55,7 +53,6 @@ export class CreatePXEImageComponent implements OnInit {
submitForm(): void { submitForm(): void {
const payload = { const payload = {
name: this.name,
downloadUrl: this.selectedDownload.url downloadUrl: this.selectedDownload.url
}; };

View File

@ -88,7 +88,7 @@
<button mat-icon-button color="info" (click)="showOgLive($event, image)"> <button mat-icon-button color="info" (click)="showOgLive($event, image)">
<mat-icon>{{ 'viewIcon' | translate }}</mat-icon> <mat-icon>{{ 'viewIcon' | translate }}</mat-icon>
</button> </button>
<button mat-icon-button color="primary" (click)="editImage(image)"> <button mat-icon-button disabled color="primary" (click)="editImage(image)">
<mat-icon>{{ 'editIcon' | translate }}</mat-icon> <mat-icon>{{ 'editIcon' | translate }}</mat-icon>
</button> </button>
<button mat-icon-button color="warn" (click)="deleteImage(image)"> <button mat-icon-button color="warn" (click)="deleteImage(image)">

View File

@ -40,9 +40,9 @@ export class PXEimagesComponent implements OnInit {
cell: (user: any) => `${user.id}` cell: (user: any) => `${user.id}`
}, },
{ {
columnDef: 'name', columnDef: 'filename',
header: 'Nombre de imagen', header: 'Og Live',
cell: (user: any) => `${user.name}` cell: (user: any) => `${user.filename}`
}, },
{ {
columnDef: 'isDefault', columnDef: 'isDefault',