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

Merge Edge Feature Branch into Master #1127

merged 32 commits into from
Oct 16, 2018

Commits on Aug 16, 2018

  1. Add scaffolding for packages page (#1063)

    * pakages tab
    
    * Packages Folder
    
    * Reusable Header Components
    
    * package svg
    
    * fix for mary ellen's comments
    
    * Fix for Stephen's comments
    
    * README update 1
    
    * oneProperty declarations
    
    * Fix 2 for MaryEllen's comments
    
    * 8/8 EOD commit
    
    * 8/9 SOD
    
    * configModels
    
    * isaac-d-t
    
    * 8 13 localhost
    
    * remove package title and header
    
    * complete reducer
    
    * crazy translation error
    
    * scafolding bug fixes
    
    * Revert "8 13 localhost"
    
    This reverts commit 9de75d0.
    
    * readme merge
    
    * fix for mary ellen's cooments 1
    
    * remove css from svg
    
    * removing warnings
    
    * copy right and spacing
    
    * work in progress
    isaac-dasan authored Aug 16, 2018
    Configuration menu
    Copy the full SHA
    406b68a View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. Display content in packages grid (#1068)

    * pakages tab
    
    * Packages Folder
    
    * Reusable Header Components
    
    * package svg
    
    * fix for mary ellen's comments
    
    * Fix for Stephen's comments
    
    * README update 1
    
    * oneProperty declarations
    
    * Fix 2 for MaryEllen's comments
    
    * 8/8 EOD commit
    
    * 8/9 SOD
    
    * configModels
    
    * isaac-d-t
    
    * 8 13 localhost
    
    * remove package title and header
    
    * complete reducer
    
    * crazy translation error
    
    * scafolding bug fixes
    
    * Revert "8 13 localhost"
    
    This reverts commit 9de75d0.
    
    * readme merge
    
    * Revert "Revert "8 13 localhost""
    
    This reverts commit 2b42e8c.
    
    * fix for mary ellen's cooments 1
    
    * remove css from svg
    
    * removing warnings
    
    * packagesColumnDefs
    
    * copy right and spacing
    
    * work in progress
    
    * Display data in grid
    
    * reset app.config
    
    * fix for mary ellen's comments
    isaac-dasan authored Aug 17, 2018
    Configuration menu
    Copy the full SHA
    04b2450 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. Merge Master into Edge Feature Branch (#1073)

    * Dev Walkthru: add a new Panel to the Dashboard (#1062)
    
    * Dev Walkthru: add a new Panel to the Dashboard
    
    * small tweaks, review feedback
    
    * fix bad code end marker
    
    * Diagnostics bugFix (#1065)
    
    * flatMap
    
    * Dummy comment to retrigger build
    
    * Add Rule Diagnostics (#1064)
    
    Add diagnostics logging for rule create/update events. Added the following metrics:
    Rule_NewClick
    Rule_EditClick
    Rule_DeviceGroupClick
    Rule_CalculationClick
    Rule_FieldClick
    Rule_OperatorClick
    Rule_AddConditionClick
    Rule_SeverityLevelClick
    Rule_StatusToggle
    Rule_ApplyClick
    Rule_CancelClick
    Rule_TopXCloseClick
    
    Also includes new "sessionid" sections of diagnostics call, which logs the time in ms since Jan 1, 1970 when the page was loaded (amplitude expects session id in this format). This fields will be added by diagnostics to enable logging of session id to amplitude--until those changes go in it will be ignored by the backend.
    isaac-dasan authored Aug 23, 2018
    Configuration menu
    Copy the full SHA
    0addf66 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2018

  1. Add newPackage Flyout (#1070)

    * newPackage commit 1
    
    * onChange
    
    * upload successful
    
    * add new package to grid
    
    * newPackage complete
    
    * alignment
    
    * remove color inside theme
    
    * combine
    
    * .new-package-header combine
    
    * error message
    
    * single delete
    isaac-dasan authored Aug 24, 2018
    Configuration menu
    Copy the full SHA
    3f2fc8f View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. Delete package (#1076)

    * newPackage commit 1
    
    * onChange
    
    * upload successful
    
    * add new package to grid
    
    * newPackage complete
    
    * alignment
    
    * remove color inside theme
    
    * combine
    
    * .new-package-header combine
    
    * error message
    
    * single delete
    
    * deletePackage commit 1
    
    * deletePackage commit 2
    
    * delete commit 3
    
    * delete commit 4
    
    * README.md
    
    * ME's review comments fix
    
    * Fix for Elvin's Comments
    
    * fix for stephen's comments
    isaac-dasan authored Aug 31, 2018
    Configuration menu
    Copy the full SHA
    9d89d94 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2018

  1. Merge Master into Edge feature branch (#1083)

    * Dev Walkthru: add a new Panel to the Dashboard (#1062)
    
    * Dev Walkthru: add a new Panel to the Dashboard
    
    * small tweaks, review feedback
    
    * fix bad code end marker
    
    * Diagnostics bugFix (#1065)
    
    * flatMap
    
    * Dummy comment to retrigger build
    
    * Add Rule Diagnostics (#1064)
    
    Add diagnostics logging for rule create/update events. Added the following metrics:
    Rule_NewClick
    Rule_EditClick
    Rule_DeviceGroupClick
    Rule_CalculationClick
    Rule_FieldClick
    Rule_OperatorClick
    Rule_AddConditionClick
    Rule_SeverityLevelClick
    Rule_StatusToggle
    Rule_ApplyClick
    Rule_CancelClick
    Rule_TopXCloseClick
    
    Also includes new "sessionid" sections of diagnostics call, which logs the time in ms since Jan 1, 1970 when the page was loaded (amplitude expects session id in this format). This fields will be added by diagnostics to enable logging of session id to amplitude--until those changes go in it will be ignored by the backend.
    
    * Delete .travis.yml (#1066)
    
    * Delete .travis.yml
    
    * Update README.md
    
    * Add diagnostics for new device funnel (#1075)
    
    * Add device metrics
    
    Add metrics for new device flyout
    
    * Add device created metric
    
    Add metric on device create so we can log device id for physical devices
    
    * Fix rule apply event
    
    Rule apply click event was only emitted for new rules. Move call so it is emitted if a rule is added or edited.
    
    * Address comments and align metric names
    
    Address comments. Update metric names to be in same format as rule metrics
    
    * fix insertion when entities are null for devices and rules (#1078)
    
    * Refactor to make walkthrough code less intrusive (#1069)
    
    * refactor to make walkthrough code less intrusive
    
    * refactor after meeting with team
    
    * update MD files, move httpClient
    
    * review feedback
    
    * fix nit
    
    * update breadcrumbs to use isDef instead of checking undefined
    
    * example
    
    * add packages
    isaac-dasan authored Sep 1, 2018
    Configuration menu
    Copy the full SHA
    6c80712 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. Configuration menu
    Copy the full SHA
    8a729a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2018

  1. Merge Master into Edge Feature Branch to keep it up to date (#1091)

    * Dev Walkthru: add a new Panel to the Dashboard (#1062)
    
    * Dev Walkthru: add a new Panel to the Dashboard
    
    * small tweaks, review feedback
    
    * fix bad code end marker
    
    * Diagnostics bugFix (#1065)
    
    * flatMap
    
    * Dummy comment to retrigger build
    
    * Add Rule Diagnostics (#1064)
    
    Add diagnostics logging for rule create/update events. Added the following metrics:
    Rule_NewClick
    Rule_EditClick
    Rule_DeviceGroupClick
    Rule_CalculationClick
    Rule_FieldClick
    Rule_OperatorClick
    Rule_AddConditionClick
    Rule_SeverityLevelClick
    Rule_StatusToggle
    Rule_ApplyClick
    Rule_CancelClick
    Rule_TopXCloseClick
    
    Also includes new "sessionid" sections of diagnostics call, which logs the time in ms since Jan 1, 1970 when the page was loaded (amplitude expects session id in this format). This fields will be added by diagnostics to enable logging of session id to amplitude--until those changes go in it will be ignored by the backend.
    
    * Delete .travis.yml (#1066)
    
    * Delete .travis.yml
    
    * Update README.md
    
    * Add diagnostics for new device funnel (#1075)
    
    * Add device metrics
    
    Add metrics for new device flyout
    
    * Add device created metric
    
    Add metric on device create so we can log device id for physical devices
    
    * Fix rule apply event
    
    Rule apply click event was only emitted for new rules. Move call so it is emitted if a rule is added or edited.
    
    * Address comments and align metric names
    
    Address comments. Update metric names to be in same format as rule metrics
    
    * fix insertion when entities are null for devices and rules (#1078)
    
    * Refactor to make walkthrough code less intrusive (#1069)
    
    * refactor to make walkthrough code less intrusive
    
    * refactor after meeting with team
    
    * update MD files, move httpClient
    
    * review feedback
    
    * fix nit
    
    * update breadcrumbs to use isDef instead of checking undefined
    
    * Treat text and number correctly in device jobs (#1082)
    
    * treat text and number correctly in device jobs
    
    * fix formatting nit
    
    * Rule updates need to send ETag (#1084)
    
    UI needs to send the ETag when updating rules.
    
    * Rule enable/disable needs to update ETag in redux store (#1086)
    
    * Small updates for the add page walkthrough (#1089)
    
    * Making cloudToDeviceMethod to empty an string (#1090)
    isaac-dasan authored Sep 7, 2018
    Configuration menu
    Copy the full SHA
    831ca51 View commit details
    Browse the repository at this point in the history
  2. Rename Package Flyouts to be consistent with rest of UI (#1087)

    * Rename Package Flyouts to be consistent with rest of UI
    
    * rename path
    isaac-dasan authored Sep 7, 2018
    Configuration menu
    Copy the full SHA
    e3cb97d View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2018

  1. Add glimmer icon to newly added grid items (#1095)

    * Add glimmer icon to newly added grid items
    mechaffin authored Sep 14, 2018
    Configuration menu
    Copy the full SHA
    eafa5df View commit details
    Browse the repository at this point in the history
  2. Add new Deployment (#1096)

    * Add new Deployment
    
    * Fix for ME's review coments
    
    * DevicesByCondition
    
    * undefined
    
    * Fix for ME's 2nd comments
    
    * alphabetical order
    isaac-dasan authored and mechaffin committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    7d3eb23 View commit details
    Browse the repository at this point in the history
  3. Merge Master into Edge Feature Branch (#1100)

    * Merge Master into Feature branch for Edge
    
    * nits
    isaac-dasan authored and mechaffin committed Sep 14, 2018
    Configuration menu
    Copy the full SHA
    236a3c9 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2018

  1. Configuration menu
    Copy the full SHA
    aa31893 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. More context bar arrangement; also page titles (#1104)

    * More context bar arrangement; also page titles
    
    * format per vscode auto formatting
    mechaffin authored Sep 20, 2018
    Configuration menu
    Copy the full SHA
    fd36538 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2018

  1. Configuration menu
    Copy the full SHA
    669a44c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    566e91f View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. Merge Master with Feature Branch (#1111)

    * Dev Walkthru: add a new Panel to the Dashboard (#1062)
    
    * Dev Walkthru: add a new Panel to the Dashboard
    
    * small tweaks, review feedback
    
    * fix bad code end marker
    
    * Diagnostics bugFix (#1065)
    
    * flatMap
    
    * Dummy comment to retrigger build
    
    * Add Rule Diagnostics (#1064)
    
    Add diagnostics logging for rule create/update events. Added the following metrics:
    Rule_NewClick
    Rule_EditClick
    Rule_DeviceGroupClick
    Rule_CalculationClick
    Rule_FieldClick
    Rule_OperatorClick
    Rule_AddConditionClick
    Rule_SeverityLevelClick
    Rule_StatusToggle
    Rule_ApplyClick
    Rule_CancelClick
    Rule_TopXCloseClick
    
    Also includes new "sessionid" sections of diagnostics call, which logs the time in ms since Jan 1, 1970 when the page was loaded (amplitude expects session id in this format). This fields will be added by diagnostics to enable logging of session id to amplitude--until those changes go in it will be ignored by the backend.
    
    * Delete .travis.yml (#1066)
    
    * Delete .travis.yml
    
    * Update README.md
    
    * Add diagnostics for new device funnel (#1075)
    
    * Add device metrics
    
    Add metrics for new device flyout
    
    * Add device created metric
    
    Add metric on device create so we can log device id for physical devices
    
    * Fix rule apply event
    
    Rule apply click event was only emitted for new rules. Move call so it is emitted if a rule is added or edited.
    
    * Address comments and align metric names
    
    Address comments. Update metric names to be in same format as rule metrics
    
    * fix insertion when entities are null for devices and rules (#1078)
    
    * Refactor to make walkthrough code less intrusive (#1069)
    
    * refactor to make walkthrough code less intrusive
    
    * refactor after meeting with team
    
    * update MD files, move httpClient
    
    * review feedback
    
    * fix nit
    
    * update breadcrumbs to use isDef instead of checking undefined
    
    * Treat text and number correctly in device jobs (#1082)
    
    * treat text and number correctly in device jobs
    
    * fix formatting nit
    
    * Rule updates need to send ETag (#1084)
    
    UI needs to send the ETag when updating rules.
    
    * Rule enable/disable needs to update ETag in redux store (#1086)
    
    * Small updates for the add page walkthrough (#1089)
    
    * Making cloudToDeviceMethod to empty an string (#1090)
    
    * rearrange controls on context menus (#1093)
    
    * Add links to Time Series Insights from Dashboard and Device Details Page (#1085)
    
    Add a Hyperlink shared component
    Fetch the Time Series Explorer URL from Telemetry
    Add link to dashboard and device details
    
    * Adding curly brackets in json Payload (#1094)
    
    * Fix alignment of stats on dashbaord (quick fix) (#1097)
    
    * Move Add Condition button below the rule conditions (#1103)
    
    * Update section decriptions to be more actionable on Device Details (#1110)
    isaac-dasan authored Sep 27, 2018
    Configuration menu
    Copy the full SHA
    e287a27 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4edda60 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2018

  1. Adding Deployment Details Page (#1112)

    * Squash DeploymentDetails commits
    
    * initial review fixes
    
    * review comments fix part 2
    
    * fix for Stephen's review comments
    
    * adding test page and minor fixes
    
    * ByQuery
    
    * fix deployments tests
    isaac-dasan authored Sep 29, 2018
    Configuration menu
    Copy the full SHA
    6202d53 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Delete Modal for Packages and Deployments Page (#1115)

    * delete Packages and delete Deployments
    
    * remove deleteDeployment.container
    
    * remove componentArray from deploymentDetailsGrid
    
    * remove payload
    
    * onrowclicked and softselected for deviceDetails
    
    * remove comment
    
    * id = ''
    isaac-dasan authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    028f89e View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2018

  1. Adding Deployment message details formatting and removing onRowClick (#…

    …1117)
    
    * Deployment message details formatting and removing onRowClick
    
    * fix for stephen's comments
    
    * minimize setState calls
    
    * refactoring componentWillReceiveProps
    
    * semicolon and single line
    isaac-dasan authored Oct 5, 2018
    Configuration menu
    Copy the full SHA
    612b72b View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2018

  1. Replacing ids with Names and removing IOThubmanager's dependency on c… (

    #1120)
    
    * replacing ids with Names and removing IOThubmanager's dependency on config service
    
    * type
    isaac-dasan authored Oct 6, 2018
    Configuration menu
    Copy the full SHA
    d116816 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2018

  1. Adding In-porduct telemetry for Packages and Deployments (#1122)

    * Adding In-porduct telemetry for Packages and Deployments
    
    * remove unused model
    isaac-dasan authored Oct 8, 2018
    Configuration menu
    Copy the full SHA
    b2f55ef View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. Styling update (#1124)

    * Styling update
    
    * red *
    
    * new line
    isaac-dasan authored Oct 9, 2018
    Configuration menu
    Copy the full SHA
    4678ded View commit details
    Browse the repository at this point in the history
  2. Merge master into Edge Feature branch (#1125)

    * Dev Walkthru: add a new Panel to the Dashboard (#1062)
    
    * Dev Walkthru: add a new Panel to the Dashboard
    
    * small tweaks, review feedback
    
    * fix bad code end marker
    
    * Diagnostics bugFix (#1065)
    
    * flatMap
    
    * Dummy comment to retrigger build
    
    * Add Rule Diagnostics (#1064)
    
    Add diagnostics logging for rule create/update events. Added the following metrics:
    Rule_NewClick
    Rule_EditClick
    Rule_DeviceGroupClick
    Rule_CalculationClick
    Rule_FieldClick
    Rule_OperatorClick
    Rule_AddConditionClick
    Rule_SeverityLevelClick
    Rule_StatusToggle
    Rule_ApplyClick
    Rule_CancelClick
    Rule_TopXCloseClick
    
    Also includes new "sessionid" sections of diagnostics call, which logs the time in ms since Jan 1, 1970 when the page was loaded (amplitude expects session id in this format). This fields will be added by diagnostics to enable logging of session id to amplitude--until those changes go in it will be ignored by the backend.
    
    * Delete .travis.yml (#1066)
    
    * Delete .travis.yml
    
    * Update README.md
    
    * Add diagnostics for new device funnel (#1075)
    
    * Add device metrics
    
    Add metrics for new device flyout
    
    * Add device created metric
    
    Add metric on device create so we can log device id for physical devices
    
    * Fix rule apply event
    
    Rule apply click event was only emitted for new rules. Move call so it is emitted if a rule is added or edited.
    
    * Address comments and align metric names
    
    Address comments. Update metric names to be in same format as rule metrics
    
    * fix insertion when entities are null for devices and rules (#1078)
    
    * Refactor to make walkthrough code less intrusive (#1069)
    
    * refactor to make walkthrough code less intrusive
    
    * refactor after meeting with team
    
    * update MD files, move httpClient
    
    * review feedback
    
    * fix nit
    
    * update breadcrumbs to use isDef instead of checking undefined
    
    * Treat text and number correctly in device jobs (#1082)
    
    * treat text and number correctly in device jobs
    
    * fix formatting nit
    
    * Rule updates need to send ETag (#1084)
    
    UI needs to send the ETag when updating rules.
    
    * Rule enable/disable needs to update ETag in redux store (#1086)
    
    * Small updates for the add page walkthrough (#1089)
    
    * Making cloudToDeviceMethod to empty an string (#1090)
    
    * rearrange controls on context menus (#1093)
    
    * Add links to Time Series Insights from Dashboard and Device Details Page (#1085)
    
    Add a Hyperlink shared component
    Fetch the Time Series Explorer URL from Telemetry
    Add link to dashboard and device details
    
    * Adding curly brackets in json Payload (#1094)
    
    * Fix alignment of stats on dashbaord (quick fix) (#1097)
    
    * Move Add Condition button below the rule conditions (#1103)
    
    * Update section decriptions to be more actionable on Device Details (#1110)
    
    * fix shell.test.js (#1116)
    
    * unit Test fix
    isaac-dasan authored Oct 9, 2018
    Configuration menu
    Copy the full SHA
    87e927b View commit details
    Browse the repository at this point in the history
  3. 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
    isaac-dasan committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    a973759 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. entities length > 0

    isaac-dasan committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    f5b249e View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2018

  1. Configuration menu
    Copy the full SHA
    eb23b41 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2018

  1. Fix for bugBash bugs (#1130)

    # Conflicts:
    #	src/store/reducers/deploymentsReducer.js
    isaac-dasan authored Oct 12, 2018
    Configuration menu
    Copy the full SHA
    2fafa08 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    511d635 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feature/packagePage' into isaac/EdgeMerger

    # Conflicts:
    #	src/store/reducers/deploymentsReducer.js
    isaac-dasan committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    dcd9731 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Configuration menu
    Copy the full SHA
    61c9fff View commit details
    Browse the repository at this point in the history