fix(console): some imperfections, delete memberships from detail, role delete from table, app state (#1551)

* app state, roles, remove memberships, feature detail

* chore(deps): bump tslib from 2.0.3 to 2.2.0 in /console (#1549)

* fix: pass necessary webauthn data through events (#1541)

* fix: pass necessary webauthn data through events (#1544)

* docs: update readme (#1460) (#1545)

* Update readme

* Apply suggestions from code review but features

Co-authored-by: Florian Forster <[email protected]>

* Update README.md

Co-authored-by: Florian Forster <[email protected]>

Co-authored-by: Maximilian Panne <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
(cherry picked from commit 5c5b13cf84aca3641ec8fd43036c7ec25479d598)

Co-authored-by: mffap <[email protected]>

* chore(deps): bump tslib from 2.0.3 to 2.2.0 in /console

Bumps [tslib](https://github.com/Microsoft/tslib) from 2.0.3 to 2.2.0.
- [Release notes](https://github.com/Microsoft/tslib/releases)
- [Commits](https://github.com/Microsoft/tslib/compare/2.0.3...2.2.0)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump @angular/language-service from 11.2.0 to 11.2.8 in /console (#1521)

* fix: pass necessary webauthn data through events (#1541)

* fix: pass necessary webauthn data through events (#1544)

* docs: update readme (#1460) (#1545)

* Update readme

* Apply suggestions from code review but features

Co-authored-by: Florian Forster <[email protected]>

* Update README.md

Co-authored-by: Florian Forster <[email protected]>

Co-authored-by: Maximilian Panne <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
(cherry picked from commit 5c5b13cf84aca3641ec8fd43036c7ec25479d598)

Co-authored-by: mffap <[email protected]>

* chore(deps-dev): bump @angular/language-service in /console

Bumps [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) from 11.2.0 to 11.2.8.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/11.2.8/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/11.2.8/packages/language-service)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump @angular-devkit/build-angular from 0.1102.1 to 0.1102.7 in /console (#1520)

* fix: pass necessary webauthn data through events (#1541)

* fix: pass necessary webauthn data through events (#1544)

* docs: update readme (#1460) (#1545)

* Update readme

* Apply suggestions from code review but features

Co-authored-by: Florian Forster <[email protected]>

* Update README.md

Co-authored-by: Florian Forster <[email protected]>

Co-authored-by: Maximilian Panne <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
(cherry picked from commit 5c5b13cf84aca3641ec8fd43036c7ec25479d598)

Co-authored-by: mffap <[email protected]>

* chore(deps-dev): bump @angular-devkit/build-angular in /console

Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1102.1 to 0.1102.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump karma from 6.1.1 to 6.3.2 in /console (#1519)

* fix: pass necessary webauthn data through events (#1541)

* fix: pass necessary webauthn data through events (#1544)

* docs: update readme (#1460) (#1545)

* Update readme

* Apply suggestions from code review but features

Co-authored-by: Florian Forster <[email protected]>

* Update README.md

Co-authored-by: Florian Forster <[email protected]>

Co-authored-by: Maximilian Panne <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
(cherry picked from commit 5c5b13cf84aca3641ec8fd43036c7ec25479d598)

Co-authored-by: mffap <[email protected]>

* chore(deps-dev): bump karma from 6.1.1 to 6.3.2 in /console

Bumps [karma](https://github.com/karma-runner/karma) from 6.1.1 to 6.3.2.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.1.1...v6.3.2)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google-protobuf from 3.13.0 to 3.15.7 in /console (#1518)

* fix: pass necessary webauthn data through events (#1541)

* fix: pass necessary webauthn data through events (#1544)

* docs: update readme (#1460) (#1545)

* Update readme

* Apply suggestions from code review but features

Co-authored-by: Florian Forster <[email protected]>

* Update README.md

Co-authored-by: Florian Forster <[email protected]>

Co-authored-by: Maximilian Panne <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
(cherry picked from commit 5c5b13cf84aca3641ec8fd43036c7ec25479d598)

Co-authored-by: mffap <[email protected]>

* chore(deps): bump google-protobuf from 3.13.0 to 3.15.7 in /console

Bumps [google-protobuf](https://github.com/protocolbuffers/protobuf) from 3.13.0 to 3.15.7.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.13.0...v3.15.7)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump @angular/cli from 11.2.0 to 11.2.7 in /console (#1517)

* fix: pass necessary webauthn data through events (#1541)

* fix: pass necessary webauthn data through events (#1544)

* docs: update readme (#1460) (#1545)

* Update readme

* Apply suggestions from code review but features

Co-authored-by: Florian Forster <[email protected]>

* Update README.md

Co-authored-by: Florian Forster <[email protected]>

Co-authored-by: Maximilian Panne <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
(cherry picked from commit 5c5b13cf84aca3641ec8fd43036c7ec25479d598)

Co-authored-by: mffap <[email protected]>

* chore(deps-dev): bump @angular/cli from 11.2.0 to 11.2.7 in /console

Bumps [@angular/cli](https://github.com/angular/angular-cli) from 11.2.0 to 11.2.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v11.2.0...v11.2.7)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <[email protected]>

* chore(deps-dev): bump @types/node from 14.14.28 to 14.14.37 in /console (#1489)

* fix: pass necessary webauthn data through events (#1541)

* fix: pass necessary webauthn data through events (#1544)

* docs: update readme (#1460) (#1545)

* Update readme

* Apply suggestions from code review but features

Co-authored-by: Florian Forster <[email protected]>

* Update README.md

Co-authored-by: Florian Forster <[email protected]>

Co-authored-by: Maximilian Panne <[email protected]>
Co-authored-by: Florian Forster <[email protected]>
(cherry picked from commit 5c5b13cf84aca3641ec8fd43036c7ec25479d598)

Co-authored-by: mffap <[email protected]>

* chore(deps-dev): bump @types/node from 14.14.28 to 14.14.37 in /console

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.28 to 14.14.37.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Livio Amstutz <[email protected]>
Co-authored-by: mffap <[email protected]>
This commit is contained in:
Max Peintner
2021-04-07 16:46:35 +02:00
committed by GitHub
co-authored by Livio Amstutz mffap dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
parent 3487a7a713
commit e9a457ddf5
26 changed files with 1194 additions and 1130 deletions
@@ -12,14 +12,26 @@
</div>
<ng-container *ngIf="isZitadel === false">
<ng-template appHasRole [appHasRole]="['project.app.write:'+projectId, 'project.app.write']">
<button *ngIf="!editState" matTooltip="{{'ACTIONS.EDIT' | translate}}" mat-icon-button
(click)="editState = !editState" aria-label="edit app name">
(click)="editState = !editState" aria-label="edit app name">
<i class="las la-edit"></i>
</button>
<button *ngIf="editState" (click)="saveApp()" [disabled]="appNameForm.invalid || name?.disabled"
mat-icon-button>
<i class="las la-save"></i>
</button>
<button class="state-button" mat-stroked-button color="warn"
*ngIf="app.state !== undefined && app?.state !== AppState.APP_STATE_INACTIVE"
(click)="changeState(AppState.APP_STATE_INACTIVE)">
{{'ACTIONS.DEACTIVATE' | translate}}
</button>
<button class="state-button" mat-stroked-button
*ngIf="app.state !== undefined && app?.state !== AppState.APP_STATE_ACTIVE"
(click)="changeState(AppState.APP_STATE_ACTIVE)">
{{'ACTIONS.REACTIVATE' | translate}}
</button>
</ng-template>
<ng-template appHasRole [appHasRole]="['project.app.delete:'+projectId, 'project.app.delete']">
@@ -38,17 +50,6 @@
<form *ngIf="app && editState" [formGroup]="appNameForm">
<div class="name-content">
<mat-button-toggle-group formControlName="state" class="toggle" (change)="changeState($event)">
<mat-button-toggle [value]="AppState.APP_STATE_INACTIVE"
matTooltip="{{ 'ACTIONS.DEACTIVATE' | translate}}">
{{'APP.PAGES.DETAIL.STATE.'+AppState.APP_STATE_INACTIVE | translate}}
</mat-button-toggle>
<mat-button-toggle [value]="AppState.APPSTATE_ACTIVE"
matTooltip="{{ 'ACTIONS.REACTIVATE' | translate}}">
{{'APP.PAGES.DETAIL.STATE.'+AppState.APP_STATE_ACTIVE | translate}}
</mat-button-toggle>
</mat-button-toggle-group>
<cnsl-form-field class="name-field">
<cnsl-label>{{ 'APP.NAME' | translate }}</cnsl-label>
<input cnslInput formControlName="name" />
@@ -37,6 +37,10 @@
font-size: 14px;
color: rgb(201, 51, 71);
}
.state-button {
margin: 0 .5rem;
}
}
.err-container {
@@ -3,7 +3,6 @@ import { Location } from '@angular/common';
import { HttpClient } from '@angular/common/http';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { MatButtonToggleChange } from '@angular/material/button-toggle';
import { MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
import { ActivatedRoute, Params, Router } from '@angular/router';
@@ -382,15 +381,17 @@ export class AppDetailComponent implements OnInit, OnDestroy {
});
}
public changeState(event: MatButtonToggleChange): void {
if (event.value === AppState.APP_STATE_ACTIVE) {
public changeState(state: AppState): void {
if (state === AppState.APP_STATE_ACTIVE) {
this.mgmtService.reactivateApp(this.projectId, this.app.id).then(() => {
this.app.state = state;
this.toast.showInfo('APP.TOAST.REACTIVATED', true);
}).catch((error: any) => {
this.toast.showError(error);
});
} else if (event.value === AppState.APP_STATE_INACTIVE) {
} else if (state === AppState.APP_STATE_INACTIVE) {
this.mgmtService.deactivateApp(this.projectId, this.app.id).then(() => {
this.app.state = state;
this.toast.showInfo('APP.TOAST.DEACTIVATED', true);
}).catch((error: any) => {
this.toast.showError(error);