{{ item.UID_QERPolicy.Column.GetDisplayValue()}}
+ {{ item.Description.Column.GetDisplayValue() }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/entitlement-edit-auto-add.component.scss b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/entitlement-edit-auto-add.component.scss
new file mode 100644
index 000000000..bbfe24996
--- /dev/null
+++ b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/entitlement-edit-auto-add.component.scss
@@ -0,0 +1,24 @@
+.eui-sidesheet-content {
+ height: inherit;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+
+ .imx-content-card {
+ flex: 1 1 auto;
+ overflow: auto;
+ }
+}
+
+.eui-sidesheet-actions {
+ .justify-start {
+ margin-right: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ }
+
+ button:not(:last-of-type):not(.justify-start) {
+ margin-right: 10px;
+ }
+}
\ No newline at end of file
diff --git a/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/entitlement-edit-auto-add.component.ts b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/entitlement-edit-auto-add.component.ts
new file mode 100644
index 000000000..b84789115
--- /dev/null
+++ b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/entitlement-edit-auto-add.component.ts
@@ -0,0 +1,123 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { OverlayRef } from '@angular/cdk/overlay';
+import { Component, Inject, OnDestroy } from '@angular/core';
+import { EuiLoadingService, EuiSidesheetRef, EuiSidesheetService, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { EntitlementToAddData, PortalApplication } from 'imx-api-aob';
+import { SqlWizardExpression } from 'imx-qbm-dbts';
+import { SnackBarService } from 'qbm';
+import { Subscription } from 'rxjs';
+import { EntitlementEditAutoAddService } from './entitlement-edit-auto-add.service';
+import { EntitlementToAddDataWrapperService } from './entitlement-to-add-data-wrapper.service';
+import { MappedEntitlementsPreviewComponent } from './mapped-entitlements-preview/mapped-entitlements-preview.component';
+
+@Component({
+ templateUrl: './entitlement-edit-auto-add.component.html',
+ styleUrls: ['./entitlement-edit-auto-add.component.scss']
+})
+export class EntitlementEditAutoAddComponent implements OnDestroy {
+
+ private subscriptions: Subscription[] = [];
+ private reload = false;
+
+ constructor(
+ @Inject(EUI_SIDESHEET_DATA) public data: { sqlExpression: SqlWizardExpression, application: PortalApplication },
+ public readonly svc: EntitlementEditAutoAddService,
+ private readonly sidesheetRef: EuiSidesheetRef,
+ private readonly entitlementToAddWrapperService: EntitlementToAddDataWrapperService,
+ private readonly busyService: EuiLoadingService,
+ private readonly snackbar: SnackBarService,
+ private readonly sidesheet: EuiSidesheetService,
+ private readonly translateService: TranslateService
+ ) {
+ this.subscriptions.push(sidesheetRef.closeClicked().subscribe(async () => {
+ sidesheetRef.close(this.reload);
+ }));
+ }
+
+ public ngOnDestroy(): void {
+ this.subscriptions.forEach(elem => elem.unsubscribe());
+ }
+
+ public async showResults(withSave: boolean): Promise
+
+
+
+
+
+
+
+
+
+ {{alertText}}
+
+
+ {{speedupText}}
+
+
+
+
+ #LDS#Matching entitlements
+ {{getCount('')}}
+ #LDS#Entitlements to add
+ {{getCount('add')}}
+ #LDS#Entitlements already assigned to this application
+ {{getCount('assigned')}}
+ #LDS#Entitlements assigned to another application
+ {{getCount('conflicted')}}
+
+
+
+
+
+
+
+
+
+
+ {{(entity.IsAssignedToMe.value ? '#LDS#Already assigned' :'#LDS#Assigned to other application') |
+ translate}}
+
+
+
+
+
+
+
+
+ {{ entity.DisplayName.Column.GetDisplayValue() }}
+ {{ entity.CanonicalName.Column.GetDisplayValue()}}
+
+
+ {{'#LDS#Assign system entitlements after saving' |translate}}
+
+
+
\ No newline at end of file
diff --git a/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/mapped-entitlements-preview/mapped-entitlements-preview.component.scss b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/mapped-entitlements-preview/mapped-entitlements-preview.component.scss
new file mode 100644
index 000000000..b86f6a61e
--- /dev/null
+++ b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/mapped-entitlements-preview/mapped-entitlements-preview.component.scss
@@ -0,0 +1,51 @@
+.eui-sidesheet-content {
+ height: inherit;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+
+ .imx-content-card {
+ flex: 1 1 auto;
+ overflow: hidden;
+
+ .imx-table-container {
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ height: calc(100% - 80px);
+ flex: 1 1 auto;
+ }
+ }
+}
+
+.eui-sidesheet-actions {
+ .justify-start {
+ margin-right: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ height: auto;
+ }
+
+ button:not(:last-of-type):not(.justify-start) {
+ margin-right: 10px;
+ }
+}
+
+.imx-info-text {
+ margin-bottom: 15px;
+}
+
+span[bold] {
+ font-weight: 600;
+}
+
+.imx-info-grid {
+ display: flex;
+ flex-direction: row;
+ :first-child {
+ display: grid;
+ column-gap: 15px;
+ grid-template-columns: auto auto;
+ }
+}
diff --git a/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/mapped-entitlements-preview/mapped-entitlements-preview.component.ts b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/mapped-entitlements-preview/mapped-entitlements-preview.component.ts
new file mode 100644
index 000000000..a76b0bc1b
--- /dev/null
+++ b/imxweb/projects/aob/src/lib/entitlements/entitlement-edit-auto-add/mapped-entitlements-preview/mapped-entitlements-preview.component.ts
@@ -0,0 +1,86 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, Inject, OnInit } from '@angular/core';
+import { EuiSidesheetRef, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
+
+import { DisplayColumns, EntitySchema, TypedEntityCollectionData } from 'imx-qbm-dbts';
+import { DataSourceToolbarSettings } from 'qbm';
+import { EntitlementToAddTyped } from '../entitlement-to-add-typed';
+
+@Component({
+ templateUrl: './mapped-entitlements-preview.component.html',
+ styleUrls: ['./mapped-entitlements-preview.component.scss']
+})
+export class MappedEntitlementsPreviewComponent implements OnInit {
+
+ public settings: DataSourceToolbarSettings;
+ public readonly DisplayColumns = DisplayColumns;
+ public entitySchema: EntitySchema;
+
+ public alertText = '#LDS#The following system entitlements will be added to this application by the condition. System entitlements that are already assigned to an application will be skipped.';
+ public speedupText = '#LDS#To speed up the process, you can check the "assign system entitlements after saving" option.'
+
+ constructor(
+ @Inject(EUI_SIDESHEET_DATA) public data: {
+ withSave: boolean,
+ entitlementToAdd: TypedEntityCollectionData{{ data.Description.Column.GetDisplayValue() }}
+
@@ -50,32 +56,41 @@
-
-
-
-
-
-
-
data-imx-identifier="entitlements-add-unsGroup"> {{'#LDS#Assign application entitlements' | translate}} +
{{ '#LDS#Publication Date' | translate }}
class="mat-small">{{ (isApplication() ? '#LDS#The application will be published on {0} at {1} (your local time).' : '#LDS#The application entitlement will be published on {0} at {1} (your local time) if the application is published.') - | translate | ldsReplace:datepickerFormControl.value.toLocaleDateString(browserCulture):datepickerFormControl.value.toLocaleTimeString(browserCulture) }} + | translate | ldsReplace: dateString : timeString }} diff --git a/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.scss b/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.scss index 0256a1a2b..1f4283fc0 100644 --- a/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.scss +++ b/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.scss @@ -1,4 +1,4 @@ -@import '~@elemental-ui/core/src/styles/_palette.scss'; +@import '@elemental-ui/core/src/styles/_palette.scss'; :host { display: flex; diff --git a/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.spec.ts b/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.spec.ts index a936f0e8a..fcb051695 100644 --- a/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.spec.ts +++ b/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.spec.ts @@ -9,7 +9,7 @@ * those terms. * * - * Copyright 2021 One Identity LLC. + * Copyright 2022 One Identity LLC. * ALL RIGHTS RESERVED. * * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR @@ -204,7 +204,7 @@ describe('LifecycleActionComponent', () => { component.data.elements = []; component.whenToPublish = testcase.whenToPublish as ('now' | 'future'); component.submitData(); - expect(mockMatDialogRef.close).toHaveBeenCalledWith({ publishFuture: testcase.expectedIsInActive, date: component.datepickerFormControl.value }); + expect(mockMatDialogRef.close).toHaveBeenCalledWith({ publishFuture: testcase.expectedIsInActive, date: component.datepickerFormControl.value.toDate() }); })); [ diff --git a/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.ts b/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.ts index 8af085aff..7e53bb5e7 100644 --- a/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.ts +++ b/imxweb/projects/aob/src/lib/lifecycle-actions/lifecycle-action.component.ts @@ -9,7 +9,7 @@ * those terms. * * - * Copyright 2021 One Identity LLC. + * Copyright 2022 One Identity LLC. * ALL RIGHTS RESERVED. * * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR @@ -30,6 +30,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { Platform } from '@angular/cdk/platform'; +import moment from 'moment-timezone'; import { LdsReplacePipe, ClassloggerService, DataSourceToolbarSettings, MetadataService } from 'qbm'; import { MetaTableData } from 'imx-api-qbm'; @@ -65,7 +66,7 @@ export class LifecycleActionComponent implements OnDestroy, OnInit { public tableDisplay: string; /** the mininum date for the datepicker */ - public readonly minDate = new Date(); + public readonly minDate: any; public publishFuture: boolean; @@ -76,6 +77,14 @@ export class LifecycleActionComponent implements OnDestroy, OnInit { public whenToPublish: 'now' | 'future' = 'now'; + public get dateString(): string { + return this.datepickerFormControl.value.toDate().toLocaleDateString(this.browserCulture); + } + + public get timeString(): string { + return this.datepickerFormControl.value.toDate().toLocaleTimeString(this.browserCulture); + } + private dataSource: TypedEntityCollectionData
-
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/imxweb/projects/att/src/lib/new-user/new-user.component.ts b/imxweb/projects/att/src/lib/new-user/new-user.component.ts
index 6753e7359..c8e469ab6 100644
--- a/imxweb/projects/att/src/lib/new-user/new-user.component.ts
+++ b/imxweb/projects/att/src/lib/new-user/new-user.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -30,87 +30,105 @@ import { FormBuilder, FormGroup } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { EuiLoadingService, EuiSidesheetRef } from '@elemental-ui/core';
import { TranslateService } from '@ngx-translate/core';
+import { Subscription } from 'rxjs';
+
import { RegisterPerson } from 'imx-api-att';
-import { BaseCdr, CaptchaService, ColumnDependentReference, ErrorService, ParameterizedText, UserMessageService } from 'qbm';
+import { BaseCdr, CaptchaService, ColumnDependentReference, ConfirmationService, ErrorService, ParameterizedText, UserMessageService } from 'qbm';
+
import { ApiService } from '../api.service';
import { ConfirmDialogComponent } from './confirm-dialog.component';
@Component({
- templateUrl: './new-user.component.html',
- styleUrls: ['./new-user.component.scss']
+ templateUrl: './new-user.component.html',
+ styleUrls: ['./new-user.component.scss']
})
export class NewUserComponent implements OnInit, OnDestroy {
- public readonly profileForm: FormGroup;
- public busy = false;
- public Person: RegisterPerson;
-
- public cdrList: ColumnDependentReference[] = [];
-
- public LdsCaptchaInfo = '#LDS#Please enter the characters from the image.';
- public LdsAccountInfo = '#LDS#Your account "%CentralAccount%" has been successfully created and the email address "%DefaultEmailAddress%" has been assigned to the account. Once your account is approved, it will be activated.';
- private disposable: () => void;
-
- constructor(private readonly attApiClient: ApiService,
- public readonly captchaSvc: CaptchaService,
- private readonly busyService: EuiLoadingService,
- private readonly messageSvc: UserMessageService,
- private readonly translate: TranslateService,
- formBuilder: FormBuilder,
- private readonly dialog: MatDialog,
- errorService: ErrorService,
- private readonly cd: ChangeDetectorRef,
- private readonly sidesheetRef: EuiSidesheetRef,
- ) {
- this.profileForm = new FormGroup({ formArray: formBuilder.array([]) });
- this.disposable = errorService.setTarget('sidesheet');
- }
+ public readonly profileForm: FormGroup;
+ public busy = false;
+ public person: RegisterPerson;
- public ngOnDestroy(): void {
- this.disposable();
- }
+ public cdrList: ColumnDependentReference[] = [];
+
+ public ldsCaptchaInfo = '#LDS#Please enter the characters from the image.';
+ public ldsAccountInfo = '#LDS#Your account "%CentralAccount%" has been successfully created and the email address "%DefaultEmailAddress%" has been assigned to the account. Once your account is approved, it will be activated.';
+
+ private disposable: () => void;
+ private readonly subscriptions: Subscription[] = [];
- public async ngOnInit(): Promise{{ '#LDS#Heading Confirm Email Address' | translate }}<
- {{LdsAlreadyCompleted| translate}}
- {{LdsConfirmationText| translate}}
- {{LdsRegistrationDenied| translate}}
+ {{ldsAlreadyCompleted| translate}}
+ {{ldsConfirmationText| translate}}
+ {{ldsRegistrationDenied| translate}}
- {{LdsCompletionFailed| translate}}
- {{LdsResendEmail| translate}}
+ {{ldsCompletionFailed| translate}}
+ {{ldsResendEmail| translate}}
+ {{ldsLoadingProblems| translate}}
+
diff --git a/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.scss b/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.scss
index 226aee776..949fb82e6 100644
--- a/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.scss
+++ b/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
overflow-y: auto;
@@ -12,6 +12,11 @@
}
}
+.eui-sidesheet-content {
+ display: flex;
+ flex-direction: column;
+}
+
h2 {
margin-bottom: 10px;
}
@@ -132,6 +137,7 @@ imx-data-table {
.heading-wrapper {
display: flex;
+ flex-direction: column;
.helper-alert {
margin: 0px 0px 30px 0px;
diff --git a/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.spec.ts b/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.spec.ts
index 1363a3b49..49b5bcb17 100644
--- a/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -114,7 +114,8 @@ describe('MatchingObjectsComponent', () => {
AttestationMatchingObjectsSchema: PortalAttestationFilterMatchingobjects.GetEntitySchema(),
getObjectsForFilter: jasmine.createSpy('getObjectsForFilter').and.returnValue(Promise.resolve({})),
createAttestationRun: jasmine.createSpy('createAttestationRun'),
- getDataModel: jasmine.createSpy('getDataModel').and.returnValue(Promise.resolve({}))
+ getDataModel: jasmine.createSpy('getDataModel').and.returnValue(Promise.resolve({})),
+ getCasesThreshold: jasmine.createSpy('getCasesThreshold').and.returnValue(Promise.resolve(99999))
}
const sideSheetRef = {
diff --git a/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.ts b/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.ts
index 7a96af816..88fd08bf0 100644
--- a/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.ts
+++ b/imxweb/projects/att/src/lib/policies/attestation-cases/attestation-cases.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -36,10 +36,9 @@ import { AttestationCasesComponentParameter } from './attestation-cases-componen
@Component({
templateUrl: './attestation-cases.component.html',
- styleUrls: ['./attestation-cases.component.scss']
+ styleUrls: ['./attestation-cases.component.scss'],
})
export class AttestationCasesComponent implements OnInit {
-
public dstSettings: DataSourceToolbarSettings;
public readonly entitySchemaPolicy: EntitySchema;
public DisplayColumns = DisplayColumns;
@@ -51,6 +50,7 @@ export class AttestationCasesComponent implements OnInit {
private navigationState: CollectionLoadParameters;
private displayedColumns: IClientProperty[];
private dataModel: DataModel;
+ private threshold = -1;
constructor(
public readonly sidesheetRef: EuiSidesheetRef,
@@ -60,28 +60,34 @@ export class AttestationCasesComponent implements OnInit {
private readonly snackbar: SnackBarService,
private readonly confirmationService: ConfirmationService,
settingsService: SettingsService,
- private readonly logger: ClassloggerService) {
+ private readonly logger: ClassloggerService
+ ) {
this.navigationState = { PageSize: settingsService.DefaultPageSize, StartIndex: 0, ParentKey: '' };
this.entitySchemaPolicy = policyService.AttestationMatchingObjectsSchema;
- this.displayedColumns = [
- this.entitySchemaPolicy.Columns[DisplayColumns.DISPLAY_PROPERTYNAME]
- ];
+ this.displayedColumns = [this.entitySchemaPolicy.Columns[DisplayColumns.DISPLAY_PROPERTYNAME]];
if (data.canCreateRuns) {
this.displayedColumns.push({
ColumnName: 'runMethod',
- Type: ValType.String
+ Type: ValType.String,
});
}
}
+ public get showWarning() {
+ return this.threshold > 0 && this.threshold < (this.dstSettings?.dataSource?.totalCount ?? 0);
+ }
+
public async ngOnInit(): Promise {
let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
+ setTimeout(() => (overlayRef = this.busyService.show()));
try {
this.dataModel = await this.policyService.getDataModel();
+ this.threshold = await this.policyService.getCasesThreshold();
} finally {
- setTimeout(async () => { this.busyService.hide(overlayRef); });
+ setTimeout(async () => {
+ this.busyService.hide(overlayRef);
+ });
}
return this.navigate();
@@ -97,21 +103,30 @@ export class AttestationCasesComponent implements OnInit {
}
public async createRun(data: PortalAttestationFilterMatchingobjects[]): Promise {
-
const count = data.length > 0 ? data.length : this.dstSettings.dataSource.totalCount;
- if (count <= 1000 || await this.confirmCreation()) {
+ if (count <= 1000 || (await this.confirmCreation())) {
let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
+ setTimeout(() => (overlayRef = this.busyService.show()));
try {
- await this.policyService.createAttestationRun(this.data.uidpolicy,
- data.map(elem => elem.Key.value));
-
- this.logger.trace(this, 'attestation run created for', this.data.uidpolicy, data.map(elem => elem.Key.value));
-
- this.snackbar.open({
- key: '#LDS#The attestation has been started successfully. It may take some time until the associated attestation cases are created.',
- }, '#LDS#Close');
+ await this.policyService.createAttestationRun(
+ this.data.uidpolicy,
+ data.map((elem) => elem.Key.value)
+ );
+
+ this.logger.trace(
+ this,
+ 'attestation run created for',
+ this.data.uidpolicy,
+ data.map((elem) => elem.Key.value)
+ );
+
+ this.snackbar.open(
+ {
+ key: '#LDS#The attestation has been started successfully. It may take some time until the associated attestation cases are created.',
+ },
+ '#LDS#Close'
+ );
} finally {
setTimeout(async () => {
this.busyService.hide(overlayRef);
@@ -123,13 +138,15 @@ export class AttestationCasesComponent implements OnInit {
private async navigate(): Promise {
let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
+ setTimeout(() => (overlayRef = this.busyService.show()));
try {
-
- const datasource = await this.policyService.getObjectsForFilter(this.data.uidobject,
+ const datasource = await this.policyService.getObjectsForFilter(
+ this.data.uidobject,
this.data.uidPickCategory,
- { Elements: this.data.filter, ConcatenationType: this.data.concat }, this.navigationState);
+ { Elements: this.data.filter, ConcatenationType: this.data.concat },
+ this.navigationState
+ );
this.dstSettings = {
displayedColumns: this.displayedColumns,
@@ -137,7 +154,7 @@ export class AttestationCasesComponent implements OnInit {
entitySchema: this.entitySchemaPolicy,
navigationState: this.navigationState,
dataModel: this.dataModel,
- identifierForSessionStore: 'attestatation-cases'
+ identifierForSessionStore: 'attestatation-cases',
};
this.logger.debug(this, 'matching objects table navigated to', this.navigationState);
@@ -149,7 +166,7 @@ export class AttestationCasesComponent implements OnInit {
private async confirmCreation(): Promise {
return this.confirmationService.confirm({
Title: '#LDS#Heading Start Attestation',
- Message: '#LDS#You have selected more than 1000 objects. Are you sure you want to start the attestation for all objects?'
+ Message: '#LDS#You have selected more than 1000 objects. Are you sure you want to start the attestation for all objects?',
});
}
}
diff --git a/imxweb/projects/att/src/lib/policies/confirm-deactivation/confirm-deactivation.component.ts b/imxweb/projects/att/src/lib/policies/confirm-deactivation/confirm-deactivation.component.ts
index 043f765a9..aa787f5bb 100644
--- a/imxweb/projects/att/src/lib/policies/confirm-deactivation/confirm-deactivation.component.ts
+++ b/imxweb/projects/att/src/lib/policies/confirm-deactivation/confirm-deactivation.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/edit-master-data/edit-master-data.component.html b/imxweb/projects/att/src/lib/policies/edit-master-data/edit-master-data.component.html
index 7424dbbd2..db7cd53ee 100644
--- a/imxweb/projects/att/src/lib/policies/edit-master-data/edit-master-data.component.html
+++ b/imxweb/projects/att/src/lib/policies/edit-master-data/edit-master-data.component.html
@@ -44,6 +44,9 @@ {{'#LDS#Heading Attestation Policy Settings' | translate}}
+
+
{{'#LDS#Heading Attestation Policy Settings' | translate}}
+
+
-
+
+
{
- await this.policy.policy.Attestators.Column.PutValueStruct({ DataValue: '', DisplayValue: '' });
this.objectProperties.Attestators.cdr = new BaseCdr(this.policy.policy.Attestators.Column);
this.logger.debug(this, 'Attestator cdr updated');
}
@@ -277,9 +274,12 @@ export class EditMasterDataComponent implements OnInit, OnDestroy {
this.policy.policy.UID_PersonOwner.Column,
this.policy.policy.RiskIndex.Column,
this.policy.policy.Areas.Column,
+ this.policy.policy.UID_AttestationPolicyGroup.Column,
this.policy.policy.UID_DialogCulture.Column,
+ this.policy.policy.IsShowElementsInvolved.Column,
this.policy.policy.IsInActive.Column,
this.policy.policy.IsAutoCloseOldCases.Column,
+ this.policy.policy.LimitOfOldCases.Column,
this.policy.policy.IsApproveRequiresMfa.Column,
this.policy.policy.UID_QERPickCategory.Column
];
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.spec.ts b/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.spec.ts
index 5a315ed8b..c86ac0c3d 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -33,7 +33,7 @@ import { configureTestSuite } from 'ng-bullet';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { LoggerTestingModule } from 'ngx-logger/testing';
-import { clearStylesFromDOM, ImxTranslationProviderService } from 'qbm';
+import { clearStylesFromDOM, ImxTranslationProviderService, MetadataService } from 'qbm';
import { PolicyService } from '../policy.service';
import { EditGenericComponent } from './edit-generic.component';
import { FilterElementModel } from './filter-element-model';
@@ -102,7 +102,13 @@ describe('EditGenericComponent', () => {
{
provide: FilterElementColumnService,
useValue: mockFactory
- }
+ },
+ {
+ provide: MetadataService,
+ useValue: {
+ updateTable: jasmine.createSpy('updateTable'),
+ }
+ }
]
});
});
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.ts b/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.ts
index 062905d39..4b82c8263 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-generic.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -27,16 +27,15 @@
import { Component, Input, Output, EventEmitter, OnChanges } from '@angular/core';
import { MultiValue, ValueStruct } from 'imx-qbm-dbts';
-import { ColumnDependentReference, BaseCdr, ClassloggerService } from 'qbm';
+import { ColumnDependentReference, BaseCdr, ClassloggerService, MetadataService } from 'qbm';
import { FilterChangedArgument } from './filter-changed-argument.interface';
import { FilterElementModel } from './filter-element-model';
@Component({
templateUrl: './edit-generic.component.html',
- selector: 'imx-edit-generic'
+ selector: 'imx-edit-generic',
})
export class EditGenericComponent implements OnChanges {
-
public cdr: ColumnDependentReference;
@Input() public filterElementModel: FilterElementModel;
@@ -44,19 +43,25 @@ export class EditGenericComponent implements OnChanges {
@Output() public valueChanged = new EventEmitter();
- constructor(
- private readonly logger: ClassloggerService
- ) { }
+ constructor(private readonly logger: ClassloggerService, private readonly metaData: MetadataService) {}
- public ngOnChanges(): void {
- this.cdr = new BaseCdr(this.filterElementModel.columnForFilter);
+ public async ngOnChanges(): Promise{
+ const tableName = this.filterElementModel.getTableName();
+ if (tableName == null) {
+ this.cdr = new BaseCdr(this.filterElementModel.columnForFilter);
+ } else {
+ await this.metaData.update([this.filterElementModel.getTableName()]);
+ this.cdr = new BaseCdr(this.filterElementModel.columnForFilter,
+ this.metaData.tables[this.filterElementModel.getTableName()]
+ .Columns[this.filterElementModel.getColumnName()].Display);
+ }
}
public async invokeValueChangedEvent(arg: ValueStruct): Promise {
await this.filterElementModel.columnForFilter.PutValueStruct(arg);
const data = {
ParameterValue: FilterElementModel.buildCommaSeparatedList(this.filterElementModel.columnForFilter.GetValue()),
- displays: MultiValue.FromString(this.filterElementModel.columnForFilter.GetDisplayValue()).GetValues()
+ displays: MultiValue.FromString(this.filterElementModel.columnForFilter.GetDisplayValue()).GetValues(),
};
this.logger.trace(this, 'valueChanged called with', data);
this.valueChanged.emit(data);
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-name.component.spec.ts b/imxweb/projects/att/src/lib/policies/editors/edit-name.component.spec.ts
index bcdd8c522..8b891021c 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-name.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-name.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-name.component.ts b/imxweb/projects/att/src/lib/policies/editors/edit-name.component.ts
index 9fc753ea3..b66d3a91e 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-name.component.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-name.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.spec.ts b/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.spec.ts
index 6be76229a..3e202eff7 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.ts b/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.ts
index e2d6c088d..18b5e726d 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-origin.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.spec.ts b/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.spec.ts
index fc2173ed0..4cd9f1259 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.ts b/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.ts
index 1fd8bfa42..06a438218 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-threshold.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.spec.ts b/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.spec.ts
index cc9f87b6d..7a47849ab 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.ts b/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.ts
index 294f948a6..eaa732f14 100644
--- a/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/edit-uint.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/filter-changed-argument.interface.ts b/imxweb/projects/att/src/lib/policies/editors/filter-changed-argument.interface.ts
index 18aaad700..29536a25b 100644
--- a/imxweb/projects/att/src/lib/policies/editors/filter-changed-argument.interface.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/filter-changed-argument.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.spec.ts b/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.spec.ts
index 703e15d1e..a2bf4b0a9 100644
--- a/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.ts b/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.ts
index d8aa79d78..f6e4fb0f2 100644
--- a/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/filter-editor.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/filter-element-column-service.spec.ts b/imxweb/projects/att/src/lib/policies/editors/filter-element-column-service.spec.ts
index 21f5bbac6..3d1e173a0 100644
--- a/imxweb/projects/att/src/lib/policies/editors/filter-element-column-service.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/filter-element-column-service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/filter-element-column.service.ts b/imxweb/projects/att/src/lib/policies/editors/filter-element-column.service.ts
index 0baff705a..ad355ee00 100644
--- a/imxweb/projects/att/src/lib/policies/editors/filter-element-column.service.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/filter-element-column.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/filter-element-model.spec.ts b/imxweb/projects/att/src/lib/policies/editors/filter-element-model.spec.ts
index 25cbb9ae2..fb8c2c0d8 100644
--- a/imxweb/projects/att/src/lib/policies/editors/filter-element-model.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/filter-element-model.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/editors/filter-element-model.ts b/imxweb/projects/att/src/lib/policies/editors/filter-element-model.ts
index 7f8832ab5..436d6461d 100644
--- a/imxweb/projects/att/src/lib/policies/editors/filter-element-model.ts
+++ b/imxweb/projects/att/src/lib/policies/editors/filter-element-model.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -32,7 +32,6 @@ import { SelectecObjectsInfo } from '../selected-objects/selected-objects-info.i
import { FilterElementColumnService } from './filter-element-column.service';
export class FilterElementModel {
-
public columnForFilter: IEntityColumn;
public selectedObjectsSubject: BehaviorSubject = new BehaviorSubject(undefined);
@@ -69,7 +68,8 @@ export class FilterElementModel {
public displays: string[],
public readonly filterElement: PolicyFilterElement,
private readonly uidAttestationObject: string,
- private readonly columnFactory: FilterElementColumnService) {
+ private readonly columnFactory: FilterElementColumnService
+ ) {
this.setColumnForFilter();
}
@@ -83,21 +83,18 @@ export class FilterElementModel {
this.recalculateMatching();
}
- private setColumnForFilter() {
- this.columnForFilter = this.columnFactory.buildColumn(this.getParameterData(this.attestationSubType),
- this.attestationSubType, this.parameterValue, this.getColumnDisplay(), this.displays, this.hasFk());
-
- }
-
public recalculateMatching(): void {
- const data = this.filterErrors() == null ? {
- policyFilter: {
- ConcatenationType: 'OR',
- Elements: [this.filterElement]
- },
- uidPickCategory: '',
- uidAttestationObject: this.uidAttestationObject
- } : undefined;
+ const data =
+ this.filterErrors() == null
+ ? {
+ policyFilter: {
+ ConcatenationType: 'OR',
+ Elements: [this.filterElement],
+ },
+ uidPickCategory: '',
+ uidAttestationObject: this.uidAttestationObject,
+ }
+ : undefined;
this.selectedObjectsSubject.next(data);
}
@@ -110,12 +107,21 @@ export class FilterElementModel {
}
public hasFk(): boolean {
- return 'UID' === FilterElementModel.getRequiredParameterType(this.getParameterData(this.attestationSubType))
- || this.policyFilterRequiresParameterName('DOMAIN');
+ return (
+ 'UID' === FilterElementModel.getRequiredParameterType(this.getParameterData(this.attestationSubType)) ||
+ this.policyFilterRequiresParameterName('DOMAIN')
+ );
}
- public filterErrors(): ({ [key: string]: boolean } | null) {
+ public getColumnName(): string {
+ return this.getParameterData(this.attestationSubType)?.ColumnName;
+ }
+
+ public getTableName(): string {
+ return this.getParameterData(this.attestationSubType)?.TableName;
+ }
+ public filterErrors(): { [key: string]: boolean } | null {
const subType = FilterElementModel.getRequiredParameterType(this.getParameterData(this.attestationSubType));
if (this.attestationSubType == null || this.attestationSubType === '') {
@@ -130,18 +136,26 @@ export class FilterElementModel {
return { lagerZero: true };
}
- if ('THRESHOLD' === subType &&
- (parseFloat(this.parameterValue) < 0 || parseFloat(this.parameterValue) > 1)) {
+ if ('THRESHOLD' === subType && (parseFloat(this.parameterValue) < 0 || parseFloat(this.parameterValue) > 1)) {
return { loweroutOfRange: true };
}
- if ('THRESHOLD' === subType && (
- parseFloat(this.parameterValue2) < 0 || parseFloat(this.parameterValue2) > 1)) {
+ if ('THRESHOLD' === subType && (parseFloat(this.parameterValue2) < 0 || parseFloat(this.parameterValue2) > 1)) {
return { upperoutOfRange: true };
}
return null;
+ }
+ private setColumnForFilter(): void {
+ this.columnForFilter = this.columnFactory.buildColumn(
+ this.getParameterData(this.attestationSubType),
+ this.attestationSubType,
+ this.parameterValue,
+ this.getColumnDisplay(),
+ this.displays,
+ this.hasFk()
+ );
}
private getColumnDisplay(): string {
@@ -160,7 +174,7 @@ export class FilterElementModel {
}
public static getParameterData(parameters: ParmData[], parameterType: string): ParmData {
- const arr = parameters.filter(p => p.Uid === parameterType);
+ const arr = parameters.filter((p) => p.Uid === parameterType);
if (arr.length !== 1) {
return null;
}
@@ -169,16 +183,26 @@ export class FilterElementModel {
}
public static getRequiredParameterType(w: ParmData): string {
- if (w == null || w.RequiredParameter == null) { return ''; }
+ if (w == null || w.RequiredParameter == null) {
+ return '';
+ }
- if (w.RequiredParameter === 'UID_ORIGIN') { return 'UID_ORIGIN'; }
- if (w.RequiredParameter.startsWith('UID_')) { return 'UID'; }
+ if (w.RequiredParameter === 'UID_ORIGIN') {
+ return 'UID_ORIGIN';
+ }
+ if (w.RequiredParameter.startsWith('UID_')) {
+ return 'UID';
+ }
return w.RequiredParameter;
}
public static getDefaultValue(parameterName: string, upper: boolean): string {
- if (parameterName === 'UINT') { return upper ? '' : '0'; }
- if (parameterName === 'THRESHOLD') { return upper ? '1' : '0'; }
+ if (parameterName === 'UINT') {
+ return upper ? '' : '0';
+ }
+ if (parameterName === 'THRESHOLD') {
+ return upper ? '1' : '0';
+ }
return '';
}
@@ -186,17 +210,20 @@ export class FilterElementModel {
if (str === '') {
return '';
}
- const seperated = this.replaceAll(
- this.replaceAll(str, '\'', ''), ',', MultiValueProperty.DefaultSeparator);
+ const seperated = this.replaceAll(this.replaceAll(str, '\'', ''), ',', MultiValueProperty.DefaultSeparator);
return seperated;
}
public static buildCommaSeparatedList(value: string): string {
- return value ? value.split(MultiValueProperty.DefaultSeparator).map(elem => `'${elem}'`).join(',') : '';
+ return value
+ ? value
+ .split(MultiValueProperty.DefaultSeparator)
+ .map((elem) => `'${elem}'`)
+ .join(',')
+ : '';
}
private static replaceAll(str: string, oldValue: string, newValue: string): string {
return str.split(oldValue).join(newValue);
}
-
}
diff --git a/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.spec.ts b/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.spec.ts
index e2314a8cb..00192259d 100644
--- a/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.ts b/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.ts
index d0556fbd5..755b58d10 100644
--- a/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-details/policy-details.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy-editor/filter-model.ts b/imxweb/projects/att/src/lib/policies/policy-editor/filter-model.ts
index 7df28d854..469095394 100644
--- a/imxweb/projects/att/src/lib/policies/policy-editor/filter-model.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-editor/filter-model.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.html b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.html
index 40cdfa525..a3cf2b8d9 100644
--- a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.html
+++ b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.html
@@ -1,55 +1,68 @@
- {{'#LDS#Heading Objects To Be Attested by This Attestation Policy' | translate}}
-
-
+ {{ '#LDS#Heading Objects To Be Attested by This Attestation Policy' | translate }}
+
+
+
+ {{ '#LDS#This policy affects many objects. Note that running this policy may take some time and generate notifications to many approvers' | translate }}
+
-
- {{'#LDS#How many conditions must
- be met?' | translate}}
-
-
- {{'#LDS#All conditions have to be met.' | translate}}
-
-
- {{'#LDS#At least one condition has to be met.' | translate}}
-
-
-
-
-
- {{'#LDS#Add at least one condition.' |translate}}
-
-
-
-
-
+
+ {{ '#LDS#How many conditions must
+ be met?' | translate }}
+
+
+ {{ '#LDS#All conditions have to be met.' | translate }}
+
+
+ {{ '#LDS#At least one condition has to be met.' | translate }}
+
+
+
+
+
+ {{ '#LDS#Add at least one condition.' | translate }}
+
+
+
+
+
- {{'#LDS#No conditions are specified for this attestation
- policy.' | translate}}
+ {{ '#LDS#No conditions are specified for this attestation
+ policy.' | translate }}
-
-
- #LDS#This attestation policy uses sample data.
-
-
- #LDS#The sample data will be used for the attestation. To use conditions, remove the sample.
-
-
-
-
\ No newline at end of file
+
+
+ #LDS#This attestation policy uses sample data.
+
+
+ #LDS#The sample data will be used for the attestation. To use conditions, remove the sample.
+
+
+
diff --git a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.scss b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.scss
index f05b561a4..ebdf20dc0 100644
--- a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.scss
+++ b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.scss
@@ -1,9 +1,11 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@use '@angular/material' as mat;
+@import "@elemental-ui/core/src/styles/_palette.scss";
+
:host {
display: flex;
flex-direction: column;
padding-top: 10px;
- background-color: mat-color($asher-gray-palette, 800);
+ background-color: mat.get-color-from-palette($asher-gray-palette, 800);
padding-left: 30px;
padding-right: 30px;
overflow: auto;
diff --git a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.spec.ts b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.spec.ts
index a7109889d..cf0dd751c 100644
--- a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -41,6 +41,7 @@ import { FilterModel } from './filter-model';
import { IEntityColumn } from 'imx-qbm-dbts';
import { FilterElementColumnService } from '../editors/filter-element-column.service';
import { FilterElementModel } from '../editors/filter-element-model';
+import { PolicyService } from '../policy.service';
@Component({
@@ -126,6 +127,12 @@ describe('PolicyEditorComponent', () => {
{
provide: EuiLoadingService,
useValue: euiLoadingServiceStub
+ },
+ {
+ provide: PolicyService,
+ useValue: {
+ getCasesThreshold: jasmine.createSpy('getCasesThreshold').and.returnValue(Promise.resolve(99999))
+ }
}
]
});
diff --git a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.ts b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.ts
index c1e9c1589..e787a60a0 100644
--- a/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-editor/policy-editor.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -25,7 +25,7 @@
*/
import { OverlayRef } from '@angular/cdk/overlay';
-import { AfterViewInit, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
import { AbstractControl, FormArray, FormControl, FormGroup, ValidatorFn } from '@angular/forms';
import { EuiLoadingService } from '@elemental-ui/core';
import { Subscription } from 'rxjs';
@@ -34,6 +34,8 @@ import { ClassloggerService } from 'qbm';
import { FilterElementModel } from '../editors/filter-element-model';
import { PolicyFilterElementComponent } from '../policy-filter-element/policy-filter-element.component';
import { FilterModel } from './filter-model';
+import { SelectedObjectsComponent } from '../selected-objects/selected-objects.component';
+import { PolicyService } from '../policy.service';
@Component({
templateUrl: './policy-editor.component.html',
@@ -55,17 +57,24 @@ export class PolicyEditorComponent implements OnInit, OnDestroy, AfterViewInit {
@Input() public filterModel: FilterModel;
public isEnabled = true;
+ public get showWarning() {
+ return this.threshold > 0 && this.threshold < (this.totalCountControl?.countMatching ?? 0);
+ }
+
@ViewChildren(PolicyFilterElementComponent) private matExpansionPanelQueryList: QueryList;
+ @ViewChild('totalCount') private totalCountControl: SelectedObjectsComponent
private readonly concatenationType = 'concatenationType';
private readonly filterControl = 'filterControl';
private readonly filterParameter = 'filterParameter';
private concatSubject: Subscription;
private newExpansionPanelSubscrioption: Subscription;
+ private threshold = -1;
constructor(
private readonly busyService: EuiLoadingService,
private cd: ChangeDetectorRef,
+ private readonly policyService:PolicyService,
private readonly logger: ClassloggerService) {
this.concatSubject = this.filterFormGroup.get(this.concatenationType).valueChanges.subscribe(elem => {
@@ -185,6 +194,7 @@ export class PolicyEditorComponent implements OnInit, OnDestroy, AfterViewInit {
setTimeout(() => overlayRef = this.busyService.show());
try {
await this.filterModel.updateConfig();
+ this.threshold = await this.policyService.getCasesThreshold();
this.logger.debug(this, 'parameter config updated');
} finally {
setTimeout(() => this.busyService.hide(overlayRef));
diff --git a/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.scss b/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.scss
index 2a96885ce..c6d5e4815 100644
--- a/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.scss
+++ b/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host ::ng-deep .mat-expansion-panel-body {
display: flex;
diff --git a/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.spec.ts b/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.spec.ts
index cd7ce6353..a5af0dcf9 100644
--- a/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.ts b/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.ts
index 82d7f6e0e..5c3e33755 100644
--- a/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-filter-element/policy-filter-element.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy-list/attestation-policy.ts b/imxweb/projects/att/src/lib/policies/policy-list/attestation-policy.ts
index ba75af376..0dbe4567c 100644
--- a/imxweb/projects/att/src/lib/policies/policy-list/attestation-policy.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-list/attestation-policy.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.scss b/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.scss
index 36eb7bd03..33fe2ac41 100644
--- a/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.scss
+++ b/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
display: flex;
@@ -6,7 +6,7 @@
overflow: hidden;
height: inherit;
}
-
+
imx-data-table {
flex-grow: 2;
}
@@ -16,7 +16,7 @@
font-size: 14px;
padding: 0 10px;
}
-
+
:host ::ng-deep imx-data-table .mat-row .mat-cell {
padding: 0 10px;
}
@@ -24,20 +24,19 @@
.imx-separate-menu-item {
border-top: 1px solid $black-c;
}
-
+
.imx-table-container {
display: flex;
flex-direction: column;
overflow: hidden;
height: inherit;
- max-width: 1200px;
}
.imx-policy-footer {
display: flex;
flex-direction: row;
align-items: center;
- padding: 10px;
+ padding: 10px;
border: 1px solid $black-c;
min-height: 50px;
}
@@ -53,7 +52,6 @@
.mat-toolbar {
background-color: inherit;
- max-width: 1200px;
margin-left: 25px;
margin-right: 0;
margin-bottom: 40px;
@@ -83,7 +81,6 @@
flex-direction: row;
justify-content: flex-end;
margin: 10px 0 0 0;
- max-width: 1200px;
}
.imx-button-column {
@@ -94,4 +91,4 @@
> *:not(:last-child) {
margin-right: 5px;
}
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.spec.ts b/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.spec.ts
index 60c7d3315..51a1016b9 100644
--- a/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.ts b/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.ts
index 47f8c2975..991e9d964 100644
--- a/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-list/policy-list.component.ts
@@ -1,446 +1,448 @@
-/*
- * ONE IDENTITY LLC. PROPRIETARY INFORMATION
- *
- * This software is confidential. One Identity, LLC. or one of its affiliates or
- * subsidiaries, has supplied this software to you under terms of a
- * license agreement, nondisclosure agreement or both.
- *
- * You may not copy, disclose, or use this software except in accordance with
- * those terms.
- *
- *
- * Copyright 2021 One Identity LLC.
- * ALL RIGHTS RESERVED.
- *
- * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
- * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
- * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
- * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
- * THIS SOFTWARE OR ITS DERIVATIVES.
- *
- */
-
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { OverlayRef } from '@angular/cdk/overlay';
-import { EuiDownloadOptions, EuiLoadingService, EuiSidesheetService } from '@elemental-ui/core';
-import { TranslateService } from '@ngx-translate/core';
-import { MatButton } from '@angular/material/button';
-
-import {
- ClassloggerService,
- ConfirmationService,
- DataSourceToolbarFilter,
- DataSourceToolbarGroupData,
- DataSourceToolbarSettings,
- DataTableGroupedData,
- SettingsService,
- SnackBarService,
- SystemInfoService
-} from 'qbm';
-import {
- IClientProperty,
- DisplayColumns,
- ValType,
- ExtendedTypedEntityCollection,
- EntitySchema,
- FilterType,
- CompareOperator,
- DataModel
-} from 'imx-qbm-dbts';
-import { PolicyFilterData, PortalAttestationPolicy, PortalAttestationPolicyEditInteractive } from 'imx-api-att';
-import { UserModelService } from 'qer';
-import { PolicyService } from '../policy.service';
-import { EditMasterDataComponent } from '../edit-master-data/edit-master-data.component';
-import { AttestationCasesComponentParameter } from '../attestation-cases/attestation-cases-component-parameter.interface';
-import { AttestationCasesComponent } from '../attestation-cases/attestation-cases.component';
-import { PolicyLoadParameters } from './policy-load-parameters.interface';
-import { AttestationPolicy } from './attestation-policy';
-import { PolicyDetailsComponent } from '../policy-details/policy-details.component';
-
-@Component({
- templateUrl: './policy-list.component.html',
- styleUrls: ['./policy-list.component.scss']
-})
-export class PolicyListComponent implements OnInit {
-
- @ViewChild('deleteButton') public deleteButton: MatButton;
-
- public dstSettings: DataSourceToolbarSettings;
- public navigationState: PolicyLoadParameters;
- public readonly entitySchemaPolicy: EntitySchema;
- public readonly DisplayColumns = DisplayColumns;
- public groupedData: { [key: string]: DataTableGroupedData } = {};
- public isComplienceFrameworkEnabled = false; private groupData: DataSourceToolbarGroupData;
-
- private filterOptions: DataSourceToolbarFilter[] = [];
- private prefilterOwner = false;
- private readonly displayedColumns: IClientProperty[];
- private dataModel: DataModel;
-
- constructor(
- private readonly busyService: EuiLoadingService,
- private readonly policyService: PolicyService,
- private readonly confirmationService: ConfirmationService,
- private readonly snackbar: SnackBarService,
- private readonly translator: TranslateService,
- private readonly sideSheet: EuiSidesheetService,
- private readonly userService: UserModelService,
- private readonly systemInfoService: SystemInfoService,
- private readonly settingsService: SettingsService,
- private readonly logger: ClassloggerService) {
- this.navigationState = { PageSize: this.settingsService.DefaultPageSize, StartIndex: 0 };
- this.entitySchemaPolicy = policyService.AttestationPolicySchema;
- this.displayedColumns = [
- this.entitySchemaPolicy.Columns[DisplayColumns.DISPLAY_PROPERTYNAME],
- this.entitySchemaPolicy.Columns.NextRun,
- {
- ColumnName: 'actions',
- Type: ValType.String
- }
- ];
- }
-
- public async ngOnInit(): Promise {
- let overlayRef: OverlayRef;
- setTimeout(() => (overlayRef = this.busyService.show()));
- let groups: string[];
- let prep: string[];
- try {
-
- this.dataModel = await this.policyService.getDataModel();
- groups = (await this.userService.getGroups()).map(elem => elem.Name);
- prep = (await this.systemInfoService.get()).PreProps;
-
- this.prefilterOwner = !this.policyService.canSeeAllAttestations(prep, groups);
- this.isComplienceFrameworkEnabled = await this.policyService.isComplienceFrameworkEnabled();
- await this.initFilterAndGrouping();
-
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- }
- await this.navigate();
- }
-
- public async onNavigationStateChanged(newState: PolicyLoadParameters): Promise {
- this.navigationState = newState;
- this.logger.trace(this, 'navigation state change to ', this.navigationState);
- await this.navigate();
- }
-
- public async onSearch(keywords: string): Promise {
- this.navigationState = {
- ...this.navigationState,
- ...{
- StartIndex: 0,
- search: keywords,
- }
- };
- this.logger.trace(this, 'navigation state change to ', this.navigationState);
- return this.navigate();
- }
-
- public async onGroupingChange(groupKey: string): Promise {
- let overlayRef: OverlayRef;
- setTimeout(() => (overlayRef = this.busyService.show()));
-
- try {
- const groupedData = this.groupedData[groupKey];
- groupedData.data = await this.policyService.getPolicies(groupedData.navigationState);
- groupedData.settings = {
- displayedColumns: this.dstSettings.displayedColumns,
- dataSource: groupedData.data,
- entitySchema: this.dstSettings.entitySchema,
- navigationState: groupedData.navigationState
- };
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- }
- }
-
- public async menuOpened(policy: AttestationPolicy): Promise {
- let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- const count = await this.policyService.getRunCountForPolicy(policy.GetEntity().GetKeys()[0]);
- policy.hasAttestations = count > 0;
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- }
- }
-
- public async editPolicy(policy: PortalAttestationPolicy): Promise {
- let data: ExtendedTypedEntityCollection;
-
- let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- data = await this.policyService.getPolicyEditInteractive(policy.GetEntity().GetKeys()[0]);
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- if (data && data.Data.length > 0) {
- await this.showPolicy(data.Data[0], data.extendedData[0], policy.GetEntity().GetDisplay(), false);
- }
- }
- }
-
- public async newPolicy(): Promise {
- let policy: PortalAttestationPolicyEditInteractive;
- let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- policy = await this.policyService.buildNewEntity();
- this.logger.trace(this, 'new policy created', policy);
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- if (policy) {
- await this.showPolicy(policy, {
- IsReadOnly: false,
- Filter: { Elements: [], ConcatenationType: 'OR' },
- InfoDisplay: []
- }, await this.translator.get('#LDS#Heading Create Attestation Policy').toPromise(), true);
- }
- }
- }
-
- public async copy(policy: PortalAttestationPolicy): Promise {
- let newPolicy: PortalAttestationPolicyEditInteractive;
- let filter: PolicyFilterData;
- let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- const data = await this.policyService.getPolicyEditInteractive(policy.GetEntity().GetKeys()[0]);
-
- if (data == null || data.Data.length === 0) {
- return this.newPolicy();
- }
-
- newPolicy = await this.policyService.buildNewEntity(data.Data[0], data.extendedData[0].Filter);
- filter = data.extendedData[0];
- this.logger.trace(this, 'copy for policy (old, new)', data, newPolicy);
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- if (newPolicy) {
- await this.showPolicy(newPolicy,
- filter,
- await this.translator.get('#LDS#Heading Copy Attestation Policy').toPromise(),
- true);
- }
- }
- }
-
- public async delete(policy: PortalAttestationPolicy): Promise {
- if (await this.confirmationService.confirm({
- Title: '#LDS#Heading Delete Attestation Policy',
- Message: '#LDS#Are you sure you want to delete the attestation policy?'
- })) {
-
- let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- const key = policy.GetEntity().GetKeys()[0];
- await this.policyService.deleteAttestationPolicy(key);
- this.logger.debug(this, `policy ${key} deleted`);
-
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- }
- const message = {
- key: '#LDS#The attestation policy "{0}" has been successfully deleted.',
- parameters: [policy.GetEntity().GetDisplay()]
- };
- this.navigate();
- this.snackbar.open(message, '#LDS#Close');
- }
- }
-
- public getReportOptions(policy: PortalAttestationPolicy): EuiDownloadOptions {
- return this.policyService.getReportDownloadOptions(policy.GetEntity().GetKeys()[0], policy.GetEntity().GetDisplay());
- }
-
- public async run(policy: PortalAttestationPolicy): Promise {
- let overlayRef: OverlayRef;
- let data: AttestationCasesComponentParameter;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- const policyEdit = await this.policyService.getPolicyEditInteractive(policy.GetEntity().GetKeys()[0]);
- this.logger.trace(this, 'interactive policy loaded', policyEdit);
-
- if (policyEdit == null || policyEdit.Data.length === 0) {
- return;
- }
-
- const ext = policyEdit.extendedData;
- data = {
- uidobject: policyEdit.Data[0].UID_AttestationObject.value,
- uidPickCategory: policyEdit.Data[0].UID_QERPickCategory.value,
- filter: ext != null ? ext[0]?.Filter.Elements : null,
- concat: ext != null ? ext[0]?.Filter.ConcatenationType : null,
- canCreateRuns: true,
- uidpolicy: policy.GetEntity().GetKeys()[0],
- subtitle: policy.GetEntity().GetDisplay()
- };
-
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- }
-
- if (data) {
- const result = await this.sideSheet.open(AttestationCasesComponent, {
- title: await this.translator.get('#LDS#Start attestation').toPromise(),
- headerColour: 'iris-blue',
- bodyColour: 'asher-gray',
- padding: '0px',
- width: 'max(600px, 60%)',
- data,
- testId: 'policy-list-start-attestation-run-sidesheet'
- }).afterClosed().toPromise();
- if (result) {
- this.navigate();
- }
- }
- }
-
- public async showDetails(policy: PortalAttestationPolicy): Promise {
-
- let singlePolicy: PortalAttestationPolicy;
- let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- const policies = (await this.policyService.getPolicies({
- filter: [
- {
- ColumnName: 'UID_AttestationPolicy',
- Type: FilterType.Compare,
- CompareOp: CompareOperator.Equal,
- Value1: policy.GetEntity().GetKeys()[0]
- }
- ]
- }));
- singlePolicy = policies.Data.length > 0 ? policies.Data[0] : undefined;
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- }
- if (singlePolicy) {
- this.sideSheet.open(PolicyDetailsComponent, {
- title: await this.translator.get('#LDS#Heading View Attestation Policy Details').toPromise(),
- headerColour: 'iris-blue',
- bodyColour: 'asher-gray',
- padding: '0px',
- width: 'max(600px, 60%)',
- data: { policy: singlePolicy },
- testId: 'policy-list-view-details-sidesheet'
- });
- }
- }
-
- private async navigate(): Promise {
- let overlayRef: OverlayRef;
- setTimeout(() => overlayRef = this.busyService.show());
- try {
- const policies = await this.policyService.getPolicies(this.navigationState);
- this.logger.trace(this, 'interactive policy loaded', policies);
-
- this.dstSettings = {
- displayedColumns: this.displayedColumns,
- dataSource: policies,
- filters: this.filterOptions,
- groupData: this.groupData,
- entitySchema: this.entitySchemaPolicy,
- navigationState: this.navigationState,
- dataModel: this.dataModel,
- identifierForSessionStore: 'policy-list'
- };
- } finally {
- setTimeout(() => this.busyService.hide(overlayRef));
- }
- }
-
- private async showPolicy(
- policy: PortalAttestationPolicyEditInteractive,
- filterData: PolicyFilterData,
- display: string,
- isNew: boolean): Promise {
- const sidesheetRef = this.sideSheet.open(EditMasterDataComponent, {
- title: display,
- headerColour: 'iris-blue',
- bodyColour: 'asher-gray',
- padding: '0px',
- width: 'max(600px, 80%)',
- disableClose: true,
- data: { policy, filterData, isNew, isComplienceFrameworkEnabled: this.isComplienceFrameworkEnabled },
- testId: 'policy-list-show-policy-sidesheet'
- });
-
- const shouldReload = await sidesheetRef.afterClosed().toPromise();
- if (shouldReload) { this.navigate(); }
- }
-
- private async initFilterAndGrouping(): Promise {
- const dataModel = await this.policyService.getDataModel();
- this.filterOptions = dataModel.Filters;
-
- // set initial value for OnlyActivePolicies
- const indexActive = this.filterOptions.findIndex(elem => elem.Name === 'OnlyActivePolicies');
- if (indexActive > -1) {
- this.filterOptions[indexActive].InitialValue = '1';
- this.navigationState.OnlyActivePolicies = '1';
- }
-
- // remove filter myPolicies, if you are an owner only and not an attestation admin
- if (this.prefilterOwner) {
- this.navigationState.mypolicies = '1';
- const index = this.filterOptions.findIndex(elem => elem.Name === 'mypolicies');
- if (index > -1) {
- this.filterOptions.splice(index, 1);
- }
- }
-
- const groups = [];
- for (const property of dataModel.Properties.filter(p => p.IsGroupable)) {
- const getData = async () => (await this.policyService.getGroupInfo({
- by: property.Property.ColumnName,
- PageSize: this.navigationState.PageSize,
- StartIndex: 0
- })).filter(item => item.Count > 0);
-
- groups.push({
- property,
- getData
- });
- }
-
- for (const dataModelGroupInfo of dataModel.GroupInfo) {
- for (const property of dataModelGroupInfo.Options) {
- const getData = async () => (await this.policyService.getGroupInfo({
- def: property.Value,
- PageSize: this.navigationState.PageSize,
- StartIndex: 0
- }))
- .filter(item => item.Count > 0)
- .map(item => {
- item.Display.forEach(display =>
- item.Filters.forEach(filter => {
- if (filter.Value1 != null) {
- display.Display = display.Display.replace(`%${filter.ColumnName}%`, filter.Value1);
- }
- })
- );
- return item;
- });
-
- groups.push({
- property,
- getData
- });
- }
- }
-
- if (groups.length > 0) {
- this.groupData = { groups };
- }
- }
-}
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { OverlayRef } from '@angular/cdk/overlay';
+import { EuiDownloadOptions, EuiLoadingService, EuiSidesheetService } from '@elemental-ui/core';
+import { TranslateService } from '@ngx-translate/core';
+import { MatButton } from '@angular/material/button';
+
+import {
+ ClassloggerService,
+ ConfirmationService,
+ DataSourceToolbarFilter,
+ DataSourceToolbarGroupData,
+ DataSourceToolbarSettings,
+ DataTableGroupedData,
+ ClientPropertyForTableColumns,
+ SettingsService,
+ SnackBarService,
+ SystemInfoService
+} from 'qbm';
+import {
+ IClientProperty,
+ DisplayColumns,
+ ValType,
+ ExtendedTypedEntityCollection,
+ EntitySchema,
+ FilterType,
+ CompareOperator,
+ DataModel
+} from 'imx-qbm-dbts';
+import { PolicyFilterData, PortalAttestationPolicy, PortalAttestationPolicyEditInteractive } from 'imx-api-att';
+import { UserModelService } from 'qer';
+import { PolicyService } from '../policy.service';
+import { EditMasterDataComponent } from '../edit-master-data/edit-master-data.component';
+import { AttestationCasesComponentParameter } from '../attestation-cases/attestation-cases-component-parameter.interface';
+import { AttestationCasesComponent } from '../attestation-cases/attestation-cases.component';
+import { PolicyLoadParameters } from './policy-load-parameters.interface';
+import { AttestationPolicy } from './attestation-policy';
+import { PolicyDetailsComponent } from '../policy-details/policy-details.component';
+
+@Component({
+ templateUrl: './policy-list.component.html',
+ styleUrls: ['./policy-list.component.scss']
+})
+export class PolicyListComponent implements OnInit {
+
+ @ViewChild('deleteButton') public deleteButton: MatButton;
+
+ public dstSettings: DataSourceToolbarSettings;
+ public navigationState: PolicyLoadParameters;
+ public readonly entitySchemaPolicy: EntitySchema;
+ public readonly DisplayColumns = DisplayColumns;
+ public groupedData: { [key: string]: DataTableGroupedData } = {};
+ public isComplienceFrameworkEnabled = false; private groupData: DataSourceToolbarGroupData;
+
+ private filterOptions: DataSourceToolbarFilter[] = [];
+ private prefilterOwner = false;
+ private readonly displayedColumns: ClientPropertyForTableColumns[];
+ private dataModel: DataModel;
+
+ constructor(
+ private readonly busyService: EuiLoadingService,
+ private readonly policyService: PolicyService,
+ private readonly confirmationService: ConfirmationService,
+ private readonly snackbar: SnackBarService,
+ private readonly translator: TranslateService,
+ private readonly sideSheet: EuiSidesheetService,
+ private readonly userService: UserModelService,
+ private readonly systemInfoService: SystemInfoService,
+ private readonly settingsService: SettingsService,
+ private readonly logger: ClassloggerService) {
+ this.navigationState = { PageSize: this.settingsService.DefaultPageSize, StartIndex: 0 };
+ this.entitySchemaPolicy = policyService.AttestationPolicySchema;
+ this.displayedColumns = [
+ this.entitySchemaPolicy.Columns[DisplayColumns.DISPLAY_PROPERTYNAME],
+ this.entitySchemaPolicy.Columns.NextRun,
+ {
+ ColumnName: 'actions',
+ Type: ValType.String,
+ afterAdditionals: true
+ }
+ ];
+ }
+
+ public async ngOnInit(): Promise {
+ let overlayRef: OverlayRef;
+ setTimeout(() => (overlayRef = this.busyService.show()));
+ let groups: string[];
+ let prep: string[];
+ try {
+
+ this.dataModel = await this.policyService.getDataModel();
+ groups = (await this.userService.getGroups()).map(elem => elem.Name);
+ prep = (await this.systemInfoService.get()).PreProps;
+
+ this.prefilterOwner = !this.policyService.canSeeAllAttestations(prep, groups);
+ this.isComplienceFrameworkEnabled = await this.policyService.isComplienceFrameworkEnabled();
+ await this.initFilterAndGrouping();
+
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ }
+ await this.navigate();
+ }
+
+ public async onNavigationStateChanged(newState: PolicyLoadParameters): Promise {
+ this.navigationState = newState;
+ this.logger.trace(this, 'navigation state change to ', this.navigationState);
+ await this.navigate();
+ }
+
+ public async onSearch(keywords: string): Promise {
+ this.navigationState = {
+ ...this.navigationState,
+ ...{
+ StartIndex: 0,
+ search: keywords,
+ }
+ };
+ this.logger.trace(this, 'navigation state change to ', this.navigationState);
+ return this.navigate();
+ }
+
+ public async onGroupingChange(groupKey: string): Promise {
+ let overlayRef: OverlayRef;
+ setTimeout(() => (overlayRef = this.busyService.show()));
+
+ try {
+ const groupedData = this.groupedData[groupKey];
+ groupedData.data = await this.policyService.getPolicies(groupedData.navigationState);
+ groupedData.settings = {
+ displayedColumns: this.dstSettings.displayedColumns,
+ dataSource: groupedData.data,
+ entitySchema: this.dstSettings.entitySchema,
+ navigationState: groupedData.navigationState
+ };
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ }
+ }
+
+ public async menuOpened(policy: AttestationPolicy): Promise {
+ let overlayRef: OverlayRef;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ const count = await this.policyService.getRunCountForPolicy(policy.GetEntity().GetKeys()[0]);
+ policy.hasAttestations = count > 0;
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ }
+ }
+
+ public async editPolicy(policy: PortalAttestationPolicy): Promise {
+ let data: ExtendedTypedEntityCollection;
+
+ let overlayRef: OverlayRef;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ data = await this.policyService.getPolicyEditInteractive(policy.GetEntity().GetKeys()[0]);
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ if (data && data.Data.length > 0) {
+ await this.showPolicy(data.Data[0], data.extendedData[0], policy.GetEntity().GetDisplay(), false);
+ }
+ }
+ }
+
+ public async newPolicy(): Promise {
+ let policy: PortalAttestationPolicyEditInteractive;
+ let overlayRef: OverlayRef;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ policy = await this.policyService.buildNewEntity();
+ this.logger.trace(this, 'new policy created', policy);
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ if (policy) {
+ await this.showPolicy(policy, {
+ IsReadOnly: false,
+ Filter: { Elements: [], ConcatenationType: 'OR' },
+ InfoDisplay: []
+ }, await this.translator.get('#LDS#Heading Create Attestation Policy').toPromise(), true);
+ }
+ }
+ }
+
+ public async copy(policy: PortalAttestationPolicy): Promise {
+ let newPolicy: PortalAttestationPolicyEditInteractive;
+ let filter: PolicyFilterData;
+ let overlayRef: OverlayRef;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ const data = await this.policyService.getPolicyEditInteractive(policy.GetEntity().GetKeys()[0]);
+
+ if (data == null || data.Data.length === 0) {
+ return this.newPolicy();
+ }
+
+ newPolicy = await this.policyService.buildNewEntity(data.Data[0], data.extendedData[0].Filter);
+ filter = data.extendedData[0];
+ this.logger.trace(this, 'copy for policy (old, new)', data, newPolicy);
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ if (newPolicy) {
+ await this.showPolicy(newPolicy,
+ filter,
+ await this.translator.get('#LDS#Heading Copy Attestation Policy').toPromise(),
+ true);
+ }
+ }
+ }
+
+ public async delete(policy: PortalAttestationPolicy): Promise {
+ if (await this.confirmationService.confirm({
+ Title: '#LDS#Heading Delete Attestation Policy',
+ Message: '#LDS#Are you sure you want to delete the attestation policy?'
+ })) {
+
+ let overlayRef: OverlayRef;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ const key = policy.GetEntity().GetKeys()[0];
+ await this.policyService.deleteAttestationPolicy(key);
+ this.logger.debug(this, `policy ${key} deleted`);
+
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ }
+ const message = {
+ key: '#LDS#The attestation policy "{0}" has been successfully deleted.',
+ parameters: [policy.GetEntity().GetDisplay()]
+ };
+ this.navigate();
+ this.snackbar.open(message, '#LDS#Close');
+ }
+ }
+
+ public getReportOptions(policy: PortalAttestationPolicy): EuiDownloadOptions {
+ return this.policyService.getReportDownloadOptions(policy.GetEntity().GetKeys()[0], policy.GetEntity().GetDisplay());
+ }
+
+ public async run(policy: PortalAttestationPolicy): Promise {
+ let overlayRef: OverlayRef;
+ let data: AttestationCasesComponentParameter;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ const policyEdit = await this.policyService.getPolicyEditInteractive(policy.GetEntity().GetKeys()[0]);
+ this.logger.trace(this, 'interactive policy loaded', policyEdit);
+
+ if (policyEdit == null || policyEdit.Data.length === 0) {
+ return;
+ }
+
+ const ext = policyEdit.extendedData;
+ data = {
+ uidobject: policyEdit.Data[0].UID_AttestationObject.value,
+ uidPickCategory: policyEdit.Data[0].UID_QERPickCategory.value,
+ filter: ext != null ? ext[0]?.Filter.Elements : null,
+ concat: ext != null ? ext[0]?.Filter.ConcatenationType : null,
+ canCreateRuns: true,
+ uidpolicy: policy.GetEntity().GetKeys()[0],
+ subtitle: policy.GetEntity().GetDisplay()
+ };
+
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ }
+
+ if (data) {
+ const result = await this.sideSheet.open(AttestationCasesComponent, {
+ title: await this.translator.get('#LDS#Start attestation').toPromise(),
+ headerColour: 'iris-blue',
+ bodyColour: 'asher-gray',
+ padding: '0px',
+ width: 'max(600px, 60%)',
+ data,
+ testId: 'policy-list-start-attestation-run-sidesheet'
+ }).afterClosed().toPromise();
+ if (result) {
+ this.navigate();
+ }
+ }
+ }
+
+ public async showDetails(policy: PortalAttestationPolicy): Promise {
+
+ let singlePolicy: PortalAttestationPolicy;
+ let overlayRef: OverlayRef;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ const policies = (await this.policyService.getPolicies({
+ filter: [
+ {
+ ColumnName: 'UID_AttestationPolicy',
+ Type: FilterType.Compare,
+ CompareOp: CompareOperator.Equal,
+ Value1: policy.GetEntity().GetKeys()[0]
+ }
+ ]
+ }));
+ singlePolicy = policies.Data.length > 0 ? policies.Data[0] : undefined;
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ }
+ if (singlePolicy) {
+ this.sideSheet.open(PolicyDetailsComponent, {
+ title: await this.translator.get('#LDS#Heading View Attestation Policy Details').toPromise(),
+ headerColour: 'iris-blue',
+ bodyColour: 'asher-gray',
+ padding: '0px',
+ width: 'max(600px, 60%)',
+ data: { policy: singlePolicy },
+ testId: 'policy-list-view-details-sidesheet'
+ });
+ }
+ }
+
+ private async navigate(): Promise {
+ let overlayRef: OverlayRef;
+ setTimeout(() => overlayRef = this.busyService.show());
+ try {
+ const policies = await this.policyService.getPolicies(this.navigationState);
+ this.logger.trace(this, 'interactive policy loaded', policies);
+
+ this.dstSettings = {
+ displayedColumns: this.displayedColumns,
+ dataSource: policies,
+ filters: this.filterOptions,
+ groupData: this.groupData,
+ entitySchema: this.entitySchemaPolicy,
+ navigationState: this.navigationState,
+ dataModel: this.dataModel,
+ identifierForSessionStore: 'policy-list'
+ };
+ } finally {
+ setTimeout(() => this.busyService.hide(overlayRef));
+ }
+ }
+
+ private async showPolicy(
+ policy: PortalAttestationPolicyEditInteractive,
+ filterData: PolicyFilterData,
+ display: string,
+ isNew: boolean): Promise {
+ const sidesheetRef = this.sideSheet.open(EditMasterDataComponent, {
+ title: display,
+ headerColour: 'iris-blue',
+ bodyColour: 'asher-gray',
+ padding: '0px',
+ width: 'max(600px, 80%)',
+ disableClose: true,
+ data: { policy, filterData, isNew, isComplienceFrameworkEnabled: this.isComplienceFrameworkEnabled },
+ testId: 'policy-list-show-policy-sidesheet'
+ });
+
+ const shouldReload = await sidesheetRef.afterClosed().toPromise();
+ if (shouldReload) { this.navigate(); }
+ }
+
+ private async initFilterAndGrouping(): Promise {
+ const dataModel = await this.policyService.getDataModel();
+ this.filterOptions = dataModel.Filters;
+
+ // set initial value for OnlyActivePolicies
+ const indexActive = this.filterOptions.findIndex(elem => elem.Name === 'OnlyActivePolicies');
+ if (indexActive > -1) {
+ this.filterOptions[indexActive].InitialValue = '1';
+ this.navigationState.OnlyActivePolicies = '1';
+ }
+
+ // remove filter myPolicies, if you are an owner only and not an attestation admin
+ if (this.prefilterOwner) {
+ this.navigationState.mypolicies = '1';
+ const index = this.filterOptions.findIndex(elem => elem.Name === 'mypolicies');
+ if (index > -1) {
+ this.filterOptions.splice(index, 1);
+ }
+ }
+
+ const groups = [];
+ for (const property of dataModel.Properties.filter(p => p.IsGroupable)) {
+ const getData = async () => (await this.policyService.getGroupInfo({
+ by: property.Property.ColumnName,
+ PageSize: this.navigationState.PageSize,
+ StartIndex: 0
+ })).filter(item => item.Count > 0);
+
+ groups.push({
+ property,
+ getData
+ });
+ }
+
+ for (const dataModelGroupInfo of dataModel.GroupInfo) {
+ for (const property of dataModelGroupInfo.Options) {
+ const getData = async () => (await this.policyService.getGroupInfo({
+ def: property.Value,
+ PageSize: this.navigationState.PageSize,
+ StartIndex: 0
+ }))
+ .filter(item => item.Count > 0)
+ .map(item => {
+ item.Display.forEach(display =>
+ item.Filters.forEach(filter => {
+ if (filter.Value1 != null) {
+ display.Display = display.Display.replace(`%${filter.ColumnName}%`, filter.Value1);
+ }
+ })
+ );
+ return item;
+ });
+
+ groups.push({
+ property,
+ getData
+ });
+ }
+ }
+
+ if (groups.length > 0) {
+ this.groupData = { groups };
+ }
+ }
+}
diff --git a/imxweb/projects/att/src/lib/policies/policy-list/policy-load-parameters.interface.ts b/imxweb/projects/att/src/lib/policies/policy-list/policy-load-parameters.interface.ts
index d4c64d43c..b737b1054 100644
--- a/imxweb/projects/att/src/lib/policies/policy-list/policy-load-parameters.interface.ts
+++ b/imxweb/projects/att/src/lib/policies/policy-list/policy-load-parameters.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy.interface.ts b/imxweb/projects/att/src/lib/policies/policy.interface.ts
index cd5c0922d..faa41b8d5 100644
--- a/imxweb/projects/att/src/lib/policies/policy.interface.ts
+++ b/imxweb/projects/att/src/lib/policies/policy.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy.module.ts b/imxweb/projects/att/src/lib/policies/policy.module.ts
index a6ee4bfa2..00929b263 100644
--- a/imxweb/projects/att/src/lib/policies/policy.module.ts
+++ b/imxweb/projects/att/src/lib/policies/policy.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/policy.service.spec.ts b/imxweb/projects/att/src/lib/policies/policy.service.spec.ts
index e695085c2..6970bb386 100644
--- a/imxweb/projects/att/src/lib/policies/policy.service.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/policy.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -68,6 +68,22 @@ describe('PolicyService', () => {
PutValueStruct: jasmine.createSpy('PutValueStruct')
}
},
+ LimitOfOldCases: {
+ GetMetadata: () => ({
+ CanEdit: () => true
+ }),
+ Column: {
+ PutValueStruct: jasmine.createSpy('PutValueStruct')
+ }
+ },
+ IsShowElementsInvolved: {
+ GetMetadata: () => ({
+ CanEdit: () => true
+ }),
+ Column: {
+ PutValueStruct: jasmine.createSpy('PutValueStruct')
+ }
+ },
IsInActive: {
GetMetadata: () => ({
CanEdit: () => true
@@ -108,6 +124,14 @@ describe('PolicyService', () => {
PutValueStruct: jasmine.createSpy('PutValueStruct')
}
},
+ UID_AttestationPolicyGroup: {
+ GetMetadata: () => ({
+ CanEdit: () => true
+ }),
+ Column: {
+ PutValueStruct: jasmine.createSpy('PutValueStruct')
+ }
+ },
UID_PWODecisionMethod: {
GetMetadata: () => ({
CanEdit: () => true
@@ -193,7 +217,7 @@ describe('PolicyService', () => {
Get_byid: jasmine.createSpy('Get_byid').and.returnValue(Promise.resolve({ totalCount: 1, Data: [] })),
Get: jasmine.createSpy('Get').and.returnValue(Promise.resolve({ totalCount: 1, Data: [emptyElement] }))
},
- PortalAttestationPolicyEditInteractive_byid : {
+ PortalAttestationPolicyEditinteractive : {
Get_byid: jasmine.createSpy('Get_byid').and.returnValue(Promise.resolve({ totalCount: 1, Data: [] })),
},
PortalAttestationPolicy: {
@@ -258,7 +282,7 @@ describe('PolicyService', () => {
it('can getPolicy for editing', async () => {
await service.getPolicyEditInteractive('policy');
- expect(apiServiceStub.typedClient.PortalAttestationPolicyEditInteractive_byid.Get_byid)
+ expect(apiServiceStub.typedClient.PortalAttestationPolicyEditInteractive.Get_byid)
.toHaveBeenCalledWith('policy');
});
@@ -273,7 +297,7 @@ describe('PolicyService', () => {
const state = { PageSize: 10 }
await service.getFilterCandidates(state, 'uid')
expect(apiServiceStub.client.portal_attestation_filter_candidates_get)
- .toHaveBeenCalledWith('uid', undefined, undefined, 10, undefined, null, undefined, undefined);
+ .toHaveBeenCalledWith('uid', { PageSize: 10 });
});
it('can delete attestation policy', async () => {
@@ -328,6 +352,24 @@ describe('PolicyService', () => {
})
}
},
+ LimitOfOldCases: {
+ value: 42,
+ Column: {
+ GetDisplayValue: () => '',
+ GetMetadata: () => ({
+ CanEdit: () => true
+ })
+ }
+ },
+ IsShowElementsInvolved: {
+ value: true,
+ Column: {
+ GetDisplayValue: () => '',
+ GetMetadata: () => ({
+ CanEdit: () => true
+ })
+ }
+ },
IsInActive: {
value: 'true',
Column: {
@@ -364,6 +406,15 @@ describe('PolicyService', () => {
})
}
},
+ UID_AttestationPolicyGroup: {
+ value: 'uidPolicyGroup',
+ Column: {
+ GetDisplayValue: () => '',
+ GetMetadata: () => ({
+ CanEdit: () => true
+ })
+ }
+ },
UID_AttestationObject: {
value: 'uidAttestationObject',
Column: {
diff --git a/imxweb/projects/att/src/lib/policies/policy.service.ts b/imxweb/projects/att/src/lib/policies/policy.service.ts
index ea5e18ae6..b4f364ef7 100644
--- a/imxweb/projects/att/src/lib/policies/policy.service.ts
+++ b/imxweb/projects/att/src/lib/policies/policy.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -29,7 +29,7 @@ import { EuiDownloadOptions } from '@elemental-ui/core';
import { TranslateService } from '@ngx-translate/core';
import {
- ApiClientMethodFactory,
+ V2ApiClientMethodFactory,
ParmData,
PolicyFilter,
PolicyStartInput,
@@ -48,7 +48,6 @@ import {
FilterType,
GroupInfo,
MethodDefinition,
- TypedEntity,
} from 'imx-qbm-dbts';
import { AppConfigService, ClassloggerService, ElementalUiConfigService } from 'qbm';
import { ApiService } from '../api.service';
@@ -60,7 +59,7 @@ import { PolicyLoadParameters } from './policy-list/policy-load-parameters.inter
})
export class PolicyService {
- private readonly apiClientMethodFactory = new ApiClientMethodFactory();
+ private readonly apiClientMethodFactory = new V2ApiClientMethodFactory();
constructor(
private api: ApiService,
@@ -96,7 +95,7 @@ export class PolicyService {
public async getPolicyEditInteractive(uid: string):
Promise> {
- return this.api.typedClient.PortalAttestationPolicyEditInteractive_byid.Get_byid(uid);
+ return this.api.typedClient.PortalAttestationPolicyEditInteractive.Get_byid(uid);
}
public async buildNewEntity(reference?: PortalAttestationPolicyEdit, filter?: PolicyFilter):
@@ -117,14 +116,7 @@ export class PolicyService {
public async getFilterCandidates(parameters: CollectionLoadParameters, uidAttestationParm: string): Promise {
return this.api.client.portal_attestation_filter_candidates_get(
uidAttestationParm,
- parameters.OrderBy,
- parameters.StartIndex,
- parameters.PageSize,
- parameters.filter,
- null,
- parameters.search,
- parameters.ParentKey
- );
+ parameters);
}
public async deleteAttestationPolicy(uidAttestationpolicy: string): Promise> {
@@ -141,14 +133,18 @@ export class PolicyService {
}
public async userCanSeePolicy(ident: string): Promise {
- const pols = await this.api.client.portal_attestation_policy_edit_get('', 0, -1, [
- {
- ColumnName: 'Ident_AttestationPolicy',
- CompareOp: CompareOperator.Equal,
- Type: FilterType.Compare,
- Value1: ident
- }
- ], '', '', '');
+ const pols = await this.api.client.portal_attestation_policy_edit_get({
+ StartIndex: 0,
+ PageSize: -1,
+ filter: [
+ {
+ ColumnName: 'Ident_AttestationPolicy',
+ CompareOp: CompareOperator.Equal,
+ Type: FilterType.Compare,
+ Value1: ident
+ }
+ ]
+ });
return pols.TotalCount > 0;
}
@@ -176,17 +172,7 @@ export class PolicyService {
}
public async getGroupInfo(parameters: { by?: string, def?: string } & CollectionLoadParameters = {}): Promise {
- const test = await this.api.client.portal_attestation_policy_group_get(
- parameters.by,
- parameters.def,
- undefined, // filter
- parameters.StartIndex,
- parameters.PageSize,
- true, // withcount
- undefined, // OnlyActivePolicies
- undefined, // ScheduleType
- undefined // myPolicies
- );
+ const test = await this.api.client.portal_attestation_policy_group_get(parameters);
return test;
}
@@ -206,6 +192,10 @@ export class PolicyService {
};
}
+ public async getCasesThreshold():Promise {
+ return (await this.api.client.portal_attestation_config_get()).PolicyObjectCountThreshold;
+ }
+
public async getRunCountForPolicy(uid: string): Promise {
const element = await this.api.typedClient.PortalAttestationRun.Get({
PageSize: -1,
diff --git a/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects-info.interface.ts b/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects-info.interface.ts
index 4e737c842..0b5a84cd5 100644
--- a/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects-info.interface.ts
+++ b/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects-info.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.spec.ts b/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.spec.ts
index 2bf147d34..83bb5181f 100644
--- a/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.spec.ts
+++ b/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.ts b/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.ts
index f4c73cdd1..7f0526017 100644
--- a/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.ts
+++ b/imxweb/projects/att/src/lib/policies/selected-objects/selected-objects.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/attestation-runs.module.ts b/imxweb/projects/att/src/lib/runs/attestation-runs.module.ts
index 132f33106..060a7b224 100644
--- a/imxweb/projects/att/src/lib/runs/attestation-runs.module.ts
+++ b/imxweb/projects/att/src/lib/runs/attestation-runs.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.spec.ts b/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.spec.ts
index 0f4153a00..9a3232900 100644
--- a/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.spec.ts
+++ b/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.ts b/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.ts
index 74f8d11fc..8e2ddd919 100644
--- a/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.ts
+++ b/imxweb/projects/att/src/lib/runs/attestation/attestation-wrapper/attestation-wrapper.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.html b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.html
index ebf45d4b4..deb9b9ab0 100644
--- a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.html
+++ b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.html
@@ -15,7 +15,7 @@
-
+
diff --git a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.scss b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.scss
index b4fe346f9..f1dbf595c 100644
--- a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.scss
+++ b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
display: flex;
@@ -39,9 +39,15 @@
display: flex;
justify-content: flex-end;
align-items: center;
+ border-top: $black-c 1px solid;
background-color: $white;
- padding: 16px 32px;
- margin-top: 16px;
+ padding: 0px 20px 20px;
+ margin: 16px -20px -20px;
+
+ > * {
+ margin-left: 10px;
+ margin-top: 20px;
+ }
button:not(:last-of-type) {
margin-right: 10px;
diff --git a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.spec.ts b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.spec.ts
index 0792b40a0..718044da3 100644
--- a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.spec.ts
+++ b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.ts b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.ts
index 46404e1c1..fadcd5c6e 100644
--- a/imxweb/projects/att/src/lib/runs/attestation/attestation.component.ts
+++ b/imxweb/projects/att/src/lib/runs/attestation/attestation.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.spec.ts b/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.spec.ts
index 200c9e618..d2be49192 100644
--- a/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.spec.ts
+++ b/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.ts b/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.ts
index d2ccf96dc..b05aa8f67 100644
--- a/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.ts
+++ b/imxweb/projects/att/src/lib/runs/case-chart/case-chart.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/helpers.ts b/imxweb/projects/att/src/lib/runs/helpers.ts
index 2af4817b5..8dd53aa43 100644
--- a/imxweb/projects/att/src/lib/runs/helpers.ts
+++ b/imxweb/projects/att/src/lib/runs/helpers.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/pending-approvers.component.html b/imxweb/projects/att/src/lib/runs/pending-approvers.component.html
index 2202cbfc4..8d94fb697 100644
--- a/imxweb/projects/att/src/lib/runs/pending-approvers.component.html
+++ b/imxweb/projects/att/src/lib/runs/pending-approvers.component.html
@@ -25,9 +25,9 @@
-
-
+
diff --git a/imxweb/projects/att/src/lib/runs/pending-approvers.component.scss b/imxweb/projects/att/src/lib/runs/pending-approvers.component.scss
index 032738e4b..0852dfe32 100644
--- a/imxweb/projects/att/src/lib/runs/pending-approvers.component.scss
+++ b/imxweb/projects/att/src/lib/runs/pending-approvers.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
display: flex;
@@ -15,7 +15,7 @@
}
.mat-card {
- margin: 32px;
+ margin: 20px;
overflow-y: auto;
}
@@ -25,6 +25,8 @@
overflow-y: inherit;
border-top: $black-c 1px solid;
padding: 0px 20px 20px 8px;
+ margin: 0;
+ background-color: $white;
> * {
margin-left: 10px;
margin-top: 20px;
@@ -33,7 +35,7 @@
.helper-alert {
display: flex;
- padding: 32px 32px 0;
+ padding: 30px 20px 0;
flex-direction: column;
span {
display: block;
diff --git a/imxweb/projects/att/src/lib/runs/pending-approvers.component.ts b/imxweb/projects/att/src/lib/runs/pending-approvers.component.ts
index d56c1b2df..684250fd1 100644
--- a/imxweb/projects/att/src/lib/runs/pending-approvers.component.ts
+++ b/imxweb/projects/att/src/lib/runs/pending-approvers.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/progress/progress.component.spec.ts b/imxweb/projects/att/src/lib/runs/progress/progress.component.spec.ts
index 2a1326b4a..e191f76d2 100644
--- a/imxweb/projects/att/src/lib/runs/progress/progress.component.spec.ts
+++ b/imxweb/projects/att/src/lib/runs/progress/progress.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/progress/progress.component.ts b/imxweb/projects/att/src/lib/runs/progress/progress.component.ts
index cf6af925e..53795dc00 100644
--- a/imxweb/projects/att/src/lib/runs/progress/progress.component.ts
+++ b/imxweb/projects/att/src/lib/runs/progress/progress.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.scss b/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.scss
index 4445535a7..732ee2a1d 100644
--- a/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.scss
+++ b/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
display: flex;
@@ -42,4 +42,4 @@
span {
display: block;
}
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.spec.ts b/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.spec.ts
index e7da65583..b47cb4609 100644
--- a/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.spec.ts
+++ b/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.ts b/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.ts
index 6575a3cd2..ded916519 100644
--- a/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.ts
+++ b/imxweb/projects/att/src/lib/runs/run-extend/run-extend.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/att/src/lib/runs/run-sidesheet.component.html b/imxweb/projects/att/src/lib/runs/run-sidesheet.component.html
index 0bfcb3d4a..0e10b02d8 100644
--- a/imxweb/projects/att/src/lib/runs/run-sidesheet.component.html
+++ b/imxweb/projects/att/src/lib/runs/run-sidesheet.component.html
@@ -124,8 +124,8 @@
{{'#LDS#Heading Attestation Policy Settings' | translate}}
-
-
+
+
+{{'#LDS#Heading Objects To Be Attested by This Attestation Policy' | translate}}
-{{ '#LDS#Heading Objects To Be Attested by This Attestation Policy' | translate }}
+{{ '#LDS#This policy affects many objects. Note that running this policy may take some time and generate notifications to many approvers' | translate }}
+{{'#LDS#No conditions are specified for this attestation
- policy.' | translate}}
+ {{ '#LDS#No conditions are specified for this attestation
+ policy.' | translate }}
{{entl.Display }}
+ {{ entl.TypeDisplay }}
+ {{action.Display }}
+ {{action.ObjectDisplay }}
+ -
+
-
+ {{ entl.Display }}+{{ entl.TypeDisplay }}+
+
+
-
\ No newline at end of file
+
diff --git a/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.scss b/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.scss
index 0c710569e..9d226d815 100644
--- a/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.scss
+++ b/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
.eui-sidesheet-content {
diff --git a/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.spec.ts b/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.spec.ts
index 9eeff165d..41a400192 100644
--- a/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.spec.ts
+++ b/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.ts b/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.ts
index 07ccc8c75..5695bb43a 100644
--- a/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.ts
+++ b/imxweb/projects/cpl/src/lib/rules-violations/rules-violations-details/rules-violations-details.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -66,4 +66,9 @@ export class RulesViolationsDetailsComponent {
await this.actionService.deny([this.data]);
return this.sideSheetRef.close(true);
}
+
+ public async resolve(): Promise
+
+ {{ '#LDS#Select one of the enabled multi-factor methods to authenticate.' | translate }}
+
+
+
diff --git a/imxweb/projects/olg/src/lib/mfa/mfa.component.scss b/imxweb/projects/olg/src/lib/mfa/mfa.component.scss
new file mode 100644
index 000000000..b5bede83b
--- /dev/null
+++ b/imxweb/projects/olg/src/lib/mfa/mfa.component.scss
@@ -0,0 +1,66 @@
+@import '@elemental-ui/core/src/styles/_palette.scss';
+
+:host {
+ overflow: auto;
+
+ ::ng-deep .eui-alert {
+ margin-bottom: 20px;
+ }
+
+ ::ng-deep .mat-card-header-text {
+ margin: 0;
+ }
+
+ ::ng-deep .mat-form-field-wrapper {
+ padding-bottom: 0;
+ }
+}
+
+.imx-info {
+ margin-bottom: 20px;
+}
+
+.auth-factor {
+ margin-bottom: 20px;
+}
+
+.spinner {
+ position: absolute;
+ top: 3px;
+ left: 20px;
+}
+
+.poll-spinner {
+ position: absolute;
+}
+
+.auth-text {
+ font-size: 14px;
+ color: $black-9;
+}
+
+.poll-content {
+ display: flex;
+ justify-content: space-between;
+}
+
+.poll-button {
+ display: flex;
+ width: 30%;
+ align-items: center;
+ justify-content: center;
+}
+
+.poll-otp {
+ width: 60%;
+}
+
+.otp {
+ display: flex;
+ flex-direction: column;
+}
+
+.otp-actions {
+ display: flex;
+ justify-content: flex-end;
+}
diff --git a/imxweb/projects/olg/src/lib/mfa/mfa.component.ts b/imxweb/projects/olg/src/lib/mfa/mfa.component.ts
new file mode 100644
index 000000000..d180cd401
--- /dev/null
+++ b/imxweb/projects/olg/src/lib/mfa/mfa.component.ts
@@ -0,0 +1,195 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { AfterContentChecked, ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
+import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
+import { EuiLoadingService, EuiSidesheetRef, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
+import { ActivateFactorData, AuthFactors, VerifyPollingResult } from 'imx-api-olg';
+import { ValType } from 'imx-qbm-dbts';
+import { BaseCdr, ColumnDependentReference, EntityService } from 'qbm';
+import { PortalMfaService } from './portal-mfa.service';
+
+@Component({
+ templateUrl: './mfa.component.html',
+ styleUrls: ['./mfa.component.scss'],
+})
+export class MfaComponent implements OnInit, AfterContentChecked {
+ public formGroup: FormGroup;
+
+ public authFactors: AuthFactors = { Factors: [] };
+ public authCDRs: ColumnDependentReference[] = [];
+ public showCDRs: boolean[] = [];
+
+ public activatedFactor: ActivateFactorData;
+ public checkingPoll = false;
+ public checkingOTP = false;
+ private workflowActionId: string;
+
+ constructor(
+ private formBuilder: FormBuilder,
+ private cdref: ChangeDetectorRef,
+ private readonly busyService: EuiLoadingService,
+
+ private readonly mfa: PortalMfaService,
+ private readonly entityService: EntityService,
+ @Inject(EUI_SIDESHEET_DATA)
+ public readonly data: {
+ workflowActionId: string;
+ },
+ private readonly sideSheetRef: EuiSidesheetRef
+ ) {
+ this.workflowActionId = data.workflowActionId;
+ this.formGroup = new FormGroup({ formArray: this.formBuilder.array([]) });
+ }
+
+ public isOTP(factorName: string): boolean {
+ return ['OneLogin Email', 'SMS'].includes(factorName);
+ }
+
+ public isProtect(factorName: string): boolean {
+ return factorName === 'OneLogin';
+ }
+
+ public isAuthenticator(factorName: string): boolean {
+ return factorName === 'Google Authenticator';
+ }
+
+ public isCDRValid(cdr: ColumnDependentReference): boolean {
+ return cdr.column.GetValue().length > 0;
+ }
+
+ public get formArray(): FormArray {
+ return this.formGroup.get('formArray') as FormArray;
+ }
+
+ public get isActivated(): boolean {
+ if (this.activatedFactor) {
+ return true;
+ }
+ return false;
+ }
+
+ public async ngOnInit(): Promise
+
+
+ {{ factor.Display }}
+ {{ factor.Name }}
+
+
+
+
+
+
+
+
+ {{ '#LDS#Check the corresponding factor for your One-Time Password to verify.' | translate }}
+{{ '#LDS#Use either the push notification or the One-Time Password in your OneLogin Protector app to verify.' | translate }}
+{{ '#LDS#Check your authenticator app for your One-Time Password to verify.' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ policyViolationApproval?.GetEntity()?.GetDisplay() }}
+
+
+
+
+
+
+
diff --git a/imxweb/projects/pol/src/lib/policy-violations/policy-violations-action/policy-violations-action.component.scss b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-action/policy-violations-action.component.scss
new file mode 100644
index 000000000..d8efa71bd
--- /dev/null
+++ b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-action/policy-violations-action.component.scss
@@ -0,0 +1,18 @@
+.eui-sidesheet-content {
+ padding: 32px;
+ overflow: hidden;
+ height: 100%;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+}
+
+.eui-sidesheet-actions.mat-card {
+ margin: 16px 32px;
+}
+
+.imx-policy-violation-content{
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+}
\ No newline at end of file
diff --git a/imxweb/projects/pol/src/lib/policy-violations/policy-violations-action/policy-violations-action.component.ts b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-action/policy-violations-action.component.ts
new file mode 100644
index 000000000..838d17080
--- /dev/null
+++ b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-action/policy-violations-action.component.ts
@@ -0,0 +1,66 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, Inject } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { EUI_SIDESHEET_DATA, EuiSidesheetRef } from '@elemental-ui/core';
+import { PolicyViolationsAction } from './policy-violations-action.interface';
+
+/**
+ * Component displayed in a sidesheet to make a decision for one or more policy violations.
+ *
+ * Uses two alternate views
+ * -
+ *
- a) a simple view for a single policy violation + *
- b) a complex view using bulk items for multiple policy violations. + *
+
+
+ {{data?.stateBadge?.caption | translate}}
+
+
+
+
+ {{ data?.State?.GetMetadata()?.GetDisplay() }}
+
+
+
+
+
\ No newline at end of file
diff --git a/imxweb/projects/pol/src/lib/policy-violations/policy-violations-sidesheet/policy-violations-sidesheet.component.scss b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-sidesheet/policy-violations-sidesheet.component.scss
new file mode 100644
index 000000000..2081b6df7
--- /dev/null
+++ b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-sidesheet/policy-violations-sidesheet.component.scss
@@ -0,0 +1,30 @@
+@import "@elemental-ui/core/src/styles/_palette.scss";
+
+:host {
+ .eui-sidesheet-content {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .eui-sidesheet-actions.mat-card {
+ margin: 16px 32px;
+ }
+
+ .eui-badge ::ng-deep .eui-badge-content {
+ font-size: 12px;
+ line-height: 12px;
+ margin-bottom: 20px;
+ }
+
+ .imx-state-caption {
+ font-size: 12px;
+ color: $black-9;
+ padding-bottom: 5px;
+ }
+
+ .eui-sidesheet-actions {
+ button:not(:last-of-type) {
+ margin-right: 10px;
+ }
+ }
+}
diff --git a/imxweb/projects/pol/src/lib/policy-violations/policy-violations-sidesheet/policy-violations-sidesheet.component.ts b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-sidesheet/policy-violations-sidesheet.component.ts
new file mode 100644
index 000000000..288e9a99f
--- /dev/null
+++ b/imxweb/projects/pol/src/lib/policy-violations/policy-violations-sidesheet/policy-violations-sidesheet.component.ts
@@ -0,0 +1,71 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, Inject } from '@angular/core';
+import { EuiSidesheetRef, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
+
+import { ColumnDependentReference } from 'qbm';
+import { PolicyViolation } from '../policy-violation';
+import { PolicyViolationsService } from '../policy-violations.service';
+
+@Component({
+ selector: 'imx-policy-violations-sidesheet',
+ templateUrl: './policy-violations-sidesheet.component.html',
+ styleUrls: ['./policy-violations-sidesheet.component.scss']
+})
+export class PolicyViolationsSidesheetComponent {
+
+ public cdrList: ColumnDependentReference[] = [];
+
+ public get isPending(): boolean {
+ return this.data.State.value?.toLocaleLowerCase() === 'pending';
+ }
+
+ constructor(
+ @Inject(EUI_SIDESHEET_DATA) public data: PolicyViolation,
+ private readonly policyViolationService: PolicyViolationsService,
+ private readonly sideSheetRef: EuiSidesheetRef
+ ) {
+ this.cdrList = this.data.properties;
+ }
+
+ /**
+ * Opens the Approve-Sidesheet for the current selected rules violations and closes the sidesheet afterwards.
+ */
+ public async approve(): Promise
+
\ No newline at end of file
diff --git a/imxweb/projects/pol/src/lib/policy-violations/policy-violations.component.scss b/imxweb/projects/pol/src/lib/policy-violations/policy-violations.component.scss
new file mode 100644
index 000000000..70c4ac200
--- /dev/null
+++ b/imxweb/projects/pol/src/lib/policy-violations/policy-violations.component.scss
@@ -0,0 +1,116 @@
+@mixin imx-flex-column-container {
+ display: flex;
+ flex-direction: column;
+}
+
+@mixin imx-flex-row-container {
+ display: flex;
+ flex-direction: row;
+}
+
+.eui-sidesheet-content {
+ @include imx-flex-column-container();
+}
+
+.heading-wrapper {
+ @include imx-flex-row-container();
+ flex: 0 0 auto;
+
+ .helper-alert {
+ display: flex;
+ margin-bottom: 15px;
+ }
+
+ .alert-wrapper {
+ margin: 0 0 0 auto;
+ align-self: flex-end;
+ width: 50%;
+ }
+}
+
+:host {
+ @include imx-flex-column-container();
+ overflow: hidden;
+ height: inherit;
+ width: inherit;
+ max-width: 100%;
+}
+
+.imx-policyviolation-page {
+ background-color: inherit;
+ @include imx-flex-column-container();
+ overflow: hidden;
+
+ div.imx-table-container {
+ @include imx-flex-column-container();
+ overflow: hidden;
+ height: inherit;
+
+ .imx-policyviolation-table {
+ flex-grow: 1;
+ overflow: auto;
+
+ .imx-main-column {
+ max-width: 600px;
+ margin-right: 10px;
+ }
+
+ .imx-decision {
+ min-width: 210px;
+ > * {
+ margin-bottom: 3px;
+ margin-top: 3px;
+ margin-left: 10px;
+ }
+ }
+ }
+ }
+
+ .imx-button-bar {
+ @include imx-flex-row-container();
+ margin-top: 20px;
+ flex: 0 0 auto;
+
+ .imx-badge {
+ background-color: inherit;
+
+ ::ng-deep .eui-badge-content {
+ font-size: 14px;
+ line-height: 14px;
+ }
+ }
+
+ .imx-selected-items {
+ margin: 0;
+ line-height: 36px;
+ }
+
+ button {
+ margin-left: 10px;
+ }
+
+ .imx-menu-spacer {
+ flex-grow: 1;
+ }
+ }
+}
+
+@media screen and (max-width: 768px) {
+ .imx-rules-violations-page {
+ .heading-wrapper {
+ display: block;
+
+ .alert-wrapper {
+ margin: 0 0 20px 0;
+ width: 100%;
+ }
+ }
+ }
+}
+
+
+@media only screen and (max-width: 1024px) {
+ ::ng-deep .mat-column-decision {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/imxweb/projects/pol/src/lib/policy-violations/policy-violations.component.ts b/imxweb/projects/pol/src/lib/policy-violations/policy-violations.component.ts
new file mode 100644
index 000000000..f6eb0bc57
--- /dev/null
+++ b/imxweb/projects/pol/src/lib/policy-violations/policy-violations.component.ts
@@ -0,0 +1,221 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { OverlayRef } from '@angular/cdk/overlay';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { EuiLoadingService, EuiSidesheetService } from '@elemental-ui/core';
+import { TranslateService } from '@ngx-translate/core';
+import { Subscription } from 'rxjs';
+import { ActivatedRoute, Params } from '@angular/router';
+
+import { CollectionLoadParameters, DataModel, DisplayColumns, IClientProperty, TypedEntity, ValType } from 'imx-qbm-dbts';
+import { DataSourceToolbarFilter, DataSourceToolbarGroupData, DataSourceToolbarSettings, DataTableComponent, DataTableGroupedData, ClientPropertyForTableColumns } from 'qbm';
+import { createGroupData } from 'qbm';
+import { PolicyViolation } from './policy-violation';
+import { PolicyViolationsSidesheetComponent } from './policy-violations-sidesheet/policy-violations-sidesheet.component';
+import { PolicyViolationsService } from './policy-violations.service';
+
+@Component({
+ selector: 'imx-policy-violations',
+ templateUrl: './policy-violations.component.html',
+ styleUrls: ['./policy-violations.component.scss']
+})
+export class PolicyViolationsComponent implements OnInit {
+
+ public DisplayColumns = DisplayColumns;
+ public selectedViolations: PolicyViolation[] = [];
+ public dstSettings: DataSourceToolbarSettings;
+ public approveOnly: boolean;
+ public groupedData: { [key: string]: DataTableGroupedData } = {};
+
+ @ViewChild(DataTableComponent) public table: DataTableComponent{{ '#LDS#Heading Policy Violations' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ product['Name'] }}
diff --git a/imxweb/projects/qbm/src/lib/about/About.component.spec.ts b/imxweb/projects/qbm/src/lib/about/About.component.spec.ts
index d93991377..ae0fcea98 100644
--- a/imxweb/projects/qbm/src/lib/about/About.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/about/About.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/about/About.component.ts b/imxweb/projects/qbm/src/lib/about/About.component.ts
index 25d1efd65..b6008d915 100644
--- a/imxweb/projects/qbm/src/lib/about/About.component.ts
+++ b/imxweb/projects/qbm/src/lib/about/About.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -62,33 +62,33 @@ export class AboutComponent implements OnInit {
) {
this.entitySchema = aboutInfoService.EntitySchema;
this.displayedColumns = [
- this.entitySchema.Columns.ComponentName,
- this.entitySchema.Columns.CopyRight,
- this.entitySchema.Columns.EmailOrURl,
- this.entitySchema.Columns.LicenceName
+ this.entitySchema.Columns['ComponentName'],
+ this.entitySchema.Columns['CopyRight'],
+ this.entitySchema.Columns['EmailOrURl'],
+ this.entitySchema.Columns['LicenceName']
];
- this.product.Name = Globals.QIM_ProductNameFull;
- this.product.Version = Globals.Version;
- this.product.Copyright = Globals.QBM_Copyright;
+ this.product['Name'] = Globals.QIM_ProductNameFull;
+ this.product['Version'] = Globals.Version;
+ this.product['Copyright'] = Globals.QBM_Copyright;
- this.product.ThirdPartyLicencesUrl = 'https://www.oneidentity.com/legal/third-party-licenses.aspx';
- this.product.OpenSourceUrl = 'https://opensource.quest.com';
- this.product.ContactUrl = 'https://www.oneidentity.com/company/contact-us.aspx';
- this.product.ProductSupportPortalUrl = 'https://support.oneidentity.com/';
- this.product.ProductPageUrl = 'https://www.oneidentity.com/products/identity-manager/';
+ this.product['ThirdPartyLicencesUrl'] = 'https://www.oneidentity.com/legal/third-party-licenses.aspx';
+ this.product['OpenSourceUrl'] = 'https://opensource.quest.com';
+ this.product['ContactUrl'] = 'https://www.oneidentity.com/company/contact-us.aspx';
+ this.product['ProductSupportPortalUrl'] = 'https://support.oneidentity.com/';
+ this.product['ProductPageUrl'] = 'https://www.oneidentity.com/products/identity-manager/';
}
public async ngOnInit(): Promise
-
\ No newline at end of file
+#LDS#Configuration
-{{ 'No configuration settings were found.' | translate}}
+
+
{{ section.Title }}
diff --git a/imxweb/projects/qbm/src/lib/admin/config.component.scss b/imxweb/projects/qbm/src/lib/admin/config.component.scss index 7acc1a351..8739479b1 100644 --- a/imxweb/projects/qbm/src/lib/admin/config.component.scss +++ b/imxweb/projects/qbm/src/lib/admin/config.component.scss @@ -1,5 +1,5 @@ @import "variables.scss"; -@import "~@angular/material/theming"; +@import "@angular/material/theming"; :host { min-width: 800px; @@ -75,3 +75,18 @@ overflow: auto; } +.no-results { + text-align: center; + margin: 20px 0; + + .eui-icon { + font-size: 100px; + color: rgba($black-c, 0.55); + } + + p { + margin: 0; + font-size: 18px; + color: $black-9; + } +} \ No newline at end of file diff --git a/imxweb/projects/qbm/src/lib/admin/config.component.ts b/imxweb/projects/qbm/src/lib/admin/config.component.ts index a0ee8420d..39d5b0e8f 100644 --- a/imxweb/projects/qbm/src/lib/admin/config.component.ts +++ b/imxweb/projects/qbm/src/lib/admin/config.component.ts @@ -9,7 +9,7 @@ * those terms. * * - * Copyright 2021 One Identity LLC. + * Copyright 2022 One Identity LLC. * ALL RIGHTS RESERVED. * * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR @@ -27,7 +27,7 @@ import { Component } from '@angular/core'; import { EuiSidesheetService } from '@elemental-ui/core'; import { TranslateService } from '@ngx-translate/core'; -import { ConfigNodeData, ConfigSettingType } from 'imx-api-qbm'; +import { ConfigSettingType } from 'imx-api-qbm'; import { AppConfigService } from '../appConfig/appConfig.service'; import { DataSourceToolbarSettings } from '../data-source-toolbar/data-source-toolbar-settings'; import { AddConfigSidesheetComponent } from './add-config-sidesheet.component'; @@ -85,6 +85,8 @@ export class ConfigComponent { } }; + this.configSvc.filter.keywords = null; + this.apiProjects = (await this.appConfigSvc.client.admin_projects_get()).map(x => x.AppId); if (this.apiProjects.length > 0) { this.optionSelected(this.apiProjects[0]); diff --git a/imxweb/projects/qbm/src/lib/admin/config.service.ts b/imxweb/projects/qbm/src/lib/admin/config.service.ts index 78023265c..ca6c70076 100644 --- a/imxweb/projects/qbm/src/lib/admin/config.service.ts +++ b/imxweb/projects/qbm/src/lib/admin/config.service.ts @@ -9,7 +9,7 @@ * those terms. * * - * Copyright 2021 One Identity LLC. + * Copyright 2022 One Identity LLC. * ALL RIGHTS RESERVED. * * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR @@ -127,7 +127,7 @@ export class ConfigService { const confObj = {}; // setting to null value, meaning: revert confObj[conf.Path] = null; - await this.session.Client.admin_apiconfig_post(this.appId, !conf.HasCustomLocalValue, confObj); + await this.session.Client.admin_apiconfig_post(this.appId, confObj, { global: !conf.HasCustomLocalValue }); delete this.pendingChanges[this.appId]; // reload all to get the effective value. there is no good way to get just @@ -141,7 +141,7 @@ export class ConfigService { Message: '#LDS#Are you sure you want to reset all customized configuration values?', identifier: 'config-confirm-reset-configuration' })) { - await this.session.Client.admin_apiconfig_revert_post(this.appId, isGlobal); + await this.session.Client.admin_apiconfig_revert_post(this.appId, { global: isGlobal }); delete this.pendingChanges[this.appId]; this.load(); } @@ -160,7 +160,7 @@ export class ConfigService { } for (let appId in this.pendingChanges) { - await this.session.Client.admin_apiconfig_post(appId, isGlobal, changeObj); + await this.session.Client.admin_apiconfig_post(appId, changeObj, { global: isGlobal }); } this.pendingChanges = {}; this.load(); @@ -219,6 +219,7 @@ export class ConfigService { const thisPath = path + node.Key; for (const n of node.Settings) { const searchTerms = [ + ...displayPath.map(d => d?.toLowerCase()), n.Name?.toLowerCase(), n.Key?.toLowerCase(), n.Description?.toLowerCase() diff --git a/imxweb/projects/qbm/src/lib/admin/convert-config-sidesheet.component.html b/imxweb/projects/qbm/src/lib/admin/convert-config-sidesheet.component.html index 94f3bc4ea..012d3e65a 100644 --- a/imxweb/projects/qbm/src/lib/admin/convert-config-sidesheet.component.html +++ b/imxweb/projects/qbm/src/lib/admin/convert-config-sidesheet.component.html @@ -1,7 +1,7 @@
-
+
+
{{ '#LDS#This field is mandatory.' | translate }}
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.scss b/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.scss
index 597123042..4dfd20681 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.scss
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
.mat-form-field {
width: 100%;
@@ -19,4 +19,4 @@
::ng-deep .mat-checkbox-frame {
border-color: $phoenix-red;
}
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.spec.ts
index f1818d0c2..1130abd91 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.ts b/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.ts
index 9622d8fc4..4968c84d3 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multi-limited-value/edit-multi-limited-value.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -31,7 +31,7 @@ import { Subscription } from 'rxjs';
import { LimitedValueData } from 'imx-qbm-dbts';
import { ColumnDependentReference } from '../column-dependent-reference.interface';
import { ClassloggerService } from '../../classlogger/classlogger.service';
-import { CdrEditor } from '../cdr-editor.interface';
+import { CdrEditor, ValueHasChangedEventArg } from '../cdr-editor.interface';
import { EntityColumnContainer } from '../entity-column-container';
import { MultiValueService } from '../../multi-value/multi-value.service';
@@ -44,11 +44,13 @@ import { MultiValueService } from '../../multi-value/multi-value.service';
styleUrls: ['./edit-multi-limited-value.component.scss']
})
export class EditMultiLimitedValueComponent implements CdrEditor, OnDestroy {
+
+ // TODO: Check Upgrade
public control = new FormArray([]);
public readonly columnContainer = new EntityColumnContainer();
- public readonly valueHasChanged = new EventEmitter();
+ public readonly valueHasChanged = new EventEmitter();
private readonly subscriptions: Subscription[] = [];
private isWriting = false;
@@ -78,7 +80,7 @@ export class EditMultiLimitedValueComponent implements CdrEditor, OnDestroy {
if (this.control.value !== this.columnContainer.value) {
this.initValues();
}
- this.valueHasChanged.emit(this.columnContainer.value);
+ this.valueHasChanged.emit({value: this.columnContainer.value});
}));
this.logger.trace(this, 'Control initialized');
} else {
@@ -116,7 +118,7 @@ export class EditMultiLimitedValueComponent implements CdrEditor, OnDestroy {
return;
}
- this.valueHasChanged.emit(value);
+ this.valueHasChanged.emit({value, forceEmit: true});
try {
this.logger.debug(this, 'writeValue - updateCdrValue...');
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.html b/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.html
index 33af93dec..5dd00abf8 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.html
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.html
@@ -1,7 +1,7 @@
{{ columnContainer?.display | translate }}
-
+
{{ '#LDS#This field is mandatory.' | translate }}
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.spec.ts
index 7087e5ac2..8159c685a 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.ts b/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.ts
index b1e70c44c..5b16fca53 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multi-value/edit-multi-value.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -31,7 +31,7 @@ import { Subscription } from 'rxjs';
import { ColumnDependentReference } from '../column-dependent-reference.interface';
import { ClassloggerService } from '../../classlogger/classlogger.service';
import { EntityColumnContainer } from '../entity-column-container';
-import { CdrEditor } from '../cdr-editor.interface';
+import { CdrEditor, ValueHasChangedEventArg } from '../cdr-editor.interface';
import { MultiValueService } from '../../multi-value/multi-value.service';
/**
@@ -47,7 +47,7 @@ export class EditMultiValueComponent implements CdrEditor, OnDestroy {
public readonly columnContainer = new EntityColumnContainer();
- public readonly valueHasChanged = new EventEmitter();
+ public readonly valueHasChanged = new EventEmitter();
private readonly subscribers: Subscription[] = [];
private isWriting = false;
@@ -75,7 +75,7 @@ export class EditMultiValueComponent implements CdrEditor, OnDestroy {
if (this.control.value !== this.columnContainer.value) {
this.control.setValue(this.columnContainer.value);
}
- this.valueHasChanged.emit(this.control.value);
+ this.valueHasChanged.emit({value: this.control.value});
}));
this.subscribers.push(this.control.valueChanges.subscribe(async value => this.writeValue(this.fromTextArea(value))));
this.logger.trace(this, 'Control initialized');
@@ -109,7 +109,7 @@ export class EditMultiValueComponent implements CdrEditor, OnDestroy {
}
}
- this.valueHasChanged.emit(value);
+ this.valueHasChanged.emit({value, forceEmit: true});
}
private toTextArea(value: string): string {
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.html b/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.html
index c8735a2d0..eaf6eb559 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.html
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.html
@@ -7,7 +7,7 @@
+
{{ '#LDS#This field is mandatory.' | translate }}
-
\ No newline at end of file
+
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.spec.ts
index 8bb185fc3..8f62bf21b 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.ts b/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.ts
index 6809e817a..f4edb529d 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-multiline/edit-multiline.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.html b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.html
index 093c0d6d9..c9516d529 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.html
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.html
@@ -8,13 +8,13 @@
+
{{ '#LDS#WD_InputInvalidInteger' | translate | ldsReplace: control.value }}
-
+
{{ '#LDS#Please enter a number greater than or equal to {0}.' | translate | ldsReplace: columnContainer.valueConstraint.MinValue }}
-
+
{{ '#LDS#Please enter a number less than or equal to {0}.' | translate | ldsReplace: columnContainer.valueConstraint.MaxValue }}
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.scss b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.scss
index 9e50c3afb..d4992ad96 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.scss
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
display: flex;
@@ -21,4 +21,4 @@
margin-right: 5px;
margin-top: 0;
}
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.spec.ts
index 50b725321..c15bbf3c0 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.ts b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.ts
index f428ec680..bf79c5ae1 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-number/edit-number.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-number/number-error.interface.ts b/imxweb/projects/qbm/src/lib/cdr/edit-number/number-error.interface.ts
index d0f53e1cd..242930208 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-number/number-error.interface.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-number/number-error.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.spec.ts
index a2d44b11a..8443c60d2 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.ts b/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.ts
index 6c6171a08..817b254c0 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-number/number-validator.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.scss b/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.scss
index 300a0e803..d4acc9db1 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.scss
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
.slider-container {
display: flex;
align-items: center;
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.spec.ts
index 15fa85666..e57be08ed 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.ts b/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.ts
index 79f7b5a1c..3a58bdda1 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-risk-index/edit-risk-index.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.html b/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.html
index a1665b121..40e6e63ec 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.html
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.html
@@ -5,7 +5,7 @@
{{ '#LDS#Please enter a valid URL in the format https://www.example.com or http://www.example.com respectively.' | translate }}
-
+
{{ '#LDS#This field is mandatory.' | translate }}
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.spec.ts
index f04deba4d..a3cb3d7b6 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.ts b/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.ts
index 27527c22a..d56c6ef7e 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-url/edit-url.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -29,7 +29,7 @@ import { FormControl, Validators } from '@angular/forms';
import { Subscription } from 'rxjs';
import { UrlValidatorService } from './url-validator.service';
-import { CdrEditor } from '../cdr-editor.interface';
+import { CdrEditor, ValueHasChangedEventArg } from '../cdr-editor.interface';
import { ColumnDependentReference } from '../column-dependent-reference.interface';
import { EntityColumnContainer } from '../entity-column-container';
@@ -42,7 +42,7 @@ export class EditUrlComponent implements CdrEditor, OnDestroy {
public readonly control = new FormControl('', { updateOn: 'blur' });
public readonly columnContainer = new EntityColumnContainer();
- public readonly valueHasChanged = new EventEmitter();
+ public readonly valueHasChanged = new EventEmitter();
private readonly subscribers: Subscription[] = [];
private isWriting = false;
@@ -69,7 +69,7 @@ export class EditUrlComponent implements CdrEditor, OnDestroy {
if (this.control.value !== this.columnContainer.value) {
this.control.setValue(this.columnContainer.value, { emitEvent: false });
}
- this.valueHasChanged.emit(this.control.value);
+ this.valueHasChanged.emit({ value: this.control.value });
}));
this.control.setValidators(validators);
@@ -94,6 +94,7 @@ export class EditUrlComponent implements CdrEditor, OnDestroy {
if (this.control.value !== this.columnContainer.value) {
this.control.setValue(this.columnContainer.value, { emitEvent: false });
}
+ this.valueHasChanged.emit({ value: this.control.value, forceEmit: true });
}
}
}
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.spec.ts b/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.spec.ts
index 51fd82b64..aa64f7881 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.ts b/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.ts
index 5bf17b33e..9e175102b 100644
--- a/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/edit-url/url-validator.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/editor-base.spec.ts b/imxweb/projects/qbm/src/lib/cdr/editor-base.spec.ts
index 71029a6cd..d792fa5a4 100644
--- a/imxweb/projects/qbm/src/lib/cdr/editor-base.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/editor-base.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/editor-base.ts b/imxweb/projects/qbm/src/lib/cdr/editor-base.ts
index 85c701422..7af7ca674 100644
--- a/imxweb/projects/qbm/src/lib/cdr/editor-base.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/editor-base.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -27,7 +27,7 @@ import { OnDestroy, Component, EventEmitter, ErrorHandler } from '@angular/core'
import { AbstractControl, Validators } from '@angular/forms';
import { Subscription } from 'rxjs';
-import { CdrEditor } from './cdr-editor.interface';
+import { CdrEditor, ValueHasChangedEventArg } from './cdr-editor.interface';
import { ColumnDependentReference } from './column-dependent-reference.interface';
import { ClassloggerService } from '../classlogger/classlogger.service';
import { EntityColumnContainer } from './entity-column-container';
@@ -42,7 +42,7 @@ export abstract class EditorBase implements CdrEditor, OnDestroy {
public readonly columnContainer = new EntityColumnContainer();
- public readonly valueHasChanged = new EventEmitter();
+ public readonly valueHasChanged = new EventEmitter();
public isBusy = false;
public lastError: ServerError;
@@ -58,7 +58,7 @@ export abstract class EditorBase implements CdrEditor, OnDestroy {
}
public get validationErrorMessage(): string {
- if (this.control.errors?.generalError) {
+ if (this.control.errors?.['generalError']) {
return this.lastError.toString();
}
}
@@ -85,7 +85,7 @@ export abstract class EditorBase implements CdrEditor, OnDestroy {
this.columnContainer.value, this.control.value);
this.setControlValue();
}
- this.valueHasChanged.emit(this.control.value);
+ this.valueHasChanged.emit({value: this.control.value});
}));
this.logger.trace(this, 'Control initialized');
@@ -136,6 +136,6 @@ export abstract class EditorBase implements CdrEditor, OnDestroy {
}
}
- this.valueHasChanged.emit(value);
+ this.valueHasChanged.emit({ value, forceEmit: true });
}
}
diff --git a/imxweb/projects/qbm/src/lib/cdr/entity-column-container.spec.ts b/imxweb/projects/qbm/src/lib/cdr/entity-column-container.spec.ts
index c5c3f6c58..fa8fb6aa4 100644
--- a/imxweb/projects/qbm/src/lib/cdr/entity-column-container.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/entity-column-container.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/entity-column-container.ts b/imxweb/projects/qbm/src/lib/cdr/entity-column-container.ts
index 79c4f24b6..58b10539a 100644
--- a/imxweb/projects/qbm/src/lib/cdr/entity-column-container.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/entity-column-container.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.spec.ts
index 678570325..4985b7380 100644
--- a/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.ts b/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.ts
index 2a5796c35..8bdb311c6 100644
--- a/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/entity-column-editor/entity-column-editor.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -44,7 +44,7 @@ export class EntityColumnEditorComponent implements OnChanges {
@Output() public controlCreated = new EventEmitter<{ name: string; control: AbstractControl; }>();
public ngOnChanges(changes: SimpleChanges): void {
- if (changes.column || changes.readonly) {
+ if (changes['column'] || changes['readonly']) {
this.cdr = this.column ?
{
column: this.column,
diff --git a/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.spec.ts b/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.spec.ts
index 4b9d48420..277b6af20 100644
--- a/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.ts b/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.ts
index 935e8f214..44727b0c0 100644
--- a/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/fk-cdr-editor-provider.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/limited-values-container.spec.ts b/imxweb/projects/qbm/src/lib/cdr/limited-values-container.spec.ts
index cd9e1d1f3..529e1c778 100644
--- a/imxweb/projects/qbm/src/lib/cdr/limited-values-container.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/limited-values-container.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/limited-values-container.ts b/imxweb/projects/qbm/src/lib/cdr/limited-values-container.ts
index 005218c84..cfaf0cc16 100644
--- a/imxweb/projects/qbm/src/lib/cdr/limited-values-container.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/limited-values-container.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.spec.ts
index 8805cc5d6..4324229f9 100644
--- a/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.ts b/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.ts
index 4b6f454cf..885c15aea 100644
--- a/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/property-viewer/property-viewer.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.spec.ts
index 609b2a82e..8925369e7 100644
--- a/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.ts b/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.ts
index cd20f3a4c..37c709303 100644
--- a/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/view-property-default/view-property-default.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.html b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.html
index d63779631..33614b504 100644
--- a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.html
+++ b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.html
@@ -1,4 +1,4 @@
{
+ public async confirmLeaveWithUnsavedChanges(title?: string, message?: string, disableClose?: boolean): Promise {
const dialogRef = this.dialogService.open(MessageDialogComponent, {
data: {
ShowYesNo: true,
@@ -48,6 +48,7 @@ export class ConfirmationService {
.toPromise(),
},
panelClass: 'imx-messageDialog',
+ disableClose: disableClose
});
return (await dialogRef.beforeClosed().toPromise()) === MessageDialogResult.YesResult ? true : false;
}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.html b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.html
index ff41b4dcf..26ef98653 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.html
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.html
@@ -1,6 +1,15 @@
-{{(data.type === 'list' ? '#LDS#Heading Additional Information per Entry' : '#LDS#Heading Additional Columns') |
+
-
\ No newline at end of file
+
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.scss b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.scss
index 2c44cf450..da9693549 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
@mixin imx-data-tile-title-mixin {
white-space: nowrap;
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.spec.ts b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.spec.ts
index e1ad968b2..1a200dec0 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -197,18 +197,22 @@ describe('DataTileComponent', () => {
});
}
- [
- { expected: false },
- { status: {}, expected: false },
- { status: { getImage: {} }, expected: true },
- { image: {}, expected: true },
- { fallbackIcon: 'some icon', expected: true }
- ].forEach(testcase =>
- it('should check if it has an image (or a fallback icon)', () => {
- component.image = testcase.image as IClientProperty;
- component.status = testcase.status as DataSourceItemStatus;
- component.fallbackIcon = testcase.fallbackIcon;
-
- expect(component.hasImage).toEqual(testcase.expected);
- }));
+ describe('should check if it has an image (or a fallback icon) - ', () => {
+ [
+ { description: 'has nothing', expected: false },
+ { description: 'has an empty status', status: {}, expected: false },
+ { description: 'has a status with an imagepath', status: { getImagePath: {} }, expected: true },
+ { description: 'has an image', image: {}, expected: true },
+ { description: 'has a fallback icon', fallbackIcon: 'some icon', expected: true }
+ ].forEach(testcase =>
+ it(`${testcase.description}`, () => {
+ component.image = testcase.image as IClientProperty;
+ component.status = testcase.status as DataSourceItemStatus;
+ component.fallbackIcon = testcase.fallbackIcon;
+
+ expect(component.hasImage).toEqual(testcase.expected);
+ }));
+ });
+
+
});
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.ts b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.ts
index 34c0b2ef6..3917b870e 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -60,7 +60,11 @@ export class DataTileComponent implements OnInit {
}
public get hasImage(): boolean {
- return this.image != null || this.status?.getImage != null || this.fallbackIcon != null;
+ return (this.image || this.status?.getImagePath || this.fallbackIcon) ? true : false;
+ }
+
+ public get filteredActions(): DataTileMenuItem[] {
+ return this.enabled ? this.actions : this.actions.filter(elem => elem.useOnDisabledTile);
}
public isLoadingImage: boolean;
@@ -157,6 +161,7 @@ export class DataTileComponent implements OnInit {
*/
@Output() public selectionChanged = new EventEmitter
+
{{ item.Description }}
-
{{ columnContainer?.display | translate }}
- {{ columnContainer?.displayValue || columnContainer?.value || defaultValue | translate }}
+ {{ displayedValue | translate }}
diff --git a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.scss b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.scss
index 54e8d4a1f..21ddc83d6 100644
--- a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.scss
+++ b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
.imx-readonly-view {
margin-bottom: 20px;
diff --git a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.spec.ts b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.spec.ts
index d104bb19f..ee6c8ac48 100644
--- a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.ts b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.ts
index 1bd9d310e..d3e49d1a9 100644
--- a/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.ts
+++ b/imxweb/projects/qbm/src/lib/cdr/view-property/view-property.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -25,15 +25,30 @@
*/
import { Component, Input } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { ValType } from 'imx-qbm-dbts';
import { EntityColumnContainer } from '../entity-column-container';
@Component({
selector: 'imx-view-property',
templateUrl: './view-property.component.html',
- styleUrls: ['./view-property.component.scss']
+ styleUrls: ['./view-property.component.scss'],
})
export class ViewPropertyComponent {
@Input() public columnContainer: EntityColumnContainer;
@Input() public defaultValue: string;
+
+ constructor(private translate: TranslateService) {}
+
+ public get displayedValue(): string {
+ if (this.columnContainer?.type === ValType.Date) {
+ if (this.columnContainer?.value == null) {
+ return this.defaultValue;
+ }
+ const date: Date = new Date(this.columnContainer.value);
+ return date.getDate() ? date.toLocaleString(this.translate.currentLang) : this.defaultValue;
+ }
+ return this.columnContainer?.displayValue || this.columnContainer?.value || this.defaultValue;
+ }
}
diff --git a/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.spec.ts b/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.spec.ts
index 941dcc0c8..9773a9638 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.spec.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.ts b/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.ts
index ba20ee0af..1475839a1 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/line-chart-options.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-options/series-information.spec.ts b/imxweb/projects/qbm/src/lib/chart-options/series-information.spec.ts
index 250aa8112..2ad13029c 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/series-information.spec.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/series-information.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-options/series-information.ts b/imxweb/projects/qbm/src/lib/chart-options/series-information.ts
index 8884e0a4d..42ecd06f4 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/series-information.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/series-information.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.spec.ts b/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.spec.ts
index 00b78cfed..37006b44c 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.spec.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.ts b/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.ts
index 0f3fa4daf..9bd7e20cb 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/x-axis-information.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.spec.ts b/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.spec.ts
index 271d68912..4693e628c 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.spec.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.ts b/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.ts
index 97c08d77a..61ca37fc6 100644
--- a/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.ts
+++ b/imxweb/projects/qbm/src/lib/chart-options/y-axis-information.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.spec.ts b/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.spec.ts
index cafb9acc3..22c2b9f6c 100644
--- a/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.ts b/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.ts
index b7e480f4a..92c5b6ecc 100644
--- a/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.ts
+++ b/imxweb/projects/qbm/src/lib/chart-tile/chart-tile.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/classlogger/classlogger.module.ts b/imxweb/projects/qbm/src/lib/classlogger/classlogger.module.ts
index 8d04d7e41..3d6031300 100644
--- a/imxweb/projects/qbm/src/lib/classlogger/classlogger.module.ts
+++ b/imxweb/projects/qbm/src/lib/classlogger/classlogger.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.spec.ts b/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.spec.ts
index 54146f454..ea2c6ba16 100644
--- a/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.ts b/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.ts
index 40411dd32..12718ea91 100644
--- a/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.ts
+++ b/imxweb/projects/qbm/src/lib/classlogger/classlogger.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.interface.ts b/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.interface.ts
index fa1810d18..923ba5278 100644
--- a/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.interface.ts
+++ b/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.spec.ts b/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.spec.ts
index 744338aef..7b3dcb865 100644
--- a/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.ts b/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.ts
index 6ff003fcf..fda623e4c 100644
--- a/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.ts
+++ b/imxweb/projects/qbm/src/lib/configuration/elemental-ui-config.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/confirmation/confirmation.module.ts b/imxweb/projects/qbm/src/lib/confirmation/confirmation.module.ts
index 364f038ec..62af75a42 100644
--- a/imxweb/projects/qbm/src/lib/confirmation/confirmation.module.ts
+++ b/imxweb/projects/qbm/src/lib/confirmation/confirmation.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.spec.ts b/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.spec.ts
index fffc6795a..2351d6175 100644
--- a/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.ts b/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.ts
index 5ce08a9f2..1f808ca6c 100644
--- a/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.ts
+++ b/imxweb/projects/qbm/src/lib/confirmation/confirmation.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -38,7 +38,7 @@ import { MessageParameter } from '../message-dialog/message-parameter.interface'
export class ConfirmationService {
constructor(private readonly dialogService: MatDialog, private readonly translate: TranslateService) { }
- public async confirmLeaveWithUnsavedChanges(title?: string, message?: string): Promise{{(data.type === 'list' ? '#LDS#Heading Additional Information per Entry' : '#LDS#Heading Additional Columns') |
+{{(data.type === 'list' ? '#LDS#Heading Additional Information per Entry' : '#LDS#Heading
+ Additional Columns') |
translate}}
+
+
+ {{infoText}}
+
+
+ {{infoTextLong}}
+
+
{{'#LDS#Information that can be added' | translate}}
@@ -38,7 +47,9 @@ {{(data.type === 'list' ? '#LDS#Heading Additional Informat
-
-
\ No newline at end of file
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.scss b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.scss
index f49a47ac1..6886085c3 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.scss
@@ -1,4 +1,5 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@use '@angular/material' as mat;
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host{
display:flex;
@@ -17,13 +18,25 @@
overflow: hidden;
display: flex;
flex-direction: column;
-
+ grid-row: 2;
+
> .imx-item-list {
padding: 10px;
overflow: auto;
}
}
+.imx-helper-alert {
+ grid-row: 1;
+ grid-column-start: 1;
+ grid-column-end: 3;
+ margin-bottom: 10px;
+
+ .imx-info-content {
+ font-size: 14px;
+ }
+}
+
.disabled-list {
background: transparent;
}
@@ -60,6 +73,7 @@
grid-column: 2;
padding: 10px;
overflow-y: auto;
+ grid-row: 2;
}
.imx-drag-handle {
@@ -72,8 +86,8 @@
box-sizing: border-box;
border-radius: 4px;
box-shadow: 0 5px 5px -3px $black-c
- 0 8px 10px 1px mat-color($asher-gray-palette, 900),
- 0 3px 14px 2px mat-color($asher-gray-palette, 700);
+ 0 8px 10px 1px mat.get-color-from-palette($asher-gray-palette, 900),
+ 0 3px 14px 2px mat.get-color-from-palette($asher-gray-palette, 700);
}
.cdk-drag-placeholder {
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.spec.ts
index f1fff311b..1a506ae8d 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.ts
index 3f788b09d..cfa434e1f 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/additional-infos/additional-infos.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -29,6 +29,7 @@ import { Component, Inject, OnInit } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSelectionListChange } from '@angular/material/list';
import { DataModel, EntitySchema, IClientProperty } from 'imx-qbm-dbts';
+import { ClientPropertyForTableColumns } from '../client-property-for-table-columns';
@Component({
selector: 'imx-additional-infos',
@@ -38,8 +39,10 @@ import { DataModel, EntitySchema, IClientProperty } from 'imx-qbm-dbts';
export class AdditionalInfosComponent implements OnInit {
public possibleProperties: IClientProperty[];
+ public optionals: ClientPropertyForTableColumns[];
- public optionals: IClientProperty[];
+ public infoText = '#LDS#Please choose the columns you like to add.';
+ public infoTextLong = '#LDS#New columns will be added to your table. You can change the sort order via drag and drop using the hatched handle.';
public get result(): any {
return { all: this.data.preselectedProperties, optionals: this.optionals };
@@ -49,9 +52,9 @@ export class AdditionalInfosComponent implements OnInit {
@Inject(MAT_DIALOG_DATA) public readonly data: {
dataModel: DataModel,
entitySchema: EntitySchema,
- displayedColumns: IClientProperty[],
- additionalPropertyNames: IClientProperty[],
- preselectedProperties: IClientProperty[],
+ displayedColumns: ClientPropertyForTableColumns[],
+ additionalPropertyNames: ClientPropertyForTableColumns[],
+ preselectedProperties: ClientPropertyForTableColumns[],
type: 'list' | 'columns'
},
public dialogRef: MatDialogRef) {
@@ -80,9 +83,14 @@ export class AdditionalInfosComponent implements OnInit {
public updateSelected(event: MatSelectionListChange): void {
if (event.options[0].selected) {
- this.data.preselectedProperties.push(event.options[0].value);
- this.optionals.push(event.options[0].value);
+ // add new columns before first item with afterAdditionals = true or at the end
+ let index = this.data.preselectedProperties.findIndex(elem => elem.afterAdditionals === true);
+ this.data.preselectedProperties.splice(index === -1 ? this.data.preselectedProperties.length : index, 0, event.options[0].value);
+
+ index = this.optionals.findIndex(elem => elem.afterAdditionals === true);
+ this.optionals.splice(index === -1 ? this.optionals.length : index, 0, event.options[0].value);
} else {
+ // Find item and remove it
let position = this.data.preselectedProperties.findIndex(elem => elem.ColumnName === event.options[0].value.ColumnName);
this.data.preselectedProperties.splice(position, 1);
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/client-property-for-table-columns.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/client-property-for-table-columns.ts
new file mode 100644
index 000000000..5e1739c11
--- /dev/null
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/client-property-for-table-columns.ts
@@ -0,0 +1,39 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { IClientProperty } from 'imx-qbm-dbts';
+
+/**
+ * Extends the IClientProperty interface, by adding a property for marking columns,
+ * that have to be displayed on the far right side
+ */
+export interface ClientPropertyForTableColumns extends IClientProperty{
+
+ /**
+ * Marks, whether the property should be displayed on the far right side of a table or not
+ */
+ afterAdditionals?: boolean;
+}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/column-options.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/column-options.ts
index d6d577a2e..095d5ff1c 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/column-options.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/column-options.ts
@@ -1,314 +1,339 @@
-import { EventEmitter, Injector } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { DataModel, DataModelViewConfig, EntitySchema, IClientProperty, ValType } from 'imx-qbm-dbts';
-import { ClassloggerService } from '../classlogger/classlogger.service';
-import { StorageService } from '../storage/storage.service';
-import { AdditionalInfosComponent } from './additional-infos/additional-infos.component';
-import { DataSourceToolbarSettings } from './data-source-toolbar-settings';
-import _ from 'lodash';
-
-export interface ShownClientPropertiesArg {
- properties: IClientProperty[];
- needsReload: boolean;
-}
-export class ColumnOptions {
-
- /**
- * A list of client properties, that will be shown in the DataTable
- */
- public shownClientProperties: IClientProperty[] = [];
-
- /**
- * List of possible addable columns
- */
- public optionalColumns: IClientProperty[] = [];
-
- /**
- * A list of client properties, that should be shown in the main column
- */
- public additionalListElements: IClientProperty[] = [];
-
- public selectedOptionals: IClientProperty[] = [];
-
- /**
- * currently used view settings
- */
- public currentViewSettings: DataModelViewConfig;
-
- /**
- * Event, that emits, when the shownClientProperies Property changes
- */
- public shownColumnsSelectionChanged = new EventEmitter();
-
- /**
- * Event, that emits, when the additionalListElements Property changes
- */
- public additionalListElementsChanged = new EventEmitter();
-
- /**
- * Indicates whether there are optional columns or not
- */
- public get hasOptionalColumns(): boolean {
- return this.currentViewSettings && this.optionalColumns?.length > 0;
- }
-
- public get additionalColumns(): IClientProperty[] {
- return this.currentViewSettings?.AdditionalTableColumns?.map(elem =>
- ColumnOptions.getClientProperty(ColumnOptions.findKey(elem, this.entitySchema), this.dataModel, this.entitySchema)) ?? [];
- }
-
- // private services
- private store: StorageService;
- private dialog: MatDialog;
- private logger: ClassloggerService;
-
- // getter for settings
- private get dataModel(): DataModel { return this.settings.dataModel; }
- private entitySchema: EntitySchema;
- private get displayedColumns(): IClientProperty[] { return this.settings.displayedColumns; }
-
- private originalEntitySchema;
-
- constructor(
- public settings: DataSourceToolbarSettings,
- injector: Injector
- ) {
- this.currentViewSettings = this.dataModel.Configurations?.
- find(elem => elem.Id === this.dataModel.DefaultConfigId);
-
- if (this.currentViewSettings) {
- // Clean up settings, if there are null or empty columnsnames attached
- if (this.currentViewSettings.AdditionalListColumns
- && this.currentViewSettings.AdditionalListColumns.some(elem => elem == null || elem === '')) {
- (this.currentViewSettings.AdditionalListColumns as any) =
- this.currentViewSettings.AdditionalListColumns.filter(elem => elem != null && elem !== '');
- }
-
- if (this.currentViewSettings.AdditionalTableColumns
- && this.currentViewSettings.AdditionalTableColumns.some(elem => elem == null || elem === '')) {
- (this.currentViewSettings.AdditionalTableColumns as any) =
- this.currentViewSettings.AdditionalTableColumns.filter(elem => elem != null && elem !== '');
- }
- }
-
- // initializing of services
- this.store = injector.get(StorageService);
- this.dialog = injector.get(MatDialog);
- this.logger = injector.get(ClassloggerService);
- this.entitySchema = _.cloneDeep(this.settings.entitySchema);
- this.originalEntitySchema = _.cloneDeep(this.entitySchema);
- }
-
- public getPropertiesForNavigation(): string[] {
- const additional = this.additionalColumns;
- return this.shownClientProperties.filter(elem =>
- this.displayedColumns.findIndex(disp => disp.ColumnName === elem.ColumnName) === -1 &&
- additional.findIndex(disp => disp.ColumnName === elem.ColumnName) === -1
- ).map(elem => elem.ColumnName);
- }
-
- /**
- * Shows a dialog for adding/removing optional columns
- */
- public async updateAdditional(): Promise {
- const additional = this.additionalColumns;
- const displayedColumns = [
- ...this.displayedColumns,
- ...additional];
- this.logger.trace(this, 'unchangeable columns', displayedColumns);
- const result: { all: IClientProperty[], optionals: IClientProperty[] }
- = await this.dialog.open(AdditionalInfosComponent, {
- width: 'min(1200px,70%)',
- autoFocus: false,
- height: 'min(700px,70%)',
- data: {
- dataModel: this.dataModel,
- entitySchema: this.entitySchema,
- displayedColumns,
- additionalPropertyNames: this.optionalColumns,
- preselectedProperties: [...this.shownClientProperties]
- },
- panelClass: 'imx-toolbar-dialog'
- }).afterClosed().toPromise();
- if (result) {
- if (JSON.stringify(this.shownClientProperties) === JSON.stringify(result.all)) { return; }
-
- this.shownClientProperties = result.all;
-
- const needsReload = result.optionals.length > this.selectedOptionals.length
- || result.optionals.some(res => this.selectedOptionals.find(sel => sel.ColumnName === res.ColumnName) == null);
- this.selectedOptionals = result.optionals;
- this.logger.trace(this, 'new displayed columns', result.all, 'new optional columns', result.optionals, 'needs reload', needsReload);
-
- this.shownColumnsSelectionChanged.emit({ properties: this.shownClientProperties, needsReload });
-
- if (this.settings.identifierForSessionStore) {
- this.store.storeProperties('columns-' + this.settings.identifierForSessionStore,
- this.shownClientProperties.map(elem => elem.ColumnName));
- this.store.storeProperties('columns-additional-' + this.settings.identifierForSessionStore,
- this.currentViewSettings?.AdditionalTableColumns ?? []);
- this.logger.trace(this, `properties stored under ${'columns-' + this.settings.identifierForSessionStore}:`
- , this.shownClientProperties.map(elem => elem.ColumnName));
- }
- }
- }
-
- /**
- * resets the view by removing all optional columns and restoring the initial order
- */
- public resetView(): void {
- if (this.currentViewSettings == null) { return; }
-
- const addition = this.additionalColumns;
- const properties = [...this.displayedColumns, ...addition];
- this.selectedOptionals = [];
- this.shownClientProperties = properties;
-
- this.shownColumnsSelectionChanged.emit({ properties, needsReload: false });
- this.logger.trace(this, 'shown client properties resetted to', this.shownClientProperties);
-
- if (this.settings.identifierForSessionStore) {
- this.store.removeKeys(
- 'columns-additional-' + this.settings.identifierForSessionStore,
- 'columns-' + this.settings.identifierForSessionStore
- );
- }
- }
-
- /**
- * updates the entity schema by adding optional columns
- * @returns the updated entity schema
- */
- public updateEntitySchema(): EntitySchema {
- this.entitySchema = _.cloneDeep(this.originalEntitySchema);
- const elements = this.getPropertiesForNavigation();
-
- if (this.currentViewSettings?.AdditionalTableColumns) {
- elements.push(...this.currentViewSettings.AdditionalTableColumns);
- }
- if (this.currentViewSettings?.AdditionalListColumns) {
- elements.push(...this.currentViewSettings.AdditionalListColumns);
- }
-
- if (elements.length > 0) {
- this.logger.trace(this, 'properties, that have to be updated', elements);
- // hack for adding the new columns to to entitySchema
- elements.forEach(element => {
- const key = ColumnOptions.findKey(element, this.entitySchema);
- (this.entitySchema.Columns[key] as any) = ColumnOptions.getClientProperty(key, this.dataModel, this.entitySchema);
- });
- }
-
- this.logger.trace(this, 'new entitySchema', this.entitySchema);
- return this.entitySchema;
- }
-
- /**
- * inits the the optional columns, the shown client properties and the additional information for the display columns
- */
- public initColumnsAndAdditionalInformation(): void {
- this.initOptionalColumns();
-
- if (this.shownClientProperties.length === 0) {
- this.initShownClientProperties();
- }
-
- this.loadShownClientPropertiesFromStore();
-
- this.initAdditionalListElements();
-
- this.shownColumnsSelectionChanged.emit({ properties: this.shownClientProperties, needsReload: true });
- }
-
- private initOptionalColumns(): void {
- const optional = this.dataModel.Properties?.filter(elem => elem.IsAdditionalColumn).map(elem => elem.Property);
-
- this.optionalColumns = optional?.filter((value, index, categoryArray) =>
- this.isAdditional(value.ColumnName)
- && categoryArray.indexOf(value) === index);
-
-
- this.logger.trace(this, 'optional columns', this.optionalColumns);
- }
-
- private initShownClientProperties(): void {
- const current = this.currentViewSettings?.AdditionalTableColumns?.
- map(elem => ColumnOptions.getClientProperty(elem, this.dataModel)) ?? [];
-
- this.shownClientProperties = [
- ...this.displayedColumns,
- ...current,
- ];
- if (this.selectedOptionals?.length) {
- this.shownClientProperties.push(...this.selectedOptionals);
- }
-
- this.logger.trace(this, 'shown client properties initialized with', this.shownClientProperties);
- }
-
- private loadShownClientPropertiesFromStore(): void {
- if (!this.settings.identifierForSessionStore) {
- return;
- }
-
- const columns = this.store.getProperties('columns-' + this.settings.identifierForSessionStore);
- const addColumns = this.store.getProperties('columns-additional-' + this.settings.identifierForSessionStore);
- const showsAdditionals =
- (this.currentViewSettings?.AdditionalTableColumns ?? []).length === addColumns.length &&
- (this.currentViewSettings?.AdditionalTableColumns ?? []).every(add => addColumns.includes(add));
-
- if (columns?.length > 0 && showsAdditionals) {
- this.shownClientProperties = columns.map(column =>
- ColumnOptions.getClientProperty(column, this.dataModel, this.entitySchema));
-
- this.selectedOptionals = this.shownClientProperties.filter(elem => this.isAdditional(elem.ColumnName));
-
- this.shownColumnsSelectionChanged.emit({ properties: this.shownClientProperties, needsReload: true });
- this.logger.trace(this, 'columns loaded from store', this.shownClientProperties);
- } else {
- this.store.removeKeys(
- 'columns-additional-' + this.settings.identifierForSessionStore,
- 'columns-' + this.settings.identifierForSessionStore
- );
- }
- }
-
- private initAdditionalListElements(): void {
- const lists = this.currentViewSettings?.AdditionalListColumns;
- if (lists?.length > 0) {
- this.additionalListElements = lists.map(elem =>
- ColumnOptions.getClientProperty(ColumnOptions.findKey(elem, this.entitySchema), this.dataModel, this.entitySchema));
- this.additionalListElementsChanged.emit(this.additionalListElements);
- this.logger.trace(this, 'additional list elements from viewSettings', this.additionalListElements);
- }
- }
-
- private isAdditional(key: string): boolean {
- return this.displayedColumns.find(elem => elem.ColumnName.toLocaleLowerCase() === key.toLocaleLowerCase()) == null
- &&
- this.currentViewSettings?.AdditionalListColumns?.find(elem => elem.toLocaleLowerCase() === key.toLocaleLowerCase()) == null
- &&
- this.currentViewSettings?.AdditionalTableColumns?.find(elem => elem.toLocaleLowerCase() === key.toLocaleLowerCase()) == null
- }
-
- public static getClientProperty(name: string, dataModel: DataModel, entitySchema?: EntitySchema): IClientProperty {
- let property: IClientProperty;
- if (entitySchema) {
- const key = ColumnOptions.findKey(name, entitySchema);
- property = key != null ? entitySchema.Columns[key] : null;
- }
- if (property == null) {
- property = dataModel?.Properties?.
- find(elem => elem?.Property?.ColumnName?.toLocaleLowerCase() === name?.toLocaleLowerCase())?.Property;
- }
- if (property == null) {
- property = { ColumnName: name, Type: ValType.String };
- }
- return property;
- }
-
- private static findKey(key: string, schema: EntitySchema): string {
- const keyVariant = Object.keys(schema.Columns).find(elem => elem.toLocaleLowerCase() === key.toLocaleLowerCase());
- return keyVariant ?? key;
- }
-}
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { EventEmitter, Injector } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { DataModel, DataModelViewConfig, EntitySchema, IClientProperty, ValType } from 'imx-qbm-dbts';
+import { ClassloggerService } from '../classlogger/classlogger.service';
+import { StorageService } from '../storage/storage.service';
+import { AdditionalInfosComponent } from './additional-infos/additional-infos.component';
+import { DataSourceToolbarSettings } from './data-source-toolbar-settings';
+import { ClientPropertyForTableColumns } from './client-property-for-table-columns';
+import _ from 'lodash';
+
+export interface ShownClientPropertiesArg {
+ properties: IClientProperty[];
+ needsReload: boolean;
+}
+export class ColumnOptions {
+
+ /**
+ * A list of client properties, that will be shown in the DataTable
+ */
+ public shownClientProperties: ClientPropertyForTableColumns[] = [];
+
+ /**
+ * List of possible addable columns
+ */
+ public optionalColumns: IClientProperty[] = [];
+
+ /**
+ * A list of client properties, that should be shown in the main column
+ */
+ public additionalListElements: IClientProperty[] = [];
+
+ public selectedOptionals: IClientProperty[] = [];
+
+ /**
+ * currently used view settings
+ */
+ public currentViewSettings: DataModelViewConfig;
+
+ /**
+ * Event, that emits, when the shownClientProperies Property changes
+ */
+ public shownColumnsSelectionChanged = new EventEmitter();
+
+ /**
+ * Event, that emits, when the additionalListElements Property changes
+ */
+ public additionalListElementsChanged = new EventEmitter();
+
+ /**
+ * Indicates whether there are optional columns or not
+ */
+ public get hasOptionalColumns(): boolean {
+ return this.currentViewSettings && this.optionalColumns?.length > 0;
+ }
+
+ public get additionalColumns(): IClientProperty[] {
+ return this.currentViewSettings?.AdditionalTableColumns?.map(elem =>
+ ColumnOptions.getClientProperty(ColumnOptions.findKey(elem, this.entitySchema), this.dataModel, this.entitySchema)) ?? [];
+ }
+
+ // private services
+ private store: StorageService;
+ private dialog: MatDialog;
+ private logger: ClassloggerService;
+
+ // getter for settings
+ private get dataModel(): DataModel { return this.settings.dataModel; }
+ private entitySchema: EntitySchema;
+ private get displayedColumns(): IClientProperty[] { return this.settings.displayedColumns; }
+
+ private originalEntitySchema;
+
+ constructor(
+ public settings: DataSourceToolbarSettings,
+ injector: Injector
+ ) {
+ this.currentViewSettings = this.dataModel.Configurations?.
+ find(elem => elem.Id === this.dataModel.DefaultConfigId);
+
+ if (this.currentViewSettings) {
+ // Clean up settings, if there are null or empty columnsnames attached
+ if (this.currentViewSettings.AdditionalListColumns
+ && this.currentViewSettings.AdditionalListColumns.some(elem => elem == null || elem === '')) {
+ (this.currentViewSettings.AdditionalListColumns as any) =
+ this.currentViewSettings.AdditionalListColumns.filter(elem => elem != null && elem !== '');
+ }
+
+ if (this.currentViewSettings.AdditionalTableColumns
+ && this.currentViewSettings.AdditionalTableColumns.some(elem => elem == null || elem === '')) {
+ (this.currentViewSettings.AdditionalTableColumns as any) =
+ this.currentViewSettings.AdditionalTableColumns.filter(elem => elem != null && elem !== '');
+ }
+ }
+
+ // initializing of services
+ this.store = injector.get(StorageService);
+ this.dialog = injector.get(MatDialog);
+ this.logger = injector.get(ClassloggerService);
+ this.entitySchema = _.cloneDeep(this.settings.entitySchema);
+ this.originalEntitySchema = _.cloneDeep(this.entitySchema);
+ }
+
+ public getPropertiesForNavigation(): string[] {
+ const additional = this.additionalColumns;
+ return this.shownClientProperties.filter(elem =>
+ this.displayedColumns.findIndex(disp => disp.ColumnName === elem.ColumnName) === -1 &&
+ additional.findIndex(disp => disp.ColumnName === elem.ColumnName) === -1
+ ).map(elem => elem.ColumnName);
+ }
+
+ /**
+ * Shows a dialog for adding/removing optional columns
+ */
+ public async updateAdditional(): Promise {
+ const additional = this.additionalColumns;
+ const displayedColumns = [
+ ...this.displayedColumns,
+ ...additional];
+ this.logger.trace(this, 'unchangeable columns', displayedColumns);
+ const result: { all: IClientProperty[], optionals: IClientProperty[] }
+ = await this.dialog.open(AdditionalInfosComponent, {
+ width: 'min(1200px,70%)',
+ autoFocus: false,
+ height: 'min(700px,70%)',
+ data: {
+ dataModel: this.dataModel,
+ entitySchema: this.entitySchema,
+ displayedColumns,
+ additionalPropertyNames: this.optionalColumns,
+ preselectedProperties: [...this.shownClientProperties]
+ },
+ panelClass: 'imx-toolbar-dialog'
+ }).afterClosed().toPromise();
+ if (result) {
+ if (JSON.stringify(this.shownClientProperties) === JSON.stringify(result.all)) { return; }
+
+ this.shownClientProperties = result.all;
+
+ const needsReload = result.optionals.length > this.selectedOptionals.length
+ || result.optionals.some(res => this.selectedOptionals.find(sel => sel.ColumnName === res.ColumnName) == null);
+ this.selectedOptionals = result.optionals;
+ this.logger.trace(this, 'new displayed columns', result.all, 'new optional columns', result.optionals, 'needs reload', needsReload);
+
+ this.shownColumnsSelectionChanged.emit({ properties: this.shownClientProperties, needsReload });
+
+ if (this.settings.identifierForSessionStore) {
+ this.store.storeProperties('columns-' + this.settings.identifierForSessionStore,
+ this.shownClientProperties.map(elem => elem.ColumnName));
+ this.store.storeProperties('columns-additional-' + this.settings.identifierForSessionStore,
+ this.currentViewSettings?.AdditionalTableColumns ?? []);
+ this.logger.trace(this, `properties stored under ${'columns-' + this.settings.identifierForSessionStore}:`
+ , this.shownClientProperties.map(elem => elem.ColumnName));
+ }
+ }
+ }
+
+ /**
+ * resets the view by removing all optional columns and restoring the initial order
+ */
+ public resetView(): void {
+ if (this.currentViewSettings == null) { return; }
+
+ const addition = this.additionalColumns;
+ this.selectedOptionals = [];
+
+ this.shownClientProperties = [...this.displayedColumns];
+ const index = this.shownClientProperties.findIndex(elem => elem.afterAdditionals);
+ this.shownClientProperties.splice(index === -1 ? this.shownClientProperties.length : index, 0, ...addition);
+
+
+ this.shownColumnsSelectionChanged.emit({ properties: this.shownClientProperties, needsReload: false });
+ this.logger.trace(this, 'shown client properties resetted to', this.shownClientProperties);
+
+ if (this.settings.identifierForSessionStore) {
+ this.store.removeKeys(
+ 'columns-additional-' + this.settings.identifierForSessionStore,
+ 'columns-' + this.settings.identifierForSessionStore
+ );
+ }
+ }
+
+ /**
+ * updates the entity schema by adding optional columns
+ * @returns the updated entity schema
+ */
+ public updateEntitySchema(): EntitySchema {
+ this.entitySchema = _.cloneDeep(this.originalEntitySchema);
+ const elements = this.getPropertiesForNavigation();
+
+ if (this.currentViewSettings?.AdditionalTableColumns) {
+ elements.push(...this.currentViewSettings.AdditionalTableColumns);
+ }
+ if (this.currentViewSettings?.AdditionalListColumns) {
+ elements.push(...this.currentViewSettings.AdditionalListColumns);
+ }
+
+ if (elements.length > 0) {
+ this.logger.trace(this, 'properties, that have to be updated', elements);
+ // hack for adding the new columns to to entitySchema
+ elements.forEach(element => {
+ const key = ColumnOptions.findKey(element, this.entitySchema);
+ (this.entitySchema.Columns[key] as any) = ColumnOptions.getClientProperty(key, this.dataModel, this.entitySchema);
+ });
+ }
+
+ this.logger.trace(this, 'new entitySchema', this.entitySchema);
+ return this.entitySchema;
+ }
+
+ /**
+ * inits the the optional columns, the shown client properties and the additional information for the display columns
+ */
+ public initColumnsAndAdditionalInformation(): void {
+ this.initOptionalColumns();
+
+ if (this.shownClientProperties.length === 0) {
+ this.initShownClientProperties();
+ }
+
+ this.loadShownClientPropertiesFromStore();
+
+ this.initAdditionalListElements();
+
+ this.shownColumnsSelectionChanged.emit({ properties: this.shownClientProperties, needsReload: true });
+ }
+
+ private initOptionalColumns(): void {
+ const optional = this.dataModel.Properties?.filter(elem => elem.IsAdditionalColumn).map(elem => elem.Property);
+
+ this.optionalColumns = optional?.filter((value, index, categoryArray) =>
+ this.isAdditional(value.ColumnName)
+ && categoryArray.indexOf(value) === index);
+
+
+ this.logger.trace(this, 'optional columns', this.optionalColumns);
+ }
+
+ private initShownClientProperties(): void {
+ const current = this.currentViewSettings?.AdditionalTableColumns?.
+ map(elem => ColumnOptions.getClientProperty(elem, this.dataModel)) ?? [];
+ this.shownClientProperties = [...this.displayedColumns];
+ const index = this.shownClientProperties.findIndex(elem => elem.afterAdditionals);
+ this.shownClientProperties.splice(index === -1 ? this.shownClientProperties.length : index, 0, ...current, ...this.selectedOptionals);
+
+ this.logger.trace(this, 'shown client properties initialized with', this.shownClientProperties);
+ }
+
+ private loadShownClientPropertiesFromStore(): void {
+ if (!this.settings.identifierForSessionStore) {
+ return;
+ }
+
+ const columns = this.store.getProperties('columns-' + this.settings.identifierForSessionStore);
+ const addColumns = this.store.getProperties('columns-additional-' + this.settings.identifierForSessionStore);
+ const showsAdditionals =
+ (this.currentViewSettings?.AdditionalTableColumns ?? []).length === addColumns.length &&
+ (this.currentViewSettings?.AdditionalTableColumns ?? []).every(add => addColumns.includes(add));
+
+ if (columns?.length > 0 && showsAdditionals) {
+ this.shownClientProperties = columns.map(column =>
+ ColumnOptions.getClientProperty(column, this.dataModel, this.entitySchema));
+
+ this.selectedOptionals = this.shownClientProperties.filter(elem => this.isAdditional(elem.ColumnName));
+
+ this.shownColumnsSelectionChanged.emit({ properties: this.shownClientProperties, needsReload: true });
+ this.logger.trace(this, 'columns loaded from store', this.shownClientProperties);
+ } else {
+ this.store.removeKeys(
+ 'columns-additional-' + this.settings.identifierForSessionStore,
+ 'columns-' + this.settings.identifierForSessionStore
+ );
+ }
+ }
+
+ private initAdditionalListElements(): void {
+ const lists = this.currentViewSettings?.AdditionalListColumns;
+ if (lists?.length > 0) {
+ this.additionalListElements = lists.map(elem =>
+ ColumnOptions.getClientProperty(ColumnOptions.findKey(elem, this.entitySchema), this.dataModel, this.entitySchema));
+ this.additionalListElementsChanged.emit(this.additionalListElements);
+ this.logger.trace(this, 'additional list elements from viewSettings', this.additionalListElements);
+ }
+ }
+
+ private isAdditional(key: string): boolean {
+ return this.displayedColumns.find(elem => elem.ColumnName.toLocaleLowerCase() === key.toLocaleLowerCase()) == null
+ &&
+ this.currentViewSettings?.AdditionalListColumns?.find(elem => elem.toLocaleLowerCase() === key.toLocaleLowerCase()) == null
+ &&
+ this.currentViewSettings?.AdditionalTableColumns?.find(elem => elem.toLocaleLowerCase() === key.toLocaleLowerCase()) == null
+ }
+
+ public static getClientProperty(name: string, dataModel: DataModel, entitySchema?: EntitySchema): IClientProperty {
+ let property: IClientProperty;
+ if (entitySchema) {
+ const key = ColumnOptions.findKey(name, entitySchema);
+ property = key != null ? entitySchema.Columns[key] : null;
+ }
+ if (property == null) {
+ property = dataModel?.Properties?.
+ find(elem => elem?.Property?.ColumnName?.toLocaleLowerCase() === name?.toLocaleLowerCase())?.Property;
+ }
+ if (property == null) {
+ property = { ColumnName: name, Type: ValType.String };
+ }
+ return property;
+ }
+
+ private static findKey(key: string, schema: EntitySchema): string {
+ const keyVariant = Object.keys(schema.Columns).find(elem => elem.toLocaleLowerCase() === key.toLocaleLowerCase());
+ return keyVariant ?? key;
+ }
+}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.spec.ts
index 2c73b8654..892cb1252 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.ts
index b867620e3..b0e52f92a 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-helper.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-wrapper.interface.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-wrapper.interface.ts
index 4f0ed9a35..d2477a6e9 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-wrapper.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/data-model-wrapper.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/filter-tree-parameter.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/filter-tree-parameter.ts
index faa0a5478..f865b5790 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/filter-tree-parameter.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/filter-tree-parameter.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/group-info-load-parameters.interface.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/group-info-load-parameters.interface.ts
index ab3e78a6e..f476731c3 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/group-info-load-parameters.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-model/group-info-load-parameters.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-item-status.interface.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-item-status.interface.ts
index 2105c442e..ad0fb3be9 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-item-status.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-item-status.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -29,6 +29,6 @@ import { DataTileBadge } from './data-tile-badge.interface';
export interface DataSourceItemStatus {
enabled: (item: TypedEntity) => boolean;
- getBadges?: (input: TypedEntity) => DataTileBadge[];
- getImage?: (item: TypedEntity) => Promise;
+ getBadges?: (input: TypedEntity) => DataTileBadge[];
+ getImagePath?: (item: TypedEntity) => Promise;
}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.spec.ts
index d854bfa48..bef1badbe 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.ts
index daa5305c6..e0497e940 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-paginator.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -82,7 +82,7 @@ export class DataSourcePaginatorComponent implements OnChanges, OnDestroy {
* Configures the paginator and subscribes to events from the attached datasource toolbar.
*/
public ngOnChanges(changes: SimpleChanges): void {
- if (changes.dst && changes.dst.currentValue) {
+ if (changes['dst'] && changes['dst'].currentValue) {
this.setPaginator();
this.subscriptions.push(this.dst.settingsChanged.subscribe((value: DataSourceToolbarSettings) => {
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.spec.ts
index 45de4f140..c94659238 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.ts
index 4056bd282..22db923cf 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-custom.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-filters.interface.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-filters.interface.ts
index 7cc06f17f..34ceae8c0 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-filters.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-filters.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-groups.interface.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-groups.interface.ts
index d19587ba3..cf0e63920 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-groups.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-groups.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-menu-item.interface.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-menu-item.interface.ts
index b24456223..fd2e6869d 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-menu-item.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-menu-item.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-settings.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-settings.ts
index 3dc1080d4..32eabadf6 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-settings.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar-settings.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -24,7 +24,8 @@
*
*/
-import { TypedEntity, TypedEntityCollectionData, CollectionLoadParameters, EntitySchema, IClientProperty, DataModel } from 'imx-qbm-dbts';
+import { TypedEntity, TypedEntityCollectionData, CollectionLoadParameters, EntitySchema, DataModel } from 'imx-qbm-dbts';
+import { ClientPropertyForTableColumns } from './client-property-for-table-columns';
import { FilterTreeParameter } from './data-model/filter-tree-parameter';
import { DataSourceToolbarFilter } from './data-source-toolbar-filters.interface';
import { DataSourceToolbarGroupData } from './data-source-toolbar-groups.interface';
@@ -53,7 +54,7 @@ export interface DataSourceToolbarSettings {
* Indicates which properties should be shown.
* If undefined, all properties of the typed entity should be visible.
*/
- displayedColumns?: IClientProperty[];
+ displayedColumns?: ClientPropertyForTableColumns[];
/**
* The datamodel filters for the typed entity
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.scss b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.scss
index 2512ef0b7..783bb17ed 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
.imx-data-source-toolbar-container {
.imx-data-source-toolbar {
@@ -38,7 +38,7 @@
.imx-data-source-selected-filters {
display: block;
- margin: 10px 5px;
+ margin: 10px 5px;
.mat-chip-list-wrapper > span {
margin-right: 5px;
@@ -121,7 +121,7 @@
white-space: normal;
}
}
-
+
.mat-checkbox-layout {
white-space: normal;
}
@@ -135,7 +135,7 @@
color: inherit;
}
- button.mat-menu-item {
+ button.mat-menu-item {
white-space: break-spaces;
min-height: 48px;
height: auto;
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.spec.ts
index 787aff254..c1f7b1667 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts
index faffdb0d4..bc00a0280 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -430,8 +430,8 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
* Checks if input fields had changed.
*/
public async ngOnChanges(changes: SimpleChanges): Promise {
- if (changes.settings && changes.settings.currentValue) {
- this.dataSourceHasChanged = !(changes.settings.currentValue.entitySchema === changes.settings.previousValue);
+ if (changes['settings'] && changes['settings'].currentValue) {
+ this.dataSourceHasChanged = !(changes['settings'].currentValue.entitySchema === changes['settings'].previousValue);
if (this.dataSourceHasChanged) {
this.entitySchema = this.settings.entitySchema;
@@ -467,7 +467,7 @@ export class DataSourceToolbarComponent implements OnChanges, OnInit, OnDestroy
this.settingsChanged.emit(this.settings);
}
- if (changes.preSelection && changes.preSelection.currentValue) {
+ if (changes['preSelection'] && changes['preSelection'].currentValue) {
this.isUpdatingPreselection = true;
setTimeout(() => {
this.preSelection.forEach(item => this.selection.checked(item));
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.module.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.module.ts
index 1338425c6..4dff49750 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.module.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-toolbar.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.spec.ts
index c1da8e41d..f7e05d525 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.ts
index 7f506f4b5..4da4f889d 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-source-wrapper.ts
@@ -1,121 +1,122 @@
-/*
- * ONE IDENTITY LLC. PROPRIETARY INFORMATION
- *
- * This software is confidential. One Identity, LLC. or one of its affiliates or
- * subsidiaries, has supplied this software to you under terms of a
- * license agreement, nondisclosure agreement or both.
- *
- * You may not copy, disclose, or use this software except in accordance with
- * those terms.
- *
- *
- * Copyright 2021 One Identity LLC.
- * ALL RIGHTS RESERVED.
- *
- * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
- * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
- * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
- * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
- * THIS SOFTWARE OR ITS DERIVATIVES.
- *
- */
-
-import {
- CollectionLoadParameters, DataModel, DisplayColumns, EntitySchema, ExtendedTypedEntityCollection, IClientProperty, TypedEntity
-} from 'imx-qbm-dbts';
-import { DataModelWrapper } from './data-model/data-model-wrapper.interface';
-import { createGroupData } from './data-model/data-model-helper';
-import { DataSourceToolbarFilter } from './data-source-toolbar-filters.interface';
-import { DataSourceToolbarGroupData } from './data-source-toolbar-groups.interface';
-import { DataSourceToolbarSettings } from './data-source-toolbar-settings';
-
-export class DataSourceWrapper {
- public readonly propertyDisplay: IClientProperty;
-
- public extendedData: TExtendedData;
-
- private parameters: CollectionLoadParameters;
- private readonly filterOptions: DataSourceToolbarFilter[];
- private dataModel: DataModel;
- private readonly groupData: DataSourceToolbarGroupData;
-
- constructor(
- private readonly getData: (parameters: CollectionLoadParameters) => Promise>,
- private readonly displayedColumns: IClientProperty[],
- private readonly entitySchema: EntitySchema,
- dataModelWrapper?: DataModelWrapper,
- private readonly identifier?: string
- ) {
- this.propertyDisplay = this.entitySchema.Columns[DisplayColumns.DISPLAY_PROPERTYNAME];
-
- if (dataModelWrapper) {
- this.dataModel = dataModelWrapper.dataModel;
- this.filterOptions = dataModelWrapper.dataModel.Filters;
- this.groupData = this.createGroupData(dataModelWrapper);
- }
- }
-
- public async getDstSettings(parameters?: CollectionLoadParameters): Promise {
- this.parameters = {
- ...this.parameters,
- ...parameters
- };
-
- const dataSource = await this.getData(this.parameters);
-
- this.extendedData = dataSource?.extendedData;
-
- if (dataSource) {
- return {
- dataSource,
- displayedColumns: this.displayedColumns,
- entitySchema: this.entitySchema,
- navigationState: this.parameters,
- filters: this.filterOptions,
- groupData: this.groupData,
- dataModel: this.dataModel,
- identifierForSessionStore: this.identifier
- };
- }
-
- return undefined;
- }
-
- public async getGroupDstSettings(parameters: CollectionLoadParameters): Promise {
- return {
- displayedColumns: this.displayedColumns,
- dataSource: await this.getData(parameters),
- entitySchema: this.entitySchema,
- navigationState: parameters
- };
- }
-
- private createGroupData(dataModelWrapper: DataModelWrapper): DataSourceToolbarGroupData {
- return createGroupData(
- dataModelWrapper.dataModel,
- parameters => dataModelWrapper.getGroupInfo({
- ...parameters,
- ...this.getGroupingFilterOptionParameters(dataModelWrapper.groupingFilterOptions),
- ...{
- StartIndex: 0,
- PageSize: this.parameters?.PageSize
- },
- }),
- dataModelWrapper.groupingExcludedColumns
- );
- }
-
- private getGroupingFilterOptionParameters(groupingFilterOptions: string[]): { [parameterName: string]: string } {
- const parameters = {};
-
- groupingFilterOptions?.forEach(filterOptionName =>
- parameters[filterOptionName] = this.filterOptions.find(item => item.Name === filterOptionName)?.CurrentValue
- );
-
- return parameters;
- }
-}
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import {
+ CollectionLoadParameters, DataModel, DisplayColumns, EntitySchema, ExtendedTypedEntityCollection, IClientProperty, TypedEntity
+} from 'imx-qbm-dbts';
+import { DataModelWrapper } from './data-model/data-model-wrapper.interface';
+import { createGroupData } from './data-model/data-model-helper';
+import { DataSourceToolbarFilter } from './data-source-toolbar-filters.interface';
+import { DataSourceToolbarGroupData } from './data-source-toolbar-groups.interface';
+import { DataSourceToolbarSettings } from './data-source-toolbar-settings';
+import { ClientPropertyForTableColumns } from './client-property-for-table-columns';
+
+export class DataSourceWrapper {
+ public readonly propertyDisplay: IClientProperty;
+
+ public extendedData: TExtendedData;
+
+ private parameters: CollectionLoadParameters;
+ private readonly filterOptions: DataSourceToolbarFilter[];
+ private dataModel: DataModel;
+ private readonly groupData: DataSourceToolbarGroupData;
+
+ constructor(
+ private readonly getData: (parameters: CollectionLoadParameters) => Promise>,
+ private readonly displayedColumns: ClientPropertyForTableColumns[],
+ private readonly entitySchema: EntitySchema,
+ dataModelWrapper?: DataModelWrapper,
+ private readonly identifier?: string
+ ) {
+ this.propertyDisplay = this.entitySchema.Columns[DisplayColumns.DISPLAY_PROPERTYNAME];
+
+ if (dataModelWrapper) {
+ this.dataModel = dataModelWrapper.dataModel;
+ this.filterOptions = dataModelWrapper.dataModel.Filters;
+ this.groupData = this.createGroupData(dataModelWrapper);
+ }
+ }
+
+ public async getDstSettings(parameters?: CollectionLoadParameters): Promise {
+ this.parameters = {
+ ...this.parameters,
+ ...parameters
+ };
+
+ const dataSource = await this.getData(this.parameters);
+
+ this.extendedData = dataSource?.extendedData;
+
+ if (dataSource) {
+ return {
+ dataSource,
+ displayedColumns: this.displayedColumns,
+ entitySchema: this.entitySchema,
+ navigationState: this.parameters,
+ filters: this.filterOptions,
+ groupData: this.groupData,
+ dataModel: this.dataModel,
+ identifierForSessionStore: this.identifier
+ };
+ }
+
+ return undefined;
+ }
+
+ public async getGroupDstSettings(parameters: CollectionLoadParameters): Promise {
+ return {
+ displayedColumns: this.displayedColumns,
+ dataSource: await this.getData(parameters),
+ entitySchema: this.entitySchema,
+ navigationState: parameters
+ };
+ }
+
+ private createGroupData(dataModelWrapper: DataModelWrapper): DataSourceToolbarGroupData {
+ return createGroupData(
+ dataModelWrapper.dataModel,
+ parameters => dataModelWrapper.getGroupInfo({
+ ...parameters,
+ ...this.getGroupingFilterOptionParameters(dataModelWrapper.groupingFilterOptions),
+ ...{
+ StartIndex: 0,
+ PageSize: this.parameters?.PageSize
+ },
+ }),
+ dataModelWrapper.groupingExcludedColumns
+ );
+ }
+
+ private getGroupingFilterOptionParameters(groupingFilterOptions: string[]): { [parameterName: string]: string } {
+ const parameters = {};
+
+ groupingFilterOptions?.forEach(filterOptionName =>
+ parameters[filterOptionName] = this.filterOptions.find(item => item.Name === filterOptionName)?.CurrentValue
+ );
+
+ return parameters;
+ }
+}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-tile-badge.interface.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-tile-badge.interface.ts
index 648cb0377..642ffe413 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/data-tile-badge.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/data-tile-badge.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-database.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-database.ts
index 509f68683..5852a9822 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-database.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-database.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -49,7 +49,7 @@ export class FilterTreeDatabase extends TreeDatabase {
}
try {
- entities = this.entityWrapper.convertToEntities(await this.getFilterTree(parameters.ParentKey), parameters.parentDisplay);
+ entities = this.entityWrapper.convertToEntities(await this.getFilterTree(parameters.ParentKey), parameters['parentDisplay']);
} finally {
if (showLoading) {
setTimeout(() => this.busyService.hide());
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-entity-wrapper.service.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-entity-wrapper.service.ts
index 2009abe19..bb0ed508f 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-entity-wrapper.service.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree-entity-wrapper.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -58,27 +58,27 @@ export class FilterTreeEntityWrapperService {
private buildProperties(): EntitySchema {
const ret: { [key: string]: IClientProperty } = {};
- ret.Display = {
+ ret['Display'] = {
Type: ValType.String,
ColumnName: 'Display'
};
- ret.Filter = {
+ ret['Filter'] = {
Type: ValType.String,
ColumnName: 'Filter'
};
- ret.HasChildren = {
+ ret['HasChildren'] = {
Type: ValType.Bool,
ColumnName: 'HasChildren'
};
- ret.ObjectKey = {
+ ret['ObjectKey'] = {
Type: ValType.String,
ColumnName: 'ObjectKey'
};
- ret.LongDisplay = {
+ ret['LongDisplay'] = {
Type: ValType.String,
ColumnName: 'LongDisplay'
};
@@ -92,15 +92,15 @@ export class FilterTreeEntityWrapperService {
private buildEntityData(data: FilterTreeElement, parentDisplay: string): EntityData {
const ret: { [key: string]: EntityColumnData } = {};
- ret.Display = { Value: data.Display, IsReadOnly: true, DisplayValue: data.Display };
+ ret['Display'] = { Value: data.Display, IsReadOnly: true, DisplayValue: data.Display };
- ret.Filter = { Value: data.Filter, IsReadOnly: true };
+ ret['Filter'] = { Value: data.Filter, IsReadOnly: true };
- ret.HasChildren = { Value: data.HasHierarchy, IsReadOnly: true };
+ ret['HasChildren'] = { Value: data.HasHierarchy, IsReadOnly: true };
- ret.ObjectKey = { Value: data.ObjectKey, IsReadOnly: true };
+ ret['ObjectKey'] = { Value: data.ObjectKey, IsReadOnly: true };
- ret.LongDisplay = {
+ ret['LongDisplay'] = {
Value: (parentDisplay || '') === '' ? data.Display : `${parentDisplay}\\${data.Display}`,
IsReadOnly: true
};
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.html b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.html
index d9f8454fb..03f111987 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.html
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.html
@@ -5,7 +5,7 @@ {{'#LDS#Narrow the selection further down by: {0}' | transl
-
+
{{'#LDS#Selected item' |translate}}:
{{currentlySelectedFilter[0].GetColumn('LongDisplay').GetValue()}}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
index ade7e91ce..c8dcdd2b2 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
@@ -1,10 +1,21 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
display: flex;
flex-direction: column;
flex: 1 1 auto;
overflow: hidden;
- padding-bottom: 15px;
+ height: 100%;
+
+ ::ng-deep .mat-list-base {
+ .mat-list-item.imx-list-item {
+ height: auto;
+ }
+ }
+
+ ::ng-deep .mat-menu-panel {
+ padding: 10px;
+ max-width: 500px;
+ }
}
.imx-dialog-content {
@@ -25,10 +36,6 @@
}
}
-::ng-deep .mat-menu-panel {
- padding: 10px;
- max-width: 500px;
-}
.imx-badge {
background-color: $white;
@@ -42,8 +49,3 @@
margin: 5px 0;
}
-::ng-deep .mat-list-base {
- .mat-list-item.imx-list-item {
- height: auto;
- }
-}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
index 5acdeb03e..05ffe23a7 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
index b18426e64..78adc77fa 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
index bef062d61..fb3d022e1 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
index aa384e995..b7af746a8 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
index 187157ab1..4c8df586b 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
index 87b037e78..6b6a5c5ee 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
@@ -1,6 +1,6 @@
-
- {{ property.Type === ValType.Date
- ? (column?.GetValue() | shortDate )
- : column?.GetDisplayValue()
- }}
+
+ {{ property.Type === ValType.Date
+ ? (column?.GetValue() | shortDate )
+ : column?.GetDisplayValue()
+ }}
\ No newline at end of file
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
index c30ad72fe..b5f928f65 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
index c566e9472..e195fda41 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
@@ -1,51 +1,51 @@
-/*
- * ONE IDENTITY LLC. PROPRIETARY INFORMATION
- *
- * This software is confidential. One Identity, LLC. or one of its affiliates or
- * subsidiaries, has supplied this software to you under terms of a
- * license agreement, nondisclosure agreement or both.
- *
- * You may not copy, disclose, or use this software except in accordance with
- * those terms.
- *
- *
- * Copyright 2021 One Identity LLC.
- * ALL RIGHTS RESERVED.
- *
- * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
- * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
- * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
- * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
- * THIS SOFTWARE OR ITS DERIVATIVES.
- *
- */
-
-import { Component, Input } from '@angular/core';
-
-import { IClientProperty, IEntityColumn, TypedEntity, ValType } from 'imx-qbm-dbts';
-
-@Component({
- selector: 'imx-data-table-cell',
- templateUrl: './data-table-cell.component.html',
- styleUrls: ['./data-table-cell.component.scss']
-})
-export class DataTableCellComponent {
-
- public readonly ValType = ValType;
-
- @Input() public entity: TypedEntity;
- @Input() public property: IClientProperty;
-
-
- public get column(): IEntityColumn{
- try{
- return this.entity.GetEntity().GetColumn(this.property.ColumnName);
- }catch {
- return undefined;
- }
- }
-}
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, Input } from '@angular/core';
+
+import { IClientProperty, IEntityColumn, TypedEntity, ValType } from 'imx-qbm-dbts';
+
+@Component({
+ selector: 'imx-data-table-cell',
+ templateUrl: './data-table-cell.component.html',
+ styleUrls: ['./data-table-cell.component.scss']
+})
+export class DataTableCellComponent {
+
+ public readonly ValType = ValType;
+
+ @Input() public entity: TypedEntity;
+ @Input() public property: IClientProperty;
+
+
+ public get column(): IEntityColumn{
+ try{
+ return this.entity.GetEntity().GetColumn(this.property.ColumnName);
+ }catch {
+ return undefined;
+ }
+ }
+}
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
index 35197df87..73f57bd78 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
td.mat-cell,
th.mat-header-cell {
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
index da247d23e..0bf64f46e 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
index 20bbd6172..dba35c5cf 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
index 12433ae92..16694cef1 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
@@ -1,6 +1,6 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
div[subtitle] {
font-size: smaller;
color: $black-9;
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
index 545131091..b929494d0 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
index 343da17cc..2ecd65f0c 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
index b8bfb0b8c..22b28f539 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
index 96b455be3..28f5811f6 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
index eeea30fbd..9f82e0870 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
index a97fc8295..dfe0b3d77 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
index 45d1e271e..d769c83b9 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
@@ -1,5 +1,5 @@
/* You can add styles to this file, and also import other style files */
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
overflow-y: auto;
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
index e9fc72bdd..411afa2d9 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
index 45dd8cceb..3d0aa090f 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -324,7 +324,7 @@ export class DataTableComponent implements OnChanges, AfterViewInit, OnDestro
*/
public async ngOnChanges(changes: SimpleChanges): Promise {
- if (changes.mode && changes.mode.currentValue) {
+ if (changes['mode'] && changes['mode'].currentValue) {
if (this.mode === 'auto') {
if (this.dst.dataSourceChanged && this.columnDefs) {
this.columnDefs.forEach(colDef => this.table.removeColumnDef(colDef));
@@ -332,7 +332,7 @@ export class DataTableComponent implements OnChanges, AfterViewInit, OnDestro
}
}
- if (changes.dst && changes.dst.currentValue) {
+ if (changes['dst'] && changes['dst'].currentValue) {
this.subscriptions.push(this.dst.settingsChanged.subscribe(async (value: DataSourceToolbarSettings) => {
if (this.dst.dataSourceHasChanged) {
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
index 19fcaf85b..cf1a0709f 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
index 181e6d040..1f4c05d2a 100644
--- a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
index 0eab5cc21..d48f05bcd 100644
--- a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts b/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
index 21f6e3892..402dc5e1f 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -31,7 +31,8 @@ import { TypedEntity } from 'imx-qbm-dbts';
*/
export interface DataTileMenuItem {
name: string;
- description: string;
+ description?: string;
typedEntity?: TypedEntity;
- tileSelected?: boolean
+ tileSelected?: boolean;
+ useOnDisabledTile?: boolean;
}
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
index e6faaebc6..ad4091763 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
@@ -35,8 +35,8 @@
[matTooltip]="getTitleDisplayValue(subtitleObject.ColumnName)">
{{getTitleDisplayValue(subtitleObject.ColumnName)}}
-
+
{{getAdditionalColumnText()}}
@@ -49,14 +49,16 @@
-
+
-
-
+
+
{{(data.type === 'list' ? '#LDS#Heading Additional Informat
{{'#LDS#Narrow the selection further down by: {0}' | transl
-
+
{{'#LDS#Selected item' |translate}}:
{{currentlySelectedFilter[0].GetColumn('LongDisplay').GetValue()}}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
index ade7e91ce..c8dcdd2b2 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
@@ -1,10 +1,21 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
display: flex;
flex-direction: column;
flex: 1 1 auto;
overflow: hidden;
- padding-bottom: 15px;
+ height: 100%;
+
+ ::ng-deep .mat-list-base {
+ .mat-list-item.imx-list-item {
+ height: auto;
+ }
+ }
+
+ ::ng-deep .mat-menu-panel {
+ padding: 10px;
+ max-width: 500px;
+ }
}
.imx-dialog-content {
@@ -25,10 +36,6 @@
}
}
-::ng-deep .mat-menu-panel {
- padding: 10px;
- max-width: 500px;
-}
.imx-badge {
background-color: $white;
@@ -42,8 +49,3 @@
margin: 5px 0;
}
-::ng-deep .mat-list-base {
- .mat-list-item.imx-list-item {
- height: auto;
- }
-}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
index 5acdeb03e..05ffe23a7 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
index b18426e64..78adc77fa 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
index bef062d61..fb3d022e1 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
index aa384e995..b7af746a8 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
index 187157ab1..4c8df586b 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
index 87b037e78..6b6a5c5ee 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
@@ -1,6 +1,6 @@
-
- {{ property.Type === ValType.Date
- ? (column?.GetValue() | shortDate )
- : column?.GetDisplayValue()
- }}
+
+ {{ property.Type === ValType.Date
+ ? (column?.GetValue() | shortDate )
+ : column?.GetDisplayValue()
+ }}
\ No newline at end of file
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
index c30ad72fe..b5f928f65 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
index c566e9472..e195fda41 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
@@ -1,51 +1,51 @@
-/*
- * ONE IDENTITY LLC. PROPRIETARY INFORMATION
- *
- * This software is confidential. One Identity, LLC. or one of its affiliates or
- * subsidiaries, has supplied this software to you under terms of a
- * license agreement, nondisclosure agreement or both.
- *
- * You may not copy, disclose, or use this software except in accordance with
- * those terms.
- *
- *
- * Copyright 2021 One Identity LLC.
- * ALL RIGHTS RESERVED.
- *
- * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
- * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
- * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
- * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
- * THIS SOFTWARE OR ITS DERIVATIVES.
- *
- */
-
-import { Component, Input } from '@angular/core';
-
-import { IClientProperty, IEntityColumn, TypedEntity, ValType } from 'imx-qbm-dbts';
-
-@Component({
- selector: 'imx-data-table-cell',
- templateUrl: './data-table-cell.component.html',
- styleUrls: ['./data-table-cell.component.scss']
-})
-export class DataTableCellComponent {
-
- public readonly ValType = ValType;
-
- @Input() public entity: TypedEntity;
- @Input() public property: IClientProperty;
-
-
- public get column(): IEntityColumn{
- try{
- return this.entity.GetEntity().GetColumn(this.property.ColumnName);
- }catch {
- return undefined;
- }
- }
-}
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, Input } from '@angular/core';
+
+import { IClientProperty, IEntityColumn, TypedEntity, ValType } from 'imx-qbm-dbts';
+
+@Component({
+ selector: 'imx-data-table-cell',
+ templateUrl: './data-table-cell.component.html',
+ styleUrls: ['./data-table-cell.component.scss']
+})
+export class DataTableCellComponent {
+
+ public readonly ValType = ValType;
+
+ @Input() public entity: TypedEntity;
+ @Input() public property: IClientProperty;
+
+
+ public get column(): IEntityColumn{
+ try{
+ return this.entity.GetEntity().GetColumn(this.property.ColumnName);
+ }catch {
+ return undefined;
+ }
+ }
+}
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
index 35197df87..73f57bd78 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
td.mat-cell,
th.mat-header-cell {
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
index da247d23e..0bf64f46e 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
index 20bbd6172..dba35c5cf 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
index 12433ae92..16694cef1 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
@@ -1,6 +1,6 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
div[subtitle] {
font-size: smaller;
color: $black-9;
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
index 545131091..b929494d0 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
index 343da17cc..2ecd65f0c 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
index b8bfb0b8c..22b28f539 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
index 96b455be3..28f5811f6 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
index eeea30fbd..9f82e0870 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
index a97fc8295..dfe0b3d77 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
index 45d1e271e..d769c83b9 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
@@ -1,5 +1,5 @@
/* You can add styles to this file, and also import other style files */
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
overflow-y: auto;
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
index e9fc72bdd..411afa2d9 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
index 45dd8cceb..3d0aa090f 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -324,7 +324,7 @@ export class DataTableComponent implements OnChanges, AfterViewInit, OnDestro
*/
public async ngOnChanges(changes: SimpleChanges): Promise {
- if (changes.mode && changes.mode.currentValue) {
+ if (changes['mode'] && changes['mode'].currentValue) {
if (this.mode === 'auto') {
if (this.dst.dataSourceChanged && this.columnDefs) {
this.columnDefs.forEach(colDef => this.table.removeColumnDef(colDef));
@@ -332,7 +332,7 @@ export class DataTableComponent implements OnChanges, AfterViewInit, OnDestro
}
}
- if (changes.dst && changes.dst.currentValue) {
+ if (changes['dst'] && changes['dst'].currentValue) {
this.subscriptions.push(this.dst.settingsChanged.subscribe(async (value: DataSourceToolbarSettings) => {
if (this.dst.dataSourceHasChanged) {
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
index 19fcaf85b..cf1a0709f 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
index 181e6d040..1f4c05d2a 100644
--- a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
index 0eab5cc21..d48f05bcd 100644
--- a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts b/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
index 21f6e3892..402dc5e1f 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -31,7 +31,8 @@ import { TypedEntity } from 'imx-qbm-dbts';
*/
export interface DataTileMenuItem {
name: string;
- description: string;
+ description?: string;
typedEntity?: TypedEntity;
- tileSelected?: boolean
+ tileSelected?: boolean;
+ useOnDisabledTile?: boolean;
}
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
index e6faaebc6..ad4091763 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
@@ -35,8 +35,8 @@
[matTooltip]="getTitleDisplayValue(subtitleObject.ColumnName)">
{{getTitleDisplayValue(subtitleObject.ColumnName)}}
-
+
{{getAdditionalColumnText()}}
@@ -49,14 +49,16 @@
-
+
-
-
+
+
{{'#LDS#Selected item' |translate}}:
{{currentlySelectedFilter[0].GetColumn('LongDisplay').GetValue()}}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
index ade7e91ce..c8dcdd2b2 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.scss
@@ -1,10 +1,21 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
display: flex;
flex-direction: column;
flex: 1 1 auto;
overflow: hidden;
- padding-bottom: 15px;
+ height: 100%;
+
+ ::ng-deep .mat-list-base {
+ .mat-list-item.imx-list-item {
+ height: auto;
+ }
+ }
+
+ ::ng-deep .mat-menu-panel {
+ padding: 10px;
+ max-width: 500px;
+ }
}
.imx-dialog-content {
@@ -25,10 +36,6 @@
}
}
-::ng-deep .mat-menu-panel {
- padding: 10px;
- max-width: 500px;
-}
.imx-badge {
background-color: $white;
@@ -42,8 +49,3 @@
margin: 5px 0;
}
-::ng-deep .mat-list-base {
- .mat-list-item.imx-list-item {
- height: auto;
- }
-}
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
index 5acdeb03e..05ffe23a7 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
index b18426e64..78adc77fa 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/filter-tree/filter-tree.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
index bef062d61..fb3d022e1 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
index aa384e995..b7af746a8 100644
--- a/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
+++ b/imxweb/projects/qbm/src/lib/data-source-toolbar/selection-model-wrapper.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
index 187157ab1..4c8df586b 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-additional-info.model.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
index 87b037e78..6b6a5c5ee 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.html
@@ -1,6 +1,6 @@
-
- {{ property.Type === ValType.Date
- ? (column?.GetValue() | shortDate )
- : column?.GetDisplayValue()
- }}
+
+ {{ property.Type === ValType.Date
+ ? (column?.GetValue() | shortDate )
+ : column?.GetDisplayValue()
+ }}
\ No newline at end of file
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
index c30ad72fe..b5f928f65 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
index c566e9472..e195fda41 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-cell/data-table-cell.component.ts
@@ -1,51 +1,51 @@
-/*
- * ONE IDENTITY LLC. PROPRIETARY INFORMATION
- *
- * This software is confidential. One Identity, LLC. or one of its affiliates or
- * subsidiaries, has supplied this software to you under terms of a
- * license agreement, nondisclosure agreement or both.
- *
- * You may not copy, disclose, or use this software except in accordance with
- * those terms.
- *
- *
- * Copyright 2021 One Identity LLC.
- * ALL RIGHTS RESERVED.
- *
- * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
- * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
- * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
- * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
- * THIS SOFTWARE OR ITS DERIVATIVES.
- *
- */
-
-import { Component, Input } from '@angular/core';
-
-import { IClientProperty, IEntityColumn, TypedEntity, ValType } from 'imx-qbm-dbts';
-
-@Component({
- selector: 'imx-data-table-cell',
- templateUrl: './data-table-cell.component.html',
- styleUrls: ['./data-table-cell.component.scss']
-})
-export class DataTableCellComponent {
-
- public readonly ValType = ValType;
-
- @Input() public entity: TypedEntity;
- @Input() public property: IClientProperty;
-
-
- public get column(): IEntityColumn{
- try{
- return this.entity.GetEntity().GetColumn(this.property.ColumnName);
- }catch {
- return undefined;
- }
- }
-}
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, Input } from '@angular/core';
+
+import { IClientProperty, IEntityColumn, TypedEntity, ValType } from 'imx-qbm-dbts';
+
+@Component({
+ selector: 'imx-data-table-cell',
+ templateUrl: './data-table-cell.component.html',
+ styleUrls: ['./data-table-cell.component.scss']
+})
+export class DataTableCellComponent {
+
+ public readonly ValType = ValType;
+
+ @Input() public entity: TypedEntity;
+ @Input() public property: IClientProperty;
+
+
+ public get column(): IEntityColumn{
+ try{
+ return this.entity.GetEntity().GetColumn(this.property.ColumnName);
+ }catch {
+ return undefined;
+ }
+ }
+}
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
index 35197df87..73f57bd78 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
td.mat-cell,
th.mat-header-cell {
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
index da247d23e..0bf64f46e 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
index 20bbd6172..dba35c5cf 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-column.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
index 12433ae92..16694cef1 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.scss
@@ -1,6 +1,6 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
div[subtitle] {
font-size: smaller;
color: $black-9;
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
index 545131091..b929494d0 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
index 343da17cc..2ecd65f0c 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-display-cell/data-table-display-cell.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
index b8bfb0b8c..22b28f539 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
index 96b455be3..28f5811f6 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-generic-column.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
index eeea30fbd..9f82e0870 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-groups.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts b/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
index a97fc8295..dfe0b3d77 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table-row-highlight.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss b/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
index 45d1e271e..d769c83b9 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.scss
@@ -1,5 +1,5 @@
/* You can add styles to this file, and also import other style files */
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
overflow-y: auto;
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
index e9fc72bdd..411afa2d9 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
index 45dd8cceb..3d0aa090f 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -324,7 +324,7 @@ export class DataTableComponent implements OnChanges, AfterViewInit, OnDestro
*/
public async ngOnChanges(changes: SimpleChanges): Promise {
- if (changes.mode && changes.mode.currentValue) {
+ if (changes['mode'] && changes['mode'].currentValue) {
if (this.mode === 'auto') {
if (this.dst.dataSourceChanged && this.columnDefs) {
this.columnDefs.forEach(colDef => this.table.removeColumnDef(colDef));
@@ -332,7 +332,7 @@ export class DataTableComponent implements OnChanges, AfterViewInit, OnDestro
}
}
- if (changes.dst && changes.dst.currentValue) {
+ if (changes['dst'] && changes['dst'].currentValue) {
this.subscriptions.push(this.dst.settingsChanged.subscribe(async (value: DataSourceToolbarSettings) => {
if (this.dst.dataSourceHasChanged) {
diff --git a/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts b/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
index 19fcaf85b..cf1a0709f 100644
--- a/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/data-table.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
index 181e6d040..1f4c05d2a 100644
--- a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
index 0eab5cc21..d48f05bcd 100644
--- a/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
+++ b/imxweb/projects/qbm/src/lib/data-table/selection-list/selection-list.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts b/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
index 21f6e3892..402dc5e1f 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile-menu-item.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -31,7 +31,8 @@ import { TypedEntity } from 'imx-qbm-dbts';
*/
export interface DataTileMenuItem {
name: string;
- description: string;
+ description?: string;
typedEntity?: TypedEntity;
- tileSelected?: boolean
+ tileSelected?: boolean;
+ useOnDisabledTile?: boolean;
}
diff --git a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
index e6faaebc6..ad4091763 100644
--- a/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
+++ b/imxweb/projects/qbm/src/lib/data-tiles/data-tile.component.html
@@ -35,8 +35,8 @@
[matTooltip]="getTitleDisplayValue(subtitleObject.ColumnName)">
{{getTitleDisplayValue(subtitleObject.ColumnName)}}
-
+
@@ -49,14 +49,16 @@
{{getAdditionalColumnText()}}
+
-
-
-
\ No newline at end of file
+
diff --git a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.scss b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.scss
index 0c0c8a93f..f52274a0d 100644
--- a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.scss
+++ b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
overflow-y: auto;
display: flex;
@@ -35,7 +35,7 @@
.justify-start {
margin-right: auto;
}
-
+
.imx-badge {
background-color: unset;
}
diff --git a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.spec.ts b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.spec.ts
index b430aa25b..0bb308a95 100644
--- a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.ts b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.ts
index 3b7f901f0..29c226925 100644
--- a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.ts
+++ b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.module.ts b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.module.ts
index 8b251f33d..cbfbbe62e 100644
--- a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.module.ts
+++ b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-advanced-picker.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.spec.ts b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.spec.ts
index d64b85e83..2c614e3eb 100644
--- a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.ts b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.ts
index bc4981c7c..9b8e4c373 100644
--- a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.ts
+++ b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidate-entity-builder.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidates-data.interface.ts b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidates-data.interface.ts
index 5b43a322d..4cfe8154e 100644
--- a/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidates-data.interface.ts
+++ b/imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-candidates/fk-candidates-data.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -30,7 +30,6 @@ export interface FkCandidatesData {
get: (parameters: CollectionLoadParameters) => Promise
-
{{ product.name }}
{{ appConfig?.Config?.Title }}
diff --git a/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.scss b/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.scss
index 30fce0804..15c0fb407 100644
--- a/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.scss
+++ b/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.scss
@@ -1,10 +1,11 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
.imx-masthead-app-name {
display: inline-block;
margin-left: 10px;
margin-right: 5px;
+ cursor: pointer;
}
.imx-masthead-space {
@@ -39,4 +40,5 @@
margin-left: -16px;
max-height: 50px;
max-width: 300px;
-}
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.spec.ts b/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.spec.ts
index 8dfdeb190..478df3b68 100644
--- a/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.ts b/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.ts
index bcd711721..b8fa43ca6 100644
--- a/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.ts
+++ b/imxweb/projects/qbm/src/lib/mast-head/mast-head.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -103,11 +103,23 @@ import { ConfirmationService } from '../confirmation/confirmation.service';
})
export class MastHeadComponent implements OnDestroy {
- public sessionState: ISessionState;
- private readonly subscriptions: Subscription[] = [];
+ public get hasDocumentationConfig(): boolean {
+ return !!this.appConfig.Config.LocalDocPath;
+ }
+ public get isMobile(): boolean {
+ return document.body.offsetWidth <= 768;
+ }
+
+ public get isAuthenticated(): boolean {
+ return this.sessionState?.IsLoggedIn;
+ }
+
+ public sessionState: ISessionState;
public logoUrl: string;
+ private readonly subscriptions: Subscription[] = [];
+
constructor(
public readonly appConfig: AppConfigService,
private readonly router: Router,
@@ -130,18 +142,6 @@ export class MastHeadComponent implements OnDestroy {
});
}
- public get hasDocumentationConfig(): boolean {
- return !!this.appConfig.Config.LocalDocPath;
- }
-
- public get isMobile(): boolean {
- return document.body.offsetWidth <= 768;
- }
-
- public get isAuthenticated(): boolean {
- return this.sessionState?.IsLoggedIn;
- }
-
public ngOnDestroy(): void {
this.subscriptions.forEach(s => s.unsubscribe());
}
@@ -154,8 +154,8 @@ export class MastHeadComponent implements OnDestroy {
}
/**
- * Opens the About view.
- */
+ * Opens the About view.
+ */
public openAboutDialog(): void {
this.dialog.open(AboutComponent, { panelClass: 'imx-AboutPanel' });
}
diff --git a/imxweb/projects/qbm/src/lib/mast-head/mast-head.module.ts b/imxweb/projects/qbm/src/lib/mast-head/mast-head.module.ts
index b62a152cd..c644f687c 100644
--- a/imxweb/projects/qbm/src/lib/mast-head/mast-head.module.ts
+++ b/imxweb/projects/qbm/src/lib/mast-head/mast-head.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.spec.ts b/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.spec.ts
index aefa25b1d..b9f783e29 100644
--- a/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.ts b/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.ts
index 05dccbc31..7a828f603 100644
--- a/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.ts
+++ b/imxweb/projects/qbm/src/lib/mast-head/mast-head.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.scss b/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.scss
index 3a0f67961..ae0d0e492 100644
--- a/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.scss
+++ b/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.scss
@@ -1,3 +1,4 @@
+@use '@angular/material' as mat;
@import "variables.scss";
$headerheight: 43;
@@ -34,7 +35,7 @@ $headerheight: 43;
}
.imx-mdc-detail {
- background: none repeat scroll 0 0 mat-color($asher-gray-palette, 900);
+ background: none repeat scroll 0 0 mat.get-color-from-palette($asher-gray-palette, 900);
border-width: 0;
display: block;
position: absolute;
diff --git a/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.spec.ts b/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.spec.ts
index 101321937..70cc3e908 100644
--- a/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.ts b/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.ts
index 67f372a33..aadac6702 100644
--- a/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.ts
+++ b/imxweb/projects/qbm/src/lib/master-detail/master-detail.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu-item/group-menu-item.ts b/imxweb/projects/qbm/src/lib/menu/menu-item/group-menu-item.ts
index a4d4efe20..1ffb95d5a 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu-item/group-menu-item.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu-item/group-menu-item.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.interface.ts b/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.interface.ts
index 278892e84..f7f12a300 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.interface.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.interface.ts
@@ -1,3 +1,4 @@
+import { ProjectConfig } from 'imx-api-qbm';
import { NavigationCommandsMenuItem } from './navigation-commands-menu-item.interface';
/*
@@ -11,7 +12,7 @@ import { NavigationCommandsMenuItem } from './navigation-commands-menu-item.inte
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -54,4 +55,4 @@ export interface MenuItem {
}
-export type MenuFactory = (preProps: string[], groups: string[]) => MenuItem;
+export type MenuFactory = (preProps: string[], groups: string[], projectConfig: ProjectConfig) => MenuItem;
diff --git a/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.spec.ts b/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.spec.ts
index ff6856af5..61c05d6d9 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.spec.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu-item/menu-item.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-commands-menu-item.interface.ts b/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-commands-menu-item.interface.ts
index 644785b6e..e0161d4d6 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-commands-menu-item.interface.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-commands-menu-item.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-menu-item.ts b/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-menu-item.ts
index b2827bbff..57fac921b 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-menu-item.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu-item/navigation-menu-item.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu-item/related-application-menu-item.ts b/imxweb/projects/qbm/src/lib/menu/menu-item/related-application-menu-item.ts
index 6315de1c2..c64f5a5e4 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu-item/related-application-menu-item.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu-item/related-application-menu-item.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu-item/related-application.interface.ts b/imxweb/projects/qbm/src/lib/menu/menu-item/related-application.interface.ts
index bd255893c..af89016d9 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu-item/related-application.interface.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu-item/related-application.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu.component.html b/imxweb/projects/qbm/src/lib/menu/menu.component.html
index 6a0a237cc..6c9d8f2ca 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu.component.html
+++ b/imxweb/projects/qbm/src/lib/menu/menu.component.html
@@ -1,14 +1,13 @@
\ No newline at end of file
+
diff --git a/imxweb/projects/qbm/src/lib/menu/menu.component.scss b/imxweb/projects/qbm/src/lib/menu/menu.component.scss
index a87360e51..ddc8a0178 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu.component.scss
+++ b/imxweb/projects/qbm/src/lib/menu/menu.component.scss
@@ -31,20 +31,26 @@
button.mat-menu-item {
box-sizing: border-box;
}
-
+
button.mat-menu-item:hover,
button.mat-menu-item:focus {
background-color: $white !important;
}
-
+
.mat-tab-nav-bar {
background-color: $white;
-
+
.mat-tab-link {
font-size: 16px;
color: $black-6;
}
}
+
+ .imx-mein-menu-item {
+ font-size: 16px;
+ padding: 10px 24px 10px 24px;
+ color: $black-7;
+ }
}
diff --git a/imxweb/projects/qbm/src/lib/menu/menu.component.spec.ts b/imxweb/projects/qbm/src/lib/menu/menu.component.spec.ts
index 8e9871606..6bfd35bc3 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu.component.ts b/imxweb/projects/qbm/src/lib/menu/menu.component.ts
index 7b12edf39..fb67ba875 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu.component.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu.module.ts b/imxweb/projects/qbm/src/lib/menu/menu.module.ts
index 16ca252b9..e6e82cf54 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu.module.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -29,21 +29,15 @@ import { CommonModule } from '@angular/common';
import { MatMenuModule } from '@angular/material/menu';
import { MatTabsModule } from '@angular/material/tabs';
import { TranslateModule } from '@ngx-translate/core';
+import { MatButtonModule } from '@angular/material/button';
import { MenuComponent } from './menu.component';
import { MenuService } from './menu.service';
@NgModule({
declarations: [MenuComponent],
- imports: [
- CommonModule,
- MatMenuModule,
- MatTabsModule,
- TranslateModule
- ],
+ imports: [CommonModule, MatMenuModule, MatTabsModule, MatButtonModule, TranslateModule],
exports: [MenuComponent],
- providers: [
- MenuService
- ]
+ providers: [MenuService],
})
-export class MenuModule { }
+export class MenuModule {}
diff --git a/imxweb/projects/qbm/src/lib/menu/menu.service.spec.ts b/imxweb/projects/qbm/src/lib/menu/menu.service.spec.ts
index ff8de9dd5..19775b3e6 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/menu/menu.service.ts b/imxweb/projects/qbm/src/lib/menu/menu.service.ts
index d5ad5893e..4b5e20209 100644
--- a/imxweb/projects/qbm/src/lib/menu/menu.service.ts
+++ b/imxweb/projects/qbm/src/lib/menu/menu.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -25,6 +25,7 @@
*/
import { Injectable } from '@angular/core';
+import { ProjectConfig } from 'imx-api-qbm';
import { MenuFactory, MenuItem } from './menu-item/menu-item.interface';
@@ -42,11 +43,15 @@ export class MenuService {
this.factories = [];
}
- public getMenuItems(preProps: string[], groups: string[], allowEmpty: boolean = false): MenuItem[] {
+ public getMenuItems(
+ preProps: string[],
+ groups: string[],
+ allowEmpty: boolean = false,
+ projectConfig?: ProjectConfig): MenuItem[] {
const menuItems: MenuItem[] = [];
this.factories
- .map(factory => factory(preProps, groups))
+ .map(factory => factory(preProps, groups, projectConfig))
.filter(menu => menu && (allowEmpty || (menu.items && menu.items.length > 0)))
.sort((item1, item2) => this.compareMenuItems(item1, item2))
.forEach(menu => {
diff --git a/imxweb/projects/qbm/src/lib/message-dialog/message-dialog-result.enum.ts b/imxweb/projects/qbm/src/lib/message-dialog/message-dialog-result.enum.ts
index ed6884764..a583605f5 100644
--- a/imxweb/projects/qbm/src/lib/message-dialog/message-dialog-result.enum.ts
+++ b/imxweb/projects/qbm/src/lib/message-dialog/message-dialog-result.enum.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.spec.ts b/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.spec.ts
index 2cace2895..0ebac430f 100644
--- a/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.ts b/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.ts
index 262336de1..0a2ccd520 100644
--- a/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.ts
+++ b/imxweb/projects/qbm/src/lib/message-dialog/message-dialog.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/message-dialog/message-parameter.interface.ts b/imxweb/projects/qbm/src/lib/message-dialog/message-parameter.interface.ts
index 5b39a2eb8..89f6a6844 100644
--- a/imxweb/projects/qbm/src/lib/message-dialog/message-parameter.interface.ts
+++ b/imxweb/projects/qbm/src/lib/message-dialog/message-parameter.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/model-css/model-css.service.ts b/imxweb/projects/qbm/src/lib/model-css/model-css.service.ts
index e9071cb05..309cff756 100644
--- a/imxweb/projects/qbm/src/lib/model-css/model-css.service.ts
+++ b/imxweb/projects/qbm/src/lib/model-css/model-css.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.scss b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.scss
index 7e8805a2d..870fe633f 100644
--- a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.scss
+++ b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
margin-top: 10px;
@@ -28,7 +28,7 @@
min-width: 280px;
flex: 1;
margin-bottom: 10px;
- }
+ }
}
.imx-multi-select-formcontrol-container {
@@ -97,9 +97,9 @@ eui-icon {
}
-@media only screen and (max-width: 1024px) {
+@media only screen and (max-width: 1024px) {
:host > div {
grid-column-start: 1;
grid-column-end: 4;
- }
+ }
}
diff --git a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.spec.ts b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.spec.ts
index 7e4f88c7b..fb7fab847 100644
--- a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.ts b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.ts
index 9a7bb0cbb..077e69d1d 100644
--- a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.ts
+++ b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.module.ts b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.module.ts
index 790267909..b753d7612 100644
--- a/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.module.ts
+++ b/imxweb/projects/qbm/src/lib/multi-select-formcontrol/multi-select-formcontrol.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/multi-value/multi-value.module.ts b/imxweb/projects/qbm/src/lib/multi-value/multi-value.module.ts
index 6472dc1d9..f0c6c6862 100644
--- a/imxweb/projects/qbm/src/lib/multi-value/multi-value.module.ts
+++ b/imxweb/projects/qbm/src/lib/multi-value/multi-value.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.spec.ts b/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.spec.ts
index ab1a97ca9..85a7dc6a3 100644
--- a/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.ts b/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.ts
index 13cb5ef9a..38fe425de 100644
--- a/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.ts
+++ b/imxweb/projects/qbm/src/lib/multi-value/multi-value.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history-api.service.ts b/imxweb/projects/qbm/src/lib/object-history/object-history-api.service.ts
index cf5f9d4e6..610b57681 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history-api.service.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history-api.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.spec.ts b/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.spec.ts
index d6ee1b517..a6163879b 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.ts b/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.ts
index d07d447e3..cdc4db3ee 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history-gridview/object-history-gridview.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.spec.ts b/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.spec.ts
index a3ec2f8de..c464e1ae4 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.ts b/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.ts
index 4ad55ff77..4b87e7f44 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history-timeline/object-history-timeline.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -63,7 +63,7 @@ export class ObjectHistoryTimelineComponent implements OnChanges {
}
public ngOnChanges(changes: SimpleChanges): void {
- if (changes && changes.historyData) {
+ if (changes && changes['historyData']) {
this.timeline.setDateRange(this.getDate('min'), this.getDate('max'), false);
this.refresh(this.historyData);
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history.component.scss b/imxweb/projects/qbm/src/lib/object-history/object-history.component.scss
index 4b1d8066a..12dcf910e 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history.component.scss
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
display: flex;
@@ -40,4 +40,4 @@
.imx-viewmode-content-timeline {
overflow: auto;
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history.component.spec.ts b/imxweb/projects/qbm/src/lib/object-history/object-history.component.spec.ts
index 3a8b284d2..458aee8e6 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history.component.ts b/imxweb/projects/qbm/src/lib/object-history/object-history.component.ts
index 604a85ff2..5175fd160 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history.component.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history.module.ts b/imxweb/projects/qbm/src/lib/object-history/object-history.module.ts
index 9a5c5e1fd..2b7a7e34a 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history.module.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-history/object-history.service.ts b/imxweb/projects/qbm/src/lib/object-history/object-history.service.ts
index 49ab7166b..ca3f74103 100644
--- a/imxweb/projects/qbm/src/lib/object-history/object-history.service.ts
+++ b/imxweb/projects/qbm/src/lib/object-history/object-history.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.spec.ts b/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.spec.ts
index 79c02914f..61a3e3ae8 100644
--- a/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.ts b/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.ts
index c52e7d167..e0caab85c 100644
--- a/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.ts
+++ b/imxweb/projects/qbm/src/lib/object-sheet/navigation.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/object-sheet/object-sheet.interface.ts b/imxweb/projects/qbm/src/lib/object-sheet/object-sheet.interface.ts
index 993818285..f746eac2e 100644
--- a/imxweb/projects/qbm/src/lib/object-sheet/object-sheet.interface.ts
+++ b/imxweb/projects/qbm/src/lib/object-sheet/object-sheet.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.component.ts b/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.component.ts
index 62e637be3..317b403f2 100644
--- a/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.component.ts
+++ b/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.module.ts b/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.module.ts
index c779244a3..8803006c4 100644
--- a/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.module.ts
+++ b/imxweb/projects/qbm/src/lib/ordered-list/ordered-list.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameter-replacement.interface.ts b/imxweb/projects/qbm/src/lib/parameterized-text/parameter-replacement.interface.ts
index d9a2734ed..27b6160d3 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameter-replacement.interface.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameter-replacement.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.html b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.html
index f1a6c7da1..302634871 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.html
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.html
@@ -1,4 +1,4 @@
-
+
{{ textToken.value }}
{{ textToken.value }}
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.scss b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.scss
new file mode 100644
index 000000000..df55d109f
--- /dev/null
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.scss
@@ -0,0 +1,11 @@
+:host {
+ display: flex;
+ flex-direction: column;
+ flex: 1 1 auto;
+ overflow: hidden;
+}
+
+.imx-parameter-container {
+ word-wrap: break-word;
+}
+
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.spec.ts b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.spec.ts
index e944bb096..5665fe17f 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.ts b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.ts
index 38a157175..6d1a6bedb 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -32,7 +32,8 @@ import { TextToken } from './text-token.interface';
@Component({
selector: 'imx-parameterized-text',
- templateUrl: './parameterized-text.component.html'
+ templateUrl: './parameterized-text.component.html',
+ styleUrls: ['./parameterized-text.component.scss']
})
export class ParameterizedTextComponent implements OnInit {
public textTokens: TextToken[];
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.interface.ts b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.interface.ts
index 2e7f77fd9..9b819da72 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.interface.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.module.ts b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.module.ts
index 458269154..35718c406 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.module.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.spec.ts b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.spec.ts
index 2bd2eb6d0..f94dfacf0 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.ts b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.ts
index d0dd45b9c..24a92011d 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/parameterized-text.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/parameterized-text/text-token.interface.ts b/imxweb/projects/qbm/src/lib/parameterized-text/text-token.interface.ts
index 6372d46ce..1d61cdf3d 100644
--- a/imxweb/projects/qbm/src/lib/parameterized-text/text-token.interface.ts
+++ b/imxweb/projects/qbm/src/lib/parameterized-text/text-token.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/plugins/plugin-loader.service.ts b/imxweb/projects/qbm/src/lib/plugins/plugin-loader.service.ts
index 52e82cdb5..20fa20c58 100644
--- a/imxweb/projects/qbm/src/lib/plugins/plugin-loader.service.ts
+++ b/imxweb/projects/qbm/src/lib/plugins/plugin-loader.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -24,14 +24,14 @@
*
*/
-import { Injectable, Compiler, Injector, isDevMode } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { Injectable, Injector, isDevMode, createNgModuleRef } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
import { NodeAppInfo, PlugInLib } from 'imx-api-qbm';
import { imx_SessionService } from '../session/imx-session.service';
import { ClassloggerService } from '../classlogger/classlogger.service';
-import { AppConfig } from '../appConfig/appConfig.interface';
+import { AppConfig } from '../appConfig/appconfig.interface';
import * as AngularCore from '@angular/core';
import * as AngularCommon from '@angular/common';
@@ -91,6 +91,8 @@ import * as ElementUICore from '@elemental-ui/core';
import * as Rxjs from 'rxjs';
import * as RxjsOperators from 'rxjs/operators';
import * as BillboardJs from 'billboard.js';
+import * as tslibModule from 'tslib';
+import * as MomentTimezone from 'moment-timezone';
declare var SystemJS: any;
@@ -105,14 +107,28 @@ export class PluginLoaderService {
private readonly session: imx_SessionService,
private readonly logger: ClassloggerService,
private readonly httpClient: HttpClient,
- private readonly compiler: Compiler,
private readonly injector: Injector
- ) { }
+ ) {
+ SystemJS.config({
+ meta: {
+ '*.mjs': {
+ babelOptions: {
+ es2015: false
+ }
+ }
+ },
+ map: {
+ 'plugin-babel': 'systemjs-plugin-babel/plugin-babel.js',
+ 'systemjs-babel-build': 'systemjs-plugin-babel/systemjs-babel-browser.js',
+ },
+ transpiler: 'plugin-babel',
+ });
+ }
public async loadModules(appName: string): Promise {
const apps: NodeAppInfo[] = await this.session.Client.imx_applications_get();
- this.appInfo = apps.filter(app => app.Name === appName)[0];
+ this.appInfo = apps.filter((app) => app.Name === appName)[0];
this.logger.debug(this, `▶️ Found config section for ${this.appInfo.DisplayName}`);
@@ -123,47 +139,54 @@ export class PluginLoaderService {
this.logger.debug(this, `▶️ Found ${this.appInfo.PlugIns.length} plugin(s)`);
- const host = window.location.pathname.split('html')[0].slice(0, -1);
+ const host = window.location.href.split('html')[0];
this.logger.debug(this, `💻 Host: ${host} `);
let config: AppConfig;
if (!isDevMode()) {
config = (await this.httpClient.get('appconfig.json').toPromise()) as AppConfig;
+ this.importDependencies();
this.logger.debug(this, '▶️ Config. PROD mode.', config);
}
+ let moduleList = [];
+
for (const plugin of this.appInfo.PlugIns) {
- let container: any;
this.logger.debug(this, `⚙️ Plugin: ${plugin.Container}`);
try {
if (isDevMode()) {
this.logger.debug(this, '▶️ Importing module. DEV mode.');
- container = await import(`html/${plugin.Container}/fesm2015/${plugin.Container}.js`);
+ moduleList.push(import(`html/${plugin.Container}/fesm2015/${plugin.Container}.mjs`));
} else {
this.logger.debug(this, '▶️ Importing module. PROD mode.');
- const pluginUrl = `${host}/html/${plugin.Container}/bundles/${plugin.Container}.umd.js`;
- container =
- await this.importProdMode(pluginUrl);
+ moduleList.push(SystemJS.import(`${host}html/${plugin.Container}/fesm2015/${plugin.Container}.mjs`));
}
- this.logger.debug(this, '▶️ Compiling module');
- const module = await this.compiler.compileModuleAndAllComponentsAsync(container[plugin.Name]);
-
- this.logger.debug(this, '▶️ Creating module instance');
- const elementModuleRef = module.ngModuleFactory.create(this.injector);
-
- this.logger.debug(this, '▶️ Instance ready');
- this.plugins.push(elementModuleRef.instance);
+ this.plugins.push(plugin);
} catch (e) {
this.logger.error(this, `💥 Loading of ${plugin.Name} (${plugin.Container}) failed with the following error: ${e.message}`);
}
+ }
+ let modules = await Promise.allSettled(moduleList);
+ for (let i = 0; i < modules.length; i++) {
+ try {
+ let m = modules[i] as any;
+ let module = m.value[this.plugins[i].Name as any];
+ createNgModuleRef(module, this.injector);
+ this.logger.debug(this, '▶️ Instance ready');
+ } catch (e) {
+ this.logger.error(
+ this,
+ `💥 Loading of ${this.plugins[i].Name} (${this.plugins[i].Container}) failed with the following error: ${e.message}`
+ );
+ }
}
}
- private async importProdMode(url: string): Promise {
+ private importDependencies(): void {
// Angular Modules
SystemJS.set('@angular/core', SystemJS.newModule(AngularCore));
SystemJS.set('@angular/common', SystemJS.newModule(AngularCommon));
@@ -225,11 +248,11 @@ export class PluginLoaderService {
SystemJS.set('rxjs', SystemJS.newModule(Rxjs));
SystemJS.set('rxjs/operators', SystemJS.newModule(RxjsOperators));
SystemJS.set('billboard.js', SystemJS.newModule(BillboardJs));
+ SystemJS.set('tslib', SystemJS.newModule(tslibModule));
+ SystemJS.set('moment-timezone', SystemJS.newModule(MomentTimezone));
// Our stuff
SystemJS.set('imx-qbm-dbts', SystemJS.newModule(QBMDBTS));
SystemJS.set('@elemental-ui/core', SystemJS.newModule(ElementUICore));
-
- return SystemJS.import(url);
}
}
diff --git a/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.spec.ts b/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.spec.ts
index 31d6374f3..132974419 100644
--- a/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.ts b/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.ts
index 767802576..30e5920ee 100644
--- a/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.ts
+++ b/imxweb/projects/qbm/src/lib/progressbar/progressbar.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/qbm.module.ts b/imxweb/projects/qbm/src/lib/qbm.module.ts
index d2c799d29..cb9b91412 100644
--- a/imxweb/projects/qbm/src/lib/qbm.module.ts
+++ b/imxweb/projects/qbm/src/lib/qbm.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -104,6 +104,8 @@ import { RouteGuardService } from './route-guard/route-guard.service';
import { ClassloggerService } from './classlogger/classlogger.service';
import { AuthenticationGuardService } from './authentication/authentication-guard.service';
import { JobQueueOverviewModule } from './jobqueue-overview/jobqueue-overview.module';
+import { PluginLoaderService } from './plugins/plugin-loader.service';
+import { HttpClientModule } from '@angular/common/http';
export function initApp(registry: CdrRegistryService, resolver: ComponentFactoryResolver, logger: NGXLogger): () => Promise {
logger.debug('init qbm');
@@ -141,6 +143,7 @@ const routes: Routes = [
imports: [
CommonModule,
RouterModule.forChild(routes),
+ HttpClientModule,
TranslateModule,
DisableControlModule,
ExtModule,
@@ -199,7 +202,8 @@ const routes: Routes = [
ImxTreeTableComponent,
TwoFactorAuthenticationService,
ApiClientAngularService,
- TableImageService
+ TableImageService,
+ PluginLoaderService
],
exports: [
TwoFactorAuthenticationComponent,
diff --git a/imxweb/projects/qbm/src/lib/route-guard/component-can-deactivate.interface.ts b/imxweb/projects/qbm/src/lib/route-guard/component-can-deactivate.interface.ts
index 859e553c5..b07c800bd 100644
--- a/imxweb/projects/qbm/src/lib/route-guard/component-can-deactivate.interface.ts
+++ b/imxweb/projects/qbm/src/lib/route-guard/component-can-deactivate.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/route-guard/route-guard.module.ts b/imxweb/projects/qbm/src/lib/route-guard/route-guard.module.ts
index e3feaad80..db3a78279 100644
--- a/imxweb/projects/qbm/src/lib/route-guard/route-guard.module.ts
+++ b/imxweb/projects/qbm/src/lib/route-guard/route-guard.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.spec.ts b/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.spec.ts
index 20403a21a..c568f3cdb 100644
--- a/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -88,7 +88,10 @@ function createOAuthServiceStub(oauthParameters: string[] = []) {
.createSpy('IsOAuthParameter')
.and.callFake(
(name: string) => oauthParameters.findIndex((param: string) => param === name) > -1
- )
+ ),
+ hasRequiredOAuthParameter: jasmine
+ .createSpy('hasRequiredOAuthParameter')
+ .and.returnValue(true)
};
}
diff --git a/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.ts b/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.ts
index fb5024171..f9475362d 100644
--- a/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.ts
+++ b/imxweb/projects/qbm/src/lib/route-guard/route-guard.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -27,13 +27,10 @@
import { Injectable, ErrorHandler } from '@angular/core';
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router, CanDeactivate } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
-import { MatDialog } from '@angular/material/dialog';
import { imx_SessionService } from '../session/imx-session.service';
import { AppConfigService } from '../appConfig/appConfig.service';
import { ComponentCanDeactivate } from './component-can-deactivate.interface';
-import { MessageDialogComponent } from '../message-dialog/message-dialog.component';
-import { MessageDialogResult } from '../message-dialog/message-dialog-result.enum';
import { OAuthService } from '../authentication/oauth.service';
import { QueryParametersHandler } from '../base/query-parameters-handler';
import { ClassloggerService } from '../classlogger/classlogger.service';
@@ -127,13 +124,14 @@ export class RouteGuardService implements CanActivate, CanDeactivate {
it('can fetch search results', () => {
svc.search('bla', '');
- expect(sessionServiceSpy.Client.opsupport_search_get).toHaveBeenCalledWith('bla', '');
+ expect(sessionServiceSpy.Client.opsupport_search_get).toHaveBeenCalledWith({ term: 'bla', tables: '' });
});
it('can get the list of table for searchfiltering', done => {
diff --git a/imxweb/projects/qbm/src/lib/search/search.service.ts b/imxweb/projects/qbm/src/lib/search/search.service.ts
index d0b9fe3ae..c09c83343 100644
--- a/imxweb/projects/qbm/src/lib/search/search.service.ts
+++ b/imxweb/projects/qbm/src/lib/search/search.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -49,7 +49,7 @@ export class imx_QBM_SearchService implements imx_ISearchService {
public async search(term: string, tables: string): Promise {
if (term === '') { return []; }
try {
- const result = await this.session.Client.opsupport_search_get(term, tables);
+ const result = await this.session.Client.opsupport_search_get({ term: term, tables: tables });
if (result) {
return result.filter((sro: SearchResultObject) => sro.Key != null)
.map((sro: SearchResultObject) => ({
diff --git a/imxweb/projects/qbm/src/lib/searchbar/iSearchService.ts b/imxweb/projects/qbm/src/lib/searchbar/iSearchService.ts
index eeb702e24..97df30384 100644
--- a/imxweb/projects/qbm/src/lib/searchbar/iSearchService.ts
+++ b/imxweb/projects/qbm/src/lib/searchbar/iSearchService.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.scss b/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.scss
index c16e64fd7..1cc5559cb 100644
--- a/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.scss
+++ b/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
$SearchBarWidth: 535px;
$SearchBarHeight: 53px;
diff --git a/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.spec.ts b/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.spec.ts
index bb3591d6d..e4ab1d91f 100644
--- a/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.ts b/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.ts
index a2bf27d7f..79772b400 100644
--- a/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.ts
+++ b/imxweb/projects/qbm/src/lib/searchbar/searchbar.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/autocomplete.component.scss b/imxweb/projects/qbm/src/lib/select/autocomplete.component.scss
index 624f4e21a..260420460 100644
--- a/imxweb/projects/qbm/src/lib/select/autocomplete.component.scss
+++ b/imxweb/projects/qbm/src/lib/select/autocomplete.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
width: 100%;
diff --git a/imxweb/projects/qbm/src/lib/select/autocomplete.component.spec.ts b/imxweb/projects/qbm/src/lib/select/autocomplete.component.spec.ts
index 62ff6d1c3..1cb7137d0 100644
--- a/imxweb/projects/qbm/src/lib/select/autocomplete.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/select/autocomplete.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/autocomplete.component.ts b/imxweb/projects/qbm/src/lib/select/autocomplete.component.ts
index b71fbdad9..18cffcb2b 100644
--- a/imxweb/projects/qbm/src/lib/select/autocomplete.component.ts
+++ b/imxweb/projects/qbm/src/lib/select/autocomplete.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -131,7 +131,7 @@ export class AutocompleteComponent implements AfterViewInit, OnChanges {
public ngOnChanges(changes: SimpleChanges): void {
- if (changes.items && changes.items.currentValue) {
+ if (changes['items'] && changes['items'].currentValue) {
this.dataSource.setData(this.items);
if (this.isLocalDatasource) {
diff --git a/imxweb/projects/qbm/src/lib/select/check-match.validator.ts b/imxweb/projects/qbm/src/lib/select/check-match.validator.ts
index 1feaea8d5..30ed18e2c 100644
--- a/imxweb/projects/qbm/src/lib/select/check-match.validator.ts
+++ b/imxweb/projects/qbm/src/lib/select/check-match.validator.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/data-navigation-parameters.interface.ts b/imxweb/projects/qbm/src/lib/select/data-navigation-parameters.interface.ts
index 8e204d3c7..a320dfae1 100644
--- a/imxweb/projects/qbm/src/lib/select/data-navigation-parameters.interface.ts
+++ b/imxweb/projects/qbm/src/lib/select/data-navigation-parameters.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/fk-selection-container.ts b/imxweb/projects/qbm/src/lib/select/fk-selection-container.ts
index 954cade41..da37e4aeb 100644
--- a/imxweb/projects/qbm/src/lib/select/fk-selection-container.ts
+++ b/imxweb/projects/qbm/src/lib/select/fk-selection-container.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/select-content-provider.interface.ts b/imxweb/projects/qbm/src/lib/select/select-content-provider.interface.ts
index 89e3bc8f7..6069b5018 100644
--- a/imxweb/projects/qbm/src/lib/select/select-content-provider.interface.ts
+++ b/imxweb/projects/qbm/src/lib/select/select-content-provider.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/select-data-source.ts b/imxweb/projects/qbm/src/lib/select/select-data-source.ts
index 74b057c0f..1d3b9a53c 100644
--- a/imxweb/projects/qbm/src/lib/select/select-data-source.ts
+++ b/imxweb/projects/qbm/src/lib/select/select-data-source.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/select.component.scss b/imxweb/projects/qbm/src/lib/select/select.component.scss
index 9fb147614..c9c4fc2e8 100644
--- a/imxweb/projects/qbm/src/lib/select/select.component.scss
+++ b/imxweb/projects/qbm/src/lib/select/select.component.scss
@@ -1,4 +1,4 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
+@import '@elemental-ui/core/src/styles/_palette.scss';
.mat-form-field {
width: 100%;
diff --git a/imxweb/projects/qbm/src/lib/select/select.component.spec.ts b/imxweb/projects/qbm/src/lib/select/select.component.spec.ts
index 51d1e2916..5abd41dee 100644
--- a/imxweb/projects/qbm/src/lib/select/select.component.spec.ts
+++ b/imxweb/projects/qbm/src/lib/select/select.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/select/select.component.ts b/imxweb/projects/qbm/src/lib/select/select.component.ts
index 466e205bb..8fcada21e 100644
--- a/imxweb/projects/qbm/src/lib/select/select.component.ts
+++ b/imxweb/projects/qbm/src/lib/select/select.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -136,7 +136,7 @@ export class SelectComponent implements AfterViewInit, OnChanges, OnDestroy {
}
public ngOnChanges(changes: SimpleChanges): void {
- if (changes.itemsSelected && changes.itemsSelected.currentValue && this.multi) {
+ if (changes['itemsSelected'] && changes['itemsSelected'].currentValue && this.multi) {
this.originalItemsSelected = this.itemsSelected.slice();
}
}
diff --git a/imxweb/projects/qbm/src/lib/select/select.module.ts b/imxweb/projects/qbm/src/lib/select/select.module.ts
index 0463f6215..f00f170a1 100644
--- a/imxweb/projects/qbm/src/lib/select/select.module.ts
+++ b/imxweb/projects/qbm/src/lib/select/select.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/services/device-state.service.spec.ts b/imxweb/projects/qbm/src/lib/services/device-state.service.spec.ts
index 8647bde84..894477329 100644
--- a/imxweb/projects/qbm/src/lib/services/device-state.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/services/device-state.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/services/device-state.service.ts b/imxweb/projects/qbm/src/lib/services/device-state.service.ts
index 4f1712b30..8225ab9de 100644
--- a/imxweb/projects/qbm/src/lib/services/device-state.service.ts
+++ b/imxweb/projects/qbm/src/lib/services/device-state.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/session/auth-prop-data-provider.interface.ts b/imxweb/projects/qbm/src/lib/session/auth-prop-data-provider.interface.ts
index 4e8092d84..5d194c8cb 100644
--- a/imxweb/projects/qbm/src/lib/session/auth-prop-data-provider.interface.ts
+++ b/imxweb/projects/qbm/src/lib/session/auth-prop-data-provider.interface.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/session/imx-session.service.spec.ts b/imxweb/projects/qbm/src/lib/session/imx-session.service.spec.ts
index b2f9abc17..f17f21b9c 100644
--- a/imxweb/projects/qbm/src/lib/session/imx-session.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/session/imx-session.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/session/imx-session.service.ts b/imxweb/projects/qbm/src/lib/session/imx-session.service.ts
index 9b602dc63..0349bcbb0 100644
--- a/imxweb/projects/qbm/src/lib/session/imx-session.service.ts
+++ b/imxweb/projects/qbm/src/lib/session/imx-session.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -26,7 +26,7 @@
import { Injectable } from '@angular/core';
-import { Client, TypedClient } from 'imx-api-qbm';
+import { TypedClient, V2Client } from 'imx-api-qbm';
import { ISessionState, SessionState } from './session-state';
import { AppConfigService } from '../appConfig/appConfig.service';
import { ClassloggerService } from '../classlogger/classlogger.service';
@@ -36,7 +36,7 @@ export class imx_SessionService {
public get SessionState(): ISessionState {
return this.sessionState;
}
- public get Client(): Client {
+ public get Client(): V2Client {
return this.appConfigService.client;
}
@@ -56,7 +56,9 @@ export class imx_SessionService {
public async login(loginData: { [key: string]: string }): Promise {
this.logger.debug(this, 'login');
- const sr = await this.appConfigService.client.imx_login_post(this.appConfigService.Config.WebAppIndex, false, loginData);
+ const sr = await this.appConfigService.client.imx_login_post(this.appConfigService.Config.WebAppIndex, loginData, {
+ noxsrf: false
+ });
return (this.sessionState = new SessionState(sr));
}
diff --git a/imxweb/projects/qbm/src/lib/session/session-state.spec.ts b/imxweb/projects/qbm/src/lib/session/session-state.spec.ts
index 34d382708..12175c3a9 100644
--- a/imxweb/projects/qbm/src/lib/session/session-state.spec.ts
+++ b/imxweb/projects/qbm/src/lib/session/session-state.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/session/session-state.ts b/imxweb/projects/qbm/src/lib/session/session-state.ts
index 5b419ea4b..b38caad73 100644
--- a/imxweb/projects/qbm/src/lib/session/session-state.ts
+++ b/imxweb/projects/qbm/src/lib/session/session-state.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/settings/settings-service.ts b/imxweb/projects/qbm/src/lib/settings/settings-service.ts
index c287f5e58..f3ad12eee 100644
--- a/imxweb/projects/qbm/src/lib/settings/settings-service.ts
+++ b/imxweb/projects/qbm/src/lib/settings/settings-service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.spec.ts b/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.spec.ts
index d350d0b57..348f500ef 100644
--- a/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.spec.ts
+++ b/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.ts b/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.ts
index 8bd2d45d2..713d4dc8e 100644
--- a/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.ts
+++ b/imxweb/projects/qbm/src/lib/snackbar/snack-bar.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qbm/src/lib/splash/splash.service.spec.ts b/imxweb/projects/qbm/src/lib/splash/splash.service.spec.ts
new file mode 100644
index 000000000..6f43bc586
--- /dev/null
+++ b/imxweb/projects/qbm/src/lib/splash/splash.service.spec.ts
@@ -0,0 +1,86 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { TestBed } from '@angular/core/testing';
+import { EuiSplashScreenService } from '@elemental-ui/core';
+import { configureTestSuite } from 'ng-bullet';
+
+import { SplashService } from './splash.service';
+
+describe('SplashService', () => {
+ let service: SplashService;
+
+ const euiSplashScreenServiceStub = {
+ open: jasmine.createSpy('open'),
+ updateState: jasmine.createSpy('updateState'),
+ close: jasmine.createSpy('close'),
+ };
+
+ configureTestSuite(() => {
+ TestBed.configureTestingModule({
+ providers: [
+ {
+ provide: EuiSplashScreenService,
+ useValue: euiSplashScreenServiceStub
+ },
+ ]
+ });
+ service = TestBed.inject(SplashService);
+ });
+
+ beforeEach(() => {
+ euiSplashScreenServiceStub.open.calls.reset();
+ euiSplashScreenServiceStub.updateState.calls.reset();
+ euiSplashScreenServiceStub.close.calls.reset();
+
+ service = TestBed.get(SplashService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+
+ it('init() should be trigger open() from the EuiSplashScreenService', () => {
+ service.init({ applicationName: 'TestMessage' });
+
+ expect(euiSplashScreenServiceStub.open).toHaveBeenCalledWith(jasmine.objectContaining({
+ applicationName: 'TestMessage'
+ }));
+ });
+
+ it('update() should be trigger updateState() from the EuiSplashScreenService', async() => {
+ await service.update({ applicationName: 'TestMessage' });
+
+ expect(euiSplashScreenServiceStub.updateState).toHaveBeenCalledWith({ applicationName: 'TestMessage' });
+ });
+
+ it('close() should be trigger close() from the EuiSplashScreenService', () => {
+ service.close();
+
+ expect(euiSplashScreenServiceStub.close).toHaveBeenCalled();
+ });
+
+});
diff --git a/imxweb/projects/qbm/src/lib/splash/splash.service.ts b/imxweb/projects/qbm/src/lib/splash/splash.service.ts
new file mode 100644
index 000000000..90458be0a
--- /dev/null
+++ b/imxweb/projects/qbm/src/lib/splash/splash.service.ts
@@ -0,0 +1,64 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+
+import { Injectable } from '@angular/core';
+import { EuiSplashScreenConfig, EuiSplashScreenOptions, EuiSplashScreenService } from '@elemental-ui/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class SplashService {
+
+ private defaultOptions: EuiSplashScreenConfig = {
+ applicationName: 'One Identity Manager',
+ icon: 'oi-horizontal',
+ showSpinner: true,
+ message: 'Loading...'
+ };
+
+ constructor(
+ private readonly splash: EuiSplashScreenService,
+ ) { }
+
+ public init(options: EuiSplashScreenOptions): void {
+ // open splash screen with fix values
+ const config = {
+ ...this.defaultOptions,
+ ...options
+ };
+ this.splash.open(config);
+ }
+
+ public async update(options: EuiSplashScreenOptions): Promise {
+ // update the splash screen and use translated texts and the title from the imxconfig
+ this.splash.updateState(options);
+ }
+
+ public close(): void {
+ this.splash.close();
+ }
+}
diff --git a/imxweb/projects/qbm/src/lib/sqlwizard/SqlNodeView.ts b/imxweb/projects/qbm/src/lib/sqlwizard/SqlNodeView.ts
index 3ea8fef49..fdd739e82 100644
--- a/imxweb/projects/qbm/src/lib/sqlwizard/SqlNodeView.ts
+++ b/imxweb/projects/qbm/src/lib/sqlwizard/SqlNodeView.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -34,8 +34,7 @@ export class SqlViewSettings {
constructor(
public readonly sqlWizardService: SqlWizardApiService,
tableName: string,
- rootExpression?: SqlExpression,
- addEmpty?: boolean) {
+ rootExpression?: SqlExpression) {
let expr = rootExpression;
if (!expr) {
expr = {
@@ -45,11 +44,6 @@ export class SqlViewSettings {
}
this.root = new SqlViewRoot(this, tableName, expr);
-
- // add empty child node if there is none and empty is allowed
- if ((!this.root.childViews || this.root.childViews.length < 1) && addEmpty === true) {
- this.root.addChildNode();
- }
}
}
@@ -142,12 +136,8 @@ export class SqlNodeView extends SqlViewBase implements ISqlNodeView {
return !this.Property || this.Property.ColumnType == SqlColumnTypes.Normal;
}
- public canRemove(allowEmptyExpression = true): boolean {
- if (allowEmptyExpression)
- return true;
- const expressions = this.Parent.Data.Expressions;
- const index = expressions.indexOf(this.Data);
- return index > -1 && expressions.length > 1;
+ public canRemove(): boolean {
+ return true;
}
public remove() {
diff --git a/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.html b/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.html
index 582cd9648..eb810150f 100644
--- a/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.html
+++ b/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.html
@@ -2,4 +2,4 @@
\ No newline at end of file
+
diff --git a/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.ts b/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.ts
index d352c97ed..97551d073 100644
--- a/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.ts
+++ b/imxweb/projects/qbm/src/lib/sqlwizard/column-selection.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -53,7 +53,7 @@ export class ColumnSelectionComponent implements OnInit, OnChanges {
constructor(private readonly svc: SqlWizardService) {
}
- public async ngOnInit() {
+ public async ngOnInit(): Promise {
await this.reloadColumns();
if (this.node.Property) {
this.formControl.setValue(this.node.Property.PropertyId);
@@ -64,22 +64,23 @@ export class ColumnSelectionComponent implements OnInit, OnChanges {
});
}
- public selectionChange(value) {
+ // TODO: Check Upgrade
+ public selectionChange(value: any): void {
this.formControl.setValue(value);
this.node.columnChanged.emit(value);
}
- public ngOnChanges(changes) {
+ public ngOnChanges(changes: any): void {
if (changes.node) {
this.reloadColumns();
}
}
- public async selectColumn(propertyId: string) {
- if (this.lastSelected == propertyId) {
+ public async selectColumn(propertyId: string): Promise {
+ if (this.lastSelected === propertyId) {
return;
}
this.lastSelected = propertyId;
- const found = this.columns.filter(c => c.PropertyId == propertyId);
+ const found = this.columns.filter(c => c.PropertyId === propertyId);
if (found.length != 1) {
throw new Error('Property not found: ' + propertyId);
}
@@ -88,9 +89,10 @@ export class ColumnSelectionComponent implements OnInit, OnChanges {
// If there is only one operator, pre-select it.
// this is important for boolean properties that do not show
// an operator selection.
- var preselectedOperator: string = null;
- if (found[0].Operators?.length == 1)
- preselectedOperator = found[0].Operators[0].Type;
+ let preselectedOperator: string = null;
+ if (found[0].Operators?.length === 1) {
+ preselectedOperator = found[0].Operators[0].Type;
+ }
// create new empty node
const data: SqlExpression = {
@@ -106,7 +108,7 @@ export class ColumnSelectionComponent implements OnInit, OnChanges {
return option.display.toString().toUpperCase().trim().includes(searchInputValue.toUpperCase().trim());
}
- private async reloadColumns() {
+ private async reloadColumns(): Promise {
const tableName = this.node.tableName;
if (tableName) {
diff --git a/imxweb/projects/qbm/src/lib/sqlwizard/date-picker.component.html b/imxweb/projects/qbm/src/lib/sqlwizard/date-picker.component.html
index aaea68860..0aab2f008 100644
--- a/imxweb/projects/qbm/src/lib/sqlwizard/date-picker.component.html
+++ b/imxweb/projects/qbm/src/lib/sqlwizard/date-picker.component.html
@@ -6,9 +6,11 @@
+ {{ '#LDS#Number' | translate }}
+ {{ '#LDS#Time unit' | translate }}
{{opt.DisplayMl | translate}}
@@ -18,8 +20,10 @@
-
+ {{ '#LDS#Date' | translate }}
+
{{'#LDS#The value you entered is not a valid date.' | translate}}
-
#LDS#Processes
Dummy
`
+})
+class DummyComponent {
+}
+
+describe('ItshopPatternGuardService', () => {
+ let service: ItshopPatternGuardService;
+
+ const authenticationServiceStub = {
+ onSessionResponse: new Subject+ {{'#LDS#Heading Products Cannot Be Added To The Request Template' | translate}} +
+
+
+
+
+
+ {{ description1 | translate}}
+
+
+ {{ description2 | translate}}
+
+ | + {{ column.title | translate }} + | ++ {{ row[column.name] }} + | +
|---|
+
+
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/duplicate-pattern-items/duplicate-pattern-items.component.scss b/imxweb/projects/qer/src/lib/itshop-pattern/duplicate-pattern-items/duplicate-pattern-items.component.scss
new file mode 100644
index 000000000..542a60e72
--- /dev/null
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/duplicate-pattern-items/duplicate-pattern-items.component.scss
@@ -0,0 +1,9 @@
+.mat-dialog-content{
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+
+ .mat-table {
+ margin-top: 20px;
+ }
+}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/duplicate-pattern-items/duplicate-pattern-items.component.ts b/imxweb/projects/qer/src/lib/itshop-pattern/duplicate-pattern-items/duplicate-pattern-items.component.ts
new file mode 100644
index 000000000..820c9b66f
--- /dev/null
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/duplicate-pattern-items/duplicate-pattern-items.component.ts
@@ -0,0 +1,59 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+import { DuplicatePatternItem } from './duplicate-pattern-item';
+
+/**
+ * This component shows a list of all serviceitems that could not be added to the itshop pattern.
+ */
+@Component({
+ selector: 'imx-duplicate-pattern-items',
+ templateUrl: './duplicate-pattern-items.component.html',
+ styleUrls: ['./duplicate-pattern-items.component.scss']
+})
+export class DuplicatePatternItemsComponent {
+
+ public get columnNames(): string[] {
+ return this.displayedColumns.map(c => c.name);
+ }
+
+ public description1 = '#LDS#Each product can be added to the request template only once.';
+ public description2 = '#LDS#The following products are already included and cannot be added again.';
+
+ public readonly displayedColumns = [
+ { name: 'Display', title: '#LDS#Product' }
+ ];
+
+ constructor(
+ @Inject(MAT_DIALOG_DATA) public readonly data: {
+ duplicatePatternItems: DuplicatePatternItem[]
+ }
+ ) {
+ }
+}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.html b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.html
new file mode 100644
index 000000000..0f50d7757
--- /dev/null
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.html
@@ -0,0 +1,31 @@
+
+
+
+ {{ description | translate }}
+
+
+
+
+
+
+
+
+ {{'#LDS#For me' | translate}}
+
+
+ {{'#LDS#For someone else' | translate}}
+
+
+
+
+
+
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.scss b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.scss
new file mode 100644
index 000000000..7b687a897
--- /dev/null
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.scss
@@ -0,0 +1,50 @@
+@import "@elemental-ui/core/src/styles/_palette.scss";
+
+:host {
+
+ eui-alert {
+ margin-bottom: 10px;
+ }
+
+ ::ng-deep imx-data-tiles {
+ padding-left: 10px;
+ }
+
+ ::ng-deep .mat-tab-body-content {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .eui-sidesheet-content {
+ display: flex;
+ flex-direction: column;
+
+ >.mat-card {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ }
+ }
+
+ .eui-sidesheet-actions {
+ button:not(:last-of-type) {
+ margin-right: 10px;
+ }
+ }
+ .mat-radio-button {
+ height: 70px;
+ margin-right: 20px;
+ }
+
+ .imx-recipients {
+ height: 100px;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+
+ .imx-align-self-base {
+ margin-right: 10px;
+ align-self: baseline;
+ }
+}
\ No newline at end of file
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.spec.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.spec.ts
new file mode 100644
index 000000000..a25675eb4
--- /dev/null
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-add-products/itshop-pattern-add-products.component.spec.ts
@@ -0,0 +1,213 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { MatCardModule } from '@angular/material/card';
+import { EuiCoreModule, EuiLoadingService, EuiSidesheetRef, EuiSidesheetService, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { configureTestSuite } from 'ng-bullet';
+import { of, Subject } from 'rxjs';
+
+import { PortalCartitem } from 'imx-api-qer';
+import { IEntity } from 'imx-qbm-dbts';
+
+import { AuthenticationService, EntityService, clearStylesFromDOM } from 'qbm';
+import { ShelfService } from '../../itshop/shelf.service';
+import { ProjectConfigurationService } from '../../project-configuration/project-configuration.service';
+import { QerApiService } from '../../qer-api-client.service';
+import { ServiceItemsService } from '../../service-items/service-items.service';
+import { CartItemsService } from '../../shopping-cart/cart-items.service';
+import { ItshopPatternCreateService } from '../itshop-pattern-create-sidesheet/itshop-pattern-create.service';
+import { ItshopPatternAddProductsComponent } from './itshop-pattern-add-products.component';
+import { UserModelService } from '../../user/user-model.service';
+
+describe('ItshopPatternAddProductsComponent', () => {
+ let component: ItshopPatternAddProductsComponent;
+ let fixture: ComponentFixture
+
{{ detailsInfoText | translate}}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.scss b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.scss
index b15b3ba2c..5666817df 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.scss
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
.eui-sidesheet-content {
display: flex;
@@ -14,12 +14,13 @@
.imx-helper-alert {
width: 100%;
+
::ng-deep .eui-alert {
margin-bottom: 20px;
}
}
- .imx-sidesheet-content{
+ .imx-sidesheet-content {
display: flex;
flex-direction: column;
height: 100%;
@@ -34,5 +35,12 @@
margin-right: 10px;
}
}
-}
+ .imx-errormessages {
+ margin-bottom: 10px;
+
+ ::ng-deep .imx-message-content {
+ font-size: 14px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.spec.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.spec.ts
index 97dea9ae0..5b6ecc496 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.spec.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -113,8 +113,7 @@ describe('ItshopPatternCreateSidesheetComponent', () => {
useValue: patterServiceStub
},
]
- })
- .compileComponents();
+ });
});
beforeEach(() => {
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.ts
index 2f4eb2696..08da8a37e 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -38,11 +38,15 @@ import {
ColumnDependentReference,
ConfirmationService,
DataTableComponent,
+ ErrorService,
TabControlHelper,
} from 'qbm';
import { ItshopPatternService } from '../itshop-pattern.service';
import { ItShopPatternChangedType } from '../itshop-pattern-changed.enum';
+/**
+ * Component displayed in a sidesheet with a form to create a itshop pattern.
+ */
@Component({
selector: 'imx-itshop-pattern-create-sidesheet',
templateUrl: './itshop-pattern-create-sidesheet.component.html',
@@ -56,11 +60,12 @@ export class ItshopPatternCreateSidesheetComponent implements OnInit, OnDestroy
public cdrList: ColumnDependentReference[] = [];
public readonly detailsFormGroup: FormGroup;
- public detailsInfoText = '#LDS#Here you can specify the details of the new request template.';
+ public detailsInfoText: string;
@ViewChild(DataTableComponent) public table: DataTableComponent;
private closeSubscription: Subscription;
+ private disposable: () => void;
constructor(
formBuilder: FormBuilder,
@@ -70,6 +75,7 @@ export class ItshopPatternCreateSidesheetComponent implements OnInit, OnDestroy
private readonly patternService: ItshopPatternService,
private readonly sideSheetRef: EuiSidesheetRef,
private readonly logger: ClassloggerService,
+ errorService: ErrorService,
confirmation: ConfirmationService
) {
this.detailsFormGroup = new FormGroup({ formArray: formBuilder.array([]) });
@@ -82,6 +88,8 @@ export class ItshopPatternCreateSidesheetComponent implements OnInit, OnDestroy
this.sideSheetRef.close();
}
});
+
+ this.disposable = errorService.setTarget('sidesheet');
}
public async ngOnInit(): Promise {
@@ -97,6 +105,7 @@ export class ItshopPatternCreateSidesheetComponent implements OnInit, OnDestroy
}
public ngOnDestroy(): void {
+ this.disposable();
if (this.closeSubscription) {
this.closeSubscription.unsubscribe();
}
@@ -117,6 +126,9 @@ export class ItshopPatternCreateSidesheetComponent implements OnInit, OnDestroy
}
private async setupDetailsTab(): Promise {
+
+ this.detailsInfoText = '#LDS#Here you can specify the details of the new request template.';
+
this.cdrList = [
new BaseCdr(this.data.pattern.Ident_ShoppingCartPattern.Column),
new BaseCdr(this.data.pattern.Description.Column),
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.spec.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.spec.ts
index 925b26201..74bf6de08 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.spec.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -25,13 +25,14 @@
*/
import { TestBed } from '@angular/core/testing';
+import { MatDialog } from '@angular/material/dialog';
import { EuiLoadingService, EuiSidesheetService } from '@elemental-ui/core';
import { configureTestSuite } from 'ng-bullet';
+import { of, Subject } from 'rxjs';
-import { ClassloggerService, SnackBarService, UserMessageService } from 'qbm';
+import { ClassloggerService, MessageDialogResult, SnackBarService, UserMessageService } from 'qbm';
import { QerApiService } from '../../qer-api-client.service';
import { ItshopPatternCreateService } from './itshop-pattern-create.service';
-import { of, Subject } from 'rxjs';
const commitSpy = jasmine.createSpy('Commit');
@@ -43,6 +44,13 @@ describe('ItshopPatternCreateService', () => {
show: jasmine.createSpy('show')
};
+ const dialogStub = {
+ open: jasmine.createSpy('open').and.returnValue({
+ beforeClosed: () => of(MessageDialogResult.YesResult),
+ afterClosed: () => of(MessageDialogResult.YesResult)
+ })
+ };
+
const qerApiServiceStub = {
typedClient: {
PortalItshopPatternPrivate: {
@@ -75,6 +83,10 @@ describe('ItshopPatternCreateService', () => {
provide: EuiSidesheetService,
useValue: sidesheetServiceStub
},
+ {
+ provide: MatDialog,
+ useValue: dialogStub
+ },
{
provide: SnackBarService,
useValue: {
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.ts
index f9d0f4990..3ae6d2ee8 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-create-sidesheet/itshop-pattern-create.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -25,14 +25,17 @@
*/
import { OverlayRef } from '@angular/cdk/overlay';
-import { Injectable } from '@angular/core';
+import { ErrorHandler, Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
import { EuiLoadingService, EuiSidesheetService } from '@elemental-ui/core';
import { TranslateService } from '@ngx-translate/core';
-import { PortalCartitem, PortalItshopPatternItem, PortalItshopPatternPrivate } from 'imx-api-qer';
+import { PortalItshopPatternItem, PortalItshopPatternPrivate, RequestableProductForPerson } from 'imx-api-qer';
import { ClassloggerService, SnackBarService, UserMessageService } from 'qbm';
import { QerApiService } from '../../qer-api-client.service';
+import { DuplicatePatternItem } from '../duplicate-pattern-items/duplicate-pattern-item';
+import { DuplicatePatternItemsComponent } from '../duplicate-pattern-items/duplicate-pattern-items.component';
import { ItShopPatternChangedType } from '../itshop-pattern-changed.enum';
import { ItshopPatternCreateSidesheetComponent } from './itshop-pattern-create-sidesheet.component';
@@ -48,9 +51,11 @@ export class ItshopPatternCreateService {
private readonly qerClient: QerApiService,
private readonly logger: ClassloggerService,
private readonly busyService: EuiLoadingService,
+ private readonly dialogService: MatDialog,
private readonly messageService: UserMessageService,
private readonly sidesheet: EuiSidesheetService,
private readonly translate: TranslateService,
+ private readonly errorHandler: ErrorHandler,
private readonly snackBar: SnackBarService) { }
public async saveNewPatternAndItems(pattern: PortalItshopPatternPrivate, patternItems: PortalItshopPatternItem[]): Promise {
@@ -107,24 +112,54 @@ export class ItshopPatternCreateService {
return newAssignedObjects;
}
- public async createItshopPatternFromShoppingCart(cartItems: PortalCartitem[]): Promise {
+ public async assignItemsToPattern(
+ serviceItemUids: string[],
+ serviceItemsForPersons: RequestableProductForPerson[],
+ uidPattern: string = ''): Promise {
- const pattern = await this.createNewPattern(false);
- if (!pattern) {
- return 0;
+ if (uidPattern.length === 0) {
+ // create new pattern
+ const pattern = await this.createNewPattern(false);
+ if (!pattern) {
+ return 0;
+ }
+ uidPattern = pattern.GetEntity().GetKeys()[0];
}
- const uidPattern = pattern.GetEntity().GetKeys()[0];
+
+ const duplicateItems: DuplicatePatternItem[] = [];
const newAssignedObjects = (await this.handlePromiseLoader(
Promise.all(
- cartItems.map(async (item) => {
- const patternItem = this.qerClient.typedClient.PortalItshopPatternItem.createEntity();
- patternItem.UID_ShoppingCartPattern.value = uidPattern;
- patternItem.UID_AccProduct.value = item.UID_AccProduct.value;
- await patternItem.GetEntity().Commit(true);
+ serviceItemUids.map(async (uid) => {
+ let patternItem: PortalItshopPatternItem;
+ try {
+ patternItem = this.qerClient.typedClient.PortalItshopPatternItem.createEntity();
+ patternItem.UID_ShoppingCartPattern.value = uidPattern;
+ patternItem.UID_AccProduct.value = uid;
+ await patternItem.GetEntity().Commit(true);
+ } catch (exception) {
+ // 810303 == the combination of the fields Role/organization, Service item, Request template must be unique.
+ if (exception?.dataItems.length && exception.dataItems[0].Number === 810303) {
+ const serviceItem = serviceItemsForPersons.find(item => item.UidAccProduct === uid);
+ duplicateItems.push(new DuplicatePatternItem(serviceItem, exception.dataItems[0]));
+ } else {
+ this.errorHandler.handleError(exception);
+ }
+ }
})
)
)).length;
+
+
+ if (duplicateItems.length > 0) {
+ const dialogRef = this.dialogService.open(DuplicatePatternItemsComponent, {
+ data: {
+ duplicatePatternItems: duplicateItems
+ }
+ });
+
+ await dialogRef.beforeClosed().toPromise();
+ }
return newAssignedObjects;
}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.html b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.html
index 5c08df210..726150dd6 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.html
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.html
@@ -4,7 +4,7 @@
- {{ detailsInfoText | translate}}
+ {{ (data.isMyPattern ? editableProductsInfoText : detailsInfoText) | translate}}
@@ -23,7 +23,7 @@
- {{ productsInfoText | translate}}
+ {{ (data.isMyPattern ? editableProductsInfoText : productsInfoText) | translate}}
;
private closeSubscription: Subscription;
+ private shoppingCartPatternUid = '';
constructor(
formBuilder: FormBuilder,
@@ -81,8 +87,11 @@ export class ItshopPatternSidesheetComponent implements OnInit, OnDestroy {
isMyPattern: boolean,
adminMode: boolean
},
+ private readonly translate: TranslateService,
private readonly patternService: ItshopPatternService,
+ private readonly sidesheet: EuiSidesheetService,
private readonly sideSheetRef: EuiSidesheetRef,
+ private readonly snackBar: SnackBarService,
private readonly logger: ClassloggerService,
private confirmation: ConfirmationService
) {
@@ -105,6 +114,8 @@ export class ItshopPatternSidesheetComponent implements OnInit, OnDestroy {
TabControlHelper.triggerResizeEvent();
});
+ this.shoppingCartPatternUid = this.data.pattern.GetEntity().GetKeys()[0];
+
await this.setupDetailsTab();
this.setupProductsTab();
}
@@ -118,19 +129,17 @@ export class ItshopPatternSidesheetComponent implements OnInit, OnDestroy {
public async getData(parameter?: CollectionLoadParameters): Promise {
this.patternService.handleOpenLoader();
try {
- const uid = this.data.pattern.GetEntity().GetKeys()[0];
const filteredState: CollectionLoadParameters = {
filter: [
{
ColumnName: 'UID_ShoppingCartPattern',
Type: FilterType.Compare,
CompareOp: CompareOperator.Equal,
- Value1: uid,
+ Value1: this.shoppingCartPatternUid,
},
],
};
-
const parameters = {
...parameter,
...filteredState
@@ -163,7 +172,7 @@ export class ItshopPatternSidesheetComponent implements OnInit, OnDestroy {
public async delete(): Promise {
if (await this.confirmation.confirm({
Title: '#LDS#Heading Delete Request Template',
- Message: '#LDS#Are you sure you want to delete this request template?'
+ Message: '#LDS#Are you sure you want to delete the request template?'
})) {
if (await this.patternService.delete([this.data.pattern])) {
this.sideSheetRef.close(ItShopPatternChangedType.Deleted);
@@ -174,6 +183,29 @@ export class ItshopPatternSidesheetComponent implements OnInit, OnDestroy {
public async deleteProducts(): Promise {
if (await this.patternService.deleteProducts(this.selectedPatternItems)) {
await this.getData();
+ this.table?.clearSelection();
+ }
+ }
+
+ public async addProducts(): Promise {
+
+ const result = await this.sidesheet.open(ItshopPatternAddProductsComponent, {
+ title: await this.translate.get('#LDS#Heading Add Products To Request Template').toPromise(),
+ headerColour: 'iris-blue',
+ bodyColour: 'asher-gray',
+ panelClass: 'imx-sidesheet',
+ padding: '0',
+ width: 'max(768px, 70%)',
+ testId: 'pattern-details-sidesheet',
+ data: {
+ shoppingCartPatternUid: this.shoppingCartPatternUid
+ }
+ }).afterClosed().toPromise();
+
+ if (result) {
+ const snackBarMessage = '#LDS#The selected products have been successfully added.';
+ this.snackBar.open({ key: snackBarMessage });
+ await this.getData();
}
}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.html b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.html
index abe0d2f62..ca6e5936c 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.html
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.html
@@ -36,7 +36,7 @@
-
\ No newline at end of file
+
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.scss b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.scss
index 3ffe4d584..1447e0b72 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.scss
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.scss
@@ -32,7 +32,6 @@
@include imx-flex-column-container();
overflow: hidden;
height: inherit;
- width: 1200px;
max-width: 100%;
}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.spec.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.spec.ts
index 353d92df9..3aa13a410 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.spec.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -74,7 +74,7 @@ describe('ItshopPatternComponent', () => {
isShopAdmin: jasmine.createSpy('isShopAdmin').and.callFake(() => isShopAdmin)
};
- let routeConfigPath = 'configuration/carttemplates';
+ let routeConfigPath = 'itshop/requesttemplates';
const activatedRouteStub = {
snapshot: {
routeConfig: { path: routeConfigPath }
@@ -151,8 +151,7 @@ describe('ItshopPatternComponent', () => {
}
}
]
- })
- .compileComponents();
+ });
});
beforeEach(waitForAsync(() => {
@@ -178,34 +177,6 @@ describe('ItshopPatternComponent', () => {
expect(component).toBeTruthy();
});
- for (const testcase of [
- { adminMode: true, description: 'admin-mode' },
- { adminMode: false, description: 'normaö-user-mode' },
- ]) {
- xit(`should run the component in ${testcase.description}`, async () => {
- patterServiceStub.getPrivatePatterns.calls.reset();
- patterServiceStub.getPublicPatterns.calls.reset();
- const state = { OrderBy: 'Ident_ShoppingCartPattern asc' };
- if (testcase.adminMode) {
- routeConfigPath = 'configuration/carttemplates';
- isShopAdmin = true;
- } else {
- routeConfigPath = 'something else';
- isShopAdmin = false;
- }
-
- await component.ngOnInit();
-
- if (testcase.adminMode) {
- expect(patterServiceStub.getPublicPatterns).toHaveBeenCalledWith(state);
- expect(patterServiceStub.getPrivatePatterns).not.toHaveBeenCalled();
- } else {
- expect(patterServiceStub.getPrivatePatterns).toHaveBeenCalledWith(state);
- expect(patterServiceStub.getPublicPatterns).not.toHaveBeenCalled();
- }
- });
- }
-
it('should open the details sidesheet', async () => {
await component.viewDetails(selectedPattern);
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.ts
index 5475c8d20..ec7245867 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -25,7 +25,6 @@
*/
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
import { EuiSidesheetService } from '@elemental-ui/core';
import { TranslateService } from '@ngx-translate/core';
import { Subscription } from 'rxjs';
@@ -48,6 +47,10 @@ import { ItshopPatternService } from './itshop-pattern.service';
import { ItshopPatternCreateService } from './itshop-pattern-create-sidesheet/itshop-pattern-create.service';
import { ItShopPatternChangedType } from './itshop-pattern-changed.enum';
+/**
+ * Component that shows all list of all itshop pattern of the current user
+ * or all itshop pattern of all other users, if the user is a shop admin.
+ */
@Component({
selector: 'imx-itshop-pattern',
templateUrl: './itshop-pattern.component.html',
@@ -76,7 +79,6 @@ export class ItshopPatternComponent implements OnInit, OnDestroy {
private readonly patternService: ItshopPatternService,
private readonly patternCreateService: ItshopPatternCreateService,
private readonly qerPermissionService: QerPermissionsService,
- private readonly activatedRoute: ActivatedRoute,
private readonly sidesheet: EuiSidesheetService,
private readonly snackBar: SnackBarService,
private readonly translate: TranslateService,
@@ -95,8 +97,7 @@ export class ItshopPatternComponent implements OnInit, OnDestroy {
this.patternService.handleOpenLoader();
try {
- const route = this.activatedRoute.snapshot.routeConfig.path;
- this.adminMode = await this.qerPermissionService.isShopAdmin() && route === 'configuration/carttemplates';
+ this.adminMode = await this.qerPermissionService.isShopAdmin();
this.infoText = this.adminMode ? this.infoTextAdmin : this.infoTextUser;
@@ -113,7 +114,8 @@ export class ItshopPatternComponent implements OnInit, OnDestroy {
entitySchema.Columns.IsPublicPattern,
{
ColumnName: 'actions',
- Type: ValType.String
+ Type: ValType.String,
+ afterAdditionals: true
}
],
entitySchema,
@@ -217,7 +219,8 @@ export class ItshopPatternComponent implements OnInit, OnDestroy {
testId: 'pattern-details-sidesheet',
data: {
pattern,
- isMyPattern
+ isMyPattern,
+ adminMode: this.adminMode
}
}).afterClosed().toPromise();
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.module.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.module.ts
index a4b14b832..b26b98c06 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.module.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -31,6 +31,9 @@ import { RouterModule, Routes } from '@angular/router';
import { EuiCoreModule, EuiMaterialModule } from '@elemental-ui/core';
import { TranslateModule } from '@ngx-translate/core';
+import { ProjectConfig } from 'imx-api-qbm';
+import { QerProjectConfig } from 'imx-api-qer';
+
import {
CdrModule,
ClassloggerService,
@@ -38,37 +41,34 @@ import {
DataTableModule,
MenuItem,
MenuService,
- RouteGuardService
+ RouteGuardService,
+ UserMessageModule
} from 'qbm';
import { ItshopPatternComponent } from './itshop-pattern.component';
import { ItshopPatternSidesheetComponent } from './itshop-pattern-sidesheet/itshop-pattern-sidesheet.component';
-
-import { ShopAdminGuardService } from '../guards/shop-admin-guard.service';
-import { isShopAdmin } from '../admin/qer-permissions-helper';
import { ItshopPatternCreateSidesheetComponent } from './itshop-pattern-create-sidesheet/itshop-pattern-create-sidesheet.component';
+import { ItshopPatternAddProductsComponent } from './itshop-pattern-add-products/itshop-pattern-add-products.component';
+import { ServiceItemsModule } from '../service-items/service-items.module';
+import { DuplicatePatternItemsComponent } from './duplicate-pattern-items/duplicate-pattern-items.component';
+import { UserModule } from '../user/user.module';
+import { ItshopPatternGuardService } from '../guards/itshop-pattern-guard.service';
const routes: Routes = [
{
- path: 'configuration/carttemplates',
+ path: 'itshop/requesttemplates',
component: ItshopPatternComponent,
- canActivate: [RouteGuardService, ShopAdminGuardService],
- resolve: [RouteGuardService]
- },
- {
- path: 'itshop/myrequesttemplates',
- component: ItshopPatternComponent,
- canActivate: [RouteGuardService],
+ canActivate: [RouteGuardService, ItshopPatternGuardService],
resolve: [RouteGuardService]
}
];
-
-
@NgModule({
declarations: [
ItshopPatternComponent,
ItshopPatternSidesheetComponent,
- ItshopPatternCreateSidesheetComponent
+ ItshopPatternCreateSidesheetComponent,
+ ItshopPatternAddProductsComponent,
+ DuplicatePatternItemsComponent
],
imports: [
CdrModule,
@@ -79,8 +79,11 @@ const routes: Routes = [
EuiMaterialModule,
FormsModule,
ReactiveFormsModule,
+ ServiceItemsModule,
TranslateModule,
RouterModule.forChild(routes),
+ UserMessageModule,
+ UserModule
]
})
export class ItshopPatternModule {
@@ -95,17 +98,18 @@ export class ItshopPatternModule {
private setupMenu(): void {
this.menuService.addMenuFactories(
- (preProps: string[], groups: string[]) => {
+ (preProps: string[], groups: string[], projectConfig: QerProjectConfig & ProjectConfig) => {
const items: MenuItem[] = [];
+ const requestTemplatesEnabled = projectConfig.ITShopConfig.VI_ITShop_ProductSelectionFromTemplate;
- if (preProps.includes('ITSHOP')) {
+ if (preProps.includes('ITSHOP') && requestTemplatesEnabled) {
items.push(
{
- id: 'QER_Request_MyRequestTemplates',
+ id: 'QER_Request_RequestTemplates',
navigationCommands: {
- commands: ['itshop', 'myrequesttemplates']
+ commands: ['itshop', 'requesttemplates']
},
- title: '#LDS#Menu Entry My request templates',
+ title: '#LDS#Menu Entry Request templates',
sorting: '10-50',
}
);
@@ -120,36 +124,7 @@ export class ItshopPatternModule {
sorting: '10',
items
};
- },
- (preProps: string[], groups: string[]) => {
- const items: MenuItem[] = [];
-
- if (preProps.includes('ITSHOP') && isShopAdmin(groups)) {
- items.push(
- {
- id: 'QER_Setup_Patterns',
- navigationCommands: {
- commands: ['configuration', 'carttemplates']
- },
- title: '#LDS#Menu Entry Request templates',
- sorting: '50-50',
- },
- );
- }
-
- if (items.length === 0) {
- return null;
- }
- return {
- id: 'ROOT_Setup',
- title: '#LDS#Setup',
- sorting: '50',
- items
- };
- },
+ }
);
}
-
-
-
}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.spec.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.spec.ts
index 027f17951..6b273863e 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.spec.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.ts
index 5aa1a509e..254fb0748 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/itshop/decision-history.service.spec.ts b/imxweb/projects/qer/src/lib/itshop/decision-history.service.spec.ts
index 9ac6decf4..ae85f0e70 100644
--- a/imxweb/projects/qer/src/lib/itshop/decision-history.service.spec.ts
+++ b/imxweb/projects/qer/src/lib/itshop/decision-history.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/itshop/decision-history.service.ts b/imxweb/projects/qer/src/lib/itshop/decision-history.service.ts
index bf54e2135..1e2a08439 100644
--- a/imxweb/projects/qer/src/lib/itshop/decision-history.service.ts
+++ b/imxweb/projects/qer/src/lib/itshop/decision-history.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/itshop/image.service.spec.ts b/imxweb/projects/qer/src/lib/itshop/image.service.spec.ts
index 2836a9659..ed3f4256c 100644
--- a/imxweb/projects/qer/src/lib/itshop/image.service.spec.ts
+++ b/imxweb/projects/qer/src/lib/itshop/image.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -26,6 +26,8 @@
import { TestBed } from '@angular/core/testing';
+import { AppConfigService } from 'qbm';
+
import { QerApiService } from '../qer-api-client.service';
import { ImageService } from './image.service';
@@ -38,6 +40,14 @@ describe('ImageService', () => {
{
provide: QerApiService,
useValue: {}
+ },
+ {
+ provide: AppConfigService,
+ useClass: class {
+ public Config = {
+ BaseUrl: ''
+ };
+ }
}
]
});
diff --git a/imxweb/projects/qer/src/lib/itshop/image.service.ts b/imxweb/projects/qer/src/lib/itshop/image.service.ts
index 941295931..d6bffcd88 100644
--- a/imxweb/projects/qer/src/lib/itshop/image.service.ts
+++ b/imxweb/projects/qer/src/lib/itshop/image.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -26,15 +26,44 @@
import { Injectable } from '@angular/core';
-import { ITShopConfig, PortalShopServiceitems } from 'imx-api-qer';
+import { ITShopConfig, PortalShopServiceitems, V2ApiClientMethodFactory } from 'imx-api-qer';
+import { MethodDefinition, MethodDescriptor } from 'imx-qbm-dbts';
+import { AppConfigService } from 'qbm';
import { QerApiService } from '../qer-api-client.service';
@Injectable({
providedIn: 'root'
})
export class ImageService {
- constructor(private readonly api: QerApiService) { }
+ private readonly methodFactory = new V2ApiClientMethodFactory();
+ constructor(
+ private readonly api: QerApiService,
+ private readonly config: AppConfigService,
+ ) { }
+
+ /** Returns the URL to the image for the specified service item. */
+ public getPath(serviceItem: PortalShopServiceitems): string {
+ const tokens = serviceItem.ImageRef.value?.split('/');
+ if (tokens?.length > 1) {
+ let path: MethodDescriptor
@@ -56,7 +56,7 @@
{{ '#LDS#Delete' | translate }}
+
-
\ No newline at end of file
+
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.scss b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.scss
index b1eb6cac9..9d70b5546 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.scss
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
@mixin imx-flex-column-container {
display: flex;
@@ -11,6 +11,10 @@
}
:host {
+ ::ng-deep .mat-tab-body-content {
+ display: flex;
+ }
+
.eui-badge ::ng-deep .eui-badge-content {
font-size: 12px;
line-height: 12px;
@@ -59,4 +63,4 @@
overflow: auto;
}
}
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.spec.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.spec.ts
index 36122b964..34510de91 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.spec.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -27,12 +27,12 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { EuiSidesheetRef, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
+import { EuiSidesheetRef, EuiSidesheetService, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
import { configureTestSuite } from 'ng-bullet';
import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
-import { ClassloggerService, clearStylesFromDOM, ConfirmationService } from 'qbm';
+import { ClassloggerService, clearStylesFromDOM, ConfirmationService, SnackBarService } from 'qbm';
import { ItshopPatternService } from '../itshop-pattern.service';
import { ItshopPatternSidesheetComponent } from './itshop-pattern-sidesheet.component';
@@ -80,6 +80,12 @@ describe('ItshopPatternSidesheetComponent', () => {
getPatternItems: jasmine.createSpy('getPatternItems').and.callThrough(),
};
+ const sidesheetServiceStub = {
+ open: jasmine.createSpy('open').and.returnValue({
+ afterClosed: () => of({})
+ })
+ };
+
configureTestSuite(() => {
TestBed.configureTestingModule({
declarations: [
@@ -102,6 +108,16 @@ describe('ItshopPatternSidesheetComponent', () => {
provide: EuiSidesheetRef,
useValue: mockSidesheetRef
},
+ {
+ provide: EuiSidesheetService,
+ useValue: sidesheetServiceStub
+ },
+ {
+ provide: SnackBarService,
+ useValue: {
+ open: jasmine.createSpy('open')
+ }
+ },
{
provide: ConfirmationService,
useValue: mockConfirmationService
@@ -118,8 +134,7 @@ describe('ItshopPatternSidesheetComponent', () => {
useValue: patterServiceStub
},
]
- })
- .compileComponents();
+ });
});
beforeEach(() => {
diff --git a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.ts b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.ts
index 374119efc..ac47f9984 100644
--- a/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.ts
+++ b/imxweb/projects/qer/src/lib/itshop-pattern/itshop-pattern-sidesheet/itshop-pattern-sidesheet.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -27,7 +27,7 @@
import { Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
import { MatTabChangeEvent } from '@angular/material/tabs';
-import { EuiSidesheetRef, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
+import { EuiSidesheetRef, EuiSidesheetService, EUI_SIDESHEET_DATA } from '@elemental-ui/core';
import { TranslateService } from '@ngx-translate/core';
import { Subscription } from 'rxjs';
@@ -42,10 +42,12 @@ import {
DataSourceToolbarSettings,
DataSourceWrapper,
DataTableComponent,
+ SnackBarService,
TabControlHelper,
} from 'qbm';
import { ItshopPatternService } from '../itshop-pattern.service';
import { ItShopPatternChangedType } from '../itshop-pattern-changed.enum';
+import { ItshopPatternAddProductsComponent } from '../itshop-pattern-add-products/itshop-pattern-add-products.component';
@Component({
selector: 'imx-itshop-pattern-sidesheet',
@@ -66,13 +68,17 @@ export class ItshopPatternSidesheetComponent implements OnInit, OnDestroy {
public adminMode: boolean;
public selectedTabIndex = 0;
- public detailsInfoText = '#LDS#Here you can edit the details of this request template.';
- public productsInfoText =
- '#LDS#Here you can get an overview of all products assigned to this request template. Additionally, you can remove products from this request template.';
+ public detailsInfoText = '#LDS#Here you can see the details of this request template.';
+ public editableDetailsInfoText = '#LDS#Here you can edit the details of this request template.';
+
+ public productsInfoText = '#LDS#Here you can get an overview of all products assigned to this request template.';
+ public editableProductsInfoText = '#LDS#Here you can get an overview of all products assigned to this request template. You can also add and remove products.';
+
@ViewChild(DataTableComponent) public table: DataTableComponent
@@ -60,17 +60,16 @@
[disabled]="!selectedItemsCanBeDeleted()" (click)="delete()">
{{'#LDS#Delete' | translate}}
-
-
-
+
[disabled]="!selectedItemsCanBeDeleted()" (click)="delete()"> {{'#LDS#Delete' | translate}} - - - +
-
+
+
+
+
+
+
+
+ {{'#LDS#This product is a role membership and has the following entitlements.' |translate}}
+
+
+
+ {{ '#LDS#The following products have optional products as well, select these if you want to request them additionally. Only products with selected parents will be added.' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ {{ '#LDS#Selected optional products' | translate }}
+
+ {{ (node.isMandatory ?
+ '#LDS#Mandatory product' :
+ '#LDS#Optional product') | translate
+ }}
+
+
+ {{ node.Display }}
+
+
+ {{'#LDS#Recipient:' | translate}}
+ {{node.Recipient}}
+
+
-
-
+
+
-
+
@@ -29,8 +25,6 @@
+
\ No newline at end of file
diff --git a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.scss b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.scss
index ef2ea7dbd..150c863fe 100644
--- a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.scss
+++ b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
display: flex;
@@ -10,14 +10,14 @@
height: 100%;
flex-grow: 1;
overflow: auto;
-
+
.mat-tab-header {
padding: 0 32px;
background-color: $white;
}
-
+
::ng-deep .mat-tab-body-wrapper {
height: 100%;
}
}
-}
\ No newline at end of file
+}
diff --git a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.spec.ts b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.spec.ts
index e1a4e07a6..c26f7b843 100644
--- a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.spec.ts
+++ b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.ts b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.ts
index 1745cc8e8..f1eb8c046 100644
--- a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.ts
+++ b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-details-sidesheet.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-entitlements/product-entitlements.component.html b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-entitlements/product-entitlements.component.html
deleted file mode 100644
index 5fd2d437d..000000000
--- a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-entitlements/product-entitlements.component.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- {{item.TargetEntitlement.Column.GetDisplayValue()}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-entitlements/product-entitlements.component.scss b/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-entitlements/product-entitlements.component.scss
deleted file mode 100644
index 1450be87c..000000000
--- a/imxweb/projects/qer/src/lib/product-selection/product-details-sidesheet/product-entitlements/product-entitlements.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-//Hier können css-regeln eingeführt werden
\ No newline at end of file
diff --git a/imxweb/projects/qer/src/lib/product-selection/product-selection.component.html b/imxweb/projects/qer/src/lib/product-selection/product-selection.component.html
index c40dd9848..ec2e9cc8a 100644
--- a/imxweb/projects/qer/src/lib/product-selection/product-selection.component.html
+++ b/imxweb/projects/qer/src/lib/product-selection/product-selection.component.html
@@ -1,16 +1,21 @@
-
-
+
-
-
+
-
-
+
-
-
+
-{{entitlementTypes.get(item.GetEntity().GetKeys().toString())}}
-
+
-
-
-
-
-
-
+
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -154,30 +175,39 @@
@@ -186,10 +216,9 @@ #LDS#Heading New Request - - - {{ ( referenceUser ? '#LDS#Heading By Reference User' : '#LDS#Heading By Peer Group' ) | translate }} + - + {{ (referenceUser ? '#LDS#Heading By Reference User' : '#LDS#Heading By Peer Group') | translate }} -
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
{{ '#LDS#Selected products' | translate }}
- {{selectedItems?.length + selectedTemplates?.length}}
+ {{ selectedItems?.length + selectedTemplates?.length }}
-
-
+
+
- {{'#LDS#Selected organizational structures' |
- translate}}
+ {{ '#LDS#Selected organizational structures' | translate }}
{{ selectedRoles?.length }}
-
-
+
+
-
-
+
{{ '#LDS#Selected products' | translate }}
-
- {{'#LDS#Selected organizational structures' |
- translate}}
+ {{ '#LDS#Selected organizational structures' | translate }}
- {{ '#LDS#This product has already been assigned to {0}.' | translate |
- ldsReplace:recipients?.Column?.GetDisplayValue() }}
- {{ '#LDS#You can still submit a request for the product. Please see the details about the assignmeht below.' |
- translate}}
+
+ {{ '#LDS#This product has already been assigned to {0}.' | translate | ldsReplace: recipients?.Column?.GetDisplayValue() }}
+ {{ '#LDS#You can still submit a request for the product. Please see the details about the assignmeht below.' | translate }}
-
+ {{ '#LDS#This product has already been assigned to {0}.' | translate | ldsReplace: recipients?.Column?.GetDisplayValue() }} + {{ '#LDS#You can still submit a request for the product. Please see the details about the assignmeht below.' | translate }}
-
+
+ {{'#LDS#Select the type of entitlement to add' | translate}}
+
+
+ {{pr.TableDisplay}}
+
+
+
+
+
+
+
+
+
+ {{'#LDS#Selected entitlements' | translate}}
+
+
-
- {{ '#LDS#Primary memberships' | translate
- }}
- {{ '#LDS#Secondary memberships' | translate }}
- {{ '#LDS#Automatic memberships' | translate }}
- {{ '#LDS#Excluded members' | translate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.scss b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.scss
index 237625287..20b6e2045 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.scss
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.scss
@@ -1,31 +1,27 @@
-@import '~@elemental-ui/core/src/styles/_palette.scss';
-
-.mat-button-toggle-group {
- margin: 32px 32px 10px 32px;
- font-size: small;
- display: flex;
- flex-direction: row;
- justify-items: flex-start;
- overflow: inherit;
- border: 0px solid transparent;
-
- .mat-button-toggle-checked {
- background-color: $iris-pastel;
- }
-}
+@import '@elemental-ui/core/src/styles/_palette.scss';
:host {
display: flex;
flex-direction: column;
overflow: auto;
height: 100%;
+
+ .mat-tab-group {
+ padding-top: 20px;
+
+ ::ng-deep .mat-tab-header {
+ background-color: $asher-gray;
+ border-bottom: 0px;
+ }
+ ::ng-deep .mat-tab-label {
+ background-color: $white;
+ }
+ }
}
.imx-tab-content {
display: flex;
flex-direction: column;
height: 100%;
-
-
}
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.spec.ts b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.spec.ts
index 152c0f4b9..409ca8d75 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.spec.ts
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.ts b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.ts
index 232956a5a..92ed9302f 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.ts
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -24,8 +24,7 @@
*
*/
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { MatButtonToggleChange } from '@angular/material/button-toggle';
+import { Component, Input } from '@angular/core';
import { OwnershipInformation } from 'imx-api-qer';
import { IEntity } from 'imx-qbm-dbts';
import { RoleService } from '../role.service';
@@ -33,41 +32,29 @@ import { RoleService } from '../role.service';
@Component({
selector: 'imx-role-memberships',
templateUrl: './role-memberships.component.html',
- styleUrls: ['./role-memberships.component.scss', '../sidesheet.scss']
+ styleUrls: ['./role-memberships.component.scss', '../sidesheet.scss'],
})
-export class RoleMembershipsComponent implements OnChanges {
- public selectedView: 'primary' | 'secondary' | 'exclusions' | 'dynamicgroup' = 'primary';
-
+export class RoleMembershipsComponent {
@Input() public entity: IEntity;
@Input() public isAdmin: boolean;
@Input() public ownershipInfo: OwnershipInformation;
- constructor(private readonly roleService: RoleService) { }
-
- public onToggleChanged(change: MatButtonToggleChange): void {
- this.selectedView = change.value;
- }
+ constructor(private readonly roleService: RoleService) {}
- public get canBeDynamic() {
+ public get canBeDynamic(): boolean {
return this.entity && this.roleService.canHaveDynamicMemberships(this.entity.TypeName);
}
- public get isDynamic() {
- return this.entity && this.entity.GetSchema().Columns["UID_DynamicGroup"] && this.entity.GetColumn("UID_DynamicGroup").GetValue();
+ public get isDynamic(): boolean {
+ return this.entity && this.entity.GetSchema().Columns['UID_DynamicGroup'] && this.entity.GetColumn('UID_DynamicGroup').GetValue();
}
- ngOnChanges(changes: SimpleChanges): void {
- if (changes.ownershipInfo && !this.canHavePrimaryMemberships()) {
- this.selectedView = 'secondary';
- }
+ public get uidDynamicGroup(): boolean {
+ return this.entity.GetColumn('UID_DynamicGroup').GetValue();
}
public canHavePrimaryMemberships(): boolean {
- return this.ownershipInfo
- && this.roleService.targetMap.get(this.ownershipInfo.TableName).membership.hasPrimaryMemberships();
+ return this.ownershipInfo && this.roleService.targetMap.get(this.ownershipInfo.TableName).membership.hasPrimaryMemberships();
}
- public get uidDynamicGroup() {
- return this.entity.GetColumn("UID_DynamicGroup").GetValue();
- }
}
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.module.ts b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.module.ts
index d234013f0..0ba0889ab 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.module.ts
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-memberships.module.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-sidesheet-tabs.scss b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-sidesheet-tabs.scss
index e27cfa43e..793e2a212 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/role-sidesheet-tabs.scss
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/role-sidesheet-tabs.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
.imx-tab-content-body {
flex: 1;
@@ -14,7 +14,7 @@
justify-content: flex-end;
align-items: center;
background-color: $white;
- padding: 16px 32px;
+ padding: 16px 27px 11px 32px;
margin: 16px 32px;
.imx-selected-items {
@@ -22,8 +22,9 @@
margin: 0;
line-height: 36px;
}
- > :not(:last-child){
+ > * {
margin-right: 5px;
+ margin-bottom: 5px;
}
.imx-menu-spacer {
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.scss b/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.scss
index 8481d9b91..0ae1d85a8 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.scss
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.scss
@@ -1,4 +1,4 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
:host {
display: flex;
flex-direction: column;
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.spec.ts b/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.spec.ts
index 67d52a789..b772cdc4a 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.spec.ts
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.ts b/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.ts
index 43270580e..261584e2a 100644
--- a/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.ts
+++ b/imxweb/projects/qer/src/lib/role-management/role-memberships/secondary-memberships.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
@@ -168,12 +168,13 @@ export class SecondaryMembershipsComponent implements OnInit {
public async onShowDetails(): Promise|
+ |
+
+ |
+ {{'#LDS#Assigned object' | translate}} | +
+ {{ entl.Property }}
+ {{ entl.TypeDisplay }}
+ |
+ {{'#LDS#Previous state' | translate}} | +
+ {{ entl.HistoryValueDisplay }}
+ |
+ {{'#LDS#Current state' | translate}} | +
+ {{ entl.CurrentValueDisplay }}
+ |
+
|---|
{{action.ObjectDisplay }}
+ {{action.Display }}
+ {{ item.Display}}
@@ -53,6 +55,15 @@
{{ getSubtitle(prod,dst.additionalListElements) }}
- +
-
-
diff --git a/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.scss b/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.scss
index 9c939cdd0..04d10a43b 100644
--- a/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.scss
+++ b/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.scss
@@ -1,5 +1,5 @@
-@import "~@elemental-ui/core/src/styles/_palette.scss";
+@import "@elemental-ui/core/src/styles/_palette.scss";
.governance-sidesheet {
::ng-deep .eui-alert {
@@ -26,7 +26,7 @@
::ng-deep .mat-tab-body-wrapper {
height: 100%;
}
-
+
.imx-edit-fk-open-picker {
display: none;
diff --git a/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.spec.ts b/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.spec.ts
index d0d6ff2a6..57b7b188f 100644
--- a/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.spec.ts
+++ b/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.ts b/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.ts
index 71ef1b117..2102d2601 100644
--- a/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.ts
+++ b/imxweb/projects/tsb/src/lib/accounts/account-sidesheet/account-sidesheet.component.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/tsb/src/lib/accounts/account-typed-entity.ts b/imxweb/projects/tsb/src/lib/accounts/account-typed-entity.ts
index df4824dc5..84fcef114 100644
--- a/imxweb/projects/tsb/src/lib/accounts/account-typed-entity.ts
+++ b/imxweb/projects/tsb/src/lib/accounts/account-typed-entity.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.spec.ts b/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.spec.ts
index a3cde23dc..e4e7baff1 100644
--- a/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.spec.ts
+++ b/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.spec.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.ts b/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.ts
index 363eb3233..97ebcc296 100644
--- a/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.ts
+++ b/imxweb/projects/tsb/src/lib/accounts/accounts-reports.service.ts
@@ -9,7 +9,7 @@
* those terms.
*
*
- * Copyright 2021 One Identity LLC.
+ * Copyright 2022 One Identity LLC.
* ALL RIGHTS RESERVED.
*
* ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
diff --git a/imxweb/projects/tsb/src/lib/accounts/accounts.component.html b/imxweb/projects/tsb/src/lib/accounts/accounts.component.html
index 1a5783854..b13c6f414 100644
--- a/imxweb/projects/tsb/src/lib/accounts/accounts.component.html
+++ b/imxweb/projects/tsb/src/lib/accounts/accounts.component.html
@@ -36,13 +36,25 @@
-
-
+
+
-
-
-
+
+
+
-
+
+
+
+
+
-
@@ -67,4 +71,4 @@
-
\ No newline at end of file
+
-
-
-
-
+
+
+
+
-
+
+
+
+
+
{{item.GetEntity().GetDisplay()}}
+ {{item.UID_Person.Column.GetDisplayValue()}}
+ {{item.UID_UNSRoot.Column.GetDisplayValue()}}
+ {{item.UID_DPRNameSpace.Column.GetDisplayValue()}}
+
+
+
+
+
+
+
+
+
+ #LDS#Please choose a target system for the report.
+
+
+
+
diff --git a/imxweb/projects/tsb/src/lib/accounts/target-system-report/target-system-report.component.scss b/imxweb/projects/tsb/src/lib/accounts/target-system-report/target-system-report.component.scss
new file mode 100644
index 000000000..675781889
--- /dev/null
+++ b/imxweb/projects/tsb/src/lib/accounts/target-system-report/target-system-report.component.scss
@@ -0,0 +1,16 @@
+:host {
+ overflow: hidden;
+ display: flex;
+}
+
+.eui-sidesheet-content {
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+}
+
+.imx-content-card {
+ margin-top: 10px;
+ flex: 1 1 auto;
+ overflow: auto;
+}
diff --git a/imxweb/projects/tsb/src/lib/accounts/target-system-report/target-system-report.component.ts b/imxweb/projects/tsb/src/lib/accounts/target-system-report/target-system-report.component.ts
new file mode 100644
index 000000000..7b5d0235e
--- /dev/null
+++ b/imxweb/projects/tsb/src/lib/accounts/target-system-report/target-system-report.component.ts
@@ -0,0 +1,106 @@
+/*
+ * ONE IDENTITY LLC. PROPRIETARY INFORMATION
+ *
+ * This software is confidential. One Identity, LLC. or one of its affiliates or
+ * subsidiaries, has supplied this software to you under terms of a
+ * license agreement, nondisclosure agreement or both.
+ *
+ * You may not copy, disclose, or use this software except in accordance with
+ * those terms.
+ *
+ *
+ * Copyright 2022 One Identity LLC.
+ * ALL RIGHTS RESERVED.
+ *
+ * ONE IDENTITY LLC. MAKES NO REPRESENTATIONS OR
+ * WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT. ONE IDENTITY LLC. SHALL NOT BE
+ * LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
+ * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+ * THIS SOFTWARE OR ITS DERIVATIVES.
+ *
+ */
+
+import { Overlay } from '@angular/cdk/overlay';
+import { HttpClient } from '@angular/common/http';
+import { Component, Injector, OnInit } from '@angular/core';
+import { EuiDownloadDirective, EuiLoadingService } from '@elemental-ui/core';
+
+import { IEntity } from 'imx-qbm-dbts';
+import { FilterTreeEntityWrapperService, FilterTreeDatabase, ElementalUiConfigService } from 'qbm';
+import { AccountsReportsService } from '../accounts-reports.service';
+import { AccountsService } from '../accounts.service';
+
+@Component({
+ selector: 'imx-target-system-report',
+ templateUrl: './target-system-report.component.html',
+ styleUrls: ['./target-system-report.component.scss']
+})
+export class TargetSystemReportComponent implements OnInit {
+
+ public showHelperAlert = true;
+ public database: FilterTreeDatabase;
+ public selectedEntity: IEntity;
+
+ constructor(
+ private busyService: EuiLoadingService,
+ private readonly entityWrapper: FilterTreeEntityWrapperService,
+ private readonly accountsService: AccountsService,
+ private readonly accountReport: AccountsReportsService,
+ private readonly elementalUiConfigService: ElementalUiConfigService,
+ private readonly http: HttpClient,
+ private readonly injector: Injector,
+ private readonly overlay: Overlay,
+ ) { }
+
+ public async ngOnInit(): Promise