misc fixes to get flow going

Author: vogievetsky

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

@@ -90,16 +90,23 @@ export class ClusterEdit extends React.Component<ClusterEditProps, ClusterEditSt
     if (this.props.onSave) this.props.onSave(this.state.newInstance);
   }
 
+  saveAndAddCubes(dataCubes: DataCube[]) {
+    const { addCubes } = this.props;
+
+    this.save();
+    if (addCubes) addCubes(dataCubes);
+  }
+
   goBack() {
     const { cluster } = this.props;
     var hash = window.location.hash;
     window.location.hash = hash.replace(`/${cluster.name}`, '');
   }
 
-  toggleCreateCubesModal() {
+  openCreateCubesModal() {
     const { showCreateCubesModal } = this.state;
     this.setState({
-      showCreateCubesModal: !showCreateCubesModal
+      showCreateCubesModal: true
     });
   }
 
@@ -109,8 +116,8 @@ export class ClusterEdit extends React.Component<ClusterEditProps, ClusterEditSt
     const CubesSuggestionModal = SuggestionModal.specialize<DataCube>();
 
     return <CubesSuggestionModal
-      onAdd={addCubes.bind(this)}
-      onClose={this.toggleCreateCubesModal.bind(this)}
+      onAdd={this.saveAndAddCubes.bind(this)}
+      onClose={this.save.bind(this)}
       getLabel={(m) => `${m.title}`}
       options={getSuggestedCubes()}
       title={STRINGS.createCubesFromCluster}
@@ -172,7 +179,7 @@ export class ClusterEdit extends React.Component<ClusterEditProps, ClusterEditSt
       className={classNames("save", {disabled: !canSave || (!isNewCluster && !hasChanged)})}
       title={isNewCluster ? "Connect cluster" : "Save"}
       type="primary"
-      onClick={this.toggleCreateCubesModal.bind(this)}
+      onClick={this.openCreateCubesModal.bind(this)}
     />;
 
     if (!isNewCluster && !hasChanged) {

src/common/models/data-cube/data-cube.ts

@@ -868,7 +868,7 @@ export class DataCube implements Instance<DataCubeValue, DataCubeJS> {
     }
 
     if (this.measures.size > 0) {
-      this.measures.first().name;
+      return this.measures.first().name;
     }
 
     return null;

src/common/models/sort-on/sort-on.ts

@@ -81,6 +81,7 @@ export class SortOn implements Instance<SortOnValue, SortOnJS> {
   constructor(parameters: SortOnValue) {
     this.dimension = parameters.dimension;
     this.measure = parameters.measure;
+    if (!(this.dimension || this.measure)) throw new Error('must have a dimension or a measure');
   }
 
   public valueOf(): SortOnValue {