From 617381ffc76b12304eb7a4e818f3abedf08c16d0 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Fri, 6 Dec 2024 13:05:53 +0200
Subject: [PATCH] UI: Fix Json Form conditions.

---
 .../components/json-form/react/json-form-schema-form.tsx    | 6 +++---
 .../shared/components/json-form/react/json-form.models.ts   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx b/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx
index 5ce35ae96f..bbdd90cbe7 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx
+++ b/ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx
@@ -131,10 +131,10 @@ class ThingsboardSchemaForm extends React.Component<JsonFormProps, any> {
     }
     if (form.condition) {
       this.hasConditions = true;
-      if (!this.conditionFunction) {
-        this.conditionFunction = new Function('form', 'model', 'index', `return ${form.condition};`);
+      if (!form.conditionFunction) {
+        form.conditionFunction = new Function('form', 'model', 'index', `return ${form.condition};`);
       }
-      if (this.conditionFunction(form, model, index) === false) {
+      if (form.conditionFunction(form, model, index) === false) {
         return null;
       }
     }
diff --git a/ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts b/ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts
index edba015521..ffcf201136 100644
--- a/ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts
+++ b/ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts
@@ -87,6 +87,7 @@ export interface JsonFormData {
   required: boolean;
   default?: any;
   condition?: string;
+  conditionFunction?: Function;
   style?: any;
   rows?: number;
   rowsMax?: number;