Fixes #32

ligreman · Mar 19, 2023 · 5f7e547 · 5f7e547
1 parent f5b4bb0
commit 5f7e547
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/app/components/dialog-new-service/dialog-new-service.component.ts b/src/app/components/dialog-new-service/dialog-new-service.component.ts
@@ -34,7 +34,7 @@ export class DialogNewServiceComponent implements OnInit, OnDestroy {
         protocol: ['', [Validators.required, CustomValidators.isProtocol(this.validProtocols)]],
         host: ['', [Validators.required, CustomValidators.isHost()]],
         port: ['', [Validators.required, CustomValidators.isNumber(), Validators.min(0), Validators.max(65535)]],
-        path: ['/', [Validators.pattern(/^\//), Validators.required]],
+        path: ['/', [Validators.pattern(/^\//)]],
         enabled: [true],
         retries: [5, [CustomValidators.isNumber(), Validators.min(0), Validators.max(32767)]],
         connect_timeout: [60000, [CustomValidators.isNumber(), Validators.min(1), Validators.max(2147483646)]],

diff --git a/src/app/routes/architect/architect.component.ts b/src/app/routes/architect/architect.component.ts
@@ -400,10 +400,15 @@ export class ArchitectComponent implements OnInit, OnDestroy, AfterViewInit {
         // Recorro los servicios creando los nodos de servicios
         for (let service of data.services) {
             const scolor = service.enabled ? '#CCCCCC' : '#E53935';
+            let sLabel = service.name + '\n' + service.protocol + '://' + service.host + ':' + service.port;
+            if (service.path && service.path !== '') {
+                sLabel += service.path;
+            }
+
             // Nodos de Servicio
             this.data.nodes.add({
                 id: service.id,
-                label: service.name + '\n' + service.protocol + '://' + service.host + ':' + service.port + service.path,
+                label: sLabel,
                 title: this.translate.instant('service.label') + ': ' + service.id + '\n' + this.translate.instant('architect.labels') + ': ' + joiner(service.tags, ', '),
                 group: 'service',
                 x: 450,