Skip to content

Commit 709e78a

Browse files
committed
lowercase PersonType enums and converter
1 parent 24ab529 commit 709e78a

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,13 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
108108
@property({
109109
attribute: 'type',
110110
converter: (value, type) => {
111-
const capitalize = s => {
112-
if (typeof s !== 'string') {
113-
return '';
114-
}
115-
return s.charAt(0).toUpperCase() + s.toLowerCase().slice(1);
116-
};
117-
value = capitalize(value);
111+
value = value.toLowerCase();
118112
if (!value || value.length === 0) {
119-
return PersonType.Any;
113+
return PersonType.any;
120114
}
121115

122116
if (typeof PersonType[value] === 'undefined') {
123-
return PersonType.Any;
117+
return PersonType.any;
124118
} else {
125119
return PersonType[value];
126120
}
@@ -262,7 +256,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
262256
@property({ attribute: false }) private _showLoading: boolean;
263257

264258
private _groupId: string;
265-
private _type: PersonType = PersonType.Person;
259+
private _type: PersonType = PersonType.person;
266260
private _groupType: GroupType = GroupType.Any;
267261

268262
private defaultPeople: IDynamicPerson[];
@@ -665,9 +659,9 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
665659
}
666660
}
667661
people = this._groupPeople || [];
668-
} else if (this.type === PersonType.Person || this.type === PersonType.Any) {
662+
} else if (this.type === PersonType.person || this.type === PersonType.any) {
669663
people = await getPeople(graph);
670-
} else if (this.type === PersonType.Group) {
664+
} else if (this.type === PersonType.group) {
671665
const groups = (await findGroups(graph, '', this.showMax, GroupType.Any)) || [];
672666
people = groups;
673667
}
@@ -685,7 +679,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
685679
}
686680
if (input) {
687681
people = [];
688-
if (this.type === PersonType.Person || this.type === PersonType.Any) {
682+
if (this.type === PersonType.person || this.type === PersonType.any) {
689683
try {
690684
people = (await findPeople(graph, input, this.showMax)) || [];
691685
} catch (e) {
@@ -709,7 +703,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
709703
}
710704
}
711705
// default group search with user input
712-
if ((this.type === PersonType.Group || this.type === PersonType.Any) && people.length < this.showMax) {
706+
if ((this.type === PersonType.group || this.type === PersonType.any) && people.length < this.showMax) {
713707
people = [];
714708
try {
715709
const groups = (await findGroups(graph, '', this.showMax, this.groupType)) || [];

src/graph/graph.people.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ export enum PersonType {
2020
/**
2121
* Any type
2222
*/
23-
Any = 0,
23+
any = 0,
2424

2525
/**
2626
* A Person such as User or Contact
2727
*/
28-
Person = 'Person',
28+
person = 'person',
2929

3030
/**
3131
* A group
3232
*/
33-
Group = 'Group'
33+
group = 'group'
3434
}
3535

3636
/**
@@ -45,13 +45,13 @@ export async function findPeople(
4545
graph: IGraph,
4646
query: string,
4747
top: number = 10,
48-
personType: PersonType = PersonType.Person
48+
personType: PersonType = PersonType.person
4949
): Promise<Person[]> {
5050
const scopes = 'people.read';
5151

5252
let filterQuery = '';
5353

54-
if (personType !== PersonType.Any) {
54+
if (personType !== PersonType.any) {
5555
filterQuery = `personType/class eq '${personType}'`;
5656
}
5757

0 commit comments

Comments
 (0)