added ability to overwrite existing presets

Author: nodeful

native/app/Source/Audio/Effects/Equalizers/Basic/BasicEqualizerDataBus.swift

@@ -24,7 +24,6 @@ class BasicEqualizerDataBus: DataBus {
 
     self.on(.GET, "/presets/selected") { data, _ in
       let preset = BasicEqualizer.getPreset(id: self.state.selectedPresetId)
-      Console.log(preset)
       return JSON(preset!.dictionary)
     }
 

ui/src/app/components/confirm-dialog/confirm-dialog.component.html

@@ -4,11 +4,11 @@
   </eqm-label>
   <ng-content></ng-content>
   <div fxLayout="row" fxLayoutGap="10px">
-    <eqm-button type="narrow" fxFlex (pressed)="cancel()">
-      <eqm-label>{{cancelText}}</eqm-label>
-    </eqm-button>
     <eqm-button type="narrow" fxFlex (pressed)="confirm()">
       <eqm-label>{{confirmText}}</eqm-label>
     </eqm-button>
+    <eqm-button type="narrow" fxFlex (pressed)="cancel()">
+      <eqm-label>{{cancelText}}</eqm-label>
+    </eqm-button>
   </div>  
 </div>

ui/src/app/sections/effects/equalizers/advanced-equalizer/advanced-equalizer.component.ts

@@ -211,7 +211,18 @@ export class AdvancedEqualizerComponent extends EqualizerComponent implements On
 
   async savePreset (name: string) {
     const { gains } = this.selectedPreset
-    this.selectedPreset = await this.service.createPreset({ name, gains }, true)
+    const existingUserPreset = this.presets.filter(p => !p.isDefault).find(p => p.name === name)
+    if (existingUserPreset) {
+      // Overwrite
+      await this.service.updatePreset({ id: existingUserPreset.id, name, gains }, {
+        select: true
+      })
+      this.selectedPreset = existingUserPreset
+    } else {
+      // Create
+      this.selectedPreset = await this.service.createPreset({ name, gains }, true)
+    }
+    await this.syncPresets()
   }
 
   async deletePreset () {

ui/src/app/sections/effects/equalizers/basic-equalizer/basic-equalizer.component.ts

@@ -134,7 +134,16 @@ export class BasicEqualizerComponent extends EqualizerComponent implements OnIni
 
   async savePreset (name: string) {
     const { gains, peakLimiter } = this.selectedPreset
-    await this.service.createPreset({ name, gains, peakLimiter }, true)
+    const existingUserPreset = this.presets.filter(p => !p.isDefault).find(p => p.name === name)
+    if (existingUserPreset) {
+      // Overwrite
+      await this.service.updatePreset({ id: existingUserPreset.id, name, gains, peakLimiter }, {
+        select: true
+      })
+    } else {
+      // Create
+      await this.service.createPreset({ name, gains, peakLimiter }, true)
+    }
     await this.syncPresets()
   }
 

ui/src/app/sections/effects/equalizers/equalizer.component.ts

@@ -9,7 +9,7 @@ export abstract class EqualizerComponent {
   @Input() animationFps = 30
   @Input() settingsDialog: MatDialogRef<OptionsDialogComponent, any>
   abstract settings: Options
-  abstract async sync ()
+  abstract sync (): Promise<any>
   async selected () {
     await this.sync()
   }

ui/src/app/sections/effects/equalizers/presets/equalizer-presets.component.ts

@@ -29,36 +29,62 @@ export class EqualizerPresetsComponent implements OnInit {
   ngOnInit () {
   }
 
-  async savePreset () {
-    const dialog = this.dialog.open(PromptDialogComponent, {
+  async savePreset (presetName?: string) {
+    presetName = await this.dialog.open(PromptDialogComponent, {
       hasBackdrop: true,
       disableClose: true,
       data: {
         confirmText: 'Save',
         cancelText: 'Cancel',
         text: 'Please enter a name',
-        placeholder: 'New Preset name'
+        placeholder: 'New Preset name',
+        prompt: presetName
       }
-    })
+    }).afterClosed().toPromise()
 
-    const presetName = await dialog.afterClosed().toPromise()
     if (presetName) {
+      const existingPreset = this.presets.find(preset => preset.name === presetName)
+      if (existingPreset) {
+        if (existingPreset.isDefault) {
+          const saveAnyway: boolean = await this.dialog.open(ConfirmDialogComponent, {
+            hasBackdrop: true,
+            disableClose: true,
+            data: {
+              confirmText: 'Yes, save',
+              cancelText: 'No, cancel',
+              text: `A Default preset with this name already exists. Would you like to use this name anyway? You might see Duplicate names in the Preset list.`
+            }
+          }).afterClosed().toPromise()
+          if (!saveAnyway) return this.savePreset(presetName)
+        } else {
+          const overwrite: boolean = await this.dialog.open(ConfirmDialogComponent, {
+            hasBackdrop: true,
+            disableClose: true,
+            data: {
+              confirmText: 'Yes, overwrite',
+              cancelText: 'No, cancel',
+              text: `A preset with this name already exists. Would you like to overwrite it?`
+            }
+          }).afterClosed().toPromise()
+          if (!overwrite) return this.savePreset(presetName)
+        }
+      }
       this.presetSaved.emit(presetName)
     }
   }
 
   async deletePreset () {
-    const dialog = this.dialog.open(ConfirmDialogComponent, {
+    const shouldDelete = await this.dialog.open(ConfirmDialogComponent, {
       hasBackdrop: true,
       disableClose: true,
       data: {
         confirmText: 'Yes, remove',
         cancelText: 'No, cancel',
-        text: `Are you sure you want to delete this Preset?`
+        text: `Are you sure you want to remove this Preset?`
       }
-    })
+    }).afterClosed().toPromise()
 
-    if (await dialog.afterClosed().toPromise()) {
+    if (shouldDelete) {
       this.presetDeleted.emit()
     }
   }