From db95bc8aa81f6d2beded755563be4c925cbd7811 Mon Sep 17 00:00:00 2001
From: kalytka <ykalytka@thingsboard.io>
Date: Mon, 10 Jul 2023 10:46:37 +0300
Subject: [PATCH 1/3] Added ng-content to js-func conponent

---
 ui-ngx/src/app/shared/components/js-func.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-ngx/src/app/shared/components/js-func.component.html b/ui-ngx/src/app/shared/components/js-func.component.html
index 23ebd76918..8827d9e57f 100644
--- a/ui-ngx/src/app/shared/components/js-func.component.html
+++ b/ui-ngx/src/app/shared/components/js-func.component.html
@@ -27,6 +27,7 @@
     <button type='button' *ngIf="!disabled" mat-button class="tidy" (click)="beautifyJs()">
       {{'js-func.tidy' | translate }}
     </button>
+    <ng-content></ng-content>
     <div *ngIf="helpId" [tb-help-popup]="helpId"></div>
     <fieldset style="width: initial">
       <div matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}"

From c7802335e2ff86c58cbe9ff89c86a477b1d0870b Mon Sep 17 00:00:00 2001
From: kalytka <ykalytka@thingsboard.io>
Date: Fri, 14 Jul 2023 17:49:14 +0300
Subject: [PATCH 2/3] Add select to ng-content

---
 ui-ngx/src/app/shared/components/js-func.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/components/js-func.component.html b/ui-ngx/src/app/shared/components/js-func.component.html
index 8827d9e57f..e621fe1e50 100644
--- a/ui-ngx/src/app/shared/components/js-func.component.html
+++ b/ui-ngx/src/app/shared/components/js-func.component.html
@@ -27,7 +27,7 @@
     <button type='button' *ngIf="!disabled" mat-button class="tidy" (click)="beautifyJs()">
       {{'js-func.tidy' | translate }}
     </button>
-    <ng-content></ng-content>
+    <ng-content select="[customButtons]"></ng-content>
     <div *ngIf="helpId" [tb-help-popup]="helpId"></div>
     <fieldset style="width: initial">
       <div matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}"

From bcf32658f91faedcad9dfa1731fdde9efa33fc8c Mon Sep 17 00:00:00 2001
From: Vladyslav <yanat708@gmail.com>
Date: Thu, 20 Jul 2023 10:08:43 +0300
Subject: [PATCH 3/3] Update js-func.component.html

---
 ui-ngx/src/app/shared/components/js-func.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/components/js-func.component.html b/ui-ngx/src/app/shared/components/js-func.component.html
index e621fe1e50..41e834668e 100644
--- a/ui-ngx/src/app/shared/components/js-func.component.html
+++ b/ui-ngx/src/app/shared/components/js-func.component.html
@@ -27,7 +27,7 @@
     <button type='button' *ngIf="!disabled" mat-button class="tidy" (click)="beautifyJs()">
       {{'js-func.tidy' | translate }}
     </button>
-    <ng-content select="[customButtons]"></ng-content>
+    <ng-content select="[toolbarSuffixButton]"></ng-content>
     <div *ngIf="helpId" [tb-help-popup]="helpId"></div>
     <fieldset style="width: initial">
       <div matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}"