Added smart-ish attribute removal

Author: lorem--ipsum

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

@@ -78,16 +78,23 @@ export class Clusters extends React.Component<ClustersProps, ClustersState> {
       Notifier.removeQuestion();
     };
 
+    var message: string | JSX.Element;
 
-    Notifier.ask({
-      title: `Remove the cluster "${cluster.title}"?`,
-      message: <div className="message">
+    if (dependantDataCubes.length > 0) {
+      message = <div className="message">
         <p>This cluster has {dependantDataCubes.length} data cubes relying on it.</p>
         <p>Removing it will remove those cubes as well.</p>
         <div className="dependency-list">
           {dependantDataCubes.map(d => <p key={d.name}>{d.title}</p>)}
         </div>
-      </div>,
+      </div>;
+    } else {
+      message = 'This cannot be undone';
+    }
+
+    Notifier.ask({
+      title: `Remove the cluster "${cluster.title}"?`,
+      message,
       choices: [
         {label: 'Remove', callback: remove, type: 'warn'},
         {label: 'Cancel', callback: Notifier.removeQuestion, type: 'secondary'}

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

@@ -152,8 +152,8 @@ export class DataTable extends React.Component<DataTableProps, DataTableState> {
     };
 
     const onRemove = () => {
-      onChange(dataCube.removeAttribute(editedAttribute));
       onClose();
+      this.askToRemoveAttribute(editedAttribute);
     };
 
     return <AttributeModal
@@ -164,6 +164,53 @@ export class DataTable extends React.Component<DataTableProps, DataTableState> {
     />;
   }
 
+  askToRemoveAttribute(attribute: AttributeInfo) {
+    var { dataCube, onChange } = this.props;
+
+    const dependantDimensions = dataCube.dimensions.filter(d => {
+      // TODO: insert here something that links a dimension and an attribute
+      return (d.expression as any).name === attribute.name;
+    });
+
+    const dependantMeasures = dataCube.measures.filter(m => {
+      // TODO: insert here something that links a measure and an attribute
+      return false;
+    });
+
+    const remove = () => {
+      dependantDimensions.forEach(d => dataCube = dataCube.removeDimension(d));
+      dependantMeasures.forEach(m => dataCube = dataCube.removeMeasure(m));
+
+      onChange(dataCube.removeAttribute(attribute));
+      Notifier.removeQuestion();
+    };
+
+    var message: string | JSX.Element;
+
+    if (dependantDimensions.size > 0 || dependantMeasures.size > 0) {
+      message = <div className="message">
+        <p>This attribute has {dependantDimensions.size} dimensions and {dependantMeasures.size} measures relying on it.</p>
+        <p>Removing it will remove them as well.</p>
+        <div className="dependency-list">
+          {dependantDimensions.map(d => <p key={d.name}>{d.title}</p>)}
+          {dependantMeasures.map(m => <p key={m.name}>{m.title}</p>)}
+        </div>
+      </div>;
+    } else {
+      message = 'This cannot be undone';
+    }
+
+    Notifier.ask({
+      title: `Remove the attribute "${attribute.name}"?`,
+      message,
+      choices: [
+        {label: 'Remove', callback: remove, type: 'warn'},
+        {label: 'Cancel', callback: Notifier.removeQuestion, type: 'secondary'}
+      ],
+      onClose: Notifier.removeQuestion
+    });
+  }
+
   getColumns(): SimpleTableColumn[] {
     const dataCube = this.props.dataCube as DataCube;
     const primaryTimeAttribute = dataCube.getPrimaryTimeAttribute();

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

@@ -64,7 +64,8 @@ export interface SettingsViewState {
 const PATHS = {
   general: 'general',
   clusters: 'clusters',
-  dataCubes: 'data-cubes'
+  dataCubes: 'data-cubes',
+  newDataCube: 'new-data-cube'
 };
 
 const VIEWS = [
@@ -252,13 +253,25 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
   // !-- DataCubes creation flow
 
 
+  shouldHaveLeftButtons(): boolean {
+    const { breadCrumbs } = this.state;
+
+    if (!breadCrumbs) return true;
+
+    if (breadCrumbs.length === 1) return true;
+
+    if (breadCrumbs[0] === PATHS.dataCubes && breadCrumbs[1] !== PATHS.newDataCube) return false;
+
+    return true;
+  }
+
   render() {
     const { user, onNavClick, customization } = this.props;
     const { settings, breadCrumbs, tempCluster, tempClusterSources, tempDataCube } = this.state;
 
     if (!settings) return null;
 
-    const hasLeftButtons = breadCrumbs && (breadCrumbs.length === 1 || breadCrumbs.indexOf(PATHS.dataCubes) === -1);
+    const hasLeftButtons = this.shouldHaveLeftButtons();
 
     const inflateCluster = (key: string, value: string): {key: string, value: any} => {
       if (key !== 'clusterId') return {key, value};
@@ -335,7 +348,7 @@ export class SettingsView extends React.Component<SettingsViewProps, SettingsVie
           <Route fragment={PATHS.dataCubes}>
             <DataCubes settings={settings} onSave={this.onSave.bind(this)}/>
 
-            <Route fragment="new-data-cube">
+            <Route fragment={PATHS.newDataCube}>
               { tempDataCube ? null : <DataCubes settings={settings} onSave={this.onSave.bind(this)}/> }
 
               { tempDataCube

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

@@ -798,6 +798,32 @@ export class DataCube implements Instance<DataCubeValue, DataCubeJS> {
     return new DataCube(value);
   }
 
+  public removeDimension(dimension: Dimension): DataCube {
+    var index = this.dimensions.indexOf(dimension);
+
+    if (index === -1) {
+      throw new Error(`Unknown dimension : ${dimension.toString()}`);
+    }
+
+    var newDimensions = this.dimensions.toArray().concat();
+    newDimensions.splice(index, 1);
+
+    return this.changeDimensions(List(newDimensions));
+  }
+
+  public removeMeasure(measure: Measure): DataCube {
+    var index = this.measures.indexOf(measure);
+
+    if (index === -1) {
+      throw new Error(`Unknown measure : ${measure.toString()}`);
+    }
+
+    var newMeasures = this.measures.toArray().concat();
+    newMeasures.splice(index, 1);
+
+    return this.changeMeasures(List(newMeasures));
+  }
+
   public filterDimensions(dimensionsToFilter: Dimension[]): Dimension[] {
     return dimensionsToFilter.filter(dimension => {
       if (this.getDimension(dimension.name)) return false;