1 files changed, 7 insertions, 84 deletions

diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts
index c34af75..b9983f6 100644
--- a/packages/main/src/stores/SharedStore.ts
+++ b/packages/main/src/stores/SharedStore.ts
@@ -19,71 +19,23 @@
  */
 
 import { SharedStore as SharedStoreBase } from '@sophie/shared';
-import {
-  applySnapshot,
-  getSnapshot,
-  IMSTArray,
-  IMSTMap,
-  Instance,
-  IReferenceType,
-  IStateTreeNode,
-  IType,
-  types,
-} from 'mobx-state-tree';
+import { getSnapshot, Instance, types } from 'mobx-state-tree';
 
 import { getLogger } from '../utils/log';
 import overrideProps from '../utils/overrideProps';
 
-import GlobalSettings, { GlobalSettingsSnapshotIn } from './GlobalSettings';
-import Profile, { addMissingProfileIds, ProfileConfig } from './Profile';
-import Service, {
-  addMissingServiceIdsAndProfiles,
-  ServiceConfig,
-} from './Service';
+import GlobalSettings from './GlobalSettings';
+import Profile from './Profile';
+import Service from './Service';
+import type Config from './config/Config';
+import loadConfig from './config/loadConfig';
 
 const log = getLogger('sharedStore');
 
-export interface Config extends GlobalSettingsSnapshotIn {
-  profiles?: ProfileConfig[] | undefined;
-
-  services?: ServiceConfig[] | undefined;
-}
-
 function getConfigs<T>(models: { config: T }[]): T[] | undefined {
   return models.length === 0 ? undefined : models.map((model) => model.config);
 }
 
-function applySettings<
-  C,
-  D extends IType<
-    { id: string; settings: C },
-    unknown,
-    { settings: IStateTreeNode<IType<C, unknown, unknown>> }
-  >,
->(
-  current: IMSTArray<IReferenceType<D>>,
-  currentById: IMSTMap<D>,
-  toApply: [string, C][],
-): void {
-  const toApplyById = new Map(toApply);
-  const toDelete = new Set(currentById.keys());
-  toApplyById.forEach((settingsSnapshot, id) => {
-    const model = currentById.get(id);
-    if (model === undefined) {
-      currentById.set(id, {
-        id,
-        settings: settingsSnapshot,
-      });
-    } else {
-      toDelete.delete(id);
-      applySnapshot(model.settings, settingsSnapshot);
-    }
-  });
-  current.clear();
-  toDelete.forEach((id) => currentById.delete(id));
-  current.push(...toApply.map(([id]) => id));
-}
-
 const SharedStore = overrideProps(SharedStoreBase, {
   settings: types.optional(GlobalSettings, {}),
   profilesById: types.map(Profile),
@@ -105,36 +57,7 @@ const SharedStore = overrideProps(SharedStoreBase, {
   }))
   .actions((self) => ({
     loadConfig(config: Config): void {
-      const {
-        profiles,
-        profilesById,
-        selectedService,
-        services,
-        servicesById,
-        settings,
-      } = self;
-      const { id: selectedServiceId } = selectedService ?? { id: undefined };
-      const {
-        profiles: profilesConfig,
-        services: servicesConfig,
-        ...settingsToApply
-      } = config;
-      const profilesToApply = addMissingProfileIds(profilesConfig);
-      const servicesToApply = addMissingServiceIdsAndProfiles(
-        servicesConfig,
-        profilesToApply,
-      );
-      applySettings(profiles, profilesById, profilesToApply);
-      applySettings(services, servicesById, servicesToApply);
-      applySnapshot(settings, settingsToApply);
-      let newSelectedService;
-      if (selectedServiceId !== undefined) {
-        newSelectedService = servicesById.get(selectedServiceId);
-      }
-      if (newSelectedService === undefined && services.length > 0) {
-        [newSelectedService] = services;
-      }
-      self.selectedService = newSelectedService;
+      loadConfig(self, config);
     },
     setShouldUseDarkColors(shouldUseDarkColors: boolean): void {
       self.shouldUseDarkColors = shouldUseDarkColors;