Updates control

Reviewed-on: #21

.gitignore

@@ -1,2 +1,9 @@
 ogWebconsole/.env
 ogWebconsole/test-results/ogGui-junit-report.xml
+node_modules/
+### Debian packaging 
+debian/oggui
+debian/*.substvars 
+debian/*.log
+debian/.debhelper/
+debian/files

CHANGELOG.md

@@ -1,7 +1,97 @@
 # 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.5.0] - 2024-11-19
+---
+## [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
+- Se ha modificado el acceso a Mercure añadiendo nueva variable de entorno.
+
+---
+## [0.9.0] - 2025-3-4
+### 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
+- 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.
+
+---
+## [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 functionality to execute actions from the menu in the general groups screen.
 - Displayed the selected center on the general screen for better context.
@@ -14,7 +104,7 @@
 
 ### Improved
 - Renamed the field "Reserved Room" to "Available RemotePC" for better clarity.
-- Added view sizes for visual cards (`mat-card`).
+- Added view sizes for visual cards.
 - Refactored the task stepper to improve efficiency and readability.
 - Replaced red "X" icons with more consistent and user-friendly visuals.
 - Allowed logical names for IP addresses in the subnets section.
@@ -22,10 +112,8 @@
 - Made predefined commands read-only to prevent accidental modifications.
 - Simplified the task creation modal to enhance user experience.
 - Adjusted the translation system to cover new elements and improve consistency (work in progress).
+- New element view from clients on groups main view.
 
 ### Fixed
 - Resolved an issue that prevented editing software profiles correctly.
 - Fixed a bug where newly created commands failed to execute in the commands section.
-
----
-

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')
+        }
+    }
+}
+

bin/start-oggui.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+
+CONFIG_FILE="/opt/opengnsys/oggui/src/.env"
+HASH_FILE="/opt/opengnsys/oggui/var/lib/oggui/oggui.config.hash"
+APP_DIR="/opt/opengnsys/oggui/browser"
+SRC_DIR="/opt/opengnsys/oggui/src"
+COMPILED_DIR=$SRC_DIR/dist
+NGINX_SERVICE="nginx"
+
+# Verificar si el archivo de configuración cambió
+if [ -f "$CONFIG_FILE" ] && [ -f "$HASH_FILE" ]; then
+    OLD_HASH=$(cat "$HASH_FILE")
+    NEW_HASH=$(md5sum "$CONFIG_FILE")
+
+    if [ "$OLD_HASH" != "$NEW_HASH" ]; then
+        echo "🔄 Cambios detectados en $CONFIG_FILE, recompilando Angular..."
+        cd "$SRC_DIR"
+        npm install -g @angular/cli
+        npm install
+        /usr/local/bin/ng build --base-href=/ --output-path=dist/oggui --optimization=true --configuration=production --localize=false 
+        md5sum "$CONFIG_FILE" > "$HASH_FILE"
+        exit 0 
+    else
+        echo "No hay cambios en $CONFIG_FILE, no es necesario recompilar."
+        exit 0 
+    fi
+else
+    echo "Archivo de configuración no encontrado o sin hash previo. No se recompilará."
+    exit 1
+fi
+
+# Iniciar Nginx
+systemctl restart "$NGINX_SERVICE"

debian/changelog

@@ -0,0 +1,14 @@
+oggui (0.0.1-1) unstable; urgency=medium
+
+  * Add debian files
+  * Update .gitignore
+  * refs #1637 refactor: remove unused client edit and create components; add manage client component
+  * refs #1619. Style: enhance cards view layout and paginator integration in groups component
+  * refactor: update paginator settings and improve page change handling in groups component
+  * Merge branch 'develop' of ssh://ognproject.evlt.uma.es:21987/opengnsys/oggui into develop
+  * style: clean up and optimize CSS for groups component; enhance HTML structure and improve responsiveness
+  * Updated groups paginator
+  * Merge branch 'develop' of ssh://ognproject.evlt.uma.es:21987/opengnsys/oggui into develop
+  * refs #1567. New subnet field: 'dns'
+
+ -- Tu Nombre <tuemail@example.com>  Mon, 10 Mar 2025 14:48:36 +0000

debian/compat

@@ -0,0 +1 @@
+12

debian/control

@@ -0,0 +1,13 @@
+Source: oggui
+Section: web
+Priority: optional
+Maintainer: Nicolas Arenas <nicolas.arenas@qindel.com>
+Build-Depends: debhelper (>= 12), nodejs, npm
+Standards-Version: 4.5.0
+
+Package: oggui
+Architecture: any
+Maintainer: Nicolas Arenas <nicolas.arenas@qindel.com> 
+Depends: ${shlibs:Depends}, ${misc:Depends}, nginx
+Description: OpenGnsys GUI created for the Opengnsys Team
+ Opengnsys Graphical Intercface

debian/debhelper-build-stamp

@@ -0,0 +1 @@
+oggui

debian/files

@@ -0,0 +1,2 @@
+oggui_1.0.1+deb-pkg20250310-1_amd64.buildinfo web optional
+oggui_1.0.1+deb-pkg20250310-1_amd64.deb web optional

debian/oggui.config

@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+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

@@ -0,0 +1,4 @@
+ogWebconsole/dist/oggui/browser /opt/opengnsys/oggui/
+etc /opt/opengnsys/oggui/
+ogWebconsole/ssl/* /opt/opengnsys/oggui/etc/nginx/certs/
+

debian/oggui.postinst

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_get  opengnsys/oggui_ogcoreUrl
+OGCORE_URL="$RET"
+db_get  opengnsys/oggui_ogmercureUrl
+OGMERCURE_URL="$RET"
+
+# Asegurarse de que el usuario exista
+USER="opengnsys"
+CONFIG_FILE="/opt/opengnsys/oggui/browser/assets/config.json"
+
+restore_config_if_modified() {
+    local new="$1"
+    local backup="$1.bak"
+
+    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
+    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 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 
+exit 0

debian/oggui.postrm

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+
+NGINX_FILE="/etc/nginx/sites-enabled/oggui.conf"
+UNIT_FILE="/etc/systemd/system/oggui.service"
+
+
+case "$1" in
+    remove)
+        echo "El paquete se está desinstalando..."
+        # Aquí puedes hacer limpieza de archivos o servicios
+        if [ -L "$NGINX_FILE" ]; then
+            rm -f "$NGINX_FILE"
+            systemctl restart nginx
+        fi
+        if [ -L "$UNIT_FILE" ]; then
+            rm -f  "$UNIT_FILE"
+            systemctl daemon-reload
+        fi
+        ;;
+    purge)
+        echo "Eliminando configuración residual..."
+        ;;
+
+    upgrade)
+        echo "Actualizando paquete..."
+        ;;
+esac
+
+exit 0

debian/oggui.postrm.debhelper

@@ -0,0 +1,6 @@
+# Automatically added by dh_installdebconf/13.14.1ubuntu5
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	db_purge
+fi
+# End automatically added section

debian/oggui.preinst

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+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"
+if id "$USER" &>/dev/null; then
+    echo "El usuario $USER ya existe."
+else
+    echo "Creando el usuario $USER con home en $HOME_DIR."
+    useradd -m -d "$HOME_DIR" -s /bin/bash "$USER"
+fi
+
+# 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

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+set -x
+
+# 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
+fi
+
+exit 0

debian/oggui.templates

@@ -0,0 +1,9 @@
+Template: opengnsys/oggui_ogcoreUrl
+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

@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	cd ogWebconsole && npm install
+	cd ogWebconsole && npx ng build --base-href=/ --output-path=dist/oggui --optimization=true --configuration=production
+
+override_dh_auto_install:
+	dh_auto_install

etc/nginx/oggui.conf

@@ -0,0 +1,20 @@
+server {
+    listen 4200 ssl;
+    server_name localhost;
+
+    root /opt/opengnsys/oggui/browser;
+    index index.html;
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Manejo de archivos estáticos
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        try_files $uri =404;
+    }
+    ssl_certificate /opt/opengnsys/oggui/etc/nginx/certs/oggui.uds-test.net.crt.pem;
+    ssl_certificate_key /opt/opengnsys/oggui/etc/nginx/certs/oggui.uds-test.net.key.pem;
+    # Configuración para evitar problemas con rutas de Angular
+    error_page 404 /index.html;
+}

ogWebconsole/.env

@@ -1 +1,2 @@
-NG_APP_BASE_API_URL=https://127.0.0.1:8443
+# 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-US": "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",
@@ -48,13 +42,16 @@
                 "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,8 +63,8 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
+                  "maximumWarning": "7kb",
-                  "maximumError": "4kb"
+                  "maximumError": "10kb"
                 }
               ],
               "outputHashing": "all"
@@ -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",
+              "zone.js/testing"
-              "@angular/localize/init"
             ],
             "tsConfig": "tsconfig.spec.json",
             "assets": [
@@ -134,7 +108,8 @@
               "src/assets"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "src/custom-theme.scss"
             ],
             "scripts": []
           }

ogWebconsole/package-lock.json

@@ -24,6 +24,7 @@
         "jwt-decode": "^4.0.0",
         "ngx-joyride": "^2.5.0",
         "ngx-toastr": "^19.0.0",
+        "papaparse": "^5.4.1",
         "rxjs": "~7.8.0",
         "tslib": "^2.3.0",
         "zone.js": "^0.14.6"
@@ -35,6 +36,7 @@
         "@angular/localize": "^18.1.0",
         "@ngx-env/builder": "^18.0.1",
         "@types/jasmine": "~5.1.0",
+        "@types/papaparse": "^5.3.15",
         "jasmine-core": "~5.1.0",
         "karma": "~6.4.0",
         "karma-chrome-launcher": "~3.2.0",
@@ -5902,6 +5904,15 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/papaparse": {
+      "version": "5.3.15",
+      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.15.tgz",
+      "integrity": "sha512-JHe6vF6x/8Z85nCX4yFdDslN11d+1pr12E526X8WAfhadOeaOTx5AuIkvDKIBopfvlzpzkdMx4YyvSKCM9oqtw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/qs": {
       "version": "6.9.15",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
@@ -11955,6 +11966,11 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/papaparse": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz",
+      "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw=="
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",

ogWebconsole/package.json

@@ -26,6 +26,7 @@
     "jwt-decode": "^4.0.0",
     "ngx-joyride": "^2.5.0",
     "ngx-toastr": "^19.0.0",
+    "papaparse": "^5.4.1",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "^0.14.6"
@@ -37,6 +38,7 @@
     "@angular/localize": "^18.1.0",
     "@ngx-env/builder": "^18.0.1",
     "@types/jasmine": "~5.1.0",
+    "@types/papaparse": "^5.3.15",
     "jasmine-core": "~5.1.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",

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

@@ -13,14 +13,11 @@ import { PXEimagesComponent } from './components/ogboot/pxe-images/pxe-images.co
 import { PxeComponent } from './components/ogboot/pxe/pxe.component';
 import { PxeBootFilesComponent } from './components/ogboot/pxe-boot-files/pxe-boot-files.component';
 import {OgbootStatusComponent} from "./components/ogboot/ogboot-status/ogboot-status.component";
-import { OgdhcpComponent } from './components/ogdhcp/ogdhcp.component';
-import { OgDhcpSubnetsComponent } from './components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component';
 import { CalendarComponent } from "./components/calendar/calendar.component";
 import { CommandsComponent } from './components/commands/main-commands/commands.component';
 import { CommandsGroupsComponent } from './components/commands/commands-groups/commands-groups.component';
 import { CommandsTaskComponent } from './components/commands/commands-task/commands-task.component';
 import { TaskLogsComponent } from './components/commands/commands-task/task-logs/task-logs.component';
-import { StatusComponent } from "./components/ogdhcp/og-dhcp-subnets/status/status.component";
 import { ClientMainViewComponent } from './components/groups/components/client-main-view/client-main-view.component';
 import { ImagesComponent } from './components/images/images.component';
 import {SoftwareComponent} from "./components/software/software.component";
@@ -31,7 +28,7 @@ import {
 } from "./components/groups/components/client-main-view/partition-assistant/partition-assistant.component";
 import {RepositoriesComponent} from "./components/repositories/repositories.component";
 import {
-  CreateImageComponent
+  CreateClientImageComponent
 } from "./components/groups/components/client-main-view/create-image/create-image.component";
 import {
   DeployImageComponent
@@ -40,11 +37,15 @@ import {
   MainRepositoryViewComponent
 } from "./components/repositories/main-repository-view/main-repository-view.component";
 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,
-  path: '',
-  component: MainLayoutComponent,
     children: [
       { path: 'dashboard', component: DashboardComponent },
       { path: 'admin', component: AdminComponent },
@@ -56,7 +57,6 @@ const routes: Routes = [
       { path: 'pxe', component: PxeComponent },
       { path: 'pxe-boot-file', component: PxeBootFilesComponent },
       { path: 'ogboot-status', component: OgbootStatusComponent },
-    { path: 'dhcp', component: OgdhcpComponent },
       { path: 'subnets', component: OgDhcpSubnetsComponent },
       { path: 'ogdhcp-status', component: StatusComponent },
       { path: 'commands', component: CommandsComponent },
@@ -64,26 +64,27 @@ const routes: Routes = [
       { path: 'commands-task', component: CommandsTaskComponent },
       { path: 'commands-logs', component: TaskLogsComponent },
       { 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/partition-assistant', component: PartitionAssistantComponent },
+      { path: 'clients/:id/create-image', component: CreateClientImageComponent },
-    { path: 'clients/:id/create-image', component: CreateImageComponent },
-    { path: 'clients/:id/deploy-image', component: DeployImageComponent },
-    { path: 'images', component: ImagesComponent },
       { path: 'repositories', component: RepositoriesComponent },
       { path: 'repository/:id', component: MainRepositoryViewComponent },
       { path: 'software', component: SoftwareComponent },
       { path: 'software-profiles', component: SoftwareProfileComponent },
       { path: 'operative-systems', component: OperativeSystemComponent },
+      { path: 'menus', component: MenusComponent },
     ],
-},
+  },
-{
+  {
     path: 'auth',
     component: AuthLayoutComponent,
     children: [
       { path: 'login', component: LoginComponent },
     ],
-},
+  },
-{ path: '**', component: PageNotFoundComponent },
+  { path: '**', component: PageNotFoundComponent },
 ];
 
 @NgModule({

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

@@ -1,9 +1,11 @@
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core'; 
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
+  let translateService: TranslateService;
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
@@ -14,6 +16,8 @@ describe('AppComponent', () => {
         AppComponent
       ],
     }).compileComponents();
+
+    translateService = TestBed.inject(TranslateService);
   });
 
   it('should create the app', () => {
@@ -21,4 +25,42 @@ describe('AppComponent', () => {
     const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   });
+
+  it(`should have as title 'ogWebconsole'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app.title).toEqual('ogWebconsole');
+  });
+
+  it('should set the language from localStorage on creation', () => {
+    spyOn(localStorage, 'getItem').and.returnValue('en'); // Simula que el idioma guardado es "en"
+    spyOn(translateService, 'use');
+
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+
+    expect(localStorage.getItem).toHaveBeenCalledWith('language');
+    expect(translateService.use).toHaveBeenCalledWith('en');
+  });
+
+  it('should default to Spanish if no language is saved in localStorage', () => {
+    spyOn(localStorage, 'getItem').and.returnValue(null); // Simula que no hay idioma guardado
+    spyOn(translateService, 'use');
+
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+
+    expect(localStorage.getItem).toHaveBeenCalledWith('language');
+    expect(translateService.use).toHaveBeenCalledWith('es');
+  });
+
+  it('should set language to Spanish in sessionStorage on ngOnInit', () => {
+    spyOn(sessionStorage, 'setItem');
+
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+
+    app.ngOnInit();
+    expect(sessionStorage.setItem).toHaveBeenCalledWith('language', 'es');
+  });
 });

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';
@@ -25,6 +26,7 @@ import { MatListModule } from '@angular/material/list';
 import { UsersComponent } from './components/admin/users/users/users.component';
 import { RolesComponent } from './components/admin/roles/roles/roles.component';
 import { MatTableModule } from '@angular/material/table';
+import { MatButtonToggleModule } from '@angular/material/button-toggle';
 import { MatDialogModule } from '@angular/material/dialog';
 import { AddUserModalComponent } from './components/admin/users/users/add-user-modal/add-user-modal.component';
 import { MatSelectModule } from '@angular/material/select';
@@ -32,17 +34,14 @@ import { AddRoleModalComponent } from './components/admin/roles/roles/add-role-m
 import { ChangePasswordModalComponent } from './components/admin/users/users/change-password-modal/change-password-modal.component';
 import { GroupsComponent } from './components/groups/groups.component';
 import { MatDividerModule } from '@angular/material/divider';
-import { CreateOrganizationalUnitComponent } from './components/groups/shared/organizational-units/create-organizational-unit/create-organizational-unit.component';
 import { MatStepperModule } from '@angular/material/stepper';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { CreateClientComponent } from './components/groups/shared/clients/create-client/create-client.component';
 import { DeleteModalComponent } from './shared/delete_modal/delete-modal/delete-modal.component';
-import { EditOrganizationalUnitComponent } from './components/groups/shared/organizational-units/edit-organizational-unit/edit-organizational-unit.component';
-import { EditClientComponent } from './components/groups/shared/clients/edit-client/edit-client.component';
 import { ClassroomViewComponent } from './components/groups/shared/classroom-view/classroom-view.component';
 import { MatProgressSpinner } from "@angular/material/progress-spinner";
+import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatMenu, MatMenuItem, MatMenuTrigger } from "@angular/material/menu";
-import {MatAutocomplete, MatAutocompleteTrigger} from "@angular/material/autocomplete";
+import { MatAutocomplete, MatAutocompleteTrigger } from "@angular/material/autocomplete";
 import { MatChip, MatChipListbox, MatChipOption, MatChipSet, MatChipsModule } from "@angular/material/chips";
 import { ClientViewComponent } from './components/groups/shared/client-view/client-view.component';
 import { MatTab, MatTabGroup } from "@angular/material/tabs";
@@ -52,7 +51,6 @@ import { DragDropModule } from '@angular/cdk/drag-drop';
 import { ToastrModule } from 'ngx-toastr';
 import { ShowOrganizationalUnitComponent } from './components/groups/shared/organizational-units/show-organizational-unit/show-organizational-unit.component';
 import { MatGridList, MatGridTile } from "@angular/material/grid-list";
-import { TreeViewComponent } from './components/groups/shared/tree-view/tree-view.component';
 import {
   MatNestedTreeNode,
   MatTree,
@@ -65,7 +63,6 @@ import { LegendComponent } from './components/groups/shared/legend/legend.compon
 import { ClassroomViewDialogComponent } from './components/groups/shared/classroom-view/classroom-view-modal';
 import { MatPaginator } from "@angular/material/paginator";
 import { SaveFiltersDialogComponent } from './components/groups/shared/save-filters-dialog/save-filters-dialog.component';
-import { AcctionsModalComponent } from './components/groups/shared/acctions-modal/acctions-modal.component';
 import { PXEimagesComponent } from './components/ogboot/pxe-images/pxe-images.component';
 import { CreatePXEImageComponent } from './components/ogboot/pxe-images/create-image/create-image/create-image.component';
 import { InfoImageComponent } from './components/ogboot/pxe-images/info-image/info-image/info-image.component';
@@ -74,12 +71,7 @@ import { CreatePxeTemplateComponent } from './components/ogboot/pxe/create-pxeTe
 import { PxeBootFilesComponent } from './components/ogboot/pxe-boot-files/pxe-boot-files.component';
 import { MatExpansionPanel, MatExpansionPanelDescription, MatExpansionPanelTitle } from "@angular/material/expansion";
 import { OgbootStatusComponent } from './components/ogboot/ogboot-status/ogboot-status.component';
-import { CreatePxeBootFileComponent } from './components/ogboot/pxe-boot-files/create-pxeBootFile/create-pxe-boot-file/create-pxe-boot-file.component';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
-import { OgdhcpComponent } from './components/ogdhcp/ogdhcp.component';
-import { OgDhcpSubnetsComponent } from './components/ogdhcp/og-dhcp-subnets/og-dhcp-subnets.component';
-import { CreateSubnetComponent } from './components/ogdhcp/og-dhcp-subnets/create-subnet/create-subnet.component';
-import { AddClientsToSubnetComponent } from './components/ogdhcp/og-dhcp-subnets/add-clients-to-subnet/add-clients-to-subnet.component';
 import { CommandsComponent } from './components/commands/main-commands/commands.component';
 import { CommandDetailComponent } from './components/commands/main-commands/detail-command/command-detail.component';
 import { CreateCommandComponent } from './components/commands/main-commands/create-command/create-command.component';
@@ -87,7 +79,7 @@ import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatNativeDateModule } from '@angular/material/core';
 import { CalendarComponent } from './components/calendar/calendar.component';
 import { CreateCalendarComponent } from './components/calendar/create-calendar/create-calendar.component';
-import {MatRadioButton, MatRadioGroup} from "@angular/material/radio";
+import { MatRadioButton, MatRadioGroup } from "@angular/material/radio";
 import { CreateCalendarRuleComponent } from './components/calendar/create-calendar-rule/create-calendar-rule.component';
 import { CommandsGroupsComponent } from './components/commands/commands-groups/commands-groups.component';
 import { CommandsTaskComponent } from './components/commands/commands-task/commands-task.component';
@@ -95,16 +87,12 @@ import { CreateCommandGroupComponent } from './components/commands/commands-grou
 import { DetailCommandGroupComponent } from './components/commands/commands-groups/detail-command-group/detail-command-group.component';
 import { CreateTaskComponent } from './components/commands/commands-task/create-task/create-task.component';
 import { DetailTaskComponent } from './components/commands/commands-task/detail-task/detail-task.component';
-import { ClientTabViewComponent } from './components/groups/components/client-tab-view/client-tab-view.component';
-import { AdvancedSearchComponent } from './components/groups/components/advanced-search/advanced-search.component';
 import { TaskLogsComponent } from './components/commands/commands-task/task-logs/task-logs.component';
-import { OrganizationalUnitTabViewComponent } from './components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component';
+import { MatSliderModule } from '@angular/material/slider';
-import { ServerInfoDialogComponent } from './components/ogdhcp/og-dhcp-subnets/server-info-dialog/server-info-dialog.component';
-import { StatusComponent } from './components/ogdhcp/og-dhcp-subnets/status/status.component';
-import {MatSliderModule} from '@angular/material/slider';
 import { ClientMainViewComponent } from './components/groups/components/client-main-view/client-main-view.component';
 import { ImagesComponent } from './components/images/images.component';
 import { CreateImageComponent } from './components/images/create-image/create-image.component';
+import { CreateClientImageComponent } from './components/groups/components/client-main-view/create-image/create-image.component';
 import { PartitionAssistantComponent } from './components/groups/components/client-main-view/partition-assistant/partition-assistant.component';
 import { SoftwareComponent } from './components/software/software.component';
 import { CreateSoftwareComponent } from './components/software/create-software/create-software.component';
@@ -113,10 +101,8 @@ import { CreateSoftwareProfileComponent } from './components/software-profile/cr
 import { OperativeSystemComponent } from './components/operative-system/operative-system.component';
 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 { AddClientsToPxeComponent } from './components/ogboot/pxe/add-clients-to-pxe/add-clients-to-pxe.component';
-import { ClientsComponent } from './components/ogboot/pxe/clients/clients.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';
@@ -125,11 +111,49 @@ import { JoyrideModule } from 'ngx-joyride';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { EnvVarsComponent } from './components/admin/env-vars/env-vars.component';
+import { MatSortModule } from '@angular/material/sort';
+import { MenusComponent } from './components/menus/menus.component';
+import { CreateMenuComponent } from './components/menus/create-menu/create-menu.component';
+import { CreateMultipleClientComponent } from './components/groups/shared/clients/create-multiple-client/create-multiple-client.component';
+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 { 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';
+import { ServerInfoDialogComponent } from "./components/ogdhcp/server-info-dialog/server-info-dialog.component";
+import { StatusComponent } from "./components/ogdhcp/status/status.component";
+import { OgDhcpSubnetsComponent } from "./components/ogdhcp/og-dhcp-subnets.component";
+import { CreateSubnetComponent } from "./components/ogdhcp/create-subnet/create-subnet.component";
+import { AddClientsToSubnetComponent } from "./components/ogdhcp/add-clients-to-subnet/add-clients-to-subnet.component";
+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,
@@ -146,19 +170,14 @@ export function HttpLoaderFactory(http: HttpClient) {
     AddRoleModalComponent,
     ChangePasswordModalComponent,
     GroupsComponent,
-    CreateOrganizationalUnitComponent,
+    ManageClientComponent,
-    CreateClientComponent,
     DeleteModalComponent,
-    EditOrganizationalUnitComponent,
-    EditClientComponent,
     ClassroomViewComponent,
     ClientViewComponent,
     ShowOrganizationalUnitComponent,
-    TreeViewComponent,
     LegendComponent,
     ClassroomViewDialogComponent,
     SaveFiltersDialogComponent,
-    AcctionsModalComponent,
     PXEimagesComponent,
     CreatePXEImageComponent,
     InfoImageComponent,
@@ -166,8 +185,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     CreatePxeTemplateComponent,
     PxeBootFilesComponent,
     OgbootStatusComponent,
-    CreatePxeBootFileComponent,
-    OgdhcpComponent,
     OgDhcpSubnetsComponent,
     CreateSubnetComponent,
     AddClientsToSubnetComponent,
@@ -176,6 +193,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     CreateCommandComponent,
     CalendarComponent,
     CreateCalendarComponent,
+    CreateClientImageComponent,
     CreateCalendarRuleComponent,
     CommandsGroupsComponent,
     CommandsTaskComponent,
@@ -183,10 +201,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     DetailCommandGroupComponent,
     CreateTaskComponent,
     DetailTaskComponent,
-    ClientTabViewComponent,
-    AdvancedSearchComponent,
     TaskLogsComponent,
-    OrganizationalUnitTabViewComponent,
     ServerInfoDialogComponent,
     StatusComponent,
     ClientMainViewComponent,
@@ -200,16 +215,35 @@ export function HttpLoaderFactory(http: HttpClient) {
     OperativeSystemComponent,
     CreateOperativeSystemComponent,
     ShowTemplateContentComponent,
-    AddClientsToPxeComponent,
-    ClientsComponent,
     RepositoriesComponent,
-    CreateRepositoryComponent,
+    ManageRepositoryComponent,
     ExecuteCommandComponent,
     ExecuteCommandOuComponent,
     DeployImageComponent,
     MainRepositoryViewComponent,
     ExecuteCommandOuComponent,
     EnvVarsComponent,
+    MenusComponent,
+    CreateMenuComponent,
+    CreateMultipleClientComponent,
+    ExportImageComponent,
+    ImportImageComponent,
+    LoadingComponent,
+    InputDialogComponent,
+    ManageOrganizationalUnitComponent,
+    BackupImageComponent,
+    ShowClientsComponent,
+    OperationResultDialogComponent,
+    ConvertImageComponent,
+    GlobalStatusComponent,
+    ShowMonoliticImagesComponent,
+    StatusTabComponent,
+    ConvertImageToVirtualComponent,
+    RunScriptAssistantComponent,
+    SaveScriptComponent,
+    EditImageComponent,
+    ShowGitImagesComponent,
+    RenameImageComponent
   ],
   bootstrap: [AppComponent],
   imports: [BrowserModule,
@@ -218,6 +252,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     ReactiveFormsModule,
     MatToolbarModule,
     MatIconModule,
+    MatButtonToggleModule,
     MatButtonModule,
     MatSidenavModule,
     NoopAnimationsModule,
@@ -230,6 +265,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     MatDialogModule,
     MatSelectModule,
     MatDividerModule,
+    MatProgressBarModule,
     MatStepperModule,
     DragDropModule,
     MatSlideToggleModule, MatMenu, MatMenuTrigger, MatMenuItem, MatAutocomplete, MatChipListbox, MatChipOption, MatChipSet, MatChipsModule, MatChip, MatProgressSpinner, MatTabGroup, MatTab, MatTooltip,
@@ -238,6 +274,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     MatDatepickerModule,
     MatNativeDateModule,
     MatSliderModule,
+    MatSortModule,
     TranslateModule.forRoot({
       loader: {
         provide: TranslateLoader,
@@ -266,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/admin.component.css

@@ -14,16 +14,6 @@
   margin: 0 10px;
 }
 
-/* Estilos de los botones */
-button {
-  height: 150px;
-  width: 150px;
-  margin: 5px;
-  padding: 5px;
-  cursor: pointer;
-  transition: all 0.3s;
-}
-
 /* Estilos del texto debajo de los botones */
 span{
   margin: 0;

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

@@ -1,9 +1,9 @@
 <div class="container">
-  <button mat-fab color="primary" class="fab-button" routerLink="/users">
+  <button class="action-button" routerLink="/users">
     <mat-icon>group</mat-icon>
     <span>{{ 'labelUsers' | translate }}</span>
   </button>
-  <button mat-fab color="primary" class="fab-button" routerLink="/user-groups">
+  <button class="action-button" routerLink="/user-groups">
     <mat-icon>admin_panel_settings</mat-icon>
     <span>{{ 'labelRoles' | translate }}</span>
   </button>

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

@@ -4,10 +4,12 @@ import { AdminComponent } from './admin.component';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { TranslateModule } from '@ngx-translate/core';
+import { Router } from '@angular/router';
 
 describe('AdminComponent', () => {
   let component: AdminComponent;
   let fixture: ComponentFixture<AdminComponent>;
+  let router: Router;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -19,6 +21,8 @@ describe('AdminComponent', () => {
         TranslateModule.forRoot()
       ]
     }).compileComponents();
+
+    router = TestBed.inject(Router);
   });
 
   beforeEach(() => {
@@ -30,4 +34,15 @@ describe('AdminComponent', () => {
   it('debería crear el componente', () => {
     expect(component).toBeTruthy();
   });
+
+  it('debería renderizar dos botones', () => {
+    const buttons = fixture.nativeElement.querySelectorAll('button');
+    expect(buttons.length).toBe(2);
+  });
+
+  it('debería tener un botón con routerLink a "/users"', () => {
+    const button = fixture.nativeElement.querySelector('button[routerLink="/users"]');
+    expect(button).toBeTruthy();
+    expect(button.querySelector('mat-icon').textContent.trim()).toBe('group');
+  });
 });

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

@@ -1,9 +1,5 @@
 .env-settings {
-  padding: 16px;
+  padding: 0rem 1rem 0rem 1rem;
-
-  h1 {
-    margin-bottom: 16px;
-  }
 
   .mat-table {
     margin-bottom: 16px;
@@ -19,10 +15,6 @@
     gap: 16px;
     justify-content: flex-end;
     margin-top: 16px;
-
-    button {
-      min-width: 120px;
-    }
   }
 }
 

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

@@ -1,5 +1,9 @@
 <div class="env-settings">
-  <h1>Editar Variables de Entorno</h1>
+  <div class="header-container">
+    <div class="header-container-title">
+      <h2>Editar Variables de Entorno</h2>
+    </div>
+  </div>
 
   <mat-table [dataSource]="envVars" class="mat-elevation-z8">
     <!-- Nombre de la variable -->
@@ -22,8 +26,8 @@
     <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
   </mat-table>
 
-  <div class="actions" >
+  <div class="actions">
-    <button mat-raised-button color="primary" (click)="saveEnvVars()">Guardar Cambios</button>
+    <button class="action-button" (click)="loadEnvVars()">Recargar</button>
-    <button mat-raised-button color="accent" (click)="loadEnvVars()">Recargar</button>
+    <button class="submit-button" (click)="saveEnvVars()">Guardar Cambios</button>
   </div>
 </div>

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

@@ -13,12 +13,17 @@ 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],
       imports: [
@@ -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 { HttpClient } from "@angular/common/http";
-import {ToastrService} from "ngx-toastr";
+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: string;
-  private apiUrl = `${this.baseUrl}/env-vars`;
 
   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.css

@@ -1,7 +1,9 @@
 .full-width {
   width: 100%;
 }
+
 .form-container {
+  margin-top: 2em;
   padding: 40px;
 }
 
@@ -22,9 +24,17 @@
 
 .time-fields {
   display: flex;
-  gap: 15px; /* Espacio entre los campos */
+  gap: 15px;
+  /* Espacio entre los campos */
 }
 
 .time-field {
   flex: 1;
 }
+
+.action-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
+}

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

@@ -16,7 +16,7 @@
     </section>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions class="action-container">
-  <button mat-button (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
+  <button class="ordinary-button" (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
-  <button mat-button (click)="onSubmit()">{{ 'buttonAdd' | translate }}</button>
+  <button class="submit-button" (click)="onSubmit()">{{ 'buttonAdd' | translate }}</button>
 </mat-dialog-actions>

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;
+  baseUrl: string;
-  private apiUrl = `${this.baseUrl}/user-groups?page=1&itemsPerPage=1000`;
+  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.css

@@ -1,6 +1,19 @@
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
+}
+
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container {
@@ -8,14 +21,10 @@ table {
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
+  margin: 1.5rem 0rem 1.5rem 0rem;
   box-sizing: border-box;
 }
 
-.divider {
-  margin: 20px 0;
-}
-
 .search-string {
   flex: 2;
   padding: 5px;
@@ -26,15 +35,8 @@ table {
   padding: 5px;
 }
 
-.header-container {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px;
-}
-
 .mat-elevation-z8 {
-  box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2);
 }
 
 .paginator-container {
@@ -42,4 +44,3 @@ table {
   justify-content: end;
   margin-bottom: 30px;
 }
-

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

@@ -1,24 +1,25 @@
 <div class="header-container">
-  <h2 class="title">{{ 'adminRolesTitle' | translate }}</h2>
+  <div class="header-container-title">
+    <h2>{{ 'adminRolesTitle' | translate }}</h2>
+  </div>
   <div class="images-button-row">
-    <button mat-flat-button color="primary" (click)="addUser()">
+    <button class="action-button" (click)="addUser()">
       {{ 'addRole' | translate }}
     </button>
   </div>
 </div>
-<mat-divider class="divider"></mat-divider>
+
 <div class="search-container">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchRoleLabel' | translate }}</mat-label>
-    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
+    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']"
+      (keyup.enter)="search()">
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
 </div>
 
-<div *ngIf="loading" class="loading-container">
+<app-loading [isLoading]="loading"></app-loading>
-  <mat-spinner></mat-spinner>
-</div>
 
 <div *ngIf="!loading">
   <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
@@ -33,7 +34,8 @@
         <button mat-icon-button color="primary" (click)="editRole(role)">
           <mat-icon>edit</mat-icon>
         </button>
-        <button mat-icon-button color="warn" (click)="deleteRole(role)" [disabled]="role.permissions.includes('ROLE_SUPER_ADMIN')">
+        <button mat-icon-button color="warn" (click)="deleteRole(role)"
+          [disabled]="role.permissions.includes('ROLE_SUPER_ADMIN')">
           <mat-icon>delete</mat-icon>
         </button>
       </td>
@@ -44,10 +46,7 @@
 </div>
 
 <div class="paginator-container">
-  <mat-paginator [length]="length"
+  <mat-paginator [length]="length" [pageSize]="itemsPerPage" [pageIndex]="page" [pageSizeOptions]="pageSizeOptions"
-                 [pageSize]="itemsPerPage"
-                 [pageIndex]="page"
-                 [pageSizeOptions]="pageSizeOptions"
     (page)="onPageChange($event)">
   </mat-paginator>
 </div>

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';
@@ -12,6 +12,7 @@ import { MatIcon } from '@angular/material/icon';
 import { MatHint } from '@angular/material/form-field';
 import { MatPaginator } from '@angular/material/paginator';
 import { TranslateModule } from '@ngx-translate/core';
+import { LoadingComponent } from '../../../../shared/loading/loading.component';
 describe('RolesComponent', () => {
   let component: RolesComponent;
   let fixture: ComponentFixture<RolesComponent>;
@@ -19,22 +20,25 @@ 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],
+      declarations: [RolesComponent, LoadingComponent],
       imports: [MatDivider, MatFormField, MatLabel, MatIcon, MatHint, MatPaginator,
         TranslateModule.forRoot()],
       providers: [
         { 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();
   });
@@ -46,9 +50,24 @@ 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', () => {
     expect(component).toBeTruthy();
   });
+  
+  it('should have a default itemsPerPage value', () => {
+    expect(component.itemsPerPage).toBeDefined();
+  });
+
+  it('should initialize the dataSource', () => {
+    expect(component.dataSource).toBeDefined();
+  });
+
+  it('should have a defined columns array', () => {
+    expect(component.columns).toBeDefined();
+    expect(component.columns.length).toBeGreaterThan(0);
+  });
+  
 });

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.css

@@ -1,30 +1,12 @@
-.full-width {
+.user-form {
-  width: 100%;
-}
-.form-container {
-  padding: 40px;
-}
-
-.form-group {
-  margin-top: 20px;
-  margin-bottom: 26px;
-}
-
-.full-width {
-  width: 100%;
-  margin-bottom: 16px;
-}
-
-.checkbox-group  {
-  margin: 15px 0;
-  align-items: flex-start;
-}
-
-.time-fields {
   display: flex;
-  gap: 15px; /* Espacio entre los campos */
+  flex-direction: column;
+  margin-top: 2rem;
 }
 
-.time-field {
+.action-container {
-  flex: 1;
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
 }

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

@@ -1,4 +1,6 @@
-<h1 mat-dialog-title>{{ 'dialogTitleAddUser' | translate }}</h1>
+<app-loading [isLoading]="loading"></app-loading>
+
+<h1 mat-dialog-title>{{ isEditMode ? ('dialogTitleEditUser' | translate) : ('dialogTitleAddUser' | translate) }}</h1>
 <mat-dialog-content class="form-container">
   <form [formGroup]="userForm" class="user-form">
     <mat-form-field appearance="fill" class="full-width">
@@ -27,9 +29,18 @@
         </mat-option>
       </mat-select>
     </mat-form-field>
+
+    <mat-form-field appearance="fill" class="full-width">
+      <mat-label>Vista tarjetas</mat-label>
+      <mat-select formControlName="groupsView" required>
+        <mat-option *ngFor="let option of views" [value]="option.value">
+          {{ option.name }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions class="action-container">
-  <button mat-button (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
+  <button class="ordinary-button" (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
-  <button mat-button (click)="onSubmit()">{{ 'buttonAdd' | translate }}</button>
+  <button class="submit-button" (click)="onSubmit()" [disabled]="userForm.invalid">{{ isEditMode ? ('buttonEdit' | translate) : ('buttonAdd' | translate) }}</button>
 </mat-dialog-actions>

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

@@ -1,9 +1,10 @@
 import { Component, EventEmitter, Inject, OnInit, Output } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import {ToastrService} from "ngx-toastr";
+import { ToastrService } from "ngx-toastr";
-import {HttpClient} from "@angular/common/http";
+import { HttpClient } from "@angular/common/http";
-import {DataService} from "../data.service";
+import { DataService } from "../data.service";
+import { ConfigService } from '@services/config.service';
 
 interface UserGroup {
   '@id': string;
@@ -17,12 +18,20 @@ 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>;
   userGroups: UserGroup[] = [];
   organizationalUnits: any[] = [];
   userId: string | null = null;
+  loading: boolean = false;
+  isEditMode: boolean = false;
+
+  protected views = [
+    { value: 'card', name: 'Tarjetas' },
+    { value: 'list', name: 'Listado' },
+  ];
 
   constructor(
     public dialogRef: MatDialogRef<AddUserModalComponent>,
@@ -30,46 +39,60 @@ 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],
       role: ['', Validators.required],
+      groupsView: ['card', Validators.required],
       organizationalUnits: [[]]
     });
+
+    if (data) {
+      this.isEditMode = true;
+    }
   }
 
   ngOnInit(): void {
     this.dataService.getUserGroups().subscribe((data) => {
       this.userGroups = data['hydra:member'];
     });
+
     this.dataService.getOrganizationalUnits().subscribe((data) => {
       this.organizationalUnits = data['hydra:member'].filter((item: any) => item.type === 'organizational-unit');
     });
+
     if (this.data) {
-      this.load()
+      this.load();
+    } else {
+      this.userForm.get('password')?.setValidators([Validators.required]);
     }
   }
 
   load(): void {
+    this.loading = true;
     this.dataService.getUser(this.data).subscribe({
       next: (response) => {
-        console.log(response);
-
         const organizationalUnitIds = response.allowedOrganizationalUnits.map((unit: any) => unit['@id']);
 
-        // Patch the values to the form
         this.userForm.patchValue({
           username: response.username,
-          role: response.userGroups[0]['@id'],
+          role: response.userGroups.length > 0 ? response.userGroups[0]['@id'] : null,
-          organizationalUnits: organizationalUnitIds
+          organizationalUnits: organizationalUnitIds,
+          groupsView: response.groupsView
         });
 
         this.userId = response['@id'];
+        this.userForm.get('password')?.clearValidators();
+        this.userForm.get('password')?.updateValueAndValidity();
+        this.loading = false;
       },
       error: (err) => {
-        console.error('Error fetching remote calendar:', err);
+        this.loading = false;
+        console.error('Error fetching user:', err);
       }
     });
   }
@@ -80,34 +103,46 @@ export class AddUserModalComponent implements OnInit {
 
   onSubmit(): void {
     if (this.userForm.valid) {
-      const payload = {
+      const payload: any = {
         username: this.userForm.value.username,
-        allowedOrganizationalUnits: this.userForm.value.organizationalUnit,
+        allowedOrganizationalUnits: this.userForm.value.organizationalUnits,
-        password: this.userForm.value.password,
         enabled: true,
-        userGroups: [this.userForm.value.role ]
+        userGroups: [this.userForm.value.role],
+        groupsView: this.userForm.value.groupsView
       };
 
+      if (!this.userId && this.userForm.value.password) {
+        payload.password = this.userForm.value.password;
+      } else if (this.userId && this.userForm.value.password.trim() !== '') {
+        payload.password = this.userForm.value.password;
+      }
+
+      this.loading = true;
+
       if (this.userId) {
         this.http.put(`${this.baseUrl}${this.userId}`, payload).subscribe(
           (response) => {
             this.toastService.success('Usuario editado correctamente');
+            this.userEdited.emit();
             this.dialogRef.close();
+            this.loading = false;
           },
           (error) => {
             this.toastService.error(error['error']['hydra:description']);
-            console.error('Error al editar el rol', error);
+            this.loading = false;
           }
         );
       } else {
         this.http.post(`${this.baseUrl}/users`, payload).subscribe(
           (response) => {
             this.toastService.success('Usuario añadido correctamente');
+            this.userAdded.emit();
             this.dialogRef.close();
+            this.loading = false;
           },
           (error) => {
             this.toastService.error(error['error']['hydra:description']);
-            console.error('Error al añadir añadido', error);
+            this.loading = false;
           }
         );
       }

ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.css

@@ -1,6 +1,5 @@
 .user-form .form-field {
   display: block;
-    margin-bottom: 10px;
 }
 
 .checkbox-group label {
@@ -17,3 +16,14 @@ mat-spinner {
   margin: 0 auto;
   align-self: center;
 }
+
+.action-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
+}
+
+.form-container {
+  margin-top: 2em;
+}

ogWebconsole/src/app/components/admin/users/users/change-password-modal/change-password-modal.component.html

@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>{{ 'dialogTitleEditUser' | translate }}</h1>
+<h1 mat-dialog-title>{{ 'dialogTitleChangePassword' | translate }}</h1>
 <mat-dialog-content class="form-container">
   <form [formGroup]="userForm" class="user-form">
     <mat-form-field class="form-field">
@@ -23,7 +23,7 @@
     </div>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions class="action-container">
-  <button mat-button (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
+  <button class="ordinary-button" (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
-  <button mat-button (click)="onSubmit()" [disabled]="loading">{{ 'buttonEdit' | translate }}</button>
+  <button class="submit-button" (click)="onSubmit()" [disabled]="loading">{{ 'buttonEdit' | translate }}</button>
 </mat-dialog-actions>

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;
+  baseUrl: string;
-  private apiUrl = `${this.baseUrl}/users?page=1&itemsPerPage=1000`;
+  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.css

@@ -1,6 +1,19 @@
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
+}
+
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container  {
@@ -8,14 +21,10 @@ table {
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
+  margin: 1.5rem 0rem 1.5rem 0rem;
   box-sizing: border-box;
 }
 
-.divider {
-  margin: 20px 0;
-}
-
 .search-string {
   flex: 2;
   padding: 5px;
@@ -26,13 +35,6 @@ table {
   padding: 5px;
 }
 
-.header-container {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px;
-}
-
 .mat-elevation-z8 {
   box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
 }

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

@@ -1,30 +1,40 @@
 <div class="header-container">
-  <h2 class="title">{{ 'adminImagesTitle' | translate }}</h2>
+  <div class="header-container-title">
+    <h2>{{ 'adminUsersTitle' | translate }}</h2>
+  </div>
   <div class="images-button-row">
-    <button mat-flat-button color="primary" (click)="addUser()">
+    <button class="action-button" (click)="addUser()">
       {{ 'addUser' | translate }}
     </button>
   </div>
 </div>
-<mat-divider class="divider"></mat-divider>
+
 <div class="search-container">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchLabel' | translate }}</mat-label>
-    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
+    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']"
+      (keyup.enter)="search()">
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
 </div>
 
-<div *ngIf="loading" class="loading-container">
+<app-loading [isLoading]="loading"></app-loading>
-  <mat-spinner></mat-spinner>
-</div>
 
 <div *ngIf="!loading">
   <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 user"> {{ column.cell(user) }} </td>
+      <td mat-cell *matCellDef="let user">
+        <ng-container *ngIf="column.columnDef === 'groupsView'">
+          <mat-chip>
+            {{ user[column.columnDef] === 'card' ? 'Vista tarjetas' : 'Listado' }}
+          </mat-chip>
+        </ng-container>
+        <ng-container *ngIf="column.columnDef !== 'groupsView'">
+          {{ column.cell(user) }}
+        </ng-container>
+      </td>
     </ng-container>
 
     <ng-container matColumnDef="actions">
@@ -44,10 +54,7 @@
 </div>
 
 <div class="paginator-container">
-  <mat-paginator [length]="length"
+  <mat-paginator [length]="length" [pageSize]="itemsPerPage" [pageIndex]="page" [pageSizeOptions]="pageSizeOptions"
-                 [pageSize]="itemsPerPage"
-                 [pageIndex]="page"
-                 [pageSizeOptions]="pageSizeOptions"
     (page)="onPageChange($event)">
   </mat-paginator>
 </div>

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

@@ -7,16 +7,11 @@ 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 MockUserService {
+class MockToastrService {
-  getUsers() {
+  success() {}
-    return of({
+  error() {}
-      'hydra:member': [
-        { id: 1, username: 'user1', allowedOrganizationalUnits: [], roles: ['admin'] },
-        { id: 2, username: 'user2', allowedOrganizationalUnits: [], roles: ['user'] }
-      ]
-    });
-  }
 }
 
 describe('UsersComponent', () => {
@@ -24,21 +19,25 @@ 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: [
         MatTableModule,
         MatDialogModule,
         HttpClientTestingModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       providers: [
-        { useClass: MockUserService },
+        { provide: ToastrService, useClass: MockToastrService },
-        { provide: ToastrService, useValue: { success: () => {} } }, 
+        { provide: ConfigService, useValue: mockConfigService }
       ],
-      schemas: [NO_ERRORS_SCHEMA], 
+      schemas: [NO_ERRORS_SCHEMA], // Ignorar elementos desconocidos
-    })
+    }).compileComponents();
-    .compileComponents();
 
     fixture = TestBed.createComponent(UsersComponent);
     component = fixture.componentInstance;
@@ -49,4 +48,27 @@ describe('UsersComponent', () => {
     expect(component).toBeTruthy();
   });
 
+  it('should have default values for pagination', () => {
+    expect(component.itemsPerPage).toBe(10);
+    expect(component.page).toBe(0);
+    expect(component.pageSizeOptions).toEqual([5, 10, 20, 40, 100]);
+  });
+
+  it('should call search on init', () => {
+    spyOn(component, 'search');
+    component.ngOnInit();
+    expect(component.search).toHaveBeenCalled();
+  });
+
+  it('should initialize the dataSource', () => {
+    expect(component.dataSource).toBeDefined();
+  });
+
+  it('should define displayedColumns', () => {
+    expect(component.displayedColumns).toBeDefined();
+    expect(component.displayedColumns).toContain('id');
+    expect(component.displayedColumns).toContain('username');
+    expect(component.displayedColumns).toContain('roles');
+    expect(component.displayedColumns).toContain('actions');
+  });
 });

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;
@@ -32,6 +33,11 @@ export class UsersComponent implements OnInit {
       header: 'Nombre de Usuario',
       cell: (user: any) => `${user.username}`
     },
+    {
+      columnDef: 'groupsView',
+      header: 'Vista de Grupos',
+      cell: (user: any) => `${user.groupsView}`
+    },
     {
       columnDef: 'allowedOrganizationalUnits',
       header: 'Unidades Organizacionales Permitidas',
@@ -45,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();
@@ -87,6 +94,10 @@ export class UsersComponent implements OnInit {
       data: user['@id']
     });
 
+    dialogRef.componentInstance.userEdited.subscribe(() => {
+      this.search();
+    });
+
     dialogRef.afterClosed().subscribe(result => {
       if (result) {
         this.search();

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

@@ -1,15 +1,20 @@
-.title {
+.header-container {
-  font-size: 24px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
 }
 
 .calendar-button-row {
   display: flex;
-  justify-content: flex-start;
+  gap: 15px;
-  margin-top: 16px;
-}
-
-.divider {
-  margin: 20px 0;
 }
 
 .lists-container {
@@ -23,7 +28,6 @@
 
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container {
@@ -31,7 +35,7 @@ table {
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
+  margin: 1.5rem 0rem 1.5rem 0rem;
   box-sizing: border-box;
 }
 
@@ -45,15 +49,8 @@ table {
   padding: 5px;
 }
 
-.header-container {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px;
-}
-
 .mat-elevation-z8 {
-  box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2);
 }
 
 .paginator-container {

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

@@ -2,30 +2,33 @@
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
-  <h2 joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}" class="title">{{ 'adminCalendarsTitle' | translate }}</h2>
+  <div class="header-container-title">
+    <h2 joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCalendarsTitle' | translate }}</h2>
+  </div>
   <div class="calendar-button-row">
-    <button joyrideStep="addButtonStep" text="{{ 'addButtonStepText' | translate }}" mat-flat-button color="primary" (click)="addImage()">
+    <button joyrideStep="addButtonStep" text="{{ 'addButtonStepText' | translate }}" class="action-button"
+      (click)="addCalendar()">
       {{ 'addCalendar' | translate }}
     </button>
   </div>
 </div>
-<mat-divider class="divider"></mat-divider>
 
 <div class="search-container">
-  <mat-form-field joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}" appearance="fill" class="search-string">
+  <mat-form-field joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}" appearance="fill"
+    class="search-string">
     <mat-label>{{ 'searchCalendarLabel' | translate }}</mat-label>
-    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
+    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']"
+      (keyup.enter)="search()">
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
 </div>
 
-<div *ngIf="loading" class="loading-container">
+<app-loading [isLoading]="loading"></app-loading>
-  <mat-spinner></mat-spinner>
-</div>
 
 <div *ngIf="!loading">
-  <table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableStepText' | translate }}">
+  <table mat-table [dataSource]="dataSource" class="mat-elevation-z8" joyrideStep="tableStep"
+    text="{{ 'tableStepText' | translate }}">
     <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
       <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
       <td mat-cell *matCellDef="let image">
@@ -34,7 +37,8 @@
             {{ image[column.columnDef] ? 'check_circle' : 'cancel' }}
           </mat-icon>
         </ng-container>
-        <ng-container *ngIf="column.columnDef !== 'isDefault' && column.columnDef !== 'installed' && column.columnDef !== 'downloadUrl'">
+        <ng-container
+          *ngIf="column.columnDef !== 'isDefault' && column.columnDef !== 'installed' && column.columnDef !== 'downloadUrl'">
           {{ column.cell(image) }}
         </ng-container>
       </td>
@@ -50,7 +54,7 @@
           <mat-icon>sync</mat-icon>
         </button>
         <button *ngIf="syncUds" mat-icon-button color="primary">
-          <mat-spinner diameter="24"></mat-spinner>
+          <app-loading [isLoading]="syncUds"></app-loading>
         </button>
         <button mat-icon-button color="warn" (click)="deleteCalendar(calendar)">
           <mat-icon>delete</mat-icon>
@@ -64,10 +68,7 @@
 </div>
 
 <div class="paginator-container">
-  <mat-paginator [length]="length"
+  <mat-paginator [length]="length" [pageSize]="itemsPerPage" [pageIndex]="page" [pageSizeOptions]="pageSizeOptions"
-                 [pageSize]="itemsPerPage"
-                 [pageIndex]="page"
-                 [pageSizeOptions]="pageSizeOptions"
     (page)="onPageChange($event)">
   </mat-paginator>
 </div>

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

@@ -15,14 +15,21 @@ import { CalendarComponent } from './calendar.component';
 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],
+      declarations: [CalendarComponent, LoadingComponent],
       imports: [
         HttpClientTestingModule,
         ToastrModule.forRoot(),
@@ -40,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,21 +54,24 @@ 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();
   }
 
-  addImage(): void {
+  addCalendar(): void {
     const dialogRef = this.dialog.open(CreateCalendarComponent, {
       width: '400px'
     });

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

@@ -28,3 +28,10 @@
 .time-field {
   flex: 1;
 }
+
+.action-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
+}

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

@@ -56,10 +56,10 @@
   </div>
 </mat-dialog-content>
 
-<mat-dialog-actions align="end">
+<mat-dialog-actions class="action-container">
-  <button mat-button (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
+  <button class="ordinary-button" (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
   <button
-    mat-button
+    class="submit-button"
     (click)="submitRule()"
     cdkFocusInitial
     [disabled]="(!isRemoteAvailable && (!busyFromHour || !busyToHour)) || (isRemoteAvailable && (!availableReason || !availableFromDate || !availableToDate))">

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

@@ -1,7 +1,8 @@
-import {Component, Inject} from '@angular/core';
+import { Component, Inject } from '@angular/core';
-import {ToastrService} from "ngx-toastr";
+import { ToastrService } from "ngx-toastr";
-import {HttpClient} from "@angular/common/http";
+import { HttpClient } from "@angular/common/http";
-import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
+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.availableFromDate = this.data.rule ? this.data.rule.availableFromDate : null;
-      this.availableToDate = this.data.rule? this.data.rule.availableToDate : null;
+      this.availableToDate = this.data.rule ? this.data.rule.availableToDate : null;
-      this.isRemoteAvailable = this.data.rule? this.data.rule.isRemoteAvailable : false;
+      this.isRemoteAvailable = this.data.rule ? this.data.rule.isRemoteAvailable : false;
-      this.availableReason = this.data.rule? this.data.rule.availableReason : null;
+      this.availableReason = this.data.rule ? this.data.rule.availableReason : null;
-      this.busyFromHour = this.data.rule? this.data.rule.busyFromHour : null;
+      this.busyFromHour = this.data.rule ? this.data.rule.busyFromHour : null;
-      this.busyToHour = this.data.rule? this.data.rule.busyToHour : 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.css

@@ -1,6 +1,3 @@
-.full-width {
-  width: 100%;
-}
 .form-container {
   padding: 40px;
 }
@@ -12,7 +9,7 @@
 
 .full-width {
   width: 100%;
-  margin-bottom: 16px;
+  margin-top: 16px;
 }
 
 .additional-form {
@@ -58,3 +55,9 @@
   cursor: pointer;
 }
 
+.action-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
+}

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

@@ -9,7 +9,7 @@
   
   <div style="display: flex; justify-content: space-between; align-items: center;">
     <div *ngIf="isEditMode" mat-subheader>{{ 'rulesHeader' | translate }}</div>
-    <button mat-flat-button color="primary" *ngIf="isEditMode" (click)="createRule()" style="padding: 10px;">
+    <button class="action-button" *ngIf="isEditMode" (click)="createRule()" style="padding: 10px;">
       {{ 'addRule' | translate }}
     </button>
   </div>
@@ -41,9 +41,9 @@
   </mat-list>
 </mat-dialog-content>
 
-<mat-dialog-actions align="end">
+<mat-dialog-actions class="action-container">
-  <button mat-button (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
+  <button class="ordinary-button" (click)="onNoClick()">{{ 'buttonCancel' | translate }}</button>
-  <button mat-button (click)="submitForm()" [disabled]="!name || name === ''" cdkFocusInitial>
+  <button class="submit-button" (click)="submitForm()" [disabled]="!name || name === ''" cdkFocusInitial>
     {{ 'buttonSave' | translate }}
   </button>
 </mat-dialog-actions>

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

@@ -1,10 +1,11 @@
-import {Component, Inject, OnInit} from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
-import {ToastrService} from "ngx-toastr";
+import { ToastrService } from "ngx-toastr";
-import {HttpClient} from "@angular/common/http";
+import { HttpClient } from "@angular/common/http";
-import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from "@angular/material/dialog";
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from "@angular/material/dialog";
-import {CreateCalendarRuleComponent} from "../create-calendar-rule/create-calendar-rule.component";
+import { CreateCalendarRuleComponent } from "../create-calendar-rule/create-calendar-rule.component";
-import {DataService} from "../data.service";
+import { DataService } from "../data.service";
-import {DeleteModalComponent} from "../../../shared/delete_modal/delete-modal/delete-modal.component";
+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;
+  baseUrl: string;
-  private apiUrl = `${this.baseUrl}/remote-calendars?page=1&itemsPerPage=1000`;
+  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.css

@@ -1,11 +1,12 @@
-.title {
+.header-container-title {
-  font-size: 24px;
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
 }
 
-.calendar-button-row {
+.command-groups-button-row {
   display: flex;
-  justify-content: flex-start;
+  gap: 15px;
-  margin-top: 16px;
 }
 
 .divider {
@@ -27,7 +28,6 @@
 
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container {
@@ -35,8 +35,8 @@ table {
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
   box-sizing: border-box;
+  margin: 1.5rem 0rem 1.5rem 0rem;
 }
 
 .search-string {
@@ -53,11 +53,12 @@ table {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 10px;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
 }
 
 .mat-elevation-z8 {
-  box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2);
 }
 
 .paginator-container {
@@ -75,4 +76,3 @@ table {
   background-color: #F44336 !important;
   color: white !important;
 }
-

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

@@ -2,16 +2,16 @@
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
-  <h2 class="title" joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCommandGroupsTitle' | translate }}</h2>
+  <div class="header-container-title">
+    <h2 joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCommandGroupsTitle' | translate }}</h2>
+  </div>
   <div class="command-groups-button-row">
-    <button mat-flat-button color="primary" (click)="openCreateCommandGroupModal()" joyrideStep="addCommandGroupStep" text="{{ 'addCommandGroupStepText' | translate }}">
+    <button class="action-button" (click)="openCreateCommandGroupModal()" joyrideStep="addCommandGroupStep" text="{{ 'addCommandGroupStepText' | translate }}">
       {{ 'addCommandGroup' | translate }}
     </button>
   </div>
 </div>
 
-<mat-divider class="divider"></mat-divider>
-
 <div class="search-container" joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchGroupNameLabel' | translate }}</mat-label>
@@ -22,7 +22,7 @@
 </div>
 
 <div *ngIf="loading" class="loading-container" joyrideStep="loadingStep" text="{{ 'loadingStepText' | translate }}">
-  <mat-spinner></mat-spinner>
+  <app-loading [isLoading]="loading"></app-loading>
 </div>
 
 <div *ngIf="!loading">
@@ -35,7 +35,7 @@
         </ng-container>
 
         <ng-container *ngIf="column.columnDef === 'commands'" joyrideStep="viewCommandsStep" text="{{ 'viewCommandsStepText' | translate }}">
-          <button mat-button [matMenuTriggerFor]="menu">{{ 'viewCommands' | translate }}</button>
+          <button class="action-button" [matMenuTriggerFor]="menu">{{ 'viewCommands' | translate }}</button>
           <mat-menu #menu="matMenu">
             <button mat-menu-item *ngFor="let command of commandGroup.commands">
               {{ command.name }}

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) {}
+    private configService: ConfigService, private joyrideService: JoyrideService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/command-groups`;
+  }
 
   ngOnInit(): void {
     this.search();

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

@@ -98,3 +98,10 @@
     margin-bottom: 20px;
   }
 }
+
+.action-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
+}

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

@@ -1,8 +1,6 @@
 <h2 mat-dialog-title>{{ editing ? ('editCommandGroup' | translate) : ('createCommandGroup' | translate) }}</h2>
 <mat-dialog-content class="form-container">
-  <div *ngIf="loading" class="loading-container">
+  <app-loading [isLoading]="loading"></app-loading>
-    <mat-spinner></mat-spinner>
-  </div>
 
   <form *ngIf="!loading" class="command-group-form" (ngSubmit)="onSubmit()">
     <mat-form-field>
@@ -55,7 +53,7 @@
   </form>
 </mat-dialog-content>
 
-<mat-dialog-actions align="end">
+<mat-dialog-actions class="action-container">
-  <button mat-button (click)="close()">{{ 'buttonCancel' | translate }}</button>
+  <button class="ordinary-button" (click)="close()">{{ 'buttonCancel' | translate }}</button>
-  <button mat-button (click)="onSubmit()" cdkFocusInitial>{{ 'buttonSave' | translate }}</button>
+  <button class="submit-button" (click)="onSubmit()" cdkFocusInitial>{{ 'buttonSave' | translate }}</button>
 </mat-dialog-actions>

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.css

@@ -58,19 +58,6 @@
     padding: 10px 20px;
   }
 
-  button {
-    background-color: #3f51b5; /* Color primario */
-    color: white;
-    padding: 10px 15px;
-    border: none;
-    border-radius: 4px;
-    cursor: pointer;
-  }
-
-  button:hover {
-    background-color: #2c387e; /* Color primario oscuro */
-  }
-
   @media (max-width: 600px) {
     .mat-card {
       margin: 10px 0;
@@ -86,15 +73,6 @@
     }
   }
 
-  .cancel-button {
-    background-color: #dc3545;
-    color: white;
-    border-radius: 5px;
-  }
-  .cancel-button:hover {
-    opacity: 0.9;
-  }
-
   .create-command-group-container {
     padding: 20px;
   }
@@ -146,8 +124,9 @@
     color: #666;
   }
 
-  .command-group-actions {
+  .action-container {
-    margin-top: 20px;
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-end;
+    gap: 1em;
+    padding: 1.5em;
   }

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

@@ -1,10 +1,7 @@
 <div class="detail-command-group-container">
   <h2>{{ 'commandGroupDetailsTitle' | translate }}</h2>
 
-  <!-- Indicador de carga -->
+  <app-loading [isLoading]="loading"></app-loading>
-  <div *ngIf="loading" class="loading-container">
-    <mat-spinner></mat-spinner>
-  </div>
 
   <mat-card *ngIf="!loading">
     <mat-card-header>
@@ -52,10 +49,10 @@
     </form>
   </div>
 
-  <div class="command-group-actions" *ngIf="!loading">
+  <div class="action-container" *ngIf="!loading">
-    <button mat-flat-button color="primary" (click)="toggleClientSelect()">
+    <button class="ordinary-button" (click)="close()">{{ 'buttonCancel' | translate }}</button>
+    <button [ngClass]="showClientSelect ? 'submit-button' : 'action-button'" (click)="toggleClientSelect()">
       {{ showClientSelect ? ('execute' | translate) : ('scheduleExecution' | translate) }}
     </button>
-    <button mat-flat-button color="warn" (click)="close()">{{ 'buttonCancel' | translate }}</button>
   </div>
 </div>

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.css

@@ -1,11 +1,12 @@
-.title {
+.header-container-title {
-  font-size: 24px;
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
 }
 
-.calendar-button-row {
+.task-button-row {
   display: flex;
-  justify-content: flex-start;
+  gap: 15px;
-  margin-top: 16px;
 }
 
 .divider {
@@ -27,7 +28,6 @@
 
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container  {
@@ -35,7 +35,7 @@ table {
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
+  margin: 1.5rem 0rem 1.5rem 0rem;
   box-sizing: border-box;
 }
 
@@ -53,7 +53,8 @@ table {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 10px;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
 }
 
 .mat-elevation-z8 {

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

@@ -2,16 +2,16 @@
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
+  <div class="header-container-title">
     <h2 class="title" joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'manageTasksTitle' | translate }}</h2>
+  </div>
   <div class="task-button-row">
-    <button mat-flat-button color="primary" (click)="openCreateTaskModal()" joyrideStep="addTaskStep" text="{{ 'addTaskStepText' | translate }}">
+    <button class="action-button" (click)="openCreateTaskModal()" joyrideStep="addTaskStep" text="{{ 'addTaskStepText' | translate }}">
       {{ 'addTask' | translate }}
     </button>
   </div>
 </div>
 
-<mat-divider class="divider"></mat-divider>
-
 <div class="search-container" joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchTaskLabel' | translate }}</mat-label>

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

@@ -11,12 +11,18 @@ import { MatInputModule } from '@angular/material/input';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 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,
@@ -31,9 +37,14 @@ describe('CommandsTaskComponent', () => {
         TranslateModule.forRoot(),
         JoyrideModule.forRoot(),
       ],
-      declarations: [CommandsTaskComponent],
+      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) {}
+    private configService: ConfigService,
+    private joyrideService: JoyrideService) {
+    this.baseUrl = this.configService.apiUrl;
+    this.apiUrl = `${this.baseUrl}/command-tasks`;
+  }
 
   ngOnInit(): void {
     this.loadTasks();

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

@@ -14,6 +14,7 @@
   display: flex;
   justify-content: flex-end;
   margin-top: 20px;
+  padding: 1.5rem;
 }
 
 mat-form-field {

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

@@ -87,10 +87,6 @@
       </mat-select>
     </mat-form-field>
 
-    <div class="button-container">
-      <button mat-raised-button color="primary" (click)="saveTask()">{{ 'buttonSave' | translate }}</button>
-    </div>
-
     <mat-form-field appearance="fill" class="full-width">
       <mat-label>Selecciona Clientes</mat-label>
       <mat-select formControlName="selectedClients" multiple>
@@ -102,10 +98,9 @@
         </mat-option>
       </mat-select>
     </mat-form-field>
-
-    <div class="button-container">
-      <button mat-raised-button color="primary" (click)="saveTask()">Guardar</button>
-    </div>
-
   </mat-dialog-content>
 </form>
+
+<div class="button-container">
+  <button class="submit-button" (click)="saveTask()">{{ 'buttonSave' | translate }}</button>
+</div>

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/detail-task/detail-task.component.css

@@ -58,25 +58,3 @@
     padding: 10px 20px;
   }
   
-  button {
-    background-color: #3f51b5;
-    color: white;
-    padding: 10px 15px;
-    border: none;
-    border-radius: 4px;
-    cursor: pointer;
-  }
-  
-  button:hover {
-    background-color: #2c387e;
-  }
-  
-  .cancel-button {
-    background-color: #dc3545;
-    color: white;
-  }
-  
-  .cancel-button:hover {
-    opacity: 0.9;
-  }
-  

ogWebconsole/src/app/components/commands/commands-task/detail-task/detail-task.component.html

@@ -50,6 +50,6 @@
   </mat-card>
 
   <div class="task-actions">
-    <button mat-flat-button class="cancel-button" (click)="closeDialog()">{{ 'buttonClose' | translate }}</button>
+    <button class="ordinary-button" (click)="closeDialog()">Cancel</button>
   </div>
 </div>

ogWebconsole/src/app/components/commands/commands-task/task-logs/input-dialog/input-dialog.component.html

@@ -0,0 +1,7 @@
+<h1 mat-dialog-title>{{ 'inputDetails' | translate }}</h1>
+<div mat-dialog-content>
+  <pre>{{ data.input | json }}</pre>
+</div>
+<div mat-dialog-actions align="end">
+  <button class="ordinary-button" (click)="close()">{{ 'closeButton' | translate }}</button>
+</div>

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

@@ -0,0 +1,47 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { InputDialogComponent } from './input-dialog.component';
+import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from "@angular/material/dialog";
+import {FormBuilder} from "@angular/forms";
+import {ToastrService} from "ngx-toastr";
+import {provideHttpClient} from "@angular/common/http";
+import {provideHttpClientTesting} from "@angular/common/http/testing";
+import {TranslateModule} from "@ngx-translate/core";
+
+describe('InputDialogComponent', () => {
+  let component: InputDialogComponent;
+  let fixture: ComponentFixture<InputDialogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [InputDialogComponent],
+      imports: [
+        MatDialogModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        FormBuilder,
+        ToastrService,
+        provideHttpClient(),
+        provideHttpClientTesting(),
+        {
+          provide: MatDialogRef,
+          useValue: {}
+        },
+        {
+          provide: MAT_DIALOG_DATA,
+          useValue: {}
+        }
+      ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(InputDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,18 @@
+import { Component, Inject  } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+
+@Component({
+  selector: 'app-input-dialog',
+  templateUrl: './input-dialog.component.html',
+  styleUrl: './input-dialog.component.css'
+})
+export class InputDialogComponent {
+  constructor(
+    public dialogRef: MatDialogRef<InputDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: { input: any }
+  ) {}
+
+  close(): void {
+    this.dialogRef.close();
+  }
+}

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

@@ -1,15 +1,20 @@
-.title {
+.header-container {
-  font-size: 24px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
 }
 
 .calendar-button-row {
   display: flex;
-  justify-content: flex-start;
+  gap: 15px;
-  margin-top: 16px;
-}
-
-.divider {
-  margin: 20px 0;
 }
 
 .lists-container {
@@ -27,14 +32,13 @@
 
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 0 5px;
+  margin: 1.5rem 0rem 1.5rem 0rem;
   box-sizing: border-box;
 }
 
@@ -53,15 +57,14 @@ table {
   padding: 5px;
 }
 
-.header-container {
+.mat-elevation-z8 {
-  display: flex;
+  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2);
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px;
 }
 
-.mat-elevation-z8 {
+.progress-container {
-  box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+  display: flex;
+  align-items: center;
+  gap: 10px;
 }
 
 .paginator-container {
@@ -71,12 +74,12 @@ table {
 }
 
 .chip-failed {
-  background-color: #f15d5d !important;
+  background-color: #e87979 !important;
   color: white;
 }
 
 .chip-success {
-  background-color: #32c532 !important;
+  background-color: #46c446 !important;
   color: white;
 }
 
@@ -90,3 +93,26 @@ table {
   color: white;
 }
 
+.status-progress-flex {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+button.cancel-button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 5px;
+}
+
+.cancel-button {
+  color: red;
+  background-color: transparent;
+  border: none;
+  padding: 0;
+}
+
+.cancel-button mat-icon {
+  color: red;
+}

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

@@ -2,29 +2,39 @@
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
-  <h2 class="title" joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCommandsTitle' | translate }}</h2>
+
+  <div class="header-container-title">
+    <h2 joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'adminCommandsTitle' |
+      translate }}</h2>
+  </div>
+
   <div class="images-button-row">
-    <button mat-flat-button color="primary" (click)="resetFilters()" joyrideStep="resetFiltersStep" text="{{ 'resetFiltersStepText' | translate }}">
+    <button class="action-button" (click)="resetFilters()" joyrideStep="resetFiltersStep"
+      text="{{ 'resetFiltersStepText' | translate }}">
       {{ 'resetFilters' | translate }}
     </button>
   </div>
 </div>
 
-<mat-divider class="divider"></mat-divider>
-
 <div class="search-container">
-  <mat-form-field appearance="fill" class="search-select" joyrideStep="clientSelectStep" text="{{ 'clientSelectStepText' | translate }}">
+  <mat-form-field appearance="fill" class="search-select" joyrideStep="clientSelectStep"
-    <input type="text" matInput [formControl]="clientControl" [matAutocomplete]="clientAuto" placeholder="{{ 'selectClientPlaceholder' | translate }}">
+    text="{{ 'clientSelectStepText' | translate }}">
-    <mat-autocomplete #clientAuto="matAutocomplete" [displayWith]="displayFnClient" (optionSelected)="onOptionClientSelected($event.option.value)">
+    <input type="text" matInput [formControl]="clientControl" [matAutocomplete]="clientAuto"
+      placeholder="{{ 'filterClientPlaceholder' | translate }}">
+    <mat-autocomplete #clientAuto="matAutocomplete" [displayWith]="displayFnClient"
+      (optionSelected)="onOptionClientSelected($event.option.value)">
       <mat-option *ngFor="let client of filteredClients | async" [value]="client">
         {{ client.name }}
       </mat-option>
     </mat-autocomplete>
   </mat-form-field>
 
-  <mat-form-field appearance="fill" class="search-select" joyrideStep="commandSelectStep" text="{{ 'commandSelectStepText' | translate }}">
+  <mat-form-field appearance="fill" class="search-select" joyrideStep="commandSelectStep"
-    <input type="text" matInput [formControl]="commandControl" [matAutocomplete]="commandAuto" placeholder="{{ 'selectCommandPlaceholder' | translate }}">
+    text="{{ 'commandSelectStepText' | translate }}">
-    <mat-autocomplete #commandAuto="matAutocomplete" [displayWith]="displayFnCommand" (optionSelected)="onOptionCommandSelected($event.option.value)">
+    <input type="text" matInput [formControl]="commandControl" [matAutocomplete]="commandAuto"
+      placeholder="{{ 'filterCommandPlaceholder' | translate }}">
+    <mat-autocomplete #commandAuto="matAutocomplete" [displayWith]="displayFnCommand"
+      (optionSelected)="onOptionCommandSelected($event.option.value)">
       <mat-option *ngFor="let command of filteredCommands | async" [value]="command">
         {{ command.name }}
       </mat-option>
@@ -33,59 +43,86 @@
 
   <mat-form-field appearance="fill" class="search-boolean">
     <mat-label i18n="@@searchLabel">Estado</mat-label>
-    <mat-select [(ngModel)]="filters['status']" (selectionChange)="loadTraces()" placeholder="Seleccionar opción" >
+    <mat-select [(ngModel)]="filters['status']" (selectionChange)="loadTraces()" placeholder="Seleccionar opción">
+      <mat-option [value]="undefined">Todos</mat-option>
       <mat-option [value]="'failed'">Fallido</mat-option>
       <mat-option [value]="'pending'">Pendiente de ejecutar</mat-option>
       <mat-option [value]="'in-progress'">Ejecutando</mat-option>
       <mat-option [value]="'success'">Completado con éxito</mat-option>
+      <mat-option [value]="'cancelled'">Cancelado</mat-option>
     </mat-select>
   </mat-form-field>
 </div>
 
-<div *ngIf="loading" class="loading-container">
+<app-loading [isLoading]="loading"></app-loading>
-  <mat-spinner></mat-spinner>
-</div>
 
 <div *ngIf="!loading">
-  <table mat-table [dataSource]="traces" class="mat-elevation-z8" joyrideStep="tableStep" text="{{ 'tableStepText' | translate }}">
+  <table mat-table [dataSource]="traces" class="mat-elevation-z8" joyrideStep="tableStep"
+    text="{{ 'tableStepText' | translate }}">
     <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnDef">
       <th mat-header-cell *matHeaderCellDef> {{ column.header }} </th>
       <td mat-cell *matCellDef="let trace">
 
-        <ng-container *ngIf="column.columnDef === 'status'; else defaultCell">
+        <ng-container [ngSwitch]="column.columnDef">
+          <ng-container *ngSwitchCase="'status'">
+            <ng-container *ngIf="trace.status === 'in-progress' && trace.progress; else statusChip">
+              <div class="progress-container">
+                <mat-progress-bar class="example-margin" [mode]="mode" [value]="trace.progress" [bufferValue]="bufferValue">
+                </mat-progress-bar>
+                <span>{{trace.progress}}%</span>
+              </div>
+            </ng-container>
+            <ng-template #statusChip>
+              <div class="status-progress-flex">
                 <mat-chip [ngClass]="{
                     'chip-failed': trace.status === 'failed',
                     'chip-success': trace.status === 'success',
                     'chip-pending': trace.status === 'pending',
-              'chip-in-progress': trace.status === 'in-progress'
+                    'chip-in-progress': trace.status === 'in-progress',
+                    'chip-cancelled': trace.status === 'cancelled'
                   }">
                   {{
                     trace.status === 'failed' ? 'Fallido' :
+                      trace.status === 'in-progress' ? 'En ejecución' :
                         trace.status === 'success' ? 'Finalizado con éxito' :
                           trace.status === 'pending' ? 'Pendiente de ejecutar' :
-                    trace.status === 'in-progress' ? 'Ejecutando' :
+                            trace.status === 'cancelled' ? 'Cancelado' :
                             trace.status
                   }}
                 </mat-chip>
+                <button *ngIf="trace.status === 'in-progress' && trace.command === 'deploy-image'"
+                        mat-icon-button
+                        (click)="cancelTrace(trace)"
+                        class="cancel-button"
+                        matTooltip="Cancelar transmisión de imagen">
+                  <mat-icon>cancel</mat-icon>
+                </button>
+              </div>
+            </ng-template>
           </ng-container>
 
-        <ng-template #defaultCell>
+          <ng-container *ngSwitchCase="'input'">
+            <button mat-icon-button (click)="openInputModal(trace.input)">
+              <mat-icon>info</mat-icon>
+            </button>
+          </ng-container>
+
+          <ng-container *ngSwitchDefault>
             {{ column.cell(trace) }}
-        </ng-template>
+          </ng-container>
+        </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="paginator-container" joyrideStep="paginationStep" text="{{ 'paginationStepText' | translate }}">
-  <mat-paginator [length]="length"
+  <mat-paginator [length]="length" [pageSize]="itemsPerPage" [pageIndex]="page" [pageSizeOptions]="pageSizeOptions"
-                 [pageSize]="itemsPerPage"
-                 [pageIndex]="page"
-                 [pageSizeOptions]="pageSizeOptions"
     (page)="onPageChange($event)">
   </mat-paginator>
 </div>

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

@@ -1,10 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
+import { Observable, forkJoin } from 'rxjs';
 import { FormControl } from '@angular/forms';
 import { map, startWith } from 'rxjs/operators';
 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 } 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',
@@ -12,7 +18,8 @@ import { JoyrideService } from 'ngx-joyride';
   styleUrls: ['./task-logs.component.css']
 })
 export class TaskLogsComponent implements OnInit {
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  baseUrl: string;
+  mercureUrl: string;
   traces: any[] = [];
   groupedTraces: any[] = [];
   commands: any[] = [];
@@ -23,6 +30,9 @@ export class TaskLogsComponent implements OnInit {
   loading: boolean = true;
   pageSizeOptions: number[] = [10, 20, 30, 50];
   datePipe: DatePipe = new DatePipe('es-ES');
+  mode: ProgressBarMode = 'buffer';
+  progress = 0;
+  bufferValue = 0;
 
   columns = [
     {
@@ -50,6 +60,16 @@ export class TaskLogsComponent implements OnInit {
       header: 'Hilo de trabajo',
       cell: (trace: any) => `${trace.jobId}`
     },
+    {
+      columnDef: 'input',
+      header: 'Input',
+      cell: (trace: any) => `${trace.input}`
+    },
+    {
+      columnDef: 'output',
+      header: 'Logs',
+      cell: (trace: any) => `${trace.output}`
+    },
     {
       columnDef: 'executedAt',
       header: 'Programación de ejecución',
@@ -70,12 +90,20 @@ export class TaskLogsComponent implements OnInit {
   commandControl = new FormControl();
 
   constructor(private http: HttpClient,
-    private joyrideService: JoyrideService) {}
+    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();
     this.loadCommands();
-    this.loadClients();
+    //this.loadClients();
     this.filteredCommands = this.commandControl.valueChanges.pipe(
       startWith(''),
       map(value => (typeof value === 'string' ? value : value?.name)),
@@ -86,7 +114,38 @@ export class TaskLogsComponent implements OnInit {
       map(value => (typeof value === 'string' ? value : value?.name)),
       map(name => (name ? this._filterClients(name) : this.clients.slice()))
     );
+
+    const eventSource = new EventSource(`${this.mercureUrl}?topic=`
+      + encodeURIComponent(`traces`));
+
+    eventSource.onmessage = (event) => {
+      const data = JSON.parse(event.data);
+      if (data && data['@id']) {
+        this.updateTracesStatus(data['@id'], data.status, data.progress);
       }
+    }
+  }
+
+  private updateTracesStatus(clientUuid: string, newStatus: string, progress: Number): void {
+    const traceIndex = this.traces.findIndex(trace => trace['@id'] === clientUuid);
+    if (traceIndex !== -1) {
+      const updatedTraces = [...this.traces];
+
+      updatedTraces[traceIndex] = {
+        ...updatedTraces[traceIndex],
+        status: newStatus,
+        progress: progress
+      };
+
+      this.traces = updatedTraces;
+      this.cdr.detectChanges();
+
+      console.log(`Estado actualizado para la traza ${clientUuid}: ${newStatus}`);
+    } else {
+      console.warn(`Traza con UUID ${clientUuid} no encontrado en la lista.`);
+    }
+  }
+
 
   private _filterClients(name: string): any[] {
     const filterValue = name.toLowerCase();
@@ -116,10 +175,41 @@ export class TaskLogsComponent implements OnInit {
     this.loadTraces();
   }
 
+  openInputModal(inputData: any): void {
+    this.dialog.open(InputDialogComponent, {
+      width: '700px',
+      data: { input: inputData }
+    });
+  }
+
+  cancelTrace(trace: any): void {
+    this.dialog.open(DeleteModalComponent, {
+      width: '300px',
+      data: { name: trace.jobId },
+    }).afterClosed().subscribe((result) => {
+      if (result) {
+        this.http.post(`${this.baseUrl}/traces/server/${trace.uuid}/cancel`, {}).subscribe({
+          next: () => {
+            this.toastService.success('Transmision de imagen cancelada');
+            this.loadTraces();
+          },
+          error: (error) => {
+            this.toastService.error(error.error['hydra:description']);
+            console.error(error.error['hydra:description']);
+          }
+        });
+      }
+    });
+  }
+
   loadTraces(): void {
     this.loading = true;
     const url = `${this.baseUrl}/traces?page=${this.page + 1}&itemsPerPage=${this.itemsPerPage}`;
-    this.http.get<any>(url, { params: this.filters }).subscribe(
+    const params = { ...this.filters };
+    if (params['status'] === undefined) {
+      delete params['status'];
+    }
+    this.http.get<any>(url, { params }).subscribe(
       (data) => {
         this.traces = data['hydra:member'];
         this.length = data['hydra:totalItems'];
@@ -151,10 +241,20 @@ export class TaskLogsComponent implements OnInit {
     this.loading = true;
     this.http.get<any>(`${this.baseUrl}/clients?&page=1&itemsPerPage=10000`).subscribe(
       response => {
-        this.clients = response['hydra:member'];
+        const clientIds = response['hydra:member'].map((client: any) => client['@id']);
+        const clientDetailsRequests: Observable<any>[] = clientIds.map((id: string) => this.http.get<any>(`${this.baseUrl}${id}`));
+        forkJoin(clientDetailsRequests).subscribe(
+          (clients: any[]) => {
+            this.clients = clients;
             this.loading = false;
           },
-      error => {
+          (error: any) => {
+            console.error('Error fetching client details:', error);
+            this.loading = false;
+          }
+        );
+      },
+      (error: any) => {
         console.error('Error fetching clients:', error);
         this.loading = false;
       }

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

@@ -1,11 +1,12 @@
-.title {
+.header-container-title {
-  font-size: 24px;
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
 }
 
-.calendar-button-row {
+.command-button-row {
   display: flex;
-  justify-content: flex-start;
+  gap: 15px;
-  margin-top: 16px;
 }
 
 .divider {
@@ -27,7 +28,6 @@
 
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container  {
@@ -35,8 +35,8 @@ table {
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
   box-sizing: border-box;
+  margin: 1.5rem 0rem 1.5rem 0rem;
 }
 
 .search-string {
@@ -53,7 +53,8 @@ table {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 10px;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
 }
 
 .mat-elevation-z8 {

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

@@ -2,14 +2,14 @@
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
-  <h2 class="title" joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'CommandsTitle' | translate }}</h2>
+  <div class="header-container-title">
+    <h2 joyrideStep="titleStep" text="{{ 'titleStepText' | translate }}">{{ 'CommandsTitle' | translate }}</h2>
+  </div>
   <div class="command-button-row" joyrideStep="addCommandStep" text="{{ 'addCommandStepText' | translate }}">
-    <button mat-flat-button color="primary" (click)="openCreateCommandModal()">{{ 'addCommand' | translate }}</button>
+    <button class="action-button" (click)="openCreateCommandModal()">{{ 'addCommand' | translate }}</button>
   </div>
 </div>
 
-<mat-divider class="divider"></mat-divider>
-
 <div class="search-container" joyrideStep="searchStep" text="{{ 'searchStepText' | translate }}">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchCommandLabel' | translate }}</mat-label>
@@ -20,7 +20,7 @@
 </div>
 
 <div *ngIf="loading" class="loading-container" joyrideStep="loadingStep" text="{{ 'loadingStepText' | translate }}">
-  <mat-spinner></mat-spinner>
+  <app-loading [isLoading]="loading"></app-loading>
 </div>
 
 <div *ngIf="!loading">
@@ -31,9 +31,11 @@
         <ng-container *ngIf="column.columnDef !== 'readOnly'">
           {{ column.cell(command) }}
         </ng-container>
+
         <ng-container *ngIf="column.columnDef === 'readOnly'">
-          <mat-chip *ngIf="command.readOnly" class="mat-chip-readonly-true"><mat-icon style="color:white;">check</mat-icon></mat-chip>
+          <mat-icon [color]="command[column.columnDef] ? 'primary' : 'warn'">
-          <mat-chip *ngIf="!command.readOnly" class="mat-chip-readonly-false"><mat-icon style="color:white;">close</mat-icon></mat-chip>
+            {{ command[column.columnDef] ? 'check_circle' : 'cancel' }}
+          </mat-icon>
         </ng-container>
       </td>
     </ng-container>
@@ -41,7 +43,6 @@
     <ng-container matColumnDef="actions">
       <th mat-header-cell *matHeaderCellDef style="text-align: center;">{{ 'columnActions' | translate }}</th>
       <td mat-cell *matCellDef="let command" style="text-align: center;" joyrideStep="actionsStep" text="{{ 'actionsStepText' | translate }}">
-        <button mat-icon-button color="info" (click)="executeCommand($event, command)"><mat-icon>play_arrow</mat-icon></button>
         <button mat-icon-button color="info" (click)="viewDetails($event, command)"><mat-icon>visibility</mat-icon></button>
         <button mat-icon-button color="primary" [disabled]="command.readOnly" (click)="editCommand($event, command)"><mat-icon>edit</mat-icon></button>
         <button mat-icon-button color="warn" [disabled]="command.readOnly" (click)="deleteCommand($event, command)"><mat-icon>delete</mat-icon></button>

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

@@ -19,14 +19,21 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 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],
+      declarations: [CommandsComponent, LoadingComponent],
       imports: [
         HttpClientTestingModule,
         ToastrModule.forRoot(),
@@ -52,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());
   }
@@ -114,19 +117,6 @@ export class CommandsComponent implements OnInit {
     });
   }
 
-  executeCommand(event: MouseEvent, command: any): void {
-    this.dialog.open(ExecuteCommandComponent, {
-      width: '50%',
-      data: { commandData: command }
-    }).afterClosed().subscribe((result) => {
-      if (result) {
-        console.log('Comando ejecutado con éxito');
-      } else {
-        console.log('Ejecución de comando cancelada');
-      }
-    });
-  }
-
   onPageChange(event: any): void {
     this.page = event.pageIndex;
     this.itemsPerPage = event.pageSize;

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

@@ -7,12 +7,6 @@
 
 .form-group {
   margin-top: 20px;
-  margin-bottom: 26px;
-}
-
-.full-width {
-  width: 100%;
-  margin-bottom: 16px;
 }
 
 .additional-form {
@@ -58,3 +52,20 @@
   cursor: pointer;
 }
 
+.action-container {
+  display: flex;
+  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">
@@ -23,7 +29,7 @@
   </form>
 </mat-dialog-content>
 
-<mat-dialog-actions align="end">
+<mat-dialog-actions class="action-container">
-  <button mat-button (click)="onCancel($event)">{{ 'buttonCancel' | translate }}</button>
+  <button class="ordinary-button" (click)="onCancel($event)">{{ 'buttonCancel' | translate }}</button>
-  <button mat-button (click)="onSubmit()" cdkFocusInitial>{{ 'buttonSave' | translate }}</button>
+  <button class="submit-button" (click)="onSubmit()" cdkFocusInitial>{{ 'buttonSave' | translate }}</button>
 </mat-dialog-actions>

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 {
+export class CreateCommandComponent implements OnInit{
-  baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
+  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;
+  baseUrl: string;
-  private apiUrl = `${this.baseUrl}/commands?page=1&itemsPerPage=1000`;
+  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

@@ -1,40 +1,24 @@
-<h2 mat-dialog-title>{{ 'executeCommandTitle' | translate }}</h2>
+<ng-container [ngSwitch]="buttonType">
+  <button *ngSwitchCase="'icon'" mat-icon-button color="primary" [matMenuTriggerFor]="commandMenu"
+    [disabled]="disabled">
+    <mat-icon>{{ icon }}</mat-icon>
+  </button>
 
-<mat-dialog-content class="form-container">
+  <button class="action-button" [disabled]="clientData.length === 0 || disabled" *ngSwitchCase="'text'"
-  <form [formGroup]="form" class="command-form">
+    [matMenuTriggerFor]="commandMenu">
+    {{ buttonText }}
+  </button>
 
-    <mat-form-field appearance="fill" class="full-width">
+  <button mat-menu-item *ngSwitchCase="'menu-item'" [matMenuTriggerFor]="commandMenu" [disabled]="disabled">
-      <mat-label>{{ 'organizationalUnitLabel' | translate }}</mat-label>
+    <mat-icon>{{ icon }}</mat-icon>
-      <mat-select formControlName="unit">
+    <span>{{ buttonText }}</span>
-        <mat-option *ngFor="let unit of units" [value]="unit.uuid">{{ unit.name }}</mat-option>
+  </button>
-      </mat-select>
+</ng-container>
-    </mat-form-field>
 
-    <mat-form-field appearance="fill" class="full-width">
+<mat-menu #commandMenu="matMenu">
-      <mat-label>{{ 'subOrganizationalUnitLabel' | translate }}</mat-label>
+  <button mat-menu-item [disabled]="command.disabled
-      <mat-select formControlName="childUnit">
+  || (command.slug === 'create-image' && clientData.length > 1)" *ngFor="let command of arrayCommands"
-        <mat-option *ngFor="let child of childUnits" [value]="child.uuid">{{ child.name }}</mat-option>
+    (click)="onCommandSelect(command.slug)">
-      </mat-select>
+    {{ command.name }}
-    </mat-form-field>
+  </button>
-
+</mat-menu>
-    <div class="checkbox-group">
-      <label>{{ 'clientsLabel' | translate }}</label>
-      <div *ngIf="clients.length > 0">
-        <mat-checkbox *ngFor="let client of clients" 
-                      (change)="toggleClientSelection(client.uuid)"
-                      [checked]="form.get('clientSelection')?.value.includes(client.uuid)">
-          {{ client.name }}
-        </mat-checkbox>
-      </div>
-      <div *ngIf="clients.length === 0">
-        <p>{{ 'noClientsAvailable' | translate }}</p>
-      </div>
-    </div>
-
-  </form>
-</mat-dialog-content>
-
-<mat-dialog-actions align="end">
-  <button mat-button (click)="closeModal()">{{ 'buttonCancel' | translate }}</button>
-  <button mat-button (click)="executeCommand()" [disabled]="!form.get('clientSelection')?.value.length">{{ 'buttonExecute' | translate }}</button>
-</mat-dialog-actions>