@@ -22,29 +20,31 @@
import Vue from "vue";
import { Component, Prop } from "sitewhere-ide-common";
+import BrandingImage from "../common/BrandingImage.vue";
+
import { IArea } from "sitewhere-rest-api";
+import { IStyle } from "../common/Style";
-@Component({})
+@Component({
+ components: {
+ BrandingImage
+ }
+})
export default class AreaListEntry extends Vue {
@Prop() readonly area!: IArea;
// Compute style of logo.
- get logoStyle() {
+ get logoStyle(): IStyle {
return {
- "background-color": "#fff",
- "background-image": "url(" + this.area.imageUrl + ")",
- "background-size": "contain",
- "background-repeat": "no-repeat",
- "background-position": "50% 50%",
- border: "1px solid #eee",
height: "120px",
- width: "100px"
+ width: "120px",
+ "padding-left": "15px"
};
}
// Handle area clicked.
onAreaClicked() {
- this.$emit("openArea", this.area);
+ this.$emit("open", this.area);
}
}
diff --git a/src/renderer/components/areas/AreaListFilterBar.vue b/src/renderer/components/areas/AreaListFilterBar.vue
deleted file mode 100644
index 993a05a..0000000
--- a/src/renderer/components/areas/AreaListFilterBar.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- {{ parentArea.areaType.icon }}
- {{ parentArea.name }}
-
-
- fa-arrow-circle-up
-
- Up One Level
-
-
-
- fa-map
- Root of Area Hierarchy
-
-
-
-
-
diff --git a/src/renderer/components/areas/AreaMultifilterChip.vue b/src/renderer/components/areas/AreaMultifilterChip.vue
new file mode 100644
index 0000000..ff37348
--- /dev/null
+++ b/src/renderer/components/areas/AreaMultifilterChip.vue
@@ -0,0 +1,38 @@
+
+
+
-
diff --git a/src/renderer/components/areas/AreaSubareas.vue b/src/renderer/components/areas/AreaSubareas.vue
index 8a6ebc0..2b418ba 100644
--- a/src/renderer/components/areas/AreaSubareas.vue
+++ b/src/renderer/components/areas/AreaSubareas.vue
@@ -7,11 +7,20 @@
>
-
+
+
+
+
-
-
-
+
+
+
-
+
+
+
+
- ;
+ }>;
+
+ /** Get wrapped dialog */
+ getDialog(): DialogComponent {
+ return this.$refs.dialog;
+ }
-
+
diff --git a/src/renderer/components/areas/ZoneDeleteDialog.vue b/src/renderer/components/areas/ZoneDeleteDialog.vue
index 2fcbe72..bc53967 100644
--- a/src/renderer/components/areas/ZoneDeleteDialog.vue
+++ b/src/renderer/components/areas/ZoneDeleteDialog.vue
@@ -1,42 +1,50 @@
-
-
- Are you sure you want to delete this zone?
-
+
+ {{ message }}
-
diff --git a/src/renderer/components/areas/ZoneDetailFields.vue b/src/renderer/components/areas/ZoneDetailFields.vue
new file mode 100644
index 0000000..a447559
--- /dev/null
+++ b/src/renderer/components/areas/ZoneDetailFields.vue
@@ -0,0 +1,365 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/areas/ZoneDialog.vue b/src/renderer/components/areas/ZoneDialog.vue
index f430cca..8d4640b 100644
--- a/src/renderer/components/areas/ZoneDialog.vue
+++ b/src/renderer/components/areas/ZoneDialog.vue
@@ -1,228 +1,111 @@
-
-
-
-
- Zone Settings
- Metadata
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Details
+ Metadata
+
+
+
+
+
+
+
+
-
diff --git a/src/renderer/components/areas/ZoneUpdateDialog.vue b/src/renderer/components/areas/ZoneUpdateDialog.vue
index a6b4de8..1625729 100644
--- a/src/renderer/components/areas/ZoneUpdateDialog.vue
+++ b/src/renderer/components/areas/ZoneUpdateDialog.vue
@@ -1,68 +1,67 @@
+ @payload="onSave"
+ />
-
diff --git a/src/renderer/components/areatypes/AreaTypeAreas.vue b/src/renderer/components/areatypes/AreaTypeAreas.vue
index cd35c63..632391a 100644
--- a/src/renderer/components/areatypes/AreaTypeAreas.vue
+++ b/src/renderer/components/areatypes/AreaTypeAreas.vue
@@ -9,9 +9,14 @@
>
-
+
+
+
+
@@ -19,8 +24,10 @@
import { Component, Prop, ListComponent } from "sitewhere-ide-common";
import AreaListEntry from "../areas/AreaListEntry.vue";
+import NoResultsPanel from "../common/NoResultsPanel.vue";
import { AxiosPromise } from "axios";
+import { routeTo } from "../common/Utils";
import { listAreas } from "../../rest/sitewhere-areas-api";
import {
IArea,
@@ -31,7 +38,8 @@ import {
@Component({
components: {
- AreaListEntry
+ AreaListEntry,
+ NoResultsPanel
}
})
export default class AreaTypeAreas extends ListComponent<
@@ -64,5 +72,10 @@ export default class AreaTypeAreas extends ListComponent<
): AxiosPromise {
return listAreas(this.$store, criteria, format);
}
+
+ /** Called to open an area */
+ onOpenArea(area: IArea) {
+ routeTo(this, "/areas/" + area.token);
+ }
}
diff --git a/src/renderer/components/areatypes/AreaTypeContentFields.vue b/src/renderer/components/areatypes/AreaTypeContentFields.vue
new file mode 100644
index 0000000..714e981
--- /dev/null
+++ b/src/renderer/components/areatypes/AreaTypeContentFields.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/areatypes/AreaTypeDeleteDialog.vue b/src/renderer/components/areatypes/AreaTypeDeleteDialog.vue
index 47abb78..140526c 100644
--- a/src/renderer/components/areatypes/AreaTypeDeleteDialog.vue
+++ b/src/renderer/components/areatypes/AreaTypeDeleteDialog.vue
@@ -1,53 +1,56 @@
-
-
- Are you sure you want to delete this area type?
-
-
+
+ {{ message }}
+
-
diff --git a/src/renderer/components/areatypes/AreaTypeDetailFields.vue b/src/renderer/components/areatypes/AreaTypeDetailFields.vue
index ab7c29f..b5b3fe3 100644
--- a/src/renderer/components/areatypes/AreaTypeDetailFields.vue
+++ b/src/renderer/components/areatypes/AreaTypeDetailFields.vue
@@ -1,16 +1,13 @@
-
- Token is required.
- Token is not valid.
-
+ :validator="$v"
+ />
+
+
-
-
- {{ areaType.name }}
-
-
- {{ areaType.description }}
-
-
- {{ formatDate(areaType.createdDate) }}
-
-
- {{ formatDate(areaType.updatedDate) }}
-
+
+
+
+
+ {{ areaType.name }}
+
+
+ {{ areaType.description }}
+
+
+ {{ formatDate(areaType.createdDate) }}
+
+
+ {{ formatDate(areaType.updatedDate) }}
+
+
-
@@ -28,10 +33,13 @@ import { Component, HeaderComponent } from "sitewhere-ide-common";
import { formatDate } from "../common/Utils";
import { IAreaType } from "sitewhere-rest-api";
+
+import ClipboardCopyField from "../common/form/ClipboardCopyField.vue";
import AuthenticatedImage from "../common/AuthenticatedImage.vue";
@Component({
components: {
+ ClipboardCopyField,
AuthenticatedImage
}
})
diff --git a/src/renderer/components/areatypes/AreaTypeDialog.vue b/src/renderer/components/areatypes/AreaTypeDialog.vue
index d695c86..86f1c3e 100644
--- a/src/renderer/components/areatypes/AreaTypeDialog.vue
+++ b/src/renderer/components/areatypes/AreaTypeDialog.vue
@@ -19,16 +19,16 @@
-
-
-
-
@@ -45,14 +45,14 @@ import {
import { NavigationIcon } from "../../libraries/constants";
import AreaTypeDetailFields from "./AreaTypeDetailFields.vue";
-import AreaTypesMultiselect from "./AreaTypesMultiselect.vue";
+import AreaTypeContentFields from "./AreaTypeContentFields.vue";
import BrandingPanel from "../common/BrandingPanel.vue";
import { IAreaType } from "sitewhere-rest-api";
@Component({
components: {
AreaTypeDetailFields,
- AreaTypesMultiselect,
+ AreaTypeContentFields,
BrandingPanel
}
})
@@ -60,8 +60,9 @@ export default class AreaTypeDialog extends DialogComponent {
// References.
$refs!: Refs<{
dialog: ITabbedComponent;
- details: DialogSection;
- branding: DialogSection;
+ details: AreaTypeDetailFields;
+ content: AreaTypeContentFields;
+ branding: BrandingPanel;
metadata: DialogSection;
}>;
@@ -76,6 +77,7 @@ export default class AreaTypeDialog extends DialogComponent {
Object.assign(
payload,
this.$refs.details.save(),
+ this.$refs.content.save(),
this.$refs.branding.save(),
this.$refs.metadata.save()
);
@@ -87,13 +89,16 @@ export default class AreaTypeDialog extends DialogComponent {
if (this.$refs.details) {
this.$refs.details.reset();
}
+ if (this.$refs.content) {
+ this.$refs.content.reset();
+ }
if (this.$refs.branding) {
this.$refs.branding.reset();
}
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -102,6 +107,9 @@ export default class AreaTypeDialog extends DialogComponent {
if (this.$refs.details) {
this.$refs.details.load(payload);
}
+ if (this.$refs.content) {
+ this.$refs.content.load(payload);
+ }
if (this.$refs.branding) {
this.$refs.branding.load(payload);
}
@@ -113,17 +121,21 @@ export default class AreaTypeDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
+ return;
+ }
+
+ if (!this.$refs.content.validate()) {
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.branding.validate()) {
- this.$refs.dialog.setActiveTab("branding");
+ this.$refs.dialog.setActiveTab(1);
return;
}
var payload = this.generatePayload();
- console.log("Before payload emit:", this);
this.$emit("payload", payload);
}
}
diff --git a/src/renderer/components/areatypes/AreaTypeListEntry.vue b/src/renderer/components/areatypes/AreaTypeListEntry.vue
index a42f05a..de023d6 100644
--- a/src/renderer/components/areatypes/AreaTypeListEntry.vue
+++ b/src/renderer/components/areatypes/AreaTypeListEntry.vue
@@ -3,9 +3,7 @@
-
-
+
This area has no subareas.
+
+ Click
+ {{areaIcon}} in the toolbar to add a subarea.
+
+ No areas have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add an area.
+
+
-
-
-
-
diff --git a/src/renderer/components/areas/MapUtils.js b/src/renderer/components/areas/MapUtils.js
deleted file mode 100644
index 328aafe..0000000
--- a/src/renderer/components/areas/MapUtils.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import L from "leaflet";
-
-export default {
- // Convert zone bounds to leaflet LatLng array.
- swToLeafletBounds: function(bounds) {
- var latLngs = [];
- for (var index = 0; index < bounds.length; index++) {
- var bound = bounds[index];
- latLngs.push(new L.LatLng(bound.latitude, bound.longitude));
- }
- return latLngs;
- },
-
- leafletToSwBounds: function(bounds) {
- var locations = [];
- if (bounds) {
- for (var index = 0; index < bounds.length; index++) {
- var bound = bounds[index];
- locations.push({
- latitude: bound.lat,
- longitude: bound.lng,
- elevation: 0
- });
- }
- }
- return locations;
- }
-};
diff --git a/src/renderer/components/areas/MapWithZoneOverlayPanel.vue b/src/renderer/components/areas/MapWithZoneOverlayPanel.vue
deleted file mode 100644
index fd5cc06..0000000
--- a/src/renderer/components/areas/MapWithZoneOverlayPanel.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
-
-
+ Token is required.
+ Token is not valid.
+
+
+ Zone name is required.
+
+
- Zone token is required.
- Zone token is not valid.
-
-
- Zone name is required.
-
- There are no areas of this type.
+
@@ -22,15 +20,30 @@
import Vue from "vue";
import { Component, Prop } from "sitewhere-ide-common";
+import BrandingImage from "../common/BrandingImage.vue";
+
+import { IStyle } from "../common/Style";
import { IAreaType } from "sitewhere-rest-api";
-@Component({})
+@Component({
+ components: {
+ BrandingImage
+ }
+})
export default class AreaTypeListEntry extends Vue {
@Prop() readonly areaType!: IAreaType;
+ // Compute style of logo.
+ get logoStyle(): IStyle {
+ return {
+ height: "80px",
+ width: "80px"
+ };
+ }
+
// Callen when clicked.
onAreaTypeClicked() {
- this.$emit("openAreaType", this.areaType);
+ this.$emit("open", this.areaType);
}
}
diff --git a/src/renderer/components/areatypes/AreaTypeMultiselect.vue b/src/renderer/components/areatypes/AreaTypeMultiselect.vue
new file mode 100644
index 0000000..b636982
--- /dev/null
+++ b/src/renderer/components/areatypes/AreaTypeMultiselect.vue
@@ -0,0 +1,58 @@
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- No area types available.
-
-
-
-
diff --git a/src/renderer/components/assets/AssetAssignments.vue b/src/renderer/components/assets/AssetAssignments.vue
index bf0dc55..7dd2a58 100644
--- a/src/renderer/components/assets/AssetAssignments.vue
+++ b/src/renderer/components/assets/AssetAssignments.vue
@@ -38,7 +38,7 @@ import {
AssignmentListEntry
}
})
-export default class AreaAssignments extends ListComponent<
+export default class AssetAssignments extends ListComponent<
IDeviceAssignment,
IDeviceAssignmentSearchCriteria,
IDeviceAssignmentResponseFormat,
@@ -51,7 +51,7 @@ export default class AreaAssignments extends ListComponent<
/** Build search criteria for list */
buildSearchCriteria(): IDeviceAssignmentSearchCriteria {
let criteria: IDeviceAssignmentSearchCriteria = {};
- criteria.assetToken = this.assetToken;
+ criteria.assetTokens = [this.assetToken];
return criteria;
}
diff --git a/src/renderer/components/assets/AssetChooser.vue b/src/renderer/components/assets/AssetChooser.vue
index e6033d5..e42be82 100644
--- a/src/renderer/components/assets/AssetChooser.vue
+++ b/src/renderer/components/assets/AssetChooser.vue
@@ -1,116 +1,62 @@
-
- Are you sure you want to delete this asset?
-
-
+
+ {{ message }}
+
-
diff --git a/src/renderer/components/assets/AssetDetail.vue b/src/renderer/components/assets/AssetDetail.vue
index 1c418ab..5b541ba 100644
--- a/src/renderer/components/assets/AssetDetail.vue
+++ b/src/renderer/components/assets/AssetDetail.vue
@@ -58,7 +58,7 @@ import {
AssetUpdateDialog
}
})
-export default class AreaDetail extends DetailComponent {
+export default class AssetDetail extends DetailComponent {
// References.
$refs!: Refs<{
edit: AssetUpdateDialog;
diff --git a/src/renderer/components/assets/AssetDetailFields.vue b/src/renderer/components/assets/AssetDetailFields.vue
index 8f6b7f2..655cad4 100644
--- a/src/renderer/components/assets/AssetDetailFields.vue
+++ b/src/renderer/components/assets/AssetDetailFields.vue
@@ -1,16 +1,13 @@
-
- Token is required.
- Token is not valid.
-
+ :validator="$v"
+ />
+
+
-
-
- {{ asset.name }}
-
-
- {{ asset.imageUrl }}
-
-
- {{ formatDate(asset.createdDate) }}
-
-
- {{ formatDate(asset.updatedDate) }}
-
+
+
+
+
+ {{ asset.name }}
+
+
+ {{ asset.imageUrl }}
+
+
+ {{ formatDate(asset.createdDate) }}
+
+
+ {{ formatDate(asset.updatedDate) }}
+
+
-
@@ -33,10 +38,13 @@ import { Component, HeaderComponent } from "sitewhere-ide-common";
import { formatDate } from "../common/Utils";
import { IAsset } from "sitewhere-rest-api";
+
+import ClipboardCopyField from "../common/form/ClipboardCopyField.vue";
import AuthenticatedImage from "../common/AuthenticatedImage.vue";
@Component({
components: {
+ ClipboardCopyField,
AuthenticatedImage
}
})
@@ -51,11 +59,6 @@ export default class AssetDetailHeader extends HeaderComponent {
return this.asset ? this.asset.token : "";
}
- // Get URL for image.
- get imageUrl(): string {
- return this.asset ? this.asset.imageUrl : "";
- }
-
// Get URL for QR code.
get qrCodeUrl() {
return "assets/" + this.token + "/label/qrcode";
diff --git a/src/renderer/components/assets/AssetDialog.vue b/src/renderer/components/assets/AssetDialog.vue
index 6a72b4f..87a529c 100644
--- a/src/renderer/components/assets/AssetDialog.vue
+++ b/src/renderer/components/assets/AssetDialog.vue
@@ -18,13 +18,13 @@
-
-
-
@@ -87,7 +87,7 @@ export default class AssetDialog extends DialogComponent {
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -107,12 +107,12 @@ export default class AssetDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.branding.validate()) {
- this.$refs.dialog.setActiveTab("branding");
+ this.$refs.dialog.setActiveTab(1);
return;
}
diff --git a/src/renderer/components/assets/AssetListEntry.vue b/src/renderer/components/assets/AssetListEntry.vue
index c522131..35a408a 100644
--- a/src/renderer/components/assets/AssetListEntry.vue
+++ b/src/renderer/components/assets/AssetListEntry.vue
@@ -3,9 +3,7 @@
-
-
-
+
+ Assign a customer, area, and/or asset associated with '{{ device.token }}'.
+
+ Customer
+ Area
+ Asset
+ Metadata
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/renderer/components/assignments/AssignmentEmulator.vue b/src/renderer/components/assignments/AssignmentEmulator.vue
deleted file mode 100644
index e9c497b..0000000
--- a/src/renderer/components/assignments/AssignmentEmulator.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-
- {{ props.item.command.name }}
- {{ invocationSource(props.item) }}
- {{ invocationTarget(props.item) }}
+ {{ props.item.command.name }}
+ {{ invocationSource(props.item) }}
+ {{ invocationTarget(props.item) }}
Released:
+
+
+ Areas selected below will be included in results.
+ If no items are selected, all areas will be included.
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/AssignmentListFilterAssetFields.vue b/src/renderer/components/assignments/AssignmentListFilterAssetFields.vue
new file mode 100644
index 0000000..034ed29
--- /dev/null
+++ b/src/renderer/components/assignments/AssignmentListFilterAssetFields.vue
@@ -0,0 +1,52 @@
+
+
+
+
+ Assets selected below will be included in results.
+ If no items are selected, all assets will be included.
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/AssignmentListFilterBar.vue b/src/renderer/components/assignments/AssignmentListFilterBar.vue
new file mode 100644
index 0000000..3131f21
--- /dev/null
+++ b/src/renderer/components/assignments/AssignmentListFilterBar.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/AssignmentListFilterCustomerFields.vue b/src/renderer/components/assignments/AssignmentListFilterCustomerFields.vue
new file mode 100644
index 0000000..28f27f3
--- /dev/null
+++ b/src/renderer/components/assignments/AssignmentListFilterCustomerFields.vue
@@ -0,0 +1,52 @@
+
+
+
+
+ Customers selected below will be included in results.
+ If no items are selected, all customers will be included.
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/AssignmentListFilterDeviceTypeFields.vue b/src/renderer/components/assignments/AssignmentListFilterDeviceTypeFields.vue
new file mode 100644
index 0000000..2d2725f
--- /dev/null
+++ b/src/renderer/components/assignments/AssignmentListFilterDeviceTypeFields.vue
@@ -0,0 +1,52 @@
+
+
+
+
+ Device types selected below will be included in results.
+ If no items are selected, all device types will be included.
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/AssignmentListFilterDialog.vue b/src/renderer/components/assignments/AssignmentListFilterDialog.vue
new file mode 100644
index 0000000..36fdede
--- /dev/null
+++ b/src/renderer/components/assignments/AssignmentListFilterDialog.vue
@@ -0,0 +1,151 @@
+
+
+ Choose criteria for filtering which device assignments are shown.
+
+ Device Types
+ Customers
+ Areas
+ Assets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/AssignmentStatusButton.vue b/src/renderer/components/assignments/AssignmentStatusButton.vue
index d3bd552..45ed7d2 100644
--- a/src/renderer/components/assignments/AssignmentStatusButton.vue
+++ b/src/renderer/components/assignments/AssignmentStatusButton.vue
@@ -5,23 +5,19 @@
buttonText="Update"
title="Update Assignment Status"
width="400"
- @action="onUpdateStatus"
+ @confirmed="onExecuteAction"
>
Are you sure you want to update the assignment status?
-
+ Released
+
- Active
+ Active
Update Status
@@ -29,19 +25,14 @@
-
+
- Missing
+ Missing
Update Status
@@ -52,87 +43,77 @@
-
diff --git a/src/renderer/components/assignments/AssignmentStatusIndicator.vue b/src/renderer/components/assignments/AssignmentStatusIndicator.vue
new file mode 100644
index 0000000..757e753
--- /dev/null
+++ b/src/renderer/components/assignments/AssignmentStatusIndicator.vue
@@ -0,0 +1,79 @@
+
+
+ {{iconForStatus}}
+ {{nameForStatus}}
+
+
+
+
diff --git a/src/renderer/components/assignments/AssignmentsList.vue b/src/renderer/components/assignments/AssignmentsList.vue
new file mode 100644
index 0000000..ebf47a1
--- /dev/null
+++ b/src/renderer/components/assignments/AssignmentsList.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/InvocationDialog.vue b/src/renderer/components/assignments/InvocationDialog.vue
index 12665e4..19773ba 100644
--- a/src/renderer/components/assignments/InvocationDialog.vue
+++ b/src/renderer/components/assignments/InvocationDialog.vue
@@ -25,10 +25,10 @@
/>
-
-
@@ -103,7 +103,7 @@ export default class InvocationDialog extends DialogComponent<
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -123,12 +123,12 @@ export default class InvocationDialog extends DialogComponent<
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.schedule.validate()) {
- this.$refs.dialog.setActiveTab("schedule");
+ this.$refs.dialog.setActiveTab(1);
return;
}
diff --git a/src/renderer/components/assignments/LocationCreateDialog.vue b/src/renderer/components/assignments/LocationCreateDialog.vue
deleted file mode 100644
index 041fb1f..0000000
--- a/src/renderer/components/assignments/LocationCreateDialog.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
- Location Details
- Metadata
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/renderer/components/assignments/MeasurementsCreateDialog.vue b/src/renderer/components/assignments/MeasurementsCreateDialog.vue
deleted file mode 100644
index 1e0a661..0000000
--- a/src/renderer/components/assignments/MeasurementsCreateDialog.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
- Measurement Details
- Metadata
-
-
-
-
-
-
-
-
diff --git a/src/renderer/components/assignments/MeasurementsPanel.vue b/src/renderer/components/assignments/MeasurementsPanel.vue
deleted file mode 100644
index 0f7d24c..0000000
--- a/src/renderer/components/assignments/MeasurementsPanel.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
-
- {{ (props.item.name.length > 25) ? props.item.name.substring(0, 25) + "..." : props.item.name }}
- {{ props.item.value }}
-
-
-
-
-
- {{error}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/renderer/components/assignments/emulator/AlertCreateDialog.vue b/src/renderer/components/assignments/emulator/AlertCreateDialog.vue
new file mode 100644
index 0000000..5ab7e92
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/AlertCreateDialog.vue
@@ -0,0 +1,68 @@
+
+
+
+
+ Alert type is required.
+
+
+
+
+ Alert level is required.
+
+
+
+
+ Alert message is required.
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/emulator/AlertDialog.vue b/src/renderer/components/assignments/emulator/AlertDialog.vue
new file mode 100644
index 0000000..4a5680e
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/AlertDialog.vue
@@ -0,0 +1,108 @@
+
+
+
+ Details
+ Metadata
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/emulator/AssignmentEmulator.vue b/src/renderer/components/assignments/emulator/AssignmentEmulator.vue
new file mode 100644
index 0000000..082f3f6
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/AssignmentEmulator.vue
@@ -0,0 +1,240 @@
+
+
+
+ Emulator
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/emulator/AssignmentEmulatorMap.vue b/src/renderer/components/assignments/emulator/AssignmentEmulatorMap.vue
new file mode 100644
index 0000000..ee501fc
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/AssignmentEmulatorMap.vue
@@ -0,0 +1,147 @@
+
+
+
+
+ Latitude is required.
+
+
+
+
+ Longitude is required.
+
+
+
+
+ Elevation is required.
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/emulator/LocationDialog.vue b/src/renderer/components/assignments/emulator/LocationDialog.vue
new file mode 100644
index 0000000..0ab4cf7
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/LocationDialog.vue
@@ -0,0 +1,108 @@
+
+
+
+ Details
+ Metadata
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/emulator/MeasurementCreateDialog.vue b/src/renderer/components/assignments/emulator/MeasurementCreateDialog.vue
new file mode 100644
index 0000000..ce0d0ec
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/MeasurementCreateDialog.vue
@@ -0,0 +1,70 @@
+
+
+
+
+ Name is required.
+
+
+
+
+ Value is required.
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/emulator/MeasurementDialog.vue b/src/renderer/components/assignments/emulator/MeasurementDialog.vue
new file mode 100644
index 0000000..d7de4e4
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/MeasurementDialog.vue
@@ -0,0 +1,110 @@
+
+
+
+ Details
+ Metadata
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/batch/BatchCommandCreateDialog.vue b/src/renderer/components/batch/BatchCommandCreateDialog.vue
deleted file mode 100644
index 3ddcb64..0000000
--- a/src/renderer/components/batch/BatchCommandCreateDialog.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
+
+
+
+
+ {{ command.description }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/batch/BatchCommandDialog.vue b/src/renderer/components/batch/BatchCommandDialog.vue
deleted file mode 100644
index 8e691e6..0000000
--- a/src/renderer/components/batch/BatchCommandDialog.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
- Command Details
- Schedule
- Metadata
-
-
-
-
-
-
-
-
-
-
- {{ command.description }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/renderer/components/batch/BatchCommandScheduleFields.vue b/src/renderer/components/batch/BatchCommandScheduleFields.vue
new file mode 100644
index 0000000..21fc1c9
--- /dev/null
+++ b/src/renderer/components/batch/BatchCommandScheduleFields.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/batch/BatchOperationDetail.vue b/src/renderer/components/batch/BatchOperationDetail.vue
index d7b6a57..fe5cba5 100644
--- a/src/renderer/components/batch/BatchOperationDetail.vue
+++ b/src/renderer/components/batch/BatchOperationDetail.vue
@@ -1,95 +1,87 @@
-
-
+
+ Batch Operation Elements
+
+
+
-
-
-
-
- {{ operation.operationType }}
-
-
- {{ operation.processingStatus }}
-
-
- {{ formatDate(operation.createdDate) }}
-
-
- {{ formatDate(operation.processingStartedDate) }}
-
-
- {{ formatDate(operation.processingEndedDate) }}
-
-
-
+
+
+ {{ icon }}
+
+
+
+
+
+
+ {{ operation.operationType }}
+
+
+ {{ operation.processingStatus }}
+
+
+ {{ formatDate(operation.createdDate) }}
+
+
+ {{ formatDate(operation.processingStartedDate) }}
+
+
+ {{ formatDate(operation.processingEndedDate) }}
+
+
+
+
+
-
-
-
diff --git a/src/renderer/components/batch/BatchOperationElementsList.vue b/src/renderer/components/batch/BatchOperationElementsList.vue
index df19174..69dedfc 100644
--- a/src/renderer/components/batch/BatchOperationElementsList.vue
+++ b/src/renderer/components/batch/BatchOperationElementsList.vue
@@ -1,114 +1,149 @@
-
+
+
+ {{deviceIcon}}
+ {{ props.item.device.token }}
+
+ {{ props.item.processingStatus }}
+ {{ formatDate(props.item.processedDate) }}
+ {{ props.item.metadata.invocation }}
+
+
+
-
-
+ /** Build response format for list */
+ buildResponseFormat(): IBatchElementResponseFormat {
+ let format: IBatchElementResponseFormat = { includeDevice: true };
+ return format;
+ }
+
+ /** Perform search */
+ performSearch(
+ criteria: IBatchElementSearchCriteria,
+ format: IBatchElementResponseFormat
+ ): AxiosPromise {
+ return listBatchOperationElements(
+ this.$store,
+ this.operation.token,
+ criteria,
+ format
+ );
+ }
+
+ /** Called to open detail page for device */
+ onOpenDevice(device: IDevice) {
+ routeTo(this, "/devices/" + device.token);
+ }
+
+ /** Make function available to template */
+ formatDate(date: Date) {
+ return formatDate(date);
+ }
+}
+
diff --git a/src/renderer/components/batch/BatchOperationsList.vue b/src/renderer/components/batch/BatchOperationsList.vue
index 3f8791a..d1729aa 100644
--- a/src/renderer/components/batch/BatchOperationsList.vue
+++ b/src/renderer/components/batch/BatchOperationsList.vue
@@ -18,7 +18,7 @@
{{ props.item.operationType }}
{{ props.item.processingStatus }}
{{ formatDate(props.item.createdDate) }}
@@ -34,21 +34,21 @@
>{{ formatDate(props.item.processingEndedDate) }}
-
-
+ >navigate_next
Batch Operation Detail
+
+
+
+
@@ -60,6 +60,8 @@ import {
ITableHeaders
} from "sitewhere-ide-common";
+import NoResultsPanel from "../common/NoResultsPanel.vue";
+
import { NavigationIcon } from "../../libraries/constants";
import { formatDate, routeTo } from "../common/Utils";
import { AxiosPromise } from "axios";
@@ -71,13 +73,19 @@ import {
IBatchOperationSearchResults
} from "sitewhere-rest-api";
-@Component({})
+@Component({
+ components: {
+ NoResultsPanel
+ }
+})
export default class BatchOperationsList extends ListComponent<
IBatchOperation,
IBatchOperationSearchCriteria,
IBatchOperationResponseFormat,
IBatchOperationSearchResults
> {
+ addIcon: string = NavigationIcon.Add;
+
headers: ITableHeaders = [
{
align: "left",
@@ -163,10 +171,7 @@ export default class BatchOperationsList extends ListComponent<
// Format a date.
formatDate(date: Date) {
- formatDate(date);
+ return formatDate(date);
}
}
-
-
diff --git a/src/renderer/components/batch/InvocationByAssignmentCriteriaCreateDialog.vue b/src/renderer/components/batch/InvocationByAssignmentCriteriaCreateDialog.vue
new file mode 100644
index 0000000..4543e3d
--- /dev/null
+++ b/src/renderer/components/batch/InvocationByAssignmentCriteriaCreateDialog.vue
@@ -0,0 +1,68 @@
+
+
+
+ Details
+ Schedule
+ Metadata
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/batch/InvocationByDeviceCriteriaCreateDialog.vue b/src/renderer/components/batch/InvocationByDeviceCriteriaCreateDialog.vue
new file mode 100644
index 0000000..3e067f0
--- /dev/null
+++ b/src/renderer/components/batch/InvocationByDeviceCriteriaCreateDialog.vue
@@ -0,0 +1,68 @@
+
+
+
+ Details
+ Schedule
+ Metadata
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/commands/CommandCreateDialog.vue b/src/renderer/components/commands/CommandCreateDialog.vue
index 198984d..ba215f8 100644
--- a/src/renderer/components/commands/CommandCreateDialog.vue
+++ b/src/renderer/components/commands/CommandCreateDialog.vue
@@ -25,7 +25,7 @@ import {
IDeviceCommand,
IDeviceCommandCreateRequest
} from "sitewhere-rest-api";
-import { createDeviceCommand } from "../../rest/sitewhere-device-commands-api";
+import { createDeviceCommand } from "../../rest/sitewhere-device-types-api";
@Component({
components: {
@@ -55,7 +55,7 @@ export default class CommandCreateDialog extends CreateDialogComponent<
/** Implemented in subclasses to save payload */
save(payload: IDeviceCommandCreateRequest): AxiosPromise {
- return createDeviceCommand(this.$store, payload);
+ return createDeviceCommand(this.$store, this.deviceTypeToken, payload);
}
/** Implemented in subclasses for after-save */
@@ -64,6 +64,3 @@ export default class CommandCreateDialog extends CreateDialogComponent<
}
}
-
-
diff --git a/src/renderer/components/commands/CommandDeleteDialog.vue b/src/renderer/components/commands/CommandDeleteDialog.vue
index b8915b3..ea27c63 100644
--- a/src/renderer/components/commands/CommandDeleteDialog.vue
+++ b/src/renderer/components/commands/CommandDeleteDialog.vue
@@ -1,56 +1,65 @@
-
-
- Are you sure you want to delete this device command?
-
-
+
+ {{ message }}
+
-
-
+ /** Load payload */
+ prepareDelete(command: IDeviceCommand): AxiosPromise {
+ return deleteDeviceCommand(
+ this.$store,
+ this.deviceTypeToken,
+ command.token
+ );
+ }
+
+ /** Called after create button is clicked */
+ onDelete(e: any) {
+ this.delete();
+ }
+
+ /** Called after cancel button is clicked */
+ onCancel(e: any) {
+ this.cancel();
+ }
+}
+
diff --git a/src/renderer/components/commands/CommandDetailFields.vue b/src/renderer/components/commands/CommandDetailFields.vue
index ccd81ba..a9cd94d 100644
--- a/src/renderer/components/commands/CommandDetailFields.vue
+++ b/src/renderer/components/commands/CommandDetailFields.vue
@@ -120,6 +120,3 @@ export default class CommandDetailFields extends DialogSection {
}
}
-
-
diff --git a/src/renderer/components/commands/CommandDialog.vue b/src/renderer/components/commands/CommandDialog.vue
index 6f4bb48..293ec88 100644
--- a/src/renderer/components/commands/CommandDialog.vue
+++ b/src/renderer/components/commands/CommandDialog.vue
@@ -18,13 +18,13 @@
-
-
-
@@ -92,7 +92,7 @@ export default class CommandDialog extends DialogComponent {
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -112,12 +112,12 @@ export default class CommandDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.parameters.validate()) {
- this.$refs.dialog.setActiveTab("parameters");
+ this.$refs.dialog.setActiveTab(1);
return;
}
@@ -127,6 +127,3 @@ export default class CommandDialog extends DialogComponent {
}
}
-
-
diff --git a/src/renderer/components/commands/CommandNamespaceListEntry.vue b/src/renderer/components/commands/CommandNamespaceListEntry.vue
index 7340db7..8318692 100644
--- a/src/renderer/components/commands/CommandNamespaceListEntry.vue
+++ b/src/renderer/components/commands/CommandNamespaceListEntry.vue
@@ -43,6 +43,3 @@ export default class CommandNamespaceListEntry extends Vue {
}
}
-
-
diff --git a/src/renderer/components/commands/CommandPanel.vue b/src/renderer/components/commands/CommandPanel.vue
index f0ee935..faee096 100644
--- a/src/renderer/components/commands/CommandPanel.vue
+++ b/src/renderer/components/commands/CommandPanel.vue
@@ -1,11 +1,11 @@
-
+
-
-
diff --git a/src/renderer/components/commands/CommandSelector.vue b/src/renderer/components/commands/CommandSelector.vue
index 2150a87..0dfe7b5 100644
--- a/src/renderer/components/commands/CommandSelector.vue
+++ b/src/renderer/components/commands/CommandSelector.vue
@@ -81,6 +81,3 @@ export default class CommandSelector extends Vue {
}
}
-
-
diff --git a/src/renderer/components/commands/CommandUpdateDialog.vue b/src/renderer/components/commands/CommandUpdateDialog.vue
index 37b11dd..18cfb09 100644
--- a/src/renderer/components/commands/CommandUpdateDialog.vue
+++ b/src/renderer/components/commands/CommandUpdateDialog.vue
@@ -12,6 +12,7 @@
-
-
diff --git a/src/renderer/components/commands/ParametersPanel.vue b/src/renderer/components/commands/ParametersPanel.vue
index 0667ccf..5bd3626 100644
--- a/src/renderer/components/commands/ParametersPanel.vue
+++ b/src/renderer/components/commands/ParametersPanel.vue
@@ -18,7 +18,7 @@
>{{ (props.item.type.length > 25) ? props.item.type.substring(0, 25) + "..." : props.item.type }}
-
@@ -36,7 +36,7 @@
-
-
@@ -196,6 +196,3 @@ export default class ParametersPanel extends DialogSection {
}
}
-
-
diff --git a/src/renderer/components/common/ApplicationModel.ts b/src/renderer/components/common/ApplicationModel.ts
index ef74b8e..a319daa 100644
--- a/src/renderer/components/common/ApplicationModel.ts
+++ b/src/renderer/components/common/ApplicationModel.ts
@@ -5,3 +5,22 @@ export interface IAlertMessage {
message: string;
type: string;
}
+
+/**
+ * Information required to connect to a remote SiteWhere instance.
+ */
+export interface IRemoteConnection {
+ id: string;
+ name: string;
+ protocol: string;
+ host: string;
+ port: number;
+}
+
+/**
+ * Information about known remote SiteWhere instances.
+ */
+export interface IRemotes {
+ connections: IRemoteConnection[];
+ default: string;
+}
diff --git a/src/renderer/components/common/BrandingImage.vue b/src/renderer/components/common/BrandingImage.vue
new file mode 100644
index 0000000..aa57f5e
--- /dev/null
+++ b/src/renderer/components/common/BrandingImage.vue
@@ -0,0 +1,36 @@
+
+
-
-
-
-
-
+
+
-
diff --git a/src/renderer/components/common/TreeNodePanel.vue b/src/renderer/components/common/TreeNodePanel.vue
new file mode 100644
index 0000000..aac4a62
--- /dev/null
+++ b/src/renderer/components/common/TreeNodePanel.vue
@@ -0,0 +1,25 @@
+
+ response).data !== undefined;
+}
+
+/**
+ * Move an element in an array from one index to another.
+ * @param arr
+ * @param old_index
+ * @param new_index
+ */
+export function arrayMove(
+ arr: any[],
+ old_index: number,
+ new_index: number
+): any[] {
+ while (old_index < 0) {
+ old_index += arr.length;
+ }
+ while (new_index < 0) {
+ new_index += arr.length;
+ }
+ if (new_index >= arr.length) {
+ var k = new_index - arr.length;
+ while (k-- + 1) {
+ arr.push(undefined);
+ }
+ }
+ arr.splice(new_index, 0, arr.splice(old_index, 1)[0]);
+ return arr;
+}
diff --git a/src/renderer/components/common/dialog/DialogHeader.vue b/src/renderer/components/common/dialog/DialogHeader.vue
new file mode 100644
index 0000000..f2753b8
--- /dev/null
+++ b/src/renderer/components/common/dialog/DialogHeader.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/form/Chooser.vue b/src/renderer/components/common/form/Chooser.vue
new file mode 100644
index 0000000..62c2d5f
--- /dev/null
+++ b/src/renderer/components/common/form/Chooser.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/form/DialogForm.vue b/src/renderer/components/common/form/DialogForm.vue
index 0499f97..8eed358 100644
--- a/src/renderer/components/common/form/DialogForm.vue
+++ b/src/renderer/components/common/form/DialogForm.vue
@@ -1,7 +1,7 @@
-
+
-
@@ -13,6 +13,3 @@ import { Component } from "sitewhere-ide-common";
@Component({})
export default class DialogForm extends Vue {}
-
-
diff --git a/src/renderer/components/common/form/FormDateTimePicker.vue b/src/renderer/components/common/form/FormDateTimePicker.vue
new file mode 100644
index 0000000..80133be
--- /dev/null
+++ b/src/renderer/components/common/form/FormDateTimePicker.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{ props.item.name }}
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/map/MapPanel.vue b/src/renderer/components/common/map/MapPanel.vue
new file mode 100644
index 0000000..a4797dd
--- /dev/null
+++ b/src/renderer/components/common/map/MapPanel.vue
@@ -0,0 +1,90 @@
+
+
+
+
+ ![]()
+
+ {{ label }}
+
+ {{ tooltip }}
+
+
+
+
diff --git a/src/renderer/components/common/search/FilterChipComponent.ts b/src/renderer/components/common/search/FilterChipComponent.ts
new file mode 100644
index 0000000..50d2bf4
--- /dev/null
+++ b/src/renderer/components/common/search/FilterChipComponent.ts
@@ -0,0 +1,59 @@
+import Vue from "vue";
+import { Component, Prop, Watch } from "vue-property-decorator";
+
+import { handleError } from "../Utils";
+import { AxiosPromise, AxiosResponse } from "axios";
+import { IBrandedEntity } from "sitewhere-rest-api";
+
+/**
+ * Base class for filter chip components.
+ */
+@Component
+export class FilterChipComponent extends Vue {
+ @Prop() readonly token!: string;
+ @Prop() readonly tooltip!: string;
+
+ record: T | null = null;
+
+ @Watch("token", { immediate: true })
+ onSelectionUpdated(updated: string) {
+ this.refresh();
+ }
+
+ /** Return method to load record */
+ load(): AxiosPromise | T {
+ throw new Error("Must implement load() method.");
+ }
+
+ /** Type guard to differentiate between responses */
+ isAxiosResponse(
+ response: AxiosResponse | T
+ ): response is AxiosResponse {
+ return (>response).data !== undefined;
+ }
+
+ /** Refresh record content based on token */
+ async refresh() {
+ try {
+ let response: AxiosResponse | T = await this.load();
+ this.record = this.isAxiosResponse(response) ? response.data : response;
+ } catch (err) {
+ handleError(err);
+ }
+ }
+
+ /** Get image information */
+ get image() {
+ return this.record ? this.record.imageUrl : null;
+ }
+
+ /** Get label information */
+ get label() {
+ return this.record ? (this.record as any).name : null;
+ }
+
+ /** Called when close button is clicked */
+ onFilterClosed() {
+ this.$emit("closed", this.token);
+ }
+}
diff --git a/src/renderer/components/common/search/ListFilterBar.vue b/src/renderer/components/common/search/ListFilterBar.vue
new file mode 100644
index 0000000..e75183f
--- /dev/null
+++ b/src/renderer/components/common/search/ListFilterBar.vue
@@ -0,0 +1,36 @@
+
+ extends Vue {
+ @Prop() readonly tokens!: string[];
+ @Prop() readonly tooltip!: string;
+
+ record: T | null = null;
+
+ @Watch("tokens", { immediate: true })
+ onSelectionUpdated(updated: string[]) {
+ this.refresh();
+ }
+
+ /** Return method to load record */
+ load(): AxiosPromise | T {
+ throw new Error("Must implement load() method.");
+ }
+
+ /** Type guard to differentiate between responses */
+ isAxiosResponse(
+ response: AxiosResponse | T
+ ): response is AxiosResponse {
+ return (>response).data !== undefined;
+ }
+
+ /** Refresh record content based on token */
+ async refresh() {
+ try {
+ if (this.token) {
+ let response: AxiosResponse | T = await this.load();
+ this.record = this.isAxiosResponse(response) ? response.data : response;
+ } else {
+ this.record = null;
+ }
+ } catch (err) {
+ handleError(err);
+ }
+ }
+
+ /** Token which will be displayed */
+ get token(): string | null {
+ return this.tokens && this.tokens.length > 0 ? this.tokens[0] : null;
+ }
+
+ /** Get image information */
+ get image() {
+ return this.record ? this.record.imageUrl : null;
+ }
+
+ /** Get label information */
+ get label() {
+ if (this.record) {
+ let name = (this.record as any).name;
+ if (this.tokens.length === 1) {
+ return name;
+ } else if (this.tokens.length > 1) {
+ return `${name} and ${this.tokens.length - 1} more`;
+ }
+ }
+ return null;
+ }
+
+ /** Called when close button is clicked */
+ onFilterClosed() {
+ this.$emit("closed", this.tokens);
+ }
+}
diff --git a/src/renderer/components/customers/CustomerAlertEvents.vue b/src/renderer/components/customers/CustomerAlertEvents.vue
index 667550e..6096761 100644
--- a/src/renderer/components/customers/CustomerAlertEvents.vue
+++ b/src/renderer/components/customers/CustomerAlertEvents.vue
@@ -47,7 +47,7 @@ import {
} from "sitewhere-rest-api";
@Component({})
-export default class CustomerMeasurementEvents extends ListComponent<
+export default class CustomerAlertEvents extends ListComponent<
IDeviceAlert,
IDateRangeSearchCriteria,
IDeviceAlertResponseFormat,
@@ -90,6 +90,3 @@ export default class CustomerMeasurementEvents extends ListComponent<
}
}
-
-
diff --git a/src/renderer/components/customers/CustomerAssignments.vue b/src/renderer/components/customers/CustomerAssignments.vue
index 59820f5..adeaf51 100644
--- a/src/renderer/components/customers/CustomerAssignments.vue
+++ b/src/renderer/components/customers/CustomerAssignments.vue
@@ -14,6 +14,11 @@
/>
+
+
+
+
@@ -21,10 +26,11 @@
import { Component, Prop, ListComponent } from "sitewhere-ide-common";
import AssignmentListEntry from "../assignments/AssignmentListEntry.vue";
+import NoResultsPanel from "../common/NoResultsPanel.vue";
import { routeTo } from "../common/Utils";
import { AxiosPromise } from "axios";
-import { listDeviceAssignments } from "../../rest/sitewhere-device-assignments-api";
+import { searchDeviceAssignments } from "../../rest/sitewhere-device-assignments-api";
import {
IDeviceAssignment,
IDeviceAssignmentSearchCriteria,
@@ -34,10 +40,11 @@ import {
@Component({
components: {
- AssignmentListEntry
+ AssignmentListEntry,
+ NoResultsPanel
}
})
-export default class CustomerTypeCustomers extends ListComponent<
+export default class CustomerAssignments extends ListComponent<
IDeviceAssignment,
IDeviceAssignmentSearchCriteria,
IDeviceAssignmentResponseFormat,
@@ -49,7 +56,7 @@ export default class CustomerTypeCustomers extends ListComponent<
/** Build search criteria for list */
buildSearchCriteria(): IDeviceAssignmentSearchCriteria {
let criteria: IDeviceAssignmentSearchCriteria = {};
- criteria.customerToken = this.customerToken;
+ criteria.customerTokens = [this.customerToken];
return criteria;
}
@@ -68,7 +75,7 @@ export default class CustomerTypeCustomers extends ListComponent<
criteria: IDeviceAssignmentSearchCriteria,
format: IDeviceAssignmentResponseFormat
): AxiosPromise {
- return listDeviceAssignments(this.$store, criteria, format);
+ return searchDeviceAssignments(this.$store, criteria, format);
}
/** Open device assignment detail page */
@@ -77,6 +84,3 @@ export default class CustomerTypeCustomers extends ListComponent<
}
}
-
-
diff --git a/src/renderer/components/customers/CustomerChooser.vue b/src/renderer/components/customers/CustomerChooser.vue
index 58d966e..f84186a 100644
--- a/src/renderer/components/customers/CustomerChooser.vue
+++ b/src/renderer/components/customers/CustomerChooser.vue
@@ -1,110 +1,62 @@
-
- Are you sure you want to delete this customer?
-
-
+
+ {{ message }}
+
-
-
+ /** Load payload */
+ prepareDelete(customer: ICustomer): AxiosPromise {
+ return deleteCustomer(this.$store, customer.token);
+ }
+
+ // Called after create button is clicked.
+ onDelete(e: any) {
+ this.delete();
+ }
+
+ // Called after cancel button is clicked.
+ onCancel(e: any) {
+ this.cancel();
+ }
+}
+
diff --git a/src/renderer/components/customers/CustomerDetail.vue b/src/renderer/components/customers/CustomerDetail.vue
index cf52e89..3bb7f1b 100644
--- a/src/renderer/components/customers/CustomerDetail.vue
+++ b/src/renderer/components/customers/CustomerDetail.vue
@@ -7,7 +7,7 @@
:record="customer"
>
- Subcustomers
@@ -17,46 +17,37 @@
Alerts
-
-
-
- Up One Level
-
-
-
- Customer token is required.
- Customer token is not valid.
-
+ :validator="$v"
+ />
-
-
diff --git a/src/renderer/components/customers/CustomerDetailHeader.vue b/src/renderer/components/customers/CustomerDetailHeader.vue
index 7b77f8f..ee60ecd 100644
--- a/src/renderer/components/customers/CustomerDetailHeader.vue
+++ b/src/renderer/components/customers/CustomerDetailHeader.vue
@@ -1,29 +1,34 @@
-
+
+
+
-
-
- {{ customer.name }}
-
-
- {{ customer.description }}
-
-
- {{ formatDate(customer.createdDate) }}
-
-
- {{ formatDate(customer.updatedDate) }}
-
+
+
+
+
+ {{ customer.name }}
+
+
+ {{ customer.description }}
+
+
+ {{ formatDate(customer.createdDate) }}
+
+
+ {{ formatDate(customer.updatedDate) }}
+
+
-
@@ -31,10 +36,13 @@
-
-
diff --git a/src/renderer/components/customers/CustomerListEntry.vue b/src/renderer/components/customers/CustomerListEntry.vue
index 9c6e965..05bc081 100644
--- a/src/renderer/components/customers/CustomerListEntry.vue
+++ b/src/renderer/components/customers/CustomerListEntry.vue
@@ -1,15 +1,13 @@
-
+
-
-
-
+
@@ -22,29 +20,31 @@
import Vue from "vue";
import { Component, Prop } from "sitewhere-ide-common";
+import BrandingImage from "../common/BrandingImage.vue";
+
import { ICustomer } from "sitewhere-rest-api";
+import { IStyle } from "../common/Style";
-@Component({})
-export default class DeviceTypeSelector extends Vue {
+@Component({
+ components: {
+ BrandingImage
+ }
+})
+export default class CustomerListEntry extends Vue {
@Prop() readonly customer!: ICustomer;
// Compute style of logo.
- get logoStyle() {
+ get logoStyle(): IStyle {
return {
- "background-color": "#fff",
- "background-image": "url(" + this.customer.imageUrl + ")",
- "background-size": "contain",
- "background-repeat": "no-repeat",
- "background-position": "50% 50%",
- border: "1px solid #eee",
height: "120px",
- width: "100px"
+ width: "120px",
+ "padding-left": "15px"
};
}
// Handle customer clicked.
onCustomerClicked() {
- this.$emit("openCustomer", this.customer);
+ this.$emit("open", this.customer);
}
}
diff --git a/src/renderer/components/customers/CustomerMultifilterChip.vue b/src/renderer/components/customers/CustomerMultifilterChip.vue
new file mode 100644
index 0000000..374325e
--- /dev/null
+++ b/src/renderer/components/customers/CustomerMultifilterChip.vue
@@ -0,0 +1,38 @@
+
+
+
-
-
-
diff --git a/src/renderer/components/customers/CustomerSubcustomers.vue b/src/renderer/components/customers/CustomerSubcustomers.vue
index 483ed54..6cb2acd 100644
--- a/src/renderer/components/customers/CustomerSubcustomers.vue
+++ b/src/renderer/components/customers/CustomerSubcustomers.vue
@@ -7,11 +7,20 @@
>
-
+
+
+
+
-
@@ -21,7 +30,9 @@ import { Component, Prop, ListComponent } from "sitewhere-ide-common";
import CustomerListEntry from "./CustomerListEntry.vue";
import CustomerCreateDialog from "./CustomerCreateDialog.vue";
+import NoResultsPanel from "../common/NoResultsPanel.vue";
+import { NavigationIcon } from "../../libraries/constants";
import { routeTo } from "../common/Utils";
import { AxiosPromise } from "axios";
import { listCustomers } from "../../rest/sitewhere-customers-api";
@@ -35,7 +46,8 @@ import {
@Component({
components: {
CustomerListEntry,
- CustomerCreateDialog
+ CustomerCreateDialog,
+ NoResultsPanel
}
})
export default class CustomerSubcustomers extends ListComponent<
@@ -47,6 +59,8 @@ export default class CustomerSubcustomers extends ListComponent<
@Prop() readonly tabkey!: string;
@Prop() readonly customer!: ICustomer;
+ custIcon: string = NavigationIcon.Customer;
+
/** Build search criteria for list */
buildSearchCriteria(): ICustomerSearchCriteria {
let criteria: ICustomerSearchCriteria = {};
@@ -77,6 +91,3 @@ export default class CustomerSubcustomers extends ListComponent<
}
}
-
-
diff --git a/src/renderer/components/customers/CustomersList.vue b/src/renderer/components/customers/CustomersList.vue
index 969237a..268cd0f 100644
--- a/src/renderer/components/customers/CustomersList.vue
+++ b/src/renderer/components/customers/CustomersList.vue
@@ -9,14 +9,23 @@
>
-
+
+
+
+
-
@@ -27,6 +36,7 @@ import { Component, ListComponent, Refs } from "sitewhere-ide-common";
import CustomerListEntry from "./CustomerListEntry.vue";
import CustomerCreateDialog from "./CustomerCreateDialog.vue";
import AddButton from "../common/navbuttons/AddButton.vue";
+import NoResultsPanel from "../common/NoResultsPanel.vue";
import { NavigationIcon } from "../../libraries/constants";
import { routeTo } from "../common/Utils";
@@ -43,7 +53,8 @@ import {
components: {
CustomerListEntry,
CustomerCreateDialog,
- AddButton
+ AddButton,
+ NoResultsPanel
}
})
export default class CustomersList extends ListComponent<
@@ -56,6 +67,8 @@ export default class CustomersList extends ListComponent<
add: CustomerCreateDialog;
}>;
+ addIcon: string = NavigationIcon.Add;
+
/** Get page icon */
get icon(): NavigationIcon {
return NavigationIcon.Customer;
diff --git a/src/renderer/components/customertypes/CustomerTypeContentFields.vue b/src/renderer/components/customertypes/CustomerTypeContentFields.vue
new file mode 100644
index 0000000..1f400a8
--- /dev/null
+++ b/src/renderer/components/customertypes/CustomerTypeContentFields.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/customertypes/CustomerTypeCreateDialog.vue b/src/renderer/components/customertypes/CustomerTypeCreateDialog.vue
index f62e85a..84960f6 100644
--- a/src/renderer/components/customertypes/CustomerTypeCreateDialog.vue
+++ b/src/renderer/components/customertypes/CustomerTypeCreateDialog.vue
@@ -58,6 +58,3 @@ export default class CustomerTypeCreateDialog extends CreateDialogComponent<
}
}
-
-
diff --git a/src/renderer/components/customertypes/CustomerTypeCustomers.vue b/src/renderer/components/customertypes/CustomerTypeCustomers.vue
index 0a3f315..7a39821 100644
--- a/src/renderer/components/customertypes/CustomerTypeCustomers.vue
+++ b/src/renderer/components/customertypes/CustomerTypeCustomers.vue
@@ -9,9 +9,14 @@
>
-
+
+
+
+
@@ -19,8 +24,10 @@
import { Component, Prop, ListComponent } from "sitewhere-ide-common";
import CustomerListEntry from "../customers/CustomerListEntry.vue";
+import NoResultsPanel from "../common/NoResultsPanel.vue";
import { AxiosPromise } from "axios";
+import { routeTo } from "../common/Utils";
import { listCustomers } from "../../rest/sitewhere-customers-api";
import {
ICustomer,
@@ -31,7 +38,8 @@ import {
@Component({
components: {
- CustomerListEntry
+ CustomerListEntry,
+ NoResultsPanel
}
})
export default class CustomerTypeCustomers extends ListComponent<
@@ -64,8 +72,10 @@ export default class CustomerTypeCustomers extends ListComponent<
): AxiosPromise {
return listCustomers(this.$store, criteria, format);
}
+
+ /** Called to open a customer */
+ onOpenCustomer(customer: ICustomer) {
+ routeTo(this, "/customers/" + customer.token);
+ }
}
-
-
diff --git a/src/renderer/components/customertypes/CustomerTypeDeleteDialog.vue b/src/renderer/components/customertypes/CustomerTypeDeleteDialog.vue
index 6cc72ec..13bb393 100644
--- a/src/renderer/components/customertypes/CustomerTypeDeleteDialog.vue
+++ b/src/renderer/components/customertypes/CustomerTypeDeleteDialog.vue
@@ -1,56 +1,56 @@
-
-
- Are you sure you want to delete this customer type?
-
-
+
+ {{ message }}
+
-
-
+ // Called after create button is clicked.
+ onDelete(e: any) {
+ this.delete();
+ }
+
+ // Called after cancel button is clicked.
+ onCancel(e: any) {
+ this.cancel();
+ }
+}
+
diff --git a/src/renderer/components/customertypes/CustomerTypeDetail.vue b/src/renderer/components/customertypes/CustomerTypeDetail.vue
index 90528d9..b52caa3 100644
--- a/src/renderer/components/customertypes/CustomerTypeDetail.vue
+++ b/src/renderer/components/customertypes/CustomerTypeDetail.vue
@@ -17,7 +17,7 @@
Customers of Type
- {
return this.customerType ? this.customerType.name : "";
}
+ /** Called when component is reused */
+ beforeRouteUpdate(to: Route, from: Route, next: any) {
+ this.display(to.params.token);
+ next();
+ }
+
/** Load record */
loadRecord(token: string): AxiosPromise {
let format: ICustomerTypeResponseFormat = {};
@@ -134,6 +137,3 @@ export default class CustomerTypeDetail extends DetailComponent {
}
}
-
-
diff --git a/src/renderer/components/customertypes/CustomerTypeDetailFields.vue b/src/renderer/components/customertypes/CustomerTypeDetailFields.vue
index 931dde1..683a608 100644
--- a/src/renderer/components/customertypes/CustomerTypeDetailFields.vue
+++ b/src/renderer/components/customertypes/CustomerTypeDetailFields.vue
@@ -1,16 +1,13 @@
-
- Token is required.
- Token is not valid.
-
+ :validator="$v"
+ />
-
-
diff --git a/src/renderer/components/customertypes/CustomerTypeDetailHeader.vue b/src/renderer/components/customertypes/CustomerTypeDetailHeader.vue
index 262126b..6bc2000 100644
--- a/src/renderer/components/customertypes/CustomerTypeDetailHeader.vue
+++ b/src/renderer/components/customertypes/CustomerTypeDetailHeader.vue
@@ -1,24 +1,29 @@
+
+
-
-
- {{ customerType.name }}
-
-
- {{ customerType.description }}
-
-
- {{ formatDate(customerType.createdDate) }}
-
-
- {{ formatDate(customerType.updatedDate) }}
-
+
+
+
+
+ {{ customerType.name }}
+
+
+ {{ customerType.description }}
+
+
+ {{ formatDate(customerType.createdDate) }}
+
+
+ {{ formatDate(customerType.updatedDate) }}
+
+
-
@@ -26,10 +31,13 @@
-
-
diff --git a/src/renderer/components/customertypes/CustomerTypeDialog.vue b/src/renderer/components/customertypes/CustomerTypeDialog.vue
index e73ef4a..a5c8b3a 100644
--- a/src/renderer/components/customertypes/CustomerTypeDialog.vue
+++ b/src/renderer/components/customertypes/CustomerTypeDialog.vue
@@ -19,16 +19,16 @@
-
-
-
-
@@ -45,14 +45,14 @@ import {
import { NavigationIcon } from "../../libraries/constants";
import CustomerTypeDetailFields from "./CustomerTypeDetailFields.vue";
-import CustomerTypesMultiselect from "./CustomerTypesMultiselect.vue";
+import CustomerTypeContentFields from "./CustomerTypeContentFields.vue";
import BrandingPanel from "../common/BrandingPanel.vue";
import { ICustomerType } from "sitewhere-rest-api";
@Component({
components: {
CustomerTypeDetailFields,
- CustomerTypesMultiselect,
+ CustomerTypeContentFields,
BrandingPanel
}
})
@@ -60,8 +60,9 @@ export default class CustomerTypeDialog extends DialogComponent {
// References.
$refs!: Refs<{
dialog: ITabbedComponent;
- details: DialogSection;
- branding: DialogSection;
+ details: CustomerTypeDetailFields;
+ content: CustomerTypeContentFields;
+ branding: BrandingPanel;
metadata: DialogSection;
}>;
@@ -76,6 +77,7 @@ export default class CustomerTypeDialog extends DialogComponent {
Object.assign(
payload,
this.$refs.details.save(),
+ this.$refs.content.save(),
this.$refs.branding.save(),
this.$refs.metadata.save()
);
@@ -87,13 +89,16 @@ export default class CustomerTypeDialog extends DialogComponent {
if (this.$refs.details) {
this.$refs.details.reset();
}
+ if (this.$refs.content) {
+ this.$refs.content.reset();
+ }
if (this.$refs.branding) {
this.$refs.branding.reset();
}
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -102,6 +107,9 @@ export default class CustomerTypeDialog extends DialogComponent {
if (this.$refs.details) {
this.$refs.details.load(payload);
}
+ if (this.$refs.content) {
+ this.$refs.content.load(payload);
+ }
if (this.$refs.branding) {
this.$refs.branding.load(payload);
}
@@ -113,21 +121,22 @@ export default class CustomerTypeDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
+ return;
+ }
+
+ if (!this.$refs.content.validate()) {
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.branding.validate()) {
- this.$refs.dialog.setActiveTab("branding");
+ this.$refs.dialog.setActiveTab(1);
return;
}
var payload = this.generatePayload();
- console.log("Before payload emit:", this);
this.$emit("payload", payload);
}
}
-
-
diff --git a/src/renderer/components/customertypes/CustomerTypeListEntry.vue b/src/renderer/components/customertypes/CustomerTypeListEntry.vue
index 8741efe..6e48198 100644
--- a/src/renderer/components/customertypes/CustomerTypeListEntry.vue
+++ b/src/renderer/components/customertypes/CustomerTypeListEntry.vue
@@ -3,13 +3,11 @@
-
-
+
@@ -22,15 +20,30 @@
import Vue from "vue";
import { Component, Prop } from "sitewhere-ide-common";
+import BrandingImage from "../common/BrandingImage.vue";
+
+import { IStyle } from "../common/Style";
import { ICustomerType } from "sitewhere-rest-api";
-@Component({})
-export default class DeviceTypeSelector extends Vue {
+@Component({
+ components: {
+ BrandingImage
+ }
+})
+export default class CustomerTypeListEntry extends Vue {
@Prop() readonly customerType!: ICustomerType;
+ // Compute style of logo.
+ get logoStyle(): IStyle {
+ return {
+ height: "80px",
+ width: "80px"
+ };
+ }
+
// Handle customer type clicked.
onCustomerTypeClicked() {
- this.$emit("openCustomerType", this.customerType);
+ this.$emit("open", this.customerType);
}
}
diff --git a/src/renderer/components/customertypes/CustomerTypeMultiselect.vue b/src/renderer/components/customertypes/CustomerTypeMultiselect.vue
new file mode 100644
index 0000000..2a00d25
--- /dev/null
+++ b/src/renderer/components/customertypes/CustomerTypeMultiselect.vue
@@ -0,0 +1,56 @@
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- No customer types available.
-
-
-
-
-
-
diff --git a/src/renderer/components/devicegroups/DeviceGroupChooser.vue b/src/renderer/components/devicegroups/DeviceGroupChooser.vue
index 030a336..7d0872d 100644
--- a/src/renderer/components/devicegroups/DeviceGroupChooser.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupChooser.vue
@@ -1,101 +1,60 @@
- Group Elements
- {
// References.
$refs!: Refs<{
+ list: DeviceGroupElements;
+ create: DeviceGroupElementCreateDialog;
edit: DeviceGroupUpdateDialog;
delete: DeviceGroupDeleteDialog;
}>;
@@ -130,17 +131,14 @@ export default class DeviceGroupDetail extends DetailComponent {
routeTo(this, "/groups");
}
- // Called when 'add element' button is clicked.
- onAddElement() {
- (this.$refs["create"] as any).onOpenDialog();
+ /** Called when 'add element' button is clicked */
+ onAddGroupElement() {
+ this.$refs.create.open();
}
- // Called when an element is added.
+ /** Called when an element is added */
onElementAdded() {
- (this.$refs["list"] as any).refresh();
+ this.$refs.list.refresh();
}
}
-
-
diff --git a/src/renderer/components/devicegroups/DeviceGroupDetailFields.vue b/src/renderer/components/devicegroups/DeviceGroupDetailFields.vue
index 2dd8137..ad6a927 100644
--- a/src/renderer/components/devicegroups/DeviceGroupDetailFields.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupDetailFields.vue
@@ -1,16 +1,13 @@
-
- Device Type token is required.
- Device Type token is not valid.
-
+ :validator="$v"
+ />
-
@@ -44,6 +41,7 @@
import { Component, DialogSection } from "sitewhere-ide-common";
import DialogForm from "../common/form/DialogForm.vue";
+import FormToken from "../common/form/FormToken.vue";
import FormText from "../common/form/FormText.vue";
import FormTextArea from "../common/form/FormTextArea.vue";
import RolesField from "./RolesField.vue";
@@ -56,6 +54,7 @@ const validToken = helpers.regex("validToken", /^[a-zA-Z0-9-_]+$/);
@Component({
components: {
DialogForm,
+ FormToken,
FormText,
FormTextArea,
RolesField
diff --git a/src/renderer/components/devicegroups/DeviceGroupDetailHeader.vue b/src/renderer/components/devicegroups/DeviceGroupDetailHeader.vue
index 761bed9..87cffb7 100644
--- a/src/renderer/components/devicegroups/DeviceGroupDetailHeader.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupDetailHeader.vue
@@ -1,24 +1,29 @@
-
+
+
+
-
-
- {{ deviceGroup.name }}
-
-
- {{ deviceGroup.description }}
-
-
- {{ deviceGroup.imageUrl }}
-
-
- {{ rolesList }}
-
+
+
+
+
+ {{ deviceGroup.name }}
+
+
+ {{ deviceGroup.description }}
+
+
+ {{ deviceGroup.imageUrl }}
+
+
+ {{ rolesList }}
+
+
-
@@ -26,14 +31,19 @@
-
-
diff --git a/src/renderer/components/devicegroups/DeviceGroupDialog.vue b/src/renderer/components/devicegroups/DeviceGroupDialog.vue
index a1e89ff..283ab0e 100644
--- a/src/renderer/components/devicegroups/DeviceGroupDialog.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupDialog.vue
@@ -18,13 +18,13 @@
-
-
-
@@ -87,7 +87,7 @@ export default class DeviceGroupDialog extends DialogComponent {
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -107,12 +107,12 @@ export default class DeviceGroupDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.branding.validate()) {
- this.$refs.dialog.setActiveTab("branding");
+ this.$refs.dialog.setActiveTab(1);
return;
}
@@ -122,6 +122,3 @@ export default class DeviceGroupDialog extends DialogComponent {
}
}
-
-
diff --git a/src/renderer/components/devicegroups/DeviceGroupElementCreateDialog.vue b/src/renderer/components/devicegroups/DeviceGroupElementCreateDialog.vue
index b8654f8..b3d0aa5 100644
--- a/src/renderer/components/devicegroups/DeviceGroupElementCreateDialog.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupElementCreateDialog.vue
@@ -1,60 +1,68 @@
- ;
+ }>;
-
+ /** Get wrapped dialog */
+ getDialog(): DialogComponent {
+ return this.$refs.dialog;
+ }
+
+ /** Called on payload commit */
+ onCommit(payload: IDeviceGroupElementCreateRequest): void {
+ this.commit(payload);
+ }
+
+ /** Implemented in subclasses to save payload */
+ save(
+ payload: IDeviceGroupElementCreateRequest
+ ): AxiosPromise {
+ let elements: IDeviceGroupElementCreateRequest[] = [];
+ elements.push(payload);
+ return createDeviceGroupElements(this.$store, this.token, elements);
+ }
+
+ /** Implemented in subclasses for after-save */
+ afterSave(payload: IDeviceGroupElement): void {}
+}
+
diff --git a/src/renderer/components/devicegroups/DeviceGroupElementDeleteDialog.vue b/src/renderer/components/devicegroups/DeviceGroupElementDeleteDialog.vue
index 5e39b50..693bf83 100644
--- a/src/renderer/components/devicegroups/DeviceGroupElementDeleteDialog.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupElementDeleteDialog.vue
@@ -1,53 +1,76 @@
-
-
- Are you sure you want to delete this group element?
-
-
+
+ {{ message }}
+
-
-
+ /** Load payload */
+ prepareDelete(
+ item: IDeviceGroupElementSearchResults
+ ): AxiosPromise {
+ deleteDeviceGroupElement(this.$store, this.token, this.deleteId);
+ let criteria: IDeviceGroupElementSearchCriteria = {
+ deviceGroupToken: this.token
+ };
+ let format: IDeviceGroupElementResponseFormat = {};
+ return listDeviceGroupElements(this.$store, this.token, criteria, format);
+ }
+
+ // Called after create button is clicked.
+ onDelete(e: any) {
+ this.delete();
+ }
+
+ // Called after cancel button is clicked.
+ onCancel(e: any) {
+ this.cancel();
+ }
+}
+
diff --git a/src/renderer/components/devicegroups/DeviceGroupElementDetailFields.vue b/src/renderer/components/devicegroups/DeviceGroupElementDetailFields.vue
new file mode 100644
index 0000000..4f20947
--- /dev/null
+++ b/src/renderer/components/devicegroups/DeviceGroupElementDetailFields.vue
@@ -0,0 +1,102 @@
+
+
+
+
+ Element type is required.
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/devicegroups/DeviceGroupElementDialog.vue b/src/renderer/components/devicegroups/DeviceGroupElementDialog.vue
index 210dbaa..d061bf2 100644
--- a/src/renderer/components/devicegroups/DeviceGroupElementDialog.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupElementDialog.vue
@@ -1,165 +1,108 @@
-
-
-
- Element details
- Roles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Details
+ Roles
+
+
+
+
+
+
+
+
-
-
-
diff --git a/src/renderer/components/devicegroups/DeviceGroupElementRoleFields.vue b/src/renderer/components/devicegroups/DeviceGroupElementRoleFields.vue
new file mode 100644
index 0000000..06ac5a0
--- /dev/null
+++ b/src/renderer/components/devicegroups/DeviceGroupElementRoleFields.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/devicegroups/DeviceGroupElements.vue b/src/renderer/components/devicegroups/DeviceGroupElements.vue
index c33415f..4b2bb7b 100644
--- a/src/renderer/components/devicegroups/DeviceGroupElements.vue
+++ b/src/renderer/components/devicegroups/DeviceGroupElements.vue
@@ -38,9 +38,9 @@
+
+
- {
}
}
-
-
diff --git a/src/renderer/components/devices/DeviceDetail.vue b/src/renderer/components/devices/DeviceDetail.vue
index 4e98ee0..08a5127 100644
--- a/src/renderer/components/devices/DeviceDetail.vue
+++ b/src/renderer/components/devices/DeviceDetail.vue
@@ -21,7 +21,7 @@
-
- Device token is required.
- Device token is not valid.
-
+ :validator="$v"
+ />
@@ -33,6 +30,7 @@
import { Component, DialogSection } from "sitewhere-ide-common";
import DialogForm from "../common/form/DialogForm.vue";
+import FormToken from "../common/form/FormToken.vue";
import FormText from "../common/form/FormText.vue";
import FormTextArea from "../common/form/FormTextArea.vue";
import DeviceTypeSelector from "../devicetypes/DeviceTypeSelector.vue";
@@ -45,6 +43,7 @@ const validToken = helpers.regex("validToken", /^[a-zA-Z0-9-_]+$/);
@Component({
components: {
DialogForm,
+ FormToken,
FormText,
FormTextArea,
DeviceTypeSelector
@@ -95,6 +94,3 @@ export default class DeviceDetailFields extends DialogSection {
}
}
-
-
diff --git a/src/renderer/components/devices/DeviceDetailHeader.vue b/src/renderer/components/devices/DeviceDetailHeader.vue
index abe7b90..5e52c9b 100644
--- a/src/renderer/components/devices/DeviceDetailHeader.vue
+++ b/src/renderer/components/devices/DeviceDetailHeader.vue
@@ -1,29 +1,17 @@
-
+
+
+
-
- Device is not assigned
-
{{ device.comments }}
@@ -35,7 +23,7 @@
-
@@ -43,11 +31,16 @@
+
+
diff --git a/src/renderer/components/devices/DeviceDialog.vue b/src/renderer/components/devices/DeviceDialog.vue
index 32a95c1..538ec8e 100644
--- a/src/renderer/components/devices/DeviceDialog.vue
+++ b/src/renderer/components/devices/DeviceDialog.vue
@@ -17,10 +17,10 @@
-
-
@@ -76,7 +76,7 @@ export default class DeviceDialog extends DialogComponent {
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -93,7 +93,7 @@ export default class DeviceDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
@@ -102,6 +102,3 @@ export default class DeviceDialog extends DialogComponent {
}
}
-
-
diff --git a/src/renderer/components/devices/DeviceListAreaFilter.vue b/src/renderer/components/devices/DeviceListAreaFilter.vue
new file mode 100644
index 0000000..dca2e5b
--- /dev/null
+++ b/src/renderer/components/devices/DeviceListAreaFilter.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/devices/DeviceListEntry.vue b/src/renderer/components/devices/DeviceListEntry.vue
index 4cd70f0..5e534af 100644
--- a/src/renderer/components/devices/DeviceListEntry.vue
+++ b/src/renderer/components/devices/DeviceListEntry.vue
@@ -1,24 +1,36 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -26,103 +38,58 @@
import { Component, Prop } from "sitewhere-ide-common";
import Vue from "vue";
-import { IStyle, styleForAssignmentStatus } from "../common/Style";
-import { IDevice, IDeviceAssignment } from "sitewhere-rest-api";
+import BrandingImage from "../common/BrandingImage.vue";
-@Component({})
+import { IStyle } from "../common/Style";
+import { IDevice, IDeviceType, IDeviceAssignment } from "sitewhere-rest-api";
+
+@Component({
+ components: {
+ BrandingImage
+ }
+})
export default class DeviceListEntry extends Vue {
@Prop() readonly device!: IDevice;
- get assignment(): IDeviceAssignment {
- return (this.device as any).assignment;
+ get deviceType(): IDeviceType {
+ return (this.device as any).deviceType;
}
- get styleForStatus(): IStyle {
- return styleForAssignmentStatus(this.assignment);
+ get assignments(): IDeviceAssignment[] {
+ return (this.device as any).activeDeviceAssignments;
}
- get hasAssignedAsset() {
- return this.assignment && this.assignment.assetId;
+ get hasAssignments() {
+ return this.assignments && this.assignments.length > 0;
}
- styleForDevice() {
- let style: IStyle = {};
- style["background-color"] = this.assignment ? "#fff" : "#f0f0ff";
- style["border"] = "1px solid " + (this.assignment ? "#ddd" : "#dde");
- return style;
+ get firstAssignment(): IDeviceAssignment | null {
+ return this.hasAssignments ? this.assignments[0] : null;
}
- // Create background image style.
- backgroundImageStyle(image: string): IStyle {
+ // Compute style of logo.
+ get logoStyle(): IStyle {
return {
- "background-image": "url(" + image + ")",
- "background-size": "contain",
- "background-repeat": "no-repeat",
- "background-position": "50% 50%"
+ height: "110px",
+ width: "110px"
};
}
// Called when a device is clicked.
onOpenDevice() {
- this.$emit("deviceOpened", this.device);
+ this.$emit("open", this.device);
}
// Open device assignment dialog.
onAssignDevice() {
- this.$emit("assignDevice", this.device);
+ this.$emit("assign", this.device);
}
}
diff --git a/src/renderer/components/devices/DeviceListFilterBar.vue b/src/renderer/components/devices/DeviceListFilterBar.vue
index 84eb36b..bd68bb0 100644
--- a/src/renderer/components/devices/DeviceListFilterBar.vue
+++ b/src/renderer/components/devices/DeviceListFilterBar.vue
@@ -1,116 +1,61 @@
-
-
-
-
-
-
- ![areaFilter.name]()
-
- {{ areaFilter.name }}
-
- Only include devices from this area
-
-
-
-
- ![deviceTypeFilter.name]()
-
- {{ deviceTypeFilter.name }}
-
- Only include devices from this device type
-
-
-
-
- view_module
-
- {{ deviceGroupFilter.name }}
-
- Only include devices from this device group
-
-
-
-
+
+
-
-
+ /** Handle device type filter cleared */
+ onDeviceTypeFilterCleared() {
+ this.$emit("clear");
+ }
+
+ /** Clear criteria */
+ onClearCriteria() {
+ this.$emit("clear");
+ }
+}
+
diff --git a/src/renderer/components/devices/DeviceListFilterDeviceTypeFields.vue b/src/renderer/components/devices/DeviceListFilterDeviceTypeFields.vue
new file mode 100644
index 0000000..4f10d2b
--- /dev/null
+++ b/src/renderer/components/devices/DeviceListFilterDeviceTypeFields.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/devices/DeviceListFilterDialog.vue b/src/renderer/components/devices/DeviceListFilterDialog.vue
index d9fc82f..c387bfa 100644
--- a/src/renderer/components/devices/DeviceListFilterDialog.vue
+++ b/src/renderer/components/devices/DeviceListFilterDialog.vue
@@ -1,253 +1,97 @@
-
-
- Area
- Device Type
- Device Group
- Created Date
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Include all devices in search without consideration
- of created date.
-
- Include only devices created within the last hour.
- Include only devices created within the last day.
- Include only devices created within the last week.
-
-
-
-
-
-
-
-
-
-
-
+ Choose criteria for filtering which devices are shown
+
+ Device Type
+
+
+
+
+
-
-
-
diff --git a/src/renderer/components/devices/DevicesList.vue b/src/renderer/components/devices/DevicesList.vue
index da514ee..b1c179b 100644
--- a/src/renderer/components/devices/DevicesList.vue
+++ b/src/renderer/components/devices/DevicesList.vue
@@ -10,29 +10,35 @@
>
-
-
+
-
-
- Composition
-
-
- Token is required.
- Token is not valid.
-
+ :validator="$v"
+ />
-
+
+
+
-
-
- {{ deviceType.name }}
-
-
- {{ deviceType.description }}
-
-
- {{ deviceType.imageUrl }}
-
-
- {{ deviceType.containerPolicy }}
-
-
- {{ formatDate(deviceType.createdDate) }}
-
-
- {{ formatDate(deviceType.updatedDate) }}
-
+
+
+
+
+ {{ deviceType.name }}
+
+
+ {{ deviceType.description }}
+
+
+ {{ deviceType.imageUrl }}
+
+
+ {{ deviceType.containerPolicy }}
+
+
+ {{ formatDate(deviceType.createdDate) }}
+
+
+ {{ formatDate(deviceType.updatedDate) }}
+
+
-
@@ -32,24 +37,24 @@
-
-
diff --git a/src/renderer/components/devicetypes/DeviceTypeFilterChip.vue b/src/renderer/components/devicetypes/DeviceTypeFilterChip.vue
new file mode 100644
index 0000000..af824e6
--- /dev/null
+++ b/src/renderer/components/devicetypes/DeviceTypeFilterChip.vue
@@ -0,0 +1,37 @@
+
+
-
-
-
+
+
+
+
+
+
+
+
+
@@ -12,21 +20,24 @@
import { Component, Prop } from "sitewhere-ide-common";
import Vue from "vue";
+import BrandingImage from "../common/BrandingImage.vue";
+
+import { IStyle } from "../common/Style";
import { IDeviceType } from "sitewhere-rest-api";
-@Component({})
+@Component({
+ components: {
+ BrandingImage
+ }
+})
export default class DeviceTypeListEntry extends Vue {
@Prop() readonly deviceType!: IDeviceType;
// Compute style of logo.
- get logoStyle() {
+ get logoStyle(): IStyle {
return {
- "background-color": "#fff",
- "background-image": "url(" + this.deviceType.imageUrl + ")",
- "background-size": "contain",
- "background-repeat": "no-repeat",
- "background-position": "50% 50%",
- border: "1px solid #eee"
+ height: "110px",
+ width: "110px"
};
}
@@ -38,37 +49,8 @@ export default class DeviceTypeListEntry extends Vue {
diff --git a/src/renderer/components/devicetypes/DeviceTypeMultifilterChip.vue b/src/renderer/components/devicetypes/DeviceTypeMultifilterChip.vue
new file mode 100644
index 0000000..685a1c0
--- /dev/null
+++ b/src/renderer/components/devicetypes/DeviceTypeMultifilterChip.vue
@@ -0,0 +1,38 @@
+
+
-
@@ -17,6 +27,7 @@ import Vue from "vue";
import { Component, Prop } from "sitewhere-ide-common";
import FormSelect from "../common/form/FormSelect.vue";
+import FormSelectCondensed from "../common/form/FormSelectCondensed.vue";
import { handleError } from "../common/Utils";
import { AxiosResponse } from "axios";
@@ -30,13 +41,15 @@ import {
@Component({
components: {
- FormSelect
+ FormSelect,
+ FormSelectCondensed
}
})
export default class DeviceTypeSelector extends Vue {
@Prop(String) readonly value!: string;
@Prop(String) readonly title!: string;
@Prop(String) readonly label!: string;
+ @Prop({ default: false }) readonly dense!: boolean;
deviceTypes: IDeviceType[] = [];
@@ -65,6 +78,3 @@ export default class DeviceTypeSelector extends Vue {
}
}
-
-
diff --git a/src/renderer/components/devicetypes/DeviceTypeStatuses.vue b/src/renderer/components/devicetypes/DeviceTypeStatuses.vue
index 58f65d0..f575a0b 100644
--- a/src/renderer/components/devicetypes/DeviceTypeStatuses.vue
+++ b/src/renderer/components/devicetypes/DeviceTypeStatuses.vue
@@ -19,7 +19,16 @@
-
-
+
+
+
+
-
- {
if (this.$refs.details) {
this.$refs.details.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -78,7 +77,7 @@ export default class ScriptsDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
diff --git a/src/renderer/components/microservice/ScriptContentFields.vue b/src/renderer/components/microservice/ScriptContentFields.vue
index 1c70c00..dcfb620 100644
--- a/src/renderer/components/microservice/ScriptContentFields.vue
+++ b/src/renderer/components/microservice/ScriptContentFields.vue
@@ -65,7 +65,6 @@ export default class ScriptContentFields extends DialogSection {
/** Load list of script templates */
async loadTemplates() {
- var component = this;
let response: AxiosResponse = await listScriptTemplates(
this.$store,
this.identifier
diff --git a/src/renderer/components/microservice/ScriptCreateCloneDialog.vue b/src/renderer/components/microservice/ScriptCreateCloneDialog.vue
index 48ed627..588e47b 100644
--- a/src/renderer/components/microservice/ScriptCreateCloneDialog.vue
+++ b/src/renderer/components/microservice/ScriptCreateCloneDialog.vue
@@ -22,13 +22,7 @@ import {
import ScriptCloneDialog from "./ScriptCloneDialog.vue";
-import { AxiosPromise } from "axios";
import { IScriptVersion } from "sitewhere-rest-api";
-import { createDevice } from "../../rest/sitewhere-devices-api";
-import {
- createGlobalScript,
- createTenantScript
-} from "../../rest/sitewhere-scripting-api";
@Component({
components: {
diff --git a/src/renderer/components/microservice/ScriptsContentEditor.vue b/src/renderer/components/microservice/ScriptsContentEditor.vue
index ea142f8..fe58134 100644
--- a/src/renderer/components/microservice/ScriptsContentEditor.vue
+++ b/src/renderer/components/microservice/ScriptsContentEditor.vue
@@ -18,7 +18,7 @@
-
-
diff --git a/src/renderer/components/schedules/ScheduleCreateDialog.vue b/src/renderer/components/schedules/ScheduleCreateDialog.vue
index 926db45..eb94a50 100644
--- a/src/renderer/components/schedules/ScheduleCreateDialog.vue
+++ b/src/renderer/components/schedules/ScheduleCreateDialog.vue
@@ -2,7 +2,7 @@
;
+ }>;
+
+ /** Get wrapped dialog */
+ getDialog(): DialogComponent {
+ return this.$refs.dialog;
+ }
-
+ /** Called on payload commit */
+ onCommit(payload: IScheduleCreateRequest): void {
+ this.commit(payload);
+ }
+
+ /** Implemented in subclasses to save payload */
+ save(payload: IScheduleCreateRequest): AxiosPromise {
+ return createSchedule(this.$store, payload);
+ }
+
+ /** Implemented in subclasses for after-save */
+ afterSave(payload: ISchedule): void {}
+}
+
diff --git a/src/renderer/components/schedules/ScheduleDeleteDialog.vue b/src/renderer/components/schedules/ScheduleDeleteDialog.vue
index 42e6f6e..510fe14 100644
--- a/src/renderer/components/schedules/ScheduleDeleteDialog.vue
+++ b/src/renderer/components/schedules/ScheduleDeleteDialog.vue
@@ -3,52 +3,54 @@
ref="dialog"
title="Delete Schedule"
width="400"
- :error="error"
- @delete="onDeleteConfirmed"
+ :visible="visible"
+ @delete="onDelete"
+ @cancel="onCancel"
>
- Are you sure you want to delete this schedule?
+ {{ message }}
-
-
+ /** Called after create button is clicked */
+ onDelete(e: any) {
+ this.delete();
+ }
+
+ /** Called after cancel button is clicked */
+ onCancel(e: any) {
+ this.cancel();
+ }
+}
+
diff --git a/src/renderer/components/schedules/ScheduleDetailFields.vue b/src/renderer/components/schedules/ScheduleDetailFields.vue
new file mode 100644
index 0000000..8383b63
--- /dev/null
+++ b/src/renderer/components/schedules/ScheduleDetailFields.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+ Name is required.
+
+
+
+
+
+
+
+
+ Trigger type is required.
+
+
+
+
+ Cron expression is required.
+
+
+
+
+ Repeat interval is required.
+
+
+
+
+ Repeat count is required.
+
+
+
+
+
+
diff --git a/src/renderer/components/schedules/ScheduleDialog.vue b/src/renderer/components/schedules/ScheduleDialog.vue
index c732c13..a522997 100644
--- a/src/renderer/components/schedules/ScheduleDialog.vue
+++ b/src/renderer/components/schedules/ScheduleDialog.vue
@@ -1,281 +1,104 @@
-
-
- Schedule Details
- Metadata
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Details
+ Metadata
+
+
+
+
+
+
+
-
-
-
diff --git a/src/renderer/components/schedules/ScheduleUpdateDialog.vue b/src/renderer/components/schedules/ScheduleUpdateDialog.vue
index a255c51..ed60b5a 100644
--- a/src/renderer/components/schedules/ScheduleUpdateDialog.vue
+++ b/src/renderer/components/schedules/ScheduleUpdateDialog.vue
@@ -1,73 +1,74 @@
-
- {{ formatDate(props.item.createdDate) }}
-
-
+
+
+
+
+
+
+ {
- return createDeviceStatus(this.$store, payload);
+ return createDeviceStatus(this.$store, this.deviceTypeToken, payload);
}
/** Implemented in subclasses for after-save */
diff --git a/src/renderer/components/statuses/DeviceStatusDeleteDialog.vue b/src/renderer/components/statuses/DeviceStatusDeleteDialog.vue
index 0526ac4..abe3bcd 100644
--- a/src/renderer/components/statuses/DeviceStatusDeleteDialog.vue
+++ b/src/renderer/components/statuses/DeviceStatusDeleteDialog.vue
@@ -1,48 +1,58 @@
- Are you sure you want to delete this device status?
+ {{ message }}
-
-
+ /** Load payload */
+ prepareDelete(command: IDeviceStatus): AxiosPromise {
+ return deleteDeviceStatus(this.$store, this.deviceTypeToken, command.token);
+ }
+
+ /** Called after create button is clicked */
+ onDelete(e: any) {
+ this.delete();
+ }
+
+ /** Called after cancel button is clicked */
+ onCancel(e: any) {
+ this.cancel();
+ }
+}
+
diff --git a/src/renderer/components/statuses/DeviceStatusDialog.vue b/src/renderer/components/statuses/DeviceStatusDialog.vue
index c4cb278..53448a2 100644
--- a/src/renderer/components/statuses/DeviceStatusDialog.vue
+++ b/src/renderer/components/statuses/DeviceStatusDialog.vue
@@ -17,10 +17,10 @@
-
-
@@ -81,7 +81,7 @@ export default class DeviceStatusDialog extends DialogComponent {
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -98,7 +98,7 @@ export default class DeviceStatusDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
diff --git a/src/renderer/components/statuses/DeviceStatusListEntry.vue b/src/renderer/components/statuses/DeviceStatusListEntry.vue
index 1328c93..09f10ef 100644
--- a/src/renderer/components/statuses/DeviceStatusListEntry.vue
+++ b/src/renderer/components/statuses/DeviceStatusListEntry.vue
@@ -1,7 +1,7 @@
- {{ name }}
@@ -72,6 +72,3 @@ export default class DeviceTypeListEntry extends Vue {
}
}
-
-
diff --git a/src/renderer/components/statuses/DeviceStatusUpdateDialog.vue b/src/renderer/components/statuses/DeviceStatusUpdateDialog.vue
index 61311d3..57731b3 100644
--- a/src/renderer/components/statuses/DeviceStatusUpdateDialog.vue
+++ b/src/renderer/components/statuses/DeviceStatusUpdateDialog.vue
@@ -12,6 +12,7 @@
diff --git a/src/renderer/components/tenants/TenantAdministration.vue b/src/renderer/components/tenants/TenantAdministration.vue
index 87bcf47..013a42f 100644
--- a/src/renderer/components/tenants/TenantAdministration.vue
+++ b/src/renderer/components/tenants/TenantAdministration.vue
@@ -1,23 +1,24 @@
-
+
-
+
+
+
+ settings
+
+ Instance Settings
+
+
+
+ exit_to_app
+
+ Log Out
+
-
-
-
-
-
-
-
-
+
@@ -28,7 +29,10 @@
-
+
+
- Microservices
-
- {
// Called after tenant is edited.
onTenantEdited() {
- this.$emit("refresh");
+ this.refresh();
}
// Called to delete tenant.
diff --git a/src/renderer/components/tenants/TenantDetailFields.vue b/src/renderer/components/tenants/TenantDetailFields.vue
index 4fdf3d3..4dd4abc 100644
--- a/src/renderer/components/tenants/TenantDetailFields.vue
+++ b/src/renderer/components/tenants/TenantDetailFields.vue
@@ -7,6 +7,7 @@
title="Unique token that identifies the tenant. Should be alpahanumeric with no spaces."
label="Tenant token"
icon="info"
+ class="mr-3"
>
Tenant token is required.
Tenant token is not valid.
@@ -47,7 +48,7 @@
icon="people"
/>
-
+
Tenant template is required.
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ tenant.name }}
+
+
+ {{ formatDate(tenant.createdDate) }}
+
+
+ {{ formatDate(tenant.updatedDate) }}
+
+
+
+
+
-
+@Component({
+ components: {
+ ClipboardCopyField,
+ AuthenticatedImage
+ }
+})
+export default class TenantDetailHeader extends HeaderComponent {
+ /** Reference record as tenant */
+ get tenant(): ITenant {
+ return this.record;
+ }
+
+ /** Get token */
+ get token(): string {
+ return this.tenant ? this.tenant.token : "";
+ }
-
+ // Get URL for QR code.
+ get qrCodeUrl(): string {
+ return this.tenant ? "tenants/" + this.token + "/label/qrcode" : "";
+ }
+}
+
diff --git a/src/renderer/components/tenants/TenantDialog.vue b/src/renderer/components/tenants/TenantDialog.vue
index ddb0221..eb2e637 100644
--- a/src/renderer/components/tenants/TenantDialog.vue
+++ b/src/renderer/components/tenants/TenantDialog.vue
@@ -18,13 +18,13 @@
-
-
-
@@ -87,7 +87,7 @@ export default class TenantDialog extends DialogComponent {
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -107,12 +107,12 @@ export default class TenantDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.branding.validate()) {
- this.$refs.dialog.setActiveTab("branding");
+ this.$refs.dialog.setActiveTab(1);
return;
}
diff --git a/src/renderer/components/tenants/TenantEngineComponentsDialog.vue b/src/renderer/components/tenants/TenantEngineComponentsDialog.vue
index 0d523de..1bd65d0 100644
--- a/src/renderer/components/tenants/TenantEngineComponentsDialog.vue
+++ b/src/renderer/components/tenants/TenantEngineComponentsDialog.vue
@@ -39,7 +39,7 @@ import { NavigationIcon } from "../../libraries/constants";
import ComponentStatusIcon from "./ComponentStatusIcon.vue";
import { ITenant, ITenantEngineState } from "sitewhere-rest-api";
-import { ILifecycleComponentState } from "../../../../../sitewhere-rest-api/src";
+import { ILifecycleComponentState } from "sitewhere-rest-api";
@Component({
components: {
diff --git a/src/renderer/components/tenants/TenantListEntry.vue b/src/renderer/components/tenants/TenantListEntry.vue
index 66bdc61..17f3337 100644
--- a/src/renderer/components/tenants/TenantListEntry.vue
+++ b/src/renderer/components/tenants/TenantListEntry.vue
@@ -2,17 +2,14 @@
-
-
-
diff --git a/src/renderer/components/tenants/TenantUpdateDialog.vue b/src/renderer/components/tenants/TenantUpdateDialog.vue
index 08773f9..89ec20c 100644
--- a/src/renderer/components/tenants/TenantUpdateDialog.vue
+++ b/src/renderer/components/tenants/TenantUpdateDialog.vue
@@ -2,6 +2,7 @@
@@ -17,10 +18,10 @@
-
-
-
-
@@ -87,7 +87,7 @@ export default class UserDialog extends DialogComponent {
if (this.$refs.metadata) {
this.$refs.metadata.reset();
}
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
}
// Load dialog from a given payload.
@@ -107,12 +107,12 @@ export default class UserDialog extends DialogComponent {
// Called after create button is clicked.
onCreateClicked(e: any) {
if (!this.$refs.details.validate()) {
- this.$refs.dialog.setActiveTab("details");
+ this.$refs.dialog.setActiveTab(0);
return;
}
if (!this.$refs.permissions.validate()) {
- this.$refs.dialog.setActiveTab("permissions");
+ this.$refs.dialog.setActiveTab(1);
return;
}
@@ -122,6 +122,3 @@ export default class UserDialog extends DialogComponent {
}
}
-
-
diff --git a/src/renderer/index.ts b/src/renderer/index.ts
index a6f8c48..abcf7a5 100644
--- a/src/renderer/index.ts
+++ b/src/renderer/index.ts
@@ -1,3 +1,5 @@
+import "./class-component-hooks";
+
import Vue from "vue";
import App from "./App.vue";
import store from "./store";
@@ -41,8 +43,11 @@ Vue.component("v-marker", Vue2Leaflet.Marker);
// BEGIN HACK to get around problems with Leaflet issues.
import L from "leaflet";
+import D from "leaflet-draw";
+
+console.log(D);
-delete L.Icon.Default.prototype._getIconUrl;
+delete (L.Icon.Default.prototype as any)._getIconUrl;
L.Icon.Default.mergeOptions({
iconRetinaUrl: require("leaflet/dist/images/marker-icon-2x.png"),
@@ -59,6 +64,7 @@ function customize(prototype: any) {
options.touchIcon = options.icon;
}
// END HACK.
+
require("./assets/sitewhere.css");
Vue.config.productionTip = false;
diff --git a/src/renderer/libraries/constants.ts b/src/renderer/libraries/constants.ts
index f257844..214c6f5 100644
--- a/src/renderer/libraries/constants.ts
+++ b/src/renderer/libraries/constants.ts
@@ -10,7 +10,7 @@ export enum NavigationIcon {
Global = "language",
Device = "developer_board",
DeviceType = "settings",
- DeviceAssignment = "bookmark",
+ DeviceAssignment = "link",
DeviceCommand = "call_made",
DeviceStatus = "warning",
DeviceGroup = "apps",
@@ -18,18 +18,22 @@ export enum NavigationIcon {
CustomerType = "settings",
Area = "collections",
AreaType = "settings",
- Asset = "link",
+ Asset = "devices_other",
AssetType = "settings",
BatchOperation = "view_module",
Schedule = "access_alarm",
Zone = "timeline",
+ Location = "room",
+ Alert = "warning",
+ Measurement = "ballot",
Emulator = "settings_remote",
Add = "add_circle",
Edit = "create",
Delete = "delete_forever",
Filter = "filter_list",
Up = "arrow_upward",
- Script = "description"
+ Script = "description",
+ Remotes = "router"
}
// Page sizes shown for event list pages.
diff --git a/src/renderer/rest/sitewhere-batch-operations-api.ts b/src/renderer/rest/sitewhere-batch-operations-api.ts
index cba7078..4124f24 100644
--- a/src/renderer/rest/sitewhere-batch-operations-api.ts
+++ b/src/renderer/rest/sitewhere-batch-operations-api.ts
@@ -7,9 +7,10 @@ import {
IBatchOperation,
IBatchOperationSearchCriteria,
IBatchOperationResponseFormat,
- IBatchOperationElementResponseFormat,
+ IBatchElementResponseFormat,
IBatchCommandInvocationRequest,
- IBatchCommandForCriteriaRequest,
+ IInvocationByDeviceCriteriaRequest,
+ IInvocationByAssignmentCriteriaRequest,
IBatchOperationSearchResults,
IBatchElementSearchResults,
ISearchCriteria
@@ -19,15 +20,17 @@ import {
* Get batch operation by token.
* @param store
* @param token
+ * @param format
*/
export function getBatchOperation(
store: Store,
- token: string
+ token: string,
+ format: IBatchOperationResponseFormat
): Promise> {
let axios: AxiosInstance = createCoreApiCall(store);
let api: AxiosPromise<
IBatchOperation
- > = SiteWhere.API.BatchOperations.getBatchOperation(axios, token);
+ > = SiteWhere.API.BatchOperations.getBatchOperation(axios, token, format);
return loaderWrapper(store, api);
}
@@ -64,7 +67,7 @@ export function listBatchOperationElements(
store: Store,
token: string,
criteria: ISearchCriteria,
- format: IBatchOperationElementResponseFormat
+ format: IBatchElementResponseFormat
): Promise> {
let axios: AxiosInstance = createCoreApiCall(store);
let api: AxiosPromise<
@@ -98,18 +101,37 @@ export function createBatchCommandInvocation(
}
/**
- * Create a batch operation based on criteria.
+ * Create command invocations based on device criteria.
+ * @param store
+ * @param request
+ */
+export function createInvocationsByDeviceCriteria(
+ store: Store,
+ request: IInvocationByDeviceCriteriaRequest
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IBatchOperation
+ > = SiteWhere.API.BatchOperations.createInvocationsByDeviceCriteria(
+ axios,
+ request
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Create command invocations based on assignment criteria.
* @param store
* @param request
*/
-export function createBatchCommandForCriteria(
+export function createInvocationsByAssignmentCriteria(
store: Store,
- request: IBatchCommandForCriteriaRequest
+ request: IInvocationByAssignmentCriteriaRequest
): Promise> {
let axios: AxiosInstance = createCoreApiCall(store);
let api: AxiosPromise<
IBatchOperation
- > = SiteWhere.API.BatchOperations.createBatchCommandForCriteria(
+ > = SiteWhere.API.BatchOperations.createInvocationsByAssignmentCriteria(
axios,
request
);
diff --git a/src/renderer/rest/sitewhere-device-assignments-api.ts b/src/renderer/rest/sitewhere-device-assignments-api.ts
index 69ce7c3..ffd004c 100644
--- a/src/renderer/rest/sitewhere-device-assignments-api.ts
+++ b/src/renderer/rest/sitewhere-device-assignments-api.ts
@@ -6,6 +6,7 @@ import { createCoreApiCall, loaderWrapper } from "./sitewhere-api-wrapper";
import {
IDeviceAssignmentCreateRequest,
IDeviceAssignment,
+ IDeviceAssignmentSimpleCriteria,
IDeviceAssignmentSearchCriteria,
IDeviceAssignmentResponseFormat,
IDeviceAssignmentSearchResults,
@@ -73,7 +74,7 @@ export function getDeviceAssignment(
*/
export function listDeviceAssignments(
store: Store,
- criteria: IDeviceAssignmentSearchCriteria,
+ criteria: IDeviceAssignmentSimpleCriteria,
format: IDeviceAssignmentResponseFormat
): Promise> {
let axios: AxiosInstance = createCoreApiCall(store);
@@ -87,6 +88,28 @@ export function listDeviceAssignments(
return loaderWrapper(store, api);
}
+/**
+ * Search device assignments that match criteria.
+ * @param store
+ * @param criteria
+ * @param format
+ */
+export function searchDeviceAssignments(
+ store: Store,
+ criteria: IDeviceAssignmentSearchCriteria,
+ format: IDeviceAssignmentResponseFormat
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceAssignmentSearchResults
+ > = SiteWhere.API.DeviceAssignments.searchDeviceAssignments(
+ axios,
+ criteria,
+ format
+ );
+ return loaderWrapper(store, api);
+}
+
/**
* Delete an existing device assignment.
* @param store
diff --git a/src/renderer/rest/sitewhere-device-commands-api.ts b/src/renderer/rest/sitewhere-device-commands-api.ts
index 012e3d5..0934843 100644
--- a/src/renderer/rest/sitewhere-device-commands-api.ts
+++ b/src/renderer/rest/sitewhere-device-commands-api.ts
@@ -4,66 +4,12 @@ import { Store } from "vuex";
import { SiteWhereUiSettings } from "../store";
import { createCoreApiCall, loaderWrapper } from "./sitewhere-api-wrapper";
import {
- IDeviceCommandCreateRequest,
- IDeviceCommand,
IDeviceCommandSearchCriteria,
IDeviceCommandResponseFormat,
IDeviceCommandSearchResults,
IDeviceCommandNamespaceSearchResults
} from "sitewhere-rest-api";
-/**
- * Create new device command.
- * @param store
- * @param request
- */
-export function createDeviceCommand(
- store: Store,
- request: IDeviceCommandCreateRequest
-): Promise> {
- let axios: AxiosInstance = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceCommand
- > = SiteWhere.API.DeviceCommands.createDeviceCommand(axios, request);
- return loaderWrapper(store, api);
-}
-
-/**
- * Get device command by token.
- * @param store
- * @param token
- * @param format
- */
-export function getDeviceCommand(
- store: Store,
- token: string,
- format: IDeviceCommandResponseFormat
-): Promise> {
- let axios = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceCommand
- > = SiteWhere.API.DeviceCommands.getDeviceCommand(axios, token, format);
- return loaderWrapper(store, api);
-}
-
-/**
- * Update an existing device command.
- * @param store
- * @param token
- * @param request
- */
-export function updateDeviceCommand(
- store: Store,
- token: string,
- request: IDeviceCommandCreateRequest
-): Promise> {
- let axios: AxiosInstance = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceCommand
- > = SiteWhere.API.DeviceCommands.updateDeviceCommand(axios, token, request);
- return loaderWrapper(store, api);
-}
-
/**
* List device commands matching criteria.
* @param store
@@ -103,19 +49,3 @@ export function listDeviceCommandsByNamespace(
);
return loaderWrapper(store, api);
}
-
-/**
- * Delete an existing device command.
- * @param store
- * @param token
- */
-export function deleteDeviceCommand(
- store: Store,
- token: string
-): Promise> {
- let axios: AxiosInstance = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceCommand
- > = SiteWhere.API.DeviceCommands.deleteDeviceCommand(axios, token);
- return loaderWrapper(store, api);
-}
diff --git a/src/renderer/rest/sitewhere-device-groups-api.ts b/src/renderer/rest/sitewhere-device-groups-api.ts
index 4f9a7f4..2b961ca 100644
--- a/src/renderer/rest/sitewhere-device-groups-api.ts
+++ b/src/renderer/rest/sitewhere-device-groups-api.ts
@@ -12,6 +12,7 @@ import {
IDeviceGroupElementResponseFormat,
IDeviceGroupElement,
IDeviceGroupSearchResults,
+ IDeviceGroupElementSearchCriteria,
IDeviceGroupElementSearchResults
} from "sitewhere-rest-api";
@@ -95,7 +96,7 @@ export function listDeviceGroups(
export function listDeviceGroupElements(
store: Store,
token: string,
- criteria: IDeviceGroupSearchCriteria,
+ criteria: IDeviceGroupElementSearchCriteria,
format: IDeviceGroupElementResponseFormat
): Promise> {
let axios: AxiosInstance = createCoreApiCall(store);
@@ -111,20 +112,20 @@ export function listDeviceGroupElements(
}
/**
- * Add new element to a device group.
+ * Add one or more elements to a device group.
* @param store
* @param token
* @param request
*/
-export function addDeviceGroupElement(
+export function createDeviceGroupElements(
store: Store,
token: string,
- request: IDeviceGroupElementCreateRequest
+ request: IDeviceGroupElementCreateRequest[]
): Promise> {
let axios: AxiosInstance = createCoreApiCall(store);
let api: AxiosPromise<
IDeviceGroupElement
- > = SiteWhere.API.DeviceGroups.createDeviceGroupElement(
+ > = SiteWhere.API.DeviceGroups.createDeviceGroupElements(
axios,
token,
request
diff --git a/src/renderer/rest/sitewhere-device-statuses-api.ts b/src/renderer/rest/sitewhere-device-statuses-api.ts
index 3810085..87c6c1f 100644
--- a/src/renderer/rest/sitewhere-device-statuses-api.ts
+++ b/src/renderer/rest/sitewhere-device-statuses-api.ts
@@ -4,65 +4,11 @@ import { Store } from "vuex";
import { SiteWhereUiSettings } from "../store";
import { createCoreApiCall, loaderWrapper } from "./sitewhere-api-wrapper";
import {
- IDeviceStatusCreateRequest,
- IDeviceStatus,
IDeviceStatusSearchCriteria,
IDeviceStatusResponseFormat,
IDeviceStatusSearchResults
} from "sitewhere-rest-api";
-/**
- * Create a new device status.
- * @param store
- * @param request
- */
-export function createDeviceStatus(
- store: Store,
- request: IDeviceStatusCreateRequest
-): Promise> {
- let axios: AxiosInstance = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceStatus
- > = SiteWhere.API.DeviceStatuses.createDeviceStatus(axios, request);
- return loaderWrapper(store, api);
-}
-
-/**
- * Update an existing device status.
- * @param store
- * @param token
- * @param format
- */
-export function getDeviceStatus(
- store: Store,
- token: string,
- format: IDeviceStatusResponseFormat
-): Promise> {
- let axios: AxiosInstance = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceStatus
- > = SiteWhere.API.DeviceStatuses.getDeviceStatus(axios, token, format);
- return loaderWrapper(store, api);
-}
-
-/**
- * Update an existing device status.
- * @param store
- * @param token
- * @param request
- */
-export function updateDeviceStatus(
- store: Store,
- token: string,
- request: IDeviceStatusCreateRequest
-): Promise> {
- let axios: AxiosInstance = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceStatus
- > = SiteWhere.API.DeviceStatuses.updateDeviceStatus(axios, token, request);
- return loaderWrapper(store, api);
-}
-
/**
* List device statuses that match the given criteria.
* @param store
@@ -80,19 +26,3 @@ export function listDeviceStatuses(
> = SiteWhere.API.DeviceStatuses.listDeviceStatuses(axios, criteria, format);
return loaderWrapper(store, api);
}
-
-/**
- * Delete an existing device status.
- * @param store
- * @param token
- */
-export function deleteDeviceStatus(
- store: Store,
- token: string
-): Promise> {
- let axios: AxiosInstance = createCoreApiCall(store);
- let api: AxiosPromise<
- IDeviceStatus
- > = SiteWhere.API.DeviceStatuses.deleteDeviceStatus(axios, token);
- return loaderWrapper(store, api);
-}
diff --git a/src/renderer/rest/sitewhere-device-types-api.ts b/src/renderer/rest/sitewhere-device-types-api.ts
index 7b0de1e..0879632 100644
--- a/src/renderer/rest/sitewhere-device-types-api.ts
+++ b/src/renderer/rest/sitewhere-device-types-api.ts
@@ -8,7 +8,13 @@ import {
IDeviceType,
IDeviceTypeSearchCriteria,
IDeviceTypeResponseFormat,
- IDeviceTypeSearchResults
+ IDeviceTypeSearchResults,
+ IDeviceCommandCreateRequest,
+ IDeviceCommand,
+ IDeviceCommandResponseFormat,
+ IDeviceStatusCreateRequest,
+ IDeviceStatus,
+ IDeviceStatusResponseFormat
} from "sitewhere-rest-api";
/**
@@ -98,3 +104,191 @@ export function deleteDeviceType(
> = SiteWhere.API.DeviceTypes.deleteDeviceType(axios, token);
return loaderWrapper(store, api);
}
+
+/**
+ * Create new device command.
+ * @param store
+ * @param deviceTypeToken
+ * @param request
+ */
+export function createDeviceCommand(
+ store: Store,
+ deviceTypeToken: string,
+ request: IDeviceCommandCreateRequest
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceCommand
+ > = SiteWhere.API.DeviceTypes.createDeviceCommand(
+ axios,
+ deviceTypeToken,
+ request
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Get device command by token.
+ * @param store
+ * @param deviceTypeToken
+ * @param commandToken
+ * @param format
+ */
+export function getDeviceCommand(
+ store: Store,
+ deviceTypeToken: string,
+ commandToken: string,
+ format: IDeviceCommandResponseFormat
+): Promise> {
+ let axios = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceCommand
+ > = SiteWhere.API.DeviceTypes.getDeviceCommand(
+ axios,
+ deviceTypeToken,
+ commandToken,
+ format
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Update an existing device command.
+ * @param store
+ * @param deviceTypeToken
+ * @param commandToken
+ * @param request
+ */
+export function updateDeviceCommand(
+ store: Store,
+ deviceTypeToken: string,
+ commandToken: string,
+ request: IDeviceCommandCreateRequest
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceCommand
+ > = SiteWhere.API.DeviceTypes.updateDeviceCommand(
+ axios,
+ deviceTypeToken,
+ commandToken,
+ request
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Delete an existing device command.
+ * @param store
+ * @param deviceTypeToken
+ * @param commandToken
+ */
+export function deleteDeviceCommand(
+ store: Store,
+ deviceTypeToken: string,
+ commandToken: string
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceCommand
+ > = SiteWhere.API.DeviceTypes.deleteDeviceCommand(
+ axios,
+ deviceTypeToken,
+ commandToken
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Create a new device status.
+ * @param store
+ * @param deviceTypeToken
+ * @param request
+ */
+export function createDeviceStatus(
+ store: Store,
+ deviceTypeToken: string,
+ request: IDeviceStatusCreateRequest
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceStatus
+ > = SiteWhere.API.DeviceTypes.createDeviceStatus(
+ axios,
+ deviceTypeToken,
+ request
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Update an existing device status.
+ * @param store
+ * @param deviceTypeToken
+ * @param statusToken
+ * @param format
+ */
+export function getDeviceStatus(
+ store: Store,
+ deviceTypeToken: string,
+ statusToken: string,
+ format: IDeviceStatusResponseFormat
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceStatus
+ > = SiteWhere.API.DeviceTypes.getDeviceStatus(
+ axios,
+ deviceTypeToken,
+ statusToken,
+ format
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Update an existing device status.
+ * @param store
+ * @param deviceTypeToken
+ * @param statusToken
+ * @param request
+ */
+export function updateDeviceStatus(
+ store: Store,
+ deviceTypeToken: string,
+ statusToken: string,
+ request: IDeviceStatusCreateRequest
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceStatus
+ > = SiteWhere.API.DeviceTypes.updateDeviceStatus(
+ axios,
+ deviceTypeToken,
+ statusToken,
+ request
+ );
+ return loaderWrapper(store, api);
+}
+
+/**
+ * Delete an existing device status.
+ * @param store
+ * @param deviceTypeToken
+ * @param statusToken
+ */
+export function deleteDeviceStatus(
+ store: Store,
+ deviceTypeToken: string,
+ statusToken: string
+): Promise> {
+ let axios: AxiosInstance = createCoreApiCall(store);
+ let api: AxiosPromise<
+ IDeviceStatus
+ > = SiteWhere.API.DeviceTypes.deleteDeviceStatus(
+ axios,
+ deviceTypeToken,
+ statusToken
+ );
+ return loaderWrapper(store, api);
+}
diff --git a/src/renderer/rest/sitewhere-schedules-api.ts b/src/renderer/rest/sitewhere-schedules-api.ts
index f9bd16a..4bea7e1 100644
--- a/src/renderer/rest/sitewhere-schedules-api.ts
+++ b/src/renderer/rest/sitewhere-schedules-api.ts
@@ -32,15 +32,18 @@ export function createSchedule(
* Get schedule by token.
* @param store
* @param token
+ * @param format
*/
export function getSchedule(
store: Store,
- token: string
+ token: string,
+ format: IScheduleResponseFormat
): Promise> {
let axios: AxiosInstance = createCoreApiCall(store);
let api: AxiosPromise = SiteWhere.API.Schedules.getSchedule(
axios,
- token
+ token,
+ format
);
return loaderWrapper(store, api);
}
diff --git a/src/renderer/router/index.ts b/src/renderer/router/index.ts
index 56a8079..b62a260 100644
--- a/src/renderer/router/index.ts
+++ b/src/renderer/router/index.ts
@@ -19,8 +19,9 @@ import AreaTypesList from "@/components/areatypes/AreaTypesList.vue";
import AreaTypeDetail from "@/components/areatypes/AreaTypeDetail.vue";
import AreasList from "@/components/areas/AreasList.vue";
import AreaDetail from "@/components/areas/AreaDetail.vue";
+import AssignmentsList from "@/components/assignments/AssignmentsList.vue";
import AssignmentDetail from "@/components/assignments/AssignmentDetail.vue";
-import AssignmentEmulator from "@/components/assignments/AssignmentEmulator.vue";
+import AssignmentEmulator from "@/components/assignments/emulator/AssignmentEmulator.vue";
import DeviceTypesList from "@/components/devicetypes/DeviceTypesList.vue";
import DeviceTypeDetail from "@/components/devicetypes/DeviceTypeDetail.vue";
import DevicesList from "@/components/devices/DevicesList.vue";
@@ -113,6 +114,10 @@ const routes = >[
path: "areas/:token",
component: AreaDetail
},
+ {
+ path: "assignments",
+ component: AssignmentsList
+ },
{
path: "assignments/:token",
component: AssignmentDetail
diff --git a/src/renderer/shims.d.ts b/src/renderer/shims.d.ts
index fa08266..fb8b457 100644
--- a/src/renderer/shims.d.ts
+++ b/src/renderer/shims.d.ts
@@ -4,4 +4,3 @@ declare module "vue-moment";
declare module "vue-clipboards";
declare module "vue-highlightjs";
declare module "vue-flatpickr-component";
-declare module "leaflet";
diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts
index 0fbd463..f7b93ce 100644
--- a/src/renderer/store/index.ts
+++ b/src/renderer/store/index.ts
@@ -3,7 +3,7 @@ import Vuex, { StoreOptions } from "vuex";
import createPersistedState from "vuex-persistedstate";
import { IUser, ITenant } from "sitewhere-rest-api";
import { INavigationSection } from "sitewhere-ide-common";
-import { IAlertMessage } from "../components/common/ApplicationModel";
+import { IAlertMessage, IRemotes } from "../components/common/ApplicationModel";
Vue.use(Vuex);
@@ -11,6 +11,7 @@ Vue.use(Vuex);
* SiteWhere user interface settings in store.
*/
export interface SiteWhereUiSettings {
+ remotes: IRemotes;
protocol?: string;
server?: string;
port?: number;
@@ -29,9 +30,18 @@ export interface SiteWhereUiSettings {
const store: StoreOptions = {
plugins: [createPersistedState()],
state: {
- protocol: "http",
- server: "localhost",
- port: 8080,
+ remotes: {
+ default: "local",
+ connections: [
+ {
+ id: "local",
+ name: "Local Instance",
+ protocol: "http",
+ host: "localhost",
+ port: 80
+ }
+ ]
+ },
jwt: undefined,
user: undefined,
authToken: undefined,
@@ -44,17 +54,22 @@ const store: StoreOptions = {
message: undefined
},
mutations: {
- // Set server protocol.
+ // Set list of remote connections.
+ remotes(state, remotes) {
+ state.remotes = remotes;
+ },
+
+ // Set protocol.
protocol(state, protocol) {
state.protocol = protocol;
},
- // Set server hostname.
+ // Set server.
server(state, server) {
state.server = server;
},
- // Set server port.
+ // Set port.
port(state, port) {
state.port = port;
},
@@ -127,6 +142,10 @@ const store: StoreOptions = {
},
getters: {
+ remotes: state => {
+ return state.remotes;
+ },
+
protocol: state => {
return state.protocol;
},
diff --git a/tsconfig.json b/tsconfig.json
index 1d154fd..41878ca 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,6 @@
"strict": true,
"jsx": "preserve",
"importHelpers": true,
- "isolatedModules": true,
"moduleResolution": "node",
"noImplicitAny": true,
"noEmitOnError": false,
No area types have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add an area type.
+
+
- {{ chosenText }}
-
-
-
- ![]()
-
-
-
-
-
- remove_circle
-
-
-
-
-
-
- {{ notChosenText }}
-
-
-
-
- ![]()
-
-
-
-
-
-
-
+
@@ -22,24 +20,40 @@
import { Component, Prop } from "sitewhere-ide-common";
import Vue from "vue";
+import BrandingImage from "../common/BrandingImage.vue";
+
import { IStyle } from "../common/Style";
-import { IAsset } from "sitewhere-rest-api";
+import { IAsset, IBrandedEntity } from "sitewhere-rest-api";
-@Component({})
+@Component({
+ components: {
+ BrandingImage
+ }
+})
export default class AssetListEntry extends Vue {
@Prop() readonly asset!: IAsset;
+ /** Use fallback for asset image as asset type */
+ get assetOrAssetType(): IBrandedEntity | null {
+ if (this.asset) {
+ if (this.asset.imageUrl) {
+ console.log("default");
+ return this.asset;
+ } else if ((this.asset as any).assetType) {
+ console.log("choose asset type");
+ return (this.asset as any).assetType;
+ }
+ }
+ console.log("fallthrough");
+ return this.asset;
+ }
+
// Compute style of logo.
get logoStyle(): IStyle {
return {
- "background-color": "#fff",
- "background-image": "url(" + this.asset.imageUrl + ")",
- "background-size": "contain",
- "background-repeat": "no-repeat",
- "background-position": "50% 50%",
- border: "1px solid #eee",
- height: "60px",
- width: "60px"
+ height: "80px",
+ width: "80px",
+ padding: "5px"
};
}
diff --git a/src/renderer/components/assets/AssetMultifilterChip.vue b/src/renderer/components/assets/AssetMultifilterChip.vue
new file mode 100644
index 0000000..461dc11
--- /dev/null
+++ b/src/renderer/components/assets/AssetMultifilterChip.vue
@@ -0,0 +1,38 @@
+
+
+
+
-
+
+
@@ -19,6 +24,7 @@
import { Component, Prop, ListComponent } from "sitewhere-ide-common";
import AssetListEntry from "../assets/AssetListEntry.vue";
+import NoResultsPanel from "../common/NoResultsPanel.vue";
import { AxiosPromise } from "axios";
import { listAssets } from "../../rest/sitewhere-assets-api";
@@ -31,7 +37,8 @@ import {
@Component({
components: {
- AssetListEntry
+ AssetListEntry,
+ NoResultsPanel
}
})
export default class AssetTypeAssets extends ListComponent<
diff --git a/src/renderer/components/assettypes/AssetTypeChooser.vue b/src/renderer/components/assettypes/AssetTypeChooser.vue
index dd8e9ab..be6df72 100644
--- a/src/renderer/components/assettypes/AssetTypeChooser.vue
+++ b/src/renderer/components/assettypes/AssetTypeChooser.vue
@@ -1,119 +1,63 @@
-
- Are you sure you want to delete this asset type?
-
-
+
+ {{ message }}
+
-
diff --git a/src/renderer/components/assettypes/AssetTypeDetailFields.vue b/src/renderer/components/assettypes/AssetTypeDetailFields.vue
index 47f3002..b961309 100644
--- a/src/renderer/components/assettypes/AssetTypeDetailFields.vue
+++ b/src/renderer/components/assettypes/AssetTypeDetailFields.vue
@@ -1,16 +1,13 @@
-
- Token is required.
- Token is not valid.
-
+ :validator="$v"
+ />
-
+
+
+
-
-
- {{ assetType.name }}
-
-
- {{ assetType.description }}
-
-
- {{ formatDate(assetType.createdDate) }}
-
-
- {{ formatDate(assetType.updatedDate) }}
-
+
+
+
+
+ {{ assetType.name }}
+
+
+ {{ assetType.description }}
+
+
+ {{ formatDate(assetType.createdDate) }}
+
+
+ {{ formatDate(assetType.updatedDate) }}
+
+
-
@@ -26,16 +31,19 @@
diff --git a/src/renderer/components/assignments/AlertDialog.vue b/src/renderer/components/assignments/AlertDialog.vue
deleted file mode 100644
index ffbb858..0000000
--- a/src/renderer/components/assignments/AlertDialog.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-
-
- Alert Details
- Metadata
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/renderer/components/assignments/AssetMiniPanel.vue b/src/renderer/components/assignments/AssetMiniPanel.vue
index 988dc94..689cdd3 100644
--- a/src/renderer/components/assignments/AssetMiniPanel.vue
+++ b/src/renderer/components/assignments/AssetMiniPanel.vue
@@ -36,24 +36,26 @@
-
diff --git a/src/renderer/components/assignments/AssignmentDialog.vue b/src/renderer/components/assignments/AssignmentDialog.vue
index 4ccfd4f..add579c 100644
--- a/src/renderer/components/assignments/AssignmentDialog.vue
+++ b/src/renderer/components/assignments/AssignmentDialog.vue
@@ -1,288 +1,152 @@
- No assets have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add an asset.
+
+ There are no assets of this type.
+
-
+
- {{ chosenText }}
-
-
-
- ![]()
-
-
-
-
-
- remove_circle
-
-
-
-
-
-
- {{ notChosenText }}
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
- Customer Assignment
- Area Assignment
- Asset Assignment
-
- Metadata
- Optional
-
-
-
-
-
-
-
-
- {{ cancelLabel }}
-
- Assign Area
- keyboard_arrow_right
-
-
-
-
-
-
-
-
-
-
- keyboard_arrow_left Back
-
- {{ cancelLabel }}
-
- Assign Asset
- keyboard_arrow_right
-
-
-
-
-
-
-
-
-
-
- keyboard_arrow_left Back
-
- {{ cancelLabel }}
- {{ createLabel }}
-
- Add Metadata
- keyboard_arrow_right
-
-
-
-
-
-
- keyboard_arrow_left Back
-
- {{ cancelLabel }}
- {{ createLabel }}
-
-
-
-
-
+
-
-
-
-
- Emulator
- MQTT Settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/renderer/components/assignments/AssignmentEmulatorMap.vue b/src/renderer/components/assignments/AssignmentEmulatorMap.vue
deleted file mode 100644
index f73c487..0000000
--- a/src/renderer/components/assignments/AssignmentEmulatorMap.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/renderer/components/assignments/AssignmentInvocationEvents.vue b/src/renderer/components/assignments/AssignmentInvocationEvents.vue
index 013aa39..83ed8a8 100644
--- a/src/renderer/components/assignments/AssignmentInvocationEvents.vue
+++ b/src/renderer/components/assignments/AssignmentInvocationEvents.vue
@@ -9,9 +9,9 @@
loadingMessage="Loading assignment command invocations ..."
>
- {{ formatDate(assignment.releasedDate) }}
Status:
- Released
+ No device assignments have been created for this tenant.
+
-
-
-
-
diff --git a/src/renderer/components/assignments/LocationDialog.vue b/src/renderer/components/assignments/LocationDialog.vue
deleted file mode 100644
index bd187a1..0000000
--- a/src/renderer/components/assignments/LocationDialog.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
diff --git a/src/renderer/components/assignments/MeasurementsDialog.vue b/src/renderer/components/assignments/MeasurementsDialog.vue
deleted file mode 100644
index 394bc15..0000000
--- a/src/renderer/components/assignments/MeasurementsDialog.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/assignments/emulator/LocationCreateDialog.vue b/src/renderer/components/assignments/emulator/LocationCreateDialog.vue
new file mode 100644
index 0000000..5a00c11
--- /dev/null
+++ b/src/renderer/components/assignments/emulator/LocationCreateDialog.vue
@@ -0,0 +1,68 @@
+
+
-
-
- Batch Operation Elements
-
-
-
-
-
-
-
-
-
-
-
- {{ props.item.device.token }}
-
- {{ props.item.processingStatus }}
- {{ formatDate(props.item.processedDate) }}
- {{ props.item.metadata.invocation }}
-
-
-
+ No batch operations have been created for this tenant.
+ {{text}}
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/form/ClipboardCopyField.vue b/src/renderer/components/common/form/ClipboardCopyField.vue
new file mode 100644
index 0000000..5f11691
--- /dev/null
+++ b/src/renderer/components/common/form/ClipboardCopyField.vue
@@ -0,0 +1,44 @@
+
+
+ {{ field }}
+
+ {{ chosenText }}
+
+
+
+ ![]()
+
+
+
+
+
+ delete
+
+
+
+
+
+
+ {{ notChosenText }}
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/form/FormSelectCondensed.vue b/src/renderer/components/common/form/FormSelectCondensed.vue
new file mode 100644
index 0000000..c60c68a
--- /dev/null
+++ b/src/renderer/components/common/form/FormSelectCondensed.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/form/FormToken.vue b/src/renderer/components/common/form/FormToken.vue
new file mode 100644
index 0000000..d316eca
--- /dev/null
+++ b/src/renderer/components/common/form/FormToken.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
diff --git a/src/renderer/components/common/form/Multichooser.vue b/src/renderer/components/common/form/Multichooser.vue
new file mode 100644
index 0000000..62a3ca1
--- /dev/null
+++ b/src/renderer/components/common/form/Multichooser.vue
@@ -0,0 +1,94 @@
+
+
+
+ {{ label || 'Token'}} is required.
+ {{ label || 'Token'}} is not valid (Alphanumeric with '-' or '_').
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/map/MapUtils.ts b/src/renderer/components/common/map/MapUtils.ts
new file mode 100644
index 0000000..c153927
--- /dev/null
+++ b/src/renderer/components/common/map/MapUtils.ts
@@ -0,0 +1,121 @@
+import L, { Polygon } from "leaflet";
+
+import { ILocation, IZoneCreateRequest } from "sitewhere-rest-api";
+import {
+ Map as LeafletMap,
+ LatLng,
+ LatLngBounds,
+ Control,
+ FeatureGroup
+} from "leaflet";
+
+/** Convert SiteWhere location bounds to leaflet LatLng array */
+export function swToLeafletBounds(bounds: ILocation[]): LatLng[] {
+ let latLngs: LatLng[] = [];
+ bounds.forEach(location => {
+ latLngs.push(new L.LatLng(location.latitude, location.longitude));
+ });
+ return latLngs;
+}
+
+/** Convert leaflet LatLng values to SiteWhere locations */
+export function leafletToSwBounds(
+ bounds: LatLng | LatLng[] | LatLng[][]
+): ILocation[] {
+ var locations: ILocation[] = [];
+ if (bounds && Array.isArray(bounds)) {
+ bounds.forEach((bound: any) => {
+ locations.push({
+ latitude: bound.lat,
+ longitude: bound.lng,
+ elevation: 0
+ });
+ });
+ }
+ return locations;
+}
+
+/** Get drawing options based on UI settings */
+function getDrawOptions(zone: IZoneCreateRequest): Control.DrawOptions {
+ return {
+ polyline: false,
+ circle: false,
+ marker: false,
+ circlemarker: false,
+ polygon: {
+ shapeOptions: {
+ color: zone.borderColor,
+ opacity: zone.borderOpacity,
+ fillColor: zone.fillColor,
+ fillOpacity: zone.fillOpacity
+ }
+ },
+ rectangle: {
+ shapeOptions: {
+ color: zone.borderColor,
+ opacity: zone.borderOpacity,
+ fillColor: zone.fillColor,
+ fillOpacity: zone.fillOpacity
+ }
+ }
+ };
+}
+
+/** Get editing options based on UI settings */
+function getEditOptions(): Control.DrawOptions {
+ return {
+ polyline: false,
+ circle: false,
+ marker: false,
+ circlemarker: false,
+ polygon: false,
+ rectangle: false
+ };
+}
+
+/** Enables drawing features on map */
+export function enableMapDrawing(
+ map: LeafletMap,
+ zone: IZoneCreateRequest
+): Control.Draw {
+ var options: Control.DrawConstructorOptions = {
+ position: "topright"
+ };
+ options.draw = getDrawOptions(zone);
+
+ var drawControl = new Control.Draw(options);
+ map.addControl(drawControl);
+ return drawControl;
+}
+
+/** Enables editing features on map */
+export function enableMapEditing(
+ map: LeafletMap,
+ boundsLayer: Polygon
+): Control.Draw {
+ var editFeatures = new FeatureGroup();
+ editFeatures.addLayer(boundsLayer);
+ map.addLayer(editFeatures);
+ editFeatures.bringToFront();
+
+ var options: Control.DrawConstructorOptions = {
+ position: "topright",
+ edit: {
+ featureGroup: editFeatures,
+ remove: true
+ }
+ };
+ options.draw = getEditOptions();
+
+ var drawControl = new Control.Draw(options);
+ map.addControl(drawControl);
+
+ var bounds: LatLngBounds = boundsLayer.getBounds();
+ if (!boundsLayer.isEmpty()) {
+ map.fitBounds(bounds, {
+ padding: [0, 0]
+ });
+ }
+
+ return drawControl;
+}
diff --git a/src/renderer/components/common/map/MapWithZoneOverlayPanel.vue b/src/renderer/components/common/map/MapWithZoneOverlayPanel.vue
new file mode 100644
index 0000000..10fa04b
--- /dev/null
+++ b/src/renderer/components/common/map/MapWithZoneOverlayPanel.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+ {{ icon }}
+
+ delete
+ Clear Filter
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/common/search/MultifilterChipComponent.ts b/src/renderer/components/common/search/MultifilterChipComponent.ts
new file mode 100644
index 0000000..9073782
--- /dev/null
+++ b/src/renderer/components/common/search/MultifilterChipComponent.ts
@@ -0,0 +1,76 @@
+import Vue from "vue";
+import { Component, Prop, Watch } from "vue-property-decorator";
+
+import { handleError } from "../Utils";
+import { AxiosPromise, AxiosResponse } from "axios";
+import { IBrandedEntity } from "sitewhere-rest-api";
+
+/**
+ * Base class for multiple filter chip components.
+ */
+@Component
+export class MultifilterChipComponentThis customer has no device assignments.
+
-
+
- {{ chosenText }}
-
-
-
- ![]()
-
-
-
-
-
- remove_circle
-
-
-
-
-
-
- {{ notChosenText }}
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
{{ customer.name }}
+ {{ customer.name }}
{{ customer.description }}
This customer has no subcustomers.
+
+ Click
+ {{custIcon}} in the toolbar to add a subcustomer.
+
+ No customers have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add a customer.
+
+ There are no customers of this type.
+
-
{{ customerType.name }}
+ {{ customerType.name }}
{{ customerType.description }}
No customer types have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add a customer type.
+
+
-
+
- {{ chosenText }}
-
-
-
- ![]()
-
-
-
-
-
- remove_circle
-
-
-
-
-
-
- {{ notChosenText }}
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
+ No device groups have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add a device group.
+
+
- {{ chosenText }}
-
-
-
- ![]()
-
-
-
-
-
- remove_circle
-
-
-
-
-
-
- {{ notChosenText }}
-
-
-
-
- ![]()
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/renderer/components/devices/DeviceDeleteDialog.vue b/src/renderer/components/devices/DeviceDeleteDialog.vue
index b95d059..f96e73d 100644
--- a/src/renderer/components/devices/DeviceDeleteDialog.vue
+++ b/src/renderer/components/devices/DeviceDeleteDialog.vue
@@ -49,6 +49,3 @@ export default class DeviceDeleteDialog extends DeleteDialogComponent
+ {{ chosenText }}
+
+
+
+ ![]()
+
+
+
+
+
+ delete
+
+
+
+
+
+
+ {{ notChosenText }}
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+ {{ device.deviceType.name }}
- {{ device.token }}
- {{ device.comments }}
-
-
-
+
+ {{ device.deviceType.name }}
+ {{ device.token }}
+ {{ device.comments }}
+
+
+
+ link
+
+ Create New Assignment
+
+
+
+
+
+ ![]()
+
+
+
+ No devices have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add a device.
+
+
-
+
- {{ chosenText }}
-
-
-
- ![]()
-
-
-
-
-
- remove_circle
-
-
-
-
-
-
- {{ notChosenText }}
-
-
-
-
- ![]()
-
-
-
-
-
-
-
- {{deviceType.name}}
- {{deviceType.description}}
-
+
+ {{ deviceType.name }}
+ {{ deviceType.description }}
+ No device types have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add a device type.
+
+
- Scripts
-
-
-
-
+
-
-
diff --git a/src/renderer/components/global/GlobalMicroservicesList.vue b/src/renderer/components/global/GlobalMicroservicesList.vue
index 1848b71..533342c 100644
--- a/src/renderer/components/global/GlobalMicroservicesList.vue
+++ b/src/renderer/components/global/GlobalMicroservicesList.vue
@@ -71,6 +71,3 @@ export default class GlobalMicroservicesList extends DetailComponent<
}
}
-
-
diff --git a/src/renderer/components/login/RemoteConnectionDetails.vue b/src/renderer/components/login/RemoteConnectionDetails.vue
new file mode 100644
index 0000000..0c5c543
--- /dev/null
+++ b/src/renderer/components/login/RemoteConnectionDetails.vue
@@ -0,0 +1,139 @@
+
+
+
+
+ Name is required.
+
+
+
+
+
+
+ Hostname is required.
+
+
+
+
+ Port is required.
+
+
+
+
+ add
+
+
+
+
+
+
diff --git a/src/renderer/components/login/RemoteConnectionsList.vue b/src/renderer/components/login/RemoteConnectionsList.vue
new file mode 100644
index 0000000..3b4ac02
--- /dev/null
+++ b/src/renderer/components/login/RemoteConnectionsList.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/components/login/RemotesDropdown.vue b/src/renderer/components/login/RemotesDropdown.vue
new file mode 100644
index 0000000..d218139
--- /dev/null
+++ b/src/renderer/components/login/RemotesDropdown.vue
@@ -0,0 +1,49 @@
+
+
+
+ router
+ {{ getNameAndUrl(data.item) }}
+
+
+ router
+ {{ getNameAndUrl(data.item) }}
+
+
+
+
+
diff --git a/src/renderer/components/microservice/AttributeFieldPanel.vue b/src/renderer/components/microservice/AttributeFieldPanel.vue
index 154d3fd..a7146f7 100644
--- a/src/renderer/components/microservice/AttributeFieldPanel.vue
+++ b/src/renderer/components/microservice/AttributeFieldPanel.vue
@@ -13,7 +13,7 @@
{{ attribute.description }}
-
@@ -57,14 +57,20 @@
hide-details
>
+
+
+
+ arrow_upward Up
+
+
+
+
+ arrow_downward Down
+
+
+
+
+ star Default
+
+
+
+
+ delete Delete
+
+
+
+
+
+
+
diff --git a/src/renderer/components/login/RemotesDialog.vue b/src/renderer/components/login/RemotesDialog.vue
new file mode 100644
index 0000000..743a4f9
--- /dev/null
+++ b/src/renderer/components/login/RemotesDialog.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+ {{ props.item.protocol === 'https' ? 'lock' : 'lock_open' }}
+
+ {{ getNameAndUrl(props.item) }}
+
+ star
+
+
+
+
+
+
- Schedule token is required.
- Schedule token is not valid.
-
-
- Name is required.
-
-
- Trigger type is required.
-
- No schedules have been created for this tenant.
+
+ Click
+ {{addIcon}} in the toolbar to add a schedule.
+
+ {{ tenant.name }}
-
-
{{tenant.name}} ({{tenant.token}})