diff --git a/.commit b/.commit index 7ce8cddde..81538a67a 100644 --- a/.commit +++ b/.commit @@ -1 +1 @@ -f70881aebe952327a2f72c75ff8e9558794abdfd +3d28542482a25d74f73c23a92d14b20ecc4cb00a diff --git a/.sync-history b/.sync-history index 4298a3e31..f3ea7cfdc 100644 --- a/.sync-history +++ b/.sync-history @@ -1,3 +1 @@ -f70881aeb 2026-06-17 Merged PR 93671: #721953 - QER: Fix IsInActive field not visible for non-admin users in identity sidesheet -e7f62f45c 2026-06-17 Merged PR 93417: #709042 - Web Portal: Fix ValidFrom error message when approving requests with MaxValidDays -679fe1db7 2026-06-11 Merged PR 93262: #706275 Enable bulk edit for role-membership cart items \ No newline at end of file +835898f90 2026-06-30 Merged PR 93496: #698009 - Web Portal: Fix profile language not applied when configured via Manager \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6443a03d2..0d8e38dd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### July 2, 2026 +- 709042: Fixing an issue with new request approval workflow valid dates. +- 698009: Fixing profile language not applied when configured via Manager. + ### June 18, 2026 - 710272: Fixing an issue with Rule violations filter column mismatch. - 706275: Fixing enable bulk edit for role-membership cart items. diff --git a/imxweb/.npmrc b/imxweb/.npmrc index bdbcfd3b9..c68cdb5aa 100644 --- a/imxweb/.npmrc +++ b/imxweb/.npmrc @@ -1,2 +1,4 @@ +@imx-modules:registry=https://pkgs.dev.azure.com/1id/_packaging/OneIdentity/npm/registry/ +@elemental-ui:registry=https://pkgs.dev.azure.com/1id/_packaging/OneIdentity/npm/registry/ # always-auth=true -engine-strict=true +engine-strict=true \ No newline at end of file diff --git a/imxweb/projects/qer-app-portal/src/app/app.component.ts b/imxweb/projects/qer-app-portal/src/app/app.component.ts index a475ae137..363a57ded 100644 --- a/imxweb/projects/qer-app-portal/src/app/app.component.ts +++ b/imxweb/projects/qer-app-portal/src/app/app.component.ts @@ -101,7 +101,8 @@ export class AppComponent implements OnInit, OnDestroy { this.isLoggedIn = sessionState.IsLoggedIn ?? false; if (this.isLoggedIn) { this.profileSettings = await this.qerClient.v2Client.portal_profile_get(); - const isUseProfileLangChecked = this.profileSettings.UseProfileLanguage ?? false; + const config: QerProjectConfig & ProjectConfig = await projectConfig.getConfig(); + const isUseProfileLangChecked = this.profileSettings.UseProfileLanguage ?? config.PersonConfig?.UseProfileCulture ?? false; // Set session culture if isUseProfileLangChecked is true if (isUseProfileLangChecked) { // Use culture if available, if not fetch @@ -115,7 +116,6 @@ export class AppComponent implements OnInit, OnDestroy { } } - const config: QerProjectConfig & ProjectConfig = await projectConfig.getConfig(); const features = (await userModelService.getFeatures()).Features ?? []; const systemInfo = await systemInfoService.get(); const groups = (await userModelService.getGroups()).map((group) => group.Name || ''); diff --git a/imxweb/projects/qer/src/lib/itshopapprove/workflow-action/workflow-action.service.ts b/imxweb/projects/qer/src/lib/itshopapprove/workflow-action/workflow-action.service.ts index 883aa37de..ab6cb4149 100644 --- a/imxweb/projects/qer/src/lib/itshopapprove/workflow-action/workflow-action.service.ts +++ b/imxweb/projects/qer/src/lib/itshopapprove/workflow-action/workflow-action.service.ts @@ -380,17 +380,21 @@ export class WorkflowActionService { const from = formGroup.controls.ValidFrom!.value; if (from) { request.ValidFrom.value = addTimeNowToDate(from); - } else { + } else if (requests.length === 1) { // The value was removed, so set it to null in order to not send an invalid date to the backend await request.ValidFrom.Column.PutValue(null); } } - if (request.canSetValidUntil(itShopConfig) && formGroup.controls.ValidUntil) { + if ( + request.canSetValidUntil(itShopConfig) && + formGroup.controls.ValidUntil && + (formGroup.controls.ValidUntil.value == null || !formGroup.controls.ValidUntil.value.isSame(request.ValidUntil.value, 'day')) + ) { const until = formGroup.controls.ValidUntil!.value; if (until) { request.ValidUntil.value = addTimeNowToDate(until); - } else { + } else if (requests.length === 1) { // The value was removed, so set it to null in order to not send an invalid date to the backend await request.ValidUntil.Column.PutValue(null); }