diff --git a/ui-ngx/src/assets/dashboard/api_usage.json b/ui-ngx/src/assets/dashboard/api_usage.json
index 3c9259f453..b1cea42249 100644
--- a/ui-ngx/src/assets/dashboard/api_usage.json
+++ b/ui-ngx/src/assets/dashboard/api_usage.json
@@ -84,7 +84,7 @@
                   "decimals": null,
                   "funcBody": null,
                   "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.udf-executions}\";",
+                  "postFuncBody": "return \"{i18n:api-usage.scripts}\";",
                   "aggregationType": "NONE"
                 },
                 {
@@ -107,7 +107,7 @@
                   "label": "tbelApiState",
                   "color": "#3f51b5",
                   "settings": {},
-                  "_hash": 0.950264191483049,
+                  "_hash": 0.2002981454581909,
                   "aggregationType": "NONE",
                   "units": null,
                   "decimals": null,
@@ -119,9 +119,9 @@
                   "name": "tbelExecutionLimit",
                   "type": "timeseries",
                   "label": "tbelLimit",
-                  "color": "#e91e63",
+                  "color": "#ffeb3b",
                   "settings": {},
-                  "_hash": 0.9618078963734347,
+                  "_hash": 0.5039854873031677,
                   "aggregationType": "NONE",
                   "units": null,
                   "decimals": null,
@@ -133,9 +133,9 @@
                   "name": "tbelExecutionCount",
                   "type": "timeseries",
                   "label": "tbelCount",
-                  "color": "#ffeb3b",
+                  "color": "#e91e63",
                   "settings": {},
-                  "_hash": 0.26695276374882493,
+                  "_hash": 0.9506731992087107,
                   "aggregationType": "NONE",
                   "units": null,
                   "decimals": null,
@@ -147,9 +147,9 @@
                   "name": "tbelExecutionApiState",
                   "type": "timeseries",
                   "label": "tbelUnit",
-                  "color": "#03a9f4",
+                  "color": "#ffeb3b",
                   "settings": {},
-                  "_hash": 0.41720010909473104,
+                  "_hash": 0.3673530683177082,
                   "aggregationType": "NONE",
                   "units": null,
                   "decimals": null,
@@ -189,8 +189,8 @@
           "color": "#666666",
           "padding": "0",
           "settings": {
-            "cardHtml": "<div class='card'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var jsCount = \"${jsCount:0}\";\n            var jsLimit = \"${jsLimit:0}\";\n            jsCount = jsCount.length > 0 ? parseInt(jsCount, 10) : 0;\n            jsLimit = jsLimit.length > 0 ? parseInt(jsLimit, 10) : 0;\n            var jsPercentElement = $('#js-api-usage-percent', parentTag);\n            var jsValueElement = $('#js-api-usage-value', parentTag);\n            var jsBarElement = $('#js-api-usage-bar', parentTag);\n            if (Number.isFinite(jsLimit) && jsLimit > 0) {\n                var jsPercent = Math.min(100, ((jsCount / jsLimit) * 100));\n                jsBarElement.width(jsPercent + '%');\n                jsPercent = jsPercent.toFixed(2);\n                jsPercentElement.text(jsPercent + '%');\n                jsValueElement.text(toShortNumber(jsCount) + ' / ' + toShortNumber(jsLimit));\n            } else {\n                jsBarElement.width('0%');\n                jsPercentElement.text('');\n                jsValueElement.text(toShortNumber(jsCount) + ' / ∞');\n            }\n            var tbelCount = \"${tbelCount:0}\";\n            var tbelLimit = \"${tbelLimit:0}\";\n            tbelCount = tbelCount.length > 0 ? parseInt(tbelCount, 10) : 0;\n            tbelLimit = tbelLimit.length > 0 ? parseInt(tbelLimit, 10) : 0;\n            var tbelPercentElement = $('#tbel-api-usage-percent', parentTag);\n            var tbelValueElement = $('#tbel-api-usage-value', parentTag);\n            var tbelBarElement = $('#tbel-api-usage-bar', parentTag);\n            if (Number.isFinite(tbelLimit) && tbelLimit > 0) {\n                var tbelPercent = Math.min(100, ((tbelCount / tbelLimit) * 100));\n                tbelBarElement.width(tbelPercent + '%');\n                tbelPercent = tbelPercent.toFixed(2);\n                tbelPercentElement.text(tbelPercent + '%');\n                tbelValueElement.text(toShortNumber(tbelCount) + ' / ' + toShortNumber(tbelLimit));\n            } else {\n                tbelBarElement.width('0%');\n                tbelPercentElement.text('');\n                tbelValueElement.text(toShortNumber(tbelCount) + ' / ∞');\n            }\n            var jsApiState = \"${jsApiState}\";\n            var tbelApiState = \"${tbelApiState}\";\n            var currentState;\n            if (jsApiState === 'DISABLED' || tbelApiState === 'DISABLED') {\n                currentState = 'DISABLED';\n            } else if (jsApiState === 'WARNING' || tbelApiState === 'WARNING') {\n                currentState = 'WARNING';\n            } else {\n                currentState = 'ENABLED';\n            }\n            var stateTitle = $('#api-state', parentTag);\n            stateTitle.text(currentState);\n            parentTag.classList.add(currentState.toLowerCase());\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div id=\"api-state\" class='state'></div>\n            </div>\n            <div class=\"bars-row\">\n                <div class=\"bar-column\" style=\"margin-right: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">${jsUnit}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"js-api-usage-bar\"></div>\n                        </div>    \n                        <div class='bar-labels'>\n                            <div id=\"js-api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"js-api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n                <div class=\"bar-column\" style=\"margin-left: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">${tbelUnit}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"tbel-api-usage-bar\"></div>\n                        </div>    \n                        <div class='bar-labels'>\n                            <div id=\"tbel-api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"tbel-api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"user_defined_functions_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n   <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n         <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n       <span class=\"mat-mdc-button-touch-target\"></span>\n     <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div> \n</div>",
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bars-row {\n    flex: 1;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .bar-column {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 6px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n"
+            "cardHtml": "<div class='card'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var jsCount = \"${jsCount:0}\";\n            var jsLimit = \"${jsLimit:0}\";\n            jsCount = jsCount.length > 0 ? parseInt(jsCount, 10) : 0;\n            jsLimit = jsLimit.length > 0 ? parseInt(jsLimit, 10) : 0;\n            var jsPercentElement = $('#js-api-usage-percent', parentTag);\n            var jsValueElement = $('#js-api-usage-value', parentTag);\n            var jsBarElement = $('#js-api-usage-bar', parentTag);\n            if (Number.isFinite(jsLimit) && jsLimit > 0) {\n                var jsPercent = Math.min(100, ((jsCount / jsLimit) * 100));\n                jsBarElement.width(jsPercent + '%');\n                jsPercent = jsPercent.toFixed(2);\n                jsPercentElement.text(jsPercent + '%');\n                jsValueElement.text(toShortNumber(jsCount) + ' / ' + toShortNumber(jsLimit));\n            } else {\n                jsBarElement.width('0%');\n                jsPercentElement.text('');\n                jsValueElement.text(toShortNumber(jsCount) + ' / ∞');\n            }\n            var tbelCount = \"${tbelCount:0}\";\n            var tbelLimit = \"${tbelLimit:0}\";\n            tbelCount = tbelCount.length > 0 ? parseInt(tbelCount, 10) : 0;\n            tbelLimit = tbelLimit.length > 0 ? parseInt(tbelLimit, 10) : 0;\n            var tbelPercentElement = $('#tbel-api-usage-percent', parentTag);\n            var tbelValueElement = $('#tbel-api-usage-value', parentTag);\n            var tbelBarElement = $('#tbel-api-usage-bar', parentTag);\n            if (Number.isFinite(tbelLimit) && tbelLimit > 0) {\n                var tbelPercent = Math.min(100, ((tbelCount / tbelLimit) * 100));\n                tbelBarElement.width(tbelPercent + '%');\n                tbelPercent = tbelPercent.toFixed(2);\n                tbelPercentElement.text(tbelPercent + '%');\n                tbelValueElement.text(toShortNumber(tbelCount) + ' / ' + toShortNumber(tbelLimit));\n            } else {\n                tbelBarElement.width('0%');\n                tbelPercentElement.text('');\n                tbelValueElement.text(toShortNumber(tbelCount) + ' / ∞');\n            }\n            var jsApiState = \"${jsApiState}\";\n            var tbelApiState = \"${tbelApiState}\";\n            var currentState;\n            if (jsApiState === 'DISABLED' || tbelApiState === 'DISABLED') {\n                currentState = 'DISABLED';\n            } else if (jsApiState === 'WARNING' || tbelApiState === 'WARNING') {\n                currentState = 'WARNING';\n            } else {\n                currentState = 'ENABLED';\n            }\n            var stateTitle = $('#api-state', parentTag);\n            stateTitle.text(currentState);\n            parentTag.classList.add(currentState.toLowerCase());\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div id=\"api-state\" class='state'></div>\n            </div>\n            <div class=\"bars-row\">\n                <div class=\"bar-column\" style=\"margin-right: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">${jsUnit}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"js-api-usage-bar\"></div>\n                        </div>    \n                        <div class='bar-labels'>\n                            <div id=\"js-api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"js-api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n                <div class=\"bar-column\" style=\"margin-left: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">${tbelUnit}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"tbel-api-usage-bar\"></div>\n                        </div>    \n                        <div class='bar-labels'>\n                            <div id=\"tbel-api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"tbel-api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"script_functions_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n   <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n         <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n       <span class=\"mat-mdc-button-touch-target\"></span>\n     <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div> \n</div>",
+            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bars-row {\n    flex: 1;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .bar-column {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 6px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    "
           },
           "title": "JavaScript functions",
           "dropShadow": true,
@@ -207,12 +207,12 @@
           "actions": {
             "elementClick": [
               {
-                "name": "user_defined_functions_details",
+                "name": "script_functions_details",
                 "icon": "insert_chart",
                 "useShowWidgetActionFunction": null,
                 "showWidgetActionFunction": "return true;",
                 "type": "openDashboardState",
-                "targetDashboardStateId": "user_defined_functions",
+                "targetDashboardStateId": "script_functions",
                 "setEntityId": false,
                 "stateEntityParamName": null,
                 "openRightLayout": false,
@@ -225,7 +225,8 @@
           "showTitleIcon": false,
           "iconColor": "rgba(0, 0, 0, 0.87)",
           "iconSize": "24px",
-          "titleTooltip": ""
+          "titleTooltip": "",
+          "displayTimewindow": true
         },
         "row": 0,
         "col": 0,
@@ -1341,9 +1342,9 @@
                   "name": "tbelExecutionCountHourly",
                   "type": "timeseries",
                   "label": "{i18n:api-usage.tbel-executions}",
-                  "color": "#4CAF50",
+                  "color": "#4caf50",
                   "settings": {},
-                  "_hash": 0.9298950525272727,
+                  "_hash": 0.6818645685001823,
                   "aggregationType": null,
                   "units": null,
                   "decimals": null,
@@ -1373,36 +1374,40 @@
           "color": "rgba(0, 0, 0, 0.87)",
           "padding": "8px",
           "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
+            "stack": false,
+            "enableSelection": true,
             "fontSize": 10,
+            "fontColor": "#545454",
+            "showTooltip": true,
+            "tooltipIndividual": false,
+            "tooltipCumulative": false,
+            "hideZeros": false,
+            "grid": {
+              "verticalLines": true,
+              "horizontalLines": true,
+              "outlineWidth": 1,
+              "color": "#545454",
+              "backgroundColor": null,
+              "tickColor": "#DDDDDD"
+            },
             "xaxis": {
+              "title": null,
               "showLabels": true,
               "color": "#545454"
             },
             "yaxis": {
+              "min": 0,
+              "max": null,
+              "title": null,
               "showLabels": true,
               "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
+              "tickSize": null,
+              "tickDecimals": 0,
+              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
             },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
             "defaultBarWidth": 2400000,
             "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
+            "comparisonEnabled": false,
             "showLegend": true,
             "legendConfig": {
               "direction": "column",
@@ -1412,9 +1417,10 @@
               "showMax": false,
               "showAvg": false,
               "showTotal": true
-            }
+            },
+            "customLegendEnabled": false
           },
-          "title": "{i18n:api-usage.user-defined-functions-hourly-activity}",
+          "title": "{i18n:api-usage.scripts-hourly-activity}",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
@@ -1431,7 +1437,7 @@
                 "useShowWidgetActionFunction": null,
                 "showWidgetActionFunction": "return true;",
                 "type": "openDashboardState",
-                "targetDashboardStateId": "user_defined_functions",
+                "targetDashboardStateId": "script_functions",
                 "setEntityId": false,
                 "stateEntityParamName": null,
                 "openRightLayout": false,
@@ -1445,7 +1451,11 @@
           "showTitleIcon": false,
           "iconColor": "rgba(0, 0, 0, 0.87)",
           "iconSize": "24px",
-          "titleTooltip": ""
+          "titleTooltip": "",
+          "widgetCss": "",
+          "pageSize": 1024,
+          "noDataDisplayMessage": "",
+          "configMode": "advanced"
         },
         "row": 0,
         "col": 0,
@@ -2239,6 +2249,20 @@
                   "funcBody": null,
                   "usePostProcessing": null,
                   "postFuncBody": null
+                },
+                {
+                  "name": "tbelExecutionCountHourly",
+                  "type": "timeseries",
+                  "label": "{i18n:api-usage.tbel-executions}",
+                  "color": "#4caf50",
+                  "settings": {},
+                  "_hash": 0.5212969314724616,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
                 }
               ]
             }
@@ -2304,7 +2328,7 @@
               "showTotal": true
             }
           },
-          "title": "{i18n:api-usage.javascript-functions-daily-activity}",
+          "title": "{i18n:api-usage.scripts-daily-activity}",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
@@ -2318,7 +2342,10 @@
           "showTitleIcon": false,
           "iconColor": "rgba(0, 0, 0, 0.87)",
           "iconSize": "24px",
-          "titleTooltip": ""
+          "titleTooltip": "",
+          "widgetCss": "",
+          "pageSize": 1024,
+          "noDataDisplayMessage": ""
         },
         "row": 0,
         "col": 0,
@@ -2371,6 +2398,20 @@
                   "funcBody": null,
                   "usePostProcessing": null,
                   "postFuncBody": null
+                },
+                {
+                  "name": "tbelExecutionCount",
+                  "type": "timeseries",
+                  "label": "{i18n:api-usage.tbel-executions}",
+                  "color": "#4caf50",
+                  "settings": {},
+                  "_hash": 0.49748239768082403,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
                 }
               ]
             }
@@ -2436,7 +2477,7 @@
               "showTotal": true
             }
           },
-          "title": "{i18n:api-usage.javascript-functions-monthly-activity}",
+          "title": "{i18n:api-usage.scripts-monthly-activity}",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
@@ -2450,7 +2491,10 @@
           "showTitleIcon": false,
           "iconColor": "rgba(0, 0, 0, 0.87)",
           "iconSize": "24px",
-          "titleTooltip": ""
+          "titleTooltip": "",
+          "widgetCss": "",
+          "pageSize": 1024,
+          "noDataDisplayMessage": ""
         },
         "row": 0,
         "col": 0,
@@ -4465,288 +4509,6 @@
         "col": 0,
         "id": "aa875b7f-e7c8-7529-1ae7-f456211b59cc",
         "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "16d469c0-b3f5-d8a6-c62c-5c245c2cc865": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "tbelExecutionCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.tbel-executions}",
-                  "color": "#4CAF50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null,
-                  "aggregationType": null
-                }
-              ],
-              "alarmFilterConfig": {
-                "statusList": [
-                  "ACTIVE"
-                ]
-              }
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.tbel-functions-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetCss": "",
-          "pageSize": 1024,
-          "noDataDisplayMessage": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "16d469c0-b3f5-d8a6-c62c-5c245c2cc865",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "70978475-c9d4-a54d-384a-851b4bba3917": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "tbelExecutionCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.tbel-executions}",
-                  "color": "#4CAF50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null,
-                  "aggregationType": null
-                }
-              ],
-              "alarmFilterConfig": {
-                "statusList": [
-                  "ACTIVE"
-                ]
-              }
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.tbel-functions-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetCss": "",
-          "pageSize": 1024,
-          "noDataDisplayMessage": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "70978475-c9d4-a54d-384a-851b4bba3917",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
       }
     },
     "states": {
@@ -5074,35 +4836,23 @@
           }
         }
       },
-      "user_defined_functions": {
-        "name": "{i18n:api-usage.user-defined-functions}",
+      "script_functions": {
+        "name": "{i18n:api-usage.scripts}",
         "root": false,
         "layouts": {
           "main": {
             "widgets": {
               "5f5ca59c-e507-5301-5910-7ad8cd34df40": {
-                "sizeX": 12,
+                "sizeX": 24,
                 "sizeY": 6,
                 "row": 0,
                 "col": 0
               },
               "ada32ee9-44ed-48d1-c368-fd0c94b7607f": {
-                "sizeX": 12,
+                "sizeX": 24,
                 "sizeY": 6,
                 "row": 6,
                 "col": 0
-              },
-              "16d469c0-b3f5-d8a6-c62c-5c245c2cc865": {
-                "sizeX": 12,
-                "sizeY": 6,
-                "row": 0,
-                "col": 12
-              },
-              "70978475-c9d4-a54d-384a-851b4bba3917": {
-                "sizeX": 12,
-                "sizeY": 6,
-                "row": 6,
-                "col": 12
               }
             },
             "gridSettings": {
diff --git a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
index 12b3412b8e..16b72c0700 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
@@ -677,8 +677,6 @@
         "executions": "Execucions",
         "javascript": "JavaScript",
         "javascript-executions": "Execucions JavaScript",
-        "javascript-functions-daily-activity": "Activitat diària de funcions JavaScript",
-        "javascript-functions-monthly-activity": "Activitat mensual de funcions JavaScript",
         "latest-error": "Últim error",
         "messages": "Missatges",
         "notifications": "Notificacions",
diff --git a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
index 87c5527c7b..1c31471928 100644
--- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
+++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
@@ -488,8 +488,6 @@
         "executions": "Zpracování",
         "javascript": "JavaScript",
         "javascript-executions": "JavaScript výjimky",
-        "javascript-functions-daily-activity": "Denní aktivita JavaScript funkcí",
-        "javascript-functions-monthly-activity": "Měsíční aktivita JavaScript funkcí",
         "latest-error": "Poslední chyba",
         "messages": "Zprávy",
         "notifications": "Notifikace",
diff --git a/ui-ngx/src/assets/locale/locale.constant-da_DK.json b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
index c2dc6c87f7..7c6da04280 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -493,8 +493,6 @@
     "executions": "Udførelser",
     "javascript": "JavaScript",
     "javascript-executions": "JavaScript-udførelser",
-    "javascript-functions-daily-activity": "JavaScript-funktioners daglige aktivitet",
-    "javascript-functions-monthly-activity": "JavaScript-funktioners månedlige aktivitet",
     "latest-error": "Seneste fejl",
     "messages": "Beskeder",
     "permanent-failures": "${entityName} Permanente fejl",
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 9c28f42cd8..27e1177d28 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -770,17 +770,14 @@
         "email-messages-monthly-activity": "Email messages monthly activity",
         "exceptions": "Exceptions",
         "executions": "Executions",
-        "udf-executions": "UDF executions",
-        "user-defined-functions": "User-defined functions",
-        "user-defined-functions-hourly-activity": "User-defined functions hourly activity",
+        "scripts": "Scripts",
+        "scripts-hourly-activity": "Scripts hourly activity",
+        "scripts-daily-activity": "Scripts daily activity",
+        "scripts-monthly-activity": "Scripts monthly activity",
         "javascript": "JavaScript",
         "javascript-executions": "JavaScript executions",
-        "javascript-functions-daily-activity": "JavaScript functions daily activity",
-        "javascript-functions-monthly-activity": "JavaScript functions monthly activity",
         "tbel": "TBEL",
         "tbel-executions": "TBEL executions",
-        "tbel-functions-daily-activity": "TBEL functions daily activity",
-        "tbel-functions-monthly-activity": "TBEL functions monthly activity",
         "latest-error": "Latest Error",
         "messages": "Messages",
         "notifications": "Notifications",
diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
index 679c60a220..6891156d75 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -772,8 +772,6 @@
         "executions": "Ejecuciones",
         "javascript": "JavaScript",
         "javascript-executions": "Ejecuciones JavaScript",
-        "javascript-functions-daily-activity": "Actividad diaria de funciones JavaScript",
-        "javascript-functions-monthly-activity": "Actividad mensual de funciones JavaScript",
         "latest-error": "Último error",
         "messages": "Mensajes",
         "notifications": "Notificaciones",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
index acf547354e..ec97ca6047 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -488,8 +488,6 @@
         "email-messages-monthly-activity": "Activité menuselle de courriels",
         "executions": "Exécutions",
         "javascript-executions": "Exécutions JavaScript",
-        "javascript-functions-daily-activity": "Activité hebdomadaire de fonctions JavaScript",
-        "javascript-functions-monthly-activity": "Activité mensuelle de fonctions JavaScript",
         "latest-error": "Dernière erreur",
         "notifications-email-sms": "Notifications (Coourriel/SMS)",
         "notifications-hourly-activity": "Activité horaire de notifications",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
index 142ef1491d..a5660c5ceb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
@@ -447,8 +447,6 @@
         "executions": "Executions",
         "javascript": "JavaScript",
         "javascript-executions": "JavaScript executions",
-        "javascript-functions-daily-activity": "JavaScript functions daily activity",
-        "javascript-functions-monthly-activity": "JavaScript functions monthly activity",
         "latest-error": "최근 오류",
         "messages": "메시지",
         "permanent-failures": "${entityName} Permanent Failures",
diff --git a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
index 2c9173b78d..f2943e6145 100644
--- a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
+++ b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
@@ -447,8 +447,6 @@
     "executions": "Executions",
     "javascript": "JavaScript",
     "javascript-executions": "JavaScript executions",
-    "javascript-functions-daily-activity": "JavaScript functions daily activity",
-    "javascript-functions-monthly-activity": "JavaScript functions monthly activity",
     "latest-error": "Latest Error",
     "messages": "Messages",
     "permanent-failures": "${entityName} Permanent Failures",
diff --git a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
index 5f05774d94..50758fb1eb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -488,8 +488,6 @@
     "executions": "Çalıştırmalar",
     "javascript": "JavaScript",
     "javascript-executions": "JavaScript çalıştırmaları",
-    "javascript-functions-daily-activity": "Günlük JavaScript fonksiyonları",
-    "javascript-functions-monthly-activity": "Aylık JavaScript fonksiyonları",
     "latest-error": "Son Hata",
     "messages": "Mesajlar",
     "notifications": "Bildirimler",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index 4003705a48..b8c0a36fe0 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -715,8 +715,6 @@
         "executions": "执行数",
         "javascript": "JavaScript",
         "javascript-executions": "JavaScript 执行数",
-        "javascript-functions-daily-activity": "每天执行的JavaScript函数",
-        "javascript-functions-monthly-activity": "每月执行的JavaScript函数",
         "latest-error": "最新错误",
         "messages": "消息",
         "notifications": "通知",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
index f3d3d13660..0091acbb61 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
@@ -563,8 +563,6 @@
         "executions": "執行",
         "javascript": "JavaScript",
         "javascript-executions": "JavaScript執行",
-        "javascript-functions-daily-activity": "JavaScript功能每日活動",
-        "javascript-functions-monthly-activity": "JavaScript功能每月活動",
         "latest-error": "最新錯誤",
         "messages": "訊息",
         "notifications": "通知",