Improve update/import preset handling

The updated or imported preset will be automatically switched to.

Author: BashPrime

src/client/src/app/generate-game/generate-game.component.ts

@@ -26,6 +26,7 @@ export class GenerateGameComponent implements OnInit {
   private userPresets: PresetObject;
   private form: FormGroup;
   private ngUnsubscribe: Subject<any> = new Subject();
+  private lastUpdatedPreset: string;
 
   // Constants
   private readonly CUSTOM_PRESET = 'Custom';
@@ -69,6 +70,27 @@ export class GenerateGameComponent implements OnInit {
           this.loaded = true;
         }
       });
+
+    this.presetsService._previousAction
+    .pipe(takeUntil(this.ngUnsubscribe))
+    .subscribe(previousAction => {
+      switch (previousAction) {
+        case 'update':
+          if (this.lastUpdatedPreset) {
+            this.setPreset(this.lastUpdatedPreset);
+          }
+          break;
+        case 'remove':
+          this.setPreset(this.randomizerService.DEFAULT_PRESET);
+          break;
+      }
+    });
+
+    this.presetsService._lastUpdatedPreset
+    .pipe(takeUntil(this.ngUnsubscribe))
+    .subscribe(preset => {
+      this.lastUpdatedPreset = preset;
+    });
   }
 
   ngOnDestroy() {
@@ -188,7 +210,6 @@ export class GenerateGameComponent implements OnInit {
 
   removePreset(name: string): void {
     this.presetsService.removePreset(name);
-    this.form.patchValue({ preset: this.randomizerService.DEFAULT_PRESET });
   }
 
   generateSeed(spoiler: boolean) {
@@ -217,15 +238,5 @@ export class GenerateGameComponent implements OnInit {
         this.presets[key] = preset[key];
       }
     }
-
-    // After building presets, if we imported a preset, select it in the form
-    this.presetsService._importedPreset
-      .pipe(take(1))
-      .subscribe(preset => {
-        if (preset) {
-          this.setPreset(preset);
-          this.presetsService.clearImportPresetSubject();
-        }
-      });
   }
 }

src/client/src/app/services/presets.service.ts

@@ -10,13 +10,14 @@ import { RandomizerForm } from '../../../../common/models/randomizerForm';
   providedIn: 'root'
 })
 export class PresetsService {
-  private cachedImportedPreset: string;
   private defaultPresets$ = new BehaviorSubject<PresetObject>(undefined);
   private userPresets$ = new BehaviorSubject<PresetObject>(undefined);
-  private importedPreset$ = new BehaviorSubject<string>(undefined);
+  private previousAction$ = new BehaviorSubject<string>(undefined);
+  private lastUpdatedPreset$ = new BehaviorSubject<string>(undefined);
   _defaultPresets = this.defaultPresets$.asObservable();
   _userPresets = this.userPresets$.asObservable();
-  _importedPreset = this.importedPreset$.asObservable();
+  _previousAction = this.previousAction$.asObservable();
+  _lastUpdatedPreset = this.lastUpdatedPreset$.asObservable();
 
   constructor(private ngZone: NgZone, private electronService: ElectronService, private toastrService: ToastrService) {
     this.getAllPresets();
@@ -27,33 +28,28 @@ export class PresetsService {
       });
     });
 
-    this.electronService.ipcRenderer.on('getUserPresetsResponse', (event, response: PresetsResponse) => {
+    this.electronService.ipcRenderer.on('getUserPresetsResponse', (event, response: PresetsResponse, previousAction: string) => {
       this.ngZone.run(() => {
-        // Emit imported preset key if one is provided
-        if (this.cachedImportedPreset) {
-          this.importedPreset$.next(this.cachedImportedPreset);
-          this.cachedImportedPreset = null;
-        }
-
         this.handlePresetsResponse(response, this.userPresets$);
+        this.previousAction$.next(previousAction);
       });
     });
 
     this.electronService.ipcRenderer.on('updateUserPresetResponse', (event, response) => {
       this.ngZone.run(() => {
-        this.getUserPresets();
+        this.getUserPresets('update');
       });
     });
 
     this.electronService.ipcRenderer.on('removeUserPresetResponse', (event, response) => {
       this.ngZone.run(() => {
-        this.getUserPresets();
+        this.getUserPresets('remove');
       });
     });
 
     this.electronService.ipcRenderer.on('importPresetResponse', (event, key: string, preset: RandomizerForm) => {
       this.ngZone.run(() => {
-        this.cachedImportedPreset = key;
+        this.lastUpdatedPreset$.next(key);
         this.electronService.ipcRenderer.send('updateUserPreset', preset, key);
       });
     });
@@ -79,8 +75,8 @@ export class PresetsService {
     this.electronService.ipcRenderer.send('getDefaultPresets');
   }
 
-  getUserPresets() {
-    this.electronService.ipcRenderer.send('getUserPresets');
+  getUserPresets(previousAction?: string) {
+    this.electronService.ipcRenderer.send('getUserPresets', previousAction);
   }
 
   getAllPresets() {
@@ -89,6 +85,7 @@ export class PresetsService {
   }
 
   addOrUpdatePreset(name: string, preset: RandomizerForm) {
+    this.lastUpdatedPreset$.next(name);
     this.electronService.ipcRenderer.send('updateUserPreset', preset, name);
   }
 
@@ -122,10 +119,6 @@ export class PresetsService {
     });
   }
 
-  clearImportPresetSubject(): void {
-    this.importedPreset$.next(null);
-  }
-
   private handlePresetsResponse(response: PresetsResponse, subject: Subject<PresetObject>): void {
     // If presets and keys are defined, return the original order the presets were in, otherwise don't do anything
     if (!response.presets) {

src/electron/controllers/presetsController.ts

@@ -31,7 +31,7 @@ export function initialize() {
     event.sender.send('getDefaultPresetsResponse', response);
   });
 
-  ipcMain.on('getUserPresets', (event) => {
+  ipcMain.on('getUserPresets', (event, previousAction: string) => {
     const userPresetsResponse = 'getUserPresetsResponse';
 
     fs.access(userPresetsPath, fs.constants.R_OK, (err) => {
@@ -45,7 +45,7 @@ export function initialize() {
         readUserPresetsFile(response => {
           // Add to allPresets object
           Object.assign(allPresets, response.presets);
-          event.sender.send(userPresetsResponse, response);
+          event.sender.send(userPresetsResponse, response, previousAction);
         });
       }
     });