Merge pull request #393 from microsoftgraph/nmetulev/392

Fixed issue with polling not respecting max pages

Author: beth-panx

src/components/mgt-get/mgt-get.ts

@@ -140,7 +140,7 @@ export class MgtGet extends MgtTemplatedComponent {
    * trigger the element to update.
    */
   protected render() {
-    if (this.isLoadingState) {
+    if (this.isLoadingState && !this.isPolling) {
       return this.renderTemplate('loading', null);
     } else if (this.error) {
       return this.renderTemplate('error', this.error);
@@ -179,8 +179,6 @@ export class MgtGet extends MgtTemplatedComponent {
       }
     } else if (this.response) {
       return this.renderTemplate('default', this.response) || html``;
-    } else if (this.isLoadingState) {
-      return this.renderTemplate('loading', null) || html``;
     } else {
       return html``;
     }
@@ -205,12 +203,14 @@ export class MgtGet extends MgtTemplatedComponent {
     if (this.resource) {
       try {
         let uri = this.resource;
-        let delta = false;
+        let isDeltaLink = false;
 
         // if we had a response earlier with a delta link, use it instead
         if (this.response && this.response['@odata.deltaLink']) {
           uri = this.response['@odata.deltaLink'];
-          delta = true;
+          isDeltaLink = true;
+        } else {
+          isDeltaLink = new URL(uri, 'https://graph.microsoft.com').pathname.endsWith('delta');
         }
 
         const graph = provider.graph.forComponent(this);
@@ -220,23 +220,23 @@ export class MgtGet extends MgtTemplatedComponent {
           request = request.middlewareOptions(prepScopes(...this.scopes));
         }
 
-        const response = await request.get();
+        let response = await request.get();
 
-        if (delta && this.response && Array.isArray(this.response.value) && Array.isArray(response.value)) {
+        if (isDeltaLink && this.response && Array.isArray(this.response.value) && Array.isArray(response.value)) {
           response.value = this.response.value.concat(response.value);
         }
 
-        if (!equals(this.response, response)) {
+        if (!this.isPolling && !equals(this.response, response)) {
           this.response = response;
         }
 
         // get more pages if there are available
-        if (this.response && Array.isArray(this.response.value) && this.response['@odata.nextLink']) {
+        if (response && Array.isArray(response.value) && response['@odata.nextLink']) {
           let pageCount = 1;
-          let page = this.response;
+          let page = response;
 
           while (
-            (pageCount < this.maxPages || this.maxPages <= 0 || this.pollingRate) &&
+            (pageCount < this.maxPages || this.maxPages <= 0 || (isDeltaLink && this.pollingRate)) &&
             page &&
             page['@odata.nextLink']
           ) {
@@ -247,11 +247,18 @@ export class MgtGet extends MgtTemplatedComponent {
               .version(this.version)
               .get();
             if (page && page.value && page.value.length) {
-              page.value = this.response.value.concat(page.value);
-              this.response = page;
+              page.value = response.value.concat(page.value);
+              response = page;
+              if (!this.isPolling) {
+                this.response = response;
+              }
             }
           }
         }
+
+        if (!equals(this.response, response)) {
+          this.response = response;
+        }
       } catch (e) {
         this.error = e;
       }