Auto adding datacubes from the new cluster flow now fills them as well

Author: lorem--ipsum

src/client/views/settings-view/cluster-edit/cluster-edit.tsx

@@ -17,6 +17,10 @@
 require('./cluster-edit.css');
 
 import * as React from 'react';
+import * as Q from 'q';
+import { AttributeInfo, Attributes } from 'plywood';
+
+import { Ajax } from '../../../utils/ajax/ajax';
 import { List } from 'immutable';
 import { Fn, pluralIfNeeded, makeTitle } from '../../../../common/utils/general/general';
 import { classNames } from '../../../utils/dom/dom';
@@ -38,7 +42,8 @@ import { CLUSTER as LABELS } from '../../../../common/models/labels';
 export interface ClusterEditProps extends React.Props<any> {
   cluster?: Cluster;
   sources?: string[];
-  onSave: (newCluster: Cluster, dataCubes: DataCube[]) => void;
+  onSave: (newCluster: Cluster) => Q.Promise<void>;
+  onAddDataCubes?: (dataCubes: DataCube[]) => Q.Promise<void>;
   isNewCluster?: boolean;
   onCancel?: () => void;
   getSuggestedCubes?: () => DataCube[];
@@ -87,11 +92,33 @@ export class ClusterEdit extends React.Component<ClusterEditProps, ClusterEditSt
   }
 
   save() {
-    if (this.props.onSave) this.props.onSave(this.state.newInstance, null);
+    if (this.props.onSave) this.props.onSave(this.state.newInstance);
   }
 
   saveAndAddCubes(dataCubes: DataCube[]) {
-    if (this.props.onSave) this.props.onSave(this.state.newInstance, dataCubes);
+    if (this.props.onSave) {
+      this.props.onSave(this.state.newInstance)
+      .then(() => {
+        Q.all(dataCubes.map(this.fetchSuggestions)).then((attributes: Attributes[]) => {
+          let newDataCubes = dataCubes.map((dc, i) => dc.fillAllFromAttributes(attributes[i]));
+          this.props.onAddDataCubes(newDataCubes);
+        });
+      });
+    }
+  }
+
+  fetchSuggestions(dataCube: DataCube): Q.Promise<Attributes> {
+    return Ajax.query({
+      method: "POST",
+      url: 'settings/attributes',
+      data: {
+        clusterName: dataCube.clusterName,
+        source: dataCube.source
+      }
+    }).then(
+        (resp) => AttributeInfo.fromJSs(resp.attributes)
+      );
+    ;
   }
 
   goBack() {

src/client/views/settings-view/settings-view.tsx

@@ -162,15 +162,11 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
     });
   }
 
-  addClusterAndDataCubes(newCluster: Cluster, newDataCubes: DataCube[]) {
+  addCluster(newCluster: Cluster): Q.Promise<any> {
     var settings = ImmutableUtils.addInArray(this.state.settings, 'clusters', newCluster);
     var message = 'Cluster created';
-    if (newDataCubes && newDataCubes.length) {
-      settings = settings.appendDataCubes(newDataCubes);
-      message = 'Cluster and data cubes created';
-    }
 
-    this.onSave(settings, message).then(this.backToClustersView.bind(this));
+    return this.onSave(settings, message).then(this.backToClustersView.bind(this));
   }
 
   backToClustersView() {
@@ -191,6 +187,20 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
       ImmutableUtils.addInArray(settings, 'clusters', newCluster, index)
     ).then(this.backToClustersView.bind(this));
   }
+
+  addDataCubes(dataCubes: DataCube[]) {
+    if (!dataCubes || !dataCubes.length) {
+      return;
+    }
+
+    this.onSave(
+      this.state.settings.appendDataCubes(dataCubes),
+      'Data cubes created'
+    )
+      .then(this.backToClustersView.bind(this))
+    ;
+  }
+
   // !-- Cluster creation flow
 
   // -- DataCubes creation flow
@@ -207,6 +217,7 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
     ).then(this.backToDataCubesView.bind(this));
   }
 
+
   backToDataCubesView() {
     window.location.hash = `#settings/${PATHS.dataCubes}`;
 
@@ -291,7 +302,8 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
                     isNewCluster={true}
                     cluster={tempCluster}
                     sources={tempClusterSources}
-                    onSave={this.addClusterAndDataCubes.bind(this)}
+                    onSave={this.addCluster.bind(this)}
+                    onAddDataCubes={this.addDataCubes.bind(this)}
                     onCancel={this.backToClustersView.bind(this)}
                   />
                 : <ClusterSeedModal