From e52b9676e412739c96c24eea4d63229258a0cac1 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 14 Oct 2019 15:37:57 +0100 Subject: [PATCH] upgrade to latest js api --- lib/core/form/services/form.service.ts | 8 +-- lib/core/models/user-process.model.ts | 2 + lib/core/services/people-process.service.ts | 4 +- package-lock.json | 78 +++++++++++++-------- package.json | 18 ++--- 5 files changed, 66 insertions(+), 44 deletions(-) diff --git a/lib/core/form/services/form.service.ts b/lib/core/form/services/form.service.ts index 77e7205d90..7dcb5b4254 100644 --- a/lib/core/form/services/form.service.ts +++ b/lib/core/form/services/form.service.ts @@ -436,7 +436,7 @@ export class FormService { * @param userId ID of the target user * @returns URL string */ - getUserProfileImageApi(userId: number): string { + getUserProfileImageApi(userId: string): string { return this.apiService.getInstance().activiti.userApi.getUserProfilePictureUrl(userId); } @@ -453,9 +453,9 @@ export class FormService { } return from(this.usersWorkflowApi.getUsers(option)) .pipe( - switchMap((response: any) => response.data || []), - map((user: any) => { - user.userImage = this.getUserProfileImageApi(user.id); + switchMap(response => response.data || []), + map((user) => { + user.userImage = this.getUserProfileImageApi(user.id.toString()); return of(user); }), combineAll(), diff --git a/lib/core/models/user-process.model.ts b/lib/core/models/user-process.model.ts index ac3acad17f..ced2f332ed 100644 --- a/lib/core/models/user-process.model.ts +++ b/lib/core/models/user-process.model.ts @@ -28,6 +28,7 @@ export class UserProcessModel implements LightUserRepresentation { lastName?: string; pictureId?: number; externalId?: string; + userImage?: string; constructor(input?: any) { if (input) { @@ -37,6 +38,7 @@ export class UserProcessModel implements LightUserRepresentation { this.lastName = input.lastName || null; this.pictureId = input.pictureId || null; this.externalId = input.externalId || null; + this.userImage = input.userImage; } } diff --git a/lib/core/services/people-process.service.ts b/lib/core/services/people-process.service.ts index e4c4856899..760772bc10 100644 --- a/lib/core/services/people-process.service.ts +++ b/lib/core/services/people-process.service.ts @@ -52,7 +52,7 @@ export class PeopleProcessService { * @returns Profile picture URL */ getUserImage(user: UserProcessModel): string { - return this.getUserProfileImageApi(user.id); + return this.getUserProfileImageApi(user.id.toString()); } /** @@ -95,7 +95,7 @@ export class PeopleProcessService { return this.alfrescoJsApi.getInstance().activiti.taskActionsApi.removeInvolvedUser(taskId, node); } - private getUserProfileImageApi(userId: number) { + private getUserProfileImageApi(userId: string): string { return this.alfrescoJsApi.getInstance().activiti.userApi.getUserProfilePictureUrl(userId); } diff --git a/package-lock.json b/package-lock.json index 72be33b630..4ec9e51ec2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.5.0.tgz", - "integrity": "sha512-qHkuhb2WRzhdU7fsRfTuhWwjl0yRoaXV0XEzcBzQ+8FDIcUzkUc/cT5TzJQrkhKkJtfpV4MQEYhhXWCoXqGlVA==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-y+OrHETNnVGW/3raUA08FcGX3aXOLaOKmotVIxkB5TC1shsTV0p3Y3L5vunu1pYZ4DzcbpQce6ffx+rSYsDmvA==", "requires": { "@angular-devkit/core": "^7.2.15", "commander": "^2.15.1", @@ -20,65 +20,65 @@ } }, "@alfresco/adf-content-services": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.5.0.tgz", - "integrity": "sha512-fdw6AJyujOP/XHzVeLRnH09IMfGRFiCKFfAPxt71jhq0fj4eywlIq/OwibvXNQ2jQfWBom7tt8WHKx5uq3nHZQ==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-UQgleXT/UEJMMiMALkgzhdtSVDC5oXxccahwcCzzNAsXfy366qGgHZD4GdE1UnIrcWqOpeRrS3LmHzeW4s8+gA==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.5.0.tgz", - "integrity": "sha512-uUD4hwTo2H7PTVSgo8bsp6X49dKQY5EPOh0B79bW4bTma6naoKoAGJ6wlpDBmxcG9CJNzBmmKu1pIwWhdmO71Q==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-HYjbVSssfZwxROKZXXjmUiN2j2k0Cvvsfz2b27qWIK7N7Z9/9yCuxiMPjEtZQW36jJLNA5ugPauK8o8xozsPCQ==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-extensions": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.5.0.tgz", - "integrity": "sha512-SbQ3+bXLZ1J+KJafcdttenJ/fe4EuqTzsb24C1Tkt4vDyHp48f0PdQL0Lq0FnMxQyErsrLijCIIlRsiWOIy24A==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-NLWYhUbGKdz6G/79VxRtw1ryS+Yi2sLYI3N9nggumYxKo/aOBxGC5VYuK1dSLqXrxIDr7a2EI+AdytF4qTWS6Q==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-insights": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.5.0.tgz", - "integrity": "sha512-u1XtaFxcaC4GBR9sJ/Tt3g/Zy6Hmg3mlq4uabqYMmHe13hmtnyQ0EZZkafpn7MD7yJ+uHejUNPuFD7brRuVxVg==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-f18Pmo64gXzaF8+zAEbf4ZDSV1G6Q4w1Oy7pxwal0xW38lygQCsah9xk38i1eyY77UWxvN8RvUb6U2e9jZSzSA==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-process-services": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.5.0.tgz", - "integrity": "sha512-7QpVUlIDhOrX7/mTeMPNQmkUBOUSvtcKouvyVw8d9R4Huuxr7Kg7xTzdfvfNW3zRN+LYPTzDW9cBepf1Z4ywyA==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-kJ+xChT8Jmg3L5zJs22fsJIRhHLpavEWQJAa7NPHrKrPRqmsu3xVIXVewRuCknGXGm3scVpomOCMDZpYFu1D9w==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-process-services-cloud": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.5.0.tgz", - "integrity": "sha512-+2uSBkOip12vROQBe6KXQLxB2dgJzSi5mkvVf5z9Ubn3adFwYa8JI2Bdr5EUz0cQU9t+kjdqjEe7u6+Oo4g4YQ==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-nkw26feKhPSKk0UbrPBAfV8acI7t4lMPCHwHPlmLkNX74JvqLtNa0mSzgjheOG+kblmxY4vETXaneqxgbNpxaw==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-testing": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.5.0.tgz", - "integrity": "sha512-eYGtcalnWCzxpv98kVN9rkQUWAB0Iglux43AwQXSiHRJnA4yWeuIS3UuaXL/grSuRyj+6H+1M8fMJZfKyXjDhQ==", + "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz", + "integrity": "sha512-GeEZGGkHoWu1v6+Z73INvjfjz8Azfi3tpjHPjEVq5eK4k7lnaeZLEMhR0PxQRsD4CUnkL6e6V0SmMU63urjFaQ==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/js-api": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.5.0.tgz", - "integrity": "sha512-LdbVDAR9AA5vwHHLHsp+v00D0XR82+myLR4JxRHIe/+KaP2DSIcZbmgqzIn0LH+tQgq3KSVcxSOZkVivB0TxOQ==", + "version": "3.6.0-7e8896bfba998c91066a9f4752af2ba4b7ea2aa2", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.6.0-7e8896bfba998c91066a9f4752af2ba4b7ea2aa2.tgz", + "integrity": "sha512-oIpYPWDwsiGGM0glZTY2KqIw3/DTYtP8QxR2/MqlMDp76VBfiQk3vIJGS04tQbtoUqC24nU59TwcPp3o6Pfn/A==", "requires": { "event-emitter": "0.3.4", "minimatch": "3.0.4", @@ -1454,6 +1454,11 @@ } } }, + "@types/caseless": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz", + "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==" + }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -1513,8 +1518,7 @@ "@types/node": { "version": "12.7.7", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.7.tgz", - "integrity": "sha512-4jUncNe2tj1nmrO/34PsRpZqYVnRV1svbU78cKhuQKkMntKB/AmdLyGgswcZKjFHEHGpiY8pVD8CuVI55nP54w==", - "dev": true + "integrity": "sha512-4jUncNe2tj1nmrO/34PsRpZqYVnRV1svbU78cKhuQKkMntKB/AmdLyGgswcZKjFHEHGpiY8pVD8CuVI55nP54w==" }, "@types/q": { "version": "0.0.32", @@ -1522,6 +1526,17 @@ "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", "dev": true }, + "@types/request": { + "version": "2.48.3", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz", + "integrity": "sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==", + "requires": { + "@types/caseless": "*", + "@types/node": "*", + "@types/tough-cookie": "*", + "form-data": "^2.5.0" + } + }, "@types/resolve": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", @@ -1555,6 +1570,11 @@ "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", "dev": true }, + "@types/tough-cookie": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz", + "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==" + }, "@types/unist": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", diff --git a/package.json b/package.json index 7648794bc0..e721459efb 100644 --- a/package.json +++ b/package.json @@ -74,15 +74,15 @@ "process services-cloud" ], "dependencies": { - "@alfresco/adf-cli": "3.5.0", - "@alfresco/adf-content-services": "3.5.0", - "@alfresco/adf-core": "3.5.0", - "@alfresco/adf-extensions": "3.5.0", - "@alfresco/adf-insights": "3.5.0", - "@alfresco/adf-process-services": "3.5.0", - "@alfresco/adf-process-services-cloud": "3.5.0", - "@alfresco/adf-testing": "3.5.0", - "@alfresco/js-api": "3.5.0", + "@alfresco/adf-cli": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/adf-content-services": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/adf-core": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/adf-extensions": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/adf-insights": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/adf-process-services": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/adf-process-services-cloud": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/adf-testing": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5", + "@alfresco/js-api": "3.6.0-7e8896bfba998c91066a9f4752af2ba4b7ea2aa2", "@angular/animations": "^7.2.15", "@angular/cdk": "7.3.7", "@angular/common": "^7.2.15",