dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rc' into features/add_tooltip_option_to_show_stack_mode_total_value_on_timeseries_chart_widgets

Browse Source
This commit is contained in:
Paolo Cristiani 2025-08-21 15:34:10 +02:00 committed by GitHub
commit 942edf37d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 1225 additions and 1434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msa/js-executor/docker/Dockerfile
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/node:20.18.0-bookworm-slim
FROM thingsboard/node:22.18.0-bookworm-slim
ENV NODE_ENV production
ENV DOCKER_MODE true

22
msa/js-executor/package.json
View File

@ -6,20 +6,20 @@
"main": "server.ts",
"bin": "server.js",
"scripts": {
"pkg": "tsc && pkg -t node18-linux-x64,node18-win-x64 --out-path ./target ./target/src && node install.js",
"pkg": "tsc && pkg -t node22-linux-x64,node22-win-x64 --out-path ./target ./target/src && node install.js",
"test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon --watch '.' --ext 'ts' --exec 'ts-node server.ts'",
"start-prod": "nodemon --watch '.' --ext 'ts' --exec 'NODE_ENV=production ts-node server.ts'",
"build": "tsc"
},
"dependencies": {
"config": "^3.3.12",
"express": "^4.21.1",
"config": "^4.1.1",
"express": "^5.1.0",
"js-yaml": "^4.1.0",
"kafkajs": "^2.2.4",
"long": "^5.2.3",
"long": "^5.3.2",
"uuid-parse": "^1.1.0",
"winston": "^3.16.0",
"winston": "^3.17.0",
"winston-daily-rotate-file": "^5.0.0"
},
"nyc": {
@ -32,14 +32,14 @@
},
"devDependencies": {
"@types/config": "^3.3.5",
"@types/express": "~4.17.21",
"@types/node": "~20.17.6",
"@types/express": "~5.0.3",
"@types/node": "~22.17.2",
"@types/uuid-parse": "^1.0.2",
"fs-extra": "^11.2.0",
"nodemon": "^3.1.7",
"pkg": "^5.8.1",
"@yao-pkg/pkg": "^6.6.0",
"fs-extra": "^11.3.1",
"nodemon": "^3.1.10",
"ts-node": "^10.9.2",
"typescript": "5.5.4"
"typescript": "5.9.2"
},
"pkg": {
"assets": [

2
msa/js-executor/pom.xml
View File

@ -71,7 +71,7 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v20.18.0</nodeVersion>
<nodeVersion>v22.18.0</nodeVersion>
<yarnVersion>v1.22.22</yarnVersion>
</configuration>
</execution>

1285
msa/js-executor/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
msa/web-ui/docker/Dockerfile
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/node:20.18.0-bookworm-slim
FROM thingsboard/node:22.18.0-bookworm-slim
ENV NODE_ENV production
ENV DOCKER_MODE true

28
msa/web-ui/package.json
View File

@ -6,21 +6,21 @@
"main": "server.ts",
"bin": "server.js",
"scripts": {
"pkg": "tsc && pkg -t node18-linux-x64,node18-win-x64 --out-path ./target ./target/src && node install.js",
"pkg": "tsc && pkg -t node22-linux-x64,node22-win-x64 --out-path ./target ./target/src && node install.js",
"test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon --watch '.' --ext 'ts' --exec 'WEB_FOLDER=./target/web ts-node server.ts'",
"start-prod": "nodemon --watch '.' --ext 'ts' --exec 'WEB_FOLDER=./target/web NODE_ENV=production ts-node server.ts'",
"build": "tsc"
},
"dependencies": {
"compression": "^1.7.5",
"compression": "^1.8.1",
"config": "^3.3.12",
"connect-history-api-fallback": "^1.6.0",
"express": "^4.21.1",
"connect-history-api-fallback": "1.6.0",
"express": "^5.1.0",
"http": "0.0.0",
"http-proxy": "^1.18.1",
"js-yaml": "^4.1.0",
"winston": "^3.16.0",
"winston": "^3.17.0",
"winston-daily-rotate-file": "^5.0.0"
},
"nyc": {
@ -32,17 +32,17 @@
]
},
"devDependencies": {
"@types/compression": "^1.7.5",
"@types/compression": "^1.8.1",
"@types/config": "^3.3.5",
"@types/connect-history-api-fallback": "^1.5.4",
"@types/express": "~4.17.21",
"@types/http-proxy": "^1.17.15",
"@types/node": "~20.17.6",
"fs-extra": "^11.2.0",
"nodemon": "^3.1.7",
"pkg": "^5.8.1",
"@types/connect-history-api-fallback": "1.5.4",
"@types/express": "~5.0.3",
"@types/http-proxy": "^1.17.16",
"@types/node": "~22.17.2",
"@yao-pkg/pkg": "^6.6.0",
"fs-extra": "^11.3.1",
"nodemon": "^3.1.10",
"ts-node": "^10.9.2",
"typescript": "5.5.4"
"typescript": "5.9.2"
},
"pkg": {
"assets": [

2
msa/web-ui/pom.xml
View File

@ -80,7 +80,7 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v20.18.0</nodeVersion>
<nodeVersion>v22.18.0</nodeVersion>
<yarnVersion>v1.22.22</yarnVersion>
</configuration>
</execution>

1307
msa/web-ui/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
ui-ngx/pom.xml
View File

@ -56,7 +56,7 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v20.18.0</nodeVersion>
<nodeVersion>v22.18.0</nodeVersion>
<yarnVersion>v1.22.22</yarnVersion>
</configuration>
</execution>

7
ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts vendored
View File

@ -74,11 +74,12 @@ export class AiConfigComponent extends RuleNodeConfigurationComponent {
}
}
protected prepareOutputConfig(configuration: RuleNodeConfiguration): RuleNodeConfiguration {
protected prepareOutputConfig(): RuleNodeConfiguration {
const config = this.configForm().getRawValue();
if (!this.aiConfigForm.get('systemPrompt').value) {
delete configuration.systemPrompt;
delete config.systemPrompt;
}
return deepTrim(configuration);
return deepTrim(config);
}
onEntityChange($event: AiModel) {