From a31e7f799f264cd95c953a1673dfc1c8c1550bb1 Mon Sep 17 00:00:00 2001
From: jasonlee6789 <jasonleenz369@gmail.com>
Date: Tue, 17 Sep 2024 13:53:46 +0900
Subject: [PATCH 1/2] Fix: evcs cluster widget missing alias

---
 .../edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
index 7743c265a65..3001f74b20e 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
@@ -1,5 +1,5 @@
 <oe-flat-widget button style="cursor: pointer;" (click)="presentModal()" *ngIf="isInitialized"
-  [icon]="{name: 'oe-evcs', color: 'environmental'}" [title]="alias | translate">
+  [icon]="{name: 'oe-evcs', color: 'environmental'}" [title]="component.alias">
 
   <ng-container *ngIf="isConnectionSuccessful, else noConnection">
     <oe-flat-widget-line [name]="'Edge.Index.Widgets.EVCS.amountOfChargingStations'| translate"

From 09310ac03b4b8126df81a1d0d2a9a1515e17b052 Mon Sep 17 00:00:00 2001
From: jasonlee6789 <jasonleenz369@gmail.com>
Date: Mon, 28 Oct 2024 08:26:03 +0900
Subject: [PATCH 2/2] fix: replace ?? with ||.  to fis the missing alias.

---
 .../edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html   | 2 +-
 .../app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
index 3001f74b20e..7743c265a65 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html
@@ -1,5 +1,5 @@
 <oe-flat-widget button style="cursor: pointer;" (click)="presentModal()" *ngIf="isInitialized"
-  [icon]="{name: 'oe-evcs', color: 'environmental'}" [title]="component.alias">
+  [icon]="{name: 'oe-evcs', color: 'environmental'}" [title]="alias | translate">
 
   <ng-container *ngIf="isConnectionSuccessful, else noConnection">
     <oe-flat-widget-line [name]="'Edge.Index.Widgets.EVCS.amountOfChargingStations'| translate"
diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts
index 0fa1fbf2ea2..8446be63140 100644
--- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts
+++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.ts
@@ -60,7 +60,7 @@ export class Evcs_Api_ClusterComponent extends AbstractFlatWidget {
   protected override onCurrentData(currentData: CurrentData) {
 
     this.evcsComponent = this.config.getComponent(this.componentId);
-    this.alias = this.config.components[this.componentId].properties.alias ?? "Edge.Index.Widgets.EVCS.chargingStationCluster";
+    this.alias = this.config.components[this.componentId].properties.alias || "Edge.Index.Widgets.EVCS.chargingStationCluster";
     this.isConnectionSuccessful = currentData.allComponents[this.componentId + "/State"] != 3 ? true : false;
 
     // Initialise the Map with all evcss