From e78fe241a01c89ae28b07721e45e5878e715761b Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 28 Feb 2025 11:46:43 +0200
Subject: [PATCH 1/7] Added tenant profile configs for Calculated Fields

---
 ui-ngx/src/app/core/auth/auth.models.ts       |  2 +
 ui-ngx/src/app/core/auth/auth.reducer.ts      |  2 +
 ...lated-field-arguments-table.component.html | 17 +++-
 ...lated-field-arguments-table.component.scss |  6 ++
 ...culated-field-arguments-table.component.ts |  5 +
 ...ulated-field-argument-panel.component.html | 17 +++-
 ...ulated-field-argument-panel.component.scss |  4 +-
 ...lculated-field-argument-panel.component.ts | 11 ++-
 ...enant-profile-configuration.component.html | 92 +++++++++++++++++++
 ...-tenant-profile-configuration.component.ts |  8 +-
 .../tenant/rate-limits/rate-limits.models.ts  |  5 +-
 .../assets/locale/locale.constant-en_US.json  | 21 ++++-
 12 files changed, 175 insertions(+), 15 deletions(-)

diff --git a/ui-ngx/src/app/core/auth/auth.models.ts b/ui-ngx/src/app/core/auth/auth.models.ts
index 55af791156..1944c693ac 100644
--- a/ui-ngx/src/app/core/auth/auth.models.ts
+++ b/ui-ngx/src/app/core/auth/auth.models.ts
@@ -28,6 +28,8 @@ export interface SysParamsState {
   userSettings: UserSettings;
   maxResourceSize: number;
   maxDebugModeDurationMinutes: number;
+  maxDataPointsPerRollingArg: number;
+  maxArgumentsPerCF: number;
   ruleChainDebugPerTenantLimitsConfiguration?: string;
 }
 
diff --git a/ui-ngx/src/app/core/auth/auth.reducer.ts b/ui-ngx/src/app/core/auth/auth.reducer.ts
index a460cf35bb..3ecf70074c 100644
--- a/ui-ngx/src/app/core/auth/auth.reducer.ts
+++ b/ui-ngx/src/app/core/auth/auth.reducer.ts
@@ -31,6 +31,8 @@ const emptyUserAuthState: AuthPayload = {
   persistDeviceStateToTelemetry: false,
   mobileQrEnabled: false,
   maxResourceSize: 0,
+  maxArgumentsPerCF: 0,
+  maxDataPointsPerRollingArg: 0,
   maxDebugModeDurationMinutes: 0,
   userSettings: initialUserSettings
 };
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
index 96dff1c1be..5510aeb2c2 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
@@ -119,9 +119,22 @@
       <tb-error noMargin [error]="errorText | translate" class="flex h-9 items-center pl-3"/>
     }
   </div>
-  <div>
-    <button type="button" mat-stroked-button color="primary" #button (click)="manageArgument($event, button)">
+  <div class="flex h-9 justify-between">
+    <button
+      type="button"
+      mat-stroked-button
+      color="primary"
+      #button
+      (click)="manageArgument($event, button)"
+      [disabled]="!!maxArgumentsPerCF && argumentsFormArray.length >= maxArgumentsPerCF"
+    >
       {{ 'calculated-fields.add-argument' | translate }}
     </button>
+    @if (!!maxArgumentsPerCF && argumentsFormArray.length >= maxArgumentsPerCF) {
+      <div class="tb-form-hint tb-primary-fill max-args-warning flex items-center gap-2">
+        <mat-icon>warning</mat-icon>
+        <span>{{ 'calculated-fields.hint.max-args' | translate }}</span>
+      </div>
+    }
   </div>
 </div>
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
index c4efe323c6..877a749afa 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
@@ -30,6 +30,12 @@
     }
   }
 
+  .max-args-warning {
+    .mat-icon {
+      color: #FAA405;
+    }
+  }
+
   .tb-form-table-row-cell-buttons {
     --mat-badge-legacy-small-size-container-size: 8px;
     --mat-badge-small-size-container-overlap-offset: -5px;
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.ts
index 2537f34059..e3b19503af 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.ts
@@ -55,6 +55,9 @@ import { TbPopoverComponent } from '@shared/components/popover.component';
 import { TbTableDatasource } from '@shared/components/table/table-datasource.abstract';
 import { EntityService } from '@core/http/entity.service';
 import { MatSort } from '@angular/material/sort';
+import { getCurrentAuthState } from '@core/auth/auth.selectors';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
 
 @Component({
   selector: 'tb-calculated-field-arguments-table',
@@ -93,6 +96,7 @@ export class CalculatedFieldArgumentsTableComponent implements ControlValueAcces
   readonly ArgumentEntityType = ArgumentEntityType;
   readonly ArgumentType = ArgumentType;
   readonly CalculatedFieldType = CalculatedFieldType;
+  readonly maxArgumentsPerCF = getCurrentAuthState(this.store).maxArgumentsPerCF;
 
   private popoverComponent: TbPopoverComponent<CalculatedFieldArgumentPanelComponent>;
   private propagateChange: (argumentsObj: Record<string, CalculatedFieldArgument>) => void = () => {};
@@ -105,6 +109,7 @@ export class CalculatedFieldArgumentsTableComponent implements ControlValueAcces
     private renderer: Renderer2,
     private entityService: EntityService,
     private destroyRef: DestroyRef,
+    private store: Store<AppState>
   ) {
     this.argumentsFormArray.valueChanges.pipe(takeUntilDestroyed()).subscribe(value => {
       this.updateEntityNameMap(value);
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.html
index 72bc85a48f..566a433545 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.html
@@ -166,10 +166,19 @@
             formControlName="timeWindow"
           />
         </div>
-        <div class="tb-form-row limit-field-row">
-          <div class="fixed-title-width">{{ 'calculated-fields.limit' | translate }}</div>
-          <tb-datapoints-limit class="w-full flex-1" formControlName="limit"/>
-        </div>
+        @if (maxDataPointsPerRollingArg) {
+          <div class="tb-form-row limit-field-row">
+            <div class="fixed-title-width">{{ 'calculated-fields.limit' | translate }}</div>
+            <div class="limit-slider-container flex w-full flex-1 flex-row items-center justify-start">
+              <mat-slider class="flex-1" min="1" max="{{maxDataPointsPerRollingArg}}">
+                <input matSliderThumb formControlName="limit" [value]="argumentFormGroup.get('limit').value"/>
+              </mat-slider>
+              <mat-form-field class="limit-slider-value" subscriptSizing="dynamic" appearance="outline">
+                <input matInput formControlName="limit" type="number" step="1" [value]="argumentFormGroup.get('limit').value" min="1" max="{{maxDataPointsPerRollingArg}}"/>
+              </mat-form-field>
+            </div>
+          </div>
+        }
       }
     </div>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.scss
index 1f7c084d08..773489ee60 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.scss
@@ -28,9 +28,7 @@ $panel-width: 520px;
       min-width: 120px;
     }
   }
-}
 
-:host ::ng-deep {
   .limit-field-row {
     @media screen and (max-width: $panel-width) {
       display: flex;
@@ -42,7 +40,9 @@ $panel-width: 520px;
       }
     }
   }
+}
 
+:host ::ng-deep {
   .time-interval-field {
     .advanced-input {
       flex-direction: column;
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.ts
index 93b8f897ce..9d9614ba28 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.ts
@@ -38,7 +38,9 @@ import { EntityFilter } from '@shared/models/query/query.models';
 import { AliasFilterType } from '@shared/models/alias.models';
 import { merge } from 'rxjs';
 import { MINUTE } from '@shared/models/time/time.models';
-import { TimeService } from '@core/services/time.service';
+import { getCurrentAuthState } from '@core/auth/auth.selectors';
+import { AppState } from '@core/core.state';
+import { Store } from '@ngrx/store';
 
 @Component({
   selector: 'tb-calculated-field-argument-panel',
@@ -58,7 +60,8 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit {
 
   argumentsDataApplied = output<{ value: CalculatedFieldArgumentValue, index: number }>();
 
-  readonly defaultLimit = Math.max(this.timeService.getMinDatapointsLimit(), Math.floor(this.timeService.getMaxDatapointsLimit() / 10));
+  readonly maxDataPointsPerRollingArg = getCurrentAuthState(this.store).maxDataPointsPerRollingArg;
+  readonly defaultLimit = Math.floor(this.maxDataPointsPerRollingArg / 10);
 
   argumentFormGroup = this.fb.group({
     argumentName: ['', [Validators.required, this.uniqNameRequired(), Validators.pattern(charsWithNumRegex), Validators.maxLength(255)]],
@@ -72,7 +75,7 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit {
       scope: [{ value: AttributeScope.SERVER_SCOPE, disabled: true }, [Validators.required]],
     }),
     defaultValue: ['', [Validators.pattern(noLeadTrailSpacesRegex)]],
-    limit: [this.defaultLimit],
+    limit: [{ value: this.defaultLimit, disabled: !this.maxDataPointsPerRollingArg }],
     timeWindow: [MINUTE * 15],
   });
 
@@ -96,7 +99,7 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit {
     private fb: FormBuilder,
     private cd: ChangeDetectorRef,
     private popover: TbPopoverComponent<CalculatedFieldArgumentPanelComponent>,
-    private timeService: TimeService
+    private store: Store<AppState>
   ) {
     this.observeEntityFilterChanges();
     this.observeEntityTypeChanges()
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
index 9f1839afec..64d5039914 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
@@ -229,6 +229,92 @@
       </ng-template>
     </mat-expansion-panel>
   </fieldset>
+  <fieldset class="fields-group">
+    <legend class="group-title">
+      {{ 'tenant-profile.calculated-fields' | translate }} <span translate>tenant-profile.unlimited</span>
+    </legend>
+    <div class="fields-element flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
+      <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+        <mat-label translate>tenant-profile.max-calculated-fields</mat-label>
+        <input matInput required min="0" step="1"
+               formControlName="maxCalculatedFieldsPerEntity"
+               type="number">
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCalculatedFieldsPerEntity').hasError('required')">
+          {{ 'tenant-profile.max-calculated-fields-required' | translate}}
+        </mat-error>
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxCalculatedFieldsPerEntity').hasError('min')">
+          {{ 'tenant-profile.max-calculated-fields-range' | translate}}
+        </mat-error>
+        <mat-hint></mat-hint>
+      </mat-form-field>
+      <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+        <mat-label translate>tenant-profile.max-data-points-per-rolling-arg</mat-label>
+        <input matInput required min="0" step="1"
+               formControlName="maxDataPointsPerRollingArg"
+               type="number">
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDataPointsPerRollingArg').hasError('required')">
+          {{ 'tenant-profile.max-data-points-per-rolling-arg-required' | translate}}
+        </mat-error>
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxDataPointsPerRollingArg').hasError('min')">
+          {{ 'tenant-profile.max-data-points-per-rolling-arg-range' | translate}}
+        </mat-error>
+        <mat-hint></mat-hint>
+      </mat-form-field>
+    </div>
+    <div class="flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
+      <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+        <mat-label translate>tenant-profile.max-arguments-per-cf</mat-label>
+        <input matInput required min="0" step="1"
+               formControlName="maxArgumentsPerCF"
+               type="number">
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxArgumentsPerCF').hasError('required')">
+          {{ 'tenant-profile.max-arguments-per-cf-required' | translate}}
+        </mat-error>
+        <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxArgumentsPerCF').hasError('min')">
+          {{ 'tenant-profile.max-arguments-per-cf-range' | translate}}
+        </mat-error>
+        <mat-hint></mat-hint>
+      </mat-form-field>
+      <div class="flex-1"></div>
+    </div>
+    <mat-expansion-panel class="configuration-panel">
+      <mat-expansion-panel-header>
+        <mat-panel-description class="flex items-stretch justify-end" translate>
+          tenant-profile.advanced-settings
+        </mat-panel-description>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
+          <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+            <mat-label translate>tenant-profile.max-state-size</mat-label>
+            <input matInput required min="0" step="1"
+                   formControlName="maxStateSizeInKBytes"
+                   type="number">
+            <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxStateSizeInKBytes').hasError('required')">
+              {{ 'tenant-profile.max-state-size-required' | translate}}
+            </mat-error>
+            <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxStateSizeInKBytes').hasError('min')">
+              {{ 'tenant-profile.max-state-size-range' | translate}}
+            </mat-error>
+            <mat-hint></mat-hint>
+          </mat-form-field>
+          <mat-form-field class="mat-block flex-1" appearance="fill" subscriptSizing="dynamic">
+            <mat-label translate>tenant-profile.max-value-argument-size</mat-label>
+            <input matInput required min="0" step="1"
+                   formControlName="maxSingleValueArgumentSizeInKBytes"
+                   type="number">
+            <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSingleValueArgumentSizeInKBytes').hasError('required')">
+              {{ 'tenant-profile.max-value-argument-size-required' | translate}}
+            </mat-error>
+            <mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxSingleValueArgumentSizeInKBytes').hasError('min')">
+              {{ 'tenant-profile.max-value-argument-size-range' | translate}}
+            </mat-error>
+            <mat-hint></mat-hint>
+          </mat-form-field>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </fieldset>
 
   <fieldset class="fields-group">
     <legend class="group-title">
@@ -638,6 +724,12 @@
                           [type]="rateLimitsType.EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT">
           </tb-rate-limits>
         </div>
+        <div class="flex flex-1 flex-row xs:flex-col gt-xs:gap-4">
+          <tb-rate-limits class="flex-1" formControlName="calculatedFieldDebugEventsRateLimit"
+                          [type]="rateLimitsType.CALCULATED_FIELD_DEBUG_EVENT_RATE_LIMIT">
+          </tb-rate-limits>
+          <div class="flex-1"></div>
+        </div>
       </ng-template>
     </mat-expansion-panel>
   </fieldset>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
index 4cce34c502..b1d6652e4a 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
@@ -118,7 +118,13 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       edgeEventRateLimits: [null, []],
       edgeEventRateLimitsPerEdge: [null, []],
       edgeUplinkMessagesRateLimits: [null, []],
-      edgeUplinkMessagesRateLimitsPerEdge: [null, []]
+      edgeUplinkMessagesRateLimitsPerEdge: [null, []],
+      maxCalculatedFieldsPerEntity: [null, [Validators.required, Validators.min(0)]],
+      maxArgumentsPerCF: [null, [Validators.required, Validators.min(0)]],
+      maxDataPointsPerRollingArg: [null, [Validators.required, Validators.min(0)]],
+      maxStateSizeInKBytes: [null, [Validators.required, Validators.min(0)]],
+      calculatedFieldDebugEventsRateLimit: [null, []],
+      maxSingleValueArgumentSizeInKBytes: [null, [Validators.required, Validators.min(0)]],
     });
 
     this.defaultTenantProfileConfigurationFormGroup.get('smsEnabled').valueChanges.pipe(
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
index ab50c967bf..f09f950ee7 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
@@ -45,7 +45,8 @@ export enum RateLimitsType {
   EDGE_EVENTS_RATE_LIMIT = 'EDGE_EVENTS_RATE_LIMIT',
   EDGE_EVENTS_PER_EDGE_RATE_LIMIT = 'EDGE_EVENTS_PER_EDGE_RATE_LIMIT',
   EDGE_UPLINK_MESSAGES_RATE_LIMIT = 'EDGE_UPLINK_MESSAGES_RATE_LIMIT',
-  EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT = 'EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT'
+  EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT = 'EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT',
+  CALCULATED_FIELD_DEBUG_EVENT_RATE_LIMIT = 'CALCULATED_FIELD_DEBUG_EVENT_RATE_LIMIT',
 }
 
 export const rateLimitsLabelTranslationMap = new Map<RateLimitsType, string>(
@@ -74,6 +75,7 @@ export const rateLimitsLabelTranslationMap = new Map<RateLimitsType, string>(
     [RateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edge-events-per-edge-rate-limit'],
     [RateLimitsType.EDGE_UPLINK_MESSAGES_RATE_LIMIT, 'tenant-profile.rate-limits.edge-uplink-messages-rate-limit'],
     [RateLimitsType.EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edge-uplink-messages-per-edge-rate-limit'],
+    [RateLimitsType.CALCULATED_FIELD_DEBUG_EVENT_RATE_LIMIT, 'tenant-profile.rate-limits.calculated-field-debug-event-rate-limit'],
   ]
 );
 
@@ -103,6 +105,7 @@ export const rateLimitsDialogTitleTranslationMap = new Map<RateLimitsType, strin
     [RateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-events-per-edge-rate-limit'],
     [RateLimitsType.EDGE_UPLINK_MESSAGES_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-uplink-messages-rate-limit'],
     [RateLimitsType.EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-uplink-messages-per-edge-rate-limit'],
+    [RateLimitsType.CALCULATED_FIELD_DEBUG_EVENT_RATE_LIMIT, 'tenant-profile.rate-limits.edit-calculated-field-debug-event-rate-limit']
   ]
 );
 
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 9aff79102b..9de260bed2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1068,7 +1068,8 @@
             "argument-name-pattern": "Argument name is invalid.",
             "argument-name-duplicate": "Argument with such name already exists.",
             "argument-name-max-length": "Argument name should be less than 256 characters.",
-            "argument-type-required": "Argument type is required."
+            "argument-type-required": "Argument type is required.",
+            "max-args": "Maximum number of arguments reached."
         }
     },
     "confirm-on-exit": {
@@ -5474,6 +5475,7 @@
         "entities": "Entities",
         "rule-engine": "Rule Engine",
         "time-to-live": "Time-to-live",
+        "calculated-fields": "Calculated fields",
         "alarms-and-notifications": "Alarms and notifications",
         "ota-files-in-bytes": "Files",
         "ws-title": "WS",
@@ -5526,6 +5528,21 @@
         "tenant-entity-import-rate-limit": "Entity version load",
         "tenant-notification-request-rate-limit": "Notification requests",
         "tenant-notification-requests-per-rule-rate-limit": "Notification requests per notification rule",
+        "max-calculated-fields": "Maximum number of calculated fields per entity",
+        "max-calculated-fields-range": "Maximum number of calculated fields per entity can't be negative",
+        "max-calculated-fields-required": "Maximum number of calculated fields per entity is required",
+        "max-data-points-per-rolling-arg": "Maximum number of data points in a time series rolling arguments",
+        "max-data-points-per-rolling-arg-range": "Maximum number of data points in a time series rolling arguments can't be negative",
+        "max-data-points-per-rolling-arg-required": "Maximum number of data points in a time series rolling arguments is required",
+        "max-arguments-per-cf": "Maximum number of arguments per calculated field",
+        "max-arguments-per-cf-range": "Maximum number of arguments per calculated field can't be negative",
+        "max-arguments-per-cf-required": "Maximum number of arguments per calculated field is required",
+        "max-state-size": "Maximum size of the state in KB",
+        "max-state-size-range": "Maximum size of the state in KB can't be negative",
+        "max-state-size-required": "Maximum size of the state in KB is required",
+        "max-value-argument-size": "Maximum size of the single value argument in KB",
+        "max-value-argument-size-range": "Maximum size of the single value argument in KB can't be negative",
+        "max-value-argument-size-required": "Maximum size of the single value argument in KB is required",
         "max-transport-messages": "Transport messages maximum number",
         "max-transport-messages-required": "Transport messages maximum number is required.",
         "max-transport-messages-range": "Transport messages maximum number can't be negative",
@@ -5597,6 +5614,8 @@
             "advanced-settings": "Advanced settings",
             "edit-limit": "Edit limit",
             "but-less-than": "but less than",
+            "calculated-field-debug-event-rate-limit": "Calculated field debug events",
+            "edit-calculated-field-debug-event-rate-limit": "Edit calculated field debug events rate limits",
             "edit-transport-tenant-msg-title": "Edit transport tenant messages rate limits",
             "edit-transport-tenant-telemetry-msg-title": "Edit transport tenant telemetry messages rate limits",
             "edit-transport-tenant-telemetry-data-points-title": "Edit transport tenant telemetry data points rate limits",

From 8e8ecf9a49f5fe38b407b4b4090fed430eedaf8f Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 28 Feb 2025 11:54:38 +0200
Subject: [PATCH 2/7] refactoring

---
 .../calculated-field-arguments-table.component.html           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
index 5510aeb2c2..6bab01f976 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
@@ -126,11 +126,11 @@
       color="primary"
       #button
       (click)="manageArgument($event, button)"
-      [disabled]="!!maxArgumentsPerCF && argumentsFormArray.length >= maxArgumentsPerCF"
+      [disabled]="maxArgumentsPerCF > 0 && argumentsFormArray.length >= maxArgumentsPerCF"
     >
       {{ 'calculated-fields.add-argument' | translate }}
     </button>
-    @if (!!maxArgumentsPerCF && argumentsFormArray.length >= maxArgumentsPerCF) {
+    @if (maxArgumentsPerCF && argumentsFormArray.length >= maxArgumentsPerCF) {
       <div class="tb-form-hint tb-primary-fill max-args-warning flex items-center gap-2">
         <mat-icon>warning</mat-icon>
         <span>{{ 'calculated-fields.hint.max-args' | translate }}</span>

From e6d69e3ed3cbbe77851571da8f59bf706412b191 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Fri, 28 Feb 2025 12:06:33 +0200
Subject: [PATCH 3/7] Restored missing constructor

---
 .../server/dao/model/sql/CalculatedFieldLinkEntity.java  | 9 +++++++++
 .../server/dao/service/DeviceServiceTest.java            | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java
index 2668a1a0d8..6f0f3d3cf9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java
@@ -60,6 +60,15 @@ public class CalculatedFieldLinkEntity extends BaseSqlEntity<CalculatedFieldLink
         super();
     }
 
+    public CalculatedFieldLinkEntity(CalculatedFieldLink calculatedFieldLink) {
+        this.setUuid(calculatedFieldLink.getUuidId());
+        this.createdTime = calculatedFieldLink.getCreatedTime();
+        this.tenantId = calculatedFieldLink.getTenantId().getId();
+        this.entityType = calculatedFieldLink.getEntityId().getEntityType().name();
+        this.entityId = calculatedFieldLink.getEntityId().getId();
+        this.calculatedFieldId = calculatedFieldLink.getCalculatedFieldId().getId();
+    }
+
     @Override
     public CalculatedFieldLink toData() {
         CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink(new CalculatedFieldLinkId(id));
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
index 0fbf97ff7e..bbbd48aa49 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
@@ -1211,7 +1211,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
     }
 
     @Test
-    public void testDeleteAssetIfReferencedInCalculatedField() {
+    public void testDeleteDeviceIfReferencedInCalculatedField() {
         Device device = saveDevice(tenantId, "Test Device");
         Device deviceWithCf = saveDevice(tenantId, "Device with CF");
 

From c9b6a9e17c17d704dccacc3aedfd1d947637e0ac Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 28 Feb 2025 12:34:47 +0200
Subject: [PATCH 4/7] Added tenant config model and default value

---
 ui-ngx/src/app/shared/models/tenant.model.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/models/tenant.model.ts b/ui-ngx/src/app/shared/models/tenant.model.ts
index 23c2d95762..38ff63e3c6 100644
--- a/ui-ngx/src/app/shared/models/tenant.model.ts
+++ b/ui-ngx/src/app/shared/models/tenant.model.ts
@@ -95,6 +95,13 @@ export interface DefaultTenantProfileConfiguration {
   rpcTtlDays: number;
   queueStatsTtlDays: number;
   ruleEngineExceptionsTtlDays: number;
+
+  maxCalculatedFieldsPerEntity: number;
+  maxArgumentsPerCF: number;
+  maxDataPointsPerRollingArg: number;
+  maxStateSizeInKBytes: number;
+  maxSingleValueArgumentSizeInKBytes: number;
+  calculatedFieldDebugEventsRateLimit: string;
 }
 
 export type TenantProfileConfigurations = DefaultTenantProfileConfiguration;
@@ -148,7 +155,13 @@ export function createTenantProfileConfiguration(type: TenantProfileType): Tenan
           alarmsTtlDays: 0,
           rpcTtlDays: 0,
           queueStatsTtlDays: 0,
-          ruleEngineExceptionsTtlDays: 0
+          ruleEngineExceptionsTtlDays: 0,
+          maxCalculatedFieldsPerEntity: 0,
+          maxArgumentsPerCF: 0,
+          maxDataPointsPerRollingArg: 0,
+          maxStateSizeInKBytes: 0,
+          maxSingleValueArgumentSizeInKBytes: 0,
+          calculatedFieldDebugEventsRateLimit: ''
         };
         configuration = {...defaultConfiguration, type: TenantProfileType.DEFAULT};
         break;

From 96f7a90a7b9ec2dacf8bf616c8754edfcfcbb948 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 28 Feb 2025 15:15:23 +0200
Subject: [PATCH 5/7] Added rolling argument functions autocompletes

---
 .../calculated-field-dialog.component.html    |   5 +-
 .../calculated-field-dialog.component.scss    |   6 +-
 ...ed-field-script-test-dialog.component.scss |   2 +-
 .../shared/models/calculated-field.models.ts  | 156 ++++++++++++++++++
 .../assets/locale/locale.constant-en_US.json  |   3 +-
 5 files changed, 168 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
index 0695b9d2b9..7de7bce749 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
@@ -78,7 +78,7 @@
           <div class="tb-form-panel-title tb-required">{{ 'calculated-fields.expression' | translate }}</div>
           @if (fieldFormGroup.get('type').value === CalculatedFieldType.SIMPLE) {
             <mat-form-field class="mt-3" appearance="outline" subscriptSizing="dynamic">
-              <input matInput formControlName="expressionSIMPLE" maxlength="255" [placeholder]="'action.set' | translate" required>
+              <input matInput formControlName="expressionSIMPLE" maxlength="255" [placeholder]="'(temperature - 32) / 1.8'" required>
               @if (configFormGroup.get('expressionSIMPLE').errors && configFormGroup.get('expressionSIMPLE').touched) {
                 <mat-error>
                   @if (configFormGroup.get('expressionSIMPLE').hasError('required')) {
@@ -91,6 +91,9 @@
                 </mat-error>
               }
             </mat-form-field>
+            @if (!configFormGroup.get('expressionSIMPLE').errors || !configFormGroup.get('expressionSIMPLE').touched) {
+              <span class="tb-form-hint expression-hint">{{ 'calculated-fields.hint.expression' | translate }}</span>
+            }
           } @else {
             <tb-js-func
               required
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
index 900758761c..f89053db7a 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
@@ -17,6 +17,10 @@
   .dialog-container {
     width: 869px;
     max-width: 100%;
+
+    .tb-form-hint.expression-hint {
+      padding-bottom: 0;
+    }
   }
 
   .script-lang-chip {
@@ -40,7 +44,7 @@
         &-key {
           color: #C52F00;
         }
-        &-ts, &-time-window, &-values, &-value {
+        &-ts, &-time-window, &-values, &-value, &-func {
           color: #7214D0;
         }
         &-start-ts, &-end-ts, &-limit {
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.scss
index 298ab64e26..2187b47e0d 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.scss
@@ -78,7 +78,7 @@
         &-key {
           color: #C52F00;
         }
-        &-ts, &-time-window, &-values, &-value {
+        &-ts, &-time-window, &-values, &-value, &-func {
           color: #7214D0;
         }
         &-start-ts, &-end-ts, &-limit {
diff --git a/ui-ngx/src/app/shared/models/calculated-field.models.ts b/ui-ngx/src/app/shared/models/calculated-field.models.ts
index 5d9c4f14c6..f6d7aaaa1e 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -29,6 +29,7 @@ import { AliasFilterType } from '@shared/models/alias.models';
 import { Observable } from 'rxjs';
 import { TbEditorCompleter } from '@shared/models/ace/completion.models';
 import {
+  AceHighlightRule,
   AceHighlightRules,
   dotOperatorHighlightRule,
   endGroupHighlightRule
@@ -268,12 +269,159 @@ export const CalculatedFieldAttributeValueArgumentAutocomplete = {
     }
   },
 };
+export const CalculatedFieldRollingValueArgumentFunctionsAutocomplete = {
+  max: {
+    meta: 'function',
+    description: 'Computes the maximum value in the list of rolling argument values. Returns NaN if any value is NaN and ignoreNaN is false.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The maximum value, or NaN if applicable',
+      type: 'number'
+    }
+  },
+  min: {
+    meta: 'function',
+    description: 'Computes the minimum value in the list of rolling argument values. Returns NaN if any value is NaN and ignoreNaN is false.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The minimum value, or NaN if applicable',
+      type: 'number'
+    }
+  },
+  mean: {
+    meta: 'function',
+    description: 'Computes the mean value of the rolling argument values list. Returns NaN if any value is NaN and ignoreNaN is false.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The mean value, or NaN if applicable',
+      type: 'number'
+    }
+  },
+  std: {
+    meta: 'function',
+    description: 'Computes the standard deviation in the list of rolling argument values. Returns NaN if any value is NaN and ignoreNaN is false.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The standard deviation, or NaN if applicable',
+      type: 'number'
+    }
+  },
+  median: {
+    meta: 'function',
+    description: 'Computes the median value of the rolling argument values list. Returns NaN if any value is NaN and ignoreNaN is false.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The median value, or NaN if applicable',
+      type: 'number'
+    }
+  },
+  count: {
+    meta: 'function',
+    description: 'Counts values in the list of rolling argument values. Counts non-NaN values if ignoreNaN is true, otherwise - total size.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The count of values',
+      type: 'number'
+    }
+  },
+  last: {
+    meta: 'function',
+    description: 'Returns the last non-NaN value in the list of rolling argument values if ignoreNaN is true, otherwise - the last value.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The last value, or NaN if applicable',
+      type: 'number'
+    }
+  },
+  first: {
+    meta: 'function',
+    description: 'Returns the first non-NaN value in the list of rolling argument values if ignoreNaN is true, otherwise - the first value.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The first value, or NaN if applicable',
+      type: 'number'
+    }
+  },
+  sum: {
+    meta: 'function',
+    description: 'Computes the sum of values in the list of rolling argument values. Returns NaN if any value is NaN and ignoreNaN is false.',
+    args: [
+      {
+        name: 'ignoreNaN',
+        description: 'Whether to ignore NaN values. Equals true by default.',
+        type: 'boolean',
+        optional: true,
+      }
+    ],
+    return: {
+      description: 'The sum of values, or NaN if applicable',
+      type: 'number'
+    }
+  }
+};
 
 export const CalculatedFieldRollingValueArgumentAutocomplete = {
   meta: 'object',
   type: '{ values: { ts: number; value: any; }[]; timeWindow: { startTs: number; endTs: number; limit: number } }; }',
   description: 'Calculated field rolling value argument.',
   children: {
+    ...CalculatedFieldRollingValueArgumentFunctionsAutocomplete,
     values: {
       meta: 'array',
       type: '{ ts: number; value: any; }[]',
@@ -355,6 +503,13 @@ const calculatedFieldSingleArgumentValueHighlightRules: AceHighlightRules = {
   ],
 }
 
+const calculatedFieldRollingArgumentValueFunctionsHighlightRules: Array<AceHighlightRule> =
+  ['max', 'min', 'mean', 'std', 'median', 'count', 'last', 'first', 'sum'].map(funcName => ({
+    token: 'tb.calculated-field-func',
+    regex: `\\b${funcName}\\b`,
+    next: 'no_regex'
+  }));
+
 const calculatedFieldRollingArgumentValueHighlightRules: AceHighlightRules = {
   calculatedFieldRollingArgumentValue: [
     dotOperatorHighlightRule,
@@ -368,6 +523,7 @@ const calculatedFieldRollingArgumentValueHighlightRules: AceHighlightRules = {
       regex: /timeWindow/,
       next: 'calculatedFieldRollingArgumentTimeWindow'
     },
+    ...calculatedFieldRollingArgumentValueFunctionsHighlightRules,
     endGroupHighlightRule
   ],
 }
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 9de260bed2..1163024e90 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1069,7 +1069,8 @@
             "argument-name-duplicate": "Argument with such name already exists.",
             "argument-name-max-length": "Argument name should be less than 256 characters.",
             "argument-type-required": "Argument type is required.",
-            "max-args": "Maximum number of arguments reached."
+            "max-args": "Maximum number of arguments reached.",
+            "expression": "Default expression demonstrates how to transform a temperature from Fahrenheit to Celsius."
         }
     },
     "confirm-on-exit": {

From 7dcddb9ffaf2a20996ad04cc3abaf25a596cbf20 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 28 Feb 2025 15:18:13 +0200
Subject: [PATCH 6/7] Changed test expression help id

---
 .../calculated-field-script-test-dialog.component.html          | 2 +-
 .../assets/help/en_US/calculated-field/test-expression_fn.md    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 ui-ngx/src/assets/help/en_US/calculated-field/test-expression_fn.md

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
index 57234aa692..cda99f6c09 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
@@ -45,7 +45,7 @@
               [scriptLanguage]="ScriptLanguage.TBEL"
               [editorCompleter]="data.argumentsEditorCompleter"
               resultType="object"
-              helpId="calculated-field/test-expression_fn"
+              helpId="calculated-field/expression_fn"
             />
           </div>
         </div>
diff --git a/ui-ngx/src/assets/help/en_US/calculated-field/test-expression_fn.md b/ui-ngx/src/assets/help/en_US/calculated-field/test-expression_fn.md
deleted file mode 100644
index f8173dc528..0000000000
--- a/ui-ngx/src/assets/help/en_US/calculated-field/test-expression_fn.md
+++ /dev/null
@@ -1 +0,0 @@
-<!-- [TODO]: [Calculated Fields] add content -->

From 4620261e6fd52f706834ffa8df011436455d1e60 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 28 Feb 2025 15:27:22 +0200
Subject: [PATCH 7/7] refactoring

---
 .../components/dialog/calculated-field-dialog.component.html | 5 ++---
 .../components/dialog/calculated-field-dialog.component.scss | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
index 7de7bce749..7e0f87a12e 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
@@ -89,11 +89,10 @@
                     {{ 'calculated-fields.hint.expression-max-length' | translate }}
                   }
                 </mat-error>
+              } @else {
+                <mat-hint>{{ 'calculated-fields.hint.expression' | translate }}</mat-hint>
               }
             </mat-form-field>
-            @if (!configFormGroup.get('expressionSIMPLE').errors || !configFormGroup.get('expressionSIMPLE').touched) {
-              <span class="tb-form-hint expression-hint">{{ 'calculated-fields.hint.expression' | translate }}</span>
-            }
           } @else {
             <tb-js-func
               required
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
index f89053db7a..0e994ed825 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
@@ -17,10 +17,6 @@
   .dialog-container {
     width: 869px;
     max-width: 100%;
-
-    .tb-form-hint.expression-hint {
-      padding-bottom: 0;
-    }
   }
 
   .script-lang-chip {