From 0b825e8dc34476d71c6048d48a743774b39d4a8a Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Fri, 18 Nov 2022 13:46:37 +0200
Subject: [PATCH] UI: Handle premature entity and alarm data updates from
 websocket.

---
 .../src/app/core/api/alarm-data-subscription.ts  | 16 +++++++++++++++-
 .../src/app/core/api/entity-data-subscription.ts | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/core/api/alarm-data-subscription.ts b/ui-ngx/src/app/core/api/alarm-data-subscription.ts
index 42f915a12a..be134f81ab 100644
--- a/ui-ngx/src/app/core/api/alarm-data-subscription.ts
+++ b/ui-ngx/src/app/core/api/alarm-data-subscription.ts
@@ -62,6 +62,7 @@ export class AlarmDataSubscription {
   private alarmDataCommand: AlarmDataCmd;
 
   private pageData: PageData<AlarmData>;
+  private prematureUpdates: Array<Array<AlarmData>>;
   private alarmIdToDataIndex: {[id: string]: number};
 
   private subsTw: SubscriptionTimewindow;
@@ -136,8 +137,21 @@ export class AlarmDataSubscription {
       this.subscriber.alarmData$.subscribe((alarmDataUpdate) => {
         if (alarmDataUpdate.data) {
           this.onPageData(alarmDataUpdate.data, alarmDataUpdate.allowedEntities, alarmDataUpdate.totalEntities);
+          if (this.prematureUpdates) {
+            for (const update of this.prematureUpdates) {
+              this.onDataUpdate(update);
+            }
+            this.prematureUpdates = null;
+          }
         } else if (alarmDataUpdate.update) {
-          this.onDataUpdate(alarmDataUpdate.update);
+          if (!this.pageData) {
+            if (!this.prematureUpdates) {
+              this.prematureUpdates = [];
+            }
+            this.prematureUpdates.push(alarmDataUpdate.update);
+          } else {
+            this.onDataUpdate(alarmDataUpdate.update);
+          }
         }
       });
 
diff --git a/ui-ngx/src/app/core/api/entity-data-subscription.ts b/ui-ngx/src/app/core/api/entity-data-subscription.ts
index 3d176fc841..dfba1abaf2 100644
--- a/ui-ngx/src/app/core/api/entity-data-subscription.ts
+++ b/ui-ngx/src/app/core/api/entity-data-subscription.ts
@@ -120,6 +120,7 @@ export class EntityDataSubscription {
 
   private entityDataResolveSubject: Subject<EntityDataLoadResult>;
   private pageData: PageData<EntityData>;
+  private prematureUpdates: Array<Array<EntityData>>;
   private data: Array<Array<DataSetHolder>>;
   private subsTw: SubscriptionTimewindow;
   private latestTsOffset: number;
@@ -348,8 +349,21 @@ export class EntityDataSubscription {
         (entityDataUpdate) => {
           if (entityDataUpdate.data) {
             this.onPageData(entityDataUpdate.data);
+            if (this.prematureUpdates) {
+              for (const update of this.prematureUpdates) {
+                this.onDataUpdate(update);
+              }
+              this.prematureUpdates = null;
+            }
           } else if (entityDataUpdate.update) {
-            this.onDataUpdate(entityDataUpdate.update);
+            if (!this.pageData) {
+              if (!this.prematureUpdates) {
+                this.prematureUpdates = [];
+              }
+              this.prematureUpdates.push(entityDataUpdate.update);
+            } else {
+              this.onDataUpdate(entityDataUpdate.update);
+            }
           }
         }
       );