From d3216f3ee78ce154ea3a4c8a224003728497c84f Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 31 Jan 2025 13:11:12 +0200
Subject: [PATCH] Changed table load

---
 .../calculated-fields-table.component.ts      | 62 ++++++-------------
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts
index 853870982a..4c22ad2896 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table.component.ts
@@ -18,8 +18,8 @@ import {
   ChangeDetectionStrategy,
   Component,
   DestroyRef,
-  Input,
-  OnInit,
+  effect,
+  input,
   ViewChild,
 } from '@angular/core';
 import { EntityId } from '@shared/models/id/entity-id';
@@ -39,36 +39,14 @@ import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
   styleUrls: ['./calculated-fields-table.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CalculatedFieldsTableComponent implements OnInit {
-
-  @Input()
-  set entityId(entityId: EntityId) {
-    if (this.entityIdValue !== entityId) {
-      this.entityIdValue = entityId;
-      if (!this.activeValue) {
-        this.hasInitialized = true;
-      }
-    }
-  }
-
-  @Input()
-  set active(active: boolean) {
-    if (this.activeValue !== active) {
-      this.activeValue = active;
-      if (this.activeValue && this.hasInitialized) {
-        this.hasInitialized = false;
-        this.entitiesTable.updateData();
-      }
-    }
-  }
+export class CalculatedFieldsTableComponent {
 
   @ViewChild(EntitiesTableComponent, {static: true}) entitiesTable: EntitiesTableComponent;
 
-  calculatedFieldsTableConfig: CalculatedFieldsTableConfig;
+  active = input();
+  entityId = input<EntityId>();
 
-  private activeValue = false;
-  private hasInitialized = false;
-  private entityIdValue: EntityId;
+  calculatedFieldsTableConfig: CalculatedFieldsTableConfig;
 
   constructor(private calculatedFieldsService: CalculatedFieldsService,
               private translate: TranslateService,
@@ -77,20 +55,20 @@ export class CalculatedFieldsTableComponent implements OnInit {
               private durationLeft: DurationLeftPipe,
               private popoverService: TbPopoverService,
               private destroyRef: DestroyRef) {
-  }
 
-  ngOnInit() {
-    this.hasInitialized = !this.activeValue;
-
-    this.calculatedFieldsTableConfig = new CalculatedFieldsTableConfig(
-      this.calculatedFieldsService,
-      this.translate,
-      this.dialog,
-      this.entityIdValue,
-      this.store,
-      this.durationLeft,
-      this.popoverService,
-      this.destroyRef,
-    );
+    effect(() => {
+      if (this.active()) {
+        this.calculatedFieldsTableConfig = new CalculatedFieldsTableConfig(
+          this.calculatedFieldsService,
+          this.translate,
+          this.dialog,
+          this.entityId(),
+          this.store,
+          this.durationLeft,
+          this.popoverService,
+          this.destroyRef,
+        );
+      }
+    });
   }
 }