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-09 23:55: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,34 @@
+<span class="title" mat-dialog-title>{{'USER.MACHINE.ADD.TITLE' | translate}}</span>
+<div mat-dialog-content>
+    <p class="desc"> {{'USER.MACHINE.ADD.DESCRIPTION' | translate}}</p>
+
+    <cnsl-form-field class="form-field" appearance="outline">
+        <cnsl-label>{{'USER.MACHINE.TYPE' | translate}}</cnsl-label>
+        <mat-select [(ngModel)]="type">
+            <mat-option *ngFor="let t of types" [value]="t">
+                {{'USER.MACHINE.KEYTYPES.'+t | translate}}
+            </mat-option>
+        </mat-select>
+    </cnsl-form-field>
+
+    <cnsl-form-field class="form-field" appearance="outline">
+        <cnsl-label>{{'USER.MACHINE.CHOOSEEXPIRY' | translate}} (optional)</cnsl-label>
+        <input cnslInput [matDatepicker]="picker" [min]="startDate" [formControl]="dateControl">
+        <mat-datepicker-toggle style="top: 0;" cnslSuffix [for]="picker"></mat-datepicker-toggle>
+        <mat-datepicker #picker startView="year" [startAt]="startDate"></mat-datepicker>
+        <span cnsl-error *ngIf="dateControl?.errors?.matDatepickerMin?.min">
+            {{'USER.MACHINE.CHOOSEDATEAFTER' | translate}}:
+            {{dateControl?.errors?.matDatepickerMin.min.toDate() | localizedDate: 'EEE dd. MMM'}}
+        </span>
+    </cnsl-form-field>
+</div>
+<div mat-dialog-actions class=" action">
+    <button mat-button (click)="closeDialog()">
+        {{'ACTIONS.CANCEL' | translate}}
+    </button>
+
+    <button color="primary" mat-raised-button class="ok-button" [disabled]="type == undefined || dateControl.invalid"
+        (click)="closeDialogWithSuccess()">
+        {{'ACTIONS.ADD' | translate}}
+    </button>
+</div>
@@ -0,0 +1,22 @@
+.title {
+  font-size: 1.2rem;
+  margin-top: 0;
+}
+
+.desc {
+  color: var(--grey);
+  font-size: .9rem;
+}
+
+.form-field {
+  width: 100%;
+}
+
+.action {
+  display: flex;
+  justify-content: flex-end;
+
+  .ok-button {
+    margin-left: .5rem;
+  }
+}
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { AddKeyDialogComponent } from './add-key-dialog.component';
+
+describe('AddKeyDialogComponent', () => {
+    let component: AddKeyDialogComponent;
+    let fixture: ComponentFixture<AddKeyDialogComponent>;
+
+    beforeEach(waitForAsync(() => {
+        TestBed.configureTestingModule({
+            declarations: [AddKeyDialogComponent],
+        })
+            .compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(AddKeyDialogComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
@@ -0,0 +1,44 @@
+import { Component, Inject } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { AuthNKeyType, MachineKeyType } from 'src/app/proto/generated/management_pb';
+
+export enum AddKeyDialogType {
+    MACHINE = "MACHINE",
+    AUTHNKEY = "AUTHNKEY",
+}
+
+@Component({
+    selector: 'app-add-key-dialog',
+    templateUrl: './add-key-dialog.component.html',
+    styleUrls: ['./add-key-dialog.component.scss'],
+})
+export class AddKeyDialogComponent {
+    public startDate: Date = new Date();
+    types: MachineKeyType[] | AuthNKeyType[] = [];
+    public type!: MachineKeyType | AuthNKeyType;
+    public dateControl: FormControl = new FormControl('', []);
+
+    constructor(
+        public dialogRef: MatDialogRef<AddKeyDialogComponent>,
+        @Inject(MAT_DIALOG_DATA) public data: any,
+    ) {
+        if (data.type = AddKeyDialogType.MACHINE) {
+            this.types = [MachineKeyType.MACHINEKEY_JSON];
+            this.type = MachineKeyType.MACHINEKEY_JSON;
+        } else if (data.type = AddKeyDialogType.AUTHNKEY) {
+            this.types = [AuthNKeyType.AUTHNKEY_JSON];
+            this.type = AuthNKeyType.AUTHNKEY_JSON;
+        }
+        const today = new Date();
+        this.startDate.setDate(today.getDate() + 1);
+    }
+
+    public closeDialog(): void {
+        this.dialogRef.close(false);
+    }
+
+    public closeDialogWithSuccess(): void {
+        this.dialogRef.close({ type: this.type, date: this.dateControl.value });
+    }
+}
@@ -0,0 +1,31 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatMomentDateModule } from '@angular/material-moment-adapter';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSelectModule } from '@angular/material/select';
+import { TranslateModule } from '@ngx-translate/core';
+import { InputModule } from 'src/app/modules/input/input.module';
+import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module';
+
+import { AddKeyDialogComponent } from './add-key-dialog.component';
+
+@NgModule({
+    declarations: [AddKeyDialogComponent],
+    imports: [
+        CommonModule,
+        TranslateModule,
+        MatButtonModule,
+        InputModule,
+        MatSelectModule,
+        MatIconModule,
+        FormsModule,
+        MatDatepickerModule,
+        MatMomentDateModule,
+        ReactiveFormsModule,
+        LocalizedDatePipeModule,
+    ],
+})
+export class AddKeyDialogModule { }