From d6031f22b764a94e41400a68b9637226f9e90923 Mon Sep 17 00:00:00 2001 From: Michael Giek Date: Sun, 19 Jan 2025 08:36:43 +0100 Subject: [PATCH] #118 - Changes from PR --- src/main/environment/service/environment-service.ts | 2 +- src/main/event/main-event-service.ts | 6 +++--- src/renderer/services/event/renderer-event-service.ts | 2 +- src/renderer/state/variableStore.ts | 2 +- src/shim/event-service.ts | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/environment/service/environment-service.ts b/src/main/environment/service/environment-service.ts index 22454157..2c8ec11f 100644 --- a/src/main/environment/service/environment-service.ts +++ b/src/main/environment/service/environment-service.ts @@ -55,7 +55,7 @@ export class EnvironmentService implements Initializable { * Sets and saves all variables in the current collection. * @param variables */ - public setAndSaveAllVariables(variables: VariableObject[]) { + public setCollectionVariables(variables: VariableObject[]) { this.currentCollection.variables = {}; variables.forEach((variable) => (this.currentCollection.variables[variable.key] = variable)); } diff --git a/src/main/event/main-event-service.ts b/src/main/event/main-event-service.ts index d4bc346d..99d8ccfb 100644 --- a/src/main/event/main-event-service.ts +++ b/src/main/event/main-event-service.ts @@ -6,7 +6,7 @@ import { PersistenceService } from '../persistence/service/persistence-service'; import { TrufosObject } from 'shim/objects'; import { EnvironmentService } from 'main/environment/service/environment-service'; import './stream-events'; -import { VariableObject } from '../../shim/variables'; +import { VariableObject } from 'shim/variables'; const persistenceService = PersistenceService.instance; const environmentService = EnvironmentService.instance; @@ -102,8 +102,8 @@ export class MainEventService implements IEventService { return environmentService.getVariable(key); } - async setAndSaveAllVariables(variables: VariableObject[]) { - environmentService.setAndSaveAllVariables(variables); + async setCollectionVariables(variables: VariableObject[]) { + environmentService.setCollectionVariables(variables); await persistenceService.saveCollection(environmentService.currentCollection); } } diff --git a/src/renderer/services/event/renderer-event-service.ts b/src/renderer/services/event/renderer-event-service.ts index 57d5a814..e3892984 100644 --- a/src/renderer/services/event/renderer-event-service.ts +++ b/src/renderer/services/event/renderer-event-service.ts @@ -11,7 +11,7 @@ const METHOD_NAMES = new Set([ 'deleteObject', 'getActiveEnvironmentVariables', 'getVariable', - 'setAndSaveAllVariables', + 'setCollectionVariables', ]); const INSTANCE = {} as IEventService; diff --git a/src/renderer/state/variableStore.ts b/src/renderer/state/variableStore.ts index 5b278afc..82afe361 100644 --- a/src/renderer/state/variableStore.ts +++ b/src/renderer/state/variableStore.ts @@ -53,7 +53,7 @@ export const useVariableStore = create()( }); }, save: () => { - RendererEventService.instance.setAndSaveAllVariables(get().variables); + RendererEventService.instance.setCollectionVariables(get().variables); set((state) => { state.variables = []; state.isOpen = false; diff --git a/src/shim/event-service.ts b/src/shim/event-service.ts index f6cfb964..57f8786d 100644 --- a/src/shim/event-service.ts +++ b/src/shim/event-service.ts @@ -65,8 +65,8 @@ export interface IEventService { getVariable(key: string): Promise; /** - * Set a variable. - * @param variables + * Set the collection variables. + * @param variables The variables of the Collection to set. */ - setAndSaveAllVariables(variables: VariableObject[]): void; + setCollectionVariables(variables: VariableObject[]): void; }