1 files changed, 25 insertions, 20 deletions

diff --git a/packages/main/src/stores/Profile.ts b/packages/main/src/stores/Profile.ts
index 4705862..eaf23c4 100644
--- a/packages/main/src/stores/Profile.ts
+++ b/packages/main/src/stores/Profile.ts
@@ -18,34 +18,39 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { ProfileSnapshotIn } from '@sophie/shared';
+import {
+  profile as originalProfile,
+  ProfileSettingsSnapshotIn,
+} from '@sophie/shared';
+import { getSnapshot, Instance } from 'mobx-state-tree';
 
+import SettingsWithId from '../utils/SettingsWithId';
 import generateId from '../utils/generateId';
 
-export interface PartialProfileSnapshotIn
-  extends Omit<ProfileSnapshotIn, 'id'> {
+export interface ProfileConfig extends ProfileSettingsSnapshotIn {
   id?: string | undefined;
 }
 
+export const profile = originalProfile.views((self) => ({
+  get config(): ProfileConfig {
+    const { id, settings } = self;
+    return { ...getSnapshot(settings), id };
+  },
+}));
+
+export interface Profile extends Instance<typeof profile> {}
+
+export type ProfileSettingsSnapshotWithId =
+  SettingsWithId<ProfileSettingsSnapshotIn>;
+
 export function addMissingProfileIds(
-  partialProfiles: PartialProfileSnapshotIn[] | undefined,
-): ProfileSnapshotIn[] {
-  return (partialProfiles ?? []).map((profile) => {
-    const { name } = profile;
-    let { id } = profile;
-    if (typeof id === 'undefined') {
-      id = generateId(name);
-    }
+  profileConfigs: ProfileConfig[] | undefined,
+): ProfileSettingsSnapshotWithId[] {
+  return (profileConfigs ?? []).map((profileConfig) => {
+    const { id, ...settings } = profileConfig;
     return {
-      ...profile,
-      id,
+      id: typeof id === 'undefined' ? generateId(settings.name) : id,
+      settings,
     };
   });
 }
-
-export type {
-  Profile,
-  ProfileSnapshotOut,
-  ProfileSnapshotIn,
-} from '@sophie/shared';
-export { profile } from '@sophie/shared';