Use snapshot preprocessor to filter out non-array old connectionInsta…

…nces (#1910)

* Snapshot preprocessor to try to avoid connectionInstances

* Add is-object dependency and add to jbrowse-desktop also

products/jbrowse-desktop/package.json

@@ -71,6 +71,7 @@
     "electron-debug": "^3.0.1",
     "electron-is-dev": "^1.1.0",
     "fontsource-roboto": "3.0.3",
+    "is-object": "^1.0.2",
     "json-stable-stringify": "^1.0.1",
     "mobx": "^5.10.1",
     "mobx-react": "^6.0.0",

products/jbrowse-desktop/src/sessionModelFactory.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { AnyConfigurationModel } from '@jbrowse/core/configuration/configurationSchema'
+import isObject from 'is-object'
 import {
   readConfObject,
   isConfigurationModel,
@@ -41,7 +42,7 @@ export default function sessionModelFactory(
   assemblyConfigSchemasType = types.frozen(), // if not using sessionAssemblies
 ) {
   const minDrawerWidth = 128
-  return types
+  const sessionModel = types
     .model('JBrowseDesktopSessionModel', {
       name: types.identifier,
       margin: 0,
@@ -552,6 +553,23 @@ export default function sessionModelFactory(
         ]
       },
     }))
+
+  return types.snapshotProcessor(sessionModel, {
+    // @ts-ignore
+    preProcessor(snapshot) {
+      if (snapshot) {
+        // @ts-ignore
+        const { connectionInstances, ...rest } = snapshot || {}
+        // connectionInstances schema changed from object to an array, so any
+        // old connectionInstances as object is in snapshot, filter it out
+        // https://github.com/GMOD/jbrowse-components/issues/1903
+        if (isObject(connectionInstances)) {
+          return rest
+        }
+      }
+      return snapshot
+    },
+  })
 }
 
 export type SessionStateModel = ReturnType<typeof sessionModelFactory>

products/jbrowse-web/package.json

@@ -50,6 +50,7 @@
     "crypto-js": "^3.0.0",
     "fastestsmallesttextencoderdecoder": "^1.0.14",
     "fontsource-roboto": "3.0.3",
+    "is-object": "^1.0.2",
     "json-stable-stringify": "^1.0.1",
     "merge-deep": "^3.0.2",
     "mobx": "^5.10.1",

products/jbrowse-web/src/sessionModelFactory.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { AnyConfigurationModel } from '@jbrowse/core/configuration/configurationSchema'
+import isObject from 'is-object'
 import {
   readConfObject,
   getConf,
@@ -46,7 +47,7 @@ export default function sessionModelFactory(
   assemblyConfigSchemasType = types.frozen(), // if not using sessionAssemblies
 ) {
   const minDrawerWidth = 128
-  return types
+  const sessionModel = types
     .model('JBrowseWebSessionModel', {
       id: types.optional(types.identifier, shortid()),
       name: types.string,
@@ -650,6 +651,23 @@ export default function sessionModelFactory(
         ]
       },
     }))
+
+  return types.snapshotProcessor(sessionModel, {
+    // @ts-ignore
+    preProcessor(snapshot) {
+      if (snapshot) {
+        // @ts-ignore
+        const { connectionInstances, ...rest } = snapshot || {}
+        // connectionInstances schema changed from object to an array, so any
+        // old connectionInstances as object is in snapshot, filter it out
+        // https://github.com/GMOD/jbrowse-components/issues/1903
+        if (isObject(connectionInstances)) {
+          return rest
+        }
+      }
+      return snapshot
+    },
+  })
 }
 
 export type SessionStateModel = ReturnType<typeof sessionModelFactory>