Sync repo from v92 to v92 20260526133217

.commit

@@ -1 +1 @@
-6b6998cc884ef6dbb04b736e3e5ba964ba5e7db4
+8ed8069fa26715010b073311bfeb2dabb01734fb

.sync-history

@@ -1 +1 @@
-6b6998cc8 2026-04-17 Merged PR 91918: 703974 - Angular Web Portal: Additional column values are not loaded in grouped tables
+406dbad84 2026-04-20 Merged PR 92027: #704328 - Fix request filter

CHANGELOG.md

@@ -1,11 +1,17 @@
+
+### May 26, 2026
+- 710276: Fixing an issue with Operations Support portal Pending Provisioning Processes page load overlay error.
+- 648928: Fixing an issue with user profile language not applied under certain circumstances.
+- 707565: Fixing an issue with ordering a product where the service item has a mandatory image form field.
+- 704328 (446299): Fixes an issue with adding a condition to a custom filter for system entitlements.
+
 ### April 17, 2026
 - 698600 (647825): Fixing an issue with an error on the Rule Violations page if the Riskindex config param is deactivated.
 - 494303: Fixes an issue with a missing badge for an active filter.
 - 702219: Fixes an issue with empty report generation of policy collection attestation runs.
 - 703157: Fixes an issue with refactoring of the edit-fk.model.ts file.
 - 703180(697986): Fixes an issue with a missing warning if there are too many results for the search.
 - 496653: Adds support for decimal range report parameters.
-- 704328 (446299): Fixes an issue with adding a condition to a custom filter for system entitlements.
 - 703974: Fixes an issue with additional column values that are not loaded into a grouped table.
 
 ### March 26, 2026
@@ -431,4 +437,4 @@ The v92 branch has been updated with fixes for the following issues.
 
 ### May 2, 2022
 
-The repository has been updated with the code changes for the Identity Manager 8.2.1 release.
+The repository has been updated with the code changes for the Identity Manager 8.2.1 release.

imxweb/package.json

@@ -50,7 +50,7 @@
     "applicationinsights-js": "^1.0.21",
     "billboard.js": "^3.11.3",
     "core-js": "^2.6.9",
-    "cytoscape": "^3.23.0",
+    "cytoscape": "^3.33.2",
     "cytoscape-edgehandles": "^4.0.1",
     "d3-hierarchy": "^3.1.2",
     "d3-scale": "^4.0.2",

imxweb/projects/qbm/src/lib/cdr/edit-image/edit-image.component.html

@@ -1,14 +1,16 @@
-<input [hidden]="true" #file type="file" multiple="false" accept="image/png" (change)="emitFiles($event.target.files)"/>
+<input [hidden]="true" #file type="file" multiple="false" accept="image/png" (change)="emitFiles($event.target.files)" />
 
-<imx-image-select *ngIf="columnContainer?.canEdit; else imageView"
+<imx-image-select
+  *ngIf="columnContainer?.canEdit; else imageView"
   [valueWrapper]="columnContainer"
   [control]="control"
   [fileFormatHint]="fileFormatHint"
   [isLoading]="isLoading"
-  (change)="resetFileFormatErrorState();file.click()"
-  (remove)="remove()">
+  (change)="resetFileFormatErrorState(); file.click()"
+  (remove)="remove()"
+>
 </imx-image-select>
-<mat-error *ngIf="control.errors?.['generalError']">
+<mat-error *ngIf="!!control.errors?.['generalError']">
   {{ validationErrorMessage }}
 </mat-error>
 

imxweb/projects/qbm/src/lib/cdr/edit-image/edit-image.component.ts

@@ -28,26 +28,26 @@ import { Component, ElementRef, EventEmitter, OnDestroy, ViewChild } from '@angu
 import { UntypedFormControl, Validators } from '@angular/forms';
 import { Subject, Subscription } from 'rxjs';
 
-import { ColumnDependentReference } from '../column-dependent-reference.interface';
-import { EditorBase } from '../editor-base';
-import { CdrEditor, ValueHasChangedEventArg } from '../cdr-editor.interface';
-import { EntityColumnContainer } from '../entity-column-container';
 import { ServerError } from '../../base/server-error';
 import { ClassloggerService } from '../../classlogger/classlogger.service';
-import { Base64ImageService } from '../../images/base64-image.service';
 import { FileSelectorService } from '../../file-selector/file-selector.service';
-
+import { Base64ImageService } from '../../images/base64-image.service';
+import { CdrEditor, ValueHasChangedEventArg } from '../cdr-editor.interface';
+import { ColumnDependentReference } from '../column-dependent-reference.interface';
+import { EditorBase } from '../editor-base';
+import { EntityColumnContainer } from '../entity-column-container';
 
 /**
  * Provides a {@link CdrEditor | CDR editor} for editing / viewing image data columns.
- * 
+ *
  * To change its value, it uses an {@link ImageSelectComponent | image select component}.
  * When set to read-only, it uses an {@link ImageViewComponent | image view component} to display the content.
  */
 @Component({
   selector: 'imx-edit-image',
   templateUrl: './edit-image.component.html',
   styleUrls: ['./edit-image.component.scss'],
+  providers: [FileSelectorService],
 })
 export class EditImageComponent implements CdrEditor, OnDestroy {
   /**
@@ -106,11 +106,11 @@ export class EditImageComponent implements CdrEditor, OnDestroy {
   constructor(
     private readonly logger: ClassloggerService,
     private readonly imageProvider: Base64ImageService,
-    private readonly fileSelector: FileSelectorService
+    private readonly fileSelector: FileSelectorService,
   ) {
     this.subscriptions.push(
       this.fileSelector.fileFormatError.subscribe(() => (this.fileFormatError = true)),
-      this.fileSelector.fileSelected.subscribe((filepath) => this.writeValue(this.imageProvider.getImageData(filepath)))
+      this.fileSelector.fileSelected.subscribe((filepath) => this.writeValue(this.imageProvider.getImageData(filepath))),
     );
   }
 
@@ -138,7 +138,7 @@ export class EditImageComponent implements CdrEditor, OnDestroy {
         this.subscriptions.push(
           cdref.minlengthSubject.subscribe(() => {
             this.setValidators();
-          })
+          }),
         );
       }
       this.subscriptions.push(
@@ -151,7 +151,7 @@ export class EditImageComponent implements CdrEditor, OnDestroy {
             this.control.setValue(this.columnContainer.value, { emitEvent: false });
           }
           this.valueHasChanged.emit({ value: this.control.value });
-        })
+        }),
       );
 
       this.subscriptions.push(
@@ -168,7 +168,7 @@ export class EditImageComponent implements CdrEditor, OnDestroy {
             } finally {
             }
           });
-        })
+        }),
       );
       this.control.addValidators(EditorBase.hasServerError(this));
     }
@@ -219,7 +219,7 @@ export class EditImageComponent implements CdrEditor, OnDestroy {
    */
   private async writeValue(value: string): Promise<void> {
     this.logger.debug(this, 'writeValue called with value', value);
-    if (this.control.errors && Object.keys(this.control.errors).some((elem) => elem !== 'generalError')) {
+    if (this.control.errors && Object.keys(this.control.errors).some((elem) => elem !== 'generalError' && elem !== 'required')) {
       this.logger.debug(this, 'writeValue - client validation failed');
       return;
     }

imxweb/projects/qbm/src/lib/data-source-toolbar/filter-wizard/filter-wizard.component.ts

@@ -156,7 +156,7 @@ export class FilterWizardComponent implements OnDestroy {
   }
 
   public get showSqlWizard(): boolean {
-    return this.sqlWizardSvc.implemented && !!this.data.settings?.entitySchema?.TypeName;
+    return this.sqlWizardSvc.implemented;
   }
 
   private async close(): Promise<void> {

imxweb/projects/qbm/src/lib/fk-advanced-picker/candidate-entity.ts

@@ -24,19 +24,18 @@
  *
  */
 
-import { TypedEntity, EntitySchema, DisplayColumns, ValType } from 'imx-qbm-dbts';
+import { DisplayColumns, EntitySchema, TypedEntity, ValType } from 'imx-qbm-dbts';
 
 export class CandidateEntity extends TypedEntity {
-    public static GetEntitySchema(): EntitySchema {
-        const columns = {
-            XObjectKey: {
-                Type: ValType.String,
-                ColumnName: 'XObjectKey'
-            }
-        };
+  public static GetEntitySchema(tablename?: string): EntitySchema {
+    const columns = {
+      XObjectKey: {
+        Type: ValType.String,
+        ColumnName: 'XObjectKey',
+      },
+    };
 
-        columns[DisplayColumns.DISPLAY_PROPERTYNAME] = DisplayColumns.DISPLAY_PROPERTY;
-
-        return { Columns: columns };
-    }
+    columns[DisplayColumns.DISPLAY_PROPERTYNAME] = DisplayColumns.DISPLAY_PROPERTY;
+    return { Columns: columns, TypeName: tablename };
+  }
 }

imxweb/projects/qbm/src/lib/fk-advanced-picker/fk-selector.component.ts

@@ -24,31 +24,32 @@
  *
  */
 
-import { Component, OnInit, ViewChild, Input, Output, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 
 import {
-  TypedEntityBuilder,
   CollectionLoadParameters,
-  DisplayColumns,
-  ValType,
-  TypedEntity,
-  IForeignKeyInfo,
-  FilterType,
   CompareOperator,
-  DbObjectKey,
+  DataModel,
   DataModelFilter,
+  DbObjectKey,
+  DisplayColumns,
+  EntitySchema,
   FilterData,
-  DataModel,
+  FilterType,
+  IForeignKeyInfo,
+  TypedEntity,
+  TypedEntityBuilder,
+  ValType,
 } from 'imx-qbm-dbts';
-import { ClassloggerService } from '../classlogger/classlogger.service';
+import { BusyService } from '../base/busy.service';
 import { MetadataService } from '../base/metadata.service';
+import { ClassloggerService } from '../classlogger/classlogger.service';
+import { ClientPropertyForTableColumns } from '../data-source-toolbar/client-property-for-table-columns';
 import { DataSourceToolbarSettings } from '../data-source-toolbar/data-source-toolbar-settings';
-import { CandidateEntity } from './candidate-entity';
 import { DataTableComponent } from '../data-table/data-table.component';
-import { ForeignKeyPickerData } from './foreign-key-picker-data.interface';
 import { SettingsService } from '../settings/settings-service';
-import { ClientPropertyForTableColumns } from '../data-source-toolbar/client-property-for-table-columns';
-import { BusyService } from '../base/busy.service';
+import { CandidateEntity } from './candidate-entity';
+import { ForeignKeyPickerData } from './foreign-key-picker-data.interface';
 
 @Component({
   selector: 'imx-fk-selector',
@@ -70,16 +71,16 @@ export class FkSelectorComponent implements OnInit {
   @Output() public selectedCandidatesChanges = new EventEmitter();
 
   public busyService = new BusyService();
+  public entitySchema: EntitySchema = CandidateEntity.GetEntitySchema();
 
   private readonly builder = new TypedEntityBuilder(CandidateEntity);
-  private readonly entitySchema = CandidateEntity.GetEntitySchema();
   private filters: DataModelFilter[];
   private dataModel: DataModel;
 
   constructor(
     public readonly metadataProvider: MetadataService,
     private readonly settingsService: SettingsService,
-    private readonly logger: ClassloggerService
+    private readonly logger: ClassloggerService,
   ) {}
 
   public async ngOnInit(): Promise<void> {
@@ -89,6 +90,7 @@ export class FkSelectorComponent implements OnInit {
       this.logger.trace(this, 'Pre-select the first candidate table');
       this.selectedTable = this.data.fkRelations.find((fkr) => fkr.TableName === this.data.selectedTableName) || this.data.fkRelations[0];
       this.dataModel = await this.selectedTable.GetDataModel();
+      this.entitySchema = CandidateEntity.GetEntitySchema(this.selectedTable.TableName);
       this.filters = this.dataModel.Filters;
     }
 

imxweb/projects/qer-app-portal/src/app/app.component.ts

@@ -101,7 +101,7 @@ export class AppComponent implements OnInit, OnDestroy {
           const systemInfo = await systemInfoService.get();
           const groups = (await userModelService.getGroups()).map((group) => group.Name || '');
           this.profileSettings = await this.qerClient.v2Client.portal_profile_get();
-          const isUseProfileLangChecked = this.profileSettings.UseProfileLanguage ?? false;
+          const isUseProfileLangChecked = this.profileSettings.UseProfileLanguage ?? config.PersonConfig?.UseProfileCulture ?? false;
           // Set session culture if isUseProfileLangChecked is true, set browser culture otherwise
           if (isUseProfileLangChecked) {
             await this.translationProvider.init(sessionState.culture, sessionState.cultureFormat);