mirror of
https://github.com/zitadel/zitadel.git
synced 2025-01-07 22:58:02 +00:00
fix(console): asset path on signout route, stop event propagation in actions table (#4016)
fix: asset path, stop event propagation in actions table
This commit is contained in:
parent
5da72dee92
commit
0cc548e3f8
@ -1,22 +1,28 @@
|
|||||||
<cnsl-refresh-table [hideRefresh]="true" [loading]="loading$ | async" (refreshed)="refreshPage()"
|
<cnsl-refresh-table
|
||||||
[dataSize]="dataSource?.data?.length ?? 0" [timestamp]="actionsResult?.details?.viewTimestamp"
|
[hideRefresh]="true"
|
||||||
[selection]="selection">
|
[loading]="loading$ | async"
|
||||||
|
(refreshed)="refreshPage()"
|
||||||
|
[dataSize]="dataSource?.data?.length ?? 0"
|
||||||
|
[timestamp]="actionsResult?.details?.viewTimestamp"
|
||||||
|
[selection]="selection"
|
||||||
|
>
|
||||||
<div actions *ngIf="selection.isEmpty()">
|
<div actions *ngIf="selection.isEmpty()">
|
||||||
<a class="cnsl-action-button" color="primary" mat-raised-button (click)="openAddAction()">
|
<a class="cnsl-action-button" color="primary" mat-raised-button (click)="openAddAction()">
|
||||||
<mat-icon class="icon">add</mat-icon>{{ 'ACTIONS.NEW' | translate }}
|
<mat-icon class="icon">add</mat-icon>{{ 'ACTIONS.NEW' | translate }}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div actions *ngIf="!selection.isEmpty()">
|
<div actions *ngIf="!selection.isEmpty()">
|
||||||
<button class="margin-right action-state-btn cnsl-action-button bg-state inactive" mat-raised-button
|
<button
|
||||||
(click)="deactivateSelection()">
|
class="margin-right action-state-btn cnsl-action-button bg-state inactive"
|
||||||
|
mat-raised-button
|
||||||
|
(click)="deactivateSelection()"
|
||||||
|
>
|
||||||
<span>{{ 'ACTIONS.DEACTIVATE' | translate }}</span>
|
<span>{{ 'ACTIONS.DEACTIVATE' | translate }}</span>
|
||||||
<cnsl-action-keys (actionTriggered)="deactivateSelection()" [type]="ActionKeysType.DEACTIVATE">
|
<cnsl-action-keys (actionTriggered)="deactivateSelection()" [type]="ActionKeysType.DEACTIVATE"> </cnsl-action-keys>
|
||||||
</cnsl-action-keys>
|
|
||||||
</button>
|
</button>
|
||||||
<button class="action-state-btn cnsl-action-button bg-state active" mat-raised-button (click)="activateSelection()">
|
<button class="action-state-btn cnsl-action-button bg-state active" mat-raised-button (click)="activateSelection()">
|
||||||
<span>{{ 'ACTIONS.REACTIVATE' | translate }}</span>
|
<span>{{ 'ACTIONS.REACTIVATE' | translate }}</span>
|
||||||
<cnsl-action-keys (actionTriggered)="activateSelection()" [type]="ActionKeysType.REACTIVATE">
|
<cnsl-action-keys (actionTriggered)="activateSelection()" [type]="ActionKeysType.REACTIVATE"> </cnsl-action-keys>
|
||||||
</cnsl-action-keys>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -24,48 +30,61 @@
|
|||||||
<table class="table" mat-table [dataSource]="dataSource">
|
<table class="table" mat-table [dataSource]="dataSource">
|
||||||
<ng-container matColumnDef="select">
|
<ng-container matColumnDef="select">
|
||||||
<th mat-header-cell *matHeaderCellDef class="action-select-cell">
|
<th mat-header-cell *matHeaderCellDef class="action-select-cell">
|
||||||
<mat-checkbox color="primary" (change)="$event ? masterToggle() : null"
|
<mat-checkbox
|
||||||
|
color="primary"
|
||||||
|
(change)="$event ? masterToggle() : null"
|
||||||
[checked]="selection.hasValue() && isAllSelected()"
|
[checked]="selection.hasValue() && isAllSelected()"
|
||||||
[indeterminate]="selection.hasValue() && !isAllSelected()">
|
[indeterminate]="selection.hasValue() && !isAllSelected()"
|
||||||
|
>
|
||||||
</mat-checkbox>
|
</mat-checkbox>
|
||||||
</th>
|
</th>
|
||||||
<td mat-cell *matCellDef="let key" class="action-select-cell">
|
<td mat-cell *matCellDef="let key" class="action-select-cell">
|
||||||
<mat-checkbox color="primary" (click)="$event.stopPropagation()"
|
<mat-checkbox
|
||||||
(change)="$event ? selection.toggle(key) : null" [checked]="selection.isSelected(key)">
|
color="primary"
|
||||||
|
(click)="$event.stopPropagation()"
|
||||||
|
(change)="$event ? selection.toggle(key) : null"
|
||||||
|
[checked]="selection.isSelected(key)"
|
||||||
|
>
|
||||||
</mat-checkbox>
|
</mat-checkbox>
|
||||||
</td>
|
</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-container matColumnDef="id">
|
<ng-container matColumnDef="id">
|
||||||
<th mat-header-cell *matHeaderCellDef> {{ 'FLOWS.ID' | translate }} </th>
|
<th mat-header-cell *matHeaderCellDef>{{ 'FLOWS.ID' | translate }}</th>
|
||||||
<td mat-cell *matCellDef="let action" class="pointer"> {{ action?.id }} </td>
|
<td mat-cell *matCellDef="let action" class="pointer">{{ action?.id }}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-container matColumnDef="name">
|
<ng-container matColumnDef="name">
|
||||||
<th mat-header-cell *matHeaderCellDef> {{ 'FLOWS.NAME' | translate }} </th>
|
<th mat-header-cell *matHeaderCellDef>{{ 'FLOWS.NAME' | translate }}</th>
|
||||||
<td mat-cell *matCellDef="let action" class="pointer"> {{ action?.name }} </td>
|
<td mat-cell *matCellDef="let action" class="pointer">{{ action?.name }}</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-container matColumnDef="state">
|
<ng-container matColumnDef="state">
|
||||||
<th mat-header-cell *matHeaderCellDef> {{ 'FLOWS.STATE' | translate }} </th>
|
<th mat-header-cell *matHeaderCellDef>{{ 'FLOWS.STATE' | translate }}</th>
|
||||||
<td mat-cell *matCellDef="let action" class="pointer">
|
<td mat-cell *matCellDef="let action" class="pointer">
|
||||||
<span class="state"
|
<span
|
||||||
[ngClass]="{'active': action.state === ActionState.ACTION_STATE_ACTIVE,'inactive': action.state === ActionState.ACTION_STATE_INACTIVE }">
|
class="state"
|
||||||
{{'FLOWS.STATES.'+action.state | translate}}</span>
|
[ngClass]="{
|
||||||
|
active: action.state === ActionState.ACTION_STATE_ACTIVE,
|
||||||
|
inactive: action.state === ActionState.ACTION_STATE_INACTIVE
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
{{ 'FLOWS.STATES.' + action.state | translate }}</span
|
||||||
|
>
|
||||||
</td>
|
</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-container matColumnDef="timeout">
|
<ng-container matColumnDef="timeout">
|
||||||
<th mat-header-cell *matHeaderCellDef> {{ 'FLOWS.TIMEOUT' | translate }} </th>
|
<th mat-header-cell *matHeaderCellDef>{{ 'FLOWS.TIMEOUT' | translate }}</th>
|
||||||
<td mat-cell *matCellDef="let key" class="pointer">
|
<td mat-cell *matCellDef="let key" class="pointer">
|
||||||
{{key.timeout | durationToSeconds}}
|
{{ key.timeout | durationToSeconds }}
|
||||||
</td>
|
</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-container matColumnDef="allowedToFail">
|
<ng-container matColumnDef="allowedToFail">
|
||||||
<th mat-header-cell *matHeaderCellDef> {{ 'FLOWS.ALLOWEDTOFAIL' | translate }} </th>
|
<th mat-header-cell *matHeaderCellDef>{{ 'FLOWS.ALLOWEDTOFAIL' | translate }}</th>
|
||||||
<td mat-cell *matCellDef="let action" class="pointer">
|
<td mat-cell *matCellDef="let action" class="pointer">
|
||||||
{{action.allowedToFail}}
|
{{ action.allowedToFail }}
|
||||||
</td>
|
</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
@ -73,8 +92,14 @@
|
|||||||
<th mat-header-cell *matHeaderCellDef></th>
|
<th mat-header-cell *matHeaderCellDef></th>
|
||||||
<td mat-cell *matCellDef="let action" class="pointer">
|
<td mat-cell *matCellDef="let action" class="pointer">
|
||||||
<cnsl-table-actions>
|
<cnsl-table-actions>
|
||||||
<button [disabled]="(['action.write'] | hasRole | async) === false" actions
|
<button
|
||||||
matTooltip="{{'ACTIONS.REMOVE' | translate}}" color="warn" (click)="deleteAction(action)" mat-icon-button>
|
[disabled]="(['action.write'] | hasRole | async) === false"
|
||||||
|
actions
|
||||||
|
matTooltip="{{ 'ACTIONS.REMOVE' | translate }}"
|
||||||
|
color="warn"
|
||||||
|
(click)="$event.stopPropagation(); deleteAction(action)"
|
||||||
|
mat-icon-button
|
||||||
|
>
|
||||||
<i class="las la-trash"></i>
|
<i class="las la-trash"></i>
|
||||||
</button>
|
</button>
|
||||||
</cnsl-table-actions>
|
</cnsl-table-actions>
|
||||||
@ -82,12 +107,17 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
<tr class="highlight" mat-row *matRowDef="let action; columns: displayedColumns;" (click)="openDialog(action)">
|
<tr class="highlight" mat-row *matRowDef="let action; columns: displayedColumns" (click)="openDialog(action)"></tr>
|
||||||
</tr>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<cnsl-paginator #paginator class="paginator" [timestamp]="actionsResult?.details?.viewTimestamp"
|
<cnsl-paginator
|
||||||
[length]="actionsResult?.details?.totalResult || 0" [pageSize]="20" [pageSizeOptions]="[10, 20, 50, 100]"
|
#paginator
|
||||||
(page)="changePage($event)"></cnsl-paginator>
|
class="paginator"
|
||||||
</cnsl-refresh-table>
|
[timestamp]="actionsResult?.details?.viewTimestamp"
|
||||||
|
[length]="actionsResult?.details?.totalResult || 0"
|
||||||
|
[pageSize]="20"
|
||||||
|
[pageSizeOptions]="[10, 20, 50, 100]"
|
||||||
|
(page)="changePage($event)"
|
||||||
|
></cnsl-paginator>
|
||||||
|
</cnsl-refresh-table>
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
<div class="signed-out-wrap">
|
<div class="signed-out-wrap">
|
||||||
<div class="block">
|
<div class="block">
|
||||||
<div class="signed-out-header">
|
<div class="signed-out-header">
|
||||||
<img alt="zitadel logo" *ngIf="dark; else lighttheme" src="../../../assets/images/zitadel-logo-light.svg" />
|
<img alt="zitadel logo" *ngIf="dark; else lighttheme" src="./assets/images/zitadel-logo-light.svg" />
|
||||||
<ng-template #lighttheme>
|
<ng-template #lighttheme>
|
||||||
<img alt="zitadel logo" src="../../../assets/images/zitadel-logo-dark.svg" />
|
<img alt="zitadel logo" src="./assets/images/zitadel-logo-dark.svg" />
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<p class="cnsl-secondary-text">{{ 'USER.SIGNEDOUT' | translate }}</p>
|
<p class="cnsl-secondary-text">{{ 'USER.SIGNEDOUT' | translate }}</p>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user