Merge pull request #5714 from influxdata/5709/upgrade_regression

fix(ui): repair redux + router usage after upgrade

ui/src/dashboards/containers/DashboardPage.tsx

@@ -657,7 +657,4 @@ const mdtp = {
   setTimeZone: appActions.setTimeZone,
 }
 
-export default connect(
-  mstp,
-  mdtp
-)(ManualRefresh(withRouter<Props>(DashboardPage)))
+export default withRouter(connect(mstp, mdtp)(ManualRefresh(DashboardPage)))

ui/src/shared/components/AnnotationTagsDropdown.tsx

@@ -74,4 +74,4 @@ const mdtp = {
   onUpdateTagFilterAsync: updateTagFilterAsync,
 }
 
-export default connect(mstp, mdtp)(withRouter(AnnotationTagsDropdown))
+export default withRouter(connect(mstp, mdtp)(AnnotationTagsDropdown))

ui/src/shared/components/Annotations.tsx

@@ -1,6 +1,5 @@
 import React, {Component} from 'react'
 import {connect} from 'react-redux'
-import {withRouter, WithRouterProps} from 'react-router'
 
 import AnnotationComponent from 'src/shared/components/Annotation'
 import NewAnnotation from 'src/shared/components/NewAnnotation'
@@ -29,7 +28,7 @@ interface Props {
 }
 
 @ErrorHandling
-class Annotations extends Component<Props & WithRouterProps> {
+class Annotations extends Component<Props> {
   public render() {
     const {
       mode,
@@ -94,4 +93,4 @@ const mstp = (state, props) => {
   }
 }
 
-export default connect(mstp)(withRouter(Annotations))
+export default connect(mstp)(Annotations)

ui/src/shared/components/NewAnnotation.tsx

@@ -250,4 +250,4 @@ const mdtp = {
   onMouseLeaveTempAnnotation: mouseLeaveTempAnnotation,
 }
 
-export default connect(mstp, mdtp)(withRouter(NewAnnotation))
+export default withRouter(connect(mstp, mdtp)(NewAnnotation))