From 5f7e60b177d1fc2020aad633b342e84e99142122 Mon Sep 17 00:00:00 2001 From: Francesco Torchia Date: Thu, 23 May 2024 23:15:53 +0200 Subject: [PATCH] Cosmetic fix Signed-off-by: Francesco Torchia --- .../admin/admin-views/admin-views.component.html | 2 +- .../user/user-views/user-views.component.html | 4 ++-- .../dashboard/user/user-views/user-views.component.ts | 11 +++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/console/src/app/components/dashboard/admin/admin-views/admin-views.component.html b/src/console/src/app/components/dashboard/admin/admin-views/admin-views.component.html index 6f558dc..76fb5f5 100644 --- a/src/console/src/app/components/dashboard/admin/admin-views/admin-views.component.html +++ b/src/console/src/app/components/dashboard/admin/admin-views/admin-views.component.html @@ -128,7 +128,7 @@ class="goto" [disabled]="deleting || element.Session?.length === 0" mat-mini-fab color="primary" - matTooltip="{{(element.Session?.length > 0 ? 'COPY_TO_CLIP' : 'GOTO_DISABLED') | translate}}" + matTooltip="{{(element.Session?.length > 0 ? getUrl(element) : 'GOTO_DISABLED') | translate}}" [cdkCopyToClipboard]="getUrl(element)"> content_copy diff --git a/src/console/src/app/components/dashboard/user/user-views/user-views.component.html b/src/console/src/app/components/dashboard/user/user-views/user-views.component.html index 07855f8..b58da40 100644 --- a/src/console/src/app/components/dashboard/user/user-views/user-views.component.html +++ b/src/console/src/app/components/dashboard/user/user-views/user-views.component.html @@ -8,14 +8,14 @@ class="goto" [disabled]="data.Session.length === 0" mat-mini-fab color="primary" - matTooltip="{{(data.Session.length > 0 ? 'VIEW_URL' : 'GOTO_DISABLED') | translate}}" + matTooltip="{{(data.Session.length > 0 ? getUrl(data) : 'GOTO_DISABLED') | translate}}" (click)="goToView(data)"> launch
{{'COLUMN_PATH' | translate}} - {{ data.Repo }} + {{ data.Repo || 'none'}}
{{'COLUMN_GIT_AUTH' | translate}} diff --git a/src/console/src/app/components/dashboard/user/user-views/user-views.component.ts b/src/console/src/app/components/dashboard/user/user-views/user-views.component.ts index bfcdc37..df65e27 100644 --- a/src/console/src/app/components/dashboard/user/user-views/user-views.component.ts +++ b/src/console/src/app/components/dashboard/user/user-views/user-views.component.ts @@ -46,6 +46,12 @@ export class UserViewsComponent implements OnInit, OnDestroy { this.cardRefresh$.complete(); } + public getUrl(element: View) { + const url = `${environment.protocol}://${window.location.hostname}${element.Path}?${element.Query}`; + + return url; + } + public goToView(element: View) { this.cookieService.get('code-server-session'); this.cookieService.put('code-server-session', element.Session, { @@ -54,10 +60,7 @@ export class UserViewsComponent implements OnInit, OnDestroy { storeUnencoded: true }); - - const url = `${environment.protocol}://${window.location.hostname}${element.Path}?${element.Query}`; - - window.open(url, '_blank'); + window.open(this.getUrl(element), '_blank'); } public goToCreateView() {