Merge branch '294-add-domain-to-cluster' into 'develop'

294 add domain to cluster

See merge request !183

src/app/model/cluster-manager.ts

@@ -15,4 +15,6 @@ export class ClusterManager {
     public externalNetworks: ClusterExtNetwork[]
     public domainNames: string[];
     public state : string;
+    public currentStateSince: Date;
+    public contactEmail: string;
 }
\ No newline at end of file

src/app/shared/admin/clusters/manager/manager.component.html

 <div style="display: flex; align-items: center;  margin-top:20px">
     <div style="margin-right:20px">
         <div >
-            <button class="btn btn-primary" (click)="modal.show()">New Cluster</button>
+            <button class="btn btn-primary" (click)="openModal()">New Cluster</button>
         </div>
     </div>
     <div class="flex" style="margin-right:20px">
@@ -56,7 +56,7 @@
                             </a>
                             <ul class="dropdown-menu pull-right-drop" >
                                 <li><a [routerLink]="[ cluster.id]" class="">
-                                    {{ 'CLUSTERS.CONFIGURATION' | translate }}</a>
+                                    {{ 'CLUSTERS.DETAILS' | translate }}</a>
                                 </li>
                             </ul>
                     </span>
@@ -78,9 +78,14 @@
             </div>
 
             <div class="mt-4">
-                <label for="name">{{'CLUSTERS.DESCRIPTION' | translate}}</label>
-                <input id="name" type="text" class="form-control" [(ngModel)]="addedCluster.description" [ngModelOptions]="{standalone: true}">
+                <label for="desc">{{'CLUSTERS.DESCRIPTION' | translate}}</label>
+                <input id="desc" type="text" class="form-control" [(ngModel)]="addedCluster.description" [ngModelOptions]="{standalone: true}">
             </div>
+            <div class="mt-4">
+                <label for="contactEmail">{{'CLUSTERS.CONTACT_MAIL' | translate}}</label>
+                <input id="contactEmail" type="text" class="form-control" [(ngModel)]="addedCluster.contactEmail" [ngModelOptions]="{standalone: true}">
+            </div>
+
 
             <div class="mt-4">
                 <label for="name">{{'CLUSTERS.DOMAIN' | translate}}</label>

src/app/shared/admin/clusters/manager/manager.component.ts

@@ -65,6 +65,12 @@ public onDomainSelection(event: any) {
   
 }
 
+public openModal() {
+  if(this.domains.length > 0) {
+    this.addedCluster.domainNames = [this.domains[0].name];
+  }
+  this.modal.show();
+}
 
 
 

src/app/shared/admin/clusters/managerdetails/managerdetails.component.html

@@ -70,6 +70,16 @@
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label for="state" class="col-sm-2 control-label">{{ 'CLUSTERS.STATE_SINCE' | translate }}</label>
+                    <div class="col-sm-10">
+                        <div class="col-sm-10">
+                            <input type="text" class="form-control" id="state" name="state"
+                                   [ngModel]="formatDate(cluster.currentStateSince)" [disabled]="true">
+                        </div>
+                    </div>
+                </div>
+
 
                 <div class="form-group">
                     <label for="clusterCreationDate" class="col-sm-2 control-label">{{ 'CLUSTERS.CREATION_DATE' | translate }}</label>

src/app/shared/admin/clusters/managerdetails/managerdetails.component.spec.ts

@@ -22,6 +22,8 @@ describe('ClusterManagerDetailsComponent', () => {
     id: 1,
     name: 'Test Cluster',
     state: "UP",
+    currentStateSince: new Date('2025-01-01'),
+      contactEmail: "test@test.test",
     description: 'Test Description',
     externalNetworks: [],
     creationDate: new Date('2025-01-01'),
@@ -171,6 +173,8 @@ describe('ClusterManagerDetailsComponent', () => {
       id: 1,
       name: 'Test Cluster',
       state:"UP",
+      currentStateSince: new Date('2025-01-01'),
+      contactEmail: "test@test.test",
       description: 'Test Description',
       externalNetworks: [],
       creationDate: new Date('2025-01-01'),