andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-10-26 17:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(console): limited actions (#3164)

Browse Source 
* max count features

* deactivate, activate

* actions, limited

* disable without permission, show action state in flow

Co-authored-by: Livio Amstutz <[email protected]>
This commit is contained in:
Max Peintner
2022-02-07 14:53:35 +01:00
committed by GitHub
co-authored by Livio Amstutz
parent 78af86db98
commit 3bf9adece5
13 changed files with 276 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
console/src/app/modules/features/features.component.html
+21 -3
View File
@@ -265,6 +265,8 @@
</mat-slide-toggle>
</div>
<p class="feature-section">{{'FEATURES.HEADERS.FLOWS' | translate}}</p>
<div class="row">
<div class="featureavatar pink">
<i class="icon las la-exchange-alt"></i>
@@ -272,9 +274,25 @@
<span class="left-desc">{{'FEATURES.DATA.FLOWS' | translate}}</span>
<span class="fill-space"></span>
<template [ngTemplateOutlet]="templateRef" [ngTemplateOutletContext]="{active: features.actions}"></template>
<mat-slide-toggle class="toggle" color="primary" name="hasNumber" ngDefaultControl [(ngModel)]="features.actions"
*ngIf="(['iam.features.write'] | hasRole | async)">
</mat-slide-toggle>
</div>
<div class="row">
<span class="fill-space"></span>
<cnsl-form-field class="flow-select">
<cnsl-label>{{ 'FEATURES.DATA.FLOW.TYPE' | translate }}</cnsl-label>
<mat-select [(ngModel)]="features.actionsAllowed"
[disabled]="(['iam.features.write'] | hasRole | async) === false">
<mat-option *ngFor="let allowedType of actionsSelection" [value]="allowedType">
{{ 'FEATURES.DATA.FLOW.ACTIONSALLOWED.'+allowedType | translate}}
</mat-option>
</mat-select>
</cnsl-form-field>
<cnsl-form-field *ngIf="features.actionsAllowed === ActionsAllowed.ACTIONS_ALLOWED_MAX" class="flow-count">
<cnsl-label>{{ 'FEATURES.DATA.FLOW.COUNT' | translate }}</cnsl-label>
<input cnslInput type="number" [(ngModel)]="features.maxActions"
[disabled]="(['iam.features.write'] | hasRole | async) === false" ngDefaultControl />
</cnsl-form-field>
</div>
</div>
console/src/app/modules/features/features.component.scss
+21 -9
View File
@@ -17,10 +17,10 @@
.title {
font-size: 14px;
color: var(--grey);
margin-bottom: .5rem;
margin-bottom: 0.5rem;
a {
margin-left: .5rem;
margin-left: 0.5rem;
cursor: pointer;
}
}
@@ -30,19 +30,19 @@
align-items: center;
a {
margin-left: .5rem;
margin-left: 0.5rem;
}
}
img {
height: 15px;
width: auto;
margin-left: .5rem;
margin-left: 0.5rem;
}
}
.spinner {
margin: .5rem;
margin: 0.5rem;
}
.error {
@@ -60,8 +60,8 @@
height: 1px;
width: 100%;
background-color: var(--grey);
opacity: .5;
margin: .5rem 0;
opacity: 0.5;
margin: 0.5rem 0;
display: block;
}
@@ -80,7 +80,7 @@
.row {
display: flex;
align-items: center;
padding: .3rem 0;
padding: 0.3rem 0;
.featureavatar {
margin-right: 1rem;
@@ -137,7 +137,7 @@
}
.left-desc {
font-size: .9rem;
font-size: 0.9rem;
margin-right: 1rem;
}
@@ -149,6 +149,18 @@
display: flex;
align-items: center;
}
.flow-select {
flex-shrink: 1;
min-width: 150px;
margin-left: 1rem;
}
.flow-count {
flex-shrink: 1;
width: 70px;
margin-left: 1rem;
}
}
}
console/src/app/modules/features/features.component.ts
+75 -44
View File
@@ -8,7 +8,7 @@ import {
SetDefaultFeaturesRequest,
SetOrgFeaturesRequest,
} from 'src/app/proto/generated/zitadel/admin_pb';
import { Features } from 'src/app/proto/generated/zitadel/features_pb';
import { ActionsAllowed, Features } from 'src/app/proto/generated/zitadel/features_pb';
import { GetFeaturesResponse } from 'src/app/proto/generated/zitadel/management_pb';
import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { AdminService } from 'src/app/services/admin.service';
@@ -46,6 +46,13 @@ export class FeaturesComponent implements OnDestroy {
public stripeURL: string = '';
public stripeCustomer!: StripeCustomer;
public actionsSelection: any = [
ActionsAllowed.ACTIONS_ALLOWED_NOT_ALLOWED,
ActionsAllowed.ACTIONS_ALLOWED_MAX,
ActionsAllowed.ACTIONS_ALLOWED_UNLIMITED,
];
public ActionsAllowed: any = ActionsAllowed;
constructor(
private route: ActivatedRoute,
private toast: ToastService,
@@ -60,27 +67,32 @@ export class FeaturesComponent implements OnDestroy {
if (temporg) {
this.org = temporg;
}
this.sub = this.route.data.pipe(switchMap(data => {
this.serviceType = data.serviceType;
if (this.serviceType === FeatureServiceType.MGMT) {
this.managementService = this.injector.get(ManagementService as Type<ManagementService>);
}
return this.route.params;
})).subscribe(_ => {
this.fetchData();
});
this.sub = this.route.data
.pipe(
switchMap((data) => {
this.serviceType = data.serviceType;
if (this.serviceType === FeatureServiceType.MGMT) {
this.managementService = this.injector.get(ManagementService as Type<ManagementService>);
}
return this.route.params;
}),
)
.subscribe((_) => {
this.fetchData();
});
if (this.serviceType === FeatureServiceType.MGMT) {
this.customerLoading = true;
this.subService.getCustomer(this.org.id)
.then(payload => {
this.subService
.getCustomer(this.org.id)
.then((payload) => {
this.customerLoading = false;
this.stripeCustomer = payload;
if (this.customerValid) {
this.getLinkToStripe();
}
})
.catch(error => {
.catch((error) => {
this.customerLoading = false;
console.error(error);
});
@@ -99,13 +111,16 @@ export class FeaturesComponent implements OnDestroy {
width: '400px',
});
dialogRefPhone.afterClosed().subscribe(customer => {
dialogRefPhone.afterClosed().subscribe((customer) => {
if (customer) {
console.log(customer);
this.stripeCustomer = customer;
this.subService.setCustomer(this.org.id, customer).then(() => {
this.getLinkToStripe();
}).catch(console.error);
this.subService
.setCustomer(this.org.id, customer)
.then(() => {
this.getLinkToStripe();
})
.catch(console.error);
}
});
}
@@ -113,12 +128,13 @@ export class FeaturesComponent implements OnDestroy {
public getLinkToStripe(): void {
if (this.serviceType === FeatureServiceType.MGMT) {
this.stripeLoading = true;
this.subService.getLink(this.org.id, window.location.href)
.then(payload => {
this.subService
.getLink(this.org.id, window.location.href)
.then((payload) => {
this.stripeLoading = false;
this.stripeURL = payload.redirect_url;
})
.catch(error => {
.catch((error) => {
this.stripeLoading = false;
console.error(error);
});
@@ -126,7 +142,7 @@ export class FeaturesComponent implements OnDestroy {
}
public fetchData(): void {
this.getData().then(resp => {
this.getData().then((resp) => {
if (resp?.features) {
this.features = resp.features;
}
@@ -167,13 +183,18 @@ export class FeaturesComponent implements OnDestroy {
req.setPrivacyPolicy(this.features.privacyPolicy);
req.setMetadataUser(this.features.metadataUser);
req.setLockoutPolicy(this.features.lockoutPolicy);
req.setActions(this.features.actions);
// req.setActions(this.features.actions);
req.setActionsAllowed(this.features.actionsAllowed);
req.setMaxActions(this.features.maxActions);
this.adminService.setOrgFeatures(req).then(() => {
this.toast.showInfo('POLICY.TOAST.SET', true);
}).catch(error => {
this.toast.showError(error);
});
this.adminService
.setOrgFeatures(req)
.then(() => {
this.toast.showInfo('POLICY.TOAST.SET', true);
})
.catch((error) => {
this.toast.showError(error);
});
break;
case FeatureServiceType.ADMIN:
// update Default org iam policy?
@@ -192,27 +213,35 @@ export class FeaturesComponent implements OnDestroy {
dreq.setCustomTextMessage(this.features.customTextMessage);
dreq.setMetadataUser(this.features.metadataUser);
dreq.setLockoutPolicy(this.features.lockoutPolicy);
dreq.setActions(this.features.actions);
// dreq.setActions(this.features.actions);
dreq.setActionsAllowed(this.features.actionsAllowed);
dreq.setMaxActions(this.features.maxActions);
this.adminService.setDefaultFeatures(dreq).then(() => {
this.toast.showInfo('POLICY.TOAST.SET', true);
}).catch(error => {
this.toast.showError(error);
});
this.adminService
.setDefaultFeatures(dreq)
.then(() => {
this.toast.showInfo('POLICY.TOAST.SET', true);
})
.catch((error) => {
this.toast.showError(error);
});
break;
}
}
public resetFeatures(): void {
if (this.serviceType === FeatureServiceType.MGMT) {
this.adminService.resetOrgFeatures(this.org.id).then(() => {
this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
setTimeout(() => {
this.fetchData();
}, 1000);
}).catch(error => {
this.toast.showError(error);
});
this.adminService
.resetOrgFeatures(this.org.id)
.then(() => {
this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
setTimeout(() => {
this.fetchData();
}, 1000);
})
.catch((error) => {
this.toast.showError(error);
});
}
}
@@ -225,13 +254,15 @@ export class FeaturesComponent implements OnDestroy {
}
get customerValid(): boolean {
return !!this.stripeCustomer?.contact &&
return (
!!this.stripeCustomer?.contact &&
!!this.stripeCustomer?.address &&
!!this.stripeCustomer?.city &&
!!this.stripeCustomer?.postal_code;
!!this.stripeCustomer?.postal_code
);
}
get customerCountry(): Country | undefined {
return COUNTRIES.find(country => country.isoCode === this.stripeCustomer.country);
return COUNTRIES.find((country) => country.isoCode === this.stripeCustomer.country);
}
}