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

Revert "Added message type translate"

Browse Source 
This reverts commit d8f2cbba8d941c3df5ad874fd038d689bb412a1d.
This commit is contained in:
mpetrov 2025-02-18 13:36:22 +02:00
parent d8f2cbba8d
commit c406f2af36
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/event/event-table-config.ts
View File

@ -55,7 +55,6 @@ import { DEFAULT_OVERLAY_POSITIONS } from '@shared/models/overlay.models';
import { getCurrentAuthState } from '@core/auth/auth.selectors'; import { getCurrentAuthState } from '@core/auth/auth.selectors';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { TestArgumentMessageType, TestArgumentMessageTypeTranslationMap } from '@shared/models/calculated-field.models';
export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> { export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
@ -402,9 +401,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
} }
), ),
new EntityTableColumn<Event>('messageType', 'event.message-type', '100px', new EntityTableColumn<Event>('messageType', 'event.message-type', '100px',
(entity) => entity.body.msgType (entity) => entity.body.msgType ?? '-',
? this.translate.instant(TestArgumentMessageTypeTranslationMap.get(entity.body.msgType as TestArgumentMessageType))
: '-',
() => ({padding: '0 12px 0 0'}), () => ({padding: '0 12px 0 0'}),
false false
), ),

13
ui-ngx/src/app/shared/models/calculated-field.models.ts
View File

@ -28,7 +28,6 @@ import { EntityType } from '@shared/models/entity-type.models';
import { AliasFilterType } from '@shared/models/alias.models'; import { AliasFilterType } from '@shared/models/alias.models';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { TbEditorCompleter } from '@shared/models/ace/completion.models'; import { TbEditorCompleter } from '@shared/models/ace/completion.models';
import { MessageType } from '@shared/models/rule-node.models';
export interface CalculatedField extends Omit<BaseData<CalculatedFieldId>, 'label'>, HasVersion, HasTenantId, ExportableEntity<CalculatedFieldId> { export interface CalculatedField extends Omit<BaseData<CalculatedFieldId>, 'label'>, HasVersion, HasTenantId, ExportableEntity<CalculatedFieldId> {
debugSettings?: EntityDebugSettings; debugSettings?: EntityDebugSettings;
@ -91,18 +90,6 @@ export enum TestArgumentType {
Rolling = 'TS_ROLLING', Rolling = 'TS_ROLLING',
} }
export enum TestArgumentMessageType {
POST_ATTRIBUTES_REQUEST = 'POST_ATTRIBUTES_REQUEST',
POST_TELEMETRY_REQUEST = 'POST_TELEMETRY_REQUEST',
}
export const TestArgumentMessageTypeTranslationMap = new Map<TestArgumentMessageType, string>(
[
[TestArgumentMessageType.POST_ATTRIBUTES_REQUEST, 'calculated-fields.post-attributes'],
[TestArgumentMessageType.POST_TELEMETRY_REQUEST, 'calculated-fields.post-telemetry'],
]
);
export const TestArgumentTypeMap = new Map<ArgumentType, TestArgumentType>( export const TestArgumentTypeMap = new Map<ArgumentType, TestArgumentType>(
[ [
[ArgumentType.Attribute, TestArgumentType.Single], [ArgumentType.Attribute, TestArgumentType.Single],

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

@ -1017,8 +1017,6 @@
"arguments": "Arguments", "arguments": "Arguments",
"debugging": "Calculated field debugging", "debugging": "Calculated field debugging",
"argument-name": "Argument name", "argument-name": "Argument name",
"post-telemetry": "Post telemetry",
"post-attributes": "Post attribute",
"datasource": "Datasource", "datasource": "Datasource",
"add-argument": "Add argument", "add-argument": "Add argument",
"test-script-function": "Test script function", "test-script-function": "Test script function",