From c18fe5581e9024040e57644207f24a0bb68e88f5 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Wed, 22 Jul 2020 18:46:53 +0300
Subject: [PATCH] UI: Fix unresolved datasource processing

---
 ui-ngx/src/app/core/api/widget-subscription.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/core/api/widget-subscription.ts b/ui-ngx/src/app/core/api/widget-subscription.ts
index eb5b5cd780..47ea205db6 100644
--- a/ui-ngx/src/app/core/api/widget-subscription.ts
+++ b/ui-ngx/src/app/core/api/widget-subscription.ts
@@ -428,7 +428,9 @@ export class WidgetSubscription implements IWidgetSubscription {
     return forkJoin(resolveResultObservables).pipe(
       map((resolveResults) => {
         resolveResults.forEach((resolveResult) => {
-          this.dataLoaded(resolveResult.pageData, resolveResult.data, resolveResult.datasourceIndex, resolveResult.pageLink, false);
+          if (resolveResult) {
+            this.dataLoaded(resolveResult.pageData, resolveResult.data, resolveResult.datasourceIndex, resolveResult.pageLink, false);
+          }
         });
         this.configureLoadedData();
         this.hasResolvedData = this.datasources.length > 0;