Merge branch 'AD/imp/generator-node' of github.com:ArtemDzhereleiko/thingsboard into AD/imp/generator-node

ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts

@@ -414,6 +414,8 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
       } else {
         return EntityType.CUSTOMER;
       }
+    } else if (entityType === AliasEntityType.CURRENT_RULE_NODE) {
+      return EntityType.RULE_NODE;
     }
     return entityType;
   }

ui-ngx/src/app/shared/components/entity/entity-select.component.html

@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<div [formGroup]="entitySelectFormGroup">
+<div [formGroup]="entitySelectFormGroup" class="tb-entity-select">
   <tb-entity-type-select
     *ngIf="displayEntityTypeSelect"
     [showLabel]="true"
@@ -25,9 +25,7 @@
     formControlName="entityType">
   </tb-entity-type-select>
   <tb-entity-autocomplete
-    *ngIf="modelValue.entityType && modelValue.entityType !== AliasEntityType.CURRENT_TENANT
+    *ngIf="modelValue.entityType && !entityTypeNullUid.has(modelValue.entityType)"
-                                 && modelValue.entityType !== AliasEntityType.CURRENT_USER
-                                 && modelValue.entityType !== AliasEntityType.CURRENT_USER_OWNER"
     [required]="required"
     [entityType]="modelValue.entityType"
     formControlName="entityId">

ui-ngx/src/app/shared/components/entity/entity-select.component.ts

@@ -15,7 +15,7 @@
 ///
 
 import { AfterViewInit, Component, forwardRef, Input, OnInit } from '@angular/core';
-import { ControlValueAccessor, UntypedFormBuilder, UntypedFormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { TranslateService } from '@ngx-translate/core';
@@ -63,6 +63,10 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit, Afte
 
   AliasEntityType = AliasEntityType;
 
+  entityTypeNullUid: Set<AliasEntityType | EntityType> = new Set([
+    AliasEntityType.CURRENT_TENANT, AliasEntityType.CURRENT_USER, AliasEntityType.CURRENT_USER_OWNER, AliasEntityType.CURRENT_RULE_NODE
+  ]);
+
   private readonly defaultEntityType: EntityType | AliasEntityType = null;
 
   private propagateChange = (v: any) => { };
@@ -143,9 +147,7 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit, Afte
         id: this.modelValue.entityType !== entityType ? null : entityId
       };
 
-      if (this.modelValue.entityType === AliasEntityType.CURRENT_TENANT
+      if (this.entityTypeNullUid.has(this.modelValue.entityType)) {
-        || this.modelValue.entityType === AliasEntityType.CURRENT_USER
-        || this.modelValue.entityType === AliasEntityType.CURRENT_USER_OWNER) {
         this.modelValue.id = NULL_UUID;
       } else if (this.modelValue.entityType === AliasEntityType.CURRENT_CUSTOMER && !this.modelValue.id) {
         this.modelValue.id = NULL_UUID;

ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts

@@ -93,6 +93,9 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit,
     this.entityTypes = this.filterAllowedEntityTypes
       ? this.entityService.prepareAllowedEntityTypesList(this.allowedEntityTypes, this.useAliasEntityTypes)
       : this.allowedEntityTypes;
+    if (this.allowedEntityTypes?.length && this.allowedEntityTypes.includes(AliasEntityType.CURRENT_RULE_NODE)) {
+      this.entityTypes.push(AliasEntityType.CURRENT_RULE_NODE);
+    }
     this.entityTypeFormGroup.get('entityType').valueChanges.subscribe(
       (value) => {
         let modelValue;

ui-ngx/src/app/shared/components/js-func.component.html

@@ -24,6 +24,7 @@
       {{ functionLabel }}
     </label>
     <span fxFlex></span>
+    <ng-content select="[toolbarPrefixButton]"></ng-content>
     <button type='button' *ngIf="!disabled" mat-button class="tidy" (click)="beautifyJs()">
       {{'js-func.tidy' | translate }}
     </button>

ui-ngx/src/app/shared/components/script-lang.component.html

@@ -17,9 +17,11 @@
 -->
 <div [formGroup]="scriptLangFormGroup" fxLayout="row" fxLayoutAlign="center">
   <mat-button-toggle-group class="tb-script-lang-toggle-group"
-                           style="width: 320px;"
+                           formControlName="scriptLang"
-                           formControlName="scriptLang" aria-label="Script language">
+                           aria-label="Script language">
     <mat-button-toggle fxFlex value="{{ scriptLanguage.TBEL }}">{{ 'rulenode.script-lang-tbel' | translate }}</mat-button-toggle>
-    <mat-button-toggle fxFlex value="{{ scriptLanguage.JS }}">{{ 'rulenode.script-lang-java-script' | translate }}</mat-button-toggle>
+    <mat-button-toggle fxFlex value="{{ scriptLanguage.JS }}">
+      {{ 'rulenode.script-lang-java-script' | translate }}
+    </mat-button-toggle>
   </mat-button-toggle-group>
 </div>

ui-ngx/src/app/shared/components/script-lang.component.scss

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 .mat-button-toggle-group.tb-script-lang-toggle-group {
+  width: 320px;
   &.mat-button-toggle-group-appearance-standard {
     border: none;
     border-radius: 18px;

ui-ngx/src/app/shared/components/script-lang.component.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Component, forwardRef, Input, OnInit, ViewEncapsulation } from '@angular/core';
-import { ControlValueAccessor, UntypedFormBuilder, UntypedFormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';

ui-ngx/src/app/shared/models/entity-type.models.ts

@@ -54,7 +54,8 @@ export enum AliasEntityType {
   CURRENT_CUSTOMER = 'CURRENT_CUSTOMER',
   CURRENT_TENANT = 'CURRENT_TENANT',
   CURRENT_USER = 'CURRENT_USER',
-  CURRENT_USER_OWNER = 'CURRENT_USER_OWNER'
+  CURRENT_USER_OWNER = 'CURRENT_USER_OWNER',
+  CURRENT_RULE_NODE = 'CURRENT_RULE_NODE'
 }
 
 export interface EntityTypeTranslation {
@@ -326,6 +327,13 @@ export const entityTypeTranslations = new Map<EntityType | AliasEntityType, Enti
         list: 'entity.type-current-user-owner'
       }
     ],
+    [
+      AliasEntityType.CURRENT_RULE_NODE,
+      {
+        type: 'entity.type-current-rule-node',
+        list: 'entity.type-current-rule-node'
+      }
+    ],
     [
       EntityType.TB_RESOURCE,
       {

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -2315,6 +2315,7 @@
         "type-current-tenant": "Current Tenant",
         "type-current-user": "Current User",
         "type-current-user-owner": "Current User Owner",
+        "type-current-rule-node": "Current Rule Node",
         "type-widgets-bundle": "Widgets bundle",
         "type-widgets-bundles": "Widgets bundles",
         "list-of-widgets-bundles": "{ count, plural, =1 {One widgets bundle} other {List of # widget bundles} }",