Updates control

Reviewed-on: #21

CHANGELOG.md

@@ -1,40 +1,98 @@
 # Changelog
+## [0.11.2] - 2025-4-16
+### Fixed
+- Se ha corregido un error en la actualizacion del estado de los pcs en la vista tarjetas.
+
+---
+## [0.11.1] - 2025-4-16
+### Improved
+- Nuevos campos en la tabla de clientes. Tipo de firmware y mac.
+
+## Fixed
+- Se ha corregido error al crear OUs, que no refrescaba la web.
+- Se ha corregido error en el formulario de creacion de imagenes. Si se seleccionaba una imagen para un versionado, no dejaba deseleccionar.
+- Se ha corregido un bug en el particionador que impedia ejecutar, cuando eliminabamos una particion.
+
+---
+## [0.11.0] - 2025-4-11
+### Added
+- Se ha diseñado el nuevo formulario para poder ejecutar script. Sistema mejorado con variables etiquetadas.
+- Se puede añadir descripcion a una imagen.
+- Se han añadido al formulario de crear/editar repositorio, la posibilidad de añadir usuario y puerto ssh.
+- Nuevo estado en pc => desconectado.
+- Se ha añadido nueva accion para renombrar imagen monolitica.
+
+### Improved
+- Se ha mejorado la interfaz de usuario tanto para el despliegue de imagenes, como el particionado.
+- Se ha mejorado la responsividad de la vista de grupos.
+- Cambios en el comportamiento general de muchos componentes modales. Se han añadido spinners de carga mas intuitivos.
+
+---
+
+## [0.10.1] - 2025-3-27
+### Improved
+- Mejoras en el comportamiento del arbol de grupos.
+- Nueva regexp para controlar las "macs" en la creacion de clientes.
+
+---
+## [0.10.0] - 2025-3-25
+### Added
+- Nuevo componenten de estado global.
+- Servicio para que el ogGui obtenga de forma dinamica las variables de entorno.
+- Nueva funcionalidad para convertir imagen en imagen virtual.
+- Nueva funcionalidad para importar imágenes externas al sistema.
+- Despliegue de imangenes sin cache. Cambios en el formulario de "despliegue".
+
+### Improved
+- Mejoras en la internacionalización.
+- Nueva UX ogRepository. Ahora se gestionan las imagenes de forma mas sencilla.
+- Cambios en ogLive. Mejora en la sincronizacion y obtención de datos en la API
+
+### Fixed
+- Cambios en la expresion regular para la validacion de documentos DHCP en la carga masiva de pc.
+
+---
+## [0.9.2] - 2025-03-19
+### Changed 
+- Jenkinsfile to pubilsh packages in repo in case og release
+
+---
 ## [0.9.1] - 2025-03-12
-### ⚡ Changed
+### Changed
 - Se ha modificado el acceso a Mercure añadiendo nueva variable de entorno.
 
-
+---
 ## [0.9.0] - 2025-3-4
-### 🔹 Added
+### Added
 - Integracion con Mercure. Subscriber tanto en "Trazas" con en "Clientes".
 - Nueva funcionalidad para checkear la integridad de una imagen. Boton en apartado "imagenes" dentro del repositorio.
 - Centralizacion de estilos.
 - Nueva funcionalidad para realizar backup de imágenes.
+- Botón para cancelar despliegues de imagenes. Aparece en "trazas" tan solo para los comendos "deploy" y para el estado "en progreso".
 
-### ⚡ Changed
+### Changed
 - Nueva interfaz en "Grupos". Se ha aprovechado mejor el espacio y acortado el tamaño de las filas, para poder tener mas elementos por pantalla.
 - Cambios en filtros de "Grupos". Ahora se pueden filtrar por "Centro" y "Unidad Organizativa" y estado. Ahora se busca en base de datos, y no en una lista de clientes dados. 
 - Refactorizados compontentes de crear/editar clientes en uno solo. 
 - Cambios en DHCP. Nueva UX en "ver clientes". Ahora tenemos un buscador detallado.
 - Para gestionar/añadir clientes a subredes ahora tenemos un botón para "añadir todos" y tan solo nos aparecn los equipos que no estén previamente asignados en una subred.
 
+---
 ## [0.7.0] - 2024-12-10
-
 ### Refactored
 - Refactored the group screen, removing the separate tabs for clients, advanced search, and organizational units.
 - Added support for partitioning functionality in the client detail view.
-- Boton para cancelar despliegues de imagenes. Aparece en "trazas" tan solo para los comendos "deploy" y para el estado "en progreos".
 
+---
 ## [0.6.1] - 2024-11-19
-
 ### Improved
 - Introduced a new automatic sync mode for the ogdhcp and ogBoot components.
 - Improve test coverage.
 - New view for clients inside the classroom on the main page.
 
+---
 ## [0.6.0] - 2024-11-19
-
-### 🔹 Added
+### Added
 - Added functionality to execute actions from the menu in the general groups screen.
 - Displayed the selected center on the general screen for better context.
 - Implemented the option to collapse the sidebar for improved usability.

Jenkins/Jenkinsfile-deb-pkg

@@ -0,0 +1,107 @@
+@Library('jenkins-shared-library') _
+pipeline {
+    agent {
+        label 'jenkins-slave'
+    }
+    environment {
+        DEBIAN_FRONTEND = 'noninteractive'
+        DEFAULT_DEV_NAME = 'Opengnsys Team'
+        DEFAULT_DEV_EMAIL = 'opengnsys@qindel.com'
+    }
+    options {
+        skipDefaultCheckout()
+    }
+    parameters {
+        string(name: 'DEV_NAME', defaultValue: '', description: 'Nombre del desarrollador')
+        string(name: 'DEV_EMAIL', defaultValue: '', description: 'Email del desarrollador')
+    }
+    stages {
+        stage('Prepare Workspace') {
+            steps {
+                script {
+                    env.BUILD_DIR = "${WORKSPACE}/oggui"
+                    sh "mkdir -p ${env.BUILD_DIR}"
+                }
+            }
+        }
+
+        stage('Checkout') {
+            steps {
+                dir("${env.BUILD_DIR}") {
+                    checkout scm
+                }
+            }
+        }
+
+        stage('Generate Changelog') {
+            when {
+                expression {
+                    return env.TAG_NAME != null
+                }
+            }
+            steps {
+                script {
+                    def devName = params.DEV_NAME ? params.DEV_NAME : env.DEFAULT_DEV_NAME
+                    def devEmail = params.DEV_EMAIL ? params.DEV_EMAIL : env.DEFAULT_DEV_EMAIL
+
+                    generateDebianChangelog(env.BUILD_DIR, devName, devEmail)
+                }
+            }
+        }
+        stage('Generate Changelog (Nightly)'){
+            when {
+                branch 'main'
+            }
+            steps {
+                script {
+                    def devName = params.DEV_NAME ? params.DEV_NAME : env.DEFAULT_DEV_NAME
+                    def devEmail = params.DEV_EMAIL ? params.DEV_EMAIL : env.DEFAULT_DEV_EMAIL
+                    generateDebianChangelog(env.BUILD_DIR, devName, devEmail,"nightly")
+                }
+            }
+        }
+
+
+        stage('Build') {
+            steps {
+                script {
+                    construirPaquete(env.BUILD_DIR, "../artifacts", "172.17.8.68", "/var/tmp/opengnsys/debian-repo/oggui")
+                }
+            }
+        }
+        stage ('Publish to Debian Repository') {
+            when {
+                expression {
+                    return env.TAG_NAME != null
+                }
+            }
+            agent { label 'debian-repo' }
+            steps {
+                script {
+                    // Construir el patrón de versión esperado en el nombre del paquete
+                    def versionPattern = "${env.TAG_NAME}-${env.BUILD_NUMBER}"
+                    publicarEnAptly('/var/tmp/opengnsys/debian-repo/oggui', 'opengnsys-devel', versionPattern)
+                }
+            }
+        }
+        stage ('Publish to Debian Repository (Nightly)') {
+            when {
+                branch 'main'
+            }
+            agent { label 'debian-repo' }
+            steps {
+               script {
+                    // Construir el patrón de versión esperado en el nombre del paquete
+                    def versionPattern = "-${env.BUILD_NUMBER}~nightly"
+                    publicarEnAptly('/var/tmp/opengnsys/debian-repo/oggui', 'nightly', versionPattern)
+                }
+            }
+        }
+    }
+    post {
+        always {
+            notifyBuildStatus('narenas@qindel.com')
+        }
+    }
+}
+

debian/changelog

@@ -1,4 +1,4 @@
-oggui (1.0.1+deb-pkg20250310-1) unstable; urgency=medium
+oggui (0.0.1-1) unstable; urgency=medium
 
   * Add debian files
   * Update .gitignore

debian/control

@@ -8,6 +8,6 @@ Standards-Version: 4.5.0
 Package: oggui
 Architecture: any
 Maintainer: Nicolas Arenas <nicolas.arenas@qindel.com> 
-Depends: ${shlibs:Depends}, ${misc:Depends}, nginx, nodejs, npm
-Description: OpenGnsys GUI
- Una interfaz gráfica para OpenGnsys.
+Depends: ${shlibs:Depends}, ${misc:Depends}, nginx
+Description: OpenGnsys GUI created for the Opengnsys Team
+ Opengnsys Graphical Intercface

debian/oggui.config

@@ -5,6 +5,6 @@ set -e
 . /usr/share/debconf/confmodule
 
 db_input high opengnsys/oggui_ogcoreUrl || true
-
+db_input high opengnsys/oggui_ogmercureUrl || true
 
 db_go

debian/oggui.install

@@ -1,9 +1,4 @@
-ogWebconsole/dist/oggui/browser /opt/opengnsys/oggui/browser/
+ogWebconsole/dist/oggui/browser /opt/opengnsys/oggui/
 etc /opt/opengnsys/oggui/
-bin /opt/opengnsys/oggui/
-var /opt/opengnsys/oggui/
-ogWebconsole/*.json   /opt/opengnsys/oggui/src/
-ogWebconsole/*.js    /opt/opengnsys/oggui/src/
-ogWebconsole/src  /opt/opengnsys/oggui/src/
 ogWebconsole/ssl/* /opt/opengnsys/oggui/etc/nginx/certs/
 

debian/oggui.postinst

@@ -6,46 +6,56 @@ set -e
 
 db_get  opengnsys/oggui_ogcoreUrl
 OGCORE_URL="$RET"
+db_get  opengnsys/oggui_ogmercureUrl
+OGMERCURE_URL="$RET"
+
 # Asegurarse de que el usuario exista
 USER="opengnsys"
-HASH_FILE="/opt/opengnsys/oggui/var/lib/oggui/oggui.config.hash"
-CONFIG_FILE="/opt/opengnsys/oggui/src/.env"
+CONFIG_FILE="/opt/opengnsys/oggui/browser/assets/config.json"
 
+restore_config_if_modified() {
+    local new="$1"
+    local backup="$1.bak"
 
-
-# Provisionar base de datos si es necesario en caso de instalación. 
+    if [ -f "$backup" ]; then
+        if ! cmp -s "$new" "$backup"; then
+            echo ">>> Archivo modificado por el usuario detectado en $new"
+            echo "    - Guardando archivo nuevo como ${new}.new"
+            mv -f "$new" "${new}.new"
+            echo "    - Restaurando archivo anterior desde backup"
+            mv -f "$backup" "$new"
+        else
+            echo ">>> El archivo $new no ha cambiado desde la última versión, eliminando backup"
+            rm -f "$backup"
+        fi
+    fi
+}
 
 
 # Detectar si es una instalación nueva o una actualización
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
-    cd /opt/opengnsys/oggui/src/
-    echo NG_APP_BASE_API_URL=$OGCORE_URL > "$CONFIG_FILE"
-    npm install -g @angular/cli
-    npm install
-    /usr/local/bin/ng build --base-href=/ --output-path=dist/oggui --optimization=true --configuration=production --localize=false 
-    cp -pr /opt/opengnsys/oggui/src/dist/oggui/browser/* /opt/opengnsys/oggui/browser/
-    md5sum "$CONFIG_FILE" > "$HASH_FILE"
-    ln -s /opt/opengnsys/oggui/etc/systemd/system/oggui.service /etc/systemd/system/oggui.service
+    if [ ! -f "$CONFIG_FILE" ]; then
+        jq --arg apiUrl "$OGCORE_URL" --arg mercureUrl "$OGMERCURE_URL" \
+          '.apiUrl = $apiUrl | .mercureUrl = $mercureUrl' "$CONFIG_FILE" > "${CONFIG_FILE}.tmp" && mv "${CONFIG_FILE}.tmp" "$CONFIG_FILE"
+    fi
+    ln -s /opt/opengnsys/oggui/etc/nginx/oggui.conf /etc/nginx/sites-enabled/oggui.conf
+    ln -s $CONFIG_FILE /opt/opengnsys/oggui/etc/config.json
+    mkdir -p /etc/nginx/certs/ 
+    cp -p /opt/opengnsys/oggui/etc/nginx/certs/* /etc/nginx/certs/
+    chown -R www-data:www-data /etc/nginx/certs
     systemctl daemon-reload
-    systemctl enable oggui
+    systemctl restart nginx
 elif [ "$1" = "configure" ] && [ -n "$2" ]; then
     cd /opt/opengnsys/oggui
     echo "Actualización desde la versión $2"
+    # Si upgrade recupero los archivos de configuracion
+    echo ">>> Backup de archivos de configuración reales en /opt/opengnsys"
+    restore_config_if_modified "/opt/opengnsys/oggui/etc/nginx/oggui.conf"
+    restore_config_if_modified "$CONFIG_FILE"
+
 fi
 
 # Cambiar la propiedad de los archivos al usuario especificado
 chown opengnsys:www-data /opt/opengnsys/
 chown -R opengnsys:www-data /opt/opengnsys/oggui 
-chmod 755 /opt/opengnsys/oggui/bin/start-oggui.sh
-# Install http server stuff
-ln -s /opt/opengnsys/oggui/etc/nginx/oggui.conf /etc/nginx/sites-enabled/oggui.conf
-mkdir -p /etc/nginx/certs/ 
-cp -p /opt/opengnsys/oggui/etc/nginx/certs/* /etc/nginx/certs/
-chown -R www-data:www-data /etc/nginx/certs
-# Reiniciar servicios si es necesario
-# systemctl restart nombre_del_servicio
-
-systemctl daemon-reload
-systemctl restart nginx
-
 exit 0

debian/oggui.preinst

@@ -2,6 +2,16 @@
 
 set -e
 
+backup_file_if_exists() {
+    local original="$1"
+    local backup="$1.bak"
+
+    if [ -e "$original" ]; then
+        echo "   - Guardando backup de $original en $backup"
+        cp -a "$original" "$backup"
+    fi
+}
+CONFIG_FILE="/opt/opengnsys/oggui/browser/assets/config.json"
 # Asegurarse de que el usuario exista
 USER="opengnsys"
 HOME_DIR="/opt/opengnsys"
@@ -12,4 +22,11 @@ else
     useradd -m -d "$HOME_DIR" -s /bin/bash "$USER"
 fi
 
-exit 0
+# Si upgrade hago backup del archivo de configuración
+if [ "$1" = "upgrade" ]; then
+    echo ">>> Backup de archivos de configuración reales en /opt/opengnsys"
+    backup_file_if_exists "/opt/opengnsys/oggui/etc/nginx/sites-available/oggui.conf"
+    backup_file_if_exists "$CONFIG_FILE"
+fi
+
+exit 0

debian/oggui.prerm

@@ -3,9 +3,8 @@
 set -e
 set -x
 
-if [ "$1" = "upgrade" ]; then
-    # Eliminar enlaces simbólicos creados en postinst
-    rm -f /etc/systemd/system/oggui.service
+# Solo eliminar archivos de configuración si se está eliminando el paquete
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
     rm -f /etc/nginx/sites-enabled/oggui.conf
     systemctl daemon-reload
     systemctl restart nginx

debian/oggui.templates

@@ -3,3 +3,7 @@ Type: string
 Default: https://127.0.0.1:8443
 Description: Introduzca la URL delAPI de OgCore
 
+Template: opengnsys/oggui_ogmercureUrl
+Type: string 
+Default: https://127.0.0.1:3000/.well-known/mercure
+Description: Introduzca el endpoint de mercure 

debian/rules

@@ -5,16 +5,7 @@
 
 override_dh_auto_build:
 	cd ogWebconsole && npm install
-	cd ogWebconsole && /usr/local/bin/ng build --base-href=/ --output-path=dist/oggui --optimization=true --configuration=production --localize=false
+	cd ogWebconsole && npx ng build --base-href=/ --output-path=dist/oggui --optimization=true --configuration=production
 
 override_dh_auto_install:
 	dh_auto_install
-	mkdir -p debian/oggui/opt/opengnsys/oggui/browser
-	mkdir -p debian/oggui/opt/opengnsys/oggui/src/
-	cp -pr ogWebconsole/dist/oggui/browser/* debian/oggui/opt/opengnsys/oggui/browser/
-	rm -rf debian/oggui/opt/opengnsys/oggui/browser/node_modules
-	cp -pr etc debian/oggui/opt/opengnsys/oggui/
-	cp -pr bin debian/oggui/opt/opengnsys/oggui/
-	cp -pr var debian/oggui/opt/opengnsys/oggui/
-	cp -p ogWebconsole/.env debian/oggui/opt/opengnsys/oggui/src/
-	md5sum debian/oggui/opt/opengnsys/oggui/src/.env > debian/oggui/opt/opengnsys/oggui/var/lib/oggui/oggui.config.hash

etc/systemd/system/oggui.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=Aplicación Angular con Nginx
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/opt/opengnsys/oggui/bin/start-oggui.sh
-Restart=always
-User=www-data
-WorkingDirectory=/var/www/mi-aplicacion
-Environment=NODE_ENV=production
-
-[Install]
-WantedBy=multi-user.target

ogWebconsole/.env

@@ -1,2 +1,2 @@
-NG_APP_BASE_API_URL=https://127.0.0.1:8443
-NG_APP_OGCORE_MERCURE_BASE_URL=http://localhost:3000/.well-known/mercure
+# NG_APP_BASE_API_URL=https://127.0.0.1:8443
+# NG_APP_OGCORE_MERCURE_BASE_URL=http://localhost:3000/.well-known/mercure

ogWebconsole/.env.prod

@@ -0,0 +1,2 @@
+NG_APP_BASE_API_URL=https://localhost:8443
+NG_APP_OGCORE_MERCURE_BASE_URL=http://localhost:3000/.well-known/mercure

ogWebconsole/.gitignore

@@ -41,3 +41,5 @@ testem.log
 .DS_Store
 Thumbs.db
 
+test-results/
+

ogWebconsole/angular.json

@@ -4,12 +4,6 @@
   "newProjectRoot": "projects",
   "projects": {
     "ogWebconsole": {
-      "i18n": {
-        "sourceLocale": "es",
-        "locales": {
-          "en": "src/locale/en.json"
-        }
-      },
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -30,7 +24,7 @@
           "builder": "@ngx-env/builder:application",
           "options": {
             "baseHref": "/oggui/",
-            "localize": true,
+            "localize": false,
             "aot": true,
             "outputPath": "dist/og-webconsole",
             "index": "src/index.html",
@@ -41,20 +35,23 @@
             ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
-  "src/favicon.ico",
-  "src/assets",
-  {
-    "glob": "**/*",
-    "input": "src/locale",
-    "output": "/locale"
-  }
-],
+              "src/favicon.ico",
+              "src/assets",
+              {
+                "glob": "**/*",
+                "input": "src/locale",
+                "output": "/locale"
+              }
+            ],
             "styles": [
               "src/custom-theme.scss",
               "src/styles.css",
               "node_modules/ngx-toastr/toastr.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "allowedCommonJsDependencies": [
+              "rfdc"
+            ]
           },
           "configurations": {
             "production": {
@@ -66,7 +63,7 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "4kb",
+                  "maximumWarning": "7kb",
                   "maximumError": "10kb"
                 }
               ],
@@ -76,16 +73,6 @@
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": false
-            },
-            "es": {
-              "localize": [
-                "es-ES"
-              ]
-            },
-            "en": {
-              "localize": [
-                "en-US"
-              ]
             }
           },
           "defaultConfiguration": "production"
@@ -104,29 +91,16 @@
             },
             "development": {
               "buildTarget": "ogWebconsole:build:development"
-            },
-            "es": {
-              "buildTarget": "ogWebconsole:build:es"
-            },
-            "en": {
-              "buildTarget": "ogWebconsole:build:en"
             }
           },
           "defaultConfiguration": "development"
         },
-        "extract-i18n": {
-          "builder": "@ngx-env/builder:extract-i18n",
-          "options": {
-            "buildTarget": "ogWebconsole:build"
-          }
-        },
         "test": {
           "builder": "@ngx-env/builder:karma",
           "options": {
             "polyfills": [
               "zone.js",
-              "zone.js/testing",
-              "@angular/localize/init"
+              "zone.js/testing"
             ],
             "tsConfig": "tsconfig.spec.json",
             "assets": [
@@ -146,4 +120,4 @@
   "cli": {
     "analytics": "95fac95c-8936-41a8-8c9c-1fae82fe6912"
   }
-}
+}

ogWebconsole/src/app/app-routing.module.ts

@@ -40,6 +40,9 @@ import {EnvVarsComponent} from "./components/admin/env-vars/env-vars.component";
 import {MenusComponent} from "./components/menus/menus.component";
 import {OgDhcpSubnetsComponent} from "./components/ogdhcp/og-dhcp-subnets.component";
 import {StatusComponent} from "./components/ogdhcp/status/status.component";
+import {
+  RunScriptAssistantComponent
+} from "./components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component";
 const routes: Routes = [
   { path: '', redirectTo: 'auth/login', pathMatch: 'full' },
   { path: '', component: MainLayoutComponent,
@@ -63,9 +66,9 @@ const routes: Routes = [
       { path: 'calendars', component: CalendarComponent },
       { path: 'clients/deploy-image', component: DeployImageComponent },
       { path: 'clients/partition-assistant', component: PartitionAssistantComponent },
+      { path: 'clients/run-script', component: RunScriptAssistantComponent },
       { path: 'clients/:id', component: ClientMainViewComponent },
       { path: 'clients/:id/create-image', component: CreateClientImageComponent },
-      { path: 'images', component: ImagesComponent },
       { path: 'repositories', component: RepositoriesComponent },
       { path: 'repository/:id', component: MainRepositoryViewComponent },
       { path: 'software', component: SoftwareComponent },

ogWebconsole/src/app/app.module.ts

@@ -1,4 +1,5 @@
-import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA, LOCALE_ID, APP_INITIALIZER } from '@angular/core';
+import { ConfigService } from './services/config.service';
 import { BrowserModule } from '@angular/platform-browser';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -101,7 +102,7 @@ import { OperativeSystemComponent } from './components/operative-system/operativ
 import { CreateOperativeSystemComponent } from './components/operative-system/create-operative-system/create-operative-system.component';
 import { ShowTemplateContentComponent } from './components/ogboot/pxe/show-template-content/show-template-content.component';
 import { RepositoriesComponent } from './components/repositories/repositories.component';
-import { CreateRepositoryComponent } from './components/repositories/create-repository/create-repository.component';
+import { ManageRepositoryComponent } from './components/repositories/manage-repository/manage-repository.component';
 import { ExecuteCommandComponent } from './components/commands/main-commands/execute-command/execute-command.component';
 import { DeployImageComponent } from './components/groups/components/client-main-view/deploy-image/deploy-image.component';
 import { MainRepositoryViewComponent } from './components/repositories/main-repository-view/main-repository-view.component';
@@ -117,7 +118,6 @@ import { CreateMultipleClientComponent } from './components/groups/shared/client
 import { ExportImageComponent } from './components/images/export-image/export-image.component';
 import { ImportImageComponent } from "./components/repositories/import-image/import-image.component";
 import { LoadingComponent } from './shared/loading/loading.component';
-import { RepositoryImagesComponent } from './components/repositories/repository-images/repository-images.component';
 import { InputDialogComponent } from './components/commands/commands-task/task-logs/input-dialog/input-dialog.component';
 import { ManageOrganizationalUnitComponent } from './components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component';
 import { BackupImageComponent } from './components/repositories/backup-image/backup-image.component';
@@ -129,10 +129,31 @@ import { AddClientsToSubnetComponent } from "./components/ogdhcp/add-clients-to-
 import { ShowClientsComponent } from './components/ogdhcp/show-clients/show-clients.component';
 import { OperationResultDialogComponent } from './components/ogdhcp/operation-result-dialog/operation-result-dialog.component';
 import { ManageClientComponent } from './components/groups/shared/clients/manage-client/manage-client.component';
+import { ConvertImageComponent } from './components/repositories/convert-image/convert-image.component';
+import { registerLocaleData } from '@angular/common';
+import localeEs from '@angular/common/locales/es';
+import { GlobalStatusComponent } from './components/global-status/global-status.component';
+import { ShowMonoliticImagesComponent } from './components/repositories/show-monolitic-images/show-monolitic-images.component';
+import { StatusTabComponent } from './components/global-status/status-tab/status-tab.component';
+import { ConvertImageToVirtualComponent } from './components/repositories/convert-image-to-virtual/convert-image-to-virtual.component';
+import { RunScriptAssistantComponent } from './components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component';
+import {
+  SaveScriptComponent
+} from "./components/groups/components/client-main-view/run-script-assistant/save-script/save-script.component";
+import { EditImageComponent } from './components/repositories/edit-image/edit-image.component';
+import { ShowGitImagesComponent } from './components/repositories/show-git-images/show-git-images.component';
+import { RenameImageComponent } from './components/repositories/rename-image/rename-image.component';
+
 export function HttpLoaderFactory(http: HttpClient) {
   return new TranslateHttpLoader(http, './locale/', '.json');
 }
 
+export function initializeApp(configService: ConfigService) {
+  return () => configService.loadConfig();
+}
+
+registerLocaleData(localeEs, 'es-ES');
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -195,7 +216,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     CreateOperativeSystemComponent,
     ShowTemplateContentComponent,
     RepositoriesComponent,
-    CreateRepositoryComponent,
+    ManageRepositoryComponent,
     ExecuteCommandComponent,
     ExecuteCommandOuComponent,
     DeployImageComponent,
@@ -208,12 +229,21 @@ export function HttpLoaderFactory(http: HttpClient) {
     ExportImageComponent,
     ImportImageComponent,
     LoadingComponent,
-    RepositoryImagesComponent,
     InputDialogComponent,
     ManageOrganizationalUnitComponent,
     BackupImageComponent,
     ShowClientsComponent,
-    OperationResultDialogComponent
+    OperationResultDialogComponent,
+    ConvertImageComponent,
+    GlobalStatusComponent,
+    ShowMonoliticImagesComponent,
+    StatusTabComponent,
+    ConvertImageToVirtualComponent,
+    RunScriptAssistantComponent,
+    SaveScriptComponent,
+    EditImageComponent,
+    ShowGitImagesComponent,
+    RenameImageComponent
   ],
   bootstrap: [AppComponent],
   imports: [BrowserModule,
@@ -273,8 +303,16 @@ export function HttpLoaderFactory(http: HttpClient) {
       useClass: CustomInterceptor,
       multi: true
     },
+    { provide: LOCALE_ID, useValue: 'es-ES' },
     provideAnimationsAsync(),
-    provideHttpClient(withInterceptorsFromDi())
+    provideHttpClient(withInterceptorsFromDi()),
+    ConfigService,
+    {
+      provide: APP_INITIALIZER,
+      useFactory: initializeApp,
+      deps: [ConfigService],
+      multi: true
+    }
   ],
 })
 export class AppModule { }

ogWebconsole/src/app/components/admin/env-vars/env-vars.component.spec.ts

@@ -13,24 +13,29 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ToastrModule, ToastrService } from 'ngx-toastr';
 import { DataService } from '../users/users/data.service';
 import { MatTableModule } from '@angular/material/table';
+import { ConfigService } from '@services/config.service';
 
 describe('EnvVarsComponent', () => {
   let component: EnvVarsComponent;
   let fixture: ComponentFixture<EnvVarsComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url'
+    };
+
     await TestBed.configureTestingModule({
-      declarations: [EnvVarsComponent], 
+      declarations: [EnvVarsComponent],
       imports: [
         ReactiveFormsModule,
-        FormsModule, 
+        FormsModule,
         MatDialogModule,
         MatFormFieldModule,
         MatInputModule,
         MatCheckboxModule,
         MatButtonModule,
         BrowserAnimationsModule,
-        MatTableModule,     
+        MatTableModule,
         ToastrModule.forRoot(),
         TranslateModule.forRoot()
       ],
@@ -47,6 +52,10 @@ describe('EnvVarsComponent', () => {
         {
           provide: MAT_DIALOG_DATA,
           useValue: {}
+        },
+        {
+          provide: ConfigService,
+          useValue: mockConfigService
         }
       ]
     }).compileComponents();

ogWebconsole/src/app/components/admin/env-vars/env-vars.component.ts

@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import {HttpClient} from "@angular/common/http";
-import {ToastrService} from "ngx-toastr";
+import { HttpClient } from "@angular/common/http";
+import { ToastrService } from "ngx-toastr";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-env-vars',
@@ -8,16 +9,17 @@ import {ToastrService} from "ngx-toastr";
   styleUrl: './env-vars.component.css'
 })
 export class EnvVarsComponent {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
   envVars: { name: string; value: string }[] = [];
   displayedColumns: string[] = ['name', 'value'];
-
-  private apiUrl = `${this.baseUrl}/env-vars`;
+  private apiUrl: string;
 
   constructor(
     private http: HttpClient,
     private toastService: ToastrService,
-  ) {}
+    private configService: ConfigService
+  ) {
+    this.apiUrl = `${this.configService.apiUrl}/env-vars`;
+  }
 
   ngOnInit(): void {
     this.loadEnvVars();

ogWebconsole/src/app/components/admin/roles/roles/add-role-modal/add-role-modal.component.ts

@@ -4,6 +4,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {DataService} from "../data.service";
 import {ToastrService} from "ngx-toastr";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-add-role-modal',
@@ -11,9 +12,9 @@ import {ToastrService} from "ngx-toastr";
   styleUrls: ['./add-role-modal.component.css']
 })
 export class AddRoleModalComponent {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
   roleForm: FormGroup<any>;
   roleId: string | null = null;
+  baseUrl: string;
 
   constructor(
     public dialogRef: MatDialogRef<AddRoleModalComponent>,
@@ -21,8 +22,10 @@ export class AddRoleModalComponent {
     private http: HttpClient,
     private fb: FormBuilder,
     private dataService: DataService,
-    private toastService: ToastrService
+    private toastService: ToastrService,
+    private configService: ConfigService
   ) {
+    this.baseUrl = this.configService.apiUrl;
     this.roleForm = this.fb.group({
       name: ['', Validators.required],
       superAdmin: [false],

ogWebconsole/src/app/components/admin/roles/roles/data.service.ts

@@ -2,15 +2,19 @@ import { Injectable } from '@angular/core';
 import {HttpClient, HttpParams} from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import { ConfigService } from '@services/config.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class DataService {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
-  private apiUrl = `${this.baseUrl}/user-groups?page=1&itemsPerPage=1000`;
+  baseUrl: string;
+  private apiUrl: string;
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, private configService: ConfigService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/user-groups?page=1&itemsPerPage=1000`;
+  }
 
   getUserGroups(filters: { [key: string]: string }): Observable<{ totalItems: any; data: any }> {
     const params = new HttpParams({ fromObject: filters });

ogWebconsole/src/app/components/admin/roles/roles/roles.component.spec.ts

@@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { HttpClient } from '@angular/common/http';
 import { ToastrService } from 'ngx-toastr';
 import { DataService } from './data.service';
-import { of } from 'rxjs';
+import { ConfigService } from '@services/config.service';
 import { MatDivider } from '@angular/material/divider';
 import { MatFormField } from '@angular/material/form-field';
 import { MatLabel } from '@angular/material/form-field';
@@ -20,12 +20,14 @@ describe('RolesComponent', () => {
   let mockHttpClient: jasmine.SpyObj<HttpClient>;
   let mockToastrService: jasmine.SpyObj<ToastrService>;
   let mockDataService: jasmine.SpyObj<DataService>;
+  let mockConfigService: jasmine.SpyObj<ConfigService>;
 
   beforeEach(async () => {
     const matDialogSpy = jasmine.createSpyObj('MatDialog', ['open']);
     const httpClientSpy = jasmine.createSpyObj('HttpClient', ['get', 'post', 'put', 'delete']);
     const toastrServiceSpy = jasmine.createSpyObj('ToastrService', ['success', 'error']);
     const dataServiceSpy = jasmine.createSpyObj('DataService', ['getRoles']);
+    const configServiceSpy = jasmine.createSpyObj('ConfigService', [], { apiUrl: 'http://mock-api-url' });
 
     await TestBed.configureTestingModule({
       declarations: [RolesComponent, LoadingComponent],
@@ -35,7 +37,8 @@ describe('RolesComponent', () => {
         { provide: MatDialog, useValue: matDialogSpy },
         { provide: HttpClient, useValue: httpClientSpy },
         { provide: ToastrService, useValue: toastrServiceSpy },
-        { provide: DataService, useValue: dataServiceSpy }
+        { provide: DataService, useValue: dataServiceSpy },
+        { provide: ConfigService, useValue: configServiceSpy }
       ]
     }).compileComponents();
   });
@@ -47,6 +50,7 @@ describe('RolesComponent', () => {
     mockHttpClient = TestBed.inject(HttpClient) as jasmine.SpyObj<HttpClient>;
     mockToastrService = TestBed.inject(ToastrService) as jasmine.SpyObj<ToastrService>;
     mockDataService = TestBed.inject(DataService) as jasmine.SpyObj<DataService>;
+    mockConfigService = TestBed.inject(ConfigService) as jasmine.SpyObj<ConfigService>;
   });
 
   it('should create', () => {

ogWebconsole/src/app/components/admin/roles/roles/roles.component.ts

@@ -7,6 +7,7 @@ import { DataService } from "./data.service";
 import { PageEvent } from "@angular/material/paginator";
 import { DeleteModalComponent } from '../../../../shared/delete_modal/delete-modal/delete-modal.component';
 import { AddRoleModalComponent } from './add-role-modal/add-role-modal.component';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-roles',
@@ -14,7 +15,7 @@ import { AddRoleModalComponent } from './add-role-modal/add-role-modal.component
   styleUrls: ['./roles.component.css']
 })
 export class RolesComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string = this.configService.apiUrl;
   dataSource = new MatTableDataSource<any>();
   filters: { [key: string]: string } = {};
   loading: boolean = false;
@@ -48,7 +49,8 @@ export class RolesComponent implements OnInit {
     public dialog: MatDialog,
     private http: HttpClient,
     private dataService: DataService,
-    private toastService: ToastrService
+    private toastService: ToastrService,
+    private configService: ConfigService
   ) {}
 
   ngOnInit() {

ogWebconsole/src/app/components/admin/users/users/add-user-modal/add-user-modal.component.ts

@@ -4,6 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { ToastrService } from "ngx-toastr";
 import { HttpClient } from "@angular/common/http";
 import { DataService } from "../data.service";
+import { ConfigService } from '@services/config.service';
 
 interface UserGroup {
   '@id': string;
@@ -17,7 +18,7 @@ interface UserGroup {
   styleUrls: ['./add-user-modal.component.css']
 })
 export class AddUserModalComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   @Output() userAdded = new EventEmitter<void>();
   @Output() userEdited = new EventEmitter<void>();
   userForm: FormGroup<any>;
@@ -38,8 +39,10 @@ export class AddUserModalComponent implements OnInit {
     private http: HttpClient,
     private fb: FormBuilder,
     private dataService: DataService,
-    private toastService: ToastrService
+    private toastService: ToastrService,
+    private configService: ConfigService
   ) {
+    this.baseUrl = this.configService.apiUrl;
     this.userForm = this.fb.group({
       username: ['', Validators.required],
       password: ['', Validators.required],

ogWebconsole/src/app/components/admin/users/users/data.service.ts

@@ -3,15 +3,19 @@ import { Injectable } from '@angular/core';
 import {HttpClient, HttpParams} from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import { ConfigService } from '@services/config.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class DataService {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
-  private apiUrl = `${this.baseUrl}/users?page=1&itemsPerPage=1000`;
+  baseUrl: string;
+  private apiUrl: string;
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, private configService: ConfigService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/users?page=1&itemsPerPage=1000`;
+  }
 
   getUsers(filters: { [key: string]: string }): Observable<{ totalItems: any; data: any }> {
     const params = new HttpParams({ fromObject: filters });

ogWebconsole/src/app/components/admin/users/users/users.component.spec.ts

@@ -7,6 +7,7 @@ import { ToastrService } from 'ngx-toastr';
 import { of } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core'; 
 import { TranslateModule } from '@ngx-translate/core';
+import { ConfigService } from '@services/config.service';
 
 class MockToastrService {
   success() {}
@@ -18,6 +19,11 @@ describe('UsersComponent', () => {
   let fixture: ComponentFixture<UsersComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [UsersComponent],
       imports: [
@@ -28,6 +34,7 @@ describe('UsersComponent', () => {
       ],
       providers: [
         { provide: ToastrService, useClass: MockToastrService },
+        { provide: ConfigService, useValue: mockConfigService }
       ],
       schemas: [NO_ERRORS_SCHEMA], // Ignorar elementos desconocidos
     }).compileComponents();

ogWebconsole/src/app/components/admin/users/users/users.component.ts

@@ -5,7 +5,7 @@ import { AddUserModalComponent } from './add-user-modal/add-user-modal.component
 import { DeleteModalComponent } from '../../../../shared/delete_modal/delete-modal/delete-modal.component';
 import { HttpClient } from '@angular/common/http';
 import { ToastrService } from 'ngx-toastr';
-import { DataService } from "./data.service";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-users',
@@ -13,7 +13,8 @@ import { DataService } from "./data.service";
   styleUrls: ['./users.component.css']
 })
 export class UsersComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
+  private apiUrl: string;
   dataSource = new MatTableDataSource<any>();
   filters: { [key: string]: string } = {};
   loading: boolean = false;
@@ -50,14 +51,15 @@ export class UsersComponent implements OnInit {
   ];
   displayedColumns = [...this.columns.map(column => column.columnDef), 'actions'];
 
-  private apiUrl = `${this.baseUrl}/users`;
-
   constructor(
     public dialog: MatDialog,
+    private configService: ConfigService,
     private http: HttpClient,
-    private dataService: DataService,
     private toastService: ToastrService
-  ) {}
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/users`;
+  }
 
   ngOnInit() {
     this.search();

ogWebconsole/src/app/components/calendar/calendar.component.spec.ts

@@ -16,12 +16,18 @@ import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { JoyrideModule, JoyrideService } from 'ngx-joyride';
 import { TranslateModule } from '@ngx-translate/core';
 import { LoadingComponent } from '../../shared/loading/loading.component';
+import { ConfigService } from '@services/config.service';
 
 describe('CalendarComponent', () => {
   let component: CalendarComponent;
   let fixture: ComponentFixture<CalendarComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [CalendarComponent, LoadingComponent],
       imports: [
@@ -41,6 +47,9 @@ describe('CalendarComponent', () => {
         JoyrideModule.forRoot(),
         TranslateModule.forRoot(),
       ],
+      providers: [
+        { provide: ConfigService, useValue: mockConfigService }
+      ]
     })
     .compileComponents();
 

ogWebconsole/src/app/components/calendar/calendar.component.ts

@@ -9,6 +9,7 @@ import { PageEvent } from "@angular/material/paginator";
 import { CreateCalendarComponent } from "./create-calendar/create-calendar.component";
 import { DeleteModalComponent } from "../../shared/delete_modal/delete-modal/delete-modal.component";
 import { JoyrideService } from 'ngx-joyride';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-calendar',
@@ -16,7 +17,8 @@ import { JoyrideService } from 'ngx-joyride';
   styleUrl: './calendar.component.css'
 })
 export class CalendarComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
+  private apiUrl: string;
   images: { downloadUrl: string; name: string; uuid: string }[] = [];
   dataSource = new MatTableDataSource<any>();
   length: number = 0;
@@ -52,15 +54,18 @@ export class CalendarComponent implements OnInit {
     }
   ];
   displayedColumns = [...this.columns.map(column => column.columnDef), 'actions'];
-  private apiUrl = `${this.baseUrl}/remote-calendars`;
 
   constructor(
     public dialog: MatDialog,
     private http: HttpClient,
     private dataService: DataService,
     private toastService: ToastrService,
+    private configService: ConfigService,
     private joyrideService: JoyrideService
-  ) {}
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/remote-calendars`;
+  }
 
   ngOnInit(): void {
     this.search();
@@ -165,7 +170,7 @@ export class CalendarComponent implements OnInit {
     this.joyrideService.startTour({
       steps: ['titleStep', 'addButtonStep', 'searchStep', 'tableStep', 'actionsStep'],
       showPrevButton: true,
-      themeColor: '#3f51b5' 
+      themeColor: '#3f51b5'
     });
   }
 }

ogWebconsole/src/app/components/calendar/create-calendar-rule/create-calendar-rule.component.ts

@@ -1,7 +1,8 @@
-import {Component, Inject} from '@angular/core';
-import {ToastrService} from "ngx-toastr";
-import {HttpClient} from "@angular/common/http";
-import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
+import { Component, Inject } from '@angular/core';
+import { ToastrService } from "ngx-toastr";
+import { HttpClient } from "@angular/common/http";
+import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-create-calendar-rule',
@@ -9,7 +10,7 @@ import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
   styleUrl: './create-calendar-rule.component.css'
 })
 export class CreateCalendarRuleComponent {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   name: string = '';
   remoteCalendarRules: any[] = [];
   weekDays: string[] = ['Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado', 'Domingo'];
@@ -29,20 +30,23 @@ export class CreateCalendarRuleComponent {
   constructor(
     private toastService: ToastrService,
     private http: HttpClient,
+    private configService: ConfigService,
     public dialogRef: MatDialogRef<CreateCalendarRuleComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
-) { }
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+  }
 
   ngOnInit(): void {
     this.calendarId = this.data.calendar
     if (this.data) {
       this.isEditMode = true;
-      this.availableFromDate = this.data.rule? this.data.rule.availableFromDate : null;
-      this.availableToDate = this.data.rule? this.data.rule.availableToDate : null;
-      this.isRemoteAvailable = this.data.rule? this.data.rule.isRemoteAvailable : false;
-      this.availableReason = this.data.rule? this.data.rule.availableReason : null;
-      this.busyFromHour = this.data.rule? this.data.rule.busyFromHour : null;
-      this.busyToHour = this.data.rule? this.data.rule.busyToHour : null;
+      this.availableFromDate = this.data.rule ? this.data.rule.availableFromDate : null;
+      this.availableToDate = this.data.rule ? this.data.rule.availableToDate : null;
+      this.isRemoteAvailable = this.data.rule ? this.data.rule.isRemoteAvailable : false;
+      this.availableReason = this.data.rule ? this.data.rule.availableReason : null;
+      this.busyFromHour = this.data.rule ? this.data.rule.busyFromHour : null;
+      this.busyToHour = this.data.rule ? this.data.rule.busyToHour : null;
       if (this.data.rule && this.data.rule.busyWeekDays) {
         this.busyWeekDays = this.data.rule.busyWeekDays.reduce((acc: {
           [x: string]: boolean;

ogWebconsole/src/app/components/calendar/create-calendar/create-calendar.component.ts

@@ -1,10 +1,11 @@
-import {Component, Inject, OnInit} from '@angular/core';
-import {ToastrService} from "ngx-toastr";
-import {HttpClient} from "@angular/common/http";
-import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from "@angular/material/dialog";
-import {CreateCalendarRuleComponent} from "../create-calendar-rule/create-calendar-rule.component";
-import {DataService} from "../data.service";
-import {DeleteModalComponent} from "../../../shared/delete_modal/delete-modal/delete-modal.component";
+import { Component, Inject, OnInit } from '@angular/core';
+import { ToastrService } from "ngx-toastr";
+import { HttpClient } from "@angular/common/http";
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from "@angular/material/dialog";
+import { CreateCalendarRuleComponent } from "../create-calendar-rule/create-calendar-rule.component";
+import { DataService } from "../data.service";
+import { DeleteModalComponent } from "../../../shared/delete_modal/delete-modal/delete-modal.component";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-create-calendar',
@@ -12,7 +13,7 @@ import {DeleteModalComponent} from "../../../shared/delete_modal/delete-modal/de
   styleUrl: './create-calendar.component.css'
 })
 export class CreateCalendarComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   name: string = '';
   remoteCalendarRules: any[] = [];
   isEditMode: boolean = false;
@@ -22,11 +23,14 @@ export class CreateCalendarComponent implements OnInit {
   constructor(
     private toastService: ToastrService,
     private http: HttpClient,
+    private configService: ConfigService,
     public dialogRef: MatDialogRef<CreateCalendarComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
     public dialog: MatDialog,
     private dataService: DataService,
-  ) { }
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+  }
 
   ngOnInit(): void {
     if (this.data) {

ogWebconsole/src/app/components/calendar/data.service.ts

@@ -1,16 +1,20 @@
 import { Injectable } from '@angular/core';
-import {HttpClient, HttpParams} from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import { ConfigService } from '@services/config.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class DataService {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
-  private apiUrl = `${this.baseUrl}/remote-calendars?page=1&itemsPerPage=1000`;
+  baseUrl: string;
+  private apiUrl: string;
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, private configService: ConfigService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/remote-calendars?page=1&itemsPerPage=1000`;
+  }
 
   getRemoteCalendars(filters: { [key: string]: string }): Observable<any[]> {
     const params = new HttpParams({ fromObject: filters });

ogWebconsole/src/app/components/commands/commands-groups/commands-groups.component.ts

@@ -8,6 +8,7 @@ import { DeleteModalComponent } from '../../../shared/delete_modal/delete-modal/
 import { MatTableDataSource } from "@angular/material/table";
 import { DatePipe } from "@angular/common";
 import { JoyrideService } from 'ngx-joyride';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-commands-groups',
@@ -15,7 +16,8 @@ import { JoyrideService } from 'ngx-joyride';
   styleUrls: ['./commands-groups.component.css']
 })
 export class CommandsGroupsComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
+  private apiUrl: string;
   dataSource = new MatTableDataSource<any>();
   filters: { [key: string]: string | boolean } = {};
   length: number = 0;
@@ -47,10 +49,12 @@ export class CommandsGroupsComponent implements OnInit {
     }
   ];
   displayedColumns = [...this.columns.map(column => column.columnDef), 'actions'];
-  private apiUrl = `${this.baseUrl}/command-groups`;
 
-  constructor(private http: HttpClient, private dialog: MatDialog, private toastService: ToastrService, 
-    private joyrideService: JoyrideService) {}
+  constructor(private http: HttpClient, private dialog: MatDialog, private toastService: ToastrService,
+    private configService: ConfigService, private joyrideService: JoyrideService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/command-groups`;
+  }
 
   ngOnInit(): void {
     this.search();
@@ -120,17 +124,17 @@ export class CommandsGroupsComponent implements OnInit {
   iniciarTour(): void {
     this.joyrideService.startTour({
       steps: [
-      'titleStep',
-      'addCommandGroupStep',
-      'searchStep',
-      'tableStep',
-      'viewCommandsStep',
-      'actionsStep',
-      'paginationStep'
+        'titleStep',
+        'addCommandGroupStep',
+        'searchStep',
+        'tableStep',
+        'viewCommandsStep',
+        'actionsStep',
+        'paginationStep'
       ],
       showPrevButton: true,
       themeColor: '#3f51b5'
     });
   }
-  
+
 }

ogWebconsole/src/app/components/commands/commands-groups/create-command-group/create-command-group.component.ts

@@ -3,6 +3,7 @@ import { HttpClient } from '@angular/common/http';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { ToastrService } from 'ngx-toastr';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-create-command-group',
@@ -10,21 +11,25 @@ import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
   styleUrls: ['./create-command-group.component.css']
 })
 export class CreateCommandGroupComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   availableCommands: any[] = [];
   selectedCommands: any[] = [];
   groupName: string = '';
   enabled: boolean = true;
   editing: boolean = false;
   loading: boolean = false;
-  private apiUrl = `${this.baseUrl}/commands`;
+  private apiUrl: string;
 
   constructor(
     private http: HttpClient,
     private dialogRef: MatDialogRef<CreateCommandGroupComponent>,
     private toastService: ToastrService,
+    private configService: ConfigService,
     @Inject(MAT_DIALOG_DATA) public data: any
-  ) {}
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/commands`;
+  }
 
   ngOnInit(): void {
     this.loadAvailableCommands();

ogWebconsole/src/app/components/commands/commands-groups/detail-command-group/detail-command-group.component.ts

@@ -3,6 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { HttpClient } from '@angular/common/http';
 import { ToastrService } from 'ngx-toastr';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-detail-command-group',
@@ -10,7 +11,7 @@ import { ToastrService } from 'ngx-toastr';
   styleUrls: ['./detail-command-group.component.css']
 })
 export class DetailCommandGroupComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   form!: FormGroup;
   clients: any[] = [];
   showClientSelect = false;
@@ -21,9 +22,12 @@ export class DetailCommandGroupComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data: any,
     private dialogRef: MatDialogRef<DetailCommandGroupComponent>,
     private fb: FormBuilder,
+    private configService: ConfigService,
     private http: HttpClient,
     private toastService: ToastrService
-  ) { }
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+  }
 
   ngOnInit(): void {
     this.form = this.fb.group({

ogWebconsole/src/app/components/commands/commands-task/commands-task.component.spec.ts

@@ -13,11 +13,16 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { LoadingComponent } from '../../../shared/loading/loading.component';
 import { JoyrideModule, JoyrideService, JoyrideStepService } from 'ngx-joyride';
+import { ConfigService } from '@services/config.service';
+
 describe('CommandsTaskComponent', () => {
   let component: CommandsTaskComponent;
   let fixture: ComponentFixture<CommandsTaskComponent>;
+  let mockConfigService: jasmine.SpyObj<ConfigService>;
 
   beforeEach(async () => {
+    const configServiceSpy = jasmine.createSpyObj('ConfigService', [], { apiUrl: 'http://mock-api-url' });
+
     await TestBed.configureTestingModule({
       imports: [
         HttpClientTestingModule,
@@ -33,8 +38,13 @@ describe('CommandsTaskComponent', () => {
         JoyrideModule.forRoot(),
       ],
       declarations: [CommandsTaskComponent, LoadingComponent],
+      providers: [
+        { provide: ConfigService, useValue: configServiceSpy }
+      ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
+
+    mockConfigService = TestBed.inject(ConfigService) as jasmine.SpyObj<ConfigService>;
   });
 
   beforeEach(() => {

ogWebconsole/src/app/components/commands/commands-task/commands-task.component.ts

@@ -6,6 +6,7 @@ import { CreateTaskComponent } from './create-task/create-task.component';
 import { DetailTaskComponent } from './detail-task/detail-task.component';
 import { DeleteModalComponent } from '../../../shared/delete_modal/delete-modal/delete-modal.component';
 import { JoyrideService } from 'ngx-joyride';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-commands-task',
@@ -13,7 +14,7 @@ import { JoyrideService } from 'ngx-joyride';
   styleUrls: ['./commands-task.component.css']
 })
 export class CommandsTaskComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   tasks: any[] = [];
   filters: { [key: string]: string | boolean } = {};
   length: number = 0;
@@ -22,10 +23,14 @@ export class CommandsTaskComponent implements OnInit {
   pageSizeOptions: number[] = [5, 10, 20, 40, 100];
   displayedColumns: string[] = ['taskid', 'notes', 'name', 'scheduledDate', 'enabled', 'actions'];
   loading: boolean = false;
-  private apiUrl = `${this.baseUrl}/command-tasks`;
+  private apiUrl: string;
 
-  constructor(private http: HttpClient, private dialog: MatDialog, private toastService: ToastrService, 
-    private joyrideService: JoyrideService) {}
+  constructor(private http: HttpClient, private dialog: MatDialog, private toastService: ToastrService,
+    private configService: ConfigService,
+    private joyrideService: JoyrideService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/command-tasks`;
+  }
 
   ngOnInit(): void {
     this.loadTasks();
@@ -110,5 +115,5 @@ export class CommandsTaskComponent implements OnInit {
       themeColor: '#3f51b5'
     });
   }
-  
+
 }

ogWebconsole/src/app/components/commands/commands-task/create-task/create-task.component.ts

@@ -3,6 +3,7 @@ import { HttpClient } from '@angular/common/http';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { ToastrService } from 'ngx-toastr';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-create-task',
@@ -10,12 +11,12 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
   styleUrls: ['./create-task.component.css']
 })
 export class CreateTaskComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   taskForm: FormGroup;
   availableCommandGroups: any[] = [];
   selectedGroupCommands: any[] = [];
   availableIndividualCommands: any[] = [];
-  apiUrl = `${this.baseUrl}/command-tasks`;
+  apiUrl: string;
   editing: boolean = false;
   availableOrganizationalUnits: any[] = [];
   selectedUnitChildren: any[] = [];
@@ -25,10 +26,13 @@ export class CreateTaskComponent implements OnInit {
   constructor(
     private fb: FormBuilder,
     private http: HttpClient,
+    private configService: ConfigService,
     private toastr: ToastrService,
     public dialogRef: MatDialogRef<CreateTaskComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any
   ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/command-tasks`;
     this.taskForm = this.fb.group({
       commandGroup: ['', Validators.required],
       extraCommands: [[]],

ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts

@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component, OnInit} from '@angular/core';
+import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, forkJoin } from 'rxjs';
 import { FormControl } from '@angular/forms';
@@ -7,9 +7,10 @@ import { DatePipe } from '@angular/common';
 import { JoyrideService } from 'ngx-joyride';
 import { MatDialog } from "@angular/material/dialog";
 import { InputDialogComponent } from "./input-dialog/input-dialog.component";
-import { ProgressBarMode, MatProgressBarModule } from '@angular/material/progress-bar';
-import {DeleteModalComponent} from "../../../../shared/delete_modal/delete-modal/delete-modal.component";
-import {ToastrService} from "ngx-toastr";
+import { ProgressBarMode } from '@angular/material/progress-bar';
+import { DeleteModalComponent } from "../../../../shared/delete_modal/delete-modal/delete-modal.component";
+import { ToastrService } from "ngx-toastr";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-task-logs',
@@ -17,8 +18,8 @@ import {ToastrService} from "ngx-toastr";
   styleUrls: ['./task-logs.component.css']
 })
 export class TaskLogsComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
-  mercureUrl: string = import.meta.env.NG_APP_OGCORE_MERCURE_BASE_URL;
+  baseUrl: string;
+  mercureUrl: string;
   traces: any[] = [];
   groupedTraces: any[] = [];
   commands: any[] = [];
@@ -89,11 +90,15 @@ export class TaskLogsComponent implements OnInit {
   commandControl = new FormControl();
 
   constructor(private http: HttpClient,
-              private joyrideService: JoyrideService,
-              private dialog: MatDialog,
-              private cdr: ChangeDetectorRef,
-              private toastService: ToastrService
-  ) { }
+    private joyrideService: JoyrideService,
+    private dialog: MatDialog,
+    private cdr: ChangeDetectorRef,
+    private configService: ConfigService,
+    private toastService: ToastrService
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.mercureUrl = this.configService.mercureUrl;
+  }
 
   ngOnInit(): void {
     this.loadTraces();
@@ -223,7 +228,6 @@ export class TaskLogsComponent implements OnInit {
     this.http.get<any>(`${this.baseUrl}/commands?&page=1&itemsPerPage=10000`).subscribe(
       response => {
         this.commands = response['hydra:member'];
-        console.log(this.commands);
         this.loading = false;
       },
       error => {

ogWebconsole/src/app/components/commands/main-commands/commands.component.spec.ts

@@ -20,12 +20,18 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { TranslateModule } from '@ngx-translate/core';
 import { JoyrideModule } from 'ngx-joyride';
 import { LoadingComponent } from '../../../shared/loading/loading.component';
+import { ConfigService } from '@services/config.service';
 
 describe('CommandsComponent', () => {
   let component: CommandsComponent;
   let fixture: ComponentFixture<CommandsComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [CommandsComponent, LoadingComponent],
       imports: [
@@ -53,7 +59,8 @@ describe('CommandsComponent', () => {
       ],
       providers: [
         { provide: MatDialogRef, useValue: {} }, 
-        { provide: MAT_DIALOG_DATA, useValue: {} } 
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+        { provide: ConfigService, useValue: mockConfigService }
       ]
       
     }).compileComponents();

ogWebconsole/src/app/components/commands/main-commands/commands.component.ts

@@ -7,7 +7,7 @@ import { CreateCommandComponent } from './create-command/create-command.componen
 import { DeleteModalComponent } from '../../../shared/delete_modal/delete-modal/delete-modal.component';
 import { MatTableDataSource } from '@angular/material/table';
 import { DatePipe } from '@angular/common';
-import { ExecuteCommandComponent } from './execute-command/execute-command.component';
+import { ConfigService } from '@services/config.service';
 import { JoyrideService } from 'ngx-joyride';
 
 @Component({
@@ -16,7 +16,8 @@ import { JoyrideService } from 'ngx-joyride';
   styleUrls: ['./commands.component.css']
 })
 export class CommandsComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
+  private apiUrl: string;
   dataSource = new MatTableDataSource<any>();
   filters: { [key: string]: string | boolean } = {};
   length: number = 0;
@@ -48,10 +49,12 @@ export class CommandsComponent implements OnInit {
     }
   ];
   displayedColumns = [...this.columns.map(column => column.columnDef), 'actions'];
-  private apiUrl = `${this.baseUrl}/commands`;
 
   constructor(private http: HttpClient, private dialog: MatDialog, private toastService: ToastrService,
-    private joyrideService: JoyrideService) {}
+    private joyrideService: JoyrideService, private configService: ConfigService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/commands`;
+  }
 
   ngOnInit(): void {
     this.search();
@@ -82,14 +85,14 @@ export class CommandsComponent implements OnInit {
 
   openCreateCommandModal(): void {
     this.dialog.open(CreateCommandComponent, {
-      width: '600px',
+      width: '800px',
     }).afterClosed().subscribe(() => this.search());
   }
 
   editCommand(event: MouseEvent, command: any): void {
     event.stopPropagation();
     this.dialog.open(CreateCommandComponent, {
-      width: '600px',
+      width: '800px',
       data: command['@id']
     }).afterClosed().subscribe(() => this.search());
   }

ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.css

@@ -57,4 +57,15 @@
   justify-content: flex-end;
   gap: 1em;
   padding: 1.5em;
-}
+}
+
+.checkbox-with-hint {
+  display: flex;
+  flex-direction: column;
+}
+
+.hint-text {
+  font-size: 12px;
+  color: gray;
+  margin-left: 40px;
+}

ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.html

@@ -13,7 +13,13 @@
 
     <div class="checkbox-group">
       <mat-checkbox formControlName="readOnly">{{ 'readOnlyLabel' | translate }}</mat-checkbox>
+
       <mat-checkbox formControlName="enabled">{{ 'enabledLabel' | translate }}</mat-checkbox>
+
+      <div class="checkbox-with-hint">
+        <mat-checkbox formControlName="parameters">{{ 'parameters' | translate }}</mat-checkbox>
+        <span class="hint-text">Si se selecciona esta opción los parámetros deben indicarse en el script con el símbolo &#64;.</span>
+      </div>
     </div>
 
     <mat-form-field appearance="fill" class="full-width">

ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.spec.ts

@@ -13,12 +13,18 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatButtonModule } from '@angular/material/button';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
+import { ConfigService } from '@services/config.service';
 
 describe('CreateCommandComponent', () => {
   let component: CreateCommandComponent;
   let fixture: ComponentFixture<CreateCommandComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [CreateCommandComponent],
       imports: [
@@ -45,7 +51,8 @@ describe('CreateCommandComponent', () => {
         {
           provide: MAT_DIALOG_DATA,
           useValue: {}
-        }
+        },
+        { provide: ConfigService, useValue: mockConfigService }
       ]
     }).compileComponents();
   });

ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.ts

@@ -1,19 +1,19 @@
-import { Component, Inject } from '@angular/core';
+import {Component, Inject, OnInit} from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { HttpClient } from '@angular/common/http';
 import { ToastrService } from 'ngx-toastr';
-import {DataService} from "../data.service";
+import { DataService } from "../data.service";
+import { ConfigService } from "@services/config.service";
 
 @Component({
   selector: 'app-create-command',
   templateUrl: './create-command.component.html',
   styleUrls: ['./create-command.component.css']
 })
-export class CreateCommandComponent {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+export class CreateCommandComponent implements OnInit{
+  baseUrl: string;
   createCommandForm: FormGroup<any>;
-  private apiUrl = `${this.baseUrl}/commands`;
   commandId: string | null = null;
 
   constructor(
@@ -21,13 +21,16 @@ export class CreateCommandComponent {
     private http: HttpClient,
     public dialogRef: MatDialogRef<CreateCommandComponent>,
     private toastService: ToastrService,
+    private configService: ConfigService,
     private dataService: DataService,
     @Inject(MAT_DIALOG_DATA) public data: any
   ) {
+    this.baseUrl = this.configService.apiUrl;
     this.createCommandForm = this.fb.group({
       name: ['', Validators.required],
       script: [''],
       readOnly: [false],
+      parameters: [false],
       enabled: [true],
       comments: [''],
     });
@@ -42,12 +45,12 @@ export class CreateCommandComponent {
   load(): void {
     this.dataService.getCommand(this.data).subscribe({
       next: (response) => {
-        console.log(response);
         this.createCommandForm = this.fb.group({
           name: [response.name, Validators.required],
           notes: [response.notes],
           script: [response.script],
           readOnly: [response.readOnly],
+          parameters: [response.parameters],
           enabled: [response.enabled],
         });
         this.commandId = response['@id'];
@@ -82,7 +85,6 @@ export class CreateCommandComponent {
           },
           (error) => {
             this.toastService.error(error['error']['hydra:description']);
-            console.error('Error al editar el comando', error);
           }
         );
       } else {
@@ -93,7 +95,6 @@ export class CreateCommandComponent {
           },
           (error) => {
             this.toastService.error(error['error']['hydra:description']);
-            console.error('Error al añadir comando', error);
           }
         );
       }

ogWebconsole/src/app/components/commands/main-commands/data.service.ts

@@ -1,6 +1,6 @@
-
+import { ConfigService } from '@services/config.service';
 import { Injectable } from '@angular/core';
-import {HttpClient, HttpParams} from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
@@ -8,10 +8,16 @@ import { catchError, map } from 'rxjs/operators';
   providedIn: 'root'
 })
 export class DataService {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
-  private apiUrl = `${this.baseUrl}/commands?page=1&itemsPerPage=1000`;
+  baseUrl: string;
+  private apiUrl: string;
 
-  constructor(private http: HttpClient) {}
+  constructor(
+    private http: HttpClient,
+    private configService: ConfigService
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/commands?page=1&itemsPerPage=1000`;
+  }
 
   getCommands(filters: { [key: string]: string }): Observable<{ totalItems: any; data: any }> {
     const params = new HttpParams({ fromObject: filters });

ogWebconsole/src/app/components/commands/main-commands/detail-command/command-detail.component.ts

@@ -4,6 +4,7 @@ import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dial
 import { CreateCommandComponent } from '../create-command/create-command.component';
 import { HttpClient } from '@angular/common/http';
 import { ToastrService } from 'ngx-toastr';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-command-detail',
@@ -11,7 +12,7 @@ import { ToastrService } from 'ngx-toastr';
   styleUrls: ['./command-detail.component.css']
 })
 export class CommandDetailComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   form!: FormGroup;
   clients: any[] = [];
   showClientSelect = false;
@@ -20,12 +21,15 @@ export class CommandDetailComponent implements OnInit {
 
   constructor(
     private fb: FormBuilder,
+    private configService: ConfigService,
     private http: HttpClient,
     public dialogRef: MatDialogRef<CommandDetailComponent>,
     private dialog: MatDialog,
     private toastService: ToastrService,
     @Inject(MAT_DIALOG_DATA) public data: any
-  ) { }
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+  }
 
   ngOnInit(): void {
     this.form = this.fb.group({
@@ -52,7 +56,7 @@ export class CommandDetailComponent implements OnInit {
 
     dialogRef.afterClosed().subscribe(result => {
       if (result) {
-        this.toastService.success('Comando editado' );
+        this.toastService.success('Comando editado');
         this.data.command = result;
       }
     });

ogWebconsole/src/app/components/commands/main-commands/execute-command/execute-command.component.html

@@ -8,11 +8,17 @@
     [matMenuTriggerFor]="commandMenu">
     {{ buttonText }}
   </button>
+
+  <button mat-menu-item *ngSwitchCase="'menu-item'" [matMenuTriggerFor]="commandMenu" [disabled]="disabled">
+    <mat-icon>{{ icon }}</mat-icon>
+    <span>{{ buttonText }}</span>
+  </button>
 </ng-container>
 
 <mat-menu #commandMenu="matMenu">
-  <button mat-menu-item [disabled]="command.disabled || (command.slug === 'create-image' && clientData.length > 1)"
-    *ngFor="let command of arrayCommands" (click)="onCommandSelect(command.slug)">
+  <button mat-menu-item [disabled]="command.disabled
+  || (command.slug === 'create-image' && clientData.length > 1)" *ngFor="let command of arrayCommands"
+    (click)="onCommandSelect(command.slug)">
     {{ command.name }}
   </button>
 </mat-menu>

ogWebconsole/src/app/components/commands/main-commands/execute-command/execute-command.component.spec.ts

@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { ExecuteCommandComponent } from './execute-command.component';
 import { provideHttpClient } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
@@ -17,12 +16,18 @@ import { ToastrModule, ToastrService } from 'ngx-toastr';
 import { DataService } from '../data.service';
 import {MatIconModule} from "@angular/material/icon";
 import {MatMenu, MatMenuModule} from "@angular/material/menu";
+import { ConfigService } from '@services/config.service';
 
 describe('ExecuteCommandComponent', () => {
   let component: ExecuteCommandComponent;
   let fixture: ComponentFixture<ExecuteCommandComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [ExecuteCommandComponent],
       imports: [
@@ -54,7 +59,8 @@ describe('ExecuteCommandComponent', () => {
         {
           provide: MAT_DIALOG_DATA,
           useValue: {}
-        }
+        },
+        { provide: ConfigService, useValue: mockConfigService }
       ]
     })
     .compileComponents();

ogWebconsole/src/app/components/commands/main-commands/execute-command/execute-command.component.ts

@@ -1,9 +1,8 @@
-import {Component, Inject, Input, OnInit, SimpleChanges} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog';
+import { Component, Input, OnInit } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { FormBuilder, FormGroup } from '@angular/forms';
-import {Router} from "@angular/router";
-import {ToastrService} from "ngx-toastr";
+import { Router } from "@angular/router";
+import { ToastrService } from "ngx-toastr";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-execute-command',
@@ -12,36 +11,36 @@ import {ToastrService} from "ngx-toastr";
 })
 export class ExecuteCommandComponent implements OnInit {
   @Input() clientData: any[] = [];
-  @Input() buttonType: 'icon' | 'text' = 'icon';
+  @Input() buttonType: 'icon' | 'text' | 'menu-item' = 'icon';
   @Input() buttonText: string = 'Ejecutar Comandos';
   @Input() icon: string = 'terminal';
   @Input() disabled: boolean = false;
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   loading: boolean = true;
 
   arrayCommands: any[] = [
-    {name: 'Enceder', slug: 'power-on', disabled: false},
-    {name: 'Apagar', slug: 'power-off', disabled: false},
-    {name: 'Reiniciar', slug: 'reboot', disabled: false},
-    {name: 'Iniciar Sesión', slug: 'login', disabled: true},
-    {name: 'Crear imagen', slug: 'create-image', disabled: false},
-    {name: 'Clonar/desplegar imagen', slug: 'deploy-image', disabled: false},
-    {name: 'Eliminar Imagen Cache', slug: 'delete-image-cache', disabled: true},
-    {name: 'Particionar y Formatear', slug: 'partition', disabled: false},
-    {name: 'Inventario Software', slug: 'software-inventory', disabled: true},
-    {name: 'Inventario Hardware', slug: 'hardware-inventory', disabled: true},
-    {name: 'Ejecutar script', slug: 'run-script', disabled: true},
+    { name: 'Enceder', slug: 'power-on', disabled: false },
+    { name: 'Apagar', slug: 'power-off', disabled: false },
+    { name: 'Reiniciar', slug: 'reboot', disabled: false },
+    { name: 'Iniciar Sesión', slug: 'login', disabled: true },
+    { name: 'Crear imagen', slug: 'create-image', disabled: false },
+    { name: 'Clonar/desplegar imagen', slug: 'deploy-image', disabled: false },
+    { name: 'Eliminar Imagen Cache', slug: 'delete-image-cache', disabled: true },
+    { name: 'Particionar y Formatear', slug: 'partition', disabled: false },
+    { name: 'Inventario Software', slug: 'software-inventory', disabled: true },
+    { name: 'Inventario Hardware', slug: 'hardware-inventory', disabled: true },
+    { name: 'Ejecutar comando', slug: 'run-script', disabled: false },
   ];
 
   client: any = {};
 
   constructor(
-    private dialog: MatDialog,
     private http: HttpClient,
-    private fb: FormBuilder,
     private router: Router,
+    private configService: ConfigService,
     private toastService: ToastrService
   ) {
+    this.baseUrl = this.configService.apiUrl;
   }
 
   ngOnInit(): void {
@@ -61,6 +60,14 @@ export class ExecuteCommandComponent implements OnInit {
       this.openDeployImageAssistant();
     }
 
+    if (action === 'run-script') {
+      this.openRunScriptAssistant();
+    }
+
+    if (action === 'login') {
+      this.loginClient();
+    }
+
     if (action === 'reboot') {
       this.rebootClient();
     }
@@ -87,6 +94,19 @@ export class ExecuteCommandComponent implements OnInit {
     );
   }
 
+  loginClient(): void {
+    this.http.post(`${this.baseUrl}/clients/server/login-client`, {
+      clients: this.clientData.map((client: any) => client['@id'])
+    }).subscribe(
+      response => {
+        this.toastService.success('Cliente actualizado correctamente');
+      },
+      error => {
+        this.toastService.error('Error de conexión con el cliente');
+      }
+    );
+  }
+
   powerOnClient(): void {
     this.http.post(`${this.baseUrl}/image-repositories/wol`, {
       clients: this.clientData.map((client: any) => client['@id'])
@@ -114,8 +134,18 @@ export class ExecuteCommandComponent implements OnInit {
   }
 
   openPartitionAssistant(): void {
+    const clientDataToSend = this.clientData.map(client => ({
+      name: client.name,
+      mac: client.mac,
+      uuid: '/clients/'+client.uuid,
+      status: client.status,
+      partitions: client.partitions,
+      firmwareType: client.firmwareType,
+      ip: client.ip
+    }));
+
     this.router.navigate(['/clients/partition-assistant'], {
-      state: { clientData: this.clientData },
+      queryParams: { clientData: JSON.stringify(clientDataToSend) }
     }).then(r => {
       console.log('Navigated to partition assistant with data:', this.clientData);
     });
@@ -128,10 +158,38 @@ export class ExecuteCommandComponent implements OnInit {
   }
 
   openDeployImageAssistant(): void {
+    const clientDataToSend = this.clientData.map(client => ({
+      name: client.name,
+      mac: client.mac,
+      uuid: '/clients/'+client.uuid,
+      status: client.status,
+      partitions: client.partitions,
+      ip: client.ip
+    }));
+
     this.router.navigate(['/clients/deploy-image'], {
-      state: { clientData: this.clientData },
+      queryParams: { clientData: JSON.stringify(clientDataToSend) }
     }).then(r => {
       console.log('Navigated to deploy image with data:', this.clientData);
     });
   }
+
+  openRunScriptAssistant(): void {
+    const clientDataToSend = this.clientData.map(client => ({
+      name: client.name,
+      mac: client.mac,
+      uuid: '/clients/'+client.uuid,
+      status: client.status,
+      partitions: client.partitions,
+      ip: client.ip
+    }));
+
+    this.router.navigate(['/clients/run-script'], {
+      queryParams: { clientData: JSON.stringify(clientDataToSend) }
+    }).then(() => {
+      console.log('Navigated to run script with data:', clientDataToSend);
+    });
+  }
+
+
 }

ogWebconsole/src/app/components/global-status/global-status.component.css

@@ -0,0 +1,44 @@
+mat-dialog-content {
+    height: calc(100% - 64px);
+    overflow: auto;
+    padding-top: 0.5em !important;
+}
+
+.content-container {
+    min-height: 100%;
+}
+
+.action-container {
+    display: flex;
+    justify-content: flex-end;
+    gap: 1em;
+    padding: 1.5em;
+}
+
+.spinner-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    z-index: 1000;
+}
+
+.loading-spinner {
+    width: 100px;
+    height: 100px;
+}
+
+.error-card {
+    margin: 20px auto;
+    max-width: 600px;
+    text-align: center;
+    background-color: rgb(243, 243, 243);
+    color: rgb(48, 48, 48);
+}
+
+.error-card p {
+    margin-top: 0;
+}

ogWebconsole/src/app/components/global-status/global-status.component.html

@@ -0,0 +1,94 @@
+<header>
+  <h1 mat-dialog-title>{{'GlobalStatus' | translate}}</h1>
+</header>
+<mat-dialog-content [ngClass]="{'loading': loading}">
+  <div class="spinner-container" *ngIf="loading">
+    <mat-spinner class="loading-spinner"></mat-spinner>
+  </div>
+  <mat-tab-group (selectedTabChange)="onTabChange($event)">
+    <mat-tab label="OgBoot">
+      <div *ngIf="!loading && !errorOgBoot" class="content-container">
+        <app-status-tab 
+          [loading]="loading"
+          [diskUsage]="ogBootDiskUsage"
+          [servicesStatus]="ogBootServicesStatus"
+          [installedOgLives]="installedOgLives"
+          [diskUsageChartData]="ogBootDiskUsageChartData"
+          [view]="view"
+          [colorScheme]="colorScheme"
+          [isDoughnut]="isDoughnut"
+          [showLabels]="showLabels"
+          [isDhcp]="isDhcp"
+          [isRepository]="false">
+        </app-status-tab>
+      </div>
+      <mat-card *ngIf="!loading && errorOgBoot" class="error-card">
+        <mat-card-content>
+          <p>{{ 'errorLoadingData' | translate }}</p>
+        </mat-card-content>
+      </mat-card>
+    </mat-tab>
+
+    <mat-tab label="Dhcp">
+      <div *ngIf="!loading && !errorDhcp" class="content-container">
+        <app-status-tab
+          [loading]="loading"
+          [diskUsage]="dhcpDiskUsage"
+          [servicesStatus]="dhcpServicesStatus"
+          [subnets]="subnets"
+          [diskUsageChartData]="dhcpDiskUsageChartData"
+          [view]="view"
+          [colorScheme]="colorScheme"
+          [isDoughnut]="isDoughnut"
+          [showLabels]="showLabels"
+          [isDhcp]="isDhcp"
+          [isRepository]="false">
+        </app-status-tab>
+      </div>
+      <mat-card *ngIf="!loading && errorDhcp" class="error-card">
+        <mat-card-content>
+          <p>{{ 'errorLoadingData' | translate }}</p>
+        </mat-card-content>
+      </mat-card>
+    </mat-tab>
+
+    <mat-tab label="Repositorios">
+      <mat-tab-group>
+        <mat-tab *ngFor="let repository of repositories" [label]="repository.name">
+          <div *ngIf="!loading && !errorRepositories[repository.uuid] && repositoryStatuses[repository.uuid]">
+            <app-status-tab
+              [loading]="loading"
+              [diskUsage]="repositoryStatuses[repository.uuid].disk"
+              [servicesStatus]="repositoryStatuses[repository.uuid].services"
+              [processesStatus]="repositoryStatuses[repository.uuid].processes"
+              [ramUsage]="repositoryStatuses[repository.uuid].ram"
+              [cpuUsage]="repositoryStatuses[repository.uuid].cpu"
+              [diskUsageChartData]="[
+                { name: 'Usado', value: repositoryStatuses[repository.uuid].disk.used },
+                { name: 'Disponible', value: repositoryStatuses[repository.uuid].disk.available }
+              ]"
+              [ramUsageChartData]="[
+                { name: 'Usado', value: repositoryStatuses[repository.uuid].ram.used },
+                { name: 'Disponible', value: repositoryStatuses[repository.uuid].ram.available }
+              ]"
+              [view]="view"
+              [colorScheme]="colorScheme"
+              [isDoughnut]="isDoughnut"
+              [showLabels]="showLabels"
+              [isDhcp]="false"
+              [isRepository]="true">
+            </app-status-tab>
+          </div>
+          <mat-card *ngIf="!loading && errorRepositories[repository.uuid]" class="error-card">
+            <mat-card-content>
+              <p>{{ 'errorLoadingData' | translate }}</p>
+            </mat-card-content>
+          </mat-card>
+        </mat-tab>
+      </mat-tab-group>
+    </mat-tab>
+  </mat-tab-group>
+</mat-dialog-content>
+<mat-dialog-actions class="action-container">
+  <button class="ordinary-button" [mat-dialog-close]="true">{{ 'closeButton' | translate }}</button>
+</mat-dialog-actions>

ogWebconsole/src/app/components/global-status/global-status.component.spec.ts

@@ -0,0 +1,49 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { ToastrModule } from 'ngx-toastr';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatTabsModule } from '@angular/material/tabs';
+import { GlobalStatusComponent } from './global-status.component';
+import { ConfigService } from '@services/config.service';
+import { LoadingComponent } from '../../shared/loading/loading.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgxChartsModule } from '@swimlane/ngx-charts';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+
+describe('GlobalStatusComponent', () => {
+  let component: GlobalStatusComponent;
+  let fixture: ComponentFixture<GlobalStatusComponent>;
+
+  beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url'
+    };
+
+    await TestBed.configureTestingModule({
+      declarations: [GlobalStatusComponent, LoadingComponent],
+      imports: [
+        HttpClientTestingModule,
+        ToastrModule.forRoot(),
+        MatDialogModule,
+        MatTabsModule,
+        TranslateModule.forRoot(),
+        NgxChartsModule,
+        BrowserAnimationsModule
+      ],
+      providers: [
+        { provide: ConfigService, useValue: mockConfigService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(GlobalStatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ogWebconsole/src/app/components/global-status/global-status.component.ts

@@ -0,0 +1,248 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { ConfigService } from '@services/config.service';
+import { MatTabChangeEvent } from '@angular/material/tabs';
+import {ToastrService} from "ngx-toastr";
+
+@Component({
+  selector: 'app-global-status',
+  templateUrl: './global-status.component.html',
+  styleUrl: './global-status.component.css'
+})
+export class GlobalStatusComponent implements OnInit {
+  baseUrl: string;
+  loading: boolean = false;
+  errorOgBoot: boolean = false;
+  errorDhcp: boolean = false;
+  errorRepositories: { [key: string]: boolean } = {};
+  installedOgLives: any[] = [];
+  subnets: any[] = [];
+  showLabels: boolean = true;
+  isDoughnut: boolean = true;
+  colorScheme: any = {
+    domain: ['#df200d', '#26a700']
+  };
+  view: [number, number] = [400, 220];
+  repositoriesUrl: string;
+  repositories: any[] = [];
+  repositoryStatuses: { [key: string]: any } = {};
+
+  ogBootApiUrl: string;
+  ogBootDiskUsage: any = {};
+  ogBootServicesStatus: any = {};
+  ogBootDiskUsageChartData: any[] = [];
+
+  dhcpApiUrl: string;
+  dhcpDiskUsage: any = {};
+  dhcpServicesStatus: any = {};
+  dhcpDiskUsageChartData: any[] = [];
+  isDhcp: boolean = false;
+  isRepository: boolean = false;
+
+  constructor(
+    private configService: ConfigService,
+    private toastService: ToastrService,
+    private http: HttpClient
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.ogBootApiUrl = `${this.baseUrl}/og-boot/status`;
+    this.dhcpApiUrl = `${this.baseUrl}/og-dhcp/status`;
+    this.repositoriesUrl = `${this.baseUrl}/image-repositories`;
+  }
+
+  ngOnInit(): void {
+    this.loadOgBootStatus();
+    this.syncSubnets()
+    this.syncTemplates()
+    this.syncOgLives()
+  }
+
+  syncSubnets() {
+    const timeoutId = setTimeout(() => {
+      this.toastService.error('Error al sincronizar las subredes: tiempo de espera agotado');
+    }, 3500);
+
+    this.http.post(`${this.baseUrl}/subnets/sync`, {}).subscribe({
+      next: (response) => {
+        clearTimeout(timeoutId);
+        this.toastService.success('Sincronización con componente DHCP exitosa');
+      },
+      error: (error) => {
+        clearTimeout(timeoutId);
+        this.toastService.error('Error al sincronizar las subredes DHCP');
+      }
+    });
+  }
+
+  syncTemplates() {
+    const timeoutId = setTimeout(() => {
+      this.toastService.error('Error al sincronizar las plantillas Pxe: tiempo de espera agotado');
+    }, 3500);
+
+    this.http.post(`${this.baseUrl}/pxe-templates/sync`, {})
+      .subscribe(response => {
+        clearTimeout(timeoutId);
+        this.toastService.success('Sincronización de las plantillas Pxe completada');
+      }, error => {
+        clearTimeout(timeoutId);
+        this.toastService.error('Error al sincronizar las plantillas Pxe');
+      });
+  }
+
+  syncOgLives(): void {
+    const timeoutId = setTimeout(() => {
+      this.toastService.error('Error al sincronizar las imagenes ogLive : tiempo de espera agotado');
+    }, 3500);
+
+    this.http.post(`${this.baseUrl}/og-lives/sync`, {})
+      .subscribe(response => {
+        clearTimeout(timeoutId);
+        this.toastService.success('Sincronización con los ogLives completada');
+      }, error => {
+        clearTimeout(timeoutId);
+        this.toastService.error('Error al sincronizar imágenes ogLive');
+      });
+  }
+
+  [key: string]: any;
+
+  loadStatus(apiUrl: string, diskUsage: any, servicesStatus: any, diskUsageChartData: any[], installedOgLives: any[], isDhcp: boolean, errorState: string): void {
+    this.loading = true;
+    this[errorState] = false;
+    const timeoutId = setTimeout(() => {
+      this.loading = false;
+      this[errorState] = true;
+    }, 3500);
+    this.http.get<any>(apiUrl).subscribe({
+      next: data => {
+        diskUsage.used = data.message.disk_usage.used;
+        diskUsage.available = data.message.disk_usage.available;
+        diskUsage.total = data.message.disk_usage.total;
+        diskUsage.percentage = data.message.disk_usage.percentage;
+
+        Object.assign(servicesStatus, data.message.services_status);
+
+        if (isDhcp) {
+          this.subnets.length = 0;
+          if (data.message.subnets) {
+            this.subnets.push(...data.message.subnets);
+          }
+        } else {
+          installedOgLives.length = 0;
+          if (data.message.installed_oglives) {
+            installedOgLives.push(...data.message.installed_oglives);
+          }
+        }
+
+        diskUsageChartData.length = 0;
+        diskUsageChartData.push(
+          { name: 'Usado', value: parseFloat(diskUsage.used) },
+          { name: 'Disponible', value: parseFloat(diskUsage.available) }
+        );
+
+        this.loading = false;
+        clearTimeout(timeoutId);
+      },
+      error: error => {
+        console.log(error);
+        this.loading = false;
+        this[errorState] = true;
+        clearTimeout(timeoutId);
+      }
+    });
+  }
+
+  loadRepositories(): void {
+    this.loading = true;
+    this.errorRepositories = {};
+    const timeoutId = setTimeout(() => {
+      this.loading = false;
+      this.repositories.forEach(repository => {
+        if (!(repository.uuid in this.errorRepositories)) {
+          this.errorRepositories[repository.uuid] = true;
+        }
+      });
+    }, 5000);
+
+    this.http.get<any>(`${this.repositoriesUrl}?page=1&itemsPerPage=10`).subscribe(
+      data => {
+        this.repositories = data['hydra:member'];
+        let remainingRepositories = this.repositories.length;
+
+        this.repositories.forEach(repository => {
+          this.loadRepositoryStatus(repository.uuid, (errorOccurred: boolean) => {
+            remainingRepositories--;
+
+            this.errorRepositories[repository.uuid] = errorOccurred;
+
+            if (remainingRepositories === 0) {
+              this.loading = false;
+              clearTimeout(timeoutId);
+            }
+          });
+        });
+      },
+      error => {
+        console.error('Error fetching repositories', error);
+        this.loading = false;
+        this.repositories.forEach(repository => {
+          this.errorRepositories[repository.uuid] = true;
+        });
+        clearTimeout(timeoutId);
+      }
+    );
+  }
+
+  loadRepositoryStatus(repositoryUuid: string, callback: (errorOccurred: boolean) => void): void {
+    const timeoutId = setTimeout(() => {
+      callback(true);
+    }, 5000);
+    this.http.get<any>(`${this.baseUrl}/image-repositories/server/${repositoryUuid}/status`).subscribe(
+      data => {
+        const output = data.output;
+        this.repositoryStatuses[repositoryUuid] = {
+          ...output,
+          disk: {
+            ...output.disk,
+            used: parseFloat(output.disk.used),
+            available: parseFloat(output.disk.available)
+          },
+          ram: {
+            ...output.ram,
+            used: parseFloat(output.ram.used),
+            available: parseFloat(output.ram.available)
+          }
+        };
+        clearTimeout(timeoutId);
+        callback(false);
+      },
+      error => {
+        console.error(`Error fetching status for repository ${repositoryUuid}`, error);
+        clearTimeout(timeoutId);
+        callback(true);
+      }
+    );
+  }
+
+  loadOgBootStatus(): void {
+    this.isDhcp = false;
+    this.loadStatus(this.ogBootApiUrl, this.ogBootDiskUsage, this.ogBootServicesStatus, this.ogBootDiskUsageChartData, this.installedOgLives, this.isDhcp, 'errorOgBoot');
+  }
+
+  loadDhcpStatus(): void {
+    this.isDhcp = true;
+    this.loadStatus(this.dhcpApiUrl, this.dhcpDiskUsage, this.dhcpServicesStatus, this.dhcpDiskUsageChartData, this.installedOgLives, this.isDhcp, 'errorDhcp');
+  }
+
+  onTabChange(event: MatTabChangeEvent): void {
+    if (event.tab.textLabel === 'OgBoot') {
+      this.loadOgBootStatus();
+    } else if (event.tab.textLabel === 'Dhcp') {
+      this.loadDhcpStatus();
+    } else if (event.tab.textLabel === 'Repositorios') {
+      if (this.repositories.length === 0) {
+        this.loadRepositories();
+      }
+    }
+  }
+}

ogWebconsole/src/app/components/global-status/status-tab/status-tab.component.css

@@ -0,0 +1,84 @@
+.dashboard {
+  display: flex;
+  flex-direction: column;
+}
+
+.disk-usage-container,
+.ram-usage-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.disk-usage,
+.ram-usage {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
+.service-list,
+.process-list {
+  margin-top: 0em;
+  margin-bottom: 0.5em;
+}
+
+.services-status,
+.processes-status {
+  display: flex;
+  flex-direction: column;
+}
+
+.services-status li {
+  margin: 5px 0;
+  display: flex;
+  align-items: center;
+}
+
+.processes-status li {
+  margin: 5px 0;
+  display: flex;
+  align-items: center;
+}
+
+.status-led {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  display: inline-block;
+  margin-right: 10px;
+}
+
+.status-led.active {
+  background-color: green;
+}
+
+.status-led.inactive {
+  background-color: red;
+}
+
+.disk-title,
+.ram-title {
+  margin-bottom: 0px;
+}
+
+.service-title,
+.process-title {
+  margin-top: 0px;
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+th,
+td {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+th {
+  background-color: #f4f4f4;
+}

ogWebconsole/src/app/components/global-status/status-tab/status-tab.component.html

@@ -0,0 +1,113 @@
+<app-loading [isLoading]="loading"></app-loading>
+<div *ngIf="!loading" class="dashboard">
+  <!-- Disk Usage Section -->
+  <div class="disk-usage-container">
+    <h3 class="disk-title">{{ 'diskUsageTitle' | translate }}</h3>
+    <div class="disk-usage" joyrideStep="diskUsageStep" text="{{ 'diskUsageDescription' | translate }}">
+      <ngx-charts-pie-chart [view]="view" [scheme]="colorScheme" [results]="diskUsageChartData" [doughnut]="isDoughnut"
+        [labels]="showLabels">
+      </ngx-charts-pie-chart>
+      <div class="disk-usage-info">
+        <p>{{ 'totalLabel' | translate }}: <strong>{{ isRepository ? diskUsage.total : formatBytes(diskUsage.total) }}</strong></p>
+        <p>{{ 'usedLabel' | translate }}: <strong>{{ isRepository ? diskUsage.used : formatBytes(diskUsage.used) }}</strong></p>
+        <p>{{ 'availableLabel' | translate }}: <strong>{{ isRepository ? diskUsage.available : formatBytes(diskUsage.available) }}</strong></p>
+        <p>{{ 'usedPercentageLabel' | translate }}: <strong>{{ isRepository ? diskUsage.used_percentage : diskUsage.percentage }}</strong></p>
+      </div>
+    </div>
+  </div>
+
+  <!-- RAM Usage Section -->
+  <div class="ram-usage-container" *ngIf="isRepository">
+    <h3 class="ram-title">{{ 'RamUsage' | translate }}</h3>
+    <div class="ram-usage">
+      <ngx-charts-pie-chart [view]="view" [scheme]="colorScheme" [results]="ramUsageChartData" [doughnut]="isDoughnut"
+        [labels]="showLabels">
+      </ngx-charts-pie-chart>
+      <div class="ram-usage-info">
+        <p>{{ 'totalLabel' | translate }}: <strong>{{ ramUsage.total }}</strong></p>
+        <p>{{ 'usedLabel' | translate }}: <strong>{{ ramUsage.used }}</strong></p>
+        <p>{{ 'availableLabel' | translate }}: <strong>{{ ramUsage.available }}</strong></p>
+        <p>{{ 'usedPercentageLabel' | translate }}: <strong>{{ ramUsage.used_percentage }}</strong></p>
+      </div>
+    </div>
+  </div>
+
+  <!-- CPU Usage Section -->
+  <div class="cpu-usage-container" *ngIf="isRepository">
+    <h3 class="cpu-title">{{ 'CpuUsage' | translate }}</h3>
+    <div class="cpu-usage">
+      <p>{{ 'usedLabel' | translate }}: <strong>{{ cpuUsage.used_percentage }}</strong></p>
+    </div>
+  </div>
+
+  <!-- Services Status Section -->
+  <div class="services-status" joyrideStep="servicesStatusStep" text="{{ 'servicesStatusDescription' | translate }}">
+    <h3 class="service-title">{{ 'servicesTitle' | translate }}</h3>
+    <ul class="service-list">
+      <li *ngFor="let service of getServices()">
+        <span class="status-led"
+          [ngClass]="{ 'active': service.status === 'active', 'inactive': service.status !== 'active' }"></span>
+        {{ service.name }}: {{ service.status | translate }}
+      </li>
+    </ul>
+  </div>
+
+  <!-- Processes Status Section -->
+  <div class="processes-status" *ngIf="isRepository">
+    <h3 class="process-title">{{ 'processes' | translate }}</h3>
+    <ul class="process-list">
+      <li *ngFor="let process of getProcesses()">
+        <span class="status-led"
+          [ngClass]="{ 'active': process.status === 'running', 'inactive': process.status !== 'running' }"></span>
+        {{ process.name }}: {{ process.status }}
+      </li>
+    </ul>
+  </div>
+
+  <!-- Installed OgLives / Subnets Section -->
+  <div *ngIf="!isRepository && !isDhcp">
+    <h3>{{ 'InstalledOglivesTitle' | translate }}</h3>
+    <table>
+      <thead>
+        <tr>
+          <th>{{ 'idLabel' | translate }}</th>
+          <th>{{ 'kernelLabel' | translate }}</th>
+          <th>{{ 'architectureLabel' | translate }}</th>
+          <th>{{ 'revisionLabel' | translate }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of installedOgLives">
+          <td>{{ item.id }}</td>
+          <td>{{ item.kernel }}</td>
+          <td>{{ item.architecture }}</td>
+          <td>{{ item.revision }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+  <div *ngIf="isDhcp">
+    <h3>{{ 'subnets' | translate }}</h3>
+    <table>
+      <thead>
+        <tr>
+          <th>{{ 'idLabel' | translate }}</th>
+          <th>{{ 'bootFileNameLabel' | translate }}</th>
+          <th>{{ 'nextServerLabel' | translate }}</th>
+          <th>{{ 'ipLabel' | translate }}</th>
+          <th>{{ 'clientsLabel' | translate }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of subnets">
+          <td>{{ item.id }}</td>
+          <td>{{ item['boot-file-name'] }}</td>
+          <td>{{ item['next-server'] }}</td>
+          <td>{{ item.subnet }}</td>
+          <td>{{ item.reservations.length }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

ogWebconsole/src/app/components/global-status/status-tab/status-tab.component.spec.ts

@@ -0,0 +1,49 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { ToastrModule } from 'ngx-toastr';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatTabsModule } from '@angular/material/tabs';
+import { ConfigService } from '@services/config.service';
+import { LoadingComponent } from 'src/app/shared/loading/loading.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgxChartsModule } from '@swimlane/ngx-charts';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { StatusTabComponent } from './status-tab.component';
+
+describe('StatusTabComponent', () => {
+  let component: StatusTabComponent;
+  let fixture: ComponentFixture<StatusTabComponent>;
+
+  const mockConfigService = {
+    apiUrl: 'http://mock-api-url'
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [StatusTabComponent, LoadingComponent],
+      imports: [
+        HttpClientTestingModule,
+        ToastrModule.forRoot(),
+        MatDialogModule,
+        MatTabsModule,
+        TranslateModule.forRoot(),
+        NgxChartsModule,
+        BrowserAnimationsModule
+      ],
+      providers: [
+        { provide: ConfigService, useValue: mockConfigService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(StatusTabComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ogWebconsole/src/app/components/global-status/status-tab/status-tab.component.ts

@@ -0,0 +1,60 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-status-tab',
+  templateUrl: './status-tab.component.html',
+  styleUrl: './status-tab.component.css'
+})
+export class StatusTabComponent {
+  @Input() loading: boolean = false;
+  @Input() diskUsage: any = {};
+  @Input() servicesStatus: any = {};
+  @Input() installedOgLives: any[] = [];
+  @Input() subnets: any[] = [];
+  @Input() diskUsageChartData: any[] = [];
+  @Input() showLabels: boolean = true;
+  @Input() isDoughnut: boolean = true;
+  @Input() colorScheme: any = {
+    domain: ['#df200d', '#26a700']
+  };
+  @Input() view: [number, number] = [400, 220];
+  @Input() isDhcp: boolean = false;
+  @Input() processesStatus: any = {};
+  @Input() ramUsage: any = {};
+  @Input() cpuUsage: any = {};
+  @Input() ramUsageChartData: any[] = [];
+  @Input() isRepository: boolean = false;
+
+  getServices(): { name: string, status: string }[] {
+    if (!this.servicesStatus) {
+      return [];
+    }
+    const services = Object.keys(this.servicesStatus).map(key => ({
+      name: key,
+      status: this.servicesStatus[key]
+    }))
+    return services;
+  }
+
+  getProcesses(): { name: string, status: string }[] {
+    if (!this.processesStatus) {
+      return [];
+    }
+    return Object.keys(this.processesStatus).map(key => ({
+      name: key,
+      status: this.processesStatus[key]
+    }));
+  }
+
+  formatBytes(bytes: number): string {
+    if (bytes >= 1e9) {
+      return (bytes / 1e9).toFixed(2) + ' GB';
+    } else if (bytes >= 1e6) {
+      return (bytes / 1e6).toFixed(2) + ' MB';
+    } else if (bytes >= 1e3) {
+      return (bytes / 1e3).toFixed(2) + ' KB';
+    } else {
+      return bytes + ' B';
+    }
+  }
+}

ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css

@@ -5,6 +5,15 @@
   padding: 10px;
 }
 
+.client-container {
+  flex-grow: 1;
+  box-sizing: border-box;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  padding: 0rem 1rem 0rem 0.5rem;
+}
+
 .client-icon {
   flex-shrink: 0;
   margin-right: 20px;
@@ -33,23 +42,19 @@
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  /* Distribuye el espacio entre los gráficos */
   gap: 20px;
-  /* Añade espacio entre los gráficos */
 }
 
 .disk-usage {
   text-align: center;
   flex: 1;
   min-width: 200px;
-  /* Ajusta este valor según el tamaño mínimo deseado para cada gráfico */
 }
 
 .circular-chart {
   max-width: 150px;
   max-height: 150px;
   margin: 0 auto;
-  /* Centra el gráfico dentro del contenedor */
 }
 
 .chart {
@@ -75,6 +80,11 @@
 
 .client-info {
   margin: 20px 0;
+  border-radius: 12px;
+  background-color: #f5f7fa;
+  padding: 20px;
+  border: 2px solid #d1d9e6;
+  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
 }
 
 .info-section {
@@ -139,9 +149,7 @@
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  /* Distribuye el espacio entre los gráficos */
   gap: 20px;
-  /* Añade espacio entre los gráficos */
 }
 
 .buttons-row {
@@ -226,29 +234,22 @@
   animation: progress 1s ease-out forwards;
 }
 
-/* Define colores distintos para cada partición */
 .partition-0 {
   stroke: #00bfa5;
 }
 
-/* Ejemplo: verde */
 .partition-1 {
   stroke: #ff6f61;
 }
 
-/* Ejemplo: rojo */
 .partition-2 {
   stroke: #ffb400;
 }
 
-/* Ejemplo: amarillo */
 .partition-3 {
   stroke: #3498db;
 }
 
-/* Ejemplo: azul */
-
-/* Texto en el centro del gráfico */
 .percentage {
   fill: #333;
   font-size: 0.7rem;
@@ -258,27 +259,72 @@
 .disk-container {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
-  align-items: flex-start;
   gap: 20px;
+  background-color: #f5f7fa;
+  border: 2px solid #d1d9e6;
+  border-radius: 10px;
+  padding: 20px;
+  margin-top: 20px;
+  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
+  flex-wrap: wrap;
+  justify-content: center;
+  align-items: stretch;
+  margin-bottom: 20px;
 }
 
 .table-container {
   flex: 3;
-  overflow-x: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+table.mat-elevation-z8 {
+  width: 100%;
+  max-width: 800px;
+  background-color: white;
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.mat-header-cell {
+  background-color: #d1d9e6 !important;
+  color: #333;
+  font-weight: bold;
+  text-align: center;
+}
+
+.mat-cell {
+  text-align: center;
+}
+
+.mat-chip {
+  font-weight: bold;
+  color: white;
 }
 
 .charts-container {
-  flex: 1;
+  flex: 2;
   display: flex;
+  flex-direction: column;
   align-items: center;
-  gap: 10px;
+  justify-content: center;
 }
 
 .disk-usage {
+  background-color: white;
+  padding: 15px;
+  border-radius: 8px;
+  justify-self: center;
+  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
   text-align: center;
 }
 
+.chart {
+  display: flex;
+  justify-content: center;
+}
+
 .back-button {
   display: flex;
   align-items: center;
@@ -302,4 +348,4 @@
 .back-button:disabled {
   background-color: #ced0df;
   cursor: not-allowed;
-}
+}

ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html

@@ -1,68 +1,71 @@
-<div class="header-container">
-  <h2 class="title">{{ 'clientDetailsTitle' | translate }}</h2>
-  <div class="client-button-row">
-    <button class="back-button" (click)="navigateToGroups()">
-      <mat-icon>arrow_back</mat-icon>
-      {{ 'Back' | translate }}
-    </button>
-  </div>
-</div>
-
 <app-loading [isLoading]="loading"></app-loading>
 
-<div *ngIf="!loading" class="client-info">
-  <div class="info-section">
-    <div class="two-column-table">
-      <div class="table-row" *ngFor="let clientData of generalData">
-        <div class="column property">{{ clientData?.property }}</div>
-        <div class="column value">{{ clientData?.value }}</div>
-      </div>
+<div class="client-container">
+  <div class="header-container">
+    <h2 class="title">{{ 'clientDetailsTitle' | translate }} {{ clientData.name }}</h2>
+    <div class="client-button-row">
+      <button class="back-button" (click)="navigateToGroups()">
+        <mat-icon>arrow_back</mat-icon>
+        {{ 'back' | translate }}
+      </button>
     </div>
-    <div class="two-column-table">
-      <div class="table-row" *ngFor="let clientData of networkData">
-        <div class="column property">{{ clientData?.property }}</div>
-        <div class="column value">{{ clientData?.value }}</div>
+  </div>
+
+  <mat-divider></mat-divider>
+
+  <div *ngIf="!loading" class="client-info">
+    <div class="info-section">
+      <div class="two-column-table">
+        <div class="table-row" *ngFor="let clientData of generalData">
+          <div class="column property">{{ clientData?.property }}</div>
+          <div class="column value">{{ clientData?.value }}</div>
+        </div>
+      </div>
+      <div class="two-column-table">
+        <div class="table-row" *ngFor="let clientData of networkData">
+          <div class="column property">{{ clientData?.property }}</div>
+          <div class="column value">{{ clientData?.value }}</div>
+        </div>
       </div>
     </div>
   </div>
-</div>
-<div class="header-container">
-  <h2 class="title" i18n="@@adminImagesTitle">Discos/Particiones</h2>
-</div>
+  <div class="header-container">
+    <h2 class="title" i18n="@@adminImagesTitle">Discos/Particiones</h2>
+  </div>
 
-<div class="disk-container">
-  <!-- Tabla de particiones -->
-  <div class="table-container">
-    <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
-      <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
-        <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
-        <td mat-cell *matCellDef="let image">
-          <ng-container *ngIf="column.columnDef !== 'size'">
-            {{ column.cell(image) }}
-          </ng-container>
-          <ng-container *ngIf="column.columnDef === 'size'">
-            <mat-chip color="primary">
-              {{ (image.size / 1024).toFixed(2) }} GB
-            </mat-chip>
-          </ng-container>
-        </td>
+  <div class="disk-container">
+    <div class="table-container">
+      <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
+        <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
+          <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
+          <td mat-cell *matCellDef="let image">
+            <ng-container *ngIf="column.columnDef !== 'size'">
+              {{ column.cell(image) }}
+            </ng-container>
+            <ng-container *ngIf="column.columnDef === 'size'">
+              <mat-chip color="primary">
+                {{ (image.size / 1024).toFixed(2) }} GB
+              </mat-chip>
+            </ng-container>
+          </td>
+        </ng-container>
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+      </table>
+    </div>
+
+    <div class="charts-container">
+      <ng-container *ngIf="diskUsageData && diskUsageData.length > 0">
+        <div *ngFor="let disk of chartDisk" class="disk-usage">
+          <ngx-charts-pie-chart class="chart" [view]="view" [results]="disk.chartData" [doughnut]="true">
+          </ngx-charts-pie-chart>
+
+          <h3>Disco {{ disk.diskNumber }}</h3>
+          <p>Usado: {{ (disk.used).toFixed(2) }} GB ({{ disk.percentage }}%)</p>
+          <p>Total: {{ disk.total }} GB</p>
+        </div>
       </ng-container>
-      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-      <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-    </table>
+    </div>
   </div>
+</div>
 
-  <!-- Gráfico circular -->
-  <div class="charts-container">
-    <ng-container *ngIf="diskUsageData && diskUsageData.length > 0">
-      <div *ngFor="let disk of chartDisk" class="disk-usage">
-        <ngx-charts-pie-chart [view]="view" [results]="disk.chartData" [doughnut]="true">
-        </ngx-charts-pie-chart>
-
-        <h3>Disco {{ disk.diskNumber }}</h3>
-        <p>Usado: {{ (disk.used).toFixed(2) }} GB ({{ disk.percentage }}%)</p>
-        <p>Total: {{ disk.total }} GB</p>
-      </div>
-    </ng-container>
-  </div>
-</div>

ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts

@@ -1,12 +1,12 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import {DatePipe} from "@angular/common";
-import {MatTableDataSource} from "@angular/material/table";
-import {PartitionAssistantComponent} from "./partition-assistant/partition-assistant.component";
-import {MatDialog} from "@angular/material/dialog";
-import {Router} from "@angular/router";
-import {ToastrService} from "ngx-toastr";
+import { DatePipe } from "@angular/common";
+import { MatTableDataSource } from "@angular/material/table";
+import { MatDialog } from "@angular/material/dialog";
+import { Router } from "@angular/router";
+import { ToastrService } from "ngx-toastr";
 import { ManageClientComponent } from "../../shared/clients/manage-client/manage-client.component";
+import { ConfigService } from '@services/config.service';
 
 interface ClientInfo {
   property: string;
@@ -19,7 +19,7 @@ interface ClientInfo {
   styleUrl: './client-main-view.component.css'
 })
 export class ClientMainViewComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   @ViewChild('assistantContainer') assistantContainer!: ElementRef;
   clientUuid: string;
   clientData: any = {};
@@ -38,17 +38,17 @@ export class ClientMainViewComponent implements OnInit {
   showLegend: boolean = true;
 
   arrayCommands: any[] = [
-    {name: 'Enceder', slug: 'power-on'},
-    {name: 'Apagar', slug: 'power-off'},
-    {name: 'Reiniciar', slug: 'reboot'},
-    {name: 'Iniciar Sesión', slug: 'login'},
-    {name: 'Crear imagen', slug: 'create-image'},
-    {name: 'Clonar/desplegar imagen', slug: 'deploy-image'},
-    {name: 'Eliminar Imagen Cache', slug: 'delete-image-cache'},
-    {name: 'Particionar y Formatear', slug: 'partition'},
-    {name: 'Inventario Software', slug: 'software-inventory'},
-    {name: 'Inventario Hardware', slug: 'hardware-inventory'},
-    {name: 'Ejecutar script', slug: 'run-script'},
+    { name: 'Enceder', slug: 'power-on' },
+    { name: 'Apagar', slug: 'power-off' },
+    { name: 'Reiniciar', slug: 'reboot' },
+    { name: 'Iniciar Sesión', slug: 'login' },
+    { name: 'Crear imagen', slug: 'create-image' },
+    { name: 'Clonar/desplegar imagen', slug: 'deploy-image' },
+    { name: 'Eliminar Imagen Cache', slug: 'delete-image-cache' },
+    { name: 'Particionar y Formatear', slug: 'partition' },
+    { name: 'Inventario Software', slug: 'software-inventory' },
+    { name: 'Inventario Hardware', slug: 'hardware-inventory' },
+    { name: 'Ejecutar comando', slug: 'run-script' },
   ];
 
   datePipe: DatePipe = new DatePipe('es-ES');
@@ -91,9 +91,11 @@ export class ClientMainViewComponent implements OnInit {
   constructor(
     private http: HttpClient,
     private dialog: MatDialog,
+    private configService: ConfigService,
     private router: Router,
     private toastService: ToastrService
-    ) {
+  ) {
+    this.baseUrl = this.configService.apiUrl;
     const url = window.location.href;
     const segments = url.split('/');
     this.clientUuid = segments[segments.length - 1];
@@ -198,15 +200,16 @@ export class ClientMainViewComponent implements OnInit {
 
   onEditClick(event: MouseEvent, uuid: string): void {
     event.stopPropagation();
-    const dialogRef = this.dialog.open(ManageClientComponent, { data: { uuid }, width: '900px' } );
+    const dialogRef = this.dialog.open(ManageClientComponent, { data: { uuid }, width: '900px' });
     dialogRef.afterClosed().subscribe();
   }
 
   loadPartitions(): void {
     this.http.get<any>(`${this.baseUrl}/partitions?client.id=${this.clientData?.id}&order[diskNumber, partitionNumber]=ASC`).subscribe({
       next: data => {
-        this.dataSource = data['hydra:member'];
-        this.partitions = data['hydra:member'];
+        const filteredPartitions = data['hydra:member'].filter((partition: any) => partition.partitionNumber !== 0);
+        this.dataSource = filteredPartitions;
+        this.partitions = filteredPartitions;
         this.calculateDiskUsage();
       },
       error: error => {
@@ -215,6 +218,7 @@ export class ClientMainViewComponent implements OnInit {
     });
   }
 
+
   loadCommands(): void {
     this.http.get<any>(`${this.baseUrl}/commands?`).subscribe({
       next: data => {

ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.css

@@ -24,6 +24,7 @@
 table {
   width: 100%;
   margin-top: 50px;
+  background-color: #eaeff6;
 }
 
 .search-container  {
@@ -36,18 +37,26 @@ table {
 }
 
 .select-container {
-  margin-top: 20px;
-  align-items: center;
+  gap: 16px;
   width: 100%;
-  padding: 0 5px;
+  box-sizing: border-box;
+  padding: 20px;
+}
+
+.selector {
+  display: flex;
+  gap: 16px;
+  width: 100%;
+  margin-top: 30px;
   box-sizing: border-box;
 }
 
-.full-width {
-  width: 100%;
-  margin-bottom: 16px;
+.half-width {
+  flex: 1;
+  max-width: 50%;
 }
 
+
 .search-string {
   flex: 2;
   padding: 5px;
@@ -62,7 +71,8 @@ table {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 10px;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
 }
 
 .mat-elevation-z8 {
@@ -74,3 +84,22 @@ table {
   justify-content: end;
   margin-bottom: 30px;
 }
+
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  padding-left: 1em;
+}
+
+.button-row {
+  display: flex;
+  padding-right: 1em;
+}
+
+.partition-table-container {
+  background-color: #eaeff6;
+  padding: 20px;
+  border-radius: 12px;
+  margin-top: 20px;
+}
+

ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.html

@@ -6,40 +6,58 @@
       Crear imagen desde {{ clientName }}
     </h2>
   </div>
-  <div class="subnets-button-row">
-    <button class="action-button" (click)="save()">Ejecutar</button>
+  <div class="button-row">
+    <button class="action-button" [disabled]="!selectedPartition"  (click)="save()">Ejecutar</button>
   </div>
 </div>
 <mat-divider></mat-divider>
 
 <div class="select-container">
-  <mat-form-field appearance="fill" class="full-width">
-    <mat-label>Nombre canónico</mat-label>
-    <input matInput [(ngModel)]="name" placeholder="Nombre canónico. En minúscula y sin espacios" required>
-  </mat-form-field>
+  <div class="selector">
+    <mat-form-field appearance="fill" class="half-width">
+      <mat-label>Nombre canónico</mat-label>
+      <input matInput [disabled]="selectedImage" [(ngModel)]="name" placeholder="Nombre canónico. En minúscula y sin espacios" required>
+    </mat-form-field>
+
+    <mat-form-field appearance="fill" class="half-width">
+      <mat-label>Seleccione imagen</mat-label>
+      <mat-select [(ngModel)]="selectedImage" name="selectedImage" (selectionChange)="resetCanonicalName()" required>
+        <mat-option *ngFor="let image of images" [value]="image">{{ image?.name }}</mat-option>
+      </mat-select>
+      <button *ngIf="selectedImage" mat-icon-button matSuffix aria-label="Clear client search"
+              (click)="selectedImage = null; resetCanonicalName()">
+        <mat-icon>close</mat-icon>
+      </button>
+      <mat-hint>Seleccione la imagen para sobreescribir si se requiere. </mat-hint>
+    </mat-form-field>
+  </div>
+
+
+  <div class="partition-table-container">
+    <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
+      <ng-container matColumnDef="select">
+        <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: start">Seleccionar partición</th>
+        <td mat-cell *matCellDef="let row">
+          <mat-radio-group
+            [(ngModel)]="selectedPartition"
+            [disabled]="!row.operativeSystem"
+          >
+            <mat-radio-button [value]="row">
+            </mat-radio-button>
+          </mat-radio-group>
+        </td>
+      </ng-container>
+
+      <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
+        <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
+        <td mat-cell *matCellDef="let image">
+          {{ column.cell(image) }}
+        </td>
+      </ng-container>
+
+      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+    </table>
+  </div>
+
 </div>
-
-<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
-  <ng-container matColumnDef="select">
-    <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: start">Seleccionar partición</th>
-    <td mat-cell *matCellDef="let row">
-      <mat-radio-group
-        [(ngModel)]="selectedPartition"
-        [disabled]="!row.operativeSystem"
-      >
-        <mat-radio-button [value]="row">
-        </mat-radio-button>
-      </mat-radio-group>
-    </td>
-  </ng-container>
-
-  <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
-    <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
-    <td mat-cell *matCellDef="let image">
-      {{ column.cell(image) }}
-    </td>
-  </ng-container>
-
-  <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-  <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-</table>

ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.ts

@@ -1,16 +1,18 @@
-import {Component, EventEmitter, Output} from '@angular/core';
-import {HttpClient} from "@angular/common/http";
-import {ToastrService} from "ngx-toastr";
-import {ActivatedRoute, Router} from "@angular/router";
-import {MatTableDataSource} from "@angular/material/table";
-import {SelectionModel} from "@angular/cdk/collections";
+import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import { HttpClient } from "@angular/common/http";
+import { ToastrService } from "ngx-toastr";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MatTableDataSource } from "@angular/material/table";
+import { SelectionModel } from "@angular/cdk/collections";
+import { ConfigService } from '@services/config.service';
+
 @Component({
   selector: 'app-create-image',
   templateUrl: './create-image.component.html',
   styleUrl: './create-image.component.css'
 })
-export class CreateClientImageComponent {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+export class CreateClientImageComponent implements OnInit{
+  baseUrl: string;
   @Output() dataChange = new EventEmitter<any>();
 
   errorMessage = '';
@@ -22,6 +24,7 @@ export class CreateClientImageComponent {
   name: string = '';
   client: any = null;
   loading: boolean = false;
+  selectedImage: any = null;
   dataSource = new MatTableDataSource<any>();
   columns = [
     {
@@ -57,10 +60,12 @@ export class CreateClientImageComponent {
   constructor(
     private http: HttpClient,
     private toastService: ToastrService,
+    private configService: ConfigService,
     private route: ActivatedRoute,
     private router: Router,
-
-  ) {}
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+  }
 
   ngOnInit() {
     this.clientId = this.route.snapshot.paramMap.get('id');
@@ -91,7 +96,7 @@ export class CreateClientImageComponent {
     const url = `${this.baseUrl}/images?created=false&page=1&itemsPerPage=1000`;
     this.http.get(url).subscribe(
       (response: any) => {
-          this.images = response['hydra:member'];
+        this.images = response['hydra:member'];
       },
       (error) => {
         console.error('Error al cargar las imágenes:', error);
@@ -99,29 +104,44 @@ export class CreateClientImageComponent {
     );
   }
 
+  resetCanonicalName() {
+    this.name = this.selectedImage ? this.selectedImage.name : '';
+  }
+
   save(): void {
     this.loading = true;
 
+    if (!this.selectedPartition) {
+      this.toastService.error('Debes seleccionar una partición');
+      this.loading = false;
+      return;
+    }
+
+    if (this.selectedImage) {
+      this.toastService.warning('Aviso: Está seleccionando una imagen previamente creada. Se procede a crear un backup de la misma. ');
+    }
+
     const payload = {
       client: `/clients/${this.clientId}`,
       name: this.name,
       partition: this.selectedPartition['@id'],
-      source: 'assistant'
+      source: 'assistant',
+      selectedImage: this.selectedImage?.['@id']
     };
 
 
     this.http.post(`${this.baseUrl}/images`, payload)
       .subscribe({
-          next: (response) => {
-            this.toastService.success('Petición de creación de imagen enviada');
-            this.loading = false;
-            this.router.navigate(['/commands-logs']);
-          },
-          error: (error) => {
-            this.toastService.error(error.error['hydra:description']);
-            this.loading = false;
-          }
+        next: (response) => {
+          this.toastService.success('Petición de creación de imagen enviada');
+          this.loading = false;
+          this.router.navigate(['/commands-logs']);
+        },
+        error: (error) => {
+          this.toastService.error(error.error['hydra:description']);
+          this.loading = false;
         }
+      }
       );
   }
 }

ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.css

@@ -6,6 +6,7 @@
 table {
   width: 100%;
   margin-top: 50px;
+  background-color: #eaeff6;
 }
 
 .search-container  {
@@ -38,10 +39,8 @@ table {
 .select-container {
   margin-top: 20px;
   align-items: center;
-  width: 100%;
-  padding: 0 5px;
+  padding: 20px;
   box-sizing: border-box;
-  padding-left: 1em;
 }
 
 .input-group {
@@ -51,6 +50,10 @@ table {
   margin-top: 20px;
 }
 
+mat-option .unit-name {
+  display: block;
+}
+
 .input-field {
   flex: 1 1 calc(33.33% - 16px);
   min-width: 250px;
@@ -75,6 +78,8 @@ table {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
 }
 
 .mat-elevation-z8 {
@@ -105,6 +110,27 @@ table {
   position: relative;
   padding: 8px;
   text-align: center;
+  cursor: pointer;
+  transition: background-color 0.3s, transform 0.2s;
+
+  &:hover {
+    background-color: #f0f0f0;
+    transform: scale(1.02);
+  }
+}
+
+::ng-deep .custom-tooltip {
+  white-space: pre-line !important;
+  max-width: 200px;
+  background: rgba(0, 0, 0, 0.8);
+  color: white;
+  padding: 8px;
+  border-radius: 4px;
+}
+
+.selected-client {
+  background-color: #a0c2e5 !important; /* Azul */
+  color: white !important;
 }
 
 .client-details {
@@ -112,11 +138,15 @@ table {
 }
 
 .client-name {
-  display: block;
-  font-size: 1.2em;
+  font-size: 0.9em;
   font-weight: 600;
   color: #333;
   margin-bottom: 5px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 150px;
+  display: inline-block;
 }
 
 .client-ip {
@@ -130,3 +160,39 @@ table {
   text-align: left;
   padding-left: 1em;
 }
+
+.button-row {
+  display: flex;
+  padding-right: 1em;
+}
+
+.partition-table-container {
+  background-color: #eaeff6;
+  padding: 20px;
+  border-radius: 12px;
+  margin-top: 20px;
+}
+
+.disabled-client {
+  pointer-events: none;
+  opacity: 0.5;
+}
+
+.error-message {
+  background-color: #de2323;
+  padding: 20px;
+  border-radius: 12px;
+  margin-top: 20px;
+  color: white;
+  font-weight: bold;
+}
+
+.action-button {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+.mat-expansion-panel-header-description {
+  justify-content: space-between;
+  align-items: center;
+}

ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html

@@ -6,142 +6,171 @@
       {{ 'deployImage' | translate }}
     </h2>
   </div>
-  <div class="subnets-button-row">
-    <button class="action-button" (click)="save()">Ejecutar</button>
+  <div class="button-row">
+    <button class="action-button" [disabled]="!allSelected || !selectedModelClient || !selectedImage || !selectedMethod || !selectedPartition"  (click)="save()">Ejecutar</button>
   </div>
 </div>
 <mat-divider></mat-divider>
 
 <div class="select-container">
-  <mat-expansion-panel hideToggle>
+  <mat-expansion-panel>
     <mat-expansion-panel-header>
       <mat-panel-title> Clientes </mat-panel-title>
-      <mat-panel-description> Listado de clientes donde se desplegará la imagen </mat-panel-description>
+      <mat-panel-description>
+        Listado de clientes donde se desplegará la imagen
+        <mat-icon>desktop_windows</mat-icon>
+      </mat-panel-description>
     </mat-expansion-panel-header>
 
-      <div class="clients-grid" >
-        <div *ngFor="let client of clientData" class="client-item">
-          <div class="client-card">
-            <img
-              [src]="'assets/images/ordenador_' + client.status + '.png'"
-              alt="Client Icon"
-              class="client-image" />
+    <div class="button-row">
+      <button class="action-button" (click)="toggleSelectAll()">
+        {{ allSelected ? 'Desmarcar todos' : 'Marcar todos' }}
+      </button>
+    </div>
 
-            <div class="client-details">
-              <span class="client-name">{{ client.name }}</span>
-              <span class="client-ip">{{ client.ip }}</span>
-              <span class="client-ip">{{ client.mac }}</span>
-            </div>
+    <div class="clients-grid">
+      <div *ngFor="let client of clientData" class="client-item">
+        <div class="client-card"
+             (click)="client.status === 'og-live' && toggleClientSelection(client)"
+             [ngClass]="{'selected-client': client.selected, 'disabled-client': client.status !== 'og-live'}"
+             [matTooltip]="getPartitionsTooltip(client)"
+             matTooltipPosition="above"
+             matTooltipClass="custom-tooltip">
+
+          <img
+            [src]="'assets/images/computer_' + client.status + '.svg'"
+            alt="Client Icon"
+            class="client-image" />
+
+          <div class="client-details">
+            <span class="client-name">{{ client.name | slice:0:20 }}</span>
+            <span class="client-ip">{{ client.ip }}</span>
+            <span class="client-ip">{{ client.mac }}</span>
           </div>
+          <mat-divider></mat-divider>
+
+          <mat-radio-group [(ngModel)]="selectedModelClient" (change)="loadPartitions(selectedModelClient)">
+            <mat-radio-button [value]="client"
+                              color="primary"
+                              [disabled]="!client.selected"
+                              (click)="$event.stopPropagation()">
+              Modelo
+            </mat-radio-button>
+          </mat-radio-group>
         </div>
       </div>
+    </div>
+
   </mat-expansion-panel>
 </div>
 
 <mat-divider style="margin-top: 20px;"></mat-divider>
 
 <div class="select-container">
-  <div class="option-container">
-    <mat-radio-group [(ngModel)]="selectedOption" name="selectedOption" aria-label="Selecciona una opcion">
-      <mat-radio-button value="update-cache">Actualizar cache</mat-radio-button>
-      <mat-radio-button value="deploy-image">Desplegar imagen</mat-radio-button>
-    </mat-radio-group>
-  </div>
-
   <div class="deploy-container">
     <mat-form-field appearance="fill" class="full-width">
       <mat-label>Seleccione imagen</mat-label>
       <mat-select [(ngModel)]="selectedImage" name="selectedImage">
-        <mat-option *ngFor="let image of images" [value]="image">{{ image.image?.name }}</mat-option>
+        <mat-option *ngFor="let image of images" [value]="image">
+          <div class="unit-name"> {{ image.name }}</div>
+          <div style="font-size: smaller; color: gray;">{{ image.description }}</div>
+        </mat-option>
       </mat-select>
-      <mat-hint *ngIf="clientData">Imágenes alojadas en {{ clientData[0].repository?.name }}</mat-hint>
     </mat-form-field>
 
     <mat-form-field appearance="fill" class="full-width">
       <mat-label>Seleccione método de deploy</mat-label>
-      <mat-select [(ngModel)]="selectedMethod" name="selectedMethod">
-        <mat-option *ngFor="let method of deployMethods" [value]="method">{{ method }}</mat-option>
+      <mat-select [(ngModel)]="selectedMethod" name="selectedMethod" (selectionChange)="validateImageSize()">
+        <mat-option *ngFor="let method of allMethods" [value]="method.value">{{ method.name }}</mat-option>
       </mat-select>
     </mat-form-field>
   </div>
+
+  <div *ngIf="errorMessage" class="error-message">
+    {{ errorMessage }}
+  </div>
+
+  <div class="partition-table-container">
+    <table mat-table [dataSource]="filteredPartitions" class="mat-elevation-z8">
+      <ng-container matColumnDef="select">
+        <th mat-header-cell *matHeaderCellDef style="text-align: start">Seleccionar partición</th>
+        <td mat-cell *matCellDef="let row">
+          <mat-radio-group [(ngModel)]="selectedPartition" name="selectedPartition" (change)="validateImageSize()">
+            <mat-radio-button [value]="row">
+            </mat-radio-button>
+          </mat-radio-group>
+        </td>
+      </ng-container>
+
+      <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
+        <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
+        <td mat-cell *matCellDef="let image">
+          {{ column.cell(image) }}
+        </td>
+      </ng-container>
+
+      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+    </table>
+  </div>
+
+  <mat-divider></mat-divider>
+  <div class="options-container">
+    <h3 *ngIf="isMethod('udpcast') || isMethod('uftp') || isMethod('udpcast-direct')" class="input-group">Opciones multicast</h3>
+    <h3 *ngIf="isMethod('p2p')" class="input-group">Opciones torrent</h3>
+    <div *ngIf="isMethod('udpcast') || isMethod('uftp') || isMethod('udpcast-direct')" class="input-group">
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label>Puerto</mat-label>
+        <input matInput [(ngModel)]="mcastPort" name="mcastPort" type="number">
+      </mat-form-field>
+
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label>Dirección</mat-label>
+        <input matInput [(ngModel)]="mcastIp" name="mcastIp">
+      </mat-form-field>
+
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label i18n="@@mcastModeLabel">Modo Multicast</mat-label>
+        <mat-select [(ngModel)]="mcastMode" name="mcastMode">
+          <mat-option *ngFor="let option of multicastModeOptions" [value]="option.value">
+            {{ option.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label>Velocidad</mat-label>
+        <input matInput [(ngModel)]="mcastSpeed" name="mcastSpeed" type="number">
+      </mat-form-field>
+
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label>Máximo Clientes</mat-label>
+        <input matInput [(ngModel)]="mcastMaxClients" name="mcastMaxClients" type="number">
+      </mat-form-field>
+
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label>Tiempo Máximo de Espera</mat-label>
+        <input matInput [(ngModel)]="mcastMaxTime" name="mcastMaxTime" type="number">
+      </mat-form-field>
+    </div>
+
+    <div *ngIf="isMethod('p2p')" class="input-group">
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label i18n="@@p2pModeLabel">Modo P2P</mat-label>
+        <mat-select [(ngModel)]="p2pMode" name="p2pMode">
+          <mat-option *ngFor="let option of p2pModeOptions" [value]="option.value">
+            {{ option.name }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field appearance="fill" class="input-field">
+        <mat-label>Semilla</mat-label>
+        <input matInput [(ngModel)]="p2pTime" name="p2pTime" type="number">
+      </mat-form-field>
+    </div>
+  </div>
+
 </div>
 
-<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
-  <ng-container matColumnDef="select">
-    <th mat-header-cell *matHeaderCellDef i18n="@@columnActions" style="text-align: start">Seleccionar partición</th>
-    <td mat-cell *matCellDef="let row">
-      <mat-radio-group [(ngModel)]="selectedPartition" name="selectedPartition">
-        <mat-radio-button [value]="row">
-        </mat-radio-button>
-      </mat-radio-group>
-    </td>
-  </ng-container>
-
-  <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
-    <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
-    <td mat-cell *matCellDef="let image">
-      {{ column.cell(image) }}
-    </td>
-  </ng-container>
-
-  <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-  <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-</table>
-
-<mat-divider></mat-divider>
-<div class="options-container">
-  <h3 *ngIf="isMethod('udpcast') || isMethod('uftp')" class="input-group">Opciones multicast</h3>
-  <h3 *ngIf="isMethod('p2p')" class="input-group">Opciones torrent</h3>
-  <div *ngIf="isMethod('udpcast') || isMethod('uftp')" class="input-group">
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label>Puerto</mat-label>
-      <input matInput [(ngModel)]="mcastPort" name="mcastPort" type="number">
-    </mat-form-field>
-
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label>Dirección</mat-label>
-      <input matInput [(ngModel)]="mcastIp" name="mcastIp">
-    </mat-form-field>
-
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label i18n="@@mcastModeLabel">Modo Multicast</mat-label>
-      <mat-select [(ngModel)]="mcastMode" name="mcastMode">
-        <mat-option *ngFor="let option of multicastModeOptions" [value]="option.value">
-          {{ option.name }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label>Velocidad</mat-label>
-      <input matInput [(ngModel)]="mcastSpeed" name="mcastSpeed" type="number">
-    </mat-form-field>
-
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label>Máximo Clientes</mat-label>
-      <input matInput [(ngModel)]="mcastMaxClients" name="mcastMaxClients" type="number">
-    </mat-form-field>
-
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label>Tiempo Máximo de Espera</mat-label>
-      <input matInput [(ngModel)]="mcastMaxTime" name="mcastMaxTime" type="number">
-    </mat-form-field>
-  </div>
-
-  <div *ngIf="isMethod('p2p')" class="input-group">
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label i18n="@@p2pModeLabel">Modo P2P</mat-label>
-      <mat-select [(ngModel)]="p2pMode" name="p2pMode">
-        <mat-option *ngFor="let option of p2pModeOptions" [value]="option.value">
-          {{ option.name }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-
-    <mat-form-field appearance="fill" class="input-field">
-      <mat-label>Semilla</mat-label>
-      <input matInput [(ngModel)]="p2pTime" name="p2pTime" type="number">
-    </mat-form-field>
-  </div>
-</div>
 

ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.spec.ts

@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { DeployImageComponent } from './deploy-image.component';
 import { provideHttpClient } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
@@ -11,20 +10,27 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatTableModule } from '@angular/material/table';
 import { MatDividerModule } from '@angular/material/divider';
-import { MatRadioModule } from '@angular/material/radio'; // Importar MatRadioModule
+import { MatRadioModule } from '@angular/material/radio';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { ToastrModule, ToastrService } from 'ngx-toastr';
-import { provideRouter } from '@angular/router';
+import { ActivatedRoute, provideRouter } from '@angular/router';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { MatSelectModule } from '@angular/material/select';
-import {MatExpansionModule} from "@angular/material/expansion";
-import {LoadingComponent} from "../../../../../shared/loading/loading.component";
+import { MatExpansionModule } from "@angular/material/expansion";
+import { LoadingComponent } from "../../../../../shared/loading/loading.component";
+import { ConfigService } from '@services/config.service';
 
 describe('DeployImageComponent', () => {
   let component: DeployImageComponent;
   let fixture: ComponentFixture<DeployImageComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [DeployImageComponent, LoadingComponent],
       imports: [
@@ -57,13 +63,26 @@ describe('DeployImageComponent', () => {
         {
           provide: MAT_DIALOG_DATA,
           useValue: {}
-        }
-      ]
+        },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            queryParams: {
+              subscribe: (fn: (value: any) => void) => fn({ clientData: JSON.stringify([{ '@id': '123', uuid: 'client-uuid', status: 'og-live', partitions: [] }]) })
+            }
+          }
+        },
+        { provide: ConfigService, useValue: mockConfigService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
     })
-    .compileComponents();
+      .compileComponents();
 
     fixture = TestBed.createComponent(DeployImageComponent);
     component = fixture.componentInstance;
+    component.clientData = [{ '@id': '123', uuid: 'client-uuid', status: 'og-live', partitions: [] }];
+    component.selectedModelClient = component.clientData[0];
+    component.loadPartitions(component.selectedModelClient);
     fixture.detectChanges();
   });
 

ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts

@@ -1,9 +1,10 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {MatTableDataSource} from "@angular/material/table";
-import {SelectionModel} from "@angular/cdk/collections";
-import {HttpClient} from "@angular/common/http";
-import {ToastrService} from "ngx-toastr";
-import {ActivatedRoute, Router} from "@angular/router";
+import { Component, EventEmitter, Output } from '@angular/core';
+import { MatTableDataSource } from "@angular/material/table";
+import { SelectionModel } from "@angular/cdk/collections";
+import { HttpClient } from "@angular/common/http";
+import { ToastrService } from "ngx-toastr";
+import { ActivatedRoute, Router } from "@angular/router";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-deploy-image',
@@ -11,16 +12,14 @@ import {ActivatedRoute, Router} from "@angular/router";
   styleUrl: './deploy-image.component.css'
 })
 export class DeployImageComponent {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   @Output() dataChange = new EventEmitter<any>();
 
   errorMessage = '';
   clientId: string | null = null;
   partitions: any[] = [];
   images: any[] = [];
-  clientName: string = '';
   selectedImage: any = null;
-  selectedOption: string | null = 'deploy-image';
   selectedMethod: string | null = null;
   selectedPartition: any = null;
   mcastIp: string = '';
@@ -31,10 +30,10 @@ export class DeployImageComponent {
   mcastMaxTime: Number = 0;
   p2pMode: string = '';
   p2pTime: Number = 0;
-  name: string = '';
   client: any = null;
   clientData: any = [];
   loading: boolean = false;
+  allSelected = true;
 
   protected p2pModeOptions = [
     { name: 'Leecher', value: 'leecher' },
@@ -42,23 +41,21 @@ export class DeployImageComponent {
     { name: 'Seeder', value: 'seeder' },
   ];
   protected multicastModeOptions = [
-    { name: 'Half duplex', value: "half"},
-    { name: 'Full duplex', value: "full"},
+    { name: 'Half duplex', value: "half" },
+    { name: 'Full duplex', value: "full" },
   ];
 
+  selectedClients: any[] = [];
+  selectedModelClient: any = null;
+  filteredPartitions: any[] = [];
+  selectedRepository: any = null;
+
   allMethods = [
-    'uftp',
-    'udpcast',
-    'unicast',
-    'unicast-direct',
-    'p2p'
-  ];
-
-  updateCacheMethods = [
-    'uftp',
-    'udpcast',
-    'unicast',
-    'p2p'
+    { name: 'Multicast', value: 'udpcast' },
+    { name: 'Unicast', value: 'unicast' },
+    { name: 'Multicast (direct)', value: 'udpcast-direct' },
+    { name: 'Unicast (direct)', value: 'unicast-direct' },
+    { name: 'Torrent', value: 'p2p' },
   ];
 
   dataSource = new MatTableDataSource<any>();
@@ -96,60 +93,111 @@ export class DeployImageComponent {
   constructor(
     private http: HttpClient,
     private toastService: ToastrService,
-    private route: ActivatedRoute,
+    private configService: ConfigService,
     private router: Router,
+    private route: ActivatedRoute
   ) {
-    const navigation = this.router.getCurrentNavigation();
-    this.clientData = navigation?.extras?.state?.['clientData'];
-    this.clientId = this.clientData?.[0]['@id'];
-    this.loadImages();
-    this.loadPartitions()
-  }
+    this.baseUrl = this.configService.apiUrl;
+    this.route.queryParams.subscribe(params => {
+      if (params['clientData']) {
+        this.clientData = JSON.parse(params['clientData']);
+      }
+    });
+    this.clientId = this.clientData?.length ? this.clientData[0]['@id'] : null;
+    this.clientData.forEach((client: { selected: boolean; status: string}) => {
+      if (client.status === 'og-live') {
+        client.selected = true;
+      }
+    });
+    this.selectedClients = this.clientData.filter(
+      (client: { status: string }) => client.status === 'og-live'
+    );
 
-  get deployMethods() {
-    return this.selectedOption === 'update-cache' ? this.updateCacheMethods : this.allMethods;
+    this.selectedModelClient = this.clientData.find(
+      (client: { status: string }) => client.status === 'og-live'
+    ) || null;
+
+    if (this.selectedModelClient) {
+      this.loadPartitions(this.selectedModelClient);
+    }
   }
 
   isMethod(method: string): boolean {
     return this.selectedMethod === method;
   }
 
-  loadPartitions() {
-    const url = `${this.baseUrl}${this.clientId}`;
-    this.http.get(url).subscribe(
-      (response: any) => {
-        if (response.partitions) {
-          this.client = response;
-          this.clientName = response.name;
-          this.dataSource.data = response.partitions.filter((partition: any) => {
-            return partition.partitionNumber !== 0;
-          });
-          this.p2pMode = response.organizationalUnit?.networkSettings?.p2pMode;
-          this.p2pTime = response.organizationalUnit?.networkSettings?.p2pTime;
-          this.mcastSpeed = response.organizationalUnit?.networkSettings?.mcastSpeed;
-          this.mcastMode = response.organizationalUnit?.networkSettings?.mcastMode;
-          this.mcastPort = response.organizationalUnit?.networkSettings?.mcastPort;
-          this.mcastIp = response.organizationalUnit?.networkSettings?.mcastIp;
-        }
-      },
-      (error) => {
-        console.error('Error al cargar los datos del cliente:', error);
-      }
+  toggleClientSelection(client: any) {
+    client.selected = !client.selected;
+    this.updateSelectedClients();
+  }
+
+  updateSelectedClients() {
+    this.selectedClients = this.clientData.filter(
+      (client: { selected: boolean; state: string }) => client.selected && client.state === "og-live"
     );
+
+    if (!this.selectedClients.includes(this.selectedModelClient)) {
+      this.selectedModelClient = null;
+      this.filteredPartitions = [];
+    }
+  }
+
+  getPartitionsTooltip(client: any): string {
+    if (!client.partitions || client.partitions.length === 0) {
+      return 'No hay particiones disponibles';
+    }
+
+    return client.partitions
+      .map((p: { partitionNumber: any; size: any; filesystem: any }) => `#${p.partitionNumber} ${p.filesystem} - ${p.size / 1024 }GB`)
+      .join('\n');
+  }
+
+  loadPartitions(client: any) {
+    if (client.selected) {
+      this.http.get(`${this.baseUrl}${client.uuid}`).subscribe(
+        (fullClientData: any) => {
+          this.filteredPartitions = fullClientData.partitions;
+          this.selectedRepository = fullClientData.repository ?? null;
+
+          if (fullClientData.partitions) {
+            this.filteredPartitions = fullClientData.partitions.filter((partition: any) => {
+              return partition.partitionNumber !== 0;
+            });
+            this.p2pMode = fullClientData.organizationalUnit?.networkSettings?.p2pMode;
+            this.p2pTime = fullClientData.organizationalUnit?.networkSettings?.p2pTime;
+            this.mcastSpeed = fullClientData.organizationalUnit?.networkSettings?.mcastSpeed;
+            this.mcastMode = fullClientData.organizationalUnit?.networkSettings?.mcastMode;
+            this.mcastPort = fullClientData.organizationalUnit?.networkSettings?.mcastPort;
+            this.mcastIp = fullClientData.organizationalUnit?.networkSettings?.mcastIp;
+          }
+
+          this.loadImages();
+        },
+        (error) => {
+          console.error('Error al cargar los datos completos del cliente:', error);
+        }
+      );
+    } else {
+      this.selectedClients = this.selectedClients.filter(c => c.uuid !== client.uuid);
+      this.filteredPartitions = [];
+    }
+  }
+
+
+  toggleSelectAll() {
+    this.allSelected = !this.allSelected;
+    this.clientData.forEach((client: { selected: boolean; status: string }) => {
+      if (client.status === "og-live") {
+        client.selected = this.allSelected;
+      }
+    });
   }
 
   loadImages() {
-    if (!this.clientData || this.clientData.length === 0 || !this.clientData[0]) {
-      console.error('Error: clientData es nulo, indefinido o vacío.');
-      return;
-    }
-
-    const repositoryId =
-      this.clientData[0]?.repository?.id ??
-      this.clientData[0]?.organizationalUnit?.networkSettings?.repository?.id;
+    const repositoryId = this.selectedRepository?.id;
 
     if (!repositoryId) {
-      console.error('Error: No se encontró repositoryId en clientData.');
+      console.error('Error: No se encontró repositoryId en el cliente seleccionado.');
       return;
     }
 
@@ -165,9 +213,27 @@ export class DeployImageComponent {
     );
   }
 
+  validateImageSize() {
+    if (this.selectedImage && this.selectedPartition) {
+      if ((this.selectedImage.datasize / 1024) / 1024 > this.selectedPartition.size) {
+
+        this.errorMessage = "El tamaño de la imagen seleccionada excede el tamaño de la partición.";
+        return false;
+      }
+    }
+    this.errorMessage = "";
+    return true;
+  }
+
   save(): void {
     this.loading = true;
 
+    if (!this.selectedClients.length) {
+      this.toastService.error('Debe seleccionar al menos un cliente');
+      this.loading = false;
+      return;
+    }
+
     if (!this.selectedImage) {
       this.toastService.error('Debe seleccionar una imagen');
       this.loading = false;
@@ -189,7 +255,7 @@ export class DeployImageComponent {
     this.toastService.info('Preparando petición de despliegue');
 
     const payload = {
-      clients: this.clientData.map((client: any) => client['@id']),
+      clients: this.selectedClients.map((client: any) => client.uuid),
       method: this.selectedMethod,
       // partition: this.selectedPartition['@id'],
       diskNumber: this.selectedPartition.diskNumber,
@@ -206,25 +272,23 @@ export class DeployImageComponent {
 
     this.http.post(`${this.baseUrl}/image-image-repositories/${this.selectedImage.uuid}/deploy-image`, payload)
       .subscribe({
-          next: (response) => {
-            this.toastService.success('Petición de despliegue enviada correctamente');
-            this.loading = false;
-            this.router.navigate(['/commands-logs']);
-          },
-          error: (error) => {
-            console.error('Error:', error);
-            this.toastService.error(error.error['hydra:description'], 'Se ha detectado un error en el despliegue de imágenes.', {
-              "closeButton": true,
-              "newestOnTop": false,
-              "progressBar": false,
-              "positionClass": "toast-bottom-right",
-              "timeOut": 0,
-              "extendedTimeOut": 0,
-              "tapToDismiss": false
-            });
-            this.loading = false;
-          }
+        next: (response) => {
+          this.toastService.success('Petición de despliegue enviada correctamente');
+          this.loading = false;
+          this.router.navigate(['/commands-logs']);
+        },
+        error: (error) => {
+          this.toastService.error(error.error['hydra:description'], 'Se ha detectado un error en el despliegue de imágenes.', {
+            "closeButton": true,
+            "newestOnTop": false,
+            "progressBar": false,
+            "positionClass": "toast-bottom-right",
+            "timeOut": 0,
+            "extendedTimeOut": 0,
+            "tapToDismiss": false
+          });
+          this.loading = false;
         }
-      );
+      });
   }
 }

ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.css

@@ -1,8 +1,8 @@
 .partition-assistant {
-  font-family: 'Roboto', sans-serif;
-  background-color: #f9f9f9;
-  padding: 20px;
-  margin: 20px auto;
+  padding: 40px;
+  margin: 20px;
+  background-color: #eaeff6;
+  border-radius: 12px;
 }
 
 .header-container {
@@ -19,40 +19,14 @@
   color: #555;
 }
 
-.partition-bar {
-  display: flex;
-  margin: 20px 0;
-  height: 40px;
-  border-radius: 8px;
-  overflow: hidden;
-  background-color: #e0e0e0;
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.partition-segment {
-  text-align: center;
-  color: white;
-  line-height: 40px;
-  font-weight: 500;
-  font-size: 0.9rem;
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.2);
-  border-right: 2px solid white; /* Borde de separación */
-}
-
-.partition-segment:last-child {
-  border-right: none;
-}
-
 .partition-table {
   width: 100%;
   border-collapse: collapse;
-  background-color: #fff;
   overflow: hidden;
   margin-bottom: 20px;
 }
 
 .partition-table th {
-  background-color: #f5f5f5;
   color: #333;
   padding: 12px;
   font-weight: 600;
@@ -178,26 +152,20 @@ button.remove-btn:hover {
   position: relative;
 }
 
-.client-card {
-  background: #ffffff;
-  border-radius: 6px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  overflow: hidden;
-  position: relative;
-  padding: 8px;
-  text-align: center;
-}
-
 .client-details {
   margin-top: 4px;
 }
 
 .client-name {
-  display: block;
-  font-size: 1.2em;
+  font-size: 0.9em;
   font-weight: 600;
   color: #333;
   margin-bottom: 5px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 150px;
+  display: inline-block;
 }
 
 .client-ip {
@@ -216,9 +184,68 @@ button.remove-btn:hover {
   margin-top: 20px;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
   box-sizing: border-box;
   padding-left: 1em;
 }
 
+.client-card {
+  background: #ffffff;
+  border-radius: 6px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+  position: relative;
+  padding: 8px;
+  text-align: center;
+  cursor: pointer;
+  transition: background-color 0.3s, transform 0.2s;
+
+  &:hover {
+    background-color: #f0f0f0;
+    transform: scale(1.02);
+  }
+}
+
+::ng-deep .custom-tooltip {
+  white-space: pre-line !important;
+  max-width: 200px;
+  background: rgba(0, 0, 0, 0.8);
+  color: white;
+  padding: 8px;
+  border-radius: 4px;
+}
+
+.selected-client {
+  background-color: #a0c2e5 !important;
+  color: white !important;
+}
+
+.button-row {
+  display: flex;
+  padding-right: 1em;
+}
+
+.disabled-client {
+  pointer-events: none;
+  opacity: 0.5;
+}
+
+.row-button {
+  display: flex;
+  align-items: center;
+  gap: 30px;
+}
+
+
+.action-button {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+.mat-expansion-panel-header-description {
+  justify-content: space-between;
+  align-items: center;
+}
+
+
+
 

ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html

@@ -7,27 +7,55 @@
     </h2>
   </div>
   <div class="subnets-button-row">
-    <button class="action-button" [disabled]="data.status === 'busy'" (click)="save()">Ejecutar</button>
+    <button class="action-button" [disabled]="data.status === 'busy' || !selectedModelClient || !allSelected" (click)="save()">Ejecutar</button>
   </div>
 </div>
 
 <div class="select-container">
-  <mat-expansion-panel hideToggle>
+  <mat-expansion-panel>
     <mat-expansion-panel-header>
       <mat-panel-title> Clientes </mat-panel-title>
-      <mat-panel-description> Listado de clientes donde se realizará el particionado </mat-panel-description>
+      <mat-panel-description>
+        Listado de clientes donde se realizará el particionado
+        <mat-icon>desktop_windows</mat-icon>
+      </mat-panel-description>
     </mat-expansion-panel-header>
 
+    <div class="button-row">
+      <button class="action-button" (click)="toggleSelectAll()">
+        {{ allSelected ? 'Desmarcar todos' : 'Marcar todos' }}
+      </button>
+    </div>
+
     <div class="clients-grid">
       <div *ngFor="let client of clientData" class="client-item">
-        <div class="client-card">
-          <img [src]="'assets/images/ordenador_' + client.status + '.png'" alt="Client Icon" class="client-image" />
+        <div class="client-card"
+             (click)="client.status === 'og-live' && toggleClientSelection(client)"
+             [ngClass]="{'selected-client': client.selected, 'disabled-client': client.status !== 'og-live'}"
+             [matTooltip]="getPartitionsTooltip(client)"
+             matTooltipPosition="above"
+             matTooltipClass="custom-tooltip">
+
+          <img
+            [src]="'assets/images/computer_' + client.status + '.svg'"
+            alt="Client Icon"
+            class="client-image" />
 
           <div class="client-details">
             <span class="client-name">{{ client.name }}</span>
             <span class="client-ip">{{ client.ip }}</span>
             <span class="client-ip">{{ client.mac }}</span>
           </div>
+          <mat-divider></mat-divider>
+          <mat-radio-group [(ngModel)]="selectedModelClient" (change)="loadPartitions(selectedModelClient)">
+            <mat-radio-button [value]="client"
+                              color="primary"
+                              [disabled]="!client.selected"
+                              (click)="$event.stopPropagation()">
+              Modelo
+            </mat-radio-button>
+          </mat-radio-group>
+
         </div>
       </div>
     </div>
@@ -49,15 +77,11 @@
   </div>
 
   <div class="partition-assistant" *ngIf="selectedDisk">
-    <div class="partition-bar">
-      <div *ngFor="let partition of activePartitions(selectedDisk.diskNumber)"
-        [ngStyle]="{'width': partition.percentage + '%', 'background-color': partition.color}"
-        class="partition-segment">
-        {{ partition.partitionCode }} ({{ (partition.size / 1024).toFixed(2) }} GB)
-      </div>
-    </div>
-    <div class="row">
+    <div class="row-button">
       <button class="action-button" (click)="addPartition(selectedDisk.diskNumber)">Añadir partición</button>
+      <mat-chip *ngIf="selectedModelClient.firmwareType">
+        Tabla de particiones: {{ selectedModelClient.firmwareType }}
+      </mat-chip>
     </div>
 
     <div class="row">
@@ -119,5 +143,3 @@
     </div>
   </div>
 </mat-dialog-content>
-
-<div *ngIf="errorMessage" class="error-message">{{ errorMessage }}</div>

ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts

@@ -1,11 +1,10 @@
 import {Component, EventEmitter, Inject, Input, OnInit, Output} from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { ToastrService } from 'ngx-toastr';
-import {MAT_DIALOG_DATA} from "@angular/material/dialog";
 import {ActivatedRoute, Router} from "@angular/router";
 import { PARTITION_TYPES } from '../../../../../shared/constants/partition-types';
 import { FILESYSTEM_TYPES } from '../../../../../shared/constants/filesystem-types';
-import {toUnredirectedSourceFile} from "@angular/compiler-cli/src/ngtsc/util/src/typescript";
+import { ConfigService } from '@services/config.service';
 
 interface Partition {
   uuid?: string;
@@ -27,7 +26,8 @@ interface Partition {
   styleUrls: ['./partition-assistant.component.css']
 })
 export class PartitionAssistantComponent {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
+  private apiUrl: string;
   @Output() dataChange = new EventEmitter<any>();
   partitionTypes = PARTITION_TYPES;
   filesystemTypes = FILESYSTEM_TYPES;
@@ -42,31 +42,56 @@ export class PartitionAssistantComponent {
   clientData: any = [];
   loading: boolean = false;
 
-  private apiUrl: string = this.baseUrl + '/partitions';
-
   view: [number, number] = [400, 300];
   showLegend = true;
   showLabels = true;
+  allSelected = true;
+  selectedClients: any[] = [];
+  selectedModelClient: any = null;
 
   constructor(
     private http: HttpClient,
     private toastService: ToastrService,
     private route: ActivatedRoute,
     private router: Router,
+    private configService: ConfigService,
   ) {
-    const navigation = this.router.getCurrentNavigation();
-    this.clientData = navigation?.extras?.state?.['clientData'];
-    this.clientId = this.clientData[0]['@id'];
-    this.loadPartitions();
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = this.baseUrl + '/partitions';
+    this.route.queryParams.subscribe(params => {
+      if (params['clientData']) {
+        this.clientData = JSON.parse(params['clientData']);
+      }
+    });
+    this.clientId = this.clientData?.[0]['@id'];
+    this.clientData.forEach((client: { selected: boolean; status: string}) => {
+      if (client.status === 'og-live') {
+        client.selected = true;
+      }
+    });
 
+    this.selectedClients = this.clientData.filter(
+      (client: { status: string }) => client.status === 'og-live'
+    );
+
+    this.selectedModelClient = this.clientData.find(
+      (client: { status: string }) => client.status === 'og-live'
+    ) || null;
+
+    if (this.selectedModelClient) {
+      this.loadPartitions(this.selectedModelClient);
+    }
   }
 
   get selectedDisk():any {
     return this.disks.find(disk => disk.diskNumber === this.selectedDiskNumber) || null;
   }
 
-  loadPartitions() {
-    const url = `${this.baseUrl}${this.clientId}`;
+  loadPartitions(client: any) {
+    if (!client.selected) {
+      this.selectedModelClient = null;
+    }
+    const url = `${this.baseUrl}${client.uuid}`;
     this.http.get(url).subscribe(
       (response) => {
         this.data = response;
@@ -78,7 +103,17 @@ export class PartitionAssistantComponent {
     );
   }
 
+  toggleSelectAll() {
+    this.allSelected = !this.allSelected;
+    this.clientData.forEach((client: { selected: boolean; status: string }) => {
+      if (client.status === "og-live") {
+        client.selected = this.allSelected;
+      }
+    });
+  }
+
   initializeDisks() {
+    this.disks = [];
     const partitionsFromData = this.data.partitions;
     this.originalPartitions = JSON.parse(JSON.stringify(partitionsFromData));
 
@@ -134,15 +169,6 @@ export class PartitionAssistantComponent {
     return bytes
   }
 
-   activePartitions(diskNumber: number) {
-      const disk = this.disks.find((d) => d.diskNumber === diskNumber);
-      if (disk) {
-        return disk.partitions.filter((partition) => !partition.removed);
-      }
-
-      return null;
-  }
-
   updatePartitionPercentages(partitions: Partition[], totalDiskSize: number) {
     let totalUsedPercentage = 0;
 
@@ -175,11 +201,31 @@ export class PartitionAssistantComponent {
     }
   }
 
+  toggleClientSelection(client: any) {
+    client.selected = !client.selected;
+    this.updateSelectedClients();
+  }
+
+  updateSelectedClients() {
+    this.selectedClients = this.clientData.filter((client: { selected: any; }) => client.selected);
+  }
+
+  getPartitionsTooltip(client: any): string {
+    if (!client.partitions || client.partitions.length === 0) {
+      return 'No hay particiones disponibles';
+    }
+
+    return client.partitions
+      .map((p: { partitionNumber: any; size: any; filesystem: any }) => `#${p.partitionNumber} ${p.filesystem} - ${p.size / 1024 }GB`)
+      .join('\n');
+  }
+
   addPartition(diskNumber: number) {
     const disk = this.disks.find((d) => d.diskNumber === diskNumber);
 
     if (disk) {
       const remainingGB = this.getRemainingGB(disk.partitions, disk.totalDiskSize);
+
       if (remainingGB > 0) {
         const removedPartitions = disk.partitions.filter((p) => !p.removed);
         const maxPartitionNumber =
@@ -202,7 +248,7 @@ export class PartitionAssistantComponent {
         this.updatePartitionPercentages(disk.partitions, disk.totalDiskSize);
         this.updateDiskChart(disk);
       } else {
-        this.errorMessage = 'No hay suficiente espacio libre en el disco para crear una nueva partición.';
+        this.toastService.error('No hay suficiente espacio libre en el disco para crear una nueva partición.');
       }
     }
   }
@@ -234,37 +280,20 @@ export class PartitionAssistantComponent {
     return Math.max(0, totalDiskSize - totalUsedGB);
   }
 
-  getModifiedOrNewPartitions() {
-    const modifiedPartitions: any[] = [];
-
-    this.disks.forEach((disk) => {
-      disk.partitions.forEach((partition) => {
-        const originalPartition = this.originalPartitions.find(
-          (p) => p.diskNumber === disk.diskNumber && p.partitionNumber === partition.partitionNumber
-        );
-        modifiedPartitions.push({
-          partition,
-          diskNumber: disk.diskNumber,
-          partitionNumber: partition.partitionNumber,
-        });
-      });
-    });
-
-    return modifiedPartitions;
-  }
-
   save() {
     if (!this.selectedDisk) {
-      this.errorMessage = 'Por favor selecciona un disco antes de guardar.';
+      this.toastService.error('No se ha seleccionado un disco.');
       return;
     }
 
     this.loading = true;
 
-    const totalPartitionSize = this.selectedDisk.partitions.reduce((sum: any, partition: { size: any; }) => sum + partition.size, 0);
+    const totalPartitionSize = this.selectedDisk.partitions
+      .filter((partition: any) => !partition.removed)
+      .reduce((sum: any, partition: any) => sum + partition.size, 0);
 
     if (totalPartitionSize > this.selectedDisk.totalDiskSize) {
-      this.errorMessage = 'El tamaño total de las particiones en el disco seleccionado excede el tamaño total del disco.';
+      this.toastService.error('El tamaño total de las particiones en el disco seleccionado excede el tamaño total del disco.');
       this.loading = false;
       return;
     }
@@ -273,7 +302,7 @@ export class PartitionAssistantComponent {
 
     if (modifiedPartitions.length === 0) {
       this.loading = false;
-      this.errorMessage = 'No hay cambios para guardar en el disco seleccionado.';
+      this.toastService.info('No hay cambios para guardar en el disco seleccionado.');
       return;
     }
 
@@ -292,7 +321,7 @@ export class PartitionAssistantComponent {
     if (newPartitions.length > 0) {
       const bulkPayload = {
         partitions: newPartitions,
-        clients: this.clientData.map((client: any) => client['@id']),
+        clients: this.selectedClients.map((client: any) => client.uuid),
       };
 
       this.http.post(this.apiUrl, bulkPayload).subscribe(
@@ -302,7 +331,6 @@ export class PartitionAssistantComponent {
           this.router.navigate(['/commands-logs']);
         },
         (error) => {
-          console.error('Error al crear las particiones:', error);
           this.loading = false;
           this.toastService.error('Error al crear las particiones.');
         }

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.css

@@ -0,0 +1,264 @@
+
+.divider {
+  margin: 20px 0;
+}
+
+table {
+  width: 100%;
+  margin-top: 50px;
+}
+
+.search-container  {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.deploy-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px;
+  gap: 10px;
+}
+
+.script-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  padding: 20px;
+  background-color: #eaeff6;
+  border-radius: 12px;
+  margin-top: 20px;
+}
+
+.script-content {
+  flex: 2;
+  min-width: 60%;
+}
+
+.script-params {
+  flex: 1;
+  min-width: 35%;
+}
+
+@media (max-width: 768px) {
+  .script-container {
+    flex-direction: column;
+  }
+
+  .script-content, .script-params {
+    min-width: 100%;
+  }
+}
+
+.select-container {
+  margin-top: 20px;
+  align-items: center;
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.input-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-top: 20px;
+}
+
+.input-field {
+  flex: 1 1 calc(33.33% - 16px);
+  min-width: 250px;
+}
+
+.script-preview {
+  background-color: #f4f4f4;
+  border: 1px solid #ccc;
+  padding: 10px;
+  border-radius: 5px;
+  font-family: monospace;
+  white-space: pre-wrap;
+  min-height: 50px;
+}
+
+.custom-width {
+  width: 50%;
+  margin-bottom: 16px;
+}
+
+.search-string {
+  flex: 2;
+  padding: 5px;
+}
+
+.search-boolean {
+  flex: 1;
+  padding: 5px;
+}
+
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.mat-elevation-z8 {
+  box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+}
+
+.paginator-container {
+  display: flex;
+  justify-content: end;
+  margin-bottom: 30px;
+}
+
+.clients-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+  gap: 8px;
+}
+
+.client-item {
+  position: relative;
+}
+
+.client-card {
+  background: #ffffff;
+  border-radius: 6px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+  position: relative;
+  padding: 8px;
+  text-align: center;
+  cursor: pointer;
+  transition: background-color 0.3s, transform 0.2s;
+
+  &:hover {
+    background-color: #f0f0f0;
+    transform: scale(1.02);
+  }
+}
+
+.client-details {
+  margin-top: 4px;
+}
+
+.client-name {
+  font-size: 0.9em;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 5px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 150px;
+  display: inline-block;
+}
+
+.client-ip {
+  display: block;
+  font-size: 0.9em;
+  color: #666;
+}
+
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  padding-left: 1em;
+}
+
+.button-row {
+  display: flex;
+  padding-right: 1em;
+}
+
+.client-card {
+  background: #ffffff;
+  border-radius: 6px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+  position: relative;
+  padding: 8px;
+  text-align: center;
+  cursor: pointer;
+  transition: background-color 0.3s, transform 0.2s;
+
+  &:hover {
+    background-color: #f0f0f0;
+    transform: scale(1.02);
+  }
+}
+
+::ng-deep .custom-tooltip {
+  white-space: pre-line !important;
+  max-width: 200px;
+  background: rgba(0, 0, 0, 0.8);
+  color: white;
+  padding: 8px;
+  border-radius: 4px;
+}
+
+.selected-client {
+  background-color: #a0c2e5 !important;
+  color: white !important;
+}
+
+.button-row {
+  display: flex;
+  padding-right: 1em;
+}
+
+.disabled-client {
+  pointer-events: none;
+  opacity: 0.5;
+}
+
+.action-button {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+.mat-expansion-panel-header-description {
+  justify-content: space-between;
+  align-items: center;
+}
+
+.new-command-container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 15px;
+  background-color: #eaeff6;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.1);
+  margin-top: 15px;
+}
+
+.new-command-container mat-form-field {
+  width: 100%;
+}
+
+.new-command-container textarea {
+  font-family: monospace;
+  resize: vertical;
+}
+
+.new-command-container .action-button {
+  align-self: flex-end;
+  color: white;
+  padding: 8px 16px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.full-width {
+  width: 100%;
+}
+
+

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.html

@@ -0,0 +1,103 @@
+<app-loading [isLoading]="loading"></app-loading>
+
+<div class="header-container">
+  <div class="header-container-title">
+    <h2>
+      {{ 'runScript' | translate }}
+    </h2>
+  </div>
+  <div class="button-row">
+    <button class="action-button" [disabled]="selectedClients.length < 1 || (commandType === 'existing' && !selectedScript)" (click)="save()">Ejecutar</button>
+  </div>
+</div>
+<mat-divider></mat-divider>
+
+<div class="select-container">
+  <mat-expansion-panel>
+    <mat-expansion-panel-header>
+      <mat-panel-title> Clientes </mat-panel-title>
+      <mat-panel-description>
+        Listado de clientes donde se ejecutara el script seleccionado
+        <mat-icon>desktop_windows</mat-icon>
+      </mat-panel-description>
+    </mat-expansion-panel-header>
+
+    <div class="button-row">
+      <button class="action-button" (click)="toggleSelectAll()">
+        {{ allSelected ? 'Desmarcar todos' : 'Marcar todos' }}
+      </button>
+    </div>
+
+    <div class="clients-grid">
+      <div *ngFor="let client of clientData" class="client-item">
+        <div class="client-card"
+             (click)="client.status === 'og-live' && toggleClientSelection(client)"
+             [ngClass]="{'selected-client': client.selected, 'disabled-client': client.status !== 'og-live'}"
+             [matTooltip]="getPartitionsTooltip(client)"
+             matTooltipPosition="above"
+             matTooltipClass="custom-tooltip">
+
+          <img
+            [src]="'assets/images/computer_' + client.status + '.svg'"
+            alt="Client Icon"
+            class="client-image" />
+
+          <div class="client-details">
+            <span class="client-name">{{ client.name }}</span>
+            <span class="client-ip">{{ client.ip }}</span>
+            <span class="client-ip">{{ client.mac }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </mat-expansion-panel>
+</div>
+
+<mat-divider style="margin-top: 20px;"></mat-divider>
+
+<div class="select-container">
+  <div class="command-toggle">
+    <mat-radio-group [(ngModel)]="commandType">
+      <mat-radio-button value="new">Comando nuevo</mat-radio-button>
+      <mat-radio-button value="existing">Comando existente</mat-radio-button>
+    </mat-radio-group>
+  </div>
+
+  <div *ngIf="commandType === 'new'" class="new-command-container">
+    <mat-form-field appearance="fill" class="full-width">
+      <mat-label>Ingrese el script</mat-label>
+      <textarea matInput [(ngModel)]="newScript" rows="6" placeholder="Escriba su script aquí"></textarea>
+    </mat-form-field>
+    <button class="action-button" (click)="saveNewScript()">Guardar Comando</button>
+  </div>
+
+  <div *ngIf="commandType === 'existing'" class="select-container">
+    <mat-form-field appearance="fill" class="custom-width">
+      <mat-label>Seleccione script a ejecutar</mat-label>
+      <mat-select [(ngModel)]="selectedScript" (selectionChange)="onScriptChange()">
+        <mat-option *ngFor="let script of scripts" [value]="script">{{ script.name }}</mat-option>
+      </mat-select>
+    </mat-form-field>
+  </div>
+
+  <div *ngIf="selectedScript && commandType === 'existing'" class="script-container">
+    <div class="script-content">
+      <h3> Script:</h3>
+      <div class="script-preview" [innerHTML]="scriptContent"></div>
+    </div>
+
+    <div class="script-params" *ngIf="parameterNames.length > 0">
+      <h3>Ingrese los valores de los parámetros detectados:</h3>
+      <div *ngFor="let paramName of parameterNames">
+        <mat-form-field appearance="fill" class="full-width">
+          <mat-label>{{ paramName }}</mat-label>
+          <input matInput
+                 [ngModel]="parameters[paramName]"
+                 (ngModelChange)="onParamChange(paramName, $event)"
+                 placeholder="Ingrese el valor">
+        </mat-form-field>
+      </div>
+    </div>
+  </div>
+</div>
+

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.spec.ts

@@ -0,0 +1,99 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { RunScriptAssistantComponent } from './run-script-assistant.component';
+import { DeployImageComponent } from "../deploy-image/deploy-image.component";
+import { LoadingComponent } from "../../../../../shared/loading/loading.component";
+import { FormBuilder, FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from "@angular/material/dialog";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatInputModule } from "@angular/material/input";
+import { MatCheckboxModule } from "@angular/material/checkbox";
+import { MatExpansionModule } from "@angular/material/expansion";
+import { MatButtonModule } from "@angular/material/button";
+import { MatTableModule } from "@angular/material/table";
+import { MatDividerModule } from "@angular/material/divider";
+import { MatRadioModule } from "@angular/material/radio";
+import { MatSelectModule } from "@angular/material/select";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { ToastrModule, ToastrService } from "ngx-toastr";
+import { TranslateModule } from "@ngx-translate/core";
+import { provideHttpClient } from "@angular/common/http";
+import { provideHttpClientTesting } from "@angular/common/http/testing";
+import { provideRouter } from "@angular/router";
+import { ConfigService } from "@services/config.service";
+import { TranslateLoader } from '@ngx-translate/core';
+import { HttpClient } from '@angular/common/http';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import {MatIconModule} from "@angular/material/icon";
+
+export function HttpLoaderFactory(http: HttpClient) {
+  return new TranslateHttpLoader(http);
+}
+
+describe('RunScriptAssistantComponent', () => {
+  let component: RunScriptAssistantComponent;
+  let fixture: ComponentFixture<RunScriptAssistantComponent>;
+
+  beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
+    await TestBed.configureTestingModule({
+      declarations: [RunScriptAssistantComponent, DeployImageComponent, LoadingComponent],
+      imports: [
+        ReactiveFormsModule,
+        FormsModule,
+        MatDialogModule,
+        MatFormFieldModule,
+        MatInputModule,
+        MatCheckboxModule,
+        MatExpansionModule,
+        MatButtonModule,
+        MatTableModule,
+        MatDividerModule,
+        MatRadioModule,
+        MatProgressSpinnerModule,
+        MatSelectModule,
+        BrowserAnimationsModule,
+        MatIconModule,
+        ToastrModule.forRoot(),
+        HttpClientTestingModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useFactory: HttpLoaderFactory,
+            deps: [HttpClient]
+          }
+        })
+      ],
+      providers: [
+        FormBuilder,
+        ToastrService,
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        provideRouter([]),
+        {
+          provide: MatDialogRef,
+          useValue: {}
+        },
+        {
+          provide: MAT_DIALOG_DATA,
+          useValue: {}
+        },
+        { provide: ConfigService, useValue: mockConfigService }
+      ]
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(RunScriptAssistantComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.ts

@@ -0,0 +1,177 @@
+import {Component, EventEmitter, Output} from '@angular/core';
+import {SelectionModel} from "@angular/cdk/collections";
+import {HttpClient} from "@angular/common/http";
+import {ToastrService} from "ngx-toastr";
+import {ConfigService} from "@services/config.service";
+import {ActivatedRoute, Router} from "@angular/router";
+import {SaveScriptComponent} from "./save-script/save-script.component";
+import {MatDialog} from "@angular/material/dialog";
+
+@Component({
+  selector: 'app-run-script-assistant',
+  templateUrl: './run-script-assistant.component.html',
+  styleUrl: './run-script-assistant.component.css'
+})
+export class RunScriptAssistantComponent {
+  baseUrl: string;
+  @Output() dataChange = new EventEmitter<any>();
+
+  errorMessage = '';
+  clientId: string | null = null;
+  name: string = '';
+  client: any = null;
+  clientData: any = [];
+  loading: boolean = false;
+  scripts: any[] = [];
+  scriptContent: string = "";
+  parameters: any = {};
+  selectedScript: any = null;
+  selectedClients: any[] = [];
+  allSelected: boolean = true;
+  commandType: string = 'existing';
+  newScript: string = '';
+  selection = new SelectionModel(true, []);
+  parameterNames: string[] = Object.keys(this.parameters);
+
+  constructor(
+    private http: HttpClient,
+    private toastService: ToastrService,
+    private configService: ConfigService,
+    private router: Router,
+    private dialog: MatDialog,
+    private route: ActivatedRoute
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.route.queryParams.subscribe(params => {
+      if (params['clientData']) {
+        this.clientData = JSON.parse(params['clientData']);
+      }
+    });
+    this.clientId = this.clientData?.length ? this.clientData[0]['@id'] : null;
+    this.clientData.forEach((client: { selected: boolean; status: string}) => {
+      if (client.status === 'og-live') {
+        client.selected = true;
+      }
+    });
+    this.selectedClients = this.clientData.filter(
+      (client: { status: string }) => client.status === 'og-live'
+    );
+    this.loadScripts()
+  }
+
+  loadScripts(): void {
+    this.loading = true;
+
+    this.http.get(`${this.baseUrl}/commands?readOnly=false&enabled=true`).subscribe((data: any) => {
+      this.scripts = data['hydra:member'];
+      this.loading = false;
+    }, (error) => {
+      this.toastService.error(error.error['hydra:description']);
+      this.loading = false;
+    });
+  }
+
+  saveNewScript() {
+    if (!this.newScript.trim()) {
+      this.toastService.error('Debe ingresar un script antes de guardar.');
+      return;
+    }
+    const dialogRef = this.dialog.open(SaveScriptComponent, {
+      width: '400px',
+      data: this.newScript
+    });
+
+    dialogRef.afterClosed().subscribe(result => {
+      if (result) {
+        this.toastService.success('Script guardado correctamente');
+      }
+    });
+  }
+
+  toggleClientSelection(client: any) {
+    client.selected = !client.selected;
+    this.updateSelectedClients();
+  }
+
+  updateSelectedClients() {
+    this.selectedClients = this.clientData.filter(
+      (client: { selected: boolean; status: string }) => client.selected && client.status === "og-live"
+    );
+  }
+
+  toggleSelectAll() {
+    this.allSelected = !this.allSelected;
+    this.clientData.forEach((client: { selected: boolean; status: string }) => {
+      if (client.status === "og-live") {
+        client.selected = this.allSelected;
+      }
+    });
+  }
+
+  getPartitionsTooltip(client: any): string {
+    if (!client.partitions || client.partitions.length === 0) {
+      return 'No hay particiones disponibles';
+    }
+
+    return client.partitions
+      .map((p: { partitionNumber: any; size: any; filesystem: any }) => `#${p.partitionNumber} ${p.filesystem} - ${p.size / 1024 }GB`)
+      .join('\n');
+  }
+
+  onScriptChange() {
+    if (this.selectedScript) {
+      this.scriptContent = this.selectedScript.script;
+
+      const matches = this.scriptContent.match(/@(\w+)/g) || [];
+      const uniqueParams = Array.from(new Set(matches.map(m => m.slice(1))));
+
+      this.parameters = {};
+      uniqueParams.forEach(param => this.parameters[param] = '');
+
+      this.parameterNames = uniqueParams;
+
+      this.updateScript();
+    }
+  }
+
+  onParamChange(name: string, value: string): void {
+    this.parameters[name] = value;
+    this.updateScript();
+  }
+
+  updateScript(): void {
+    let updatedScript = this.selectedScript.script;
+
+    for (const [key, value] of Object.entries(this.parameters)) {
+      const regex = new RegExp(`@${key}\\b`, 'g');
+      updatedScript = updatedScript.replace(regex, value || `@${key}`);
+    }
+
+    this.scriptContent = updatedScript;
+  }
+
+  trackByIndex(index: number): number {
+    return index;
+  }
+
+
+  save(): void {
+    this.loading = true;
+
+    this.http.post(`${this.baseUrl}/commands/run-script`, {
+      clients: this.selectedClients.map((client: any) => client.uuid),
+      script: this.commandType === 'existing'  ? this.scriptContent : this.newScript,
+    }).subscribe(
+      response => {
+        this.toastService.success('Script ejecutado correctamente');
+        this.dataChange.emit();
+        this.router.navigate(['/commands-logs']);
+      },
+      error => {
+        this.toastService.error('Error al ejecutar el script');
+      }
+    );
+
+    this.loading = false;
+  }
+}

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/save-script/save-script.component.css

@@ -0,0 +1,40 @@
+.dialog-content {
+  display: flex;
+  flex-direction: column;
+  padding: 40px;
+}
+
+.repository-form {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.full-width{
+  width: 100%;
+  margin-top: 16px;
+}
+
+.action-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
+}
+
+@media (max-width: 600px) {
+  .form-field {
+    width: 100%;
+  }
+
+  .dialog-actions {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  button {
+    width: 100%;
+    margin-left: 0;
+    margin-bottom: 8px;
+  }
+}

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/save-script/save-script.component.html

@@ -0,0 +1,12 @@
+<h2 mat-dialog-title>Guardar Comando</h2>
+<mat-dialog-content>
+  <p>Introduce un nombre para el comando:</p>
+  <mat-form-field appearance="fill" class="full-width">
+    <mat-label>Nombre del Comando</mat-label>
+    <input matInput [(ngModel)]="commandName">
+  </mat-form-field>
+</mat-dialog-content>
+<div mat-dialog-actions class="action-container">
+  <button class="ordinary-button" (click)="close()">Cancelar</button>
+  <button class="submit-button" (click)="save()">Guardar</button>
+</div>

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/save-script/save-script.component.spec.ts

@@ -0,0 +1,94 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import {RunScriptAssistantComponent} from "../run-script-assistant.component";
+import {DeployImageComponent} from "../../deploy-image/deploy-image.component";
+import {LoadingComponent} from "../../../../../../shared/loading/loading.component";
+import {FormBuilder, FormsModule, ReactiveFormsModule} from "@angular/forms";
+import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from "@angular/material/dialog";
+import {MatFormFieldModule} from "@angular/material/form-field";
+import {MatInputModule} from "@angular/material/input";
+import {MatCheckboxModule} from "@angular/material/checkbox";
+import {MatExpansionModule} from "@angular/material/expansion";
+import {MatButtonModule} from "@angular/material/button";
+import {MatTableModule} from "@angular/material/table";
+import {MatDividerModule} from "@angular/material/divider";
+import {MatRadioModule} from "@angular/material/radio";
+import {MatProgressSpinnerModule} from "@angular/material/progress-spinner";
+import {MatSelectModule} from "@angular/material/select";
+import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
+import {MatIconModule} from "@angular/material/icon";
+import {ToastrModule, ToastrService} from "ngx-toastr";
+import {HttpClientTestingModule, provideHttpClientTesting} from "@angular/common/http/testing";
+import {TranslateLoader, TranslateModule} from "@ngx-translate/core";
+import {HttpClient, provideHttpClient} from "@angular/common/http";
+import {provideRouter} from "@angular/router";
+import {ConfigService} from "@services/config.service";
+import {HttpLoaderFactory} from "../run-script-assistant.component.spec";
+import {SaveScriptComponent} from "./save-script.component";
+
+describe('SaveScriptComponent', () => {
+  let component: SaveScriptComponent;
+  let fixture: ComponentFixture<SaveScriptComponent>;
+
+  beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
+    await TestBed.configureTestingModule({
+      declarations: [RunScriptAssistantComponent, DeployImageComponent, LoadingComponent],
+      imports: [
+        ReactiveFormsModule,
+        FormsModule,
+        MatDialogModule,
+        MatFormFieldModule,
+        MatInputModule,
+        MatCheckboxModule,
+        MatExpansionModule,
+        MatButtonModule,
+        MatTableModule,
+        MatDividerModule,
+        MatRadioModule,
+        MatProgressSpinnerModule,
+        MatSelectModule,
+        BrowserAnimationsModule,
+        MatIconModule,
+        ToastrModule.forRoot(),
+        HttpClientTestingModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useFactory: HttpLoaderFactory,
+            deps: [HttpClient]
+          }
+        })
+      ],
+      providers: [
+        FormBuilder,
+        ToastrService,
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        provideRouter([]),
+        {
+          provide: MatDialogRef,
+          useValue: {}
+        },
+        {
+          provide: MAT_DIALOG_DATA,
+          useValue: {}
+        },
+        { provide: ConfigService, useValue: mockConfigService }
+      ]
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(SaveScriptComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/save-script/save-script.component.ts

@@ -0,0 +1,51 @@
+import {Component, Inject} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
+import {FormBuilder, Validators} from "@angular/forms";
+import {HttpClient} from "@angular/common/http";
+import {ToastrService} from "ngx-toastr";
+import {ConfigService} from "@services/config.service";
+import {DataService} from "../../../../../commands/main-commands/data.service";
+
+@Component({
+  selector: 'app-save-script',
+  templateUrl: './save-script.component.html',
+  styleUrl: './save-script.component.css'
+})
+export class SaveScriptComponent {
+  commandName: string = '';
+  baseUrl: string;
+
+  constructor(
+    private http: HttpClient,
+    public dialogRef: MatDialogRef<SaveScriptComponent>,
+    private toastService: ToastrService,
+    private configService: ConfigService,
+    private dataService: DataService,
+    @Inject(MAT_DIALOG_DATA) public data: any
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+  }
+
+  save() {
+    const payload = {
+      name: this.commandName,
+      script: this.data,
+      readOnly: false,
+      enabled: true,
+    };
+
+    this.http.post(`${this.baseUrl}/commands`, payload).subscribe(
+      (response) => {
+        this.toastService.success('Comando añadido correctamente');
+        this.dialogRef.close();
+      },
+      (error) => {
+        this.toastService.error(error['error']['hydra:description']);
+      }
+    );
+  }
+
+  close() {
+    this.dialogRef.close();
+  }
+}

ogWebconsole/src/app/components/groups/groups.component.css

@@ -22,6 +22,96 @@
   overflow: hidden;
 }
 
+.clients-mat-divider {
+  display: none;
+}
+
+@media (max-width: 992px) {
+  .main-container {
+    display: flex !important;
+    flex-direction: column !important;
+    width: 100% !important;
+    height: 100% !important;
+    overflow: hidden !important;
+  }
+
+  .filters-and-tree-container {
+    display: flex !important;
+    flex-direction: row !important;
+    flex-grow: 1 !important;
+    flex-shrink: 1 !important;
+    width: 100% !important;
+    max-width: none !important;
+    min-width: 0 !important;
+    padding: 1rem !important;
+    box-sizing: border-box !important;
+    min-height: 250px !important;
+    overflow-y: auto !important;
+  }
+
+  .filters-panel,
+  .tree-container {
+    flex: 1 1 50% !important;
+    overflow-y: auto !important;
+    padding: 0.5rem !important;
+    box-sizing: border-box !important;
+    margin-bottom: 0 !important;
+  }
+
+  .filters-container {
+    padding: 0 !important;
+  }
+
+  .tree-mat-divider {
+    display: none !important;
+  }
+
+  .clients-mat-divider {
+    display: inline;
+  }
+
+  .clients-view-header {
+    display: flex;
+    flex-direction: row !important;
+    justify-content: space-between !important;
+    margin-bottom: 0.5rem !important;
+    margin-top: 0.5rem !important;
+    align-items: center !important;
+    padding-right: 1rem !important;
+  }
+
+  .groups-button-row {
+    display: none !important;
+  }
+
+  .cards-view {
+    max-height: none !important;
+  }
+
+  .clients-table {
+    max-height: unset !important;
+    overflow: unset !important;
+    display: table !important;
+    flex-direction: unset !important;
+  }
+
+  .clients-container {
+    padding: 0em 1em 0em 1em !important;
+  }
+}
+
+@media (max-width: 1400px) {
+  .type-view-text {
+    display: none;
+  }
+}
+
+@media (max-width: 450px) {
+  .clients-title-name {
+    font-size: 20px !important;
+  }
+}
+
 .header-container-title {
   flex-grow: 1;
   text-align: left;
@@ -34,15 +124,6 @@
   padding-right: 0.5rem;
 }
 
-.clients-container {
-  flex-grow: 1;
-  box-sizing: border-box;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-  padding: 0rem 1rem 0rem 0.5rem;
-}
-
 .clients-view-header {
   display: flex;
   flex-direction: row;
@@ -53,6 +134,32 @@
   padding-right: 1rem;
 }
 
+@media (max-width: 768px) {
+  .clients-view-header {
+    display: flex;
+    flex-direction: column !important;
+  }
+}
+
+.clients-title-name {
+  font-size: x-large;
+  display: block;
+  padding: 1rem 1rem 1rem 13px;
+  margin-left: 0.6rem;
+  flex: 1 1 auto;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.view-type-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+  align-items: center;
+  flex-shrink: 0;
+}
+
 .clients-view {
   flex-grow: 1;
   overflow-y: auto;
@@ -75,16 +182,35 @@
   padding-left: 1rem;
 }
 
+.list-view {
+  overflow-x: auto;
+}
+
 .clients-table {
   max-height: calc(100vh - 330px);
   overflow: auto;
   display: flex;
   flex-direction: column;
+  width: 100%;
+  table-layout: auto;
+  border-collapse: collapse;
 }
 
-.clients-table table {
-  flex-grow: 1;
-  overflow: auto;
+.clients-table th,
+.clients-table td {
+  text-align: left;
+  padding: 2px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.clients-table th {
+  font-weight: 500;
+}
+
+.clients-table td {
+  border-bottom: 1px solid #ddd;
 }
 
 .paginator-container {
@@ -124,18 +250,6 @@
   flex: 1;
 }
 
-@media (max-width: 1024px) {
-  .header-container {
-    flex-direction: column;
-    gap: 10px;
-  }
-
-  .groups-button-row {
-    flex-wrap: wrap;
-    gap: 10px;
-  }
-}
-
 mat-tree {
   background-color: #f9f9f9;
   padding: 0px 10px 10px 10px;
@@ -258,28 +372,43 @@ mat-tree mat-tree-node.disabled:hover {
 
 .client-name {
   display: block;
-  font-size: 16px;
-  font-weight: 600;
-  color: #333;
+  font-weight: 500;
   margin-bottom: 5px;
   margin-top: 5px;
+  padding-left: 1rem;
+  padding-right: 1rem;
+}
+
+.clients-container {
+  flex: 8;
+  box-sizing: border-box;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  padding: 0rem 1rem 0rem 0.5rem;
+}
+
+.filters-and-tree-container {
+  flex: 2;
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 1;
+  width: 100%;
+  box-sizing: border-box;
 }
 
 .filters-container {
   display: flex;
   flex-direction: column;
-  justify-content: start;
-  padding: 1em 1em 0em 1em;
+  padding: 1em;
+  flex-grow: 1;
 }
 
 .filter-form-field {
-  min-width: 21rem;
-}
-
-.filters-and-tree-container {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
+  flex: 1;
+  min-width: 150px;
+  max-width: 100%;
+  box-sizing: border-box;
 }
 
 .filters-panel {
@@ -319,11 +448,30 @@ mat-tree mat-tree-node.disabled:hover {
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.15);
 }
 
-.client-image {
-  width: 35px;
-  height: 35px;
+.client-details {
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin-top: 4px;
+}
+
+.type-view-text {
+  margin-left: 0.5vw;
+}
+
+.action-icons {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 1px;
   margin-top: 10px;
-  margin-bottom: 8px;
+}
+
+.client-status-container {
+  display: flex;
+  align-items: center;
+  gap: 5px;
 }
 
 .client-ip {
@@ -338,11 +486,9 @@ mat-tree mat-tree-node.disabled:hover {
   gap: 4px;
 }
 
-.action-icons {
-  display: flex;
-  justify-content: center;
-  gap: 1px;
-  margin-top: 10px;
+.sync-spinner {
+  margin-left: 1em;
+  margin-right: 1em;
 }
 
 .mat-elevation-z8 {
@@ -360,26 +506,6 @@ mat-tree mat-tree-node.disabled:hover {
   position: relative;
 }
 
-.client-details {
-  margin-top: 4px;
-}
-
-@media (max-width: 1560px) {
-  .clients-view-header {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 1rem;
-    margin-top: 0;
-  }
-}
-
-.clients-title-name {
-  font-size: x-large;
-  display: block;
-  padding: 1rem 1rem 1rem 13px;
-  margin-left: 0.6rem;
-}
-
 .no-clients-info {
   display: flex;
   align-items: center;
@@ -388,13 +514,6 @@ mat-tree mat-tree-node.disabled:hover {
   margin-left: 1.6rem;
 }
 
-.view-type-container {
-  display: flex;
-  justify-content: flex-end;
-  gap: 2rem;
-  align-items: center;
-}
-
 mat-button-toggle-group {
   border: none;
 }
@@ -447,4 +566,4 @@ mat-button-toggle-group {
   padding: 0.5rem 1rem 1rem 1rem;
   width: 100%;
   box-sizing: border-box;
-}
+}

ogWebconsole/src/app/components/groups/groups.component.html

@@ -25,6 +25,27 @@
         {{ 'legendButton' | translate }}
       </button>
     </div>
+
+    <!-- Menú desplegable para pantallas pequeñas -->
+    <div *ngIf="isSmallScreen" class="groups-menu">
+      <button mat-icon-button [matMenuTriggerFor]="smallScreenMenu" matTooltip="Opciones" matTooltipShowDelay="1000">
+        <mat-icon>menu</mat-icon>
+      </button>
+      <mat-menu #smallScreenMenu="matMenu">
+        <button mat-menu-item (click)="addOU($event)">
+          {{ 'newOrganizationalUnitButton' | translate }}
+        </button>
+        <button mat-menu-item (click)="addClient($event)">
+          {{ 'newSingleClientButton' | translate }}
+        </button>
+        <button mat-menu-item (click)="addMultipleClients($event)">
+          {{ 'newMultipleClientButton' | translate }}
+        </button>
+        <button mat-menu-item (click)="openBottomSheet()">
+          {{ 'legendButton' | translate }}
+        </button>
+      </mat-menu>
+    </div>
   </div>
 
   <div *ngIf="initialLoading; else contentTemplate">
@@ -60,17 +81,19 @@
               </button>
             </mat-form-field>
             <mat-form-field class="form-field search-select" appearance="outline">
-              <mat-select placeholder="Buscar por estado..." #clientSearchStatusInput (selectionChange)="onClientFilterStatusInput($event.value)">
+              <mat-select placeholder="Buscar por estado..." #clientSearchStatusInput
+                (selectionChange)="onClientFilterStatusInput($event.value)">
                 <mat-option *ngFor="let option of status" [value]="option.value">
                   {{ option.name }}
                 </mat-option>
               </mat-select>
-              <button *ngIf="clientSearchStatusInput.value" mat-icon-button matSuffix aria-label="Clear tree search" (click)="clearStatusFilter($event, clientSearchStatusInput)">
+              <button *ngIf="clientSearchStatusInput.value" mat-icon-button matSuffix aria-label="Clear tree search"
+                (click)="clearStatusFilter($event, clientSearchStatusInput)">
                 <mat-icon>close</mat-icon>
               </button>
             </mat-form-field>
 
-            <mat-divider style="padding-top: 10px;"></mat-divider>
+            <mat-divider class="tree-mat-divider" style="padding-top: 10px;"></mat-divider>
 
             <!-- Funcionalidad actualmente deshabilitada-->
             <!-- <mat-form-field appearance="outline">
@@ -96,7 +119,7 @@
         <div class="tree-container">
           <mat-tree [dataSource]="treeDataSource" [treeControl]="treeControl">
             <mat-tree-node [ngClass]="{'selected-node': selectedNode?.id === node.id}"
-              *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding (click)="onNodeClick(node)">
+              *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding (click)="onNodeClick($event, node)">
               <button mat-icon-button matTreeNodeToggle [disabled]="!node.expandable"
                 [ngClass]="{'disabled-toggle': !node.expandable}">
                 <mat-icon>{{ treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right' }}</mat-icon>
@@ -112,12 +135,12 @@
                 }}
               </mat-icon>
               <span>{{ node.name }}</span>
-              <button mat-icon-button [matMenuTriggerFor]="menuNode" (click)="onNodeClick(node)">
+              <button mat-icon-button [matMenuTriggerFor]="menuNode" (click)="onMenuClick($event, node)">
                 <mat-icon>more_vert</mat-icon>
               </button>
             </mat-tree-node>
             <mat-tree-node [ngClass]="{'selected-node': selectedNode?.id === node.id}"
-              *matTreeNodeDef="let node; when: isLeafNode" matTreeNodePadding (click)="onNodeClick(node)">
+              *matTreeNodeDef="let node; when: isLeafNode" matTreeNodePadding (click)="onNodeClick($event, node)">
               <button mat-icon-button matTreeNodeToggle [disabled]="true" class="disabled-toggle"></button>
               <mat-icon style="color: green;">
                 {{
@@ -133,7 +156,7 @@
               <ng-container *ngIf="node.type === 'client'">
                 <span> - IP: {{ node.ip }}</span>
               </ng-container>
-              <button mat-icon-button [matMenuTriggerFor]="menuNode" (click)="onNodeClick(node)">
+              <button mat-icon-button [matMenuTriggerFor]="menuNode" (click)="onMenuClick($event, node)">
                 <mat-icon>more_vert</mat-icon>
               </button>
             </mat-tree-node>
@@ -175,6 +198,9 @@
             <mat-icon>delete</mat-icon>
             <span>{{ 'delete' | translate }}</span>
           </button>
+          <app-execute-command [clientData]="selectedNode?.clients || []" [buttonType]="'menu-item'"
+            [buttonText]="'Ejecutar comandos'" [icon]="'terminal'" [disabled]="!((selectedNode?.clients ?? []).length > 0)">
+          </app-execute-command>
         </mat-menu>
 
       </div>
@@ -183,25 +209,23 @@
 
       <!-- CLIENTS -->
       <div class="clients-container">
-
+        <mat-divider class="clients-mat-divider"></mat-divider>
         <!-- CLIENTS HEADER -->
         <div class="clients-view-header">
-          <div>
-            <span [ngStyle]="{ visibility: isLoadingClients ? 'hidden' : 'visible' }" class="clients-title-name">
-              {{ 'clients' | translate }}
-              <strong>{{ selectedNode?.name }}</strong>
-            </span>
-          </div>
+          <span [ngStyle]="{ visibility: isLoadingClients ? 'hidden' : 'visible' }" class="clients-title-name">
+            {{ 'clients' | translate }}
+            <strong>{{ selectedNode?.name }}</strong>
+          </span>
           <div class="view-type-container">
             <app-execute-command [clientData]="selection.selected" [buttonType]="'text'"
               [buttonText]="'Ejecutar comandos'" [disabled]="selection.selected.length === 0"></app-execute-command>
             <mat-button-toggle-group name="viewType" aria-label="View Type" [hideSingleSelectionIndicator]="true"
               (change)="toggleView($event.value)">
               <mat-button-toggle value="list" [disabled]="currentView === 'list'">
-                <mat-icon>list</mat-icon> {{ 'Vista Lista' | translate }}
+                <mat-icon>list</mat-icon> <span class="type-view-text">{{ 'Vista Lista' | translate }}</span>
               </mat-button-toggle>
               <mat-button-toggle value="card" [disabled]="currentView === 'card'">
-                <mat-icon>grid_view</mat-icon> {{ 'Vista Tarjeta' | translate }}
+                <mat-icon>grid_view</mat-icon> <span class="type-view-text">{{ 'Vista Tarjeta' | translate }}</span>
               </mat-button-toggle>
             </mat-button-toggle-group>
           </div>
@@ -224,24 +248,17 @@
                   <div *ngFor="let client of arrayClients" class="client-item">
                     <div class="client-card">
                       <mat-checkbox (click)="$event.stopPropagation()" (change)="toggleRow(client)"
-                        [checked]="selection.isSelected(client)" [disabled]="client.status === 'busy'">
+                        [checked]="selection.isSelected(client)"
+                        [disabled]="client.status === 'busy' || client.status === 'off' || client.status === 'disconnected'">
                       </mat-checkbox>
-                      <img [src]="'assets/images/ordenador_' + client.status + '.png'" alt="Client Icon"
-                        class="client-image" />
+                      <img style="margin-top: 0.5em;" [src]="'assets/images/computer_' + client.status + '.svg'"
+                        alt="Client Icon" class="client-image" />
 
                       <div class="client-details">
                         <span class="client-name">{{ client.name }}</span>
                         <span class="client-ip">{{ client.ip }}</span>
                         <span class="client-ip">{{ client.mac }}</span>
                         <div class="action-icons">
-                          <button *ngIf="(!syncStatus || syncingClientId !== client.uuid)" mat-icon-button
-                            color="primary" (click)="getStatus(client, selectedNode)">
-                            <mat-icon>sync</mat-icon>
-                          </button>
-
-                          <button *ngIf="syncStatus && syncingClientId === client.uuid" mat-icon-button color="primary">
-                            <mat-spinner diameter="24"></mat-spinner>
-                          </button>
 
                           <app-execute-command [clientData]="[client]" [buttonType]="'icon'" [icon]="'terminal'"
                             [disabled]="selection.selected.length > 1 || (selection.selected.length === 1 && !selection.isSelected(client))"></app-execute-command>
@@ -252,6 +269,10 @@
                             <mat-icon>more_vert</mat-icon>
                           </button>
 
+                          <span class="sync-spinner" *ngIf="syncStatus && syncingClientId === client.uuid">
+                            <mat-spinner diameter="24"></mat-spinner>
+                          </span>
+
                           <mat-menu #clientMenu="matMenu">
                             <button mat-menu-item (click)="onEditClick($event, client.type, client.uuid)">
                               <mat-icon>edit</mat-icon>
@@ -261,6 +282,11 @@
                               <mat-icon>visibility</mat-icon>
                               <span>{{ 'viewDetails' | translate }}</span>
                             </button>
+                            <button mat-menu-item *ngIf="(!syncStatus || syncingClientId !== client.uuid)"
+                              (click)="getStatus(client, selectedNode)">
+                              <mat-icon>sync</mat-icon>
+                              <span>{{ 'sync' | translate }}</span>
+                            </button>
                             <button mat-menu-item (click)="onDeleteClick($event, client)">
                               <mat-icon>delete</mat-icon>
                               <span>{{ 'delete' | translate }}</span>
@@ -292,7 +318,8 @@
                     </th>
                     <td mat-cell *matCellDef="let row">
                       <mat-checkbox (click)="$event.stopPropagation()" (change)="toggleRow(row)"
-                        [checked]="selection.isSelected(row)" [disabled]="row.status === 'busy'">
+                        [checked]="selection.isSelected(row)"
+                        [disabled]="row.status === 'busy' || row.status === 'off' || row.status === 'disconnected'">
                       </mat-checkbox>
                     </td>
                   </ng-container>
@@ -300,8 +327,13 @@
                     <th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'status' | translate }} </th>
                     <td mat-cell *matCellDef="let client" matTooltip="{{ getClientPath(client) }}"
                       matTooltipPosition="left" matTooltipShowDelay="500">
-                      <img [src]="'assets/images/ordenador_' + client.status + '.png'" alt="Client Icon"
-                        class="client-image" />
+                      <div class="client-status-container">
+                        <img [src]="'assets/images/computer_' + client.status + '.svg'" alt="Client Icon"
+                          class="client-image" />
+                        <span *ngIf="syncStatus && syncingClientId === client.uuid">
+                          <mat-spinner diameter="24"></mat-spinner>
+                        </span>
+                      </div>
                     </td>
                   </ng-container>
 
@@ -309,16 +341,29 @@
                     <th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'name' | translate }} </th>
                     <td mat-cell *matCellDef="let client" matTooltip="{{ getClientPath(client) }}"
                       matTooltipPosition="left" matTooltipShowDelay="500">
-                      <p style="font-weight: 500;">{{ client.name }}</p>
+                      <p>{{ client.name }}</p>
                     </td>
                   </ng-container>
                   <ng-container matColumnDef="ip">
                     <th mat-header-cell *matHeaderCellDef mat-sort-header>IP </th>
                     <td mat-cell *matCellDef="let client" matTooltip="{{ getClientPath(client) }}"
                       matTooltipPosition="left" matTooltipShowDelay="500">
-                      {{ client.ip }}
+                      <div style="display: flex; flex-direction: column;">
+                        <span>{{ client.ip }}</span>
+                        <span style="font-size: 0.75rem; color: gray;">{{ client.mac }}</span>
+                      </div>
                     </td>
                   </ng-container>
+
+                  <ng-container matColumnDef="firmwareType">
+                    <th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'firmwareType' | translate }} </th>
+                    <td mat-cell *matCellDef="let client">
+                      <mat-chip s>
+                        {{ client.firmwareType ? client.firmwareType : 'N/A' }}
+                      </mat-chip>
+                    </td>
+                  </ng-container>
+
                   <ng-container matColumnDef="oglive">
                     <th mat-header-cell *matHeaderCellDef mat-sort-header> OG Live </th>
                     <td mat-cell *matCellDef="let client"> {{ client.ogLive?.date | date }} </td>
@@ -351,7 +396,8 @@
                         <mat-icon>more_vert</mat-icon>
                       </button>
                       <app-execute-command [clientData]="[client]" [buttonType]="'icon'" [icon]="'terminal'"
-                        [disabled]="selection.selected.length > 1 || (selection.selected.length === 1 && !selection.isSelected(client))"></app-execute-command>
+                        [disabled]="selection.selected.length > 1 || (selection.selected.length === 1 && !selection.isSelected(client))">
+                      </app-execute-command>
                       <mat-menu #clientMenu="matMenu">
                         <button mat-menu-item (click)="onEditClick($event, client.type, client.uuid)">
                           <mat-icon>edit</mat-icon>
@@ -372,7 +418,8 @@
                       </mat-menu>
                     </td>
                   </ng-container>
-                  <tr mat-header-row style="background-color: #f3f3f3;" *matHeaderRowDef="displayedColumns; sticky: true"></tr>
+                  <tr mat-header-row style="background-color: #f3f3f3;"
+                    *matHeaderRowDef="displayedColumns; sticky: true"></tr>
                   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
                 </table>
               </section>

ogWebconsole/src/app/components/groups/groups.component.spec.ts

@@ -4,7 +4,6 @@ import { MatInputModule } from '@angular/material/input';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
-import { MatOptionModule } from '@angular/material/core';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
@@ -27,12 +26,18 @@ import { MatTreeModule } from '@angular/material/tree';
 import { TreeNode } from './model/model';
 import { LoadingComponent } from '../../shared/loading/loading.component';
 import { ExecuteCommandComponent } from '../commands/main-commands/execute-command/execute-command.component';
+import { ConfigService } from '@services/config.service';
 
 describe('GroupsComponent', () => {
     let component: GroupsComponent;
     let fixture: ComponentFixture<GroupsComponent>;
 
     beforeEach(async () => {
+        const mockConfigService = {
+            apiUrl: 'http://mock-api-url',
+            mercureUrl: 'http://mock-mercure-url'
+        };
+
         await TestBed.configureTestingModule({
             declarations: [GroupsComponent, ExecuteCommandComponent, LoadingComponent],
             imports: [
@@ -63,7 +68,8 @@ describe('GroupsComponent', () => {
             ],
             providers: [
                 { provide: MatDialogRef, useValue: {} },
-                { provide: MAT_DIALOG_DATA, useValue: { data: { id: 123 } } }
+                { provide: MAT_DIALOG_DATA, useValue: { data: { id: 123 } } },
+                { provide: ConfigService, useValue: mockConfigService }
             ]
         }).compileComponents();
 
@@ -110,13 +116,13 @@ describe('GroupsComponent', () => {
         expect(component.expandPathToNode).toHaveBeenCalledWith(node);
     });
 
-    it('should handle node click', () => {
+   /* it('should handle node click', () => {
         const node: TreeNode = { id: '1', name: 'Node 1', type: 'type', children: [] };
         spyOn<any>(component, 'fetchClientsForNode');
-        component.onNodeClick(node);
+        component.onNodeClick($event, node);
         expect(component.selectedNode).toBe(node);
         expect(component['fetchClientsForNode']).toHaveBeenCalledWith(node);
-    });
+    });*/
 
     it('should fetch clients for node', () => {
         const node: TreeNode = { id: '1', name: 'Node 1', type: 'type', children: [] };
@@ -128,4 +134,4 @@ describe('GroupsComponent', () => {
             { params: jasmine.any(Object) }
         );
     });
-});
+})

ogWebconsole/src/app/components/groups/groups.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
+import {Component, OnInit, OnDestroy, ViewChild, QueryList, ViewChildren, ChangeDetectorRef} from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Router } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
@@ -17,12 +17,15 @@ import { DeleteModalComponent } from '../../shared/delete_modal/delete-modal/del
 import { ClassroomViewDialogComponent } from './shared/classroom-view/classroom-view-modal';
 import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
-import { MatPaginator, PageEvent } from '@angular/material/paginator';
+import { PageEvent } from '@angular/material/paginator';
 import { CreateMultipleClientComponent } from "./shared/clients/create-multiple-client/create-multiple-client.component";
 import { SelectionModel } from "@angular/cdk/collections";
 import { ManageClientComponent } from "./shared/clients/manage-client/manage-client.component";
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
+import { ConfigService } from '@services/config.service';
+import { BreakpointObserver } from '@angular/cdk/layout';
+import { MatMenuTrigger } from '@angular/material/menu';
 
 enum NodeType {
   OrganizationalUnit = 'organizational-unit',
@@ -38,8 +41,10 @@ enum NodeType {
   styleUrls: ['./groups.component.css'],
 })
 export class GroupsComponent implements OnInit, OnDestroy {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
-  mercureUrl: string = import.meta.env.NG_APP_OGCORE_MERCURE_BASE_URL;
+  @ViewChildren(MatMenuTrigger) menuTriggers!: QueryList<MatMenuTrigger>;
+  isSmallScreen: boolean = false;
+  baseUrl: string;
+  mercureUrl: string;
   organizationalUnits: UnidadOrganizativa[] = [];
   selectedUnidad: UnidadOrganizativa | null = null;
   selectedDetail: UnidadOrganizativa | null = null;
@@ -82,7 +87,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
     { value: 'mac', name: 'Mac' },
   ];
 
-  displayedColumns: string[] = ['select', 'status', 'ip', 'name', 'oglive', 'subnet', 'pxeTemplate', 'actions'];
+  displayedColumns: string[] = ['select', 'status', 'ip', 'firmwareType', 'name', 'oglive', 'subnet', 'pxeTemplate', 'actions'];
 
   private _sort!: MatSort;
 
@@ -103,8 +108,13 @@ export class GroupsComponent implements OnInit, OnDestroy {
     public dialog: MatDialog,
     private bottomSheet: MatBottomSheet,
     private joyrideService: JoyrideService,
-    private toastr: ToastrService
+    private breakpointObserver: BreakpointObserver,
+    private toastr: ToastrService,
+    private configService: ConfigService,
+    private cd: ChangeDetectorRef,
   ) {
+    this.baseUrl = this.configService.apiUrl;
+    this.mercureUrl = this.configService.mercureUrl;
     this.treeFlattener = new MatTreeFlattener<TreeNode, FlatNode>(
       this.transformer,
       (node) => node.level,
@@ -139,38 +149,62 @@ export class GroupsComponent implements OnInit, OnDestroy {
 
     this.arrayClients = this.selectedClients.data;
 
-    const eventSource = new EventSource(`${this.mercureUrl}?topic=`
-      + encodeURIComponent(`clients`));
+    const eventSource = new EventSource(`${this.mercureUrl}?topic=` + encodeURIComponent(`clients`));
 
     eventSource.onmessage = (event) => {
       const data = JSON.parse(event.data);
-      if (data && data['@id']) {
+
+      if (Array.isArray(data)) {
+        data.forEach((client) => {
+          if (client && client['@id']) {
+            this.updateClientStatus(client['@id'], client.status);
+          }
+        });
+      }
+      else if (data && data['@id']) {
         this.updateClientStatus(data['@id'], data.status);
       }
-    }
+    };
 
     this.clientFilterSubject.pipe(debounceTime(500)).subscribe(searchTerm => {
       this.filters['query'] = searchTerm;
       this.filterClients(searchTerm);
     });
+
+    this.breakpointObserver.observe(['(max-width: 992px)']).subscribe((result) => {
+      this.isSmallScreen = result.matches;
+    })
   }
 
-  private updateClientStatus(clientUuid: string, newStatus: string): void {
-    const clientIndex = this.selectedClients.data.findIndex(client => client['@id'] === clientUuid);
+  private updateClientStatus(clientUuid: string, status: string): void {
+    let updated = false;
 
-    if (clientIndex !== -1) {
+    const index = this.arrayClients.findIndex(client => client['@id'] === clientUuid);
+    if (index !== -1) {
+      const updatedClient = {...this.arrayClients[index], status};
+      this.arrayClients = [
+        ...this.arrayClients.slice(0, index),
+        updatedClient,
+        ...this.arrayClients.slice(index + 1)
+      ];
+      updated = true;
+    }
+
+    const tableIndex = this.selectedClients.data.findIndex(client => client['@id'] === clientUuid);
+
+    if (tableIndex !== -1) {
       const updatedClients = [...this.selectedClients.data];
 
-      updatedClients[clientIndex] = {
-        ...updatedClients[clientIndex],
-        status: newStatus
+      updatedClients[tableIndex] = {
+        ...updatedClients[tableIndex],
+        status: status
       };
 
       this.selectedClients.data = updatedClients;
+    }
 
-      console.log(`Estado actualizado para el cliente ${clientUuid}: ${newStatus}`);
-    } else {
-      console.warn(`Cliente con UUID ${clientUuid} no encontrado en la lista.`);
+    if (updated) {
+      this.cd.detectChanges();
     }
   }
 
@@ -190,6 +224,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
     hasClients: node.hasClients,
     ip: node.ip,
     '@id': node['@id'],
+    networkSettings: node.networkSettings,
   });
 
 
@@ -344,9 +379,18 @@ export class GroupsComponent implements OnInit, OnDestroy {
   }
 
 
-  onNodeClick(node: TreeNode): void {
+  onNodeClick(event: MouseEvent, node: TreeNode): void {
+    event.stopPropagation();
     this.selectedNode = node;
-    this.fetchClientsForNode(node);
+    const selectedClientsBeforeEdit = this.selection.selected.map(client => client.uuid);
+    this.fetchClientsForNode(node, selectedClientsBeforeEdit);
+  }
+
+  onMenuClick(event: Event, node: any): void {
+    event.stopPropagation();
+    this.selectedNode = node;
+    const selectedClientsBeforeEdit = this.selection.selected.map(client => client.uuid);
+    this.fetchClientsForNode(node, selectedClientsBeforeEdit);
   }
 
 
@@ -357,9 +401,12 @@ export class GroupsComponent implements OnInit, OnDestroy {
     this.http.get<any>(`${this.baseUrl}/clients?organizationalUnit.id=${node.id}&page=${this.page + 1}&itemsPerPage=${this.itemsPerPage}`, { params }).subscribe({
       next: (response: any) => {
         this.selectedClients.data = response['hydra:member'];
+        if (this.selectedNode) {
+          this.selectedNode.clients = response['hydra:member'];
+        }
         this.length = response['hydra:totalItems'];
         this.arrayClients = this.selectedClients.data;
-        this.hasClients = node.hasClients ?? false;
+        this.hasClients = this.selectedClients.data.length > 0;
         this.isLoadingClients = false;
         this.initialLoading = false;
         this.selection.clear();
@@ -390,7 +437,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
       width: '900px',
     });
     dialogRef.afterClosed().subscribe((newUnit) => {
-      if (newUnit?.uuid) {
+      if (newUnit) {
         this.refreshData(newUnit.uuid);
       }
     });
@@ -453,10 +500,11 @@ export class GroupsComponent implements OnInit, OnDestroy {
       ? this.dialog.open(ManageOrganizationalUnitComponent, { data: { uuid }, width: '900px' })
       : this.dialog.open(ManageClientComponent, { data: { uuid }, width: '900px' });
 
-    dialogRef.afterClosed().subscribe(() => {
-      if (node) {
-        this.refreshData(node.id);
+    dialogRef.afterClosed().subscribe((result) => {
+      if (result?.success) {
+        this.refreshData(node?.id);
       }
+      this.menuTriggers.forEach(trigger => trigger.closeMenu());
     });
   }
 
@@ -520,8 +568,11 @@ export class GroupsComponent implements OnInit, OnDestroy {
       ? this.dialog.open(ManageOrganizationalUnitComponent, { data: { uuid }, width: '900px' })
       : this.dialog.open(ManageClientComponent, { data: { uuid }, width: '900px' });
 
-    dialogRef.afterClosed().subscribe(() => {
-      this.refreshData(this.selectedNode?.id, selectedClientsBeforeEdit);
+    dialogRef.afterClosed().subscribe((result) => {
+      if (result?.success) {
+        this.refreshData(this.selectedNode?.id, selectedClientsBeforeEdit);
+      }
+      this.menuTriggers.forEach(trigger => trigger.closeMenu());
     });
   }
 

ogWebconsole/src/app/components/groups/model/model.ts

@@ -71,6 +71,7 @@ export interface TreeNode {
   hasClients?: boolean;
   clients?: Client[];
   ip?: string;
+  networkSettings?: Object;
 }
 
 export interface FlatNode {
@@ -80,6 +81,7 @@ export interface FlatNode {
   level: number;
   expandable: boolean;
   hasClients?: boolean;
+  networkSettings?: Object;
   ip?: string;
   '@id'?: string;
 }

ogWebconsole/src/app/components/groups/services/data.service.ts

@@ -3,18 +3,22 @@ import {HttpClient, HttpParams} from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { UnidadOrganizativa } from '../model/model';
+import { ConfigService } from '@services/config.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class DataService {
 
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
+  private apiUrl: string;
+  private clientsUrl: string;
 
-  private apiUrl = `${this.baseUrl}/organizational-units?page=1&itemsPerPage=1000`;
-  private clientsUrl = `${this.baseUrl}/clients`;
-
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, private configService: ConfigService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/organizational-units?page=1&itemsPerPage=1000`;
+    this.clientsUrl = `${this.baseUrl}/clients`;
+  }
 
   getOrganizationalUnits(search: string = ''): Observable<UnidadOrganizativa[]> {
     let url = `${this.apiUrl}&type=organizational-unit`;

ogWebconsole/src/app/components/groups/shared/classroom-view/classroom-view.component.ts

@@ -4,6 +4,7 @@ import { ClientViewComponent } from "../client-view/client-view.component";
 import { CdkDragMove } from '@angular/cdk/drag-drop';
 import { HttpClient } from '@angular/common/http';
 import { ToastrService } from 'ngx-toastr';
+import { ConfigService } from '@services/config.service';
 
 interface GroupedClients {
   organizationalUnitName: string;
@@ -16,12 +17,14 @@ interface GroupedClients {
   styleUrls: ['./classroom-view.component.css']
 })
 export class ClassroomViewComponent implements OnInit, OnChanges {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   @Input() clients: any[] = [];
   @Input() pcInTable: number = 5;
   groupedClients: GroupedClients[] = [];
 
-  constructor(public dialog: MatDialog, private http: HttpClient, private toastService: ToastrService) { }
+  constructor(public dialog: MatDialog, private http: HttpClient, private toastService: ToastrService, private configService: ConfigService) {
+    this.baseUrl = this.configService.apiUrl;
+  }
 
   ngOnInit(): void {
     this.groupClientsByOrganizationalUnit();

ogWebconsole/src/app/components/groups/shared/clients/create-multiple-client/create-multiple-client.component.ts

@@ -1,18 +1,18 @@
-import {Component, Inject, OnInit, Optional} from '@angular/core';
-import {MatDialogRef} from "@angular/material/dialog";
-import {HttpClient} from "@angular/common/http";
-import {MatSnackBar} from "@angular/material/snack-bar";
-import {ToastrService} from "ngx-toastr";
-import {MAT_DIALOG_DATA} from "@angular/material/dialog";
+import { Component, Inject, OnInit, Optional } from '@angular/core';
+import { MatDialogRef } from "@angular/material/dialog";
+import { HttpClient } from "@angular/common/http";
+import { ToastrService } from "ngx-toastr";
+import { MAT_DIALOG_DATA } from "@angular/material/dialog";
 import { DataService } from '../../../services/data.service';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-create-multiple-client',
   templateUrl: './create-multiple-client.component.html',
   styleUrl: './create-multiple-client.component.css'
 })
-export class CreateMultipleClientComponent implements OnInit{
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+export class CreateMultipleClientComponent implements OnInit {
+  baseUrl: string = this.configService.apiUrl;
   parentUnits: any[] = [];
   parentUnitsWithPaths: { id: string, name: string, path: string }[] = [];
   uploadedClients: any[] = [];
@@ -20,22 +20,24 @@ export class CreateMultipleClientComponent implements OnInit{
   displayedColumns: string[] = ['name', 'ip', 'mac'];
   showTextarea: boolean = true;
   organizationalUnit: any;
-  regex: RegExp = /host\s+(\S+)\s+\{\s+hardware\s+ethernet\s+([a-zA-Z0-9]{2}(:[a-zA-Z0-9]{2}){5});\s+fixed-address\s+((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?));\s+\}/g;
+  regex: RegExp = /host\s+(\S+)\s*\{\s*hardware\s+ethernet\s+([a-fA-F0-9]{2}(:[a-fA-F0-9]{2}){5});\s*fixed-address\s+((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?));\s*\}/g;
 
   constructor(
     @Optional() private dialogRef: MatDialogRef<CreateMultipleClientComponent>,
     @Inject(MAT_DIALOG_DATA) private data: any,
     private http: HttpClient,
-    private snackBar: MatSnackBar,
+    private configService: ConfigService,
     private toastService: ToastrService,
     private dataService: DataService
-  ) {}
+  ) {
+    this.baseUrl = this.configService.apiUrl;
+  }
 
   ngOnInit(): void {
     this.loadParentUnits();
 
     if (this.data?.organizationalUnit) {
-      this.organizationalUnit = this.data.organizationalUnit['@id']; 
+      this.organizationalUnit = this.data.organizationalUnit['@id'];
     }
   }
 

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>
+</div>

ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.spec.ts

@@ -8,12 +8,18 @@ import { TranslateModule } from '@ngx-translate/core';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { ManageClientComponent } from './manage-client.component';
 import { DataService } from '../../../services/data.service';
+import { ConfigService } from '@services/config.service';
 
 describe('ManageClientComponent', () => {
   let component: ManageClientComponent;
   let fixture: ComponentFixture<ManageClientComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [ManageClientComponent],
       imports: [
@@ -28,6 +34,7 @@ describe('ManageClientComponent', () => {
       providers: [
         { provide: MatDialogRef, useValue: {} },
         { provide: MAT_DIALOG_DATA, useValue: { uuid: '123', organizationalUnit: { '@id': '/units/1' } } },
+        { provide: ConfigService, useValue: mockConfigService },
         DataService
       ]
     })

ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.ts

@@ -2,9 +2,9 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { MatSnackBar } from '@angular/material/snack-bar';
 import { ToastrService } from 'ngx-toastr';
 import { DataService } from '../../../services/data.service';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-manage-client',
@@ -12,7 +12,7 @@ import { DataService } from '../../../services/data.service';
   styleUrls: ['./manage-client.component.css']
 })
 export class ManageClientComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   clientForm!: FormGroup;
   parentUnits: any[] = [];
   parentUnitsWithPaths: { id: string, name: string, path: string }[] = [];
@@ -38,11 +38,12 @@ export class ManageClientComponent implements OnInit {
     private fb: FormBuilder,
     private dialogRef: MatDialogRef<ManageClientComponent>,
     private http: HttpClient,
-    private snackBar: MatSnackBar,
+    private configService: ConfigService,
     private toastService: ToastrService,
     private dataService: DataService,
     @Inject(MAT_DIALOG_DATA) public data: any
   ) {
+    this.baseUrl = this.configService.apiUrl;
     this.isEditMode = !!data?.uuid;
     this.dialogTitle = this.isEditMode ? 'editClientDialogTitle' : 'addClientDialogTitle';
   }
@@ -83,13 +84,14 @@ export class ManageClientComponent implements OnInit {
       serialNumber: [''],
       netiface: null,
       netDriver: null,
-      mac: ['', Validators.required],
+      mac: ['', Validators.pattern(/^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/)],
       ip: ['', Validators.required],
       template: [null],
       hardwareProfile: [null],
       ogLive: [null],
       repository: [null],
-      menu: [null]
+      menu: [null],
+      maintenance: [false]
     });
   }
 
@@ -103,6 +105,7 @@ export class ManageClientComponent implements OnInit {
           this.parentUnitsWithPaths = this.parentUnits.map(unit => ({
             id: unit['@id'],
             name: unit.name,
+            netiface: unit.networkSettings?.netiface,
             path: this.dataService.getOrganizationalUnitPath(unit, this.parentUnits),
             repository: unit.networkSettings?.repository?.['@id'],
             hardwareProfile: unit.networkSettings?.hardwareProfile?.['@id'],
@@ -224,7 +227,8 @@ export class ManageClientComponent implements OnInit {
         repository: selectedUnit.repository || null,
         hardwareProfile: selectedUnit.hardwareProfile || null,
         ogLive: selectedUnit.ogLive || null,
-        menu: selectedUnit.menu || null
+        menu: selectedUnit.menu || null,
+        netiface: selectedUnit.netiface || null,
       });
     }
   }
@@ -248,6 +252,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();
         },
@@ -269,7 +274,7 @@ export class ManageClientComponent implements OnInit {
 
         this.http.patch<any>(putUrl, formData, { headers }).subscribe(
           response => {
-            this.dialogRef.close();
+            this.dialogRef.close({ success: true });
             this.toastService.success('Cliente actualizado exitosamente', 'Éxito');
           },
           error => {
@@ -282,6 +287,7 @@ export class ManageClientComponent implements OnInit {
           (response) => {
             this.toastService.success('Cliente creado exitosamente', 'Éxito');
             this.dialogRef.close({
+              success: true,
               client: response,
               organizationalUnit: formData.organizationalUnit,
             });
@@ -297,6 +303,6 @@ export class ManageClientComponent implements OnInit {
   }
 
   onNoClick(): void {
-    this.dialogRef.close();
+    this.dialogRef.close({ success: false });
   }
-}
+}

ogWebconsole/src/app/components/groups/shared/execute-command-ou/execute-command-ou.component.ts

@@ -3,6 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { HttpClient } from '@angular/common/http';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { ToastrService } from 'ngx-toastr';
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-execute-command-ou',
@@ -14,15 +15,17 @@ export class ExecuteCommandOuComponent implements OnInit {
   clients: any[] = [];
   commands: any[] = [];
   commandGroups: any[] = [];
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
 
   constructor(
     private dialogRef: MatDialogRef<ExecuteCommandOuComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
     private http: HttpClient,
     private fb: FormBuilder,
+    private configService: ConfigService,
     private toastService: ToastrService,
   ) {
+    this.baseUrl = this.configService.apiUrl;
     this.form = this.fb.group({
       selectedCommand: [null],
       selectedCommandGroup: [null],

ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.css

@@ -6,6 +6,10 @@ h1 {
     margin-top: 20px;
 }
 
+.create-ou-container {
+    position: relative;
+}
+
 .form-field {
     width: 100%;
 }
@@ -20,6 +24,13 @@ h1 {
     overflow-y: auto;
 }
 
+.loading-spinner {
+  display: block;
+  margin: 0 auto;
+  align-items: center;
+  justify-content: center;
+}
+
 .mat-dialog-actions {
     display: flex;
     justify-content: flex-end;
@@ -55,4 +66,4 @@ h1 {
     align-items: center;
     grid-column: span 2;
     margin-bottom: 10px;
-}
+}

ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.html

@@ -1,11 +1,10 @@
-<app-loading [isLoading]="loading"></app-loading>
-
-<div *ngIf="!loading">
+<div class="create-ou-container">
     <h1 mat-dialog-title>{{ isEditMode ? 'Editar' : 'Crear' }} Unidad Organizativa</h1>
-    <div class="mat-dialog-content">
+  <div class="mat-dialog-content" [ngClass]="{'loading': loading}">
         <!-- Paso 1: General -->
-        <span class="step-title">General</span>
-        <form [formGroup]="generalFormGroup" class="grid-form">
+      <mat-spinner class="loading-spinner" *ngIf="loading"></mat-spinner>
+      <span *ngIf="!loading" class="step-title">General</span>
+        <form *ngIf="generalFormGroup && !loading" [formGroup]="generalFormGroup" class="grid-form">
             <mat-form-field class="form-field" appearance="fill">
                 <mat-label>Tipo</mat-label>
                 <mat-select formControlName="type" required>
@@ -20,7 +19,7 @@
             </mat-form-field>
             <mat-form-field class="form-field" appearance="fill">
                 <mat-label>Padre</mat-label>
-                <mat-select formControlName="parent">
+                <mat-select formControlName="parent" (selectionChange)="onParentChange($event)">
                     <mat-select-trigger>
                         {{ getSelectedParentName() }}
                     </mat-select-trigger>
@@ -42,8 +41,8 @@
         </form>
 
         <!-- Paso 2: Información del Aula -->
-        <span *ngIf="generalFormGroup.value.type === 'classroom'" class="step-title">Información del aula</span>
-        <form *ngIf="generalFormGroup.value.type === 'classroom'" class="grid-form"
+        <span *ngIf="generalFormGroup.value.type === 'classroom' && !loading" class="step-title">Información del aula</span>
+        <form *ngIf="generalFormGroup.value.type === 'classroom' && !loading" class="grid-form"
             [formGroup]="classroomInfoFormGroup">
             <mat-form-field class="form-field">
                 <mat-label>Localización</mat-label>
@@ -71,8 +70,8 @@
         </form>
 
         <!-- Paso 3: Configuración de Red -->
-        <span class="step-title">Configuración de Red</span>
-        <form [formGroup]="networkSettingsFormGroup" class="grid-form">
+        <span *ngIf="!loading" class="step-title">Configuración de Red</span>
+        <form *ngIf="networkSettingsFormGroup && !loading" [formGroup]="networkSettingsFormGroup" class="grid-form">
             <mat-form-field class="form-field">
                 <mat-label>OgLive</mat-label>
                 <mat-select formControlName="ogLive" (selectionChange)="onOgLiveChange($event)">
@@ -168,8 +167,8 @@
         </form>
 
         <!-- Paso 4: Información Adicional -->
-        <span class="step-title">Información Adicional</span>
-        <form [formGroup]="additionalInfoFormGroup">
+        <span *ngIf="!loading" class="step-title">Información Adicional</span>
+        <form *ngIf="additionalInfoFormGroup && !loading" [formGroup]="additionalInfoFormGroup">
             <mat-form-field class="form-field">
                 <mat-label>Comentarios</mat-label>
                 <textarea matInput formControlName="comments"></textarea>

ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.spec.ts

@@ -13,12 +13,18 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { LoadingComponent } from '../../../../../shared/loading/loading.component';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; 
+import { ConfigService } from '@services/config.service';
 
 describe('ManageOrganizationalUnitComponent', () => {
   let component: ManageOrganizationalUnitComponent;
   let fixture: ComponentFixture<ManageOrganizationalUnitComponent>;
 
   beforeEach(async () => {
+    const mockConfigService = {
+      apiUrl: 'http://mock-api-url',
+      mercureUrl: 'http://mock-mercure-url'
+    };
+
     await TestBed.configureTestingModule({
       declarations: [ManageOrganizationalUnitComponent, LoadingComponent],
       imports: [
@@ -36,7 +42,8 @@ describe('ManageOrganizationalUnitComponent', () => {
       ],
       providers: [
         { provide: MatDialogRef, useValue: {} },
-        { provide: MAT_DIALOG_DATA, useValue: {} }
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+        { provide: ConfigService, useValue: mockConfigService }
       ]
     })
       .compileComponents();

ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.ts

@@ -4,6 +4,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DataService } from "../../../services/data.service";
 import { ToastrService } from "ngx-toastr";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-manage-organizational-unit',
@@ -11,7 +12,7 @@ import { ToastrService } from "ngx-toastr";
   styleUrls: ['./manage-organizational-unit.component.css']
 })
 export class ManageOrganizationalUnitComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   isLinear = true;
   generalFormGroup: FormGroup;
   additionalInfoFormGroup: FormGroup;
@@ -55,11 +56,12 @@ export class ManageOrganizationalUnitComponent implements OnInit {
     private dialogRef: MatDialogRef<ManageOrganizationalUnitComponent>,
     private http: HttpClient,
     private dataService: DataService,
+    private configService: ConfigService,
     private toastService: ToastrService,
     @Inject(MAT_DIALOG_DATA) public data: any
   ) {
     this.isEditMode = !!data?.uuid;
-
+    this.baseUrl = this.configService.apiUrl;
     this.generalFormGroup = this._formBuilder.group({
       name: [null, Validators.required],
       parent: [data?.parent ? data.parent['@id'] : null],
@@ -98,43 +100,103 @@ export class ManageOrganizationalUnitComponent implements OnInit {
       capacity: [null, [Validators.required, Validators.min(0)]],
       remoteCalendar: [null]
     });
-
-    if (this.isEditMode) {
-      this.loadData(data.uuid);
-    }
   }
 
-  ngOnInit() {
-    this.loadParentUnits();
-    this.loadHardwareProfiles();
-    this.loadCalendars();
-    this.loadOgLives();
-    this.loadRepositories();
-    this.loadMenus()
+  ngOnInit(): void {
+    this.loading = true;
+    const observables = [
+      this.loadParentUnits(),
+      this.loadHardwareProfiles(),
+      this.loadCalendars(),
+      this.loadOgLives(),
+      this.loadRepositories(),
+      this.loadMenus(),
+    ];
+
+    Promise.all(observables).then(() => {
+      if (this.isEditMode) {
+        this.loadData(this.data.uuid).then(() => {
+          this.loading = false;
+        });
+      } else {
+        this.loading = false;
+      }
+    }).catch(error => {
+      console.error('Error loading data:', error);
+      this.loading = false;
+    });
   }
 
   get filteredTypes(): string[] {
     return this.generalFormGroup.get('parent')?.value ? this.types.filter(type => type !== 'organizational-unit') : this.types;
   }
 
-  loadParentUnits() {
-    this.loading = true;
-    const url = `${this.baseUrl}/organizational-units?page=1&itemsPerPage=1000`;
-    this.http.get<any>(url).subscribe(
-      response => {
-        this.parentUnits = response['hydra:member'];
-        this.parentUnitsWithPaths = this.parentUnits.map(unit => ({
-          id: unit['@id'],
-          name: unit.name,
-          path: this.dataService.getOrganizationalUnitPath(unit, this.parentUnits)
-        }));
-        this.loading = false;
-      },
-      error => {
-        console.error('Error fetching parent units:', error);
-        this.loading = false;
-      }
-    );
+  loadParentUnits(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const url = `${this.baseUrl}/organizational-units?page=1&itemsPerPage=1000`;
+      this.http.get<any>(url).subscribe(
+        response => {
+          this.parentUnits = response['hydra:member'];
+          this.parentUnitsWithPaths = this.parentUnits.map(unit => ({
+            id: unit['@id'],
+            name: unit.name,
+            path: this.dataService.getOrganizationalUnitPath(unit, this.parentUnits),
+            repository: unit.networkSettings?.repository?.['@id'],
+            hardwareProfile: unit.networkSettings?.hardwareProfile?.['@id'],
+            ogLive: unit.networkSettings?.ogLive?.['@id'],
+            menu: unit.networkSettings?.menu?.['@id'],
+            mcastIp: unit.networkSettings?.mcastIp,
+            mcastSpeed: unit.networkSettings?.mcastSpeed,
+            mcastPort: unit.networkSettings?.mcastPort,
+            mcastMode: unit.networkSettings?.mcastMode,
+            netiface: unit.networkSettings?.netiface,
+            p2pMode: unit.networkSettings?.p2pMode,
+            p2pTime: unit.networkSettings?.p2pTime,
+            dns: unit.networkSettings?.dns,
+            netmask: unit.networkSettings?.netmask,
+            router: unit.networkSettings?.router,
+            ntp: unit.networkSettings?.ntp
+          }));
+
+          const initialUnitId = this.generalFormGroup.get('parent')?.value;
+          if (initialUnitId) {
+            this.setOrganizationalUnitDefaults(initialUnitId);
+          }
+          resolve();
+        },
+        error => {
+          console.error('Error fetching parent units:', error);
+          reject(error);
+        }
+      );
+    });
+  }
+
+  onParentChange(event: any): void {
+    this.setOrganizationalUnitDefaults(event.value);
+  }
+
+  setOrganizationalUnitDefaults(unitId: string): void {
+    const selectedUnit: any = this.parentUnitsWithPaths.find(unit => unit.id === unitId);
+    if (selectedUnit) {
+      this.networkSettingsFormGroup.patchValue({
+        repository: selectedUnit.repository || null,
+        hardwareProfile: selectedUnit.hardwareProfile || null,
+        ogLive: selectedUnit.ogLive || null,
+        menu: selectedUnit.menu || null,
+        mcastIp: selectedUnit.mcastIp || null,
+        mcastSpeed: selectedUnit.mcastSpeed || null,
+        mcastPort: selectedUnit.mcastPort || null,
+        mcastMode: selectedUnit.mcastMode || null,
+        netiface: selectedUnit.netiface || null,
+        p2pMode: selectedUnit.p2pMode || null,
+        p2pTime: selectedUnit.p2pTime || null,
+        dns: selectedUnit.dns || null,
+        netmask: selectedUnit.netmask || null,
+        router: selectedUnit.router || null,
+        ntp: selectedUnit.ntp || null
+      });
+    }
   }
 
   getSelectedParentName(): string | undefined {
@@ -142,78 +204,87 @@ export class ManageOrganizationalUnitComponent implements OnInit {
     return this.parentUnitsWithPaths.find(unit => unit.id === parentId)?.name;
   }
 
-  loadHardwareProfiles(): void {
-    this.loading = true;
-    this.dataService.getHardwareProfiles().subscribe(
-      (data: any[]) => {
-        this.hardwareProfiles = data;
-        this.loading = false;
-      },
-      (error: any) => {
-        console.error('Error fetching hardware profiles', error);
-        this.loading = false;
-      }
-    );
+  loadHardwareProfiles(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      this.dataService.getHardwareProfiles().subscribe(
+        (data: any[]) => {
+          this.hardwareProfiles = data;
+          resolve();
+        },
+        error => {
+          console.error('Error fetching hardware profiles:', error);
+          reject(error);
+        }
+      );
+    });
   }
 
-  loadMenus(): void {
-    this.loading = true;
-    const url = `${this.baseUrl}/menus?page=1&itemsPerPage=10000`;
+  loadOgLives(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const url = `${this.baseUrl}/og-lives?page=1&itemsPerPage=30`;
 
-    this.http.get<any>(url).subscribe(
-      response => {
-        this.menus = response['hydra:member'];
-        this.loading = false;
-      },
-      error => {
-        console.error('Error fetching menus:', error);
-        this.loading = false;
-      }
-    );
+      this.http.get<any>(url).subscribe(
+        response => {
+          this.ogLives = response['hydra:member'];
+          resolve();
+        },
+        error => {
+          console.error('Error fetching ogLives:', error);
+          reject(error);
+        }
+      );
+    });
   }
 
-  loadOgLives() {
-    this.loading = true;
-    this.dataService.getOgLives().subscribe(
-      (data: any[]) => {
-        this.ogLives = data;
-        this.loading = false;
-      },
-      error => {
-        console.error('Error fetching ogLives', error);
-        this.loading = false;
-      }
-    );
+  loadMenus(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const url = `${this.baseUrl}/menus?page=1&itemsPerPage=10000`;
+
+      this.http.get<any>(url).subscribe(
+        response => {
+          this.menus = response['hydra:member'];
+          resolve();
+        },
+        error => {
+          console.error('Error fetching menus:', error);
+          reject(error);
+        }
+      );
+    });
   }
 
-  loadRepositories() {
-    this.loading = true;
-    this.dataService.getRepositories().subscribe(
-      (data: any[]) => {
-        this.repositories = data;
-        this.loading = false;
-      },
-      error => {
-        console.error('Error fetching repositories', error);
-        this.loading = false;
-      }
-    );
+  loadRepositories(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const url = `${this.baseUrl}/image-repositories?page=1&itemsPerPage=10000`;
+
+      this.http.get<any>(url).subscribe(
+        response => {
+          this.repositories = response['hydra:member'];
+          resolve();
+        },
+        error => {
+          console.error('Error fetching ogLives:', error);
+          reject(error);
+        }
+      );
+    });
   }
 
-  loadCalendars() {
-    this.loading = true;
-    const apiUrl = `${this.baseUrl}/remote-calendars?page=1&itemsPerPage=30`;
-    this.http.get<any>(apiUrl).subscribe(
-      response => {
-        this.calendars = response['hydra:member'];
-        this.loading = false;
-      },
-      error => {
-        console.error('Error loading calendars', error);
-        this.toastService.error('Error loading current calendar');
-        this.loading = false;
-      }
-    );
+  loadCalendars(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const apiUrl = `${this.baseUrl}/remote-calendars?page=1&itemsPerPage=30`;
+      this.http.get<any>(apiUrl).subscribe(
+        response => {
+          this.calendars = response['hydra:member'];
+          resolve();
+        },
+        error => {
+          console.error('Error loading calendars', error);
+          this.toastService.error('Error loading current calendar');
+          reject(error);
+        }
+      );
+    });
   }
 
   loadCurrentCalendar(uuid: string): void {
@@ -244,57 +315,58 @@ export class ManageOrganizationalUnitComponent implements OnInit {
     this.networkSettingsFormGroup.value.repository = event.value;
   }
 
-  loadData(uuid: string) {
-    this.loading = true;
-    const url = `${this.baseUrl}/organizational-units/${uuid}`;
+  loadData(uuid: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const url = `${this.baseUrl}/organizational-units/${uuid}`;
 
-    this.http.get<any>(url).subscribe(
-      data => {
-        this.generalFormGroup.patchValue({
-          name: data.name,
-          parent: data.parent ? data.parent['@id'] : '',
-          description: data.description,
-          type: data.type,
-          excludeParentChanges: data.excludeParentChanges
-        });
-        this.additionalInfoFormGroup.patchValue({
-          comments: data.comments
-        });
-        this.networkSettingsFormGroup.patchValue({
-          proxy: data.networkSettings.proxy,
-          dns: data.networkSettings.dns,
-          netmask: data.networkSettings.netmask,
-          router: data.networkSettings.router,
-          ntp: data.networkSettings.ntp,
-          netiface: data.networkSettings.netiface,
-          p2pMode: data.networkSettings.p2pMode,
-          p2pTime: data.networkSettings.p2pTime,
-          mcastIp: data.networkSettings.mcastIp,
-          mcastSpeed: data.networkSettings.mcastSpeed,
-          mcastPort: data.networkSettings.mcastPort,
-          mcastMode: data.networkSettings.mcastMode,
-          menu: data.networkSettings.menu ? data.networkSettings.menu['@id'] : null,
-          hardwareProfile: data.networkSettings.hardwareProfile ? data.networkSettings.hardwareProfile['@id'] : null,
-          ogLive: data.networkSettings.ogLive ? data.networkSettings.ogLive['@id'] : null,
-          repository: data.networkSettings.repository ? data.networkSettings.repository['@id'] : null
-        });
-        this.classroomInfoFormGroup.patchValue({
-          location: data.location,
-          projector: data.projector,
-          board: data.board,
-          capacity: data.capacity,
-          remoteCalendar: data.remoteCalendar ? data.remoteCalendar['@id'] : null
-        });
-        this.loading = false;
-      },
+      this.http.get<any>(url).subscribe(
+        data => {
+          this.generalFormGroup.patchValue({
+            name: data.name,
+            parent: data.parent ? data.parent['@id'] : '',
+            description: data.description,
+            type: data.type,
+            excludeParentChanges: data.excludeParentChanges
+          });
+          this.additionalInfoFormGroup.patchValue({
+            comments: data.comments
+          });
+          this.networkSettingsFormGroup.patchValue({
+            proxy: data.networkSettings?.proxy,
+            dns: data.networkSettings?.dns,
+            netmask: data.networkSettings?.netmask,
+            router: data.networkSettings?.router,
+            ntp: data.networkSettings?.ntp,
+            netiface: data.networkSettings?.netiface,
+            p2pMode: data.networkSettings?.p2pMode,
+            p2pTime: data.networkSettings?.p2pTime,
+            mcastIp: data.networkSettings?.mcastIp,
+            mcastSpeed: data.networkSettings?.mcastSpeed,
+            mcastPort: data.networkSettings?.mcastPort,
+            mcastMode: data.networkSettings?.mcastMode,
+            menu: data.networkSettings?.menu ? data.networkSettings.menu['@id'] : null,
+            hardwareProfile: data.networkSettings?.hardwareProfile ? data.networkSettings.hardwareProfile['@id'] : null,
+            ogLive: data.networkSettings?.ogLive ? data.networkSettings.ogLive['@id'] : null,
+            repository: data.networkSettings?.repository ? data.networkSettings.repository['@id'] : null
+          });
+          this.classroomInfoFormGroup.patchValue({
+            location: data.location,
+            projector: data.projector,
+            board: data.board,
+            capacity: data.capacity,
+            remoteCalendar: data.remoteCalendar ? data.remoteCalendar['@id'] : null
+          });
+          resolve();
+        },
 
-      error => {
-        console.error('Error fetching data for edit:', error);
-        this.toastService.error('Error fetching data');
-        this.loading = false;
-        this.onNoClick();
-      }
-    );
+        error => {
+          console.error('Error fetching data for edit:', error);
+          this.toastService.error('Error fetching data');
+          reject(error);
+          this.onNoClick();
+        }
+      );
+    });
   }
 
   onSubmit() {
@@ -322,7 +394,7 @@ export class ManageOrganizationalUnitComponent implements OnInit {
         this.http.put<any>(putUrl, formData, { headers }).subscribe(
           response => {
             this.unitAdded.emit();
-            this.dialogRef.close();
+            this.dialogRef.close({ success: true });
             this.toastService.success('Editado exitosamente', 'Éxito');
           },
           error => {
@@ -341,7 +413,7 @@ export class ManageOrganizationalUnitComponent implements OnInit {
         this.http.post<any>(postUrl, formData, { headers }).subscribe(
           response => {
             this.unitAdded.emit(response);
-            this.dialogRef.close(response);
+            this.dialogRef.close({ success: true });
             this.toastService.success('Creado exitosamente', 'Éxito');
           },
           error => {
@@ -358,6 +430,6 @@ export class ManageOrganizationalUnitComponent implements OnInit {
   }
 
   onNoClick(): void {
-    this.dialogRef.close();
+    this.dialogRef.close({ success: false });
   }
 }

ogWebconsole/src/app/components/groups/shared/organizational-units/show-organizational-unit/show-organizational-unit.component.ts

@@ -1,7 +1,8 @@
 import { HttpClient } from '@angular/common/http';
-import {Component, Inject, OnInit} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
-import {DatePipe} from "@angular/common";
+import { Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
+import { DatePipe } from "@angular/common";
+import { ConfigService } from '@services/config.service';
 
 @Component({
   selector: 'app-show-organizational-unit',
@@ -9,7 +10,7 @@ import {DatePipe} from "@angular/common";
   styleUrl: './show-organizational-unit.component.css'
 })
 export class ShowOrganizationalUnitComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
   displayedColumns: string[] = ['property', 'value'];
   currentCalendar: any;
   ou: any;
@@ -26,8 +27,10 @@ export class ShowOrganizationalUnitComponent implements OnInit {
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: any,
     private dialogRef: MatDialogRef<ShowOrganizationalUnitComponent>,
+    private configService: ConfigService,
     private http: HttpClient
   ) {
+    this.baseUrl = this.configService.apiUrl;
   }
 
   ngOnInit(): void {

ogWebconsole/src/app/components/images/create-image/create-image.component.css

@@ -1,8 +1,25 @@
-.dialog-content {
+.create-image-container {
   display: flex;
   flex-direction: column;
-  gap: 16px;
-  /* Espacio entre los elementos del formulario */
+  padding: 1rem;
+}
+
+.loading-spinner {
+  display: block;
+  margin: 0 auto;
+}
+
+.mat-dialog-content.loading {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+}
+
+.mat-dialog-content {
+  padding-left: 1.5em;
+  padding-right: 1.5em;
+  padding-top: 1em;
 }
 
 .image-form {