From 075fd1dfe6629fac1c262627a5a77b89f1dc07aa Mon Sep 17 00:00:00 2001
From: Max Peintner <max@caos.ch>
Date: Mon, 8 Aug 2022 15:03:28 +0200
Subject: [PATCH] fix(console): restore url after state handling, remove user
 metadata without user.write permission (#4136)

* metadata role check

* fix: restore url after handling state

* hide metadata if has user not user.write

* allow metadata read

Co-authored-by: Livio Spring <livio.a@gmail.com>
---
 .../users/user-detail/metadata/metadata.component.html | 10 +++++++++-
 .../statehandler/statehandler-processor.service.ts     |  3 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/console/src/app/pages/users/user-detail/metadata/metadata.component.html b/console/src/app/pages/users/user-detail/metadata/metadata.component.html
index c341e2aa4a..88551c32aa 100644
--- a/console/src/app/pages/users/user-detail/metadata/metadata.component.html
+++ b/console/src/app/pages/users/user-detail/metadata/metadata.component.html
@@ -1,7 +1,15 @@
 <cnsl-card class="metadata-details" title="{{ 'USER.METADATA.TITLE' | translate }}">
   <div class="metadata-actions">
     <mat-spinner class="spinner" diameter="20" *ngIf="loading"></mat-spinner>
-    <button mat-raised-button color="primary" class="edit" (click)="editMetadata()">{{ 'ACTIONS.EDIT' | translate }}</button>
+    <button
+      [disabled]="(['user.write:' + userId, 'user.write'] | hasRole | async) === false"
+      mat-raised-button
+      color="primary"
+      class="edit"
+      (click)="editMetadata()"
+    >
+      {{ 'ACTIONS.EDIT' | translate }}
+    </button>
   </div>
 
   <ng-container *ngIf="metadata?.length; else emptyList">
diff --git a/console/src/app/services/statehandler/statehandler-processor.service.ts b/console/src/app/services/statehandler/statehandler-processor.service.ts
index 89da854cf4..5576415b15 100644
--- a/console/src/app/services/statehandler/statehandler-processor.service.ts
+++ b/console/src/app/services/statehandler/statehandler-processor.service.ts
@@ -28,8 +28,7 @@ export class StatehandlerProcessorServiceImpl implements StatehandlerProcessorSe
         return;
       } else {
         sessionStorage.removeItem(state);
-        // window.location.replace(window.location.origin + url);
-        this.router.navigate([url]);
+        this.router.navigateByUrl(url);
       }
     }
   }