Browse Source

[FIX] modules rendering

Gogs 6 years ago
parent
commit
58d2761452
1 changed files with 9 additions and 17 deletions
  1. 9 17
      src/components/pages/TasksList.js

+ 9 - 17
src/components/pages/TasksList.js

@@ -15,7 +15,7 @@ import IconButton from 'material-ui/IconButton'
 import AddIcon from '../icons/AddIcon'
 import RemoveIcon from '../icons/RemoveIcon'
 import { isEqual, isEmpty, filter, union, difference, defer } from 'lodash'
-import { ODOO, DOCKER, REQUEST, GIT } from '../../constants/ResourceNames'
+import { ODOO, REQUEST } from '../../constants/ResourceNames'
 import { post, get } from '../../actions'
 import { connect } from 'react-redux'
 import { withStyles } from 'material-ui/styles'
@@ -71,13 +71,11 @@ class TasksList extends Component {
         }
 
         if (taskName === 'show-modules') {
-            Promise.all([
-                this.props.loadContainers(),
-                this.props.loadRepositories()
-            ]).then(data => {   
+            this.props.loadModules().then(data => {
+                console.log(data)
                 this.setState({
-                    odoos: data[0].payload.containers,
-                    modules: data[1].payload.repositories
+                    odoos: data.payload.odoos,
+                    modules: data.payload.modules
                 }, () => this.showDialog(taskName))
             })
         }
@@ -324,8 +322,8 @@ class TasksList extends Component {
                                 inputProps={{
                                     name: 'selectedOdoo'
                                 }}>
-                                {this.state.odoos.map(o =>
-                                    <MenuItem key={o.id} value={o.name}>{o.name}</MenuItem>
+                                {this.state.odoos.map((odoo, index) =>
+                                    <MenuItem key={index} value={odoo}>{odoo}</MenuItem>
                                 )}
                             </Select>
                         </FormControl>
@@ -404,14 +402,8 @@ const mapDispatchToProps = (dispatch, props) => ({
     /**
      * 
      */
-    loadRepositories() {
-        return dispatch(get(`${GIT}repositories/`))
-    },
-    /**
-     * 
-     */
-    loadContainers() {
-        return dispatch(get(`${DOCKER}container/all/`))
+    loadModules() {
+        return dispatch(get(`${ODOO}install_modules/`))
     },
     /**
      *