diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css index 03b6761..d6c8672 100644 --- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css +++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css @@ -194,6 +194,17 @@ button { margin-bottom: 10px; } +.button-group { + display: flex; + flex-wrap: wrap; + gap: 10px; + align-items: center; +} + +.button-group button { + flex-grow: 1; +} + .red-card { background-color: #f35f53; color: white; diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html index cc9b317..75afd03 100644 --- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html +++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html @@ -106,13 +106,19 @@ - - - - +
+ + + + + + + + + +
diff --git a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html index a5ec6a4..1d6afc0 100644 --- a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html @@ -78,12 +78,31 @@ - {{ 'columnActions' | translate }} - - - - - + + {{ 'columnActions' | translate }} + + + + + + + + + diff --git a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts index 5b1c624..cd27a08 100644 --- a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts +++ b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts @@ -32,6 +32,7 @@ export class ClientTabViewComponent { filters: { [key: string]: string } = {}; organizationalUnits: any[] = []; datePipe: DatePipe = new DatePipe('es-ES'); + syncingClientId: number | null = null; private apiUrl = `${this.baseUrl}/clients`; @@ -136,16 +137,20 @@ export class ClientTabViewComponent { } getStatus(client: any): void { + this.syncingClientId = client.uuid; this.syncStatus = true; + this.http.post(`${this.baseUrl}${client['@id']}/agent/status`, {}).subscribe( response => { this.toastService.success('Cliente actualizado correctamente'); - this.search() + this.search(); this.syncStatus = false; + this.syncingClientId = null; }, error => { this.toastService.error('Error de conexión con el cliente'); this.syncStatus = false; + this.syncingClientId = null; } ); } diff --git a/ogWebconsole/src/app/components/images/images.component.html b/ogWebconsole/src/app/components/images/images.component.html index 8bf0363..071d165 100644 --- a/ogWebconsole/src/app/components/images/images.component.html +++ b/ogWebconsole/src/app/components/images/images.component.html @@ -12,29 +12,16 @@
+
- Buscar nombre de imagen + {{ 'searchLabel' | translate }} search - Pulsar 'enter' para buscar + {{ 'searchHint' | translate }}
- - - - -
{{ column.header }} - - - {{ image[column.columnDef] ? 'check_circle' : 'cancel' }} - - - - {{ column.cell(image) }} - -
@@ -86,50 +73,4 @@ (page)="onPageChange($event)"> -
- - {{ 'searchLabel' | translate }} - - search - {{ 'searchHint' | translate }} - -
-
{{ column.header }}
- - - - - - - - - - - -
{{ column.header }} - - - {{ image[column.columnDef] ? 'check_circle' : 'cancel' }} - - - - {{ column.cell(image) }} - - {{ 'columnActions' | translate }} - - -
- -
- - -
diff --git a/ogWebconsole/src/app/components/repositories/main-repository-view/main-repository-view.component.ts b/ogWebconsole/src/app/components/repositories/main-repository-view/main-repository-view.component.ts index bc378c7..f209816 100644 --- a/ogWebconsole/src/app/components/repositories/main-repository-view/main-repository-view.component.ts +++ b/ogWebconsole/src/app/components/repositories/main-repository-view/main-repository-view.component.ts @@ -270,7 +270,7 @@ export class MainRepositoryViewComponent { } syncRepository() { - this.http.post(`${this.apiUrl}/sync`, {}) + this.http.get(`${this.baseUrl}/image-repositories/server/sync`, {}) .subscribe(response => { this.toastService.success('Sincronización completada'); this.load()