diff --git a/src/app/model/cluster-manager.ts b/src/app/model/cluster-manager.ts index 754b5332eb386b3659d8c031c93a678eebc48d22..f37b9747cb8cc223d1ee1d4d8b5f142cf582b270 100644 --- a/src/app/model/cluster-manager.ts +++ b/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 diff --git a/src/app/shared/admin/clusters/manager/manager.component.html b/src/app/shared/admin/clusters/manager/manager.component.html index 49225644f1caa1ed74d792d303310de96d2b9eb6..cf693202ea648e7e341fc231b6df0e9becbdfcce 100644 --- a/src/app/shared/admin/clusters/manager/manager.component.html +++ b/src/app/shared/admin/clusters/manager/manager.component.html @@ -1,7 +1,7 @@ <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> diff --git a/src/app/shared/admin/clusters/manager/manager.component.ts b/src/app/shared/admin/clusters/manager/manager.component.ts index 786a8dc6caff3a132f8896a09677dd582c97fccc..2e9df32629c98c7ed0181231b3fe064f3da72753 100644 --- a/src/app/shared/admin/clusters/manager/manager.component.ts +++ b/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(); +} diff --git a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html b/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html index 28edc9a564b5b7dc72d04895c8c721df681298a3..9f7c872af6f0fe143d19d6bf09102cd51986309c 100644 --- a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html +++ b/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> diff --git a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.spec.ts b/src/app/shared/admin/clusters/managerdetails/managerdetails.component.spec.ts index eef78c6c0a8abdad85584608c13238ef30aa22eb..b9b928804c25a5b8ba4817fc5bab13369cef47cf 100644 --- a/src/app/shared/admin/clusters/managerdetails/managerdetails.component.spec.ts +++ b/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'),