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] <[email protected]>

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 40a7e958d712f83585e25f18f4fff620de5e3269)

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

(cherry picked from commit 2e04c977eba295cab6aa533379f6075d2e27ab42)

* fix: tos link (#1345)

(cherry picked from commit 5333ef10c169e3656e3ca8dfb8edf7f738fa0a26)

* 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 <[email protected]>

(cherry picked from commit c8b9888427f4ea6b513d370f9fed555208594edf)

* fix: reactivate/deactivate idp (#1351)

(cherry picked from commit 54f395e2e05d4adb29321e9597d049800c033b61)

Co-authored-by: Max Peintner <[email protected]>

console/src/app/modules/idp-table/idp-table.component.html

@@ -29,21 +29,19 @@
                     </mat-checkbox>
                 </th>
                 <td mat-cell *matCellDef="let idp">
-                    <mat-checkbox color="primary" (click)="$event.stopPropagation()"
+                    <mat-checkbox color="primary" (click)="$event.stopPropagation()" class="chbox"
                         [disabled]="serviceType==PolicyComponentServiceType.MGMT && idp?.providerType == IdpProviderType.IDPPROVIDERTYPE_SYSTEM"
                         (change)="$event ? selection.toggle(idp) : null" [checked]="selection.isSelected(idp)">
-                        <ng-template #genAvatar>
-                            <div class="avatar">
-                                <span>{{idp.name.charAt(0)}}</span>
-                            </div>
-                        </ng-template>
+                        <img src="../../../assets/images/google.png"
+                            *ngIf="idp.stylingType == IdpStylingType.IDPSTYLINGTYPE_GOOGLE" alt="google" />
                     </mat-checkbox>
                 </td>
             </ng-container>
 
             <ng-container matColumnDef="name">
                 <th mat-header-cell *matHeaderCellDef> {{ 'IDP.NAME' | translate }} </th>
-                <td [routerLink]="routerLinkForRow(idp)" mat-cell *matCellDef="let idp"> {{idp?.name}} </td>
+                <td [routerLink]="routerLinkForRow(idp)" mat-cell *matCellDef="let idp"><strong>{{idp?.name}}</strong>
+                </td>
             </ng-container>
 
             <ng-container matColumnDef="config">
@@ -59,19 +57,24 @@
             <ng-container matColumnDef="state">
                 <th mat-header-cell *matHeaderCellDef> {{ 'IDP.STATE' | translate }} </th>
                 <td [routerLink]="routerLinkForRow(idp)" mat-cell *matCellDef="let idp">
-                    {{ 'IDP.STATES.'+idp.state | translate }} </td>
+                    <span class="state"
+                        [ngClass]="{'active': idp.state === IdpState.IDPCONFIGSTATE_ACTIVE, 'inactive': idp.state === IdpState.IDPCONFIGSTATE_INACTIVE}">{{
+                        'IDP.STATES.'+idp.state | translate }}</span>
+                </td>
             </ng-container>
 
-            <ng-container matColumnDef="creationDate">
+            <ng-container matColumnDef="dates">
                 <th mat-header-cell *matHeaderCellDef> {{ 'IDP.CREATIONDATE' | translate }} </th>
                 <td [routerLink]="routerLinkForRow(idp)" class="pointer" mat-cell *matCellDef="let idp">
-                    {{idp.creationDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }} </td>
-            </ng-container>
-
-            <ng-container matColumnDef="changeDate">
-                <th mat-header-cell *matHeaderCellDef> {{ 'IDP.CHANGEDATE' | translate }} </th>
-                <td [routerLink]="routerLinkForRow(idp)" class="pointer" mat-cell *matCellDef="let idp">
-                    {{idp.changeDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }} </td>
+                    <div class="date-block">
+                        <span class="date-sub">{{ 'IDP.CREATIONDATE' | translate }}:</span>
+                        <span>{{idp.creationDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }}</span>
+                    </div>
+                    <div class="date-block">
+                        <span class="date-sub">{{ 'IDP.CHANGEDATE' | translate }}</span>
+                        <span>{{idp.changeDate | timestampToDate | localizedDate: 'dd. MMM, HH:mm' }}</span>
+                    </div>
+                </td>
             </ng-container>
 
             <ng-container matColumnDef="type">

console/src/app/modules/idp-table/idp-table.component.scss

@@ -23,6 +23,15 @@
 
 td {
   outline: none;
+
+  img {
+      height: 30px;
+      width: 30px;
+      margin-left: 1rem;
+      border-radius: .5rem;
+      object-fit: contain;
+      margin-top: .5rem;
+  }
 }
 
 tr {
@@ -88,3 +97,16 @@ tr {
     padding-bottom: .5rem;
   }
 }
+
+
+.date-block {
+    margin: .5rem 0;
+    display: block;
+    min-width: 120px;
+  
+    .date-sub {
+      font-size: 13px;
+      display: block;
+    }
+}
+  

console/src/app/modules/idp-table/idp-table.component.ts

@@ -5,8 +5,9 @@ import { MatPaginator, PageEvent } from '@angular/material/paginator';
 import { MatTableDataSource } from '@angular/material/table';
 import { RouterLink } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import { Empty } from 'google-protobuf/google/protobuf/empty_pb';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { IdpSearchResponse as AdminIdpSearchResponse, IdpView as AdminIdpView } from 'src/app/proto/generated/admin_pb';
+import { IdpSearchResponse as AdminIdpSearchResponse, IdpState, IdpStylingType, IdpView as AdminIdpView } from 'src/app/proto/generated/admin_pb';
 import { IdpProviderType, IdpView as MgmtIdpView } from 'src/app/proto/generated/management_pb';
 import { AdminService } from 'src/app/services/admin.service';
 import { ManagementService } from 'src/app/services/mgmt.service';
@@ -34,7 +35,9 @@ export class IdpTableComponent implements OnInit {
     public loading$: Observable<boolean> = this.loadingSubject.asObservable();
     public PolicyComponentServiceType: any = PolicyComponentServiceType;
     public IdpProviderType: any = IdpProviderType;
-    @Input() public displayedColumns: string[] = ['select', 'name', 'config', 'creationDate', 'changeDate', 'state'];
+    public IdpState: any = IdpState;
+    public IdpStylingType: any = IdpStylingType;
+    @Input() public displayedColumns: string[] = ['select', 'name', 'config', 'dates', 'state'];
 
     @Output() public changedSelection: EventEmitter<Array<AdminIdpView.AsObject | MgmtIdpView.AsObject>>
         = new EventEmitter();
@@ -48,7 +51,7 @@ export class IdpTableComponent implements OnInit {
     ngOnInit(): void {
         this.getData(10, 0);
         if (this.serviceType === PolicyComponentServiceType.MGMT) {
-            this.displayedColumns = ['select', 'name', 'config', 'creationDate', 'changeDate', 'state', 'type'];
+            this.displayedColumns = ['select', 'name', 'config', 'dates', 'state', 'type'];
         }
 
         if (!this.disabled) {
@@ -74,22 +77,28 @@ export class IdpTableComponent implements OnInit {
     }
 
     public deactivateSelectedIdps(): void {
-        this.selection.clear();
-        Promise.all(this.selection.selected.map(value => {
+        const map: Promise<Empty>[] = this.selection.selected.map(value => {
             return this.service.DeactivateIdpConfig(value.id);
-        })).then(() => {
+        });
+        Promise.all(map).then(() => {
+            this.selection.clear();
             this.toast.showInfo('IDP.TOAST.SELECTEDDEACTIVATED', true);
             this.refreshPage();
+        }).catch(error => {
+            this.toast.showError(error);
         });
     }
 
     public reactivateSelectedIdps(): void {
-        this.selection.clear();
-        Promise.all(this.selection.selected.map(value => {
+        const map: Promise<Empty>[] = this.selection.selected.map(value => {
             return this.service.ReactivateIdpConfig(value.id);
-        })).then(() => {
+        });
+        Promise.all(map).then(() => {
+            this.selection.clear();
             this.toast.showInfo('IDP.TOAST.SELECTEDREACTIVATED', true);
             this.refreshPage();
+        }).catch(error => {
+            this.toast.showError(error);
         });
     }