feat(console): v2 feature cleanup, fix styling issues, instance naming (#3530)

* new console

* move npm ci to angular build

* rel path for assets

* local grpc copy

* login policy, rm clear views, features rel path

* login_hint param

* edit default color values

* remove features, zitadel-tier, contact styles

* html formatter

* rm feature restrictions, fix theming issues

* instance naming

* statehandler

* rm class

* rm class

* update footer links

* statehandler

* stroked color

Co-authored-by: Livio Amstutz <[email protected]>
This commit is contained in:
Max Peintner
2022-04-29 10:25:12 +02:00
committed by GitHub
co-authored by Livio Amstutz
parent f9e79ef8fe
commit 41e60b3d8a
93 changed files with 5256 additions and 13100 deletions
@@ -10,9 +10,9 @@ import { PaginatorComponent } from 'src/app/modules/paginator/paginator.componen
import { WarnDialogComponent } from 'src/app/modules/warn-dialog/warn-dialog.component';
import { Action, ActionState } from 'src/app/proto/generated/zitadel/action_pb';
import {
CreateActionRequest,
ListActionsResponse,
UpdateActionRequest,
CreateActionRequest,
ListActionsResponse,
UpdateActionRequest,
} from 'src/app/proto/generated/zitadel/management_pb';
import { ManagementService } from 'src/app/services/mgmt.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -49,7 +49,7 @@ export class ActionTableComponent implements OnInit {
});
}
public ngOnInit(): void {
ngOnInit(): void {
this.getData(10, 0);
}
@@ -1,80 +1,84 @@
<div class="max-width-container">
<div class="enlarged-container">
<h1>{{ 'FLOWS.TITLE' | translate }}</h1>
<p class="desc cnsl-secondary-text">{{'FLOWS.DESCRIPTION' | translate }}</p>
<p class="desc cnsl-secondary-text">{{ 'FLOWS.DESCRIPTION' | translate }}</p>
<cnsl-info-section class=" max-actions" *ngIf="maxActions">{{'FLOWS.ACTIONSMAX' | translate: ({value: maxActions})
}}
<cnsl-info-section class="max-actions" *ngIf="maxActions"
>{{ 'FLOWS.ACTIONSMAX' | translate: { value: maxActions } }}
</cnsl-info-section>
<cnsl-info-section *ngIf="(['actions'] | hasFeature | async) === false" [featureLink]="['/org/features']"
class="info" [type]="InfoSectionType.WARN">
<span [innerHTML]="'FEATURES.NOTAVAILABLE' | translate: ({value: 'actions'})"></span>
</cnsl-info-section>
<ng-template cnslHasRole [hasRole]="[ 'org.action.read']">
<cnsl-card title="{{'FLOWS.ACTIONSTITLE' | translate}}" description="{{'FLOWS.ACTIONSDESCRIPTION' | translate}}">
<ng-template cnslHasRole [hasRole]="['org.action.read']">
<cnsl-card title="{{ 'FLOWS.ACTIONSTITLE' | translate }}" description="{{ 'FLOWS.ACTIONSDESCRIPTION' | translate }}">
<cnsl-action-table (changedSelection)="selection = $event"></cnsl-action-table>
</cnsl-card>
</ng-template>
<div class="title-section">
<h2>{{'FLOWS.FLOWSTITLE' | translate}}</h2>
<h2>{{ 'FLOWS.FLOWSTITLE' | translate }}</h2>
<i class="las la-exchange-alt"></i>
</div>
<p class="desc cnsl-secondary-text">{{'FLOWS.FLOWSDESCRIPTION' | translate}}</p>
<p class="desc cnsl-secondary-text">{{ 'FLOWS.FLOWSDESCRIPTION' | translate }}</p>
<ng-template cnslHasRole [hasRole]="[ 'org.flow.read']">
<ng-template cnslHasRole [hasRole]="['org.flow.read']">
<div *ngIf="flow" class="flow">
<cnsl-form-field class="formfield" appearance="outline">
<cnsl-label>{{ 'FLOWS.FLOWTYPE' | translate }}</cnsl-label>
<mat-select [formControl]="typeControl">
<mat-option *ngFor="let type of typesForSelection" [value]="type">
{{ 'FLOWS.TYPES.'+type | translate }}
{{ 'FLOWS.TYPES.' + type | translate }}
</mat-option>
</mat-select>
</cnsl-form-field>
<div *ngIf="flow" class="trigger-wrapper">
<div class="topbottomline"></div>
<div class="flow-type">
<i class="type-icon las la-dot-circle"></i>
<span>{{'FLOWS.TYPES.'+flow.type | translate}}</span>
<button matTooltip="{{'ACTIONS.CLEAR' | translate}}" mat-icon-button color="warn" (click)="clearFlow()"><i
class="type-button-icon las la-trash"></i></button>
<span>{{ 'FLOWS.TYPES.' + flow.type | translate }}</span>
<button matTooltip="{{ 'ACTIONS.CLEAR' | translate }}" mat-icon-button color="warn" (click)="clearFlow()">
<i class="type-button-icon las la-trash"></i>
</button>
</div>
<cnsl-card *ngFor="let trigger of flow.triggerActionsList; index as i" class="trigger">
<div class="trigger-top">
<mat-icon svgIcon="mdi_arrow_right_bottom" class="icon"></mat-icon>
<span>{{'FLOWS.TRIGGERTYPES.'+trigger.triggerType | translate}}</span>
<span>{{ 'FLOWS.TRIGGERTYPES.' + trigger.triggerType | translate }}</span>
</div>
<span class="fill-space"></span>
<div class="flow-action-wrapper" cdkDropList (cdkDropListDropped)="drop(i, trigger.actionsList, $event)">
<div cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".action-wrapper" class="flow-action"
*ngFor="let action of trigger.actionsList">
<div
cdkDrag
cdkDragLockAxis="y"
cdkDragBoundary=".action-wrapper"
class="flow-action"
*ngFor="let action of trigger.actionsList"
>
<i class="las la-code"></i>
<span class="flow-action-name">{{action.name}}</span>
<span class="flow-action-name">{{ action.name }}</span>
<span class="fill-space"></span>
<span class="state"
[ngClass]="{'active': action.state === ActionState.ACTION_STATE_ACTIVE,'inactive': action.state === ActionState.ACTION_STATE_INACTIVE }">
{{'FLOWS.STATES.'+action.state | translate}}</span>
<span
class="state"
[ngClass]="{
active: action.state === ActionState.ACTION_STATE_ACTIVE,
inactive: action.state === ActionState.ACTION_STATE_INACTIVE
}"
>
{{ 'FLOWS.STATES.' + action.state | translate }}</span
>
</div>
</div>
</cnsl-card>
<button class="add-btn cnsl-action-button" mat-raised-button color="primary" (click)="openAddTrigger()">
<mat-icon>add</mat-icon>
<span>{{'FLOWS.ADDTRIGGER' | translate}}</span>
<span *ngIf="selection && selection.length">&nbsp;({{selection.length}})</span>
<span>{{ 'FLOWS.ADDTRIGGER' | translate }}</span>
<span *ngIf="selection && selection.length">&nbsp;({{ selection.length }})</span>
</button>
</div>
</div>
</ng-template>
</div>
</div>
</div>
@@ -22,7 +22,6 @@ import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.
import { TableActionsModule } from 'src/app/modules/table-actions/table-actions.module';
import { WarnDialogModule } from 'src/app/modules/warn-dialog/warn-dialog.module';
import { DurationToSecondsPipeModule } from 'src/app/pipes/duration-to-seconds-pipe/duration-to-seconds-pipe.module';
import { HasFeaturePipeModule } from 'src/app/pipes/has-feature-pipe/has-feature-pipe.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
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';
@@ -63,7 +62,6 @@ import { AddFlowDialogComponent } from './add-flow-dialog/add-flow-dialog.compon
InfoSectionModule,
HasRolePipeModule,
TableActionsModule,
HasFeaturePipeModule,
CodemirrorModule,
],
})
@@ -1,51 +1,69 @@
<div class="max-width-container">
<ng-container *ngIf="(['org.write$'] | hasRole) as canwrite$">
<ng-container *ngIf="['org.write$'] | hasRole as canwrite$">
<div class="domain-top-view">
<div>
<div class="domain-title-row">
<h1>{{ 'ORG.DOMAINS.TITLE' | translate }}</h1>
<a mat-icon-button
<a
mat-icon-button
href="https://docs.zitadel.ch/docs/guides/basics/organizations#how-zitadel-handles-usernames"
rel="noreferrer" target="_blank">
rel="noreferrer"
target="_blank"
>
<i class="las la-info-circle"></i>
</a>
</div>
<p class="desc cnsl-secondary-text">{{ 'ORG.DOMAINS.DESCRIPTION' | translate }}</p>
</div>
<span class=" fill-space"></span>
<span class="fill-space"></span>
<button [disabled]="(canwrite$ | async) === false || (['custom_domain'] | hasFeature | async) === false"
matTooltip="Add domain" mat-raised-button color="primary" class="cnsl-action-button" (click)="addNewDomain()">
<button
[disabled]="(canwrite$ | async) === false"
matTooltip="Add domain"
mat-raised-button
color="primary"
class="cnsl-action-button"
(click)="addNewDomain()"
>
<mat-icon>add</mat-icon>
<span>{{'ACTIONS.NEW' | translate}}</span>
<cnsl-action-keys (actionTriggered)="addNewDomain()">
</cnsl-action-keys>
<span>{{ 'ACTIONS.NEW' | translate }}</span>
<cnsl-action-keys (actionTriggered)="addNewDomain()"> </cnsl-action-keys>
</button>
</div>
<cnsl-info-section *ngIf="(['custom_domain'] | hasFeature | async) === false" [featureLink]="['/org/features']"
class="info" [type]="InfoSectionType.WARN">
<span [innerHTML]="'FEATURES.NOTAVAILABLE' | translate: ({value: 'custom_domain'})"></span>
</cnsl-info-section>
<cnsl-card *ngFor="let domain of domains" class="domain-card">
<div class="domain">
<span class="title">{{domain.domainName}}</span>
<span class="title">{{ domain.domainName }}</span>
<i matTooltip="verified" *ngIf="domain.isVerified" class="verified las la-check-circle"></i>
<i matTooltip="primary" *ngIf="domain.isPrimary" class="primary las la-star"></i>
<a *ngIf="domain.isVerified && !domain.isPrimary && (canwrite$ | async)" class="primaryset"
(click)="setPrimary(domain)">{{'ORG.DOMAINS.SETPRIMARY' | translate}}</a>
<a
*ngIf="domain.isVerified && !domain.isPrimary && (canwrite$ | async)"
class="primaryset"
(click)="setPrimary(domain)"
>{{ 'ORG.DOMAINS.SETPRIMARY' | translate }}</a
>
<span class="fill-space"></span>
<button mat-icon-button [disabled]="(canwrite$ | async) === false || domain.isVerified"
*ngIf="(canwrite$ | async) && (['custom_domain'] | hasFeature | async)" (click)="verifyDomain(domain)">
<button
mat-icon-button
[disabled]="(canwrite$ | async) === false || domain.isVerified"
*ngIf="canwrite$ | async"
(click)="verifyDomain(domain)"
>
<i class="las la-pen"></i>
</button>
<button class="domain-rem-button" [disabled]="(canwrite$ | async) === false || domain.isPrimary"
matTooltip="Remove domain" color="warn" mat-icon-button (click)="removeDomain(domain.domainName)"><i
class="las la-trash"></i></button>
<button
class="domain-rem-button"
[disabled]="(canwrite$ | async) === false || domain.isPrimary"
matTooltip="Remove domain"
color="warn"
mat-icon-button
(click)="removeDomain(domain.domainName)"
>
<i class="las la-trash"></i>
</button>
</div>
</cnsl-card>
</ng-container>
</div>
</div>
@@ -11,7 +11,6 @@ import { CardModule } from 'src/app/modules/card/card.module';
import { InfoSectionModule } from 'src/app/modules/info-section/info-section.module';
import { InputModule } from 'src/app/modules/input/input.module';
import { SharedModule } from 'src/app/modules/shared/shared.module';
import { HasFeaturePipeModule } from 'src/app/pipes/has-feature-pipe/has-feature-pipe.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
import { AddDomainDialogModule } from './add-domain-dialog/add-domain-dialog.module';
@@ -28,7 +27,6 @@ import { DomainsComponent } from './domains.component';
CommonModule,
MatIconModule,
CardModule,
HasFeaturePipeModule,
HasRolePipeModule,
ActionKeysModule,
InfoSectionModule,
@@ -15,7 +15,6 @@ import { PaginatorModule } from 'src/app/modules/paginator/paginator.module';
import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.module';
import { SharedModule } from 'src/app/modules/shared/shared.module';
import { TableActionsModule } from 'src/app/modules/table-actions/table-actions.module';
import { HasFeaturePipeModule } from 'src/app/pipes/has-feature-pipe/has-feature-pipe.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
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';
@@ -32,7 +31,6 @@ import { FailedEventsComponent } from './failed-events.component';
TableActionsModule,
MatIconModule,
CardModule,
HasFeaturePipeModule,
HasRolePipeModule,
PaginatorModule,
MatButtonModule,
+18 -10
View File
@@ -1,12 +1,12 @@
<div class="max-width-container">
<div class="home-wrapper enlarged-container">
<div class="header">
<h1 class="title">{{'HOME.WELCOME' | translate}}</h1>
<h1 class="title">{{ 'HOME.WELCOME' | translate }}</h1>
</div>
<cnsl-shortcuts></cnsl-shortcuts>
<p class="disclaimer cnsl-secondary-text">{{'HOME.DISCLAIMER' | translate}} </p>
<p class="disclaimer cnsl-secondary-text">{{ 'HOME.DISCLAIMER' | translate }}</p>
<span class="fill-space"></span>
<div class="home-grid-container">
@@ -14,24 +14,32 @@
<div class="grid-item-avatar blue">
<i class="icon las la-file-alt"></i>
</div>
<span>{{'HOME.DOCUMENTATION.TITLE' | translate}}</span>
<span>{{ 'HOME.DOCUMENTATION.TITLE' | translate }}</span>
</a>
<a href="https://docs.zitadel.ch/docs/guides/basics/get-started/" target="_blank" rel="noreferrer"
class="grid-item green">
<a
href="https://docs.zitadel.ch/docs/guides/basics/get-started/"
target="_blank"
rel="noreferrer"
class="grid-item green"
>
<div class="grid-item-avatar green">
<i class="icon las la-play"></i>
</div>
<span>{{'HOME.GETSTARTED.TITLE' | translate}}</span>
<span>{{ 'HOME.GETSTARTED.TITLE' | translate }}</span>
</a>
<a href="https://docs.zitadel.ch/docs/quickstarts/introduction" target="_blank" rel="noreferrer"
class="grid-item green">
<a
href="https://docs.zitadel.ch/docs/quickstarts/introduction"
target="_blank"
rel="noreferrer"
class="grid-item green"
>
<div class="grid-item-avatar green">
<i class="icon las la-play"></i>
</div>
<span>{{'HOME.QUICKSTARTS.TITLE' | translate}}</span>
<span>{{ 'HOME.QUICKSTARTS.TITLE' | translate }}</span>
</a>
</div>
</div>
</div>
</div>
@@ -15,7 +15,6 @@ import { PaginatorModule } from 'src/app/modules/paginator/paginator.module';
import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.module';
import { SharedModule } from 'src/app/modules/shared/shared.module';
import { TableActionsModule } from 'src/app/modules/table-actions/table-actions.module';
import { HasFeaturePipeModule } from 'src/app/pipes/has-feature-pipe/has-feature-pipe.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
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';
@@ -32,7 +31,6 @@ import { IamViewsComponent } from './iam-views.component';
TableActionsModule,
MatIconModule,
CardModule,
HasFeaturePipeModule,
HasRolePipeModule,
MatButtonModule,
CopyToClipboardModule,
@@ -48,5 +46,6 @@ import { IamViewsComponent } from './iam-views.component';
MatTableModule,
MatSortModule,
],
exports: [],
})
export class IamViewsModule {}
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { AuthGuard } from 'src/app/guards/auth.guard';
import { RoleGuard } from 'src/app/guards/role.guard';
import { FeatureServiceType } from 'src/app/modules/features/features.component';
import { PolicyComponentServiceType, PolicyComponentType } from 'src/app/modules/policies/policy-component-types.enum';
import { IamComponent } from './iam.component';
@@ -24,14 +23,6 @@ const routes: Routes = [
roles: ['iam.member.read'],
},
},
{
path: 'features',
loadChildren: () => import('src/app/modules/features/features.module').then((m) => m.FeaturesModule),
data: {
roles: ['iam.features.read'],
serviceType: FeatureServiceType.ADMIN,
},
},
{
path: 'idp',
children: [
+15 -12
View File
@@ -3,23 +3,26 @@
<div class="iam-top-row">
<div>
<div class="iam-title-row">
<h1 class="iam-title">{{'IAM.POLICIES.TITLE' | translate}}</h1>
<h1 class="iam-title">{{ 'IAM.POLICIES.TITLE' | translate }}</h1>
</div>
<p class="iam-sub cnsl-secondary-text">{{'IAM.POLICIES.DESCRIPTION' | translate}}</p>
<p class="iam-sub cnsl-secondary-text">{{ 'IAM.POLICIES.DESCRIPTION' | translate }}</p>
</div>
<span class="fill-space"></span>
<cnsl-contributors [totalResult]="totalMemberResult" [loading]="loading$ | async"
[membersSubject]="membersSubject" title="{{ 'PROJECT.MEMBER.TITLE' | translate }}"
description="{{ 'PROJECT.MEMBER.TITLEDESC' | translate }}" (addClicked)="openAddMember()"
(showDetailClicked)="showDetail()" (refreshClicked)="loadMembers()" [disabled]="false">
<cnsl-contributors
[totalResult]="totalMemberResult"
[loading]="loading$ | async"
[membersSubject]="membersSubject"
title="{{ 'PROJECT.MEMBER.TITLE' | translate }}"
description="{{ 'PROJECT.MEMBER.TITLEDESC' | translate }}"
(addClicked)="openAddMember()"
(showDetailClicked)="showDetail()"
(refreshClicked)="loadMembers()"
[disabled]="false"
>
</cnsl-contributors>
</div>
</div>
</div>
<div class="max-width-container">
<h1 class="iam-subtitle">{{'FEATURES.TITLE' | translate}}</h1>
<p class="iam-top-desc cnsl-secondary-text">{{'FEATURES.DESCRIPTION' | translate}} </p>
<cnsl-zitadel-tier [features]="features" [iam]="true"></cnsl-zitadel-tier>
<cnsl-policy-grid class="policies" [type]="PolicyComponentServiceType.ADMIN"></cnsl-policy-grid>
</div>
<cnsl-policy-grid [type]="PolicyComponentServiceType.ADMIN"></cnsl-policy-grid>
</div>
@@ -52,8 +52,3 @@
text-transform: uppercase;
margin-top: 2rem;
}
.policies {
display: block;
padding-top: 2rem;
}
-2
View File
@@ -21,7 +21,6 @@ import { MetaLayoutModule } from 'src/app/modules/meta-layout/meta-layout.module
import { PolicyGridModule } from 'src/app/modules/policy-grid/policy-grid.module';
import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.module';
import { SharedModule } from 'src/app/modules/shared/shared.module';
import { ZitadelTierModule } from 'src/app/modules/zitadel-tier/zitadel-tier.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
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';
@@ -44,7 +43,6 @@ import { IamComponent } from './iam.component';
MetaLayoutModule,
MatIconModule,
MatTableModule,
ZitadelTierModule,
InputModule,
MatSortModule,
MatTooltipModule,
@@ -10,14 +10,19 @@
<div class="org-create-main-content">
<ng-template cnslHasRole [hasRole]="['iam.write']">
<mat-slide-toggle [disabled]="currentCreateStep !== 1" class="example-margin" color="primary"
(change)="changeSelf($event)" [(ngModel)]="forSelf">
{{'ORG.PAGES.USERSELFACCOUNT' | translate}}
<mat-slide-toggle
[disabled]="currentCreateStep !== 1"
class="example-margin"
color="primary"
(change)="changeSelf($event)"
[(ngModel)]="forSelf"
>
{{ 'ORG.PAGES.USERSELFACCOUNT' | translate }}
</mat-slide-toggle>
<ng-container *ngIf="!forSelf">
<ng-container *ngIf="currentCreateStep === 1">
<h1>{{'ORG.PAGES.ORGDETAIL_TITLE' | translate}} </h1>
<h1>{{ 'ORG.PAGES.ORGDETAIL_TITLE' | translate }}</h1>
<form [formGroup]="orgForm" (ngSubmit)="next()">
<div class="content">
@@ -33,16 +38,22 @@
<div class="btn-container">
<span class="fill-space"></span>
<button [disabled]="orgForm.invalid" color="primary" mat-raised-button class="big-button"
cdkFocusInitial type="submit">
{{'ACTIONS.CONTINUE' | translate}}
<button
[disabled]="orgForm.invalid"
color="primary"
mat-raised-button
class="big-button"
cdkFocusInitial
type="submit"
>
{{ 'ACTIONS.CONTINUE' | translate }}
</button>
</div>
</form>
</ng-container>
<ng-container *ngIf="currentCreateStep === createSteps">
<h1>{{'ORG.PAGES.ORGDETAILUSER_TITLE' | translate}}</h1>
<h1>{{ 'ORG.PAGES.ORGDETAILUSER_TITLE' | translate }}</h1>
<div class="user">
<form [formGroup]="userForm" class="form">
@@ -90,7 +101,7 @@
<cnsl-label>{{ 'USER.PROFILE.GENDER' | translate }}</cnsl-label>
<mat-select formControlName="gender">
<mat-option *ngFor="let gender of genders" [value]="gender">
{{ 'GENDERS.'+gender | translate }}
{{ 'GENDERS.' + gender | translate }}
</mat-option>
</mat-select>
<span cnslError *ngIf="gender?.invalid && gender?.errors?.required">
@@ -101,7 +112,7 @@
<cnsl-label>{{ 'USER.PROFILE.PREFERRED_LANGUAGE' | translate }}</cnsl-label>
<mat-select formControlName="preferredLanguage">
<mat-option *ngFor="let language of languages" [value]="language">
{{ 'LANGUAGES.'+language | translate }}
{{ 'LANGUAGES.' + language | translate }}
</mat-option>
<span cnslError *ngIf="preferredLanguage?.invalid && preferredLanguage?.errors?.required">
{{ 'USER.VALIDATION.REQUIRED' | translate }}
@@ -109,9 +120,14 @@
</mat-select>
</cnsl-form-field>
<mat-checkbox class="checkbox" [(ngModel)]="usePassword" [ngModelOptions]="{standalone: true}"
(change)="initPwdValidators()">
{{'ORG.PAGES.USEPASSWORD' | translate}}</mat-checkbox>
<mat-checkbox
class="checkbox"
[(ngModel)]="usePassword"
[ngModelOptions]="{ standalone: true }"
(change)="initPwdValidators()"
>
{{ 'ORG.PAGES.USEPASSWORD' | translate }}</mat-checkbox
>
<ng-container *ngIf="usePassword && pwdForm">
<p class="section cnsl-secondary-text">{{ 'USER.CREATE.PASSWORDSECTION' | translate }}</p>
@@ -122,18 +138,27 @@
<form [formGroup]="pwdForm" class="pwd-form">
<cnsl-form-field class="pwd" *ngIf="password" appearance="outline">
<cnsl-label>{{ 'USER.PASSWORD.NEW' | translate }}</cnsl-label>
<input cnslInput autocomplete="off" name="firstpassword" formControlName="password"
type="password" />
<input
cnslInput
autocomplete="off"
name="firstpassword"
formControlName="password"
type="password"
/>
<span cnslError *ngIf="password?.errors?.required">
{{ 'USER.VALIDATION.REQUIRED' | translate }}
</span>
</cnsl-form-field>
<cnsl-form-field class="pwd" *ngIf="confirmPassword" appearance="outline">
<cnsl-label>{{ 'USER.PASSWORD.CONFIRM' | translate }}</cnsl-label>
<input cnslInput autocomplete="off" name="confirmPassword" formControlName="confirmPassword"
type="password" />
<input
cnslInput
autocomplete="off"
name="confirmPassword"
formControlName="confirmPassword"
type="password"
/>
<span cnslError *ngIf="confirmPassword?.errors?.required">
{{ 'USER.VALIDATION.REQUIRED' | translate }}
@@ -146,12 +171,19 @@
</ng-container>
</div>
<div class="btn-container">
<button color="primary" class="small-button" type="button" (click)="previous()" mat-stroked-button>{{
'ACTIONS.BACK' | translate }}</button>
<button color="primary" class="small-button" type="button" (click)="previous()" mat-stroked-button>
{{ 'ACTIONS.BACK' | translate }}
</button>
<span class="fill-space"></span>
<button color="primary" class="big-button" (click)="finish()"
[disabled]="orgForm.invalid || userForm.invalid || ((usePassword && pwdForm) ? pwdForm?.invalid : false)"
mat-raised-button>{{ 'ACTIONS.FINISH' | translate }}</button>
<button
color="primary"
class="big-button"
(click)="finish()"
[disabled]="orgForm.invalid || userForm.invalid || (usePassword && pwdForm ? pwdForm?.invalid : false)"
mat-raised-button
>
{{ 'ACTIONS.FINISH' | translate }}
</button>
</div>
</form>
</div>
@@ -161,7 +193,7 @@
<ng-template cnslHasRole [hasRole]="['org.create']">
<div *ngIf="forSelf">
<ng-container *ngIf="currentCreateStep === 1">
<h1>{{'ORG.PAGES.ORGDETAIL_TITLE_WITHOUT_DOMAIN' | translate}} </h1>
<h1>{{ 'ORG.PAGES.ORGDETAIL_TITLE_WITHOUT_DOMAIN' | translate }}</h1>
<form [formGroup]="orgForm" (ngSubmit)="createOrgForSelf()">
<div class="content">
@@ -173,9 +205,15 @@
<div class="btn-container">
<span class="fill-space"></span>
<button [disabled]="orgForm.invalid" color="primary" mat-raised-button class="big-button"
cdkFocusInitial type="submit">
{{'CREATE' | translate}}
<button
[disabled]="orgForm.invalid"
color="primary"
mat-raised-button
class="big-button"
cdkFocusInitial
type="submit"
>
{{ 'ACTIONS.CREATE' | translate }}
</button>
</div>
</form>
@@ -184,4 +222,4 @@
</ng-template>
</div>
</div>
</div>
</div>
@@ -1,28 +1,35 @@
<cnsl-top-view [hasBackButton]="false" title="{{org?.name}}" [isActive]="org?.state === OrgState.ORG_STATE_ACTIVE"
[isInactive]="org?.state === OrgState.ORG_STATE_INACTIVE" [hasContributors]="true"
stateTooltip="{{'ORG.STATE.'+org?.state | translate}}">
<cnsl-contributors topContributors [totalResult]="totalMemberResult" [loading]="loading$ | async"
[membersSubject]="membersSubject" title="{{ 'PROJECT.MEMBER.TITLE' | translate }}"
description="{{ 'PROJECT.MEMBER.TITLEDESC' | translate }}" (addClicked)="openAddMember()"
(showDetailClicked)="showDetail()" (refreshClicked)="loadMembers()" [disabled]="false">
<cnsl-top-view
[hasBackButton]="false"
title="{{ org?.name }}"
[isActive]="org?.state === OrgState.ORG_STATE_ACTIVE"
[isInactive]="org?.state === OrgState.ORG_STATE_INACTIVE"
[hasContributors]="true"
stateTooltip="{{ 'ORG.STATE.' + org?.state | translate }}"
>
<cnsl-contributors
topContributors
[totalResult]="totalMemberResult"
[loading]="loading$ | async"
[membersSubject]="membersSubject"
title="{{ 'PROJECT.MEMBER.TITLE' | translate }}"
description="{{ 'PROJECT.MEMBER.TITLEDESC' | translate }}"
(addClicked)="openAddMember()"
(showDetailClicked)="showDetail()"
(refreshClicked)="loadMembers()"
[disabled]="false"
>
</cnsl-contributors>
<cnsl-info-row topContent *ngIf="org" [org]="org"></cnsl-info-row>
</cnsl-top-view>
<div class="max-width-container">
<cnsl-meta-layout>
<ng-container *ngIf="['features.read'] | hasRole | async">
<h2 class="org-subtitle">{{'FEATURES.TITLE' | translate}}</h2>
<p class="org-top-desc cnsl-secondary-text">{{'FEATURES.DESCRIPTION' | translate}}</p>
<cnsl-zitadel-tier [features]="features"></cnsl-zitadel-tier>
</ng-container>
<ng-template cnslHasRole [hasRole]="['policy.read']">
<cnsl-policy-grid class="policies" [type]="PolicyComponentServiceType.MGMT"></cnsl-policy-grid>
<cnsl-policy-grid [type]="PolicyComponentServiceType.MGMT"></cnsl-policy-grid>
</ng-template>
<div metainfo>
<cnsl-changes *ngIf="org" [changeType]="ChangeType.ORG" [id]="org.id"></cnsl-changes>
</div>
</cnsl-meta-layout>
</div>
</div>
@@ -8,8 +8,3 @@
text-transform: uppercase;
margin-top: 2rem;
}
.policies {
display: block;
padding-top: 2rem;
}
@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { RoleGuard } from 'src/app/guards/role.guard';
import { FeatureServiceType } from 'src/app/modules/features/features.component';
import { PolicyComponentServiceType, PolicyComponentType } from 'src/app/modules/policies/policy-component-types.enum';
import { OrgDetailComponent } from './org-detail/org-detail.component';
@@ -30,15 +29,6 @@ const routes: Routes = [
},
],
},
{
path: 'features',
loadChildren: () => import('src/app/modules/features/features.module').then((m) => m.FeaturesModule),
canActivate: [RoleGuard],
data: {
roles: ['features.read'],
serviceType: FeatureServiceType.MGMT,
},
},
{
path: 'policy',
children: [
@@ -14,7 +14,6 @@ import { HasRoleModule } from 'src/app/directives/has-role/has-role.module';
import { MemberCreateDialogModule } from 'src/app/modules/add-member-dialog/member-create-dialog.module';
import { CardModule } from 'src/app/modules/card/card.module';
import { ContributorsModule } from 'src/app/modules/contributors/contributors.module';
import { FeaturesModule } from 'src/app/modules/features/features.module';
import { InfoRowModule } from 'src/app/modules/info-row/info-row.module';
import { InfoSectionModule } from 'src/app/modules/info-section/info-section.module';
import { InputModule } from 'src/app/modules/input/input.module';
@@ -23,11 +22,9 @@ import { PolicyGridModule } from 'src/app/modules/policy-grid/policy-grid.module
import { SharedModule } from 'src/app/modules/shared/shared.module';
import { TopViewModule } from 'src/app/modules/top-view/top-view.module';
import { WarnDialogModule } from 'src/app/modules/warn-dialog/warn-dialog.module';
import { HasFeaturePipeModule } from 'src/app/pipes/has-feature-pipe/has-feature-pipe.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
import { ChangesModule } from '../../modules/changes/changes.module';
import { ZitadelTierModule } from '../../modules/zitadel-tier/zitadel-tier.module';
import { OrgDetailComponent } from './org-detail/org-detail.component';
import { OrgsRoutingModule } from './orgs-routing.module';
@@ -53,7 +50,6 @@ import { OrgsRoutingModule } from './orgs-routing.module';
MatTooltipModule,
WarnDialogModule,
MemberCreateDialogModule,
HasFeaturePipeModule,
MatMenuModule,
ChangesModule,
MatProgressSpinnerModule,
@@ -62,8 +58,6 @@ import { OrgsRoutingModule } from './orgs-routing.module';
ContributorsModule,
CopyToClipboardModule,
PolicyGridModule,
FeaturesModule,
ZitadelTierModule,
],
})
export class OrgsModule {}
@@ -1,8 +1,12 @@
<cnsl-top-view title="{{user?.human ? user.human?.profile?.displayName :
user?.machine?.name}}" sub="{{user?.preferredLoginName}}" [isActive]="user?.state === UserState.USER_STATE_ACTIVE"
[isInactive]="user?.state === UserState.USER_STATE_INACTIVE" stateTooltip="{{'USER.STATE.'+user?.state | translate}}"
[hasBackButton]="(['org.read'] | hasRole | async)" (backRouterLink)="['/']">
<cnsl-top-view
title="{{ user?.human ? user.human?.profile?.displayName : user?.machine?.name }}"
sub="{{ user?.preferredLoginName }}"
[isActive]="user?.state === UserState.USER_STATE_ACTIVE"
[isInactive]="user?.state === UserState.USER_STATE_INACTIVE"
stateTooltip="{{ 'USER.STATE.' + user?.state | translate }}"
[hasBackButton]="['org.read'] | hasRole | async"
(backRouterLink)="(['/'])"
>
<span *ngIf="!loading && !user">{{ 'USER.PAGES.NOUSER' | translate }}</span>
<cnsl-info-row topContent *ngIf="user" [user]="user"></cnsl-info-row>
</cnsl-top-view>
@@ -15,35 +19,62 @@
<cnsl-meta-layout>
<cnsl-sidenav [(ngModel)]="currentSetting" [settingsList]="settingsList">
<ng-container *ngIf="currentSetting === 'general'">
<cnsl-card *ngIf="user && user.human && user.human.profile" class=" app-card"
title="{{ 'USER.PROFILE.TITLE' | translate }}">
<cnsl-detail-form [showEditImage]="true" [preferredLoginName]="user.preferredLoginName" [genders]="genders"
[languages]="languages" [username]="user.userName" [user]="user.human" [disabled]="false"
(changedLanguage)="changedLanguage($event)" (changeUsernameClicked)="changeUsername()"
(submitData)="saveProfile($event)">
<cnsl-card
*ngIf="user && user.human && user.human.profile"
class="app-card"
title="{{ 'USER.PROFILE.TITLE' | translate }}"
>
<cnsl-detail-form
[showEditImage]="true"
[preferredLoginName]="user.preferredLoginName"
[genders]="genders"
[languages]="languages"
[username]="user.userName"
[user]="user.human"
[disabled]="false"
(changedLanguage)="changedLanguage($event)"
(changeUsernameClicked)="changeUsername()"
(submitData)="saveProfile($event)"
>
</cnsl-detail-form>
</cnsl-card>
<cnsl-card *ngIf="user" title="{{ 'USER.LOGINMETHODS.TITLE' | translate }}"
description="{{ 'USER.LOGINMETHODS.DESCRIPTION' | translate }}">
<button class="icon-button" card-actions mat-icon-button (click)="refreshUser()"
matTooltip="{{'ACTIONS.REFRESH' | translate}}">
<cnsl-card
*ngIf="user"
title="{{ 'USER.LOGINMETHODS.TITLE' | translate }}"
description="{{ 'USER.LOGINMETHODS.DESCRIPTION' | translate }}"
>
<button
class="icon-button"
card-actions
mat-icon-button
(click)="refreshUser()"
matTooltip="{{ 'ACTIONS.REFRESH' | translate }}"
>
<mat-icon class="icon">refresh</mat-icon>
</button>
<cnsl-contact *ngIf="user.human" [human]="user.human" [state]="user.state" [canWrite]="true"
(editType)="openEditDialog($event)" (enteredPhoneCode)="enteredPhoneCode($event)"
(deletedPhone)="deletePhone()" (resendEmailVerification)="resendEmailVerification()"
(resendPhoneVerification)="resendPhoneVerification()">
<cnsl-contact
*ngIf="user.human"
[human]="user.human"
[state]="user.state"
[canWrite]="true"
(editType)="openEditDialog($event)"
(enteredPhoneCode)="enteredPhoneCode($event)"
(deletedPhone)="deletePhone()"
(resendEmailVerification)="resendEmailVerification()"
(resendPhoneVerification)="resendPhoneVerification()"
>
</cnsl-contact>
</cnsl-card>
<ng-template cnslHasRole [hasRole]="['user.self.delete']">
<cnsl-card title="{{'USER.PAGES.DELETEACCOUNT'| translate}}" [warn]="true">
<p>{{'USER.PAGES.DELETEACCOUNT_DESC'| translate}}</p>
<cnsl-card title="{{ 'USER.PAGES.DELETEACCOUNT' | translate }}" [warn]="true">
<p>{{ 'USER.PAGES.DELETEACCOUNT_DESC' | translate }}</p>
<div class="delete-account-wrapper">
<button color="warn" mat-raised-button (click)="deleteAccount()">{{'USER.PAGES.DELETEACCOUNT_BTN' |
translate}}</button>
<button color="warn" mat-raised-button (click)="deleteAccount()">
{{ 'USER.PAGES.DELETEACCOUNT_BTN' | translate }}
</button>
</div>
</cnsl-card>
</ng-template>
@@ -62,33 +93,48 @@
</ng-container>
<ng-container *ngIf="currentSetting === 'grants'">
<cnsl-card *ngIf="user?.id" title="{{ 'GRANTS.USER.TITLE' | translate }}"
description="{{'GRANTS.USER.DESCRIPTION' | translate }}">
<cnsl-user-grants [userId]="user.id" [context]="USERGRANTCONTEXT"
[displayedColumns]="['select', 'org','projectId', 'type','creationDate','changeDate', 'roleNamesList', 'actions']"
[disableWrite]="((['user.grant.write$'] | hasRole) | async) === false"
[disableDelete]="((['user.grant.delete$'] | hasRole) | async) === false">
<cnsl-card
*ngIf="user?.id"
title="{{ 'GRANTS.USER.TITLE' | translate }}"
description="{{ 'GRANTS.USER.DESCRIPTION' | translate }}"
>
<cnsl-user-grants
[userId]="user.id"
[context]="USERGRANTCONTEXT"
[displayedColumns]="[
'select',
'org',
'projectId',
'type',
'creationDate',
'changeDate',
'roleNamesList',
'actions'
]"
[disableWrite]="(['user.grant.write$'] | hasRole | async) === false"
[disableDelete]="(['user.grant.delete$'] | hasRole | async) === false"
>
</cnsl-user-grants>
</cnsl-card>
</ng-container>
<ng-container *ngIf="currentSetting === 'memberships'">
<cnsl-card *ngIf="user?.id" title="{{ 'USER.MEMBERSHIPS.TITLE' | translate }}"
description="{{'USER.MEMBERSHIPS.DESCRIPTION' | translate }}">
<cnsl-card
*ngIf="user?.id"
title="{{ 'USER.MEMBERSHIPS.TITLE' | translate }}"
description="{{ 'USER.MEMBERSHIPS.DESCRIPTION' | translate }}"
>
<cnsl-memberships-table></cnsl-memberships-table>
</cnsl-card>
</ng-container>
<ng-template cnslHasFeature [hasFeature]="['metadata.user']">
<ng-container *ngIf="currentSetting === 'metadata'">
<cnsl-metadata *ngIf="user?.id" [userId]="user.id"></cnsl-metadata>
</ng-container>
</ng-template>
<ng-container *ngIf="currentSetting === 'metadata'">
<cnsl-metadata *ngIf="user?.id" [userId]="user.id"></cnsl-metadata>
</ng-container>
</cnsl-sidenav>
<div metainfo>
<cnsl-changes class="changes" [refresh]="refreshChanges$" [changeType]="ChangeType.MYUSER">
</cnsl-changes>
<cnsl-changes class="changes" [refresh]="refreshChanges$" [changeType]="ChangeType.MYUSER"> </cnsl-changes>
</div>
</cnsl-meta-layout>
</div>
</div>
@@ -1,79 +1,79 @@
<div class="method-col">
<div class="method-row">
<div class="left">
<span class="label cnsl-secondary-text">{{ 'USER.PROFILE.PASSWORD' | translate }}</span>
<span class="name">*********</span>
<div class="contact-method-col">
<div class="contact-method-row">
<div class="left">
<span class="label cnsl-secondary-text">{{ 'USER.PROFILE.PASSWORD' | translate }}</span>
<span class="name">*********</span>
<ng-content select="[pwdAction]"></ng-content>
<ng-content select="[pwdAction]"></ng-content>
</div>
<div class="right">
<a matTooltip="{{'USER.PASSWORD.SET' | translate}}" [disabled]="!canWrite" [routerLink]="['password']"
mat-icon-button>
<i class="las la-pen"></i>
</a>
</div>
</div>
<div class="right">
<a matTooltip="{{'USER.PASSWORD.SET' | translate}}" [disabled]="!canWrite" [routerLink]="['password']"
mat-icon-button>
<i class="las la-pen"></i>
</a>
</div>
</div>
<div class="contact-method-row">
<div class="left">
<span class="label cnsl-secondary-text">{{ 'USER.EMAIL' | translate }}</span>
<span class="name">{{human?.email?.email}}</span>
<span *ngIf="human?.email?.isEmailVerified" class="contact-state verified">{{'USER.EMAILVERIFIED' |
translate}}</span>
<div *ngIf="!human?.email?.isEmailVerified" class="block">
<span class="contact-state notverified">{{'USER.NOTVERIFIED' | translate}}</span>
<div class="method-row">
<div class="left">
<span class="label cnsl-secondary-text">{{ 'USER.EMAIL' | translate }}</span>
<span class="name">{{human?.email?.email}}</span>
<span *ngIf="human?.email?.isEmailVerified" class="contact-state verified">{{'USER.EMAILVERIFIED' |
translate}}</span>
<div *ngIf="!human?.email?.isEmailVerified" class="block">
<span class="contact-state notverified">{{'USER.NOTVERIFIED' | translate}}</span>
<ng-container *ngIf="human?.email">
<a *ngIf="canWrite" class="verify cnsl-secondary-text"
matTooltip="{{'USER.LOGINMETHODS.EMAIL.RESEND' | translate}}"
(click)="emitEmailVerification()">{{'USER.LOGINMETHODS.RESENDCODE' | translate}}</a>
</ng-container>
</div>
<ng-container *ngIf="human?.email">
<a *ngIf="canWrite" class="verify cnsl-secondary-text"
matTooltip="{{'USER.LOGINMETHODS.EMAIL.RESEND' | translate}}"
(click)="emitEmailVerification()">{{'USER.LOGINMETHODS.RESENDCODE' | translate}}</a>
</ng-container>
</div>
<ng-content select="[emailAction]"></ng-content>
</div>
<ng-content select="[emailAction]"></ng-content>
<div class="right">
<button matTooltip="{{'ACTIONS.EDIT' | translate}}"
[disabled]="!canWrite || state === UserState.USER_STATE_INITIAL"
(click)="openEditDialog(EditDialogType.EMAIL)" mat-icon-button>
<i class="las la-pen"></i>
</button>
</div>
</div>
<div class="right">
<button matTooltip="{{'ACTIONS.EDIT' | translate}}"
[disabled]="!canWrite || state === UserState.USER_STATE_INITIAL" (click)="openEditDialog(EditDialogType.EMAIL)"
mat-icon-button>
<i class="las la-pen"></i>
</button>
<div class="contact-method-row">
<div class="left">
<span class="label cnsl-secondary-text">{{ 'USER.PHONE' | translate }}</span>
<span class="name">{{human?.phone?.phone ? human.phone?.phone : ('USER.PHONEEMPTY' | translate)}}</span>
<span *ngIf="human?.phone?.isPhoneVerified" class="contact-state verified">{{'USER.PHONEVERIFIED' |
translate}}</span>
<div *ngIf="human.phone?.phone && !human?.phone?.isPhoneVerified" class="block">
<span class="contact-state notverified">{{'USER.NOTVERIFIED' | translate}}</span>
<ng-container *ngIf="human?.phone?.phone">
<a *ngIf="!disablePhoneCode && canWrite" class="verify cnsl-secondary-text"
matTooltip="{{'USER.LOGINMETHODS.ENTERCODE_DESC' | translate}}"
(click)="enterCode()">{{'USER.LOGINMETHODS.ENTERCODE' | translate}}</a>
<a *ngIf="canWrite" class="verify cnsl-secondary-text"
matTooltip="{{'USER.LOGINMETHODS.PHONE.RESEND' | translate}}"
(click)="emitPhoneVerification()">{{'USER.LOGINMETHODS.RESENDCODE' | translate}}</a>
</ng-container>
</div>
<ng-content select="[phoneAction]"></ng-content>
</div>
<div class="right">
<button matTooltip="{{'ACTIONS.DELETE' | translate}}" *ngIf="human && human.phone?.phone" color="warn"
(click)="emitDeletePhone()" mat-icon-button>
<i class="las la-trash"></i>
</button>
<button matTooltip="{{'ACTIONS.EDIT' | translate}}" [disabled]="!canWrite"
(click)="openEditDialog(EditDialogType.PHONE)" mat-icon-button>
<i class="las la-pen"></i>
</button>
</div>
</div>
</div>
<div class="method-row">
<div class="left">
<span class="label cnsl-secondary-text">{{ 'USER.PHONE' | translate }}</span>
<span class="name">{{human?.phone?.phone ? human.phone?.phone : ('USER.PHONEEMPTY' | translate)}}</span>
<span *ngIf="human?.phone?.isPhoneVerified" class="contact-state verified">{{'USER.PHONEVERIFIED' |
translate}}</span>
<div *ngIf="human.phone?.phone && !human?.phone?.isPhoneVerified" class="block">
<span class="contact-state notverified">{{'USER.NOTVERIFIED' | translate}}</span>
<ng-container *ngIf="human?.phone?.phone">
<a *ngIf="!disablePhoneCode && canWrite" class="verify cnsl-secondary-text"
matTooltip="{{'USER.LOGINMETHODS.ENTERCODE_DESC' | translate}}"
(click)="enterCode()">{{'USER.LOGINMETHODS.ENTERCODE' | translate}}</a>
<a *ngIf="canWrite" class="verify cnsl-secondary-text"
matTooltip="{{'USER.LOGINMETHODS.PHONE.RESEND' | translate}}"
(click)="emitPhoneVerification()">{{'USER.LOGINMETHODS.RESENDCODE' | translate}}</a>
</ng-container>
</div>
<ng-content select="[phoneAction]"></ng-content>
</div>
<div class="right">
<button matTooltip="{{'ACTIONS.DELETE' | translate}}" *ngIf="human && human.phone?.phone" color="warn"
(click)="emitDeletePhone()" mat-icon-button>
<i class="las la-trash"></i>
</button>
<button matTooltip="{{'ACTIONS.EDIT' | translate}}" [disabled]="!canWrite"
(click)="openEditDialog(EditDialogType.PHONE)" mat-icon-button>
<i class="las la-pen"></i>
</button>
</div>
</div>
</div>
@@ -1,74 +1,84 @@
.method-col {
display: flex;
flex-direction: column;
margin: -0.5rem;
@use '@angular/material' as mat;
.method-row {
@mixin contact-theme($theme) {
$foreground: map-get($theme, foreground);
$background: map-get($theme, background);
$is-dark-theme: map-get($theme, is-dark);
$warn: map-get($theme, warn);
$warn-color: map-get($warn, default);
.contact-method-col {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.5rem;
padding-right: 0;
border-bottom: 1px solid #ffffff20;
flex-wrap: wrap;
flex-direction: column;
margin: -0.5rem;
.left {
.label {
font-size: 13px;
margin-bottom: 0.5rem;
min-width: 100px;
display: block;
}
.contact-method-row {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.5rem;
padding-right: 0;
border-bottom: 1px solid #ffffff20;
flex-wrap: wrap;
.name {
display: block;
margin-bottom: 0.5rem;
}
.contact-state {
font-size: 14px;
margin-bottom: 0.5rem;
&.verified {
color: #85d996;
.left {
.label {
font-size: 13px;
margin-bottom: 0.5rem;
min-width: 100px;
display: block;
}
&.notverified {
color: var(--warn);
margin-right: 1rem;
.name {
display: block;
margin-bottom: 0.5rem;
}
.contact-state {
font-size: 14px;
margin-bottom: 0.5rem;
&.verified {
color: #85d996;
display: block;
}
&.notverified {
color: var(--warn);
margin-right: 1rem;
}
}
.block {
display: block;
}
}
.block {
display: block;
.right {
flex-basis: 70px;
display: flex;
justify-content: flex-end;
}
}
.right {
flex-basis: 70px;
display: flex;
justify-content: flex-end;
}
.verified-icon {
font-size: 1.2rem;
line-height: 1.2rem;
height: 1.2rem;
cursor: default;
}
.verified-icon {
font-size: 1.2rem;
line-height: 1.2rem;
height: 1.2rem;
cursor: default;
}
.verify {
text-decoration: none;
font-size: 0.8rem;
border-radius: 0.5rem;
cursor: pointer;
word-wrap: none;
white-space: nowrap;
margin-right: 1rem;
.verify {
text-decoration: none;
font-size: 0.8rem;
border-radius: 0.5rem;
cursor: pointer;
word-wrap: none;
white-space: nowrap;
margin-right: 1rem;
&:hover {
text-decoration: underline;
&:hover {
color: map-get($foreground, text);
}
}
}
}
@@ -38,12 +38,11 @@ import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.mod
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 { HasFeatureModule } from '../../../directives/has-feature/has-feature.module';
import { InfoRowModule } from '../../../modules/info-row/info-row.module';
import { AuthFactorDialogComponent } from './auth-user-detail/auth-factor-dialog/auth-factor-dialog.component';
import { AuthPasswordlessComponent } from './auth-user-detail/auth-passwordless/auth-passwordless.component';
import {
DialogPasswordlessComponent,
DialogPasswordlessComponent,
} from './auth-user-detail/auth-passwordless/dialog-passwordless/dialog-passwordless.component';
import { AuthUserDetailComponent } from './auth-user-detail/auth-user-detail.component';
import { AuthUserMfaComponent } from './auth-user-detail/auth-user-mfa/auth-user-mfa.component';
@@ -106,7 +105,6 @@ import { UserMfaComponent } from './user-detail/user-mfa/user-mfa.component';
MatIconModule,
CardModule,
MatProgressSpinnerModule,
HasFeatureModule,
MatTooltipModule,
HasRoleModule,
TranslateModule,
@@ -1,20 +1,36 @@
<cnsl-top-view *ngIf="user" title="{{user?.human ? user.human?.profile?.displayName :
user?.machine?.name}}" docLink="https://docs.zitadel.ch/docs/guides/basics/projects"
sub="{{user?.preferredLoginName}}" [isActive]="user?.state === UserState.USER_STATE_ACTIVE"
[isInactive]="user?.state === UserState.USER_STATE_INACTIVE" stateTooltip="{{'USER.STATE.'+user?.state | translate}}"
(backClicked)="navigateBack()" [hasActions]="['user.write$', 'user.write:'+user?.id] | hasRole | async">
<ng-template topActions cnslHasRole [hasRole]="['user.write$', 'user.write:'+user?.id]">
<button mat-menu-item color="warn" *ngIf="user?.state === UserState.USER_STATE_LOCKED"
(click)="unlockUser()">{{'USER.PAGES.UNLOCK' |
translate}}</button>
<button mat-menu-item *ngIf="user?.state === UserState.USER_STATE_ACTIVE"
(click)="changeState(UserState.USER_STATE_INACTIVE)">{{'USER.PAGES.DEACTIVATE' |
translate}}</button>
<button mat-menu-item *ngIf="user?.state === UserState.USER_STATE_INACTIVE"
(click)="changeState(UserState.USER_STATE_ACTIVE)">{{'USER.PAGES.REACTIVATE' | translate}}</button>
<ng-template cnslHasRole [hasRole]="['user.delete$', 'user.delete:'+user?.id]">
<button mat-menu-item matTooltip="{{'USER.PAGES.DELETE' | translate}}" (click)="deleteUser()"><span
[style.color]="'var(--warn)'">{{'USER.PAGES.DELETE' | translate}}</span></button>
<cnsl-top-view
*ngIf="user"
title="{{ user?.human ? user.human?.profile?.displayName : user?.machine?.name }}"
docLink="https://docs.zitadel.ch/docs/guides/basics/projects"
sub="{{ user?.preferredLoginName }}"
[isActive]="user?.state === UserState.USER_STATE_ACTIVE"
[isInactive]="user?.state === UserState.USER_STATE_INACTIVE"
stateTooltip="{{ 'USER.STATE.' + user?.state | translate }}"
(backClicked)="navigateBack()"
[hasActions]="['user.write$', 'user.write:' + user?.id] | hasRole | async"
>
<ng-template topActions cnslHasRole [hasRole]="['user.write$', 'user.write:' + user?.id]">
<button mat-menu-item color="warn" *ngIf="user?.state === UserState.USER_STATE_LOCKED" (click)="unlockUser()">
{{ 'USER.PAGES.UNLOCK' | translate }}
</button>
<button
mat-menu-item
*ngIf="user?.state === UserState.USER_STATE_ACTIVE"
(click)="changeState(UserState.USER_STATE_INACTIVE)"
>
{{ 'USER.PAGES.DEACTIVATE' | translate }}
</button>
<button
mat-menu-item
*ngIf="user?.state === UserState.USER_STATE_INACTIVE"
(click)="changeState(UserState.USER_STATE_ACTIVE)"
>
{{ 'USER.PAGES.REACTIVATE' | translate }}
</button>
<ng-template cnslHasRole [hasRole]="['user.delete$', 'user.delete:' + user?.id]">
<button mat-menu-item matTooltip="{{ 'USER.PAGES.DELETE' | translate }}" (click)="deleteUser()">
<span [style.color]="'var(--warn)'">{{ 'USER.PAGES.DELETE' | translate }}</span>
</button>
</ng-template>
</ng-template>
<cnsl-info-row topContent *ngIf="user" [user]="user"></cnsl-info-row>
@@ -26,48 +42,83 @@
<p class="no-user-error" *ngIf="!loading && !user">{{ 'USER.PAGES.NOUSER' | translate }}</p>
<div class="max-width-container" *ngIf="user && (['user.write$','user.write:' + user.id] | hasRole) as canWrite$">
<div class="max-width-container" *ngIf="user && (['user.write$', 'user.write:' + user.id] | hasRole) as canWrite$">
<cnsl-meta-layout>
<cnsl-sidenav [(ngModel)]="currentSetting" [settingsList]="settingsList">
<div *ngIf="error" class="max-width-container">
<p>{{error}}</p>
<p>{{ error }}</p>
</div>
<div class="max-width-container">
<cnsl-info-section class="locked" *ngIf="user?.state === UserState.USER_STATE_LOCKED"
[type]="InfoSectionType.WARN">
{{'USER.PAGES.LOCKEDDESCRIPTION' | translate}}</cnsl-info-section>
<cnsl-info-section class="locked" *ngIf="user?.state === UserState.USER_STATE_LOCKED" [type]="InfoSectionType.WARN">
{{ 'USER.PAGES.LOCKEDDESCRIPTION' | translate }}</cnsl-info-section
>
<span *ngIf="!loading && !user">{{ 'USER.PAGES.NOUSER' | translate }}</span>
<ng-container *ngIf="currentSetting === 'general'">
<ng-template cnslHasRole [hasRole]="['user.read$', 'user.read:'+user?.id]">
<ng-template cnslHasRole [hasRole]="['user.read$', 'user.read:' + user?.id]">
<cnsl-card *ngIf="user.human" title="{{ 'USER.PROFILE.TITLE' | translate }}">
<cnsl-detail-form [preferredLoginName]="user.preferredLoginName"
[disabled]="(canWrite$ | async) === false" [genders]="genders" [languages]="languages"
[username]="user.userName" [user]="user.human" (submitData)="saveProfile($event)"
(changeUsernameClicked)="changeUsername()">
<cnsl-detail-form
[preferredLoginName]="user.preferredLoginName"
[disabled]="(canWrite$ | async) === false"
[genders]="genders"
[languages]="languages"
[username]="user.userName"
[user]="user.human"
(submitData)="saveProfile($event)"
(changeUsernameClicked)="changeUsername()"
>
</cnsl-detail-form>
</cnsl-card>
<cnsl-card *ngIf="user.human" title="{{ 'USER.LOGINMETHODS.TITLE' | translate }}"
description="{{ 'USER.LOGINMETHODS.DESCRIPTION' | translate }}">
<button card-actions class="icon-button" mat-icon-button (click)="refreshUser()"
matTooltip="{{'ACTIONS.REFRESH' | translate}}">
<cnsl-card
*ngIf="user.human"
title="{{ 'USER.LOGINMETHODS.TITLE' | translate }}"
description="{{ 'USER.LOGINMETHODS.DESCRIPTION' | translate }}"
>
<button
card-actions
class="icon-button"
mat-icon-button
(click)="refreshUser()"
matTooltip="{{ 'ACTIONS.REFRESH' | translate }}"
>
<mat-icon class="icon">refresh</mat-icon>
</button>
<cnsl-contact [disablePhoneCode]="true" [state]="user.state"
[canWrite]="(['user.write:' + user?.id, 'user.write$'] | hasRole | async)" *ngIf="user?.human"
[human]="user.human" (editType)="openEditDialog($event)" (deletedPhone)="deletePhone()"
<cnsl-contact
[disablePhoneCode]="true"
[state]="user.state"
[canWrite]="['user.write:' + user?.id, 'user.write$'] | hasRole | async"
*ngIf="user?.human"
[human]="user.human"
(editType)="openEditDialog($event)"
(deletedPhone)="deletePhone()"
(resendEmailVerification)="resendEmailVerification()"
(resendPhoneVerification)="resendPhoneVerification()">
<button pwdAction [disabled]="(canWrite$ | async) === false" (click)="sendSetPasswordNotification()"
mat-stroked-button color="primary"
*ngIf="user.state !== UserState.USER_STATE_LOCKED && user.state !== UserState.USER_STATE_INACTIVE && user.state !== UserState.USER_STATE_INITIAL">{{
'USER.PASSWORD.RESENDNOTIFICATION' | translate }}</button>
<button emailAction [disabled]="(canWrite$ | async) === false" class="resendemail"
*ngIf="user.state === UserState.USER_STATE_INITIAL" mat-stroked-button color="primary"
(click)="resendInitEmail()">{{'USER.RESENDINITIALEMAIL' |
translate}}</button>
(resendPhoneVerification)="resendPhoneVerification()"
>
<button
pwdAction
[disabled]="(canWrite$ | async) === false"
(click)="sendSetPasswordNotification()"
mat-stroked-button
*ngIf="
user.state !== UserState.USER_STATE_LOCKED &&
user.state !== UserState.USER_STATE_INACTIVE &&
user.state !== UserState.USER_STATE_INITIAL
"
>
{{ 'USER.PASSWORD.RESENDNOTIFICATION' | translate }}
</button>
<button
emailAction
[disabled]="(canWrite$ | async) === false"
class="resendemail"
*ngIf="user.state === UserState.USER_STATE_INITIAL"
mat-stroked-button
(click)="resendInitEmail()"
>
{{ 'USER.RESENDINITIALEMAIL' | translate }}
</button>
</cnsl-contact>
</cnsl-card>
</ng-template>
@@ -80,25 +131,35 @@
<ng-container *ngIf="currentSetting && currentSetting === 'general'">
<cnsl-card *ngIf="user.machine" title="{{ 'USER.MACHINE.TITLE' | translate }}">
<cnsl-detail-form-machine [disabled]="(canWrite$ | async) === false" [username]="user.userName"
[user]="user.machine" (submitData)="saveMachine($event)">
<cnsl-detail-form-machine
[disabled]="(canWrite$ | async) === false"
[username]="user.userName"
[user]="user.machine"
(submitData)="saveMachine($event)"
>
</cnsl-detail-form-machine>
</cnsl-card>
</ng-container>
<ng-container *ngIf="currentSetting && currentSetting === 'pat'">
<ng-template cnslHasRole [hasRole]="['user.read$', 'user.read:'+user?.id]">
<cnsl-card *ngIf="user.machine && user.id" title="{{ 'USER.MACHINE.TOKENSTITLE' | translate }}"
description="{{ 'USER.MACHINE.TOKENSDESC' | translate }}">
<ng-template cnslHasRole [hasRole]="['user.read$', 'user.read:' + user?.id]">
<cnsl-card
*ngIf="user.machine && user.id"
title="{{ 'USER.MACHINE.TOKENSTITLE' | translate }}"
description="{{ 'USER.MACHINE.TOKENSDESC' | translate }}"
>
<cnsl-personal-access-tokens [userId]="user.id"></cnsl-personal-access-tokens>
</cnsl-card>
</ng-template>
</ng-container>
<ng-container *ngIf="currentSetting && currentSetting === 'keys'">
<ng-template cnslHasRole [hasRole]="['user.read$', 'user.read:'+user?.id]">
<cnsl-card *ngIf="user.machine && user.id" title="{{ 'USER.MACHINE.KEYSTITLE' | translate }}"
description="{{ 'USER.MACHINE.KEYSDESC' | translate }}">
<ng-template cnslHasRole [hasRole]="['user.read$', 'user.read:' + user?.id]">
<cnsl-card
*ngIf="user.machine && user.id"
title="{{ 'USER.MACHINE.KEYSTITLE' | translate }}"
description="{{ 'USER.MACHINE.KEYSDESC' | translate }}"
>
<cnsl-machine-keys [userId]="user.id"></cnsl-machine-keys>
</cnsl-card>
</ng-template>
@@ -114,34 +175,40 @@
</ng-container>
<ng-container *ngIf="currentSetting && currentSetting === 'grants'">
<cnsl-card *ngIf="user?.id" title="{{ 'GRANTS.USER.TITLE' | translate }}"
description="{{'GRANTS.USER.DESCRIPTION' | translate }}">
<cnsl-user-grants [userId]="user.id" [context]="USERGRANTCONTEXT"
[displayedColumns]="['select', 'projectId', 'creationDate','changeDate', 'roleNamesList', 'actions']"
[disableWrite]="((['user.grant.write$'] | hasRole) | async) === false"
[disableDelete]="((['user.grant.delete$'] | hasRole) | async) === false">
<cnsl-card
*ngIf="user?.id"
title="{{ 'GRANTS.USER.TITLE' | translate }}"
description="{{ 'GRANTS.USER.DESCRIPTION' | translate }}"
>
<cnsl-user-grants
[userId]="user.id"
[context]="USERGRANTCONTEXT"
[displayedColumns]="['select', 'projectId', 'creationDate', 'changeDate', 'roleNamesList', 'actions']"
[disableWrite]="(['user.grant.write$'] | hasRole | async) === false"
[disableDelete]="(['user.grant.delete$'] | hasRole | async) === false"
>
</cnsl-user-grants>
</cnsl-card>
</ng-container>
<ng-container *ngIf="currentSetting && currentSetting === 'memberships'">
<cnsl-card *ngIf="user?.id" title="{{ 'USER.MEMBERSHIPS.TITLE' | translate }}"
description="{{'USER.MEMBERSHIPS.DESCRIPTION' | translate }}">
<cnsl-card
*ngIf="user?.id"
title="{{ 'USER.MEMBERSHIPS.TITLE' | translate }}"
description="{{ 'USER.MEMBERSHIPS.DESCRIPTION' | translate }}"
>
<cnsl-memberships-table [userId]="user.id"></cnsl-memberships-table>
</cnsl-card>
</ng-container>
<ng-container *ngIf="currentSetting && currentSetting === 'metadata'">
<ng-template cnslHasFeature [hasFeature]="['metadata.user']">
<cnsl-metadata *ngIf="user" [userId]="user.id"></cnsl-metadata>
</ng-template>
<cnsl-metadata *ngIf="user" [userId]="user.id"></cnsl-metadata>
</ng-container>
</div>
</cnsl-sidenav>
<div metainfo>
<cnsl-changes class="changes" [refresh]="refreshChanges$" [changeType]="ChangeType.USER" [id]="user.id">
</cnsl-changes>
</div>
</cnsl-meta-layout>
</div>
</div>