Skip to content

Commit b5e0472

Browse files
authored
Merge pull request #425 from microsoftgraph/nmetulev/personUpdate
mgt-person update
2 parents 72c2c99 + b80bb07 commit b5e0472

File tree

12 files changed

+651
-457
lines changed

12 files changed

+651
-457
lines changed

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
<!-- <mgt-mock-provider></mgt-mock-provider> -->
3434

3535
<mgt-login></mgt-login>
36-
<mgt-person person-query="me" show-name show-email person-card="hover"></mgt-person>
36+
<mgt-person person-query="me" view="twoLines" person-card="hover" show-presence></mgt-person>
3737
<mgt-people-picker></mgt-people-picker>
3838
<mgt-teams-channel-picker></mgt-teams-channel-picker>
3939
<mgt-tasks data-source="todo"></mgt-tasks>
4040
<mgt-agenda group-by-day></mgt-agenda>
41-
<mgt-people></mgt-people>
41+
<mgt-people show-presence></mgt-people>
4242
</body>
4343
</html>

src/components/mgt-login/mgt-login.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { styles } from './mgt-login-css';
1616

1717
import '../../styles/fabric-icon-font';
1818
import '../mgt-person/mgt-person';
19+
import { PersonViewType } from '../mgt-person/mgt-person';
1920

2021
/**
2122
* Web component button and flyout control to facilitate Microsoft identity platform authentication
@@ -260,13 +261,7 @@ export class MgtLogin extends MgtTemplatedComponent {
260261
return (
261262
template ||
262263
html`
263-
<mgt-person
264-
.personDetails=${personDetails}
265-
.personImage=${personImage}
266-
.avatarSize="large"
267-
.showName=${true}
268-
.showEmail=${true}
269-
/>
264+
<mgt-person .personDetails=${personDetails} .personImage=${personImage} .view=${PersonViewType.twolines} />
270265
`
271266
);
272267
}
@@ -321,12 +316,7 @@ export class MgtLogin extends MgtTemplatedComponent {
321316
return (
322317
template ||
323318
html`
324-
<mgt-person
325-
.personDetails=${this.userDetails}
326-
.personImage=${this._image}
327-
.avatarSize="small"
328-
.showName=${true}
329-
/>
319+
<mgt-person .personDetails=${this.userDetails} .personImage=${this._image} .view=${PersonViewType.oneline} />
330320
`
331321
);
332322
}

src/components/mgt-people-picker/mgt-people-picker.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { Providers } from '../../Providers';
1717
import { ProviderState } from '../../providers/IProvider';
1818
import '../../styles/fabric-icon-font';
1919
import { debounce } from '../../utils/Utils';
20+
import { PersonViewType } from '../mgt-person/mgt-person';
2021
import { PersonCardInteraction } from '../PersonCardInteraction';
2122
import { MgtFlyout } from '../sub-components/mgt-flyout/mgt-flyout';
2223
import { MgtTemplatedComponent } from '../templatedComponent';
@@ -600,7 +601,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
600601
class="selected-person"
601602
.personDetails=${person}
602603
.fetchImage=${true}
603-
.showName=${true}
604+
.view=${PersonViewType.oneline}
604605
.personCardInteraction=${PersonCardInteraction.click}
605606
></mgt-person>
606607
`;

src/components/mgt-person-card/mgt-person-card.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ export class MgtPersonCard extends MgtTemplatedComponent {
602602
const person = await getUserWithPhoto(graph, id);
603603
this.personDetails = person;
604604
this.personImage = this.getImage();
605-
this.personDetails.personImage = this.personImage;
606605
} else if (
607606
!this.personDetails.personImage &&
608607
((this.fetchImage && !this.personImage) || this.personImage === '@')

0 commit comments

Comments
 (0)