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]>
2026-11-10 16:15:12 +00:00 · 2021-03-01 09:01:34 +01:00
parent 3c07a186fc
commit 9f417f3957
113 changed files with 2976 additions and 1327 deletions
@@ -0,0 +1,30 @@
+<span class="title" mat-dialog-title>{{'USER.MACHINE.ADDED.TITLE' | translate}}</span>
+<div mat-dialog-content>
+    <p class="desc"> {{'USER.MACHINE.ADDED.DESCRIPTION' | translate}}</p>
+    <ng-container *ngIf="addedKey">
+        <div class="row">
+            <p class="left">{{'USER.MACHINE.ID' | translate}}</p>
+            <p class="right">{{addedKey?.id}}</p>
+        </div>
+        <div class="row">
+            <p class="left">{{'USER.MACHINE.TYPE' | translate}}</p>
+            <p class="right">{{'USER.MACHINE.KEYTYPES.'+addedKey?.type | translate}}</p>
+        </div>
+        <div class="row">
+            <p class="left">{{'USER.MACHINE.CREATIONDATE' | translate}}</p>
+            <p class="right">{{addedKey?.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, HH:mm' }}
+            </p>
+        </div>
+        <div class="row">
+            <p class="left">{{'USER.MACHINE.EXPIRATIONDATE' | translate}}</p>
+            <p class="right">{{addedKey?.expirationDate | timestampToDate | localizedDate: 'EEE dd. MMM YYYY, HH:mm'}}
+            </p>
+        </div>
+        <button class="download-button" mat-stroked-button color="primary" (click)="saveFile()">Download</button>
+    </ng-container>
+</div>
+<div mat-dialog-actions class="action">
+    <button color="primary" mat-raised-button class="ok-button" (click)="closeDialog()">
+        {{'ACTIONS.CLOSE' | translate}}
+    </button>
+</div>
@@ -0,0 +1,51 @@
+.title {
+  font-size: 1.2rem;
+  margin-top: 0;
+}
+
+.desc {
+  color: rgb(201, 51, 71);
+  font-size: .9rem;
+}
+
+.form-field {
+  width: 100%;
+}
+
+.action {
+  display: flex;
+  justify-content: flex-end;
+
+  .ok-button {
+    margin-left: .5rem;
+  }
+}
+
+.row {
+  display: flex;
+  width: 100%;
+  flex-direction: column;
+
+  .left,
+  .right {
+    font-size: 14px;
+    flex: 1 0 auto;
+  }
+
+  .left {
+    color: var(--grey);
+    margin-right: 1rem;
+    margin-top: 0;
+    margin-bottom: .5rem;
+  }
+
+  .right {
+    margin-top: 0;
+    margin-bottom: 1rem;
+    overflow: auto;
+  }
+}
+
+.download-button {
+  margin-bottom: 1rem;
+}
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { ShowKeyDialogComponent } from './show-key-dialog.component';
+
+describe('ShowKeyDialogComponent', () => {
+    let component: ShowKeyDialogComponent;
+    let fixture: ComponentFixture<ShowKeyDialogComponent>;
+
+    beforeEach(waitForAsync(() => {
+        TestBed.configureTestingModule({
+            declarations: [ShowKeyDialogComponent],
+        })
+            .compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(ShowKeyDialogComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
@@ -0,0 +1,30 @@
+import { Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { saveAs } from 'file-saver';
+import { AddMachineKeyResponse } from 'src/app/proto/generated/management_pb';
+
+@Component({
+    selector: 'app-show-key-dialog',
+    templateUrl: './show-key-dialog.component.html',
+    styleUrls: ['./show-key-dialog.component.scss'],
+})
+export class ShowKeyDialogComponent {
+    public addedKey!: AddMachineKeyResponse.AsObject;
+
+    constructor(
+        public dialogRef: MatDialogRef<ShowKeyDialogComponent>,
+        @Inject(MAT_DIALOG_DATA) public data: any,
+    ) {
+        this.addedKey = data.key;
+    }
+
+    public saveFile(): void {
+        const json = atob(this.addedKey.keyDetails.toString());
+        const blob = new Blob([json], { type: 'text/plain;charset=utf-8' });
+        saveAs(blob, `${this.addedKey.id}.json`);
+    }
+
+    public closeDialog(): void {
+        this.dialogRef.close(false);
+    }
+}
@@ -0,0 +1,20 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
+import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module';
+import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date-pipe.module';
+
+import { ShowKeyDialogComponent } from './show-key-dialog.component';
+
+@NgModule({
+    declarations: [ShowKeyDialogComponent],
+    imports: [
+        CommonModule,
+        TranslateModule,
+        MatButtonModule,
+        LocalizedDatePipeModule,
+        TimestampToDatePipeModule,
+    ],
+})
+export class ShowKeyDialogModule { }