forked from HyperIoT-Labs/HyperIoT-UI
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updated dashboard; upgraded to latest plotly.js 1.49.4
- Loading branch information
Showing
33 changed files
with
1,356 additions
and
884 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
patches/plotly.js+1.48.3.patch → patches/plotly.js+1.49.4.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| diff --git a/node_modules/plotly.js/dist/plotly.js b/node_modules/plotly.js/dist/plotly.js | ||
| index 6557dcc..e5cbe64 100644 | ||
| index 441db1e..e4f4976 100644 | ||
| --- a/node_modules/plotly.js/dist/plotly.js | ||
| +++ b/node_modules/plotly.js/dist/plotly.js | ||
| @@ -32478,7 +32478,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); | ||
| @@ -34417,7 +34417,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); | ||
| return request.responseXML; | ||
| }); | ||
| if (typeof define === "function" && define.amd) this.d3 = d3, define(d3); else if (typeof module === "object" && module.exports) module.exports = d3; else this.d3 = d3; | ||
| -}(); | ||
| +}.apply(self); | ||
| },{}],158:[function(_dereq_,module,exports){ | ||
| },{}],164:[function(_dereq_,module,exports){ | ||
| module.exports = function () { | ||
| for (var i = 0; i < arguments.length; i++) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| { | ||
| "/hyperiot/authentication/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/husers/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/roles/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/permissions/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/hprojects/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/hdevices/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/hpackets/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/rules/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/dashboards/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/dashboardwidgets/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "changeOrigin": true | ||
| }, | ||
| "/hyperiot/ws/*": { | ||
| "target": "http://localhost:8181", | ||
| "secure": false, | ||
| "logLevel": "debug", | ||
| "ws": true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ import { | |
| Component, | ||
| OnInit, | ||
| ElementRef, | ||
| OnDestroy, | ||
| Output, | ||
| EventEmitter, | ||
| HostListener | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/app/pages/dashboard/dashboard-view/dashboard-view.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 22 additions & 12 deletions
34
src/app/pages/dashboard/dynamic-widget/dynamic-widget.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,31 @@ | ||
| <!-- List of widget that can be dynamically loaded --> | ||
|
|
||
| <hyperiot-time-chart *ngIf="widget.type === 'time-chart'" [widget]="widget" (widgetAction)="onWidgetAction($event)"> | ||
| </hyperiot-time-chart> | ||
| <hyperiot-time-chart | ||
| *ngIf="widget.type === 'time-chart'" | ||
| [widget]="widget" | ||
| (widgetAction)="onWidgetAction($event)"></hyperiot-time-chart> | ||
|
|
||
| <hyperiot-stats-chart | ||
| *ngIf="widget.type === 'stats-chart'" | ||
| [widget]="widget" | ||
| (widgetAction)="onWidgetAction($event)"></hyperiot-stats-chart> | ||
|
|
||
| <hyperiot-stats-chart *ngIf="widget.type === 'stats-chart'" [widget]="widget" (widgetAction)="onWidgetAction($event)"> | ||
| </hyperiot-stats-chart> | ||
| <hyperiot-sensor-value | ||
| *ngIf="widget.type === 'sensor-value'" | ||
| [widget]="widget" | ||
| (widgetAction)="onWidgetAction($event)"></hyperiot-sensor-value> | ||
|
|
||
| <hyperiot-sensor-value *ngIf="widget.type === 'sensor-value'" [widget]="widget" (widgetAction)="onWidgetAction($event)"> | ||
| </hyperiot-sensor-value> | ||
| <!-- | ||
| <hyperiot-gauge-value | ||
| *ngIf="widget.type === 'gauge-value'" | ||
| [widget]="widget" | ||
| (widgetAction)="onWidgetAction($event)"></hyperiot-gauge-value> --> | ||
| (widgetAction)="onWidgetAction($event)"></hyperiot-gauge-value> | ||
|
|
||
| <hyperiot-events-log *ngIf="widget.type === 'events-log'" [widget]="widget" (widgetAction)="onWidgetAction($event)"> | ||
| </hyperiot-events-log> | ||
| <hyperiot-events-log | ||
| *ngIf="widget.type === 'events-log'" | ||
| [widget]="widget" | ||
| (widgetAction)="onWidgetAction($event)"></hyperiot-events-log> | ||
|
|
||
| <hyperiot-text-label *ngIf="widget.type === 'text-label'" [widget]="widget" (widgetAction)="onWidgetAction($event)"> | ||
| </hyperiot-text-label> | ||
| <hyperiot-text-label | ||
| *ngIf="widget.type === 'text-label'" | ||
| [widget]="widget" | ||
| (widgetAction)="onWidgetAction($event)"></hyperiot-text-label> |
59 changes: 31 additions & 28 deletions
59
src/app/pages/dashboard/widget-settings-dialog/packet-select/packet-select.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,39 @@ | ||
| <div class="padding-6 d-flex flex-column justify-content-stretch"> | ||
|
|
||
| <ng-container *ngIf="widget.config"> | ||
| <ng-container *ngIf="widget.config"> | ||
|
|
||
| <div class="d-flex flex-column"> | ||
| <label for="packet-select" [ngClass]="{'error-color': selectedPacket == null}" | ||
| i18n="@@widgetSettingsDialog/packet-lbl-type">Select packet</label> | ||
| <select size="5" [(ngModel)]="selectedPacket" [compareWith]="packetCompare" (ngModelChange)="onPacketChange()" | ||
| name="packet-select" id="packet-select" required> | ||
| <option *ngFor="let packet of projectPackets" [ngValue]="packet" selected> | ||
| {{packet.name}} | ||
| ({{packet.id}}) | ||
| </option> | ||
| </select> | ||
| </div> | ||
| <div class="d-flex flex-column"> | ||
| <label for="packet-select" [ngClass]="{'error-color': selectedPacket == null}" | ||
| i18n="@@widgetSettingsDialog/packet-lbl-type">Select packet</label> | ||
| <select size="5" | ||
| [(ngModel)]="selectedPacket" [compareWith]="packetCompare" | ||
| (ngModelChange)="onPacketChange()" | ||
| name="packet-select" id="packet-select" required> | ||
| <option *ngFor="let packet of projectPackets" [ngValue]="packet" selected> | ||
| {{packet.name}} | ||
| ({{packet.id}}) | ||
| </option> | ||
| </select> | ||
| </div> | ||
|
|
||
| </ng-container> | ||
| </ng-container> | ||
|
|
||
| <ng-container *ngIf="selectedPacket != null"> | ||
| <ng-container *ngIf="selectedPacket != null"> | ||
|
|
||
| <div class="d-flex flex-column"> | ||
| <label for="field-select" | ||
| [ngClass]="{'error-color': selectedFields == null || selectedFields.length === 0 || selectedFields[0] === null}" | ||
| i18n="@@widgetSettingsDialog/packet-lbl-fields"> | ||
| Select {multiPacketSelect?1:0, plural, =0 {field} other {fields}} | ||
| </label> | ||
| <select [size]="multiPacketSelect ? 5 : null" [(ngModel)]="selectedFields" [multiple]="multiPacketSelect" | ||
| (ngModelChange)="onPacketFieldChange($event)" name="field-select" id="field-select" required minlength="1"> | ||
| <option *ngIf="!multiPacketSelect" [ngValue]="null"></option> | ||
| <option *ngFor="let field of selectedPacket.fields" [ngValue]="field">{{field.name}}</option> | ||
| </select> | ||
| </div> | ||
| <div class="d-flex flex-column"> | ||
| <label for="field-select" [ngClass]="{'error-color': selectedFields == null || selectedFields.length === 0}" | ||
| i18n="@@widgetSettingsDialog/packet-lbl-fields"> | ||
| Select {multiPacketSelect?1:0, plural, =0 {field} other {fields}} | ||
| </label> | ||
| <select [size]="multiPacketSelect ? 5 : null" | ||
| [(ngModel)]="selectedFields" [multiple]="multiPacketSelect" | ||
| (ngModelChange)="onPacketFieldChange($event)" | ||
| name="field-select" id="field-select" required minlength="1"> | ||
| <option *ngIf="!multiPacketSelect" [ngValue]="null"></option> | ||
| <option *ngFor="let field of selectedPacket.fields" [ngValue]="field">{{field.name}}</option> | ||
| </select> | ||
| </div> | ||
|
|
||
| </ng-container> | ||
| </ng-container> | ||
|
|
||
| </div> | ||
| </div> |
4 changes: 2 additions & 2 deletions
4
src/app/pages/dashboard/widget-settings-dialog/packet-select/packet-select.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...shboard/widget-settings-dialog/sensor-value-settings/sensor-value-settings.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <hyt-packet-select [widget]="widget"></hyt-packet-select> | ||
| <hyt-packet-select [widget]="widget"></hyt-packet-select> |
14 changes: 7 additions & 7 deletions
14
...dashboard/widget-settings-dialog/sensor-value-settings/sensor-value-settings.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...s/dashboard/widget-settings-dialog/stats-chart-settings/stats-chart-settings.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 2 additions & 3 deletions
5
...s/dashboard/widget-settings-dialog/time-chart-settings/time-chart-settings.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| <hyt-packet-select [widget]="widget" [multiPacketSelect]="true" [selectedFields]="selectedFields" | ||
| (selectedFieldsChange)="onSelectedFieldsChange($event)"></hyt-packet-select> | ||
| <hyt-packet-select [widget]="widget" [multiPacketSelect]="true" [selectedFields]="selectedFields" (selectedFieldsChange)="onSelectedFieldsChange($event)"></hyt-packet-select> | ||
| <!-- | ||
| <div *ngFor="let field of selectedFields">{{field.name}}</div> | ||
| --> | ||
| <!-- Plotly chart specific options --> | ||
|
|
||
| <div class="padding-6 d-flex flex-column justify-content-stretch"> | ||
| <!-- not yet implemented --> | ||
| <!-- not yet implemented --> | ||
| </div> |
Oops, something went wrong.