feat(console): email label policy, cleanup policy grid module (#890)

* add primitive label policy component, routing

* label policy, i18n

* refactor policy grid

* i18n

* lint

* cleanup i19n policy

* rm failed events styling

* fix detail layout padding, de i18n

* remove unused translations

console/src/app/modules/policies/label-policy/label-policy-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { LabelPolicyComponent } from './label-policy.component';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: LabelPolicyComponent,
+        data: {
+            animation: 'DetailPage',
+        },
+    },
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule],
+})
+export class LabelPolicyRoutingModule { }

console/src/app/modules/policies/label-policy/label-policy.component.html

@@ -0,0 +1,20 @@
+<app-detail-layout [backRouterLink]="['/iam']" [title]="'POLICY.LABEL.TITLE' | translate"
+    [description]="'POLICY.LABEL.DESCRIPTION' | translate">
+
+    <div class="content" *ngIf="labelData">
+        <mat-form-field class="form-field" appearance="outline">
+            <mat-label>{{'POLICY.LABEL.PRIMARYCOLOR' | translate}}</mat-label>
+            <input [(ngModel)]="labelData.primaryColor" matInput />
+        </mat-form-field>
+
+        <mat-form-field class="form-field" appearance="outline">
+            <mat-label>{{'POLICY.LABEL.SECONDARYCOLOR' | translate}}</mat-label>
+            <input [(ngModel)]="labelData.secondaryColor" matInput />
+        </mat-form-field>
+    </div>
+
+    <div class="btn-container">
+        <button (click)="savePolicy()" color="primary" type="submit"
+            mat-raised-button>{{ 'ACTIONS.SAVE' | translate }}</button>
+    </div>
+</app-detail-layout>

console/src/app/modules/policies/label-policy/label-policy.component.scss

@@ -0,0 +1,24 @@
+.content {
+  padding-top: 1rem;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin: 0 -.5rem;
+
+  .form-field {
+    flex: 1;
+    margin: 0 .5rem;
+  }
+}
+
+.btn-container {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+
+  button {
+    margin-top: 3rem;
+    display: block;
+    padding: .5rem 4rem;
+  }
+}

console/src/app/modules/policies/label-policy/label-policy.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LabelPolicyComponent } from './label-policy.component';
+
+describe('LabelPolicyComponent', () => {
+    let component: LabelPolicyComponent;
+    let fixture: ComponentFixture<LabelPolicyComponent>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [LabelPolicyComponent],
+        })
+            .compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(LabelPolicyComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});

console/src/app/modules/policies/label-policy/label-policy.component.ts

@@ -0,0 +1,54 @@
+import { Component, OnDestroy } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { DefaultLabelPolicyUpdate, DefaultLabelPolicyView } from 'src/app/proto/generated/admin_pb';
+import { AdminService } from 'src/app/services/admin.service';
+import { ToastService } from 'src/app/services/toast.service';
+
+import { PolicyComponentServiceType } from '../policy-component-types.enum';
+
+
+@Component({
+    selector: 'app-label-policy',
+    templateUrl: './label-policy.component.html',
+    styleUrls: ['./label-policy.component.scss'],
+})
+export class LabelPolicyComponent implements OnDestroy {
+    public labelData!: DefaultLabelPolicyView.AsObject;
+
+    private sub: Subscription = new Subscription();
+
+    public PolicyComponentServiceType: any = PolicyComponentServiceType;
+    constructor(
+        private route: ActivatedRoute,
+        private toast: ToastService,
+        private adminService: AdminService,
+    ) {
+        this.route.params.subscribe(() => {
+            this.getData().then(data => {
+                if (data) {
+                    this.labelData = data.toObject();
+                }
+            });
+        });
+    }
+
+    public ngOnDestroy(): void {
+        this.sub.unsubscribe();
+    }
+
+    private async getData(): Promise<DefaultLabelPolicyView> {
+        return this.adminService.GetDefaultLabelPolicy();
+    }
+
+    public savePolicy(): void {
+        const req = new DefaultLabelPolicyUpdate();
+        req.setPrimaryColor(this.labelData.primaryColor);
+        req.setSecondaryColor(this.labelData.secondaryColor);
+        this.adminService.UpdateDefaultLabelPolicy(req).then(() => {
+            this.toast.showInfo('POLICY.TOAST.SET', true);
+        }).catch(error => {
+            this.toast.showError(error);
+        });
+    }
+}

console/src/app/modules/policies/label-policy/label-policy.module.ts

@@ -0,0 +1,34 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { TranslateModule } from '@ngx-translate/core';
+import { HasRoleModule } from 'src/app/directives/has-role/has-role.module';
+import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.module';
+
+import { LabelPolicyRoutingModule } from './label-policy-routing.module';
+import { LabelPolicyComponent } from './label-policy.component';
+
+@NgModule({
+    declarations: [LabelPolicyComponent],
+    imports: [
+        LabelPolicyRoutingModule,
+        CommonModule,
+        FormsModule,
+        MatInputModule,
+        MatFormFieldModule,
+        MatButtonModule,
+        MatSlideToggleModule,
+        MatIconModule,
+        HasRoleModule,
+        MatTooltipModule,
+        TranslateModule,
+        DetailLayoutModule,
+    ],
+})
+export class LabelPolicyModule { }

console/src/app/modules/policies/login-policy/login-policy.component.html

@@ -1,23 +1,23 @@
 <app-detail-layout [backRouterLink]="[ serviceType === PolicyComponentServiceType.ADMIN ? '/iam' : '/org']"
-    [title]="'ORG.POLICY.LOGIN_POLICY.TITLECREATE' | translate"
-    [description]="(serviceType==PolicyComponentServiceType.MGMT ? 'ORG.POLICY.LOGIN_POLICY.DESCRIPTIONCREATEMGMT' : PolicyComponentServiceType.ADMIN ? 'ORG.POLICY.LOGIN_POLICY.DESCRIPTIONCREATEADMIN' : '') | translate">
-    <p class="default" *ngIf="isDefault"> {{'ORG.POLICY.DEFAULTLABEL' | translate}}</p>
+    [title]="'POLICY.LOGIN_POLICY.TITLE' | translate"
+    [description]="(serviceType==PolicyComponentServiceType.MGMT ? 'POLICY.LOGIN_POLICY.DESCRIPTIONCREATEMGMT' : PolicyComponentServiceType.ADMIN ? 'POLICY.LOGIN_POLICY.DESCRIPTIONCREATEADMIN' : '') | translate">
+    <p class="default" *ngIf="isDefault"> {{'POLICY.DEFAULTLABEL' | translate}}</p>
 
     <div class="spinner-wr">
         <mat-spinner diameter="30" *ngIf="loading" color="primary"></mat-spinner>
     </div>
     <ng-container *ngIf="serviceType === PolicyComponentServiceType.MGMT">
         <ng-template appHasRole [appHasRole]="['policy.delete']">
-            <button *ngIf="!isDefault" matTooltip="{{'ORG.POLICY.RESET' | translate}}" color="warn"
-                (click)="removePolicy()" mat-stroked-button>
-                {{'ORG.POLICY.RESET' | translate}}
+            <button *ngIf="!isDefault" matTooltip="{{'POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()"
+                mat-stroked-button>
+                {{'POLICY.RESET' | translate}}
             </button>
         </ng-template>
 
         <ng-template appHasRole [appHasRole]="['policy.write']">
-            <button *ngIf="isDefault" matTooltip="{{'ORG.POLICY.CREATECUSTOM' | translate}}" (click)="savePolicy()"
+            <button *ngIf="isDefault" matTooltip="{{'POLICY.CREATECUSTOM' | translate}}" (click)="savePolicy()"
                 mat-raised-button>
-                {{'ORG.POLICY.CREATECUSTOM' | translate}}
+                {{'POLICY.CREATECUSTOM' | translate}}
             </button>
         </ng-template>
     </ng-container>
@@ -26,23 +26,23 @@
         <div class="row">
             <mat-slide-toggle class="toggle" color="primary" [disabled]="disabled" ngDefaultControl
                 [(ngModel)]="loginData.allowUsernamePassword">
-                {{'ORG.POLICY.DATA.ALLOWUSERNAMEPASSWORD' | translate}}
+                {{'POLICY.DATA.ALLOWUSERNAMEPASSWORD' | translate}}
             </mat-slide-toggle>
-            <p>{{'ORG.POLICY.DATA.ALLOWUSERNAMEPASSWORD_DESC' | translate}}</p>
+            <p>{{'POLICY.DATA.ALLOWUSERNAMEPASSWORD_DESC' | translate}}</p>
         </div>
         <div class="row">
             <mat-slide-toggle class="toggle" color="primary" [disabled]="disabled" ngDefaultControl
                 [(ngModel)]="loginData.allowRegister">
-                {{'ORG.POLICY.DATA.ALLOWREGISTER' | translate}}
+                {{'POLICY.DATA.ALLOWREGISTER' | translate}}
             </mat-slide-toggle>
-            <p> {{'ORG.POLICY.DATA.ALLOWREGISTER_DESC' | translate}} </p>
+            <p> {{'POLICY.DATA.ALLOWREGISTER_DESC' | translate}} </p>
         </div>
         <div class="row">
             <mat-slide-toggle class="toggle" color="primary" [disabled]="disabled" ngDefaultControl
                 [(ngModel)]="loginData.allowExternalIdp">
-                {{'ORG.POLICY.DATA.ALLOWEXTERNALIDP' | translate}}
+                {{'POLICY.DATA.ALLOWEXTERNALIDP' | translate}}
             </mat-slide-toggle>
-            <p> {{'ORG.POLICY.DATA.ALLOWEXTERNALIDP_DESC' | translate}} </p>
+            <p> {{'POLICY.DATA.ALLOWEXTERNALIDP_DESC' | translate}} </p>
         </div>
     </div>
 

console/src/app/modules/policies/login-policy/login-policy.component.ts

@@ -128,7 +128,7 @@ export class LoginPolicyComponent implements OnDestroy {
 
     public savePolicy(): void {
         this.updateData().then(() => {
-            this.toast.showInfo('ORG.POLICY.LOGIN_POLICY.SAVED', true);
+            this.toast.showInfo('POLICY.LOGIN_POLICY.SAVED', true);
             this.loading = true;
             setTimeout(() => {
                 this.fetchData();
@@ -141,7 +141,7 @@ export class LoginPolicyComponent implements OnDestroy {
     public removePolicy(): void {
         if (this.serviceType === PolicyComponentServiceType.MGMT) {
             (this.service as ManagementService).RemoveLoginPolicy().then(() => {
-                this.toast.showInfo('ORG.POLICY.TOAST.RESETSUCCESS', true);
+                this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
                 this.loading = true;
                 setTimeout(() => {
                     this.fetchData();

console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.html

@@ -1,18 +1,17 @@
 <app-detail-layout [backRouterLink]="[ serviceType === PolicyComponentServiceType.ADMIN ? '/iam' : '/org']"
-    [title]="'ORG.POLICY.IAM_POLICY.TITLECREATE' | translate"
-    [description]="'ORG.POLICY.IAM_POLICY.DESCRIPTION' | translate">
-    <p class="default" *ngIf="isDefault"> {{'ORG.POLICY.DEFAULTLABEL' | translate}}</p>
+    [title]="'POLICY.IAM_POLICY.TITLECREATE' | translate" [description]="'POLICY.IAM_POLICY.DESCRIPTION' | translate">
+    <p class="default" *ngIf="isDefault"> {{'POLICY.DEFAULTLABEL' | translate}}</p>
 
     <ng-template appHasRole [appHasRole]="['iam.policy.delete']">
         <button *ngIf="serviceType === PolicyComponentServiceType.MGMT && !isDefault"
-            matTooltip="{{'ORG.POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
-            {{'ORG.POLICY.RESET' | translate}}
+            matTooltip="{{'POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
+            {{'POLICY.RESET' | translate}}
         </button>
     </ng-template>
 
     <div class="content" *ngIf="iamData">
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.USERLOGINMUSTBEDOMAIN' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.USERLOGINMUSTBEDOMAIN' | translate}}</span>
             <span class="fill-space"></span>
             <mat-slide-toggle color="primary" name="hasNumber" ngDefaultControl
                 [(ngModel)]="iamData.userLoginMustBeDomain">

console/src/app/modules/policies/org-iam-policy/org-iam-policy.component.ts

@@ -83,7 +83,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
                         this.org.id,
                         this.iamData.userLoginMustBeDomain,
                     ).then(() => {
-                        this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                        this.toast.showInfo('POLICY.TOAST.SET', true);
                     }).catch(error => {
                         this.toast.showError(error);
                     });
@@ -93,7 +93,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
                         this.org.id,
                         this.iamData.userLoginMustBeDomain,
                     ).then(() => {
-                        this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                        this.toast.showInfo('POLICY.TOAST.SET', true);
                     }).catch(error => {
                         this.toast.showError(error);
                     });
@@ -105,7 +105,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
                     this.org.id,
                     this.iamData.userLoginMustBeDomain,
                 ).then(() => {
-                    this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                    this.toast.showInfo('POLICY.TOAST.SET', true);
                 }).catch(error => {
                     this.toast.showError(error);
                 });
@@ -116,7 +116,7 @@ export class OrgIamPolicyComponent implements OnDestroy {
     public removePolicy(): void {
         if (this.serviceType === PolicyComponentServiceType.MGMT) {
             this.adminService.RemoveOrgIamPolicy(this.org.id).then(() => {
-                this.toast.showInfo('ORG.POLICY.TOAST.RESETSUCCESS', true);
+                this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
                 setTimeout(() => {
                     this.fetchData();
                 }, 1000);

console/src/app/modules/policies/password-age-policy/password-age-policy.component.html

@@ -1,15 +1,15 @@
 <app-detail-layout [backRouterLink]="[ serviceType === PolicyComponentServiceType.ADMIN ? '/iam' : '/org']"
-    [title]="'ORG.POLICY.PWD_AGE.TITLE' | translate" [description]="'ORG.POLICY.PWD_AGE.DESCRIPTION' | translate">
+    [title]="'POLICY.PWD_AGE.TITLE' | translate" [description]="'POLICY.PWD_AGE.DESCRIPTION' | translate">
     <ng-template appHasRole [appHasRole]="['policy.delete']">
         <button *ngIf="serviceType === PolicyComponentServiceType.MGMT && !isDefault"
-            matTooltip="{{'ORG.POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
-            {{'ORG.POLICY.RESET' | translate}}
+            matTooltip="{{'POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
+            {{'POLICY.RESET' | translate}}
         </button>
     </ng-template>
 
     <div class="content" *ngIf="ageData">
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.EXPIREWARNDAYS' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.EXPIREWARNDAYS' | translate}}</span>
             <span class="fill-space"></span>
             <div class="length-wrapper">
                 <button mat-icon-button (click)="incrementExpireWarnDays()">
@@ -23,7 +23,7 @@
         </div>
 
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.MAXAGEDAYS' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.MAXAGEDAYS' | translate}}</span>
             <span class="fill-space"></span>
             <div class="length-wrapper">
                 <button mat-icon-button (click)="incrementMaxAgeDays()">

console/src/app/modules/policies/password-age-policy/password-age-policy.component.ts

@@ -69,7 +69,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
     public removePolicy(): void {
         if (this.serviceType === PolicyComponentServiceType.MGMT) {
             (this.service as ManagementService).RemovePasswordAgePolicy().then(() => {
-                this.toast.showInfo('ORG.POLICY.TOAST.RESETSUCCESS', true);
+                this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
                 setTimeout(() => {
                     this.getData();
                 }, 1000);
@@ -111,7 +111,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
                         this.ageData.maxAgeDays,
                         this.ageData.expireWarnDays,
                     ).then(() => {
-                        this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                        this.toast.showInfo('POLICY.TOAST.SET', true);
                     }).catch(error => {
                         this.toast.showError(error);
                     });
@@ -120,7 +120,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
                         this.ageData.maxAgeDays,
                         this.ageData.expireWarnDays,
                     ).then(() => {
-                        this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                        this.toast.showInfo('POLICY.TOAST.SET', true);
                     }).catch(error => {
                         this.toast.showError(error);
                     });
@@ -131,7 +131,7 @@ export class PasswordAgePolicyComponent implements OnDestroy {
                     this.ageData.maxAgeDays,
                     this.ageData.expireWarnDays,
                 ).then(() => {
-                    this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                    this.toast.showInfo('POLICY.TOAST.SET', true);
                 }).catch(error => {
                     this.toast.showError(error);
                 });

console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.html

@@ -1,8 +1,7 @@
 <app-detail-layout [backRouterLink]="[ serviceType === PolicyComponentServiceType.ADMIN ? '/iam' : '/org']"
-    [title]="'ORG.POLICY.PWD_COMPLEXITY.TITLE' | translate"
-    [description]="'ORG.POLICY.PWD_COMPLEXITY.DESCRIPTION' | translate">
+    [title]="'POLICY.PWD_COMPLEXITY.TITLE' | translate" [description]="'POLICY.PWD_COMPLEXITY.DESCRIPTION' | translate">
 
-    <p class="default" *ngIf="isDefault"> {{'ORG.POLICY.DEFAULTLABEL' | translate}}</p>
+    <p class="default" *ngIf="isDefault"> {{'POLICY.DEFAULTLABEL' | translate}}</p>
 
     <div class="spinner-wr">
         <mat-spinner diameter="30" *ngIf="loading" color="primary"></mat-spinner>
@@ -10,14 +9,14 @@
 
     <ng-template appHasRole [appHasRole]="['policy.delete']">
         <button *ngIf="serviceType === PolicyComponentServiceType.MGMT && !isDefault"
-            matTooltip="{{'ORG.POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
-            {{'ORG.POLICY.RESET' | translate}}
+            matTooltip="{{'POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
+            {{'POLICY.RESET' | translate}}
         </button>
     </ng-template>
 
     <div *ngIf="complexityData" class="content">
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.MINLENGTH' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.MINLENGTH' | translate}}</span>
             <span class="fill-space"></span>
             <div class="length-wrapper">
                 <button mat-icon-button (click)="decrementLength()">
@@ -30,26 +29,26 @@
             </div>
         </div>
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.HASNUMBER' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.HASNUMBER' | translate}}</span>
             <span class="fill-space"></span>
             <mat-slide-toggle color="primary" name="hasNumber" ngDefaultControl [(ngModel)]="complexityData.hasNumber">
             </mat-slide-toggle>
         </div>
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.HASSYMBOL' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.HASSYMBOL' | translate}}</span>
             <span class="fill-space"></span>
             <mat-slide-toggle color="primary" name="hasSymbol" ngDefaultControl [(ngModel)]="complexityData.hasSymbol">
             </mat-slide-toggle>
         </div>
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.HASLOWERCASE' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.HASLOWERCASE' | translate}}</span>
             <span class="fill-space"></span>
             <mat-slide-toggle color="primary" name="hasLowercase" ngDefaultControl
                 [(ngModel)]="complexityData.hasLowercase">
             </mat-slide-toggle>
         </div>
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.HASUPPERCASE' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.HASUPPERCASE' | translate}}</span>
             <span class="fill-space"></span>
             <mat-slide-toggle color="primary" name="hasUppercase" ngDefaultControl
                 [(ngModel)]="complexityData.hasUppercase">

console/src/app/modules/policies/password-complexity-policy/password-complexity-policy.component.ts

@@ -76,7 +76,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
     public removePolicy(): void {
         if (this.service instanceof ManagementService) {
             this.service.removePasswordComplexityPolicy().then(() => {
-                this.toast.showInfo('ORG.POLICY.TOAST.RESETSUCCESS', true);
+                this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
                 setTimeout(() => {
                     this.fetchData();
                 }, 1000);
@@ -110,7 +110,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
                         this.complexityData.hasSymbol,
                         this.complexityData.minLength,
                     ).then(() => {
-                        this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                        this.toast.showInfo('POLICY.TOAST.SET', true);
                     }).catch(error => {
                         this.toast.showError(error);
                     });
@@ -122,7 +122,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
                         this.complexityData.hasSymbol,
                         this.complexityData.minLength,
                     ).then(() => {
-                        this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                        this.toast.showInfo('POLICY.TOAST.SET', true);
                     }).catch(error => {
                         this.toast.showError(error);
                     });
@@ -136,7 +136,7 @@ export class PasswordComplexityPolicyComponent implements OnDestroy {
                     this.complexityData.hasSymbol,
                     this.complexityData.minLength,
                 ).then(() => {
-                    this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                    this.toast.showInfo('POLICY.TOAST.SET', true);
                 }).catch(error => {
                     this.toast.showError(error);
                 });

console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.html

@@ -1,18 +1,17 @@
 <app-detail-layout [backRouterLink]="[ serviceType === PolicyComponentServiceType.ADMIN ? '/iam' : '/org']"
-    [title]="'ORG.POLICY.PWD_LOCKOUT.TITLE' | translate"
-    [description]="'ORG.POLICY.PWD_LOCKOUT.DESCRIPTION' | translate">
-    <p class="default" *ngIf="isDefault"> {{'ORG.POLICY.DEFAULTLABEL' | translate}}</p>
+    [title]="'POLICY.PWD_LOCKOUT.TITLE' | translate" [description]="'POLICY.PWD_LOCKOUT.DESCRIPTION' | translate">
+    <p class="default" *ngIf="isDefault"> {{'POLICY.DEFAULTLABEL' | translate}}</p>
 
     <ng-template appHasRole [appHasRole]="['policy.delete']">
         <button *ngIf="serviceType === PolicyComponentServiceType.MGMT  && !isDefault"
-            matTooltip="{{'ORG.POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
-            {{'ORG.POLICY.RESET' | translate}}
+            matTooltip="{{'POLICY.RESET' | translate}}" color="warn" (click)="removePolicy()" mat-stroked-button>
+            {{'POLICY.RESET' | translate}}
         </button>
     </ng-template>
 
     <div class="content" *ngIf="lockoutData">
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.MAXATTEMPTS' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.MAXATTEMPTS' | translate}}</span>
             <span class="fill-space"></span>
             <div class="length-wrapper">
                 <button mat-icon-button (click)="incrementMaxAttempts()">
@@ -25,7 +24,7 @@
             </div>
         </div>
         <div class="row">
-            <span class="left-desc">{{'ORG.POLICY.DATA.SHOWLOCKOUTFAILURES' | translate}}</span>
+            <span class="left-desc">{{'POLICY.DATA.SHOWLOCKOUTFAILURES' | translate}}</span>
             <span class="fill-space"></span>
             <mat-slide-toggle color="primary" name="showLockoutFailure" ngDefaultControl
                 [(ngModel)]="lockoutData.showLockoutFailure">

console/src/app/modules/policies/password-lockout-policy/password-lockout-policy.component.ts

@@ -73,7 +73,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
     public removePolicy(): void {
         if (this.service instanceof ManagementService) {
             this.service.RemovePasswordLockoutPolicy().then(() => {
-                this.toast.showInfo('ORG.POLICY.TOAST.RESETSUCCESS', true);
+                this.toast.showInfo('POLICY.TOAST.RESETSUCCESS', true);
                 this.fetchData();
             }).catch(error => {
                 this.toast.showError(error);
@@ -100,7 +100,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
                 this.lockoutData.maxAttempts,
                 this.lockoutData.showLockoutFailure,
             ).then(() => {
-                this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                this.toast.showInfo('POLICY.TOAST.SET', true);
             }).catch(error => {
                 this.toast.showError(error);
             });
@@ -110,7 +110,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
                     this.lockoutData.maxAttempts,
                     this.lockoutData.showLockoutFailure,
                 ).then(() => {
-                    this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                    this.toast.showInfo('POLICY.TOAST.SET', true);
                 }).catch(error => {
                     this.toast.showError(error);
                 });
@@ -119,7 +119,7 @@ export class PasswordLockoutPolicyComponent implements OnDestroy {
                     this.lockoutData.maxAttempts,
                     this.lockoutData.showLockoutFailure,
                 ).then(() => {
-                    this.toast.showInfo('ORG.POLICY.TOAST.SET', true);
+                    this.toast.showInfo('POLICY.TOAST.SET', true);
                 }).catch(error => {
                     this.toast.showError(error);
                 });

console/src/app/modules/policies/policy-component-types.enum.ts

@@ -4,6 +4,7 @@ export enum PolicyComponentType {
     COMPLEXITY = 'complexity',
     IAM = 'iam',
     LOGIN = 'login',
+    LABEL = 'label',
 }
 export enum PolicyComponentServiceType {
     MGMT = 'mgmt',