Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f70881aebe952327a2f72c75ff8e9558794abdfd
3d28542482a25d74f73c23a92d14b20ecc4cb00a
4 changes: 1 addition & 3 deletions .sync-history
Original file line number Diff line number Diff line change
@@ -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
835898f90 2026-06-30 Merged PR 93496: #698009 - Web Portal: Fix profile language not applied when configured via Manager
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 3 additions & 1 deletion imxweb/.npmrc
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions imxweb/projects/qer-app-portal/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 || '');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down