1 files changed, 17 insertions, 46 deletions

diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts
index 9ec7963..499d1ee 100644
--- a/packages/main/src/stores/SharedStore.ts
+++ b/packages/main/src/stores/SharedStore.ts
@@ -55,25 +55,20 @@ function getConfigs<T>(models: { config: T }[]): T[] | undefined {
   return models.length === 0 ? undefined : models.map((model) => model.config);
 }
 
-type TypeWithSettings<C> = IType<
-  { id: string; settings: C },
-  unknown,
-  { settings: IStateTreeNode<IType<C, unknown, unknown>> }
->;
-
-function deleteStaleModels<C, D extends TypeWithSettings<C>>(
+function applySettings<
+  C,
+  D extends IType<
+    { id: string; settings: C },
+    unknown,
+    { settings: IStateTreeNode<IType<C, unknown, unknown>> }
+  >,
+>(
+  current: IMSTArray<IReferenceType<D>>,
   currentById: IMSTMap<D>,
-  toApplyById: Map<string, C>,
+  toApply: [string, C][],
 ): void {
+  const toApplyById = new Map(toApply);
   const toDelete = new Set(currentById.keys());
-  toApplyById.forEach((_settings, id) => toDelete.delete(id));
-  toDelete.forEach((id) => currentById.delete(id));
-}
-
-function applySettings<C, D extends TypeWithSettings<C>>(
-  currentById: IMSTMap<D>,
-  toApplyById: Map<string, C>,
-): void {
   toApplyById.forEach((settingsSnapshot, id) => {
     const model = currentById.get(id);
     if (model === undefined) {
@@ -82,16 +77,13 @@ function applySettings<C, D extends TypeWithSettings<C>>(
         settings: settingsSnapshot,
       });
     } else {
+      toDelete.delete(id);
       applySnapshot(model.settings, settingsSnapshot);
     }
   });
-}
-
-function pushReferences<C, D extends TypeWithSettings<C>>(
-  list: IMSTArray<IReferenceType<D>>,
-  toApply: [string, C][],
-): void {
-  list.push(...toApply.map(([id]) => id));
+  current.clear();
+  toDelete.forEach((id) => currentById.delete(id));
+  current.push(...toApply.map(([id]) => id));
 }
 
 export const sharedStore = overrideProps(originalSharedStore, {
@@ -115,9 +107,6 @@ export const sharedStore = overrideProps(originalSharedStore, {
   }))
   .actions((self) => ({
     loadConfig(config: Config): void {
-      // `onPatch` will send store changes piecemeal without any attention to
-      // transaction boundaries. We must make sure that any state communicated to the
-      // renderer process is actually valid.
       const {
         profiles,
         profilesById,
@@ -137,27 +126,9 @@ export const sharedStore = overrideProps(originalSharedStore, {
         servicesConfig,
         profilesToApply,
       );
-      const profilesToApplyById = new Map(profilesToApply);
-      const servicesToApplyById = new Map(servicesToApply);
-      // First remove any references to profiles and services that might be deleted.
-      self.selectedService = undefined;
-      services.clear();
-      profiles.clear();
-      // Delete all services that may depend on profiles that will be delete.
-      deleteStaleModels(servicesById, servicesToApplyById);
-      // Update existing profiles and add new profiles.
-      applySettings(profilesById, profilesToApplyById);
-      // Update existing services and add new services. This will make sure that no service
-      // depends on a profile that will be deleted.
-      applySettings(servicesById, servicesToApplyById);
-      // Now it's safe to delete stale profiles.
-      deleteStaleModels(profilesById, profilesToApplyById);
-      // We are ready to build new profile and service lists from the new models.
-      pushReferences(profiles, profilesToApply);
-      pushReferences(services, servicesToApply);
-      // Global settings may refer to particular profiles or services.
+      applySettings(profiles, profilesById, profilesToApply);
+      applySettings(services, servicesById, servicesToApply);
       applySnapshot(settings, settingsToApply);
-      // Restore service selection (if applicable).
       let newSelectedService;
       if (selectedServiceId !== undefined) {
         newSelectedService = servicesById.get(selectedServiceId);