Merge remote-tracking branch 'origin/develop' into 272-improve-new-layout

# Conflicts:
#	src/app/shared/admin/clusters/manager/manager.component.html
#	src/app/shared/admin/clusters/manager/manager.component.ts

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'),

src/app/shared/left-menu/left-menu.component.html

@@ -119,9 +119,17 @@
                     </span>
                 </a>
             </li>
+            <li *roles="['ROLE_SYSTEM_ADMIN']" [routerLinkActiveOptions]="{exact:true}" [routerLinkActive]="['active']" [ngClass]="{'collapsed': isCollapsed}">
+                <a  style="display: flex; align-items: center;" [routerLink]="['/admin/webhooks']">
+                    <i class="pi pi-share-alt" style="margin-right:10px; font-size: 18px" title="Settings"></i>
+                    <span *ngIf="!isCollapsed">
+                        {{ 'WEBHOOKS.TITLE_SHORT' | translate }}
+                    </span>
+                </a>
+            </li>
             <li *roles="['ROLE_SYSTEM_ADMIN']" [routerLinkActiveOptions]="{exact:true}" [routerLinkActive]="['active']" [ngClass]="{'collapsed': isCollapsed}">
                 <a  style="display: flex; align-items: center;" [routerLink]="['/admin/manage/clusters']">
-                    <i class="pi pi-cog" style="margin-right:10px; font-size: 18px"></i>
+                    <i class="pi pi-cloud" style="margin-right:10px; font-size: 18px"></i>
                     <span *ngIf="!isCollapsed">
                         {{ 'CLUSTERS.CONFIGURATION' | translate }}
                     </span>
@@ -129,7 +137,7 @@
             </li>
             <li *roles="['ROLE_SYSTEM_ADMIN']" [routerLinkActiveOptions]="{exact:true}" [routerLinkActive]="['active']" [ngClass]="{'collapsed': isCollapsed}">
                 <a  style="display: flex; align-items: center;" [routerLink]="['/admin/languages']">
-                    <i class="pi pi-tags" style="margin-right:10px; font-size: 18px" title=" {{'NAVBAR.LANGUAGES' | translate }}"></i>
+                    <i class="pi pi-language" style="margin-right:10px; font-size: 18px" title=" {{'NAVBAR.LANGUAGES' | translate }}"></i>
                     <span *ngIf="!isCollapsed">
                         {{'NAVBAR.LANGUAGES' | translate }}
                     </span>

src/app/shared/shared.module.ts

@@ -72,6 +72,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import {ChartModule} from 'primeng/chart';
 import { RolesExcludedDirective } from '../directive/roles-exluded.directive';
 import { FileUploadModule } from 'primeng/fileupload';
+import { RecaptchaVisibilityService } from '../service/recaptcha-visibility.service';
 
 
 
@@ -155,6 +156,7 @@ import { FileUploadModule } from 'primeng/fileupload';
         PasswordValidator,
         UserDataService,
         NotificationService,
+        RecaptchaVisibilityService,
         AppConfigService,
         DatePipe,
         {

src/app/welcome/welcome.component.ts

 import {AppConfigService} from '../service/appconfig.service';
-import {AfterContentChecked, AfterViewChecked, Component, OnInit,} from '@angular/core';
+import {AfterContentChecked, AfterViewChecked, Component, OnDestroy, OnInit,} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {ServiceUnavailableService} from '../service-unavailable/service-unavailable.service';
+import { RecaptchaVisibilityService } from '../service/recaptcha-visibility.service';
 
 @Component({
     selector: 'app-welcome',
     templateUrl: './welcome.component.html',
     styleUrls: ['./welcome.component.css']
 })
-export class WelcomeComponent implements OnInit, AfterViewChecked, AfterContentChecked {
+export class WelcomeComponent implements OnInit, AfterViewChecked, AfterContentChecked, OnDestroy {
 
     private height = 0;
 
@@ -19,7 +20,8 @@ export class WelcomeComponent implements OnInit, AfterViewChecked, AfterContentC
     constructor(private appConfig: AppConfigService,
                 public router: Router,
                 private serviceHealth: ServiceUnavailableService,
-                private readonly route: ActivatedRoute) {
+                private readonly route: ActivatedRoute,
+                private readonly recaptcha: RecaptchaVisibilityService) {
         this.route.queryParams.subscribe(params => {
             console.log(params)
             if (params.logout !== undefined) {
@@ -38,14 +40,21 @@ export class WelcomeComponent implements OnInit, AfterViewChecked, AfterContentC
 
         this.landingProfile = this.appConfig.getLandingProfile();
         console.log("Landing profile = ", this.landingProfile)
+        this.recaptcha.showBadge();
     }
 
     ngAfterContentChecked() {
         // this.onResize();
+         this.recaptcha.showBadge();
     }
 
     ngAfterViewChecked() {
         // this.onResize();
+         this.recaptcha.showBadge();
+    }
+
+    ngOnDestroy(): void {
+        this.recaptcha.hideBadge();
     }
 
     public onCloseBanner() {

src/styles.css

@@ -241,3 +241,8 @@ body .p-datatable .p-sortable-column.p-highlight{
 body .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon{
     color:var(--primary-button-color);
 }
+
+.grecaptcha-badge { 
+    visibility: hidden; 
+    bottom: 45px !important;
+}
\ No newline at end of file