Fix possibility to open the same env multiple times

Closes #1381
mockoon · Apr 30, 2024 · 09e2c13 · 09e2c13
1 parent c006917
commit 09e2c13
Showing 1 changed file with 25 additions and 27 deletions.
diff --git a/packages/desktop/src/renderer/app/services/environments.service.ts b/packages/desktop/src/renderer/app/services/environments.service.ts
@@ -885,42 +885,40 @@ export class EnvironmentsService extends Logger {
     return this.dialogsService
       .showOpenDialog('Open environment JSON file', 'json', true, true)
       .pipe(
-        filter((filePaths) => {
+        switchMap((filePaths) => {
           if (!filePaths) {
-            return false;
+            return EMPTY;
           }
+          const environments = this.store.get('settings').environments;
 
-          // set environment as active if already opened
-          if (filePaths.length === 1) {
-            const openedEnvironment = this.store
-              .get('settings')
-              .environments.find(
-                (environmentItem) => environmentItem.path === filePaths[0]
-              );
+          const observables: Observable<Environment>[] = [];
+
+          filePaths.forEach((filePath) => {
+            const openedEnvironment = environments.find(
+              (environmentItem) => environmentItem.path === filePath
+            );
 
-            if (openedEnvironment !== undefined) {
+            if (openedEnvironment === undefined) {
+              observables.push(
+                this.storageService.loadEnvironment(filePath).pipe(
+                  switchMap((environment) => this.verifyData(environment)),
+                  tap((environment) => {
+                    this.validateAndAddToStore(environment, filePath);
+                  })
+                )
+              );
+            } else if (
+              openedEnvironment !== undefined &&
+              filePaths.length === 1
+            ) {
               this.store.update(
                 setActiveEnvironmentAction(openedEnvironment.uuid)
               );
-
-              return false;
             }
-          }
+          });
 
-          return true;
-        }),
-        switchMap((filePaths) =>
-          concat(
-            ...filePaths.map((filePath) =>
-              this.storageService.loadEnvironment(filePath).pipe(
-                switchMap((environment) => this.verifyData(environment)),
-                tap((environment) => {
-                  this.validateAndAddToStore(environment, filePath);
-                })
-              )
-            )
-          )
-        )
+          return concat(...observables);
+        })
       );
   }