From 0a539e9fdd70c25d299deeed5bebf82f2c7bfe3c Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Thu, 13 Oct 2016 18:18:50 +0100 Subject: [PATCH] Refactor for PR --- .../ng2-alfresco-userinfo/karma.conf.js | 4 + .../src/assets/anonymous.gif | Bin 0 -> 1765 bytes .../src/assets/bpmImg.gif | Bin 0 -> 1765 bytes .../src/assets/ecmImg.gif | Bin 0 -> 1765 bytes .../src/assets/fake-bpm-user.service.mock.ts | 65 +++-- .../src/assets/fake-ecm-user.service.mock.ts | 29 +- .../src/components/user-info.component.html | 40 +-- .../components/user-info.component.spec.ts | 273 +++++++++++------- .../src/components/user-info.component.ts | 35 +-- .../src/services/bpm-user.service.spec.ts | 20 +- .../src/services/bpm-user.service.ts | 22 +- 11 files changed, 289 insertions(+), 199 deletions(-) create mode 100644 ng2-components/ng2-alfresco-userinfo/src/assets/anonymous.gif create mode 100644 ng2-components/ng2-alfresco-userinfo/src/assets/bpmImg.gif create mode 100644 ng2-components/ng2-alfresco-userinfo/src/assets/ecmImg.gif diff --git a/ng2-components/ng2-alfresco-userinfo/karma.conf.js b/ng2-components/ng2-alfresco-userinfo/karma.conf.js index 8f3adc54b4..2b805693c3 100644 --- a/ng2-components/ng2-alfresco-userinfo/karma.conf.js +++ b/ng2-components/ng2-alfresco-userinfo/karma.conf.js @@ -45,6 +45,10 @@ module.exports = function (config) { // ng2-components { pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false }, + // Fake files + { pattern: 'src/assets/ecmImg.gif', included: false, watched: true, served: true }, + { pattern: 'src/assets/bpmImg.gif', included: false, watched: true, served: true }, + { pattern: 'src/img/anonymous.gif', included: false, watched: true, served: true }, // paths to support debugging with source maps in dev tools {pattern: 'src/**/*.ts', included: false, watched: false}, diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/anonymous.gif b/ng2-components/ng2-alfresco-userinfo/src/assets/anonymous.gif new file mode 100644 index 0000000000000000000000000000000000000000..e1b58fa57dfcdfd452ec498c98b930aa905d21d6 GIT binary patch literal 1765 zcmb8pizCyC0|4;vcMq|L=guW!Vi%c59pzQG$YVmt(9<&qUk|0_<~^#dpPrfJR`3LkEhFNwuD*UseB%E9NpnxZIwFun4Gh4>giwRA zc0?x^01y1ne**w~537AIAf!0BrjESujDjDc-khY>t=wMO?<%F(;}2yFR74Dt%}a)P zREJt`!8kwqm|RZoeK}|r3IHK##rgzkWXR z#*`{VI@~f{tInV0ukwK$G*WXf9#@J?Z!6r2$!xjap@7u(QUCMI;#?2#}9bcnDw%MSwt8tuX$>-NEJGdr(T*AtL&uqN~#WT z-g_QP^LsP+c=+}i&ztKwm?_}Wl%Vf);6;vy(fFPKq-Krf{zpQvQICg(?Ug@>Nx&U+ zjC*f3!1kFY4zS~t!;(qN5%NIU3H4v3)8o8SJ&}xYli-Iq9S6HVS;BT^QM6I<7xiew zs43F&{rZ7&()90DAGOE2XC;|(F#99fIapv)+E_ML>o!h2H=U!U*6L3=``J^Qqoo7W zf@~)ZW~T7YOjSR6)Sl9&+Nd*+aNRrksZvj^#`9rO9o8rC1d|21)u|F3inL-f#Wi}R<~|kmHN&5; z3B)yYe%YIv8;IuZpFayGV;%0-^uB2NgFe{gg7ft_xj^TT_Y{uR${^)A3ysIpSs39& z9ijG;m}vnKkiUg2%P?vsYQCJO@$_OV@CO0Hu)t)o;|R^??X%tO1-F=8j*)@eCsBO8 zi%eVFsxw-!Lvd0lwD|S>cPa5}M3u<4Tb}T$Ox;$^a_lM*m{i5Pu{oB{h2Ay`Po(Dx zD#N-MNvdBGX_`Lud8}5idh^1LixlXK&^sCJ@PI-IJn*VhrM|k_W5)x{ zzhbeqUP%h#MU{Oa-7EuT&#~1EiAPO=nPq4Rbk@D@* z6M~fh0C=qA2Fx`k=Mt6^izaq#br)QLk3CvAW9%+&^6yXaFr(JLRl%+P{?WF8(;BaX zE{t!)7R`6~pLq*@-8wtlZL#g$h)*e9)U%B{XxYCXGPN_V;k|Z!l;3$33aB3vZ~j!f z8jhOM^$Qdom4h>-B7!MgsLVCNNk__$82?`QspL*0zwl&CWb!J(Q;GX2gTXNKJLh7b zN8^5=;xVjOqw+n`ziQf<^ritlK&M(Z8LjoT%+`GX4nZhrFaHSbxJOg`KARNhh?nMx zGP`u#0?`@`N33T&?%+eSu$L?L=-+paXBat?0s^Lq(6>66KiD9fJaJdGPrldmp)ES9 zq5Q@w&+dWzairp+mQ9lhlYn@l$-pFQ%6Vm;W0F$S`6)^oDnz!UA}W)wZD#Nf-02yE zSxiRiSbJrnHZpS2^QFqWDWYiJ2_&D4GxJTob6game4Rnp4-a8oK0|uY-oP;ACYJg= zfzq$)JUSkdEEQ-FsXFl0O1;D@^(Svq!Dtb~|zD{Xe%&8EA}t;;Z>bJpL9WgQD_~sHG5(h>mr{Irog}T$u=eqGe-Q&yn=bw z7r-~(&JD^vmmxkz!hBa8Ik(`jlhvudkmrW!#)Y{1Gd3YvBL>qqDmh!%F}{e44g(m3 zaqT=bY?~3aCoJ(;oj;Ql3NL$?!}~e$!?~b?QkCYp)qa#vtFm`QZozZZrH&eTD*&+g E7ZAQxl>h($ literal 0 HcmV?d00001 diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/bpmImg.gif b/ng2-components/ng2-alfresco-userinfo/src/assets/bpmImg.gif new file mode 100644 index 0000000000000000000000000000000000000000..e1b58fa57dfcdfd452ec498c98b930aa905d21d6 GIT binary patch literal 1765 zcmb8pizCyC0|4;vcMq|L=guW!Vi%c59pzQG$YVmt(9<&qUk|0_<~^#dpPrfJR`3LkEhFNwuD*UseB%E9NpnxZIwFun4Gh4>giwRA zc0?x^01y1ne**w~537AIAf!0BrjESujDjDc-khY>t=wMO?<%F(;}2yFR74Dt%}a)P zREJt`!8kwqm|RZoeK}|r3IHK##rgzkWXR z#*`{VI@~f{tInV0ukwK$G*WXf9#@J?Z!6r2$!xjap@7u(QUCMI;#?2#}9bcnDw%MSwt8tuX$>-NEJGdr(T*AtL&uqN~#WT z-g_QP^LsP+c=+}i&ztKwm?_}Wl%Vf);6;vy(fFPKq-Krf{zpQvQICg(?Ug@>Nx&U+ zjC*f3!1kFY4zS~t!;(qN5%NIU3H4v3)8o8SJ&}xYli-Iq9S6HVS;BT^QM6I<7xiew zs43F&{rZ7&()90DAGOE2XC;|(F#99fIapv)+E_ML>o!h2H=U!U*6L3=``J^Qqoo7W zf@~)ZW~T7YOjSR6)Sl9&+Nd*+aNRrksZvj^#`9rO9o8rC1d|21)u|F3inL-f#Wi}R<~|kmHN&5; z3B)yYe%YIv8;IuZpFayGV;%0-^uB2NgFe{gg7ft_xj^TT_Y{uR${^)A3ysIpSs39& z9ijG;m}vnKkiUg2%P?vsYQCJO@$_OV@CO0Hu)t)o;|R^??X%tO1-F=8j*)@eCsBO8 zi%eVFsxw-!Lvd0lwD|S>cPa5}M3u<4Tb}T$Ox;$^a_lM*m{i5Pu{oB{h2Ay`Po(Dx zD#N-MNvdBGX_`Lud8}5idh^1LixlXK&^sCJ@PI-IJn*VhrM|k_W5)x{ zzhbeqUP%h#MU{Oa-7EuT&#~1EiAPO=nPq4Rbk@D@* z6M~fh0C=qA2Fx`k=Mt6^izaq#br)QLk3CvAW9%+&^6yXaFr(JLRl%+P{?WF8(;BaX zE{t!)7R`6~pLq*@-8wtlZL#g$h)*e9)U%B{XxYCXGPN_V;k|Z!l;3$33aB3vZ~j!f z8jhOM^$Qdom4h>-B7!MgsLVCNNk__$82?`QspL*0zwl&CWb!J(Q;GX2gTXNKJLh7b zN8^5=;xVjOqw+n`ziQf<^ritlK&M(Z8LjoT%+`GX4nZhrFaHSbxJOg`KARNhh?nMx zGP`u#0?`@`N33T&?%+eSu$L?L=-+paXBat?0s^Lq(6>66KiD9fJaJdGPrldmp)ES9 zq5Q@w&+dWzairp+mQ9lhlYn@l$-pFQ%6Vm;W0F$S`6)^oDnz!UA}W)wZD#Nf-02yE zSxiRiSbJrnHZpS2^QFqWDWYiJ2_&D4GxJTob6game4Rnp4-a8oK0|uY-oP;ACYJg= zfzq$)JUSkdEEQ-FsXFl0O1;D@^(Svq!Dtb~|zD{Xe%&8EA}t;;Z>bJpL9WgQD_~sHG5(h>mr{Irog}T$u=eqGe-Q&yn=bw z7r-~(&JD^vmmxkz!hBa8Ik(`jlhvudkmrW!#)Y{1Gd3YvBL>qqDmh!%F}{e44g(m3 zaqT=bY?~3aCoJ(;oj;Ql3NL$?!}~e$!?~b?QkCYp)qa#vtFm`QZozZZrH&eTD*&+g E7ZAQxl>h($ literal 0 HcmV?d00001 diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/ecmImg.gif b/ng2-components/ng2-alfresco-userinfo/src/assets/ecmImg.gif new file mode 100644 index 0000000000000000000000000000000000000000..e1b58fa57dfcdfd452ec498c98b930aa905d21d6 GIT binary patch literal 1765 zcmb8pizCyC0|4;vcMq|L=guW!Vi%c59pzQG$YVmt(9<&qUk|0_<~^#dpPrfJR`3LkEhFNwuD*UseB%E9NpnxZIwFun4Gh4>giwRA zc0?x^01y1ne**w~537AIAf!0BrjESujDjDc-khY>t=wMO?<%F(;}2yFR74Dt%}a)P zREJt`!8kwqm|RZoeK}|r3IHK##rgzkWXR z#*`{VI@~f{tInV0ukwK$G*WXf9#@J?Z!6r2$!xjap@7u(QUCMI;#?2#}9bcnDw%MSwt8tuX$>-NEJGdr(T*AtL&uqN~#WT z-g_QP^LsP+c=+}i&ztKwm?_}Wl%Vf);6;vy(fFPKq-Krf{zpQvQICg(?Ug@>Nx&U+ zjC*f3!1kFY4zS~t!;(qN5%NIU3H4v3)8o8SJ&}xYli-Iq9S6HVS;BT^QM6I<7xiew zs43F&{rZ7&()90DAGOE2XC;|(F#99fIapv)+E_ML>o!h2H=U!U*6L3=``J^Qqoo7W zf@~)ZW~T7YOjSR6)Sl9&+Nd*+aNRrksZvj^#`9rO9o8rC1d|21)u|F3inL-f#Wi}R<~|kmHN&5; z3B)yYe%YIv8;IuZpFayGV;%0-^uB2NgFe{gg7ft_xj^TT_Y{uR${^)A3ysIpSs39& z9ijG;m}vnKkiUg2%P?vsYQCJO@$_OV@CO0Hu)t)o;|R^??X%tO1-F=8j*)@eCsBO8 zi%eVFsxw-!Lvd0lwD|S>cPa5}M3u<4Tb}T$Ox;$^a_lM*m{i5Pu{oB{h2Ay`Po(Dx zD#N-MNvdBGX_`Lud8}5idh^1LixlXK&^sCJ@PI-IJn*VhrM|k_W5)x{ zzhbeqUP%h#MU{Oa-7EuT&#~1EiAPO=nPq4Rbk@D@* z6M~fh0C=qA2Fx`k=Mt6^izaq#br)QLk3CvAW9%+&^6yXaFr(JLRl%+P{?WF8(;BaX zE{t!)7R`6~pLq*@-8wtlZL#g$h)*e9)U%B{XxYCXGPN_V;k|Z!l;3$33aB3vZ~j!f z8jhOM^$Qdom4h>-B7!MgsLVCNNk__$82?`QspL*0zwl&CWb!J(Q;GX2gTXNKJLh7b zN8^5=;xVjOqw+n`ziQf<^ritlK&M(Z8LjoT%+`GX4nZhrFaHSbxJOg`KARNhh?nMx zGP`u#0?`@`N33T&?%+eSu$L?L=-+paXBat?0s^Lq(6>66KiD9fJaJdGPrldmp)ES9 zq5Q@w&+dWzairp+mQ9lhlYn@l$-pFQ%6Vm;W0F$S`6)^oDnz!UA}W)wZD#Nf-02yE zSxiRiSbJrnHZpS2^QFqWDWYiJ2_&D4GxJTob6game4Rnp4-a8oK0|uY-oP;ACYJg= zfzq$)JUSkdEEQ-FsXFl0O1;D@^(Svq!Dtb~|zD{Xe%&8EA}t;;Z>bJpL9WgQD_~sHG5(h>mr{Irog}T$u=eqGe-Q&yn=bw z7r-~(&JD^vmmxkz!hBa8Ik(`jlhvudkmrW!#)Y{1Gd3YvBL>qqDmh!%F}{e44g(m3 zaqT=bY?~3aCoJ(;oj;Ql3NL$?!}~e$!?~b?QkCYp)qa#vtFm`QZozZZrH&eTD*&+g E7ZAQxl>h($ literal 0 HcmV?d00001 diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts index ffddf85e68..eae63e6272 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts @@ -60,7 +60,30 @@ export var fakeBpmUser: BpmUserModel = { lastUpdate: 'fake-update-date', latestSyncTimeStamp: 'fake-timestamp', password: 'fake-password', - pictureId: 'fake-picture-id', + pictureId: 'src/assets/bpmImg.gif', + status: 'fake-status', + tenantId: 'fake-tenant-id', + tenantName: 'fake-tenant-name', + tenantPictureId: 'fake-tenant-picture-id', + type: 'fake-type' +}; + +export var fakeBpmEditedUser: BpmUserModel = { + apps: {}, + capabilities: 'fake-capability', + company: 'fake-company', + created: 'fake-create-date', + email: 'fakeBpm@fake.com', + externalId: 'fake-external-id', + firstName: 'fake-first-name', + lastName: 'fake-last-name', + fullname: 'fake-full-name', + groups: {}, + id: 'fake-id', + lastUpdate: 'fake-update-date', + latestSyncTimeStamp: 'fake-timestamp', + password: 'fake-password', + pictureId: 'src/assets/bpmImg.gif', status: 'fake-status', tenantId: 'fake-tenant-id', tenantName: 'fake-tenant-name', @@ -70,27 +93,31 @@ export var fakeBpmUser: BpmUserModel = { export class FakeBpmUserService { - lastPromise: Observable; - public userNeeded = 0; - usersList = [fakeBpmUser, fakeBpmUserNoImage]; + lastPromise: Observable; + public userNeeded = 0; + usersList = [fakeBpmUser, fakeBpmUserNoImage, fakeBpmEditedUser]; - getUserInfo(userName: string) { - return this.lastPromise = Observable.of(this.usersList[this.userNeeded]); - }; + getUserInfo(userName: string) { + return this.lastPromise = Observable.of(this.usersList[this.userNeeded]); + }; - getCurrentUserInfo() { - return this.getUserInfo('fake-id'); - }; + getCurrentUserInfo() { + return this.getUserInfo('fake-id'); + }; - getCurrentUserProfileImage() { - return Observable.of(this.usersList[this.userNeeded].pictureId); - }; + getCurrentUserProfileImage() { + return Observable.of(this.usersList[this.userNeeded].pictureId); + }; - respondWithTheUserWithoutImage() { - this.userNeeded = 1; - } + respondWithTheUserWithoutImage() { + this.userNeeded = 1; + } - respondWithTheUserWithImage() { - this.userNeeded = 0; - } + respondWithTheUserWithImage() { + this.userNeeded = 0; + } + + respondWithEditedUser() { + this.userNeeded = 2; + } } diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts index 9024896f7b..c2d7a9d040 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts @@ -76,11 +76,32 @@ export var fakeEcmUser: EcmUserModel = { emailNotificationsEnabled: true }; +export var fakeEcmEditedUser: EcmUserModel = { + id: 'fake-id', + firstName: 'fake-first-name', + lastName: 'fake-last-name', + description: 'i am a fake user for test', + avatarId: 'fake-avatar-id', + email: 'fakeEcm@ecmUser.com', + skypeId: 'fake-skype-id', + googleId: 'fake-googleId-id', + instantMessageId: 'fake-instantMessageId-id', + company: fakeEcmCompany, + jobTitle: 'test job', + location: 'fake location', + mobile: '000000000', + telephone: '11111111', + statusUpdatedAt: 'fake-date', + userStatus: 'active', + enabled: true, + emailNotificationsEnabled: true +}; + export class FakeEcmUserService { lastPromise: Observable; public userNeeded = 0; - usersList = [fakeEcmUser, fakeEcmUserNoImage]; + usersList = [fakeEcmUser, fakeEcmUserNoImage, fakeEcmEditedUser]; getUserInfo(userName: string) { return this.lastPromise = Observable.of(this.usersList[this.userNeeded]); @@ -92,7 +113,7 @@ export class FakeEcmUserService { getUserProfileImage(avatarId: string) { if (avatarId) { - return 'fake/url/image/for/ecm/user'; + return 'src/assets/ecmImg.gif'; } }; @@ -104,4 +125,8 @@ export class FakeEcmUserService { this.userNeeded = 0; }; + respondWithEditedUser() { + this.userNeeded = 2; + }; + } diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html index 04b7db4e95..a5cccc1539 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html @@ -1,56 +1,58 @@ -
- {{ecmUser.firstName || ecmUser.lastName}} - +
+ {{ecmUser.firstName || ecmUser.lastName}} + {{ formatValue(bpmUser.firstName) || formatValue(bpmUser.lastName) || - formatValue(bpmUser.fullName) }} + formatValue(bpmUser.fullname) }} -
+
-