From 7dc1f662e6cce08897278c079ba2085c87ca05f8 Mon Sep 17 00:00:00 2001
From: Manuel Aranda <maranda@qindel.com>
Date: Tue, 25 Mar 2025 15:53:41 +0100
Subject: [PATCH] Merge main, and updated improvements

---
 .../client-main-view.component.css            |  1 +
 .../client-main-view.component.html           |  2 +-
 .../manage-client.component.html              |  6 +++-
 .../manage-client/manage-client.component.ts  |  6 ++--
 .../app/layout/sidebar/sidebar.component.html | 28 ++-----------------
 ogWebconsole/src/locale/en.json               |  4 +++
 ogWebconsole/src/locale/es.json               |  5 ++++
 7 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css
index a7c40c7..c9e5bef 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css
@@ -277,6 +277,7 @@
   flex-wrap: wrap;
   justify-content: center;
   align-items: center; /* Centra contenido verticalmente */
+  margin-bottom: 20px;
 }
 
 .table-container {
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html
index d228ceb..bfda90e 100644
--- a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html
+++ b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html
@@ -6,7 +6,7 @@
     <div class="client-button-row">
       <button class="back-button" (click)="navigateToGroups()">
         <mat-icon>arrow_back</mat-icon>
-        {{ 'Back' | translate }}
+        {{ 'back' | translate }}
       </button>
     </div>
   </div>
diff --git a/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.html b/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.html
index 4d90eb2..1a4d246 100644
--- a/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.html
+++ b/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.html
@@ -101,6 +101,10 @@
                 </mat-select>
                 <mat-error>{{ 'menuError' | translate }}</mat-error>
             </mat-form-field>
+
+          <mat-checkbox formControlName="maintenance">
+            {{ 'maintenance' | translate }}
+          </mat-checkbox>
         </form>
     </div>
 
@@ -110,4 +114,4 @@
             {{ isEditMode ? 'Guardar' : 'Crear' }}
         </button>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.ts b/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.ts
index 32aced7..42a1477 100644
--- a/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.ts
+++ b/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.ts
@@ -90,7 +90,8 @@ export class ManageClientComponent implements OnInit {
       hardwareProfile: [null],
       ogLive: [null],
       repository: [null],
-      menu: [null]
+      menu: [null],
+      maintenance: [false]
     });
   }
 
@@ -249,6 +250,7 @@ export class ManageClientComponent implements OnInit {
             ogLive: data.ogLive ? data.ogLive['@id'] : null,
             template: data.template ? data.template['@id'] : null,
             menu: data.menu ? data.menu['@id'] : null,
+            maintenance: data.maintenance
           });
           resolve();
         },
@@ -300,4 +302,4 @@ export class ManageClientComponent implements OnInit {
   onNoClick(): void {
     this.dialogRef.close();
   }
-}
\ No newline at end of file
+}
diff --git a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html
index 6f38cfe..cde15ee 100644
--- a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html
+++ b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html
@@ -43,29 +43,13 @@
     </mat-list-item>
   </mat-nav-list>
 
-  <mat-list-item (click)="toggleOgDhcpSub()" matTooltip="{{ 'TOOLTIP_DHCP' | translate }}" matTooltipShowDelay="1000">
+  <mat-list-item routerLink="/subnets" matTooltip="{{ 'TOOLTIP_SUBNETS' | translate }}" matTooltipShowDelay="1000">
     <span class="entry">
-      <mat-icon class="icon">settings_ethernet</mat-icon>
-      <span>{{ 'dhcp' | translate }}</span>
+      <mat-icon class="icon">lan</mat-icon>
+      <span> {{ 'subnets' | translate }}</span>
     </span>
   </mat-list-item>
 
-  <!-- Submenu items for DHCP -->
-  <mat-nav-list *ngIf="showOgDhcpSub" style="padding-left: 20px;">
-    <mat-list-item routerLink="/ogdhcp-status" matTooltip="{{ 'TOOLTIP_DHCP_STATUS' | translate }}" matTooltipShowDelay="1000">
-      <span class="entry">
-        <mat-icon class="icon">analytics</mat-icon>
-        <span>{{ 'status' | translate }}</span>
-      </span>
-    </mat-list-item>
-    <mat-list-item routerLink="/subnets" matTooltip="{{ 'TOOLTIP_SUBNETS' | translate }}" matTooltipShowDelay="1000">
-      <span class="entry">
-        <mat-icon class="icon">lan</mat-icon>
-        <span>{{ 'subnets' | translate }}</span>
-      </span>
-    </mat-list-item>
-  </mat-nav-list>
-
   <mat-list-item (click)="toggleOgBootSub()" matTooltip="{{ 'TOOLTIP_BOOT' | translate }}" matTooltipShowDelay="1000">
     <span class="entry">
       <mat-icon class="icon">desktop_windows</mat-icon>
@@ -75,12 +59,6 @@
 
   <!-- Submenu items for Boot -->
   <mat-nav-list *ngIf="showOgBootSub" style="padding-left: 20px;">
-    <mat-list-item routerLink="/ogboot-status" matTooltip="{{ 'TOOLTIP_BOOT_STATUS' | translate }}" matTooltipShowDelay="1000">
-      <span class="entry">
-        <mat-icon class="icon">analytics</mat-icon>
-        <span>{{ 'status' | translate }}</span>
-      </span>
-    </mat-list-item>
     <mat-list-item routerLink="/pxe-images" matTooltip="{{ 'TOOLTIP_PXE_IMAGES' | translate }}" matTooltipShowDelay="1000">
       <span class="entry">
         <mat-icon class="icon">album</mat-icon>
diff --git a/ogWebconsole/src/locale/en.json b/ogWebconsole/src/locale/en.json
index 7399a21..afdbe80 100644
--- a/ogWebconsole/src/locale/en.json
+++ b/ogWebconsole/src/locale/en.json
@@ -21,6 +21,10 @@
   "labelOrganizationalUnit": "Organizational Unit",
   "buttonCancel": "Cancel",
   "buttonAdd": "Add",
+  "addRule": "Add rule",
+  "rulesHeader": "Rules",
+  "statusUnavailable": "Unavailable",
+  "statusAvailable": "Available",
   "addClientDialogTitle": "Add Client",
   "dialogTitleEditUser": "Editar usuario",
   "dialogTitleChangePassword": "Change password",
diff --git a/ogWebconsole/src/locale/es.json b/ogWebconsole/src/locale/es.json
index e06377f..314061a 100644
--- a/ogWebconsole/src/locale/es.json
+++ b/ogWebconsole/src/locale/es.json
@@ -21,6 +21,7 @@
   "labelOrganizationalUnit": "Unidad organizativa",
   "buttonCancel": "Cancelar",
   "buttonAdd": "Añadir",
+  "back": "Atrás",
   "addClientDialogTitle": "Añadir Cliente",
   "dialogTitleEditUser": "Editar usuario",
   "dialogTitleChangePassword": "Change password",
@@ -33,6 +34,10 @@
   "addRole": "Añadir rol",
   "searchRoleLabel": "Buscar nombre de rol",
   "dialogTitleAddRole": "Añadir Rol",
+  "addRule": "Añadir regla",
+  "rulesHeader": "Reglas",
+  "statusUnavailable": "No disponible",
+  "statusAvailable": "Disponible",
   "labelRoleName": "Nombre",
   "sectionTitlePermissions": "Permisos:",
   "checkboxSuperAdmin": "Super Admin",