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

Merge branch 'tbel-api-limits-ui' of github.com:rusikv/thingsboard into tbel-api-limits-ui

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2023-10-13 15:26:13 +03:00
commit 2dbd77d6f2
16 changed files with 461 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
View File

@ -169,15 +169,15 @@
<mat-hint></mat-hint>
</mat-form-field>
<mat-form-field fxFlex class="mat-block" appearance="fill" subscriptSizing="dynamic">
<mat-label translate>tenant-profile.max-transport-data-points</mat-label>
<mat-label translate>tenant-profile.max-tbel-executions</mat-label>
<input matInput required min="0" step="1"
formControlName="maxTransportDataPoints"
formControlName="maxTbelExecutions"
type="number">
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('required')">
{{ 'tenant-profile.max-transport-data-points-required' | translate}}
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTbelExecutions').hasError('required')">
{{ 'tenant-profile.max-tbel-executions-required' | translate}}
</mat-error>
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('min')">
{{ 'tenant-profile.max-transport-data-points-range' | translate}}
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTbelExecutions').hasError('min')">
{{ 'tenant-profile.max-tbel-executions-range' | translate}}
</mat-error>
<mat-hint></mat-hint>
</mat-form-field>
@ -196,7 +196,19 @@
</mat-error>
<mat-hint></mat-hint>
</mat-form-field>
<div fxFlex></div>
<mat-form-field fxFlex class="mat-block" appearance="fill" subscriptSizing="dynamic">
<mat-label translate>tenant-profile.max-transport-data-points</mat-label>
<input matInput required min="0" step="1"
formControlName="maxTransportDataPoints"
type="number">
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('required')">
{{ 'tenant-profile.max-transport-data-points-required' | translate}}
</mat-error>
<mat-error *ngIf="defaultTenantProfileConfigurationFormGroup.get('maxTransportDataPoints').hasError('min')">
{{ 'tenant-profile.max-transport-data-points-range' | translate}}
</mat-error>
<mat-hint></mat-hint>
</mat-form-field>
</div>
</ng-template>
</mat-expansion-panel>

1
ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
View File

@ -81,6 +81,7 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
maxTransportDataPoints: [null, [Validators.required, Validators.min(0)]],
maxREExecutions: [null, [Validators.required, Validators.min(0)]],
maxJSExecutions: [null, [Validators.required, Validators.min(0)]],
maxTbelExecutions: [null, [Validators.required, Validators.min(0)]],
maxDPStorageDays: [null, [Validators.required, Validators.min(0)]],
maxRuleNodeExecutionsPerMessage: [null, [Validators.required, Validators.min(0)]],
maxEmails: [null, [Validators.required, Validators.min(0)]],

2
ui-ngx/src/app/shared/models/api-usage.models.ts
View File

@ -31,6 +31,7 @@ export enum ApiFeature {
DB = 'DB',
RE = 'RE',
JS = 'JS',
TBEL = 'TBEL',
EMAIL = 'EMAIL',
SMS = 'SMS',
ALARM = 'ALARM'
@ -41,6 +42,7 @@ export const ApiFeatureTranslationMap = new Map<ApiFeature, string>([
[ApiFeature.DB, 'api-usage.telemetry-persistence'],
[ApiFeature.RE, 'api-usage.rule-engine-executions'],
[ApiFeature.JS, 'api-usage.javascript-executions'],
[ApiFeature.TBEL, 'api-usage.tbel-executions'],
[ApiFeature.EMAIL, 'api-usage.email-messages'],
[ApiFeature.SMS, 'api-usage.sms-messages'],
[ApiFeature.ALARM, 'api-usage.alarm'],

2
ui-ngx/src/app/shared/models/tenant.model.ts
View File

@ -50,6 +50,7 @@ export interface DefaultTenantProfileConfiguration {
maxTransportDataPoints: number;
maxREExecutions: number;
maxJSExecutions: number;
maxTbelExecutions: number;
maxDPStorageDays: number;
maxRuleNodeExecutionsPerMessage: number;
maxEmails: number;
@ -104,6 +105,7 @@ export function createTenantProfileConfiguration(type: TenantProfileType): Tenan
maxTransportDataPoints: 0,
maxREExecutions: 0,
maxJSExecutions: 0,
maxTbelExecutions: 0,
maxDPStorageDays: 0,
maxRuleNodeExecutionsPerMessage: 0,
maxEmails: 0,

490
ui-ngx/src/assets/dashboard/api_usage.json
View File

File diff suppressed because one or more lines are too long

2
ui-ngx/src/assets/locale/locale.constant-ca_ES.json
View File

@ -677,9 +677,7 @@
"executions": "Execucions",
"javascript": "JavaScript",
"javascript-executions": "Execucions JavaScript",
"javascript-functions": "Funcions JavaScript",
"javascript-functions-daily-activity": "Activitat diària de funcions JavaScript",
"javascript-functions-hourly-activity": "Activitat horària de funcions JavaScript",
"javascript-functions-monthly-activity": "Activitat mensual de funcions JavaScript",
"latest-error": "Últim error",
"messages": "Missatges",

2
ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
View File

@ -488,9 +488,7 @@
"executions": "Zpracování",
"javascript": "JavaScript",
"javascript-executions": "JavaScript výjimky",
"javascript-functions": "JavaScript funkce",
"javascript-functions-daily-activity": "Denní aktivita JavaScript funkcí",
"javascript-functions-hourly-activity": "Hodinová aktivita JavaScript funkcí",
"javascript-functions-monthly-activity": "Měsíční aktivita JavaScript funkcí",
"latest-error": "Poslední chyba",
"messages": "Zprávy",

2
ui-ngx/src/assets/locale/locale.constant-da_DK.json
View File

@ -493,9 +493,7 @@
"executions": "Udførelser",
"javascript": "JavaScript",
"javascript-executions": "JavaScript-udførelser",
"javascript-functions": "JavaScript-funktioner",
"javascript-functions-daily-activity": "JavaScript-funktioners daglige aktivitet",
"javascript-functions-hourly-activity": "JavaScript-funktioners timeaktivitet",
"javascript-functions-monthly-activity": "JavaScript-funktioners månedlige aktivitet",
"latest-error": "Seneste fejl",
"messages": "Beskeder",

12
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -770,12 +770,17 @@
"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",
"javascript": "JavaScript",
"javascript-executions": "JavaScript executions",
"javascript-functions": "JavaScript functions",
"javascript-functions-daily-activity": "JavaScript functions daily activity",
"javascript-functions-hourly-activity": "JavaScript functions hourly 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",
@ -3995,6 +4000,9 @@
"max-j-s-executions": "JavaScript executions maximum number ",
"max-j-s-executions-required": "JavaScript executions maximum number is required.",
"max-j-s-executions-range": "JavaScript executions maximum number can't be negative",
"max-tbel-executions": "TBEL executions maximum number ",
"max-tbel-executions-required": "TBEL executions maximum number is required.",
"max-tbel-executions-range": "TBEL executions maximum number can't be negative",
"max-d-p-storage-days": "Data points storage days maximum number",
"max-d-p-storage-days-required": "Data points storage days maximum number is required.",
"max-d-p-storage-days-range": "Data points storage days maximum number can't be negative",

2
ui-ngx/src/assets/locale/locale.constant-es_ES.json
View File

@ -772,9 +772,7 @@
"executions": "Ejecuciones",
"javascript": "JavaScript",
"javascript-executions": "Ejecuciones JavaScript",
"javascript-functions": "Funciones JavaScript",
"javascript-functions-daily-activity": "Actividad diaria de funciones JavaScript",
"javascript-functions-hourly-activity": "Actividad horaria de funciones JavaScript",
"javascript-functions-monthly-activity": "Actividad mensual de funciones JavaScript",
"latest-error": "Último error",
"messages": "Mensajes",

2
ui-ngx/src/assets/locale/locale.constant-fr_FR.json
View File

@ -488,9 +488,7 @@
"email-messages-monthly-activity": "Activité menuselle de courriels",
"executions": "Exécutions",
"javascript-executions": "Exécutions JavaScript",
"javascript-functions": "Fonctions JavaScript",
"javascript-functions-daily-activity": "Activité hebdomadaire de fonctions JavaScript",
"javascript-functions-hourly-activity": "Activité horaire de fonctions JavaScript",
"javascript-functions-monthly-activity": "Activité mensuelle de fonctions JavaScript",
"latest-error": "Dernière erreur",
"notifications-email-sms": "Notifications (Coourriel/SMS)",

2
ui-ngx/src/assets/locale/locale.constant-ko_KR.json
View File

@ -447,9 +447,7 @@
"executions": "Executions",
"javascript": "JavaScript",
"javascript-executions": "JavaScript executions",
"javascript-functions": "JavaScript functions",
"javascript-functions-daily-activity": "JavaScript functions daily activity",
"javascript-functions-hourly-activity": "JavaScript functions hourly activity",
"javascript-functions-monthly-activity": "JavaScript functions monthly activity",
"latest-error": "최근 오류",
"messages": "메시지",

2
ui-ngx/src/assets/locale/locale.constant-sl_SI.json
View File

@ -447,9 +447,7 @@
"executions": "Executions",
"javascript": "JavaScript",
"javascript-executions": "JavaScript executions",
"javascript-functions": "JavaScript functions",
"javascript-functions-daily-activity": "JavaScript functions daily activity",
"javascript-functions-hourly-activity": "JavaScript functions hourly activity",
"javascript-functions-monthly-activity": "JavaScript functions monthly activity",
"latest-error": "Latest Error",
"messages": "Messages",

2
ui-ngx/src/assets/locale/locale.constant-tr_TR.json
View File

@ -488,9 +488,7 @@
"executions": "Çalıştırmalar",
"javascript": "JavaScript",
"javascript-executions": "JavaScript çalıştırmaları",
"javascript-functions": "JavaScript fonksiyonları",
"javascript-functions-daily-activity": "Günlük JavaScript fonksiyonları",
"javascript-functions-hourly-activity": "Saatlik JavaScript fonksiyonları",
"javascript-functions-monthly-activity": "Aylık JavaScript fonksiyonları",
"latest-error": "Son Hata",
"messages": "Mesajlar",

2
ui-ngx/src/assets/locale/locale.constant-zh_CN.json
View File

@ -715,9 +715,7 @@
"executions": "执行数",
"javascript": "JavaScript",
"javascript-executions": "JavaScript 执行数",
"javascript-functions": "JavaScript 函数",
"javascript-functions-daily-activity": "每天执行的JavaScript函数",
"javascript-functions-hourly-activity": "每小时执行的JavaScript函数",
"javascript-functions-monthly-activity": "每月执行的JavaScript函数",
"latest-error": "最新错误",
"messages": "消息",

2
ui-ngx/src/assets/locale/locale.constant-zh_TW.json
View File

@ -563,9 +563,7 @@
"executions": "執行",
"javascript": "JavaScript",
"javascript-executions": "JavaScript執行",
"javascript-functions": "JavaScript功能",
"javascript-functions-daily-activity": "JavaScript功能每日活動",
"javascript-functions-hourly-activity": "JavaScript功能每小時活動",
"javascript-functions-monthly-activity": "JavaScript功能每月活動",
"latest-error": "最新錯誤",
"messages": "訊息",