fix: Merge master (#1373)

* feat(console): app infos, api apps, fix redirects on create, fix role update, redesign idps, policy, prettier history  (#1310)

* idp fixes

* idp cleanup and rehaul, complexity policy preview

* policy fixes, orthodox redirect

* link component, add links to policies

* redirect pipe, state labels

* Cnsl map changes (#1315)

* map changes to different format

* fix changes layout, cursor

* set asc values

* fix user appearance in changes, index

* changes

* app create with api

* api app create

* auth method for api config

* authmethods, app card for api, authmethod in dev create

* move machine keys to own module

* jwt method for oidc

* fix app edit

* save toast

* fix changes, change det in app detail

* regenerate secret

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

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix policy backlink

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 40a7e958d7)

* fix: i18n refs, unnecessary logs (#1343)

(cherry picked from commit 2e04c977eb)

* fix: tos link (#1345)

(cherry picked from commit 5333ef10c1)

* fix: reactivate/deactivate idp, remove idp provider (#1348)

* fix: reactivate/deactivate idp, remove idp provider

* fix build

* fix(console): add jwt to selection, idp deactivate reactivate (#1347)

* fix: log error on idp change

* add jwt to method selection

Co-authored-by: Max Peintner <max@caos.ch>

(cherry picked from commit c8b9888427)

* fix: reactivate/deactivate idp (#1351)

(cherry picked from commit 54f395e2e0)

Co-authored-by: Max Peintner <max@caos.ch>
This commit is contained in:
Fabi
2021-03-01 09:01:34 +01:00
committed by GitHub
parent 3c07a186fc
commit 9f417f3957
113 changed files with 2976 additions and 1327 deletions

View File

@@ -6,12 +6,45 @@
</div>
<div class="scroll-container" appScrollable (scrollPosition)="scrollHandler($event)">
<li class="item change-item-back" *ngFor="let event of data | async">
<span class="seq">
{{event.changeDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm'}}
</span>
<span class="editor">{{event.editor}}</span>
<span class="desc">{{event?.eventType?.localizedMessage }}</span>
<li class="item change-item-back" *ngFor="let hist of data | async; index as histindex">
<span *ngIf="hist.values[0].dates[0]" class="date">{{
hist.values[0]?.dates[0]| timestampToDate | localizedDate: 'dd. MMMM YYYY' }}</span>
<div class="item" *ngFor="let dayelement of hist.values; index as i">
<div class="row">
<app-avatar matTooltip="{{ dayelement.editorName }}" *ngIf="dayelement.editorName; else spacer"
class="avatar" [name]="dayelement.editorName" [size]="32">
</app-avatar>
<ng-template #spacer>
<div class="spacer"></div>
</ng-template>
<div class="actions">
<div class="action" *ngFor="let action of dayelement.eventTypes; index as j">
<button disabled mat-icon-button aria-label="Restore history"
matTooltip="{{ dayelement.dates[j] | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}">
<mat-icon class="icon">schedule</mat-icon>
</button>
<span>
<span class="msg">{{ action.localizedMessage }}</span>
<span class="block">{{
dayelement.dates[j] | timestampToDate | localizedDate: 'HH:mm'
}}</span>
</span>
<!-- <span *ngIf="histindex === 0 && i === 0 && j === 0">
<span>current file</span>
<span class="block">{{
dayelement.dates[j] | timestampToDate | localizedDate: 'HH:mm'
}}</span>
</span> -->
<!-- <button mat-icon-button disabled>
<mat-icon class="icon red" color="warn">error_outline
</mat-icon>
</button> -->
</div>
</div>
</div>
</div>
</li>
<div class="sp-wrapper">
<mat-spinner *ngIf="loading | async" diameter="25"></mat-spinner>