Merge branch 'main' into nmetulev/useContactApis

Author: nmetulev

index.html

@@ -25,7 +25,7 @@
 
     <mgt-msal-provider
       client-id="a974dfa0-9f57-49b9-95db-90f04ce2111a"
-      scopes="user.read,people.read,user.readbasic.all,contacts.read,calendars.read"
+      scopes="user.read,people.read,user.readbasic.all,contacts.read,calendars.read,presence.read.all,tasks.readwrite,presence.read,user.read.all,group.read.all,tasks.read"
       redirect-uri="http://localhost:3000"
       depends-on="mgt-teams-provider"
     ></mgt-msal-provider>

packages/mgt-react/src/generated/react.ts

@@ -12,6 +12,7 @@ export type AgendaProps = {
 	events?: MicrosoftGraph.Event[];
 	showMax?: number;
 	groupByDay?: boolean;
+	preferredTimezone?: string;
 	templateConverters?: MgtElement.TemplateContext;
 	templateContext?: MgtElement.TemplateContext;
 	direction?: string;

packages/mgt/src/components/mgt-agenda/mgt-agenda.ts

@@ -259,6 +259,15 @@ export class MgtAgenda extends MgtTemplatedComponent {
     `;
   }
 
+  /**
+   * Reloads the component with its current settings and potential new data
+   *
+   * @memberof MgtAgenda
+   */
+  public async reload() {
+    this.events = await this.loadEvents();
+  }
+
   /**
    * Render the loading state
    *
@@ -496,7 +505,40 @@ export class MgtAgenda extends MgtTemplatedComponent {
       return;
     }
 
+    const events = await this.loadEvents();
+    if (events && events.length > 0) {
+      this.events = events;
+    }
+  }
+
+  private async reloadState() {
+    this.events = null;
+    this.requestStateUpdate(true);
+  }
+
+  private onResize() {
+    this._isNarrow = this.offsetWidth < 600;
+  }
+
+  private eventClicked(event: MicrosoftGraph.Event) {
+    this.fireCustomEvent('eventClick', { event });
+  }
+
+  private getEventTimeString(event: MicrosoftGraph.Event) {
+    if (event.isAllDay) {
+      return 'ALL DAY';
+    }
+
+    const start = this.prettyPrintTimeFromDateTime(new Date(event.start.dateTime));
+    const end = this.prettyPrintTimeFromDateTime(new Date(event.end.dateTime));
+
+    return `${start} - ${end}`;
+  }
+
+  private async loadEvents(): Promise<MicrosoftGraph.Event[]> {
     const p = Providers.globalProvider;
+    let events: MicrosoftGraph.Event[] = [];
+
     if (p && p.state === ProviderState.SignedIn) {
       const graph = p.graph.forComponent(this);
 
@@ -525,7 +567,7 @@ export class MgtAgenda extends MgtTemplatedComponent {
           const results = await request.get();
 
           if (results && results.value) {
-            this.events = results.value;
+            events = results.value;
           }
           // tslint:disable-next-line: no-empty
         } catch (e) {}
@@ -538,42 +580,20 @@ export class MgtAgenda extends MgtTemplatedComponent {
           const iterator = await getEventsPageIterator(graph, start, end, this.groupId, this.preferredTimezone);
 
           if (iterator && iterator.value) {
-            this.events = iterator.value;
+            events = iterator.value;
 
             while (iterator.hasNext) {
               await iterator.next();
-              this.events = iterator.value;
+              events = iterator.value;
             }
           }
         } catch (error) {
           // noop - possible error with graph
         }
       }
     }
-  }
-
-  private async reloadState() {
-    this.events = null;
-    this.requestStateUpdate(true);
-  }
-
-  private onResize() {
-    this._isNarrow = this.offsetWidth < 600;
-  }
-
-  private eventClicked(event: MicrosoftGraph.Event) {
-    this.fireCustomEvent('eventClick', { event });
-  }
-
-  private getEventTimeString(event: MicrosoftGraph.Event) {
-    if (event.isAllDay) {
-      return 'ALL DAY';
-    }
 
-    const start = this.prettyPrintTimeFromDateTime(new Date(event.start.dateTime));
-    const end = this.prettyPrintTimeFromDateTime(new Date(event.end.dateTime));
-
-    return `${start} - ${end}`;
+    return events;
   }
 
   private prettyPrintTimeFromDateTime(date: Date) {

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

@@ -707,17 +707,6 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
       }
     }
 
-    if (people) {
-      people = people.filter((user: User) => {
-        return (
-          user.displayName.toLowerCase().indexOf(input) !== -1 ||
-          (!!user.givenName && user.givenName.toLowerCase().indexOf(input) !== -1) ||
-          (!!user.surname && user.surname.toLowerCase().indexOf(input) !== -1) ||
-          (!!user.mail && user.mail.toLowerCase().indexOf(input) !== -1)
-        );
-      });
-    }
-
     this._foundPeople = this.filterPeople(people);
   }
 
@@ -844,6 +833,8 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
         highlight = displayName.slice(highlightLocation, highlightLocation + userInputLength);
         last = displayName.slice(highlightLocation + userInputLength, displayName.length);
       }
+    } else {
+      first = person.displayName;
     }
 
     return html`

packages/mgt/src/graph/graph.user.ts

@@ -406,9 +406,9 @@ export async function findUsers(graph: IGraph, query: string, top: number = 10):
   try {
     graphResult = await graph
       .api('users')
-      .filter(
-        `startswith(displayName,'${query}') or startswith(givenName,'${query}') or startswith(surname,'${query}') or startswith(mail,'${query}') or startswith(userPrincipalName,'${query}')`
-      )
+      .header('ConsistencyLevel', 'eventual')
+      .count(true)
+      .search(`"displayName:${query}"`)
       .top(top)
       .middlewareOptions(prepScopes(scopes))
       .get();