Merge branch 'feature/packagePage' into isaac/EdgeMerger

# Conflicts: # public/locales/en/translations.json # src/components/app.js # src/components/pages/dashboard/dashboard.js # src/components/pages/devices/devices.js # src/components/pages/devices/flyouts/deviceDetails/deviceDetails.container.js # src/components/pages/devices/flyouts/deviceDetails/deviceDetails.js # src/components/pages/devices/flyouts/deviceNew/deviceNew.js # src/components/pages/index.js # src/components/pages/maintenance/jobDetails/jobDetails.js # src/components/pages/maintenance/ruleDetails/ruleDetails.js # src/components/pages/maintenance/summary/summary.js # src/components/pages/rules/flyouts/ruleDetailsFlyout.js # src/components/pages/rules/rules.js # src/components/pages/rules/rulesGrid/rulesGrid.js # src/components/shell/shell.test.js # src/services/iotHubManagerService.js # src/services/models/logEventModels.js # src/store/reducers/devicesReducer.js # src/store/reducers/rulesReducer.js # src/walkthrough/components/pages/pageWithFlyout/pageWithFlyout.js # src/walkthrough/components/pages/pageWithGrid/exampleGrid/exampleGrid.js # src/walkthrough/components/pages/pageWithGrid/pageWithGrid.js
Azure · Oct 9, 2018 · a973759 · a973759
2 parents 46bcd14 + 87e927b
commit a973759
Show file tree

Hide file tree

Showing 114 changed files with 4,122 additions and 672 deletions.
diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json
@@ -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.",
@@ -166,6 +177,7 @@
     "lastRefreshed": "Last refreshed"
   },
   "devices": {
+    "title": "Devices",
     "searchPlaceholder": "Search devices...",
     "noneFound": "No devices found.",
     "refresh": "Refresh",
@@ -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>.",
@@ -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",
@@ -540,6 +559,126 @@
     "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",
+          "nan": "Must be a number"
+        }
+      }
+    },
+    "details": {
+      "deploymentName": "Deployment name",
+      "deviceGroup": "Device group",
+      "start": "Start",
+      "packageType": "Package type",
+      "package": "Package",
+      "priority": "Priority",
+      "devices": "Devices",
+      "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",
+      "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",
@@ -555,7 +694,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.",
@@ -584,6 +723,10 @@
           "panelBody": "This is a new panel."
         }
       }
+    },
+    "panel": {
+      "header": "Example Panel",
+      "panelBody": "This is a new panel."
     }
   }
 }
diff --git a/src/assets/icons/failed.svg b/src/assets/icons/failed.svg
diff --git a/src/assets/icons/glimmer.svg b/src/assets/icons/glimmer.svg
diff --git a/src/assets/icons/packages.svg b/src/assets/icons/packages.svg
diff --git a/src/assets/icons/tabDeployments.svg b/src/assets/icons/tabDeployments.svg
diff --git a/src/components/app.js b/src/components/app.js
@@ -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 {
 
@@ -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,
@@ -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' }