Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Merge Edge Feature Branch into Master #1127

Merged
merged 32 commits into from
Oct 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
406b68a
Add scaffolding for packages page (#1063)
isaac-dasan Aug 16, 2018
04b2450
Display content in packages grid (#1068)
isaac-dasan Aug 17, 2018
0addf66
Merge Master into Edge Feature Branch (#1073)
isaac-dasan Aug 23, 2018
3f2fc8f
Add newPackage Flyout (#1070)
isaac-dasan Aug 24, 2018
9d89d94
Delete package (#1076)
isaac-dasan Aug 31, 2018
6c80712
Merge Master into Edge feature branch (#1083)
isaac-dasan Sep 1, 2018
8a729a5
Deployments page scaffolding (#1088)
isaac-dasan Sep 6, 2018
831ca51
Merge Master into Edge Feature Branch to keep it up to date (#1091)
isaac-dasan Sep 7, 2018
e3cb97d
Rename Package Flyouts to be consistent with rest of UI (#1087)
isaac-dasan Sep 7, 2018
eafa5df
Add glimmer icon to newly added grid items (#1095)
mechaffin Sep 14, 2018
7d3eb23
Add new Deployment (#1096)
isaac-dasan Sep 14, 2018
236a3c9
Merge Master into Edge Feature Branch (#1100)
isaac-dasan Sep 14, 2018
aa31893
Add glimmer icon for newly added deployments (#1101)
mechaffin Sep 17, 2018
fd36538
More context bar arrangement; also page titles (#1104)
mechaffin Sep 20, 2018
669a44c
implement new ComponentArray and change existing code to use it (#1108)
mechaffin Sep 24, 2018
566e91f
Followup to remove more keys for ComponentArray usage (#1109)
mechaffin Sep 24, 2018
e287a27
Merge Master with Feature Branch (#1111)
isaac-dasan Sep 27, 2018
4edda60
Fix device insert reducer function so the id in the items list is a s…
mechaffin Sep 27, 2018
6202d53
Adding Deployment Details Page (#1112)
isaac-dasan Sep 29, 2018
028f89e
Delete Modal for Packages and Deployments Page (#1115)
isaac-dasan Oct 2, 2018
612b72b
Adding Deployment message details formatting and removing onRowClick …
isaac-dasan Oct 5, 2018
d116816
Replacing ids with Names and removing IOThubmanager's dependency on c…
isaac-dasan Oct 6, 2018
b2f55ef
Adding In-porduct telemetry for Packages and Deployments (#1122)
isaac-dasan Oct 8, 2018
4678ded
Styling update (#1124)
isaac-dasan Oct 9, 2018
87e927b
Merge master into Edge Feature branch (#1125)
isaac-dasan Oct 9, 2018
a973759
Merge branch 'feature/packagePage' into isaac/EdgeMerger
isaac-dasan Oct 9, 2018
f5b249e
entities length > 0
isaac-dasan Oct 10, 2018
eb23b41
Merge branch 'master' into isaac/EdgeMerger
isaac-dasan Oct 11, 2018
2fafa08
Fix for bugBash bugs (#1130)
isaac-dasan Oct 12, 2018
511d635
keyboard accessibility fix (#1131)
isaac-dasan Oct 12, 2018
dcd9731
Merge branch 'feature/packagePage' into isaac/EdgeMerger
isaac-dasan Oct 12, 2018
61c9fff
Merge branch 'master' into isaac/EdgeMerger
isaac-dasan Oct 16, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 151 additions & 6 deletions public/locales/en/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,20 @@
"dashboard": "Dashboard",
"devices": "Devices",
"rules": "Rules",
"maintenance": "Maintenance"
"maintenance": "Maintenance",
"packages": "Packages",
"deployments": "Deployments"
},
"errorFormat": "Error: {{message}}",
"edgeAgentStatus": {
"200": "OK.",
"400": "The deployment configuration is malformed or invalid.",
"406": "The device is offline or not sending status reports.",
"412": "The deployment configuration schema version is invalid.",
"417": "The device's deployment configuration is not set.",
"500": "An error occurred in the IoT Edge runtime.",
"unknown": "An unknown code received."
},
"errorCode": {
"noResponse": "Oops, there was no response from the server.",
"notLoggedIn": "You need to login to call the service.",
Expand Down Expand Up @@ -166,6 +177,7 @@
"lastRefreshed": "Last refreshed"
},
"devices": {
"title": "Devices",
"searchPlaceholder": "Search devices...",
"noneFound": "No devices found.",
"refresh": "Refresh",
Expand Down Expand Up @@ -206,6 +218,11 @@
"description": "To run a method on one or more devices, close this pane, select the checkbox for the device(s), click <1><0>{{jobs}}</0></1>, and then select <3><0>{{methods}}</0></3>.",
"noneExist": "No methods found for this device."
},
"modules": {
"title": "Deployment messages",
"description": "Edge module messages on the device",
"noneExist": "No messages found for this device"
},
"properties": {
"title": "Properties",
"description": "To change a property on one or more devices, close this pane, select the checkbox for the device(s), click <1><0>{{jobs}}</0></1>, and then select <3><0>{{properties}}</0></3>.",
Expand Down Expand Up @@ -354,22 +371,24 @@
},
"SIMManagement": {
"title": "SIM Management",
"provider" : "Provider",
"provider": "Provider",
"summaryHeader": "Summary and instructions",
"here": "here",
"select": "Select...",
"header":{
"telefonica": "As a Telefónica IoT customer you have the advantage of adding this feature to enrich automatically your Azure Remote Monitoring Solution with the connectivity data available in Telefónica IoT Connectivity Platform (Network Information, Data Consumption & Network Based Location)." },
"header": {
"telefonica": "As a Telefónica IoT customer you have the advantage of adding this feature to enrich automatically your Azure Remote Monitoring Solution with the connectivity data available in Telefónica IoT Connectivity Platform (Network Information, Data Consumption & Network Based Location)."
},
"description": {
"telefonica": "This feature is in Preview. In order to sync your connectivity data into Azure Remote Monitoring Solution, please fill a request <1><0>url</0></1>, select the option “Azure Remote Monitoring” and include your contact data and we will automatically activate your account. \n\nIf you are not a Telefónica client yet and you want to enjoy this or other IoT Connectivity Cloud Ready services, you can contact us <1><0>url</0></1> and select the option “Connectivity”; we will be glad to help you."
},
"operator":{
"operator": {
"telefonica": "Telefónica"
}
}
}
},
"rules": {
"title": "Rules",
"searchPlaceholder": "Search rules...",
"severity": {
"info": "Info",
Expand Down Expand Up @@ -540,6 +559,128 @@
"P7D": "Last week",
"P1M": "Last month"
},
"deployments": {
"title": "Deployments",
"flyouts": {
"new": {
"contextMenuName": "New deployment",
"title": "New deployment",
"apply": "Apply",
"cancel": "Cancel",
"close": "Close",
"type": "Package type",
"deviceGroup": "Device Group",
"name": "Name",
"priority": "Priority",
"package": "Package",
"typePlaceHolder": "Select package type",
"packagePlaceHolder": "Select package",
"deviceGroupPlaceHolder": "Select device group",
"priorityPlaceHolder": "Enter priority",
"namePlaceHolder": "Enter name",
"targetText": "targeted devices",
"infoText": "This deployment runs continuously. Every edge device (and any you add in the future) in the selected device group will receive this package.",
"successText": "View your deployment status detail for <1><0>{{deploymentName}}</0></1>.",
"creating": "Creating deployment",
"validation": {
"required": "Is required",
"positiveInteger": "Must be a positive integer less than 2147483648"
}
}
},
"details": {
"deploymentName": "Deployment name",
"deviceGroup": "Device group",
"start": "Start",
"packageType": "Package type",
"package": "Package",
"priority": "Priority",
"applied": "Applied",
"targeted": "Targeted",
"failed": "Failed",
"succeeded": "Succeeded",
"pending": "Pending",
"devicesAffected": "Devices Affected",
"grid": {
"name": "Name",
"deploymentStatus": "Deployment Status",
"firmware": "Firmware",
"lastMessage": "Last Message",
"start": "Start",
"end": "End"
}
},
"modals": {
"delete": {
"contextMenuName": "Delete",
"title": "Delete Deployment?",
"info": "Deleting '{{deploymentName}}' will stop this deployment from being applied to these devices. It may result in a lower priority edge manifest being applied."
}
},
"typeOptions": {
"edgemanifest": "Edge Manifest",
"unknown": "Unknown"
},
"grid": {
"name": "Name",
"package": "Package",
"deviceGroup": "Device group",
"priority": "Priority",
"type": "Package Type",
"targeted": "Targeted",
"applied": "Applied",
"failed": "Failed",
"succeeded": "Succeeded",
"dateCreated": "Created On"
}
},
"packages": {
"searchPlaceholder": "Search packages...",
"noneFound": "No packages found.",
"title": "Packages",
"total": "total packages",
"new": "New Package",
"delete": "Delete",
"grid": {
"name": "Name",
"type": "Type",
"dateCreated": "Date Created"
},
"flyouts": {
"new": {
"title": "New Package",
"header": "Upload a package",
"description": "Add a package to your solution",
"upload": "Upload",
"cancel": "Cancel",
"close": "Close",
"type": "Package type",
"browse": "Browse",
"browseText": "for a package file",
"placeHolder": "Select package type",
"package": "Package",
"deploymentsPage": "Deployments page",
"newDeployment": "+ New Deployment",
"deploymentText": "To deploy packages, go to the <1>Deployments page</1>, and then click <3>+ New Deployment</3> button.",
"validation": {
"required": "Is required"
}
}
},
"modals": {
"delete": {
"title": "Delete Package?",
"info": "Deleting selected package will remove it. It will not impact any of the deployments of this package."
}
},
"typeOptions": {
"edgemanifest": "Edge Manifest"
}
},
"modal": {
"delete": "Delete",
"cancel": "Cancel"
},
"walkthrough": {
"tabs": {
"dashboard": "Dashboard",
Expand All @@ -555,7 +696,7 @@
"pageBody": "Click the context button above to open a flyout.",
"open": "Open Flyout",
"flyouts": {
"example" : {
"example": {
"header": "Example Flyout",
"description": "This example flyout contains a simple form with action buttons.",
"insertFormHere": "Insert form controls here. See 'src/components/shared/forms' for form specific shared controls you might leverage.",
Expand Down Expand Up @@ -584,6 +725,10 @@
"panelBody": "This is a new panel."
}
}
},
"panel": {
"header": "Example Panel",
"panelBody": "This is a new panel."
}
}
}
11 changes: 11 additions & 0 deletions src/assets/icons/failed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/icons/glimmer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/packages.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/tabDeployments.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 38 additions & 1 deletion src/components/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ import React, { Component } from 'react';
import { svgs } from 'utilities';
import Shell from "components/shell/shell";
import { ManageDeviceGroupsContainer, SettingsContainer } from 'components/shell/flyouts';
import { DashboardContainer, DevicesContainer, RulesContainer, MaintenanceContainer } from './pages';
import {
DashboardContainer,
DevicesContainer,
RulesContainer,
MaintenanceContainer,
PackagesContainer,
DeploymentsRouter
} from './pages';

class App extends Component {

Expand Down Expand Up @@ -45,6 +52,20 @@ class App extends Component {
labelId: 'tabs.rules',
component: RulesContainer
},
{
to: '/packages',
exact: true,
svg: svgs.tabs.packages,
labelId: 'tabs.packages',
component: PackagesContainer
},
{
to: '/deployments',
exact: false,
svg: svgs.tabs.deployments,
labelId: 'tabs.deployments',
component: DeploymentsRouter
},
{
to: '/maintenance',
exact: false,
Expand All @@ -70,6 +91,22 @@ class App extends Component {
{ to: '/rules', labelId: 'tabs.rules' }
]
},
{
path: '/packages', crumbs: [
{ to: '/packages', labelId: 'tabs.packages' }
]
},
{
path: '/deployments', crumbs: [
{ to: '/deployments', labelId: 'tabs.deployments' }
]
},
{
path: '/deployments/:id', crumbs: [
{ to: '/deployments', labelId: 'tabs.deployments' },
{ to: '/deployments/:id', matchParam: 'id' },
]
},
{
path: '/maintenance', crumbs: [
{ to: '/maintenance', labelId: 'tabs.maintenance' }
Expand Down
Loading