Fix mobx: deleting a node should be done through destroy

mrdjohnson · Apr 4, 2024 · ae9693b · ae9693b
1 parent a1902f2
commit ae9693b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/src/models/ChatModel.ts b/src/models/ChatModel.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { types, Instance, detach, flow, cast } from 'mobx-state-tree'
+import { types, Instance, flow, cast, destroy } from 'mobx-state-tree'
 import moment from 'moment'
 
 import { IMessageModel, MessageModel } from '~/models/MessageModel'
@@ -82,9 +82,7 @@ export const ChatModel = types
     },
 
     deleteMessage(message: IMessageModel) {
-      detach(message)
-
-      _.remove(self.messages, message)
+      destroy(message)
     },
 
     findAndRegenerateResponse() {

diff --git a/src/models/ChatStore.ts b/src/models/ChatStore.ts
@@ -1,4 +1,4 @@
-import { detach, types, SnapshotIn } from 'mobx-state-tree'
+import { types, SnapshotIn, destroy } from 'mobx-state-tree'
 import persist from 'mst-persist'
 import _ from 'lodash'
 
@@ -24,15 +24,15 @@ export const ChatStore = types
     },
 
     deleteChat(chat: IChatModel) {
-      detach(chat)
-
-      _.remove(self.chats, { id: chat.id })
-
-      if (!_.isEmpty(self.chats)) {
+      if (self.selectedChat?.id === chat.id) {
         self.selectedChat = self.chats[0]
-      } else {
+      }
+
+      if (!self.selectedChat) {
         this.createChat()
       }
+
+      destroy(chat)
     },
 
     selectChat(chat: IChatModel) {

diff --git a/src/models/PersonaStore.ts b/src/models/PersonaStore.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { Instance, cast, detach, types } from 'mobx-state-tree'
+import { Instance, cast, destroy, types } from 'mobx-state-tree'
 import { persist } from 'mst-persist'
 
 export const PersonaModel = types.model({
@@ -29,13 +29,7 @@ const PersonaStore = types
       },
 
       deletePersona(persona: IPersonaModel) {
-        detach(persona)
-
-        _.remove(self.personas, persona)
-
-        if (persona === self.selectedPersona) {
-          self.selectedPersona = undefined
-        }
+        destroy(persona)
       },
 
       duplicatePersona(persona: IPersonaModel) {

diff --git a/src/models/ToastStore.ts b/src/models/ToastStore.ts
@@ -1,4 +1,4 @@
-import { types, cast, Instance, detach } from 'mobx-state-tree'
+import { types, cast, Instance, destroy } from 'mobx-state-tree'
 import _ from 'lodash'
 
 const ToastModel = types.model({
@@ -25,10 +25,8 @@ const ToastStore = types
       self.toasts = cast([...toasts, { id: _.uniqueId('toast_'), message: message, type }])
     },
 
-    removeToast(toast: { id: string }) {
-      detach(toast)
-
-      _.remove(self.toasts, toast)
+    removeToast(toast: IToastModel) {
+      destroy(toast)
     },
 
     clearToasts() {