update material-ui. fix proptype warnings

jeffshaver · Oct 6, 2016 · c9c81cc · c9c81cc
1 parent 386f7e0
commit c9c81cc
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -67,15 +67,15 @@
     "leaflet-fullscreen": "^1.0.1",
     "lodash.isequal": "^4.4.0",
     "lodash.uniqby": "^4.7.0",
-    "material-ui": "^0.15.4",
+    "material-ui": "^0.16.0",
     "morgan": "^1.7.0",
     "node-uuid": "^1.4.7",
     "numeral": "^1.5.3",
     "papaparse": "^4.1.2",
     "radium": "^0.18.1",
     "react": "^15.3.1",
     "react-dom": "^15.3.1",
-    "react-grid-layout": "^0.13.1",
+    "react-grid-layout": "^0.13.7",
     "react-leaflet": "^0.12.1",
     "react-redux": "^4.4.5",
     "react-router": "^2.7.0",

diff --git a/src/js/components/Dashboard.jsx b/src/js/components/Dashboard.jsx
@@ -44,11 +44,11 @@ class Dashboard extends Component {
     dashboard: PropTypes.object.isRequired,
     dashboardFetch: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    filters: PropTypes.array.isRequired,
+    filters: PropTypes.object.isRequired,
     gridOptions: PropTypes.object,
     visualizationResults: PropTypes.object.isRequired
   }
-  
+
   static defaultProps = {
     gridOptions: {}
   }
@@ -119,11 +119,11 @@ class Dashboard extends Component {
   onClickReset () {
     this.resetFilters()
   }
-  
+
   onVisualizationClose (vizToRemove) {
     const {dashboard, dispatch} = this.props
     const {visualizations = []} = dashboard
-    
+
     dashboard.visualizations = visualizations.filter((viz) => (
       vizToRemove._id !== viz._id
     ))
@@ -139,10 +139,10 @@ class Dashboard extends Component {
 
     const layout = []
     let i = 0
-    
+
     for (const id in visualizationSizes) {
       const {[id]: vizSize} = visualizationSizes
-      
+
       layout.push({
         x: i % totalCols,
         y: Math.floor(i / totalCols),
@@ -151,7 +151,7 @@ class Dashboard extends Component {
         i: id,
         ...vizSize
       })
-      
+
       i++
     }
 
@@ -182,7 +182,7 @@ class Dashboard extends Component {
   renderVisualizations () {
     const {dashboard, filters, visualizationResults} = this.props
     const {visualizations = []} = dashboard
-    
+
     return visualizations.map((visualization, i) => {
       const results = visualizationResults[visualization._id]
       const visualizationElement = filters[dashboard._id]
@@ -208,7 +208,7 @@ class Dashboard extends Component {
           />
         )
         : null
-  
+
       return (
         <div
           key={visualization._id}

diff --git a/src/js/components/Dashboards.jsx b/src/js/components/Dashboards.jsx
@@ -53,7 +53,6 @@ class Dashboards extends Component {
   static propTypes = {
     dashboardGroups: PropTypes.object.isRequired,
     dashboardId: PropTypes.string,
-    dashboards: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     visualizations: PropTypes.object.isRequired
   }
@@ -62,7 +61,10 @@ class Dashboards extends Component {
     super(props)
 
     this.state = {
-      dashboardLayout: []
+      createVisibility: false,
+      dashboardLayout: [],
+      deleteVisibility: false,
+      editVisibility: false
     }
 
     this.displayName = 'Dashboards'
@@ -300,7 +302,7 @@ class Dashboards extends Component {
           onClose={this.hideDeleteDialog}
           onSubmitClick={this.deleteDashboard}
         >
-          <p>Are you sure you want to delete this dashboard?</p>
+          {[<p key={'delete'}>Are you sure you want to delete this dashboard?</p>]}
         </FormDialog>
         <FormDialog
           open={editVisibility}

diff --git a/src/js/components/FilterCriteria.jsx b/src/js/components/FilterCriteria.jsx
@@ -162,7 +162,30 @@ class FilterCriteria extends Component {
     const {criteriaDataProperty, fields, style: filterStyle} = this.props
     const field = fields.data.find((field) => field.name === fieldName) || {}
     const {[criteriaDataProperty]: fieldData} = field
-    const ValueField = fieldData ? AutoComplete : TextField
+    const valueField = fieldData
+      ? (
+        <AutoComplete
+          dataSource={fieldData}
+          errorText={errorText}
+          filter={AutoComplete.caseInsensitiveFilter}
+          floatingLabelText='Filter Criteria'
+          hintText='Filter Criteria'
+          openOnFocus={true}
+          searchText={value}
+          style={filterStyle}
+          onNewRequest={(value) => this.onChangeValue(id, value)}
+          onUpdateInput={(value) => this.onChangeValue(id, value)}
+        />
+      ) : (
+        <TextField
+          errorText={errorText}
+          floatingLabelText='Filter Criteria'
+          hintText='Filter Criteria'
+          style={filterStyle}
+          value={value}
+          onChange={({target: {value}}) => this.onChangeValue(id, value)}
+        />
+      )
     const errorText = required && !value
       ? 'Required'
       : undefined
@@ -193,20 +216,7 @@ class FilterCriteria extends Component {
           valueProp={'value'}
           onChange={(ev, index, value) => this.onChangeOperator(id, value)}
         />
-        <ValueField
-          dataSource={fieldData}
-          errorText={errorText}
-          filter={AutoComplete.caseInsensitiveFilter}
-          floatingLabelText='Filter Criteria'
-          hintText='Filter Criteria'
-          openOnFocus={true}
-          searchText={value}
-          style={filterStyle}
-          value={value}
-          onChange={({target: {value}}) => this.onChangeValue(id, value)}
-          onNewRequest={(value) => this.onChangeValue(id, value)}
-          onUpdateInput={(value) => this.onChangeValue(id, value)}
-        />
+        {valueField}
         {(() => {
           if (required && !isLastFilter) return null
 

diff --git a/src/js/components/LeftNav.jsx b/src/js/components/LeftNav.jsx
@@ -150,9 +150,6 @@ export class LeftNav extends Component {
             labelStyle={style.logoLabel}
             rippleColor='transparent'
             style={allLogoStyles}
-            tooltip={applicationAbbreviation}
-            tooltipPosition='top-center'
-            tooltipStyles={style.tooltip}
           />
         </MenuItem>
         {this.renderRoutes()}