From 952482e68b544f17072978c049fd2ece44225535 Mon Sep 17 00:00:00 2001 From: jmbardallo Date: Thu, 24 Sep 2026 08:46:26 +0200 Subject: [PATCH] fix(deploy-image): add missing html template and translations --- .../deploy-image/deploy-image.component.css | 10 ++++++ .../deploy-image/deploy-image.component.html | 32 +++++++++++++++++++ ogWebconsole/src/locale/cat.json | 15 ++++++--- ogWebconsole/src/locale/en.json | 15 ++++++--- ogWebconsole/src/locale/es.json | 15 ++++++--- 5 files changed, 75 insertions(+), 12 deletions(-) diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.css b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.css index c194ac4..b88e360 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.css +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.css @@ -921,3 +921,13 @@ table { margin-top: 2px; } +.post-deploy-radio-group { + margin-top: 10px; +} + +.pxe-template-container { + margin-top: 15px; + display: flex; + flex-direction: column; + gap: 10px; +} diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html index 7de0a6b..6464b54 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html @@ -235,6 +235,38 @@
+ + @if (deployMode !== 'update-cache') { +
+
+ power_settings_new + {{ 'postDeployAction' | translate }} +
+ + + {{ 'postDeployNone' | translate }} + {{ 'postDeployBootOs' | translate }} + {{ 'postDeployPxeTemplate' | translate }} + + + @if (postDeployAction === 'pxeTemplate') { +
+ + {{ 'selectPxeTemplate' | translate }} + + @for (template of pxeTemplates; track template.uuid) { + {{ template.name }} + } + + + + + {{ pxePermanent ? ('pxeTemplatePermanent' | translate) : ('pxeTemplateTemporal' | translate) }} + +
+ } +
+ } @if (imageType === 'monolithic' && selectedMethod && !isDirectMethod()) { diff --git a/ogWebconsole/src/locale/cat.json b/ogWebconsole/src/locale/cat.json index d35ee3e..24e425d 100644 --- a/ogWebconsole/src/locale/cat.json +++ b/ogWebconsole/src/locale/cat.json @@ -242,8 +242,6 @@ "clientSelectStepText": "Selecciona un client per veure les traces associades.", "clientsPerPage": "Clients per pàgina", "clientsPerPageHint": "Nombre de clients mostrats per pàgina al llistat", - "userLanguage": "Idioma preferit", - "userLanguageHint": "Idioma de la interfície per a aquest usuari", "clientSuccessfullyRemovedFromThe": "Client eliminat de la xarxa correctament", "clientsViewStepText": "Visualització dels clients de la unitat organitzativa seleccionada", "clientUpdatedSuccessfully": "Client actualitzat correctament", @@ -1049,8 +1047,8 @@ "noTemplateOption": "Cap", "noTemplatesInServer": "No hi ha plantilles en aquest servidor", "notEnoughFreeSpace": "No hi ha suficient espai lliure al disc per crear una nova partició.", - "noTracesSelectedToCancel": "No hi ha traces seleccionades per cancel·lar", "notesPlaceholder": "Ingressa les teves notes aquí", + "noTracesSelectedToCancel": "No hi ha traces seleccionades per cancel·lar", "notValidDataFound": "No s'han trobat dades vàlides", "ntfsOption": "NTFS", "numberOfRules": "Nº de regles", @@ -1142,6 +1140,10 @@ "pleaseSelectARepository": "Si us plau, selecciona un repositori primer", "portNumberRange": "El port ha d'estar entre 1 i 65535", "portRequired": "El port és obligatori", + "postDeployAction": "Acció Post-Desplegament", + "postDeployBootOs": "Iniciar sistema restaurat", + "postDeployNone": "Cap (Mantenir a ogLive)", + "postDeployPxeTemplate": "Canviar plantilla PXE i reiniciar", "powerOnDevice": "Encendre Equip", "preparingDeploymentRequest": "Preparant petició de desplegament", "preSelectedInfo": "Els clients han estat pre-seleccionats des del component de desplegament d'imatges.", @@ -1159,7 +1161,9 @@ "pxePortTftp": "Port PXE (TFTP)", "pxeTemplate": "Plantilla", "pxeTemplateCreatedSuccessfully": "Plantilla PXE creada correctament", + "pxeTemplatePermanent": "Definitiva (sempre arrencarà amb aquesta plantilla)", "pxeTemplates": "Plantilles PXE", + "pxeTemplateTemporal": "Temporal (només el proper reinici)", "pxeTemplateUpdatedSuccessfully": "Plantilla PXE actualitzada correctament", "queueActions": "Encuar accions", "queueActionsForFailedPcs": "Vols que s'encuin les accions per als PCs que no es pugui executar?", @@ -1297,6 +1301,7 @@ "selectParentOuDhcpHint": "Seleccioni una Unitat Organitzativa Pare (OU) on agrupar les subxarxes i clients que es detectin automàticament en el servei DHCP.", "selectPartitionToBootOs": "Seleccionar partició per arrencar SO", "selectPartitionToInventory": "Seleccionar partició per inventariar", + "selectPxeTemplate": "Seleccionar Plantilla PXE", "selectRepository": "Seleccionar Repositori OG", "selectRepoToView": "Tria un repositori de la llista per veure el seu estat detallat.", "selectScriptToRun": "Seleccioni script a executar", @@ -1502,6 +1507,8 @@ "userDeletedSuccessfully": "Usuari eliminat correctament", "userEditedSuccessfully": "Usuari editat correctament", "userLabel": "Usuari", + "userLanguage": "Idioma preferit", + "userLanguageHint": "Idioma de la interfície per a aquest usuari", "userName": "Nom d'Usuari", "validationToggle": "Validació", "valueFor": "Valor per a", @@ -1522,8 +1529,8 @@ "viewInput": "Veure entrada", "viewOutput": "Veure sortida", "viewParameters": "Veure paràmetres", - "viewScript": "Veure script", "viewPendingTraces": "Veure traces pendents", + "viewScript": "Veure script", "viewSentTraces": "Veure traces enviades", "viewSubnets": "Veure Subxarxes", "viewSuccessfulTraces": "Veure traces completades correctament", diff --git a/ogWebconsole/src/locale/en.json b/ogWebconsole/src/locale/en.json index d67fc9f..398c9c6 100644 --- a/ogWebconsole/src/locale/en.json +++ b/ogWebconsole/src/locale/en.json @@ -242,8 +242,6 @@ "clientSelectStepText": "Select a client to see the associated traces.", "clientsPerPage": "Clients per page", "clientsPerPageHint": "Number of clients shown per page in the list", - "userLanguage": "Preferred language", - "userLanguageHint": "Interface language for this user", "clientSuccessfullyRemovedFromThe": "Client successfully removed from the network", "clientsViewStepText": "Display of the selected organizational unit's clients", "clientUpdatedSuccessfully": "Client updated successfully", @@ -1049,8 +1047,8 @@ "noTemplateOption": "None", "noTemplatesInServer": "There are no templates on this server", "notEnoughFreeSpace": "Not enough free space on the disk to create a new partition.", - "noTracesSelectedToCancel": "No traces selected to cancel", "notesPlaceholder": "Enter your notes here", + "noTracesSelectedToCancel": "No traces selected to cancel", "notValidDataFound": "No valid data found", "ntfsOption": "NTFS", "numberOfRules": "Nº de reglas", @@ -1142,6 +1140,10 @@ "pleaseSelectARepository": "Please select a repository first", "portNumberRange": "The port must be between 1 and 65535", "portRequired": "Port is required", + "postDeployAction": "Post-Deploy Action", + "postDeployBootOs": "Boot restored system", + "postDeployNone": "None (Keep in ogLive)", + "postDeployPxeTemplate": "Change PXE template and reboot", "powerOnDevice": "Power On", "preparingDeploymentRequest": "Preparing deployment request", "preSelectedInfo": "Clients have been pre-selected from the image deployment component.", @@ -1159,7 +1161,9 @@ "pxePortTftp": "PXE Port (TFTP)", "pxeTemplate": "Template", "pxeTemplateCreatedSuccessfully": "PXE template created successfully", + "pxeTemplatePermanent": "Permanent (always boot with this template)", "pxeTemplates": "PXE Templates", + "pxeTemplateTemporal": "Temporary (only next reboot)", "pxeTemplateUpdatedSuccessfully": "PXE template updated successfully", "queueActions": "Queue actions", "queueActionsForFailedPcs": "Do you want to queue actions for PCs that cannot execute?", @@ -1297,6 +1301,7 @@ "selectParentOuDhcpHint": "Select a Parent Organizational Unit (OU) to group the subnets and clients automatically detected in the DHCP service.", "selectPartitionToBootOs": "Select partition to boot OS", "selectPartitionToInventory": "Select partition to inventory", + "selectPxeTemplate": "Select PXE Template", "selectRepository": "Select OG Repository", "selectRepoToView": "Select a repository from the list to view its detailed status.", "selectScriptToRun": "Select script to run", @@ -1502,6 +1507,8 @@ "userDeletedSuccessfully": "User deleted successfully", "userEditedSuccessfully": "User edited successfully", "userLabel": "Username", + "userLanguage": "Preferred language", + "userLanguageHint": "Interface language for this user", "userName": "User name", "validationToggle": "Validation", "valueFor": "Value for", @@ -1522,8 +1529,8 @@ "viewInput": "View input", "viewOutput": "View output", "viewParameters": "View parameters", - "viewScript": "View script", "viewPendingTraces": "View pending traces", + "viewScript": "View script", "viewSentTraces": "View sent traces", "viewSubnets": "View Subnets", "viewSuccessfulTraces": "View successful traces", diff --git a/ogWebconsole/src/locale/es.json b/ogWebconsole/src/locale/es.json index c85be5d..1e62ee8 100644 --- a/ogWebconsole/src/locale/es.json +++ b/ogWebconsole/src/locale/es.json @@ -242,8 +242,6 @@ "clientSelectStepText": "Selecciona un cliente para ver las trazas asociadas.", "clientsPerPage": "Clientes por página", "clientsPerPageHint": "Número de clientes mostrados por página en el listado", - "userLanguage": "Idioma preferido", - "userLanguageHint": "Idioma de la interfaz para este usuario", "clientSuccessfullyRemovedFromThe": "Cliente eliminado de la red con éxito", "clientsViewStepText": "Visualización de los clientes de la unidad organizativa seleccionada", "clientUpdatedSuccessfully": "Cliente actualizado con éxito", @@ -1049,8 +1047,8 @@ "noTemplateOption": "Ninguna", "noTemplatesInServer": "No hay plantillas en este servidor", "notEnoughFreeSpace": "No hay suficiente espacio libre en el disco para crear una nueva partición.", - "noTracesSelectedToCancel": "No hay trazas seleccionadas para cancelar", "notesPlaceholder": "Ingresa tus notas aquí", + "noTracesSelectedToCancel": "No hay trazas seleccionadas para cancelar", "notValidDataFound": "No se encontraron datos válidos", "ntfsOption": "NTFS", "numberOfRules": "Nº de reglas", @@ -1142,6 +1140,10 @@ "pleaseSelectARepository": "Por favor, selecciona un repositorio primero", "portNumberRange": "El puerto debe estar entre 1 y 65535", "portRequired": "El puerto es obligatorio", + "postDeployAction": "Acción Post-Despliegue", + "postDeployBootOs": "Iniciar sistema restaurado", + "postDeployNone": "Ninguna (Mantener en ogLive)", + "postDeployPxeTemplate": "Cambiar plantilla PXE y reiniciar", "powerOnDevice": "Encender Equipo", "preparingDeploymentRequest": "Preparando petición de despliegue", "preSelectedInfo": "Los clientes han sido pre-seleccionados desde el componente de despliegue de imágenes.", @@ -1159,7 +1161,9 @@ "pxePortTftp": "Puerto PXE (TFTP)", "pxeTemplate": "Plantilla", "pxeTemplateCreatedSuccessfully": "Plantilla PXE creada con éxito", + "pxeTemplatePermanent": "Definitiva (siempre arrancará con esta plantilla)", "pxeTemplates": "Plantillas PXE", + "pxeTemplateTemporal": "Temporal (solo el próximo reinicio)", "pxeTemplateUpdatedSuccessfully": "Plantilla PXE actualizada con éxito", "queueActions": "Encolar acciones", "queueActionsForFailedPcs": "¿Quieres que se encolen las acciones para los PCs que no se pueda ejecutar?", @@ -1297,6 +1301,7 @@ "selectParentOuDhcpHint": "Seleccione una Unidad Organizativa Padre (OU) donde agrupar las subredes y clientes que se detecten automáticamente en el servicio DHCP.", "selectPartitionToBootOs": "Seleccionar particion para arrancar SO", "selectPartitionToInventory": "Seleccionar partición para inventariar", + "selectPxeTemplate": "Seleccionar Plantilla PXE", "selectRepository": "Seleccionar Repositorio OG", "selectRepoToView": "Elige un repositorio de la lista para ver su estado detallado.", "selectScriptToRun": "Seleccione script a ejecutar", @@ -1502,6 +1507,8 @@ "userDeletedSuccessfully": "Usuario eliminado correctamente", "userEditedSuccessfully": "Usuario editado correctamente", "userLabel": "Usuario", + "userLanguage": "Idioma preferido", + "userLanguageHint": "Idioma de la interfaz para este usuario", "userName": "Nombre de Usuario", "validationToggle": "Validación", "valueFor": "Valor para", @@ -1522,8 +1529,8 @@ "viewInput": "Ver entrada", "viewOutput": "Ver salida", "viewParameters": "Ver parámetros", - "viewScript": "Ver script", "viewPendingTraces": "Ver trazas pendientes", + "viewScript": "Ver script", "viewSentTraces": "Ver trazas enviadas", "viewSubnets": "Ver Subredes", "viewSuccessfulTraces": "Ver trazas exitosas",