fixed renames

Author: vogievetsky

src/client/applications/pivot-application/collection-view-delegate/collection-view-delegate.tsx

@@ -175,7 +175,7 @@ export class CollectionViewDelegate {
       this.save(this.getSettings().addCollectionAt(collection, oldIndex));
     };
 
-    return this.save(appSettings.deleteCollection(collection)).then( () => {
+    return this.save(appSettings.deleteCollection(collection.name)).then( () => {
       window.location.hash = `#/home`;
       Notifier.success('Collection removed', {label: STRINGS.undo, callback: undo});
     });

src/client/applications/pivot-application/pivot-application.tsx

@@ -468,8 +468,7 @@ export class PivotApplication extends React.Component<PivotApplicationProps, Piv
 
   deleteDataCube(dataCube: DataCube) {
     const appSettings = this.state.appSettings as AppSettings;
-
-    this.saveDataCubes(appSettings.deleteDataCube(dataCube));
+    this.saveDataCubes(appSettings.deleteDataCube(dataCube.name));
   }
 
 

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

@@ -48,21 +48,13 @@ export class DataCubes extends React.Component<DataCubesProps, DataCubesState> {
     });
   }
 
-  editCube(cube: DataCube) {
-    window.location.hash += `/${cube.name}`;
+  editDataCube(dataCube: DataCube) {
+    window.location.hash += `/${dataCube.name}`;
   }
 
-  removeCube(cube: DataCube) {
+  removeDataCube(dataCube: DataCube) {
     const remove = () => {
-      var settings: AppSettings = this.state.newSettings;
-      var index = settings.dataCubes.indexOf(cube);
-
-      if (index < 0) return;
-
-      var newCubes = settings.dataCubes;
-      newCubes.splice(index, 1);
-
-      this.props.onSave(settings.changeDataCubes(newCubes), 'Cube removed');
+      this.props.onSave(this.state.newSettings.deleteDataCube(dataCube.name), 'Date cube removed');
       Notifier.removeQuestion();
     };
 
@@ -71,9 +63,9 @@ export class DataCubes extends React.Component<DataCubesProps, DataCubesState> {
     };
 
     Notifier.ask({
-      title: 'Remove this cube',
+      title: 'Remove this data cube',
       message: [
-        `Are you sure you would like to delete the data cube "${cube.title}"?`,
+        `Are you sure you would like to delete the data cube "${dataCube.title}"?`,
         'This action is not reversible.'
       ],
       choices: [
@@ -110,8 +102,8 @@ export class DataCubes extends React.Component<DataCubesProps, DataCubesState> {
     ];
 
     const actions: SimpleTableAction[] = [
-      {icon: require(`../../../icons/full-edit.svg`), callback: this.editCube.bind(this)},
-      {icon: require(`../../../icons/full-remove.svg`), callback: this.removeCube.bind(this)}
+      {icon: require(`../../../icons/full-edit.svg`), callback: this.editDataCube.bind(this)},
+      {icon: require(`../../../icons/full-remove.svg`), callback: this.removeDataCube.bind(this)}
     ];
 
     return <div className="data-cubes">
@@ -124,7 +116,7 @@ export class DataCubes extends React.Component<DataCubesProps, DataCubesState> {
           columns={columns}
           rows={newSettings.dataCubes}
           actions={actions}
-          onRowClick={this.editCube.bind(this)}
+          onRowClick={this.editDataCube.bind(this)}
         />
       </div>
     </div>;

src/common/models/app-settings/app-settings.ts

@@ -213,33 +213,16 @@ export class AppSettings implements Instance<AppSettingsValue, AppSettingsJS> {
     return new AppSettings(value);
   }
 
-  public deleteCollection(collection: Collection): AppSettings {
+  public deleteCollection(collectionName: string): AppSettings {
     var value = this.valueOf();
-    var index = value.collections.indexOf(collection);
-
-    if (index === -1) {
-      throw new Error(`Unknown collection : ${collection.toString()}`);
-    }
-
-    var newCollections = value.collections.concat();
-    newCollections.splice(index, 1);
-
-    value.collections = newCollections;
+    value.collections = value.collections.filter(collection => collection.name !== collectionName);
     return new AppSettings(value);
   }
 
-  public deleteDataCube(dataCube: DataCube): AppSettings {
+  public deleteDataCube(dataCubeName: string): AppSettings {
     var value = this.valueOf();
-    var index = value.dataCubes.indexOf(dataCube);
-
-    if (index === -1) {
-      throw new Error(`Unknown dataCube : ${dataCube.toString()}`);
-    }
-
-    var newDataCubes = value.dataCubes.concat();
-    newDataCubes.splice(index, 1);
-
-    value.dataCubes = newDataCubes;
+    value.dataCubes = value.dataCubes.filter(dataCube => dataCube.name !== dataCubeName);
+    value.collections = value.collections.map(collection => collection.deleteTilesContainingCube(dataCubeName));
     return new AppSettings(value);
   }