From 411491091b357fbb577fedb0e9873139ae21cdeb Mon Sep 17 00:00:00 2001
From: Manuel Aranda <maranda@qindel.com>
Date: Fri, 11 Apr 2025 11:45:15 +0200
Subject: [PATCH] refs #1864. Added ssh_port and user in imageRepository in UX.

---
 .../manage-repository.component.html                 | 12 ++++++++++++
 .../manage-repository/manage-repository.component.ts |  6 ++++++
 .../repositories/repositories.component.html         |  2 +-
 .../repositories/repositories.component.ts           | 10 +++++++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.html b/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.html
index 1edb619..b9dfea4 100644
--- a/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.html
+++ b/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.html
@@ -12,6 +12,18 @@
       <input matInput formControlName="ip" name="description">
     </mat-form-field>
 
+    <mat-form-field appearance="fill" class="form-field">
+      <mat-label>Puerto ssh</mat-label>
+      <input matInput formControlName="sshPort" name="sshPort">
+      <mat-hint>Valor que utilizará el sistema para algunas acciones como transferir imagenes.</mat-hint>
+    </mat-form-field>
+
+    <mat-form-field appearance="fill" class="form-field">
+      <mat-label>Usuario</mat-label>
+      <input matInput formControlName="user" name="user">
+      <mat-hint>Este usuario se utilizara para conectarse al repositorio.</mat-hint>
+    </mat-form-field>
+
     <mat-form-field appearance="fill" class="form-field">
       <mat-label>Comentarios</mat-label>
       <input matInput formControlName="comments" name="comments">
diff --git a/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts b/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts
index d570f90..4e2b71d 100644
--- a/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts
+++ b/ogWebconsole/src/app/components/repositories/manage-repository/manage-repository.component.ts
@@ -30,6 +30,8 @@ export class ManageRepositoryComponent implements OnInit {
     this.imageForm = this.fb.group({
       name: [null, Validators.required],
       ip: [null],
+      sshPort: [null],
+      user: [null],
       comments: [null],
     });
   }
@@ -46,6 +48,8 @@ export class ManageRepositoryComponent implements OnInit {
         this.imageForm = this.fb.group({
           name: [response.name, Validators.required],
           ip: [response.ip],
+          sshPort: [response.sshPort?? '22' ],
+          user: [response.user?? 'opengnsys'],
           comments: [response.comments],
         });
         this.repositoryId = response['@id'];
@@ -60,6 +64,8 @@ export class ManageRepositoryComponent implements OnInit {
     const payload = {
       name: this.imageForm.value.name,
       ip: this.imageForm.value.ip,
+      sshPort: this.imageForm.value.sshPort,
+      user: this.imageForm.value.user,
       comments: this.imageForm.value.comments,
     };
 
diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.html b/ogWebconsole/src/app/components/repositories/repositories.component.html
index cdfdb27..3ddf7ec 100644
--- a/ogWebconsole/src/app/components/repositories/repositories.component.html
+++ b/ogWebconsole/src/app/components/repositories/repositories.component.html
@@ -5,7 +5,7 @@
     <mat-icon>help</mat-icon>
   </button>
   <div class="header-container-title">
-    <h2 joyrideStep="groupsTitleStepText" text="{{ 'groupsTitleStepText' | translate }}">
+    <h2 joyrideStep="repositoryTitleStep" text="{{ 'groupsTitleStepText' | translate }}">
       {{ 'repositoryTitle' | translate }}
     </h2>
   </div>
diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.ts b/ogWebconsole/src/app/components/repositories/repositories.component.ts
index 35d2ae0..b53de26 100644
--- a/ogWebconsole/src/app/components/repositories/repositories.component.ts
+++ b/ogWebconsole/src/app/components/repositories/repositories.component.ts
@@ -39,6 +39,11 @@ export class RepositoriesComponent implements OnInit {
       header: 'Nombre de repositorio',
       cell: (repository: any) => `${repository.name}`
     },
+    {
+      columnDef: 'user',
+      header: 'Usuario',
+      cell: (repository: any) => `${repository.user?? 'opengnsys'}`
+    },
     {
       columnDef: 'ip',
       header: 'Ip',
@@ -55,8 +60,8 @@ export class RepositoriesComponent implements OnInit {
       cell: (repository: any) => `${this.datePipe.transform(repository.createdAt, 'dd/MM/yyyy hh:mm:ss')}`
     }
   ];
-  displayedColumns: string[] = ['id', 'name', 'ip', 'images', 'createdAt', 'actions'];
   isGitModuleInstalled: boolean = true;
+  displayedColumns: string[] = ['id', 'name', 'ip', 'user', 'images', 'createdAt', 'actions'];
 
   constructor(
     public dialog: MatDialog,
@@ -93,7 +98,6 @@ export class RepositoriesComponent implements OnInit {
         this.loading = false;
       },
       error => {
-        console.error('Error fetching images', error);
         this.loading = false;
       }
     );
@@ -165,7 +169,7 @@ export class RepositoriesComponent implements OnInit {
   iniciarTour(): void {
     this.joyrideService.startTour({
       steps: [
-        'titleStep',
+        'repositoryTitleStep',
         'addStep',
       ],
       showPrevButton: true,