diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts b/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
index 78c8df6c08..b7cb2b1752 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
@@ -20,12 +20,15 @@ import { AppState } from '@core/core.state';
import { EntityComponent } from '@home/components/entity/entity.component';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { EntityType } from '@shared/models/entity-type.models';
-import { EdgeInfo } from '@shared/models/edge.models';
+import { EdgeInfo, edgeVersionAttributeKey } from '@shared/models/edge.models';
import { TranslateService } from '@ngx-translate/core';
import { NULL_UUID } from '@shared/models/id/has-uuid';
import { ActionNotificationShow } from '@core/notification/notification.actions';
import { generateSecret, guid } from '@core/utils';
import { EntityTableConfig } from '@home/models/entity/entities-table-config.models';
+import { environment as env } from '@env/environment';
+import { AttributeService } from '@core/http/attribute.service';
+import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
@Component({
selector: 'tb-edge',
@@ -37,9 +40,11 @@ export class EdgeComponent extends EntityComponent
{
entityType = EntityType;
edgeScope: 'tenant' | 'customer' | 'customer_user';
+ upgradeAvailable: boolean = false;
constructor(protected store: Store,
protected translate: TranslateService,
+ private attributeService: AttributeService,
@Inject('entity') protected entityValue: EdgeInfo,
@Inject('entitiesTableConfig') protected entitiesTableConfigValue: EntityTableConfig,
public fb: UntypedFormBuilder,
@@ -95,6 +100,7 @@ export class EdgeComponent extends EntityComponent {
}
});
this.generateRoutingKeyAndSecret(entity, this.entityForm);
+ this.checkEdgeVersion();
}
updateFormState() {
@@ -133,4 +139,25 @@ export class EdgeComponent extends EntityComponent {
form.get('secret').patchValue(generateSecret(20), {emitEvent: false});
}
}
+
+ checkEdgeVersion() {
+ this.attributeService.getEntityAttributes(this.entity.id, AttributeScope.SERVER_SCOPE, [edgeVersionAttributeKey])
+ .subscribe(attributes => {
+ if (attributes?.length) {
+ const edgeVersion = attributes[0].value;
+ const tbVersion = 'V_' + env.tbVersion.replaceAll('.', '_');
+ this.upgradeAvailable = this.versionUpgradeSupported(edgeVersion) && (edgeVersion !== tbVersion);
+ } else {
+ this.upgradeAvailable = false;
+ }
+ }
+ );
+ }
+
+ private versionUpgradeSupported(edgeVersion: string): boolean {
+ const edgeVersionArray = edgeVersion.split('_');
+ const major = parseInt(edgeVersionArray[1]);
+ const minor = parseInt(edgeVersionArray[2]);
+ return major >= 3 && minor >= 6;
+ }
}
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
index 6a80388b52..4429515705 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
@@ -558,7 +558,7 @@ export class EdgesTableConfigResolver implements Resolve {
if (afterAdd) {
@@ -610,9 +611,12 @@ export class EdgesTableConfigResolver implements Resolve {
if (image) {
- this.updateData();
+ if (this.selectionMode) {
+ this.imageSelected.next(image);
+ } else {
+ this.updateData();
+ }
}
});
}
diff --git a/ui-ngx/src/app/shared/components/rule-chain/rule-chain-select.component.ts b/ui-ngx/src/app/shared/components/rule-chain/rule-chain-select.component.ts
index 003d85b751..d9f2f90cc8 100644
--- a/ui-ngx/src/app/shared/components/rule-chain/rule-chain-select.component.ts
+++ b/ui-ngx/src/app/shared/components/rule-chain/rule-chain-select.component.ts
@@ -65,7 +65,7 @@ export class RuleChainSelectComponent implements ControlValueAccessor, OnInit {
}
ngOnInit() {
- const pageLink = new PageLink(100, 0, null, {
+ const pageLink = new PageLink(1024, 0, null, {
property: 'name',
direction: Direction.ASC
});
diff --git a/ui-ngx/src/app/shared/models/edge.models.ts b/ui-ngx/src/app/shared/models/edge.models.ts
index 01789636b8..26337b5e35 100644
--- a/ui-ngx/src/app/shared/models/edge.models.ts
+++ b/ui-ngx/src/app/shared/models/edge.models.ts
@@ -179,8 +179,8 @@ export interface EdgeEvent extends BaseData {
body: string;
}
-export interface EdgeInstallInstructions {
- installInstructions: string;
+export interface EdgeInstructions {
+ instructions: string;
}
export enum EdgeInstructionsMethod {
@@ -188,3 +188,5 @@ export enum EdgeInstructionsMethod {
centos,
docker
}
+
+export const edgeVersionAttributeKey = 'edgeVersion';
diff --git a/ui-ngx/src/app/shared/models/public-api.ts b/ui-ngx/src/app/shared/models/public-api.ts
index 517ede9ba3..4ff3ce5778 100644
--- a/ui-ngx/src/app/shared/models/public-api.ts
+++ b/ui-ngx/src/app/shared/models/public-api.ts
@@ -41,7 +41,6 @@ export * from './limited-api.models';
export * from './login.models';
export * from './material.models';
export * from './notification.models';
-export * from './websocket/notification-ws.models';
export * from './websocket/websocket.models';
export * from './oauth2.models';
export * from './ota-package.models';
diff --git a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
index 66f39d080a..e56941f688 100644
--- a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
+++ b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
@@ -17,25 +17,29 @@
import { EntityType } from '@shared/models/entity-type.models';
import { AggregationType } from '../time/time.models';
-import { Observable, ReplaySubject } from 'rxjs';
+import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs';
import { EntityId } from '@shared/models/id/entity-id';
import { map } from 'rxjs/operators';
import { NgZone } from '@angular/core';
import {
AlarmCountQuery,
AlarmData,
- AlarmDataQuery, EntityCountQuery,
+ AlarmDataQuery,
+ EntityCountQuery,
EntityData,
- EntityDataQuery, EntityFilter,
+ EntityDataQuery,
+ EntityFilter,
EntityKey,
TsValue
} from '@shared/models/query/query.models';
import { PageData } from '@shared/models/page/page-data';
import { alarmFields } from '@shared/models/alarm.models';
import { entityFields } from '@shared/models/entity.models';
-import { isUndefined } from '@core/utils';
-import { CmdWrapper, WsSubscriber } from '@shared/models/websocket/websocket.models';
+import { isDefinedAndNotNull, isUndefined } from '@core/utils';
+import { CmdWrapper, WsService, WsSubscriber } from '@shared/models/websocket/websocket.models';
import { TelemetryWebsocketService } from '@core/ws/telemetry-websocket.service';
+import { Notification } from '@shared/models/notification.models';
+import { WebsocketService } from '@core/ws/websocket.service';
export const NOT_SUPPORTED = 'Not supported!';
@@ -58,11 +62,6 @@ export enum AttributeScope {
SHARED_SCOPE = 'SHARED_SCOPE'
}
-export enum TelemetryFeature {
- ATTRIBUTES = 'ATTRIBUTES',
- TIMESERIES = 'TIMESERIES'
-}
-
export enum TimeseriesDeleteStrategy {
DELETE_ALL_DATA = 'DELETE_ALL_DATA',
DELETE_ALL_DATA_EXCEPT_LATEST_VALUE = 'DELETE_ALL_DATA_EXCEPT_LATEST_VALUE',
@@ -105,7 +104,7 @@ export const timeseriesDeleteStrategyTranslations = new Map;
- tsSubCmds: Array;
- historyCmds: Array;
- entityDataCmds: Array;
- entityDataUnsubscribeCmds: Array;
- alarmDataCmds: Array;
- alarmDataUnsubscribeCmds: Array;
- entityCountCmds: Array;
- entityCountUnsubscribeCmds: Array;
- alarmCountCmds: Array;
- alarmCountUnsubscribeCmds: Array;
+ this.cmds = [];
+ }
+
+ cmds: Array;
+ authCmd: AuthCmd;
private static popCmds(cmds: Array, leftCount: number): Array {
const toPublish = Math.min(cmds.length, leftCount);
@@ -300,58 +359,25 @@ export class TelemetryPluginCmdsWrapper implements CmdWrapper {
}
}
+ public setAuth(token: string) {
+ this.authCmd = new AuthCmd(token);
+ }
+
public hasCommands(): boolean {
- return this.tsSubCmds.length > 0 ||
- this.historyCmds.length > 0 ||
- this.attrSubCmds.length > 0 ||
- this.entityDataCmds.length > 0 ||
- this.entityDataUnsubscribeCmds.length > 0 ||
- this.alarmDataCmds.length > 0 ||
- this.alarmDataUnsubscribeCmds.length > 0 ||
- this.entityCountCmds.length > 0 ||
- this.entityCountUnsubscribeCmds.length > 0 ||
- this.alarmCountCmds.length > 0 ||
- this.alarmCountUnsubscribeCmds.length > 0;
+ return this.cmds.length > 0;
}
public clear() {
- this.attrSubCmds.length = 0;
- this.tsSubCmds.length = 0;
- this.historyCmds.length = 0;
- this.entityDataCmds.length = 0;
- this.entityDataUnsubscribeCmds.length = 0;
- this.alarmDataCmds.length = 0;
- this.alarmDataUnsubscribeCmds.length = 0;
- this.entityCountCmds.length = 0;
- this.entityCountUnsubscribeCmds.length = 0;
- this.alarmCountCmds.length = 0;
- this.alarmCountUnsubscribeCmds.length = 0;
+ this.cmds.length = 0;
}
public preparePublishCommands(maxCommands: number): TelemetryPluginCmdsWrapper {
const preparedWrapper = new TelemetryPluginCmdsWrapper();
- let leftCount = maxCommands;
- preparedWrapper.tsSubCmds = TelemetryPluginCmdsWrapper.popCmds(this.tsSubCmds, leftCount);
- leftCount -= preparedWrapper.tsSubCmds.length;
- preparedWrapper.historyCmds = TelemetryPluginCmdsWrapper.popCmds(this.historyCmds, leftCount);
- leftCount -= preparedWrapper.historyCmds.length;
- preparedWrapper.attrSubCmds = TelemetryPluginCmdsWrapper.popCmds(this.attrSubCmds, leftCount);
- leftCount -= preparedWrapper.attrSubCmds.length;
- preparedWrapper.entityDataCmds = TelemetryPluginCmdsWrapper.popCmds(this.entityDataCmds, leftCount);
- leftCount -= preparedWrapper.entityDataCmds.length;
- preparedWrapper.entityDataUnsubscribeCmds = TelemetryPluginCmdsWrapper.popCmds(this.entityDataUnsubscribeCmds, leftCount);
- leftCount -= preparedWrapper.entityDataUnsubscribeCmds.length;
- preparedWrapper.alarmDataCmds = TelemetryPluginCmdsWrapper.popCmds(this.alarmDataCmds, leftCount);
- leftCount -= preparedWrapper.alarmDataCmds.length;
- preparedWrapper.alarmDataUnsubscribeCmds = TelemetryPluginCmdsWrapper.popCmds(this.alarmDataUnsubscribeCmds, leftCount);
- leftCount -= preparedWrapper.alarmDataUnsubscribeCmds.length;
- preparedWrapper.entityCountCmds = TelemetryPluginCmdsWrapper.popCmds(this.entityCountCmds, leftCount);
- leftCount -= preparedWrapper.entityCountCmds.length;
- preparedWrapper.entityCountUnsubscribeCmds = TelemetryPluginCmdsWrapper.popCmds(this.entityCountUnsubscribeCmds, leftCount);
- leftCount -= preparedWrapper.entityCountUnsubscribeCmds.length;
- preparedWrapper.alarmCountCmds = TelemetryPluginCmdsWrapper.popCmds(this.alarmCountCmds, leftCount);
- leftCount -= preparedWrapper.alarmCountCmds.length;
- preparedWrapper.alarmCountUnsubscribeCmds = TelemetryPluginCmdsWrapper.popCmds(this.alarmCountUnsubscribeCmds, leftCount);
+ if (this.authCmd) {
+ preparedWrapper.authCmd = this.authCmd;
+ this.authCmd = null;
+ }
+ preparedWrapper.cmds = TelemetryPluginCmdsWrapper.popCmds(this.cmds, maxCommands);
return preparedWrapper;
}
}
@@ -415,8 +441,22 @@ export interface AlarmCountUpdateMsg extends CmdUpdateMsg {
count: number;
}
+export interface NotificationCountUpdateMsg extends CmdUpdateMsg {
+ cmdUpdateType: CmdUpdateType.NOTIFICATIONS_COUNT;
+ totalUnreadCount: number;
+ sequenceNumber: number;
+}
+
+export interface NotificationsUpdateMsg extends CmdUpdateMsg {
+ cmdUpdateType: CmdUpdateType.NOTIFICATIONS;
+ update?: Notification;
+ notifications?: Notification[];
+ totalUnreadCount: number;
+ sequenceNumber: number;
+}
+
export type WebsocketDataMsg = AlarmDataUpdateMsg | AlarmCountUpdateMsg |
- EntityDataUpdateMsg | EntityCountUpdateMsg | SubscriptionUpdateMsg;
+ EntityDataUpdateMsg | EntityCountUpdateMsg | SubscriptionUpdateMsg | NotificationCountUpdateMsg | NotificationsUpdateMsg;
export const isEntityDataUpdateMsg = (message: WebsocketDataMsg): message is EntityDataUpdateMsg => {
const updateMsg = (message as CmdUpdateMsg);
@@ -438,6 +478,16 @@ export const isAlarmCountUpdateMsg = (message: WebsocketDataMsg): message is Ala
return updateMsg.cmdId !== undefined && updateMsg.cmdUpdateType === CmdUpdateType.ALARM_COUNT_DATA;
};
+export const isNotificationCountUpdateMsg = (message: WebsocketDataMsg): message is NotificationCountUpdateMsg => {
+ const updateMsg = (message as CmdUpdateMsg);
+ return updateMsg.cmdId !== undefined && updateMsg.cmdUpdateType === CmdUpdateType.NOTIFICATIONS_COUNT;
+};
+
+export const isNotificationsUpdateMsg = (message: WebsocketDataMsg): message is NotificationsUpdateMsg => {
+ const updateMsg = (message as CmdUpdateMsg);
+ return updateMsg.cmdId !== undefined && updateMsg.cmdUpdateType === CmdUpdateType.NOTIFICATIONS;
+};
+
export class SubscriptionUpdate implements SubscriptionUpdateMsg {
subscriptionId: number;
errorCode: number;
@@ -627,6 +677,32 @@ export class AlarmCountUpdate extends CmdUpdate {
}
}
+export class NotificationCountUpdate extends CmdUpdate {
+ totalUnreadCount: number;
+ sequenceNumber: number;
+
+ constructor(msg: NotificationCountUpdateMsg) {
+ super(msg);
+ this.totalUnreadCount = msg.totalUnreadCount;
+ this.sequenceNumber = msg.sequenceNumber;
+ }
+}
+
+export class NotificationsUpdate extends CmdUpdate {
+ totalUnreadCount: number;
+ sequenceNumber: number;
+ update?: Notification;
+ notifications?: Notification[];
+
+ constructor(msg: NotificationsUpdateMsg) {
+ super(msg);
+ this.totalUnreadCount = msg.totalUnreadCount;
+ this.sequenceNumber = msg.sequenceNumber;
+ this.update = msg.update;
+ this.notifications = msg.notifications;
+ }
+}
+
export class TelemetrySubscriber extends WsSubscriber {
private dataSubject = new ReplaySubject(1);
@@ -789,3 +865,113 @@ export class TelemetrySubscriber extends WsSubscriber {
);
}
}
+
+export class NotificationSubscriber extends WsSubscriber {
+ private notificationCountSubject = new BehaviorSubject({
+ cmdId: 0,
+ cmdUpdateType: undefined,
+ errorCode: 0,
+ errorMsg: '',
+ totalUnreadCount: 0,
+ sequenceNumber: 0
+ });
+ private notificationsSubject = new BehaviorSubject({
+ cmdId: 0,
+ cmdUpdateType: undefined,
+ errorCode: 0,
+ errorMsg: '',
+ notifications: null,
+ totalUnreadCount: 0,
+ sequenceNumber: 0
+ });
+
+ public messageLimit = 10;
+
+ public notificationCount$ = this.notificationCountSubject.asObservable().pipe(map(msg => msg.totalUnreadCount));
+ public notifications$ = this.notificationsSubject.asObservable().pipe(map(msg => msg.notifications ));
+
+ public static createNotificationCountSubscription(websocketService: WebsocketService,
+ zone: NgZone): NotificationSubscriber {
+ const subscriptionCommand = new UnreadCountSubCmd();
+ const subscriber = new NotificationSubscriber(websocketService, zone);
+ subscriber.subscriptionCommands.push(subscriptionCommand);
+ return subscriber;
+ }
+
+ public static createNotificationsSubscription(websocketService: WebsocketService,
+ zone: NgZone, limit = 10): NotificationSubscriber {
+ const subscriptionCommand = new UnreadSubCmd(limit);
+ const subscriber = new NotificationSubscriber(websocketService, zone);
+ subscriber.messageLimit = limit;
+ subscriber.subscriptionCommands.push(subscriptionCommand);
+ return subscriber;
+ }
+
+ public static createMarkAsReadCommand(websocketService: WebsocketService,
+ ids: string[]): NotificationSubscriber {
+ const subscriptionCommand = new MarkAsReadCmd(ids);
+ const subscriber = new NotificationSubscriber(websocketService);
+ subscriber.subscriptionCommands.push(subscriptionCommand);
+ return subscriber;
+ }
+
+ public static createMarkAllAsReadCommand(websocketService: WebsocketService