upgrade to latest js api

This commit is contained in:
Denys Vuika
2019-10-14 15:37:57 +01:00
parent 1d7ef62095
commit e52b9676e4
5 changed files with 66 additions and 44 deletions

View File

@@ -436,7 +436,7 @@ export class FormService {
* @param userId ID of the target user * @param userId ID of the target user
* @returns URL string * @returns URL string
*/ */
getUserProfileImageApi(userId: number): string { getUserProfileImageApi(userId: string): string {
return this.apiService.getInstance().activiti.userApi.getUserProfilePictureUrl(userId); return this.apiService.getInstance().activiti.userApi.getUserProfilePictureUrl(userId);
} }
@@ -453,9 +453,9 @@ export class FormService {
} }
return from(this.usersWorkflowApi.getUsers(option)) return from(this.usersWorkflowApi.getUsers(option))
.pipe( .pipe(
switchMap((response: any) => <UserProcessModel[]> response.data || []), switchMap(response => <UserProcessModel[]> response.data || []),
map((user: any) => { map((user) => {
user.userImage = this.getUserProfileImageApi(user.id); user.userImage = this.getUserProfileImageApi(user.id.toString());
return of(user); return of(user);
}), }),
combineAll(), combineAll(),

View File

@@ -28,6 +28,7 @@ export class UserProcessModel implements LightUserRepresentation {
lastName?: string; lastName?: string;
pictureId?: number; pictureId?: number;
externalId?: string; externalId?: string;
userImage?: string;
constructor(input?: any) { constructor(input?: any) {
if (input) { if (input) {
@@ -37,6 +38,7 @@ export class UserProcessModel implements LightUserRepresentation {
this.lastName = input.lastName || null; this.lastName = input.lastName || null;
this.pictureId = input.pictureId || null; this.pictureId = input.pictureId || null;
this.externalId = input.externalId || null; this.externalId = input.externalId || null;
this.userImage = input.userImage;
} }
} }

View File

@@ -52,7 +52,7 @@ export class PeopleProcessService {
* @returns Profile picture URL * @returns Profile picture URL
*/ */
getUserImage(user: UserProcessModel): string { 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); 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); return this.alfrescoJsApi.getInstance().activiti.userApi.getUserProfilePictureUrl(userId);
} }

78
package-lock.json generated
View File

@@ -5,9 +5,9 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-cli": { "@alfresco/adf-cli": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-qHkuhb2WRzhdU7fsRfTuhWwjl0yRoaXV0XEzcBzQ+8FDIcUzkUc/cT5TzJQrkhKkJtfpV4MQEYhhXWCoXqGlVA==", "integrity": "sha512-y+OrHETNnVGW/3raUA08FcGX3aXOLaOKmotVIxkB5TC1shsTV0p3Y3L5vunu1pYZ4DzcbpQce6ffx+rSYsDmvA==",
"requires": { "requires": {
"@angular-devkit/core": "^7.2.15", "@angular-devkit/core": "^7.2.15",
"commander": "^2.15.1", "commander": "^2.15.1",
@@ -20,65 +20,65 @@
} }
}, },
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-fdw6AJyujOP/XHzVeLRnH09IMfGRFiCKFfAPxt71jhq0fj4eywlIq/OwibvXNQ2jQfWBom7tt8WHKx5uq3nHZQ==", "integrity": "sha512-UQgleXT/UEJMMiMALkgzhdtSVDC5oXxccahwcCzzNAsXfy366qGgHZD4GdE1UnIrcWqOpeRrS3LmHzeW4s8+gA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-uUD4hwTo2H7PTVSgo8bsp6X49dKQY5EPOh0B79bW4bTma6naoKoAGJ6wlpDBmxcG9CJNzBmmKu1pIwWhdmO71Q==", "integrity": "sha512-HYjbVSssfZwxROKZXXjmUiN2j2k0Cvvsfz2b27qWIK7N7Z9/9yCuxiMPjEtZQW36jJLNA5ugPauK8o8xozsPCQ==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-SbQ3+bXLZ1J+KJafcdttenJ/fe4EuqTzsb24C1Tkt4vDyHp48f0PdQL0Lq0FnMxQyErsrLijCIIlRsiWOIy24A==", "integrity": "sha512-NLWYhUbGKdz6G/79VxRtw1ryS+Yi2sLYI3N9nggumYxKo/aOBxGC5VYuK1dSLqXrxIDr7a2EI+AdytF4qTWS6Q==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-insights": { "@alfresco/adf-insights": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-u1XtaFxcaC4GBR9sJ/Tt3g/Zy6Hmg3mlq4uabqYMmHe13hmtnyQ0EZZkafpn7MD7yJ+uHejUNPuFD7brRuVxVg==", "integrity": "sha512-f18Pmo64gXzaF8+zAEbf4ZDSV1G6Q4w1Oy7pxwal0xW38lygQCsah9xk38i1eyY77UWxvN8RvUb6U2e9jZSzSA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-process-services": { "@alfresco/adf-process-services": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-7QpVUlIDhOrX7/mTeMPNQmkUBOUSvtcKouvyVw8d9R4Huuxr7Kg7xTzdfvfNW3zRN+LYPTzDW9cBepf1Z4ywyA==", "integrity": "sha512-kJ+xChT8Jmg3L5zJs22fsJIRhHLpavEWQJAa7NPHrKrPRqmsu3xVIXVewRuCknGXGm3scVpomOCMDZpYFu1D9w==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-process-services-cloud": { "@alfresco/adf-process-services-cloud": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-+2uSBkOip12vROQBe6KXQLxB2dgJzSi5mkvVf5z9Ubn3adFwYa8JI2Bdr5EUz0cQU9t+kjdqjEe7u6+Oo4g4YQ==", "integrity": "sha512-nkw26feKhPSKk0UbrPBAfV8acI7t4lMPCHwHPlmLkNX74JvqLtNa0mSzgjheOG+kblmxY4vETXaneqxgbNpxaw==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-testing": { "@alfresco/adf-testing": {
"version": "3.5.0", "version": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5.tgz",
"integrity": "sha512-eYGtcalnWCzxpv98kVN9rkQUWAB0Iglux43AwQXSiHRJnA4yWeuIS3UuaXL/grSuRyj+6H+1M8fMJZfKyXjDhQ==", "integrity": "sha512-GeEZGGkHoWu1v6+Z73INvjfjz8Azfi3tpjHPjEVq5eK4k7lnaeZLEMhR0PxQRsD4CUnkL6e6V0SmMU63urjFaQ==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/js-api": { "@alfresco/js-api": {
"version": "3.5.0", "version": "3.6.0-7e8896bfba998c91066a9f4752af2ba4b7ea2aa2",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.6.0-7e8896bfba998c91066a9f4752af2ba4b7ea2aa2.tgz",
"integrity": "sha512-LdbVDAR9AA5vwHHLHsp+v00D0XR82+myLR4JxRHIe/+KaP2DSIcZbmgqzIn0LH+tQgq3KSVcxSOZkVivB0TxOQ==", "integrity": "sha512-oIpYPWDwsiGGM0glZTY2KqIw3/DTYtP8QxR2/MqlMDp76VBfiQk3vIJGS04tQbtoUqC24nU59TwcPp3o6Pfn/A==",
"requires": { "requires": {
"event-emitter": "0.3.4", "event-emitter": "0.3.4",
"minimatch": "3.0.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": { "@types/estree": {
"version": "0.0.39", "version": "0.0.39",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
@@ -1513,8 +1518,7 @@
"@types/node": { "@types/node": {
"version": "12.7.7", "version": "12.7.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.7.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.7.tgz",
"integrity": "sha512-4jUncNe2tj1nmrO/34PsRpZqYVnRV1svbU78cKhuQKkMntKB/AmdLyGgswcZKjFHEHGpiY8pVD8CuVI55nP54w==", "integrity": "sha512-4jUncNe2tj1nmrO/34PsRpZqYVnRV1svbU78cKhuQKkMntKB/AmdLyGgswcZKjFHEHGpiY8pVD8CuVI55nP54w=="
"dev": true
}, },
"@types/q": { "@types/q": {
"version": "0.0.32", "version": "0.0.32",
@@ -1522,6 +1526,17 @@
"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
"dev": true "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": { "@types/resolve": {
"version": "0.0.8", "version": "0.0.8",
"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
@@ -1555,6 +1570,11 @@
"integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
"dev": true "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": { "@types/unist": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",

View File

@@ -74,15 +74,15 @@
"process services-cloud" "process services-cloud"
], ],
"dependencies": { "dependencies": {
"@alfresco/adf-cli": "3.5.0", "@alfresco/adf-cli": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/adf-content-services": "3.5.0", "@alfresco/adf-content-services": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/adf-core": "3.5.0", "@alfresco/adf-core": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/adf-extensions": "3.5.0", "@alfresco/adf-extensions": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/adf-insights": "3.5.0", "@alfresco/adf-insights": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/adf-process-services": "3.5.0", "@alfresco/adf-process-services": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/adf-process-services-cloud": "3.5.0", "@alfresco/adf-process-services-cloud": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/adf-testing": "3.5.0", "@alfresco/adf-testing": "3.6.0-1d7ef6209592e8703cdbaf48d4340d141fa461a5",
"@alfresco/js-api": "3.5.0", "@alfresco/js-api": "3.6.0-7e8896bfba998c91066a9f4752af2ba4b7ea2aa2",
"@angular/animations": "^7.2.15", "@angular/animations": "^7.2.15",
"@angular/cdk": "7.3.7", "@angular/cdk": "7.3.7",
"@angular/common": "^7.2.15", "@angular/common": "^7.2.15",