+
{{message}}
@@ -51,6 +52,10 @@ export class TbErrorComponent {
state: any;
message;
+ @Input()
+ @coerceBoolean()
+ noMargin = false;
+
@Input()
set error(value) {
if (value && !this.message) {
diff --git a/ui-ngx/src/app/shared/models/notification.models.ts b/ui-ngx/src/app/shared/models/notification.models.ts
index 2cef7c6cc2..4d8a9cffcd 100644
--- a/ui-ngx/src/app/shared/models/notification.models.ts
+++ b/ui-ngx/src/app/shared/models/notification.models.ts
@@ -48,6 +48,8 @@ export interface NotificationInfo {
alarmStatus?: AlarmStatus;
alarmType?: string;
stateEntityId?: EntityId;
+ acknowledged?: boolean;
+ cleared?: boolean;
}
export interface NotificationRequest extends Omit, 'label'> {
diff --git a/ui-ngx/src/app/shared/models/time/time.models.ts b/ui-ngx/src/app/shared/models/time/time.models.ts
index fd2b4f52fa..235df14bb0 100644
--- a/ui-ngx/src/app/shared/models/time/time.models.ts
+++ b/ui-ngx/src/app/shared/models/time/time.models.ts
@@ -452,6 +452,15 @@ export const calculateIntervalStartTime = (interval: QuickTimeInterval, currentD
case QuickTimeInterval.PREVIOUS_MONTH:
currentDate.subtract(1, 'months');
return currentDate.startOf('month');
+ case QuickTimeInterval.PREVIOUS_QUARTER:
+ currentDate.subtract(1, 'quarter');
+ return currentDate.startOf('quarter');
+ case QuickTimeInterval.PREVIOUS_HALF_YEAR:
+ if (currentDate.get('quarter') < 3) {
+ return currentDate.startOf('year').subtract(2, 'quarters');
+ } else {
+ return currentDate.startOf('year');
+ }
case QuickTimeInterval.PREVIOUS_YEAR:
currentDate.subtract(1, 'years');
return currentDate.startOf('year');
diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts
index bfe9021926..55a1070c41 100644
--- a/ui-ngx/src/app/shared/models/widget.models.ts
+++ b/ui-ngx/src/app/shared/models/widget.models.ts
@@ -318,6 +318,11 @@ export interface DataKey extends KeyInfo {
_hash?: number;
}
+export enum DataKeyConfigMode {
+ general = 'general',
+ advanced = 'advanced'
+}
+
export enum DatasourceType {
function = 'function',
device = 'device',
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 60e218674f..55b377dcec 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1130,6 +1130,7 @@
},
"datakey": {
"settings": "Settings",
+ "general": "General",
"advanced": "Advanced",
"key": "Key",
"label": "Label",
@@ -1187,7 +1188,9 @@
"delta-calculation-result": "Delta calculation result",
"delta-calculation-result-previous-value": "Previous value",
"delta-calculation-result-delta-absolute": "Delta (absolute)",
- "delta-calculation-result-delta-percent": "Delta (percent)"
+ "delta-calculation-result-delta-percent": "Delta (percent)",
+ "source": "Source",
+ "latest": "Latest"
},
"datasource": {
"type": "Datasource type",
@@ -4242,7 +4245,6 @@
"preview": "Preview",
"set": "Set",
"set-message": "Set message",
- "card-title": "Card title",
"advanced-title-style": "Advanced title style",
"card-style": "Card style",
"text": "Text",
@@ -4262,6 +4264,8 @@
"chart": {
"common-settings": "Common settings",
"enable-stacking-mode": "Enable stacking mode",
+ "selection": "Time range selection",
+ "enable-selection-mode": "Enable selection mode",
"line-shadow-size": "Line shadow size",
"display-smooth-lines": "Display smooth (curved) lines",
"default-bar-width": "Default bar width for non-aggregated data (milliseconds)",
@@ -5231,9 +5235,18 @@
"display-alarm-activity": "Display alarm activity",
"allow-alarms-assign": "Allow alarms assignment",
"columns": "Columns",
+ "column-settings": "Column settings",
"remove-column": "Remove column",
"add-column": "Add column",
- "no-columns": "No columns configured"
+ "no-columns": "No columns configured",
+ "show-card-buttons": "Show card buttons",
+ "columns-to-display": "Columns to display",
+ "table-header": "Table header",
+ "header-buttons": "Header buttons",
+ "pagination": "Pagination",
+ "rows": "Rows",
+ "timeseries-column-error": "At least one timeseries column should be specified",
+ "table-tabs": "Table tabs"
},
"value-source": {
"value-source": "Value source",
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index 760ffe88c6..f4d4192122 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -224,6 +224,8 @@ div {
line-height: var(--mdc-typography-caption-line-height, 20px);
font-weight: var(--mdc-typography-caption-font-weight, 400);
letter-spacing: var(--mdc-typography-caption-letter-spacing, 0.0333333333em);
+ color: rgba(0, 0, 0, 0.6);
+ white-space: normal;
}
.mat-caption {
@@ -1199,11 +1201,31 @@ mat-label {
&.no-padding-bottom {
padding-bottom: 0;
}
+ &.no-padding {
+ padding: 0;
+ }
&.stroked {
box-shadow: none;
border: 1px solid rgba(0, 0, 0, 0.12);
border-radius: 6px;
}
+ &.tb-slide-toggle {
+ padding: 0;
+ gap: 0;
+ .tb-widget-config-panel-title {
+ padding-top: 16px;
+ padding-left: 16px;
+ }
+ .mat-expansion-panel {
+ padding: 16px;
+ .mat-expansion-panel-header {
+ height: 32px;
+ .mat-slide {
+ margin: 0;
+ }
+ }
+ }
+ }
.mat-expansion-panel {
&.tb-settings {
box-shadow: none;
@@ -1220,6 +1242,11 @@ mat-label {
flex: 0;
white-space: nowrap;
}
+ &.fill-width {
+ .mat-content {
+ flex: 1;
+ }
+ }
&:hover {
background: none;
}
@@ -1246,6 +1273,9 @@ mat-label {
}
.mat-slide {
margin: 8px 0;
+ &.no-margin {
+ margin: 0;
+ }
.mdc-form-field>label {
font-weight: 400;
font-size: 16px;
diff --git a/ui-ngx/src/typings/jquery.flot.typings.d.ts b/ui-ngx/src/typings/jquery.flot.typings.d.ts
index 5bcc9b9b3e..e832a36e7a 100644
--- a/ui-ngx/src/typings/jquery.flot.typings.d.ts
+++ b/ui-ngx/src/typings/jquery.flot.typings.d.ts
@@ -119,6 +119,7 @@ interface JQueryPlotSelection {
color?: string;
shape?: JQueryPlotSelectionShape;
minSize?: number;
+ touch?: boolean;
}
interface JQueryPlotSelectionRanges {