From bc3212ced7c570e466def0fbebf9da63d7f92d1f Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Thu, 15 May 2025 16:13:58 +0200
Subject: [PATCH 1/3] add contact mail field
---
src/app/model/cluster-manager.ts | 1 +
.../admin/clusters/manager/manager.component.html | 13 +++++++++----
.../admin/clusters/manager/manager.component.ts | 6 ++++++
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/app/model/cluster-manager.ts b/src/app/model/cluster-manager.ts
index 754b5332..128a5521 100644
--- a/src/app/model/cluster-manager.ts
+++ b/src/app/model/cluster-manager.ts
@@ -15,4 +15,5 @@ export class ClusterManager {
public externalNetworks: ClusterExtNetwork[]
public domainNames: string[];
public state : string;
+ 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 49225644..cf693202 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 786a8dc6..2e9df326 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();
+}
--
GitLab
From eb2d086d427020774175c8e5d9fa633d53d39529 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Fri, 16 May 2025 14:21:26 +0200
Subject: [PATCH 2/3] add current date since
---
src/app/model/cluster-manager.ts | 2 ++
.../managerdetails/managerdetails.component.html | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/src/app/model/cluster-manager.ts b/src/app/model/cluster-manager.ts
index 754b5332..f37b9747 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/managerdetails/managerdetails.component.html b/src/app/shared/admin/clusters/managerdetails/managerdetails.component.html
index 28edc9a5..9f7c872a 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>
--
GitLab
From e44c7f7bc30c0317e8838d502fa782176d8a619d Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Fri, 16 May 2025 14:26:13 +0200
Subject: [PATCH 3/3] fix test
---
.../clusters/managerdetails/managerdetails.component.spec.ts | 4 ++++
1 file changed, 4 insertions(+)
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 eef78c6c..b9b92880 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'),
--
GitLab