Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update v91 from source repository #140

Merged
merged 2 commits into from
May 7, 2024
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 @@
b3f764edcbb79ac7e5709cbc606b7549d68ca374
212c038772ffd7ce23bc8d0f0a26a2feed2444fa
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@

## Change log

### May 7, 2024

The package versions have been updated to 9.1.3.

The `v91` branch has been updated with fixes for the following issues.

- 418493:Fixed an issue in the overview of request approvers
- 449890: Fixed the inherited group membership pagination
- 449915: Fixed an inconsistency with the pending item display after approving a request
- 452771: Fixed an issue in the overview of attestation case approvers

### March 11, 2024
- 440206: When a request is added to the cart, request properties were sometimes not correctly applied to the shopping cart item.
- 446476: The number of pending requests and shopping cart items were not being updated correctly.
Expand Down
Binary file modified imxweb/imx-modules/imx-api-aad.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-aob.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-att.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-cpl.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-dpr.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-hds.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-o3t.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-olg.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-pol.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-qbm.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-qer.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-rmb.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-rms.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-rps.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-tsb.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api-uci.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-api.tgz
Binary file not shown.
Binary file modified imxweb/imx-modules/imx-qbm-dbts.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion imxweb/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion imxweb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "imxweb",
"version": "9.1.2",
"version": "9.1.3",
"scripts": {
"ng": "ng",
"start": "ng serve --configuration development",
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/aad/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aad",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-aad"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/aob/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aob",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-aob"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/arc-app-certaccess/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arc-app-certaccess",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"peerDependencies": {

Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/att/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "att",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-att"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/cpl/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cpl",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-cpl"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/dpr/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dpr",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/hds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hds",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-hds"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/o3t/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "o3t",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-o3t"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/olg/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "olg",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-olg"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/pol/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pol",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-pol"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/qbm-app-landingpage/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qbm-app-landingpage",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"peerDependencies": {

Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/qbm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qbm",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"dependencies": {

Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/qer-app-operationssupport/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qer-app-operationssupport",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"description": "One Identity Manager Operations Support Web Portal",
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/qer-app-portal/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qer-app-portal",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"peerDependencies": {
}
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/qer-app-pwdportal/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "qer-app-pwdportal",
"version": "9.1.2",
"version": "9.1.3",
"private": true
}
2 changes: 1 addition & 1 deletion imxweb/projects/qer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qer",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"dependencies": {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ describe('ApproverContainer', () => {
UID_PersonHead: {
Value: uidPersonHead,
DisplayValue: uidPersonHead,
}
},
Decision: {Value: ''}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,12 @@ export class ApproverContainer {
? []
: this.request.pwoData.WorkflowData.Entities.filter(
(data) =>
!this.isDecided(data,this.request.pwoData.WorkflowData.Entities.filter((elem) => elem.Columns.Decision?.Value !== '')) &&
data.Columns.UID_PersonHead.Value &&
currentSteps.some((step) => data.Columns.UID_QERWorkingStep.Value === step.uidWorkingStep) &&
this.request.approvers.includes(data.Columns.UID_PersonHead.Value)
).sort((data1, data2) => data1.Columns.UID_PersonHead.DisplayValue.localeCompare(data2.Columns.UID_PersonHead.DisplayValue));

this.logger?.trace(this, 'personWantsOrg should be approved by', this.approverNow);
}

Expand All @@ -152,6 +154,17 @@ export class ApproverContainer {
}
}

/*
* Checks, if a workflowData item is already decided (by any person in the same sub step)
*/
private isDecided(data: EntityData, decidedEntries:EntityData[]): boolean {
return decidedEntries.some(
(elem) =>
elem.Columns.LevelNumber.Value === data.Columns.LevelNumber.Value &&
elem.Columns.SubLevelNumber.Value === data.Columns.SubLevelNumber.Value
);
}

private buildOrderedWorkingSteps(): OrderedWorkingStep[] {
if (this.request == null || this.request.pwoData == null) {
return [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ describe('RequestActionService', () => {
{
provide: UserModelService,
useValue: {
reloadPendingItems: jasmine.createSpy('ReloadPendingItems')
reloadPendingItems: jasmine.createSpy('ReloadPendingItems'),
reloadUserConfig: jasmine.createSpy('reloadUserConfig')
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,15 @@ export class RequestActionService {
} catch (error) {
this.errorHandler.handleError(error);
} finally {
await this.userService.reloadPendingItems();
await this.userService.reloadPendingItems();
await this.userService.reloadUserConfig();
setTimeout(() => this.busyService.hide(busyIndicator));
}

if (success) {
this.snackBar.open({
key: config.message, parameters: [config.data.requests.length]
});
await this.userService.reloadPendingItems();
this.applied.next();
}
} else {
Expand Down
6 changes: 6 additions & 0 deletions imxweb/projects/qer/src/lib/user/user-model.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class UserModelService {
private pendingItems: CachedPromise<PendingItemsType>;
private userConfig: CachedPromise<UserConfig>;


public onPendingItemsChange = new Subject<PendingItemsType>();

constructor(private qerClient: QerApiService, private readonly cache: CacheService) {
Expand All @@ -51,6 +52,11 @@ export class UserModelService {
return this.userConfig.get();
}

public async reloadUserConfig(): Promise<void> {
this.userConfig = undefined;
await this.getUserConfig();
}

public getPendingItems(): Promise<PendingItemsType> {
if (this.pendingItems == null) {
this.pendingItems = this.cache.buildCache(() => this.qerClient.client.portal_pendingitems_get());
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/rmb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rmb",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-rmb"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/rms/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rms",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-rms"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/rps/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rps",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-rps"
Expand Down
2 changes: 1 addition & 1 deletion imxweb/projects/tsb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tsb",
"version": "9.1.2",
"version": "9.1.3",
"private": true,
"bundledDependencies": [
"imx-api-tsb"
Expand Down
Loading
Loading