From 97c52f3cc9051a746b731ca3f5909abde1a5ddc4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:03:14 -0700
Subject: [PATCH 01/59] Add auth header to spell service.  Use live get spell
 endpoint.

---
 client/src/state/spells.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index e6981562c..b44767140 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -2,6 +2,7 @@ import { createSelector } from '@reduxjs/toolkit'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
 import { Spell as SpellType } from '@latitudegames/thoth-core/types'
 
+import { getAuthHeader } from '../utils/authHelper'
 import { initDB } from '../database'
 
 function camelize(str) {
@@ -45,18 +46,25 @@ const versions: Record<string, DeployedSpellVersion[]> = {}
 export const spellApi = createApi({
   reducerPath: 'spellApi',
   baseQuery: fetchBaseQuery({
-    baseUrl: process.env.REACT_APP_API_URL || 'localhost:8000/',
+    baseUrl: `${process.env.REACT_APP_API_URL}/game` || 'localhost:8000/game',
+    prepareHeaders: headers => {
+      const authHeader = getAuthHeader()
+      if (authHeader?.Authorization)
+        headers.set('authorization', authHeader['Authorization'])
+      return headers
+    },
   }),
   tagTypes: ['Spell', 'Version'],
   endpoints: builder => ({
     getSpells: builder.query<Spell[], void>({
       providesTags: ['Spell'],
-      async queryFn() {
-        const spellModel = await _spellModel()
-        const spells = await spellModel.getSpells()
+      query: () => '/spells',
+      // async queryFn() {
+      //   const spellModel = await _spellModel()
+      //   const spells = await spellModel.getSpells()
 
-        return { data: spells.map(spell => spell.toJSON()) }
-      },
+      //   return { data: spells.map(spell => spell.toJSON()) }
+      // },
     }),
     getSpell: builder.query<Spell, string>({
       providesTags: ['Spell'],

From 855c35fdedb041162b9326091e404eebe800c81f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:18:43 -0700
Subject: [PATCH 02/59] Connect new spell to save spell endpoint

---
 client/src/state/spells.ts | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index b44767140..59b4ffe44 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -59,12 +59,6 @@ export const spellApi = createApi({
     getSpells: builder.query<Spell[], void>({
       providesTags: ['Spell'],
       query: () => '/spells',
-      // async queryFn() {
-      //   const spellModel = await _spellModel()
-      //   const spells = await spellModel.getSpells()
-
-      //   return { data: spells.map(spell => spell.toJSON()) }
-      // },
     }),
     getSpell: builder.query<Spell, string>({
       providesTags: ['Spell'],
@@ -85,13 +79,16 @@ export const spellApi = createApi({
     }),
     newSpell: builder.mutation<Spell, Partial<Spell>>({
       invalidatesTags: ['Spell'],
-      async queryFn(spellData) {
-        const newSpell = { gameState: {}, ...spellData }
-        const spellModel = await _spellModel()
-
-        const spell = await spellModel.newSpell(newSpell)
-
-        return { data: spell.toJSON() }
+      query: spellData => {
+        const spell = {
+          ...spellData,
+          gameState: {},
+        }
+        return {
+          url: '/spells/save',
+          method: 'POST',
+          body: spell,
+        }
       },
     }),
     deploySpell: builder.mutation<DeployedSpellVersion, DeployArgs>({

From 15fd37eee3d8fa853a5e0208a65409d1b9de4033 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:43:06 -0700
Subject: [PATCH 03/59] Change access route to graph in editor provider

---
 client/src/contexts/EditorProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/contexts/EditorProvider.tsx b/client/src/contexts/EditorProvider.tsx
index d842862bb..391ae0cf8 100644
--- a/client/src/contexts/EditorProvider.tsx
+++ b/client/src/contexts/EditorProvider.tsx
@@ -86,7 +86,7 @@ const EditorProvider = ({ children }) => {
     // set editor to the map
     setEditor(newEditor)
 
-    if (tab.type === 'spell') newEditor.loadGraph(spell.graph)
+    if (tab.type === 'spell') newEditor.loadGraph(spell.chain.graph)
 
     if (tab.type === 'module') {
       const moduleDoc = await thoth.getModule(tab.module)

From da0e3e8dd6594e2f37a9fa4f375e842df4543be5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:43:47 -0700
Subject: [PATCH 04/59] Change route to access graph in module provider

---
 client/src/contexts/ModuleProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/contexts/ModuleProvider.tsx b/client/src/contexts/ModuleProvider.tsx
index 37bfcde4e..af1095d31 100644
--- a/client/src/contexts/ModuleProvider.tsx
+++ b/client/src/contexts/ModuleProvider.tsx
@@ -77,7 +77,7 @@ const ModuleProvider = ({ children }) => {
 
   const getSpellModules = async spell => {
     // should actually look for spells that have a data.module key set to a string
-    const moduleNames = Object.values(spell.graph.nodes)
+    const moduleNames = Object.values(spell.chain.graph.nodes)
       .filter((n: any) => n.name === 'Module')
       .map((n: any) => n.data.name)
 

From 4ea159daa2d425f327c0e38b2753a0365b20157c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:44:08 -0700
Subject: [PATCH 05/59] Use default name in create new to create tab

---
 client/src/features/StartScreen/components/CreateNew.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/features/StartScreen/components/CreateNew.jsx b/client/src/features/StartScreen/components/CreateNew.jsx
index 87c7a60aa..d29f63e80 100644
--- a/client/src/features/StartScreen/components/CreateNew.jsx
+++ b/client/src/features/StartScreen/components/CreateNew.jsx
@@ -48,7 +48,11 @@ const CreateNew = () => {
     })
 
     await clearTabs()
-    await openTab({ name: spell.name, spellId: spell.name, type: 'spell' })
+    await openTab({
+      name: placeholderName,
+      spellId: placeholderName,
+      type: 'spell',
+    })
     setLocation('/thoth')
   }
 

From 4b7260f4781f99b03d3dac3f4b026fa778ff0a3c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:44:22 -0700
Subject: [PATCH 06/59] Check for trab spell as well before loading

---
 client/src/features/Thoth/components/Workspace.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/components/Workspace.jsx b/client/src/features/Thoth/components/Workspace.jsx
index 34adaa7c4..05a56fcbc 100644
--- a/client/src/features/Thoth/components/Workspace.jsx
+++ b/client/src/features/Thoth/components/Workspace.jsx
@@ -39,7 +39,7 @@ const Workspace = ({ tab, appPubSub }) => {
   }, [editor])
 
   useEffect(() => {
-    if (!tab) return
+    if (!tab || !tab.spell) return
     loadSpell(tab.spell)
   }, [tab])
 

From baf35bbdca1700628aa8db6f0841b5579a0919d7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:44:49 -0700
Subject: [PATCH 07/59] Switch get spell to use proper endpoint

---
 client/src/state/spells.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index 59b4ffe44..e807e5e7d 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -62,11 +62,10 @@ export const spellApi = createApi({
     }),
     getSpell: builder.query<Spell, string>({
       providesTags: ['Spell'],
-      async queryFn(spellId) {
-        const spellModel = await _spellModel()
-        const spell = await spellModel.getSpell(spellId)
-
-        return { data: spell.toJSON() }
+      query: spellId => {
+        return {
+          url: `spells/${spellId}`,
+        }
       },
     }),
     saveSpell: builder.mutation<Partial<Spell>, Partial<Spell>>({

From 71efbc6c01c8ebed4510c8606d6f47178c1d4daf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 12:45:56 -0700
Subject: [PATCH 08/59] Add implementation note to save spell service reducer

---
 client/src/state/spells.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index e807e5e7d..8738084a6 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -72,6 +72,7 @@ export const spellApi = createApi({
       invalidatesTags: ['Spell'],
       async queryFn(spell) {
         const spellModel = await _spellModel()
+        // get modules here and add the, serialize spell into json blob, and send to sendpoint.
         const updatedSpell = await spellModel.saveSpell(spell.name, spell)
         return { data: updatedSpell.toJSON() }
       },

From c72abd070aab77d72edfd5cd3b1caa43bb818b25 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 17:56:14 -0700
Subject: [PATCH 09/59] Add get spell modules helper function to module model

---
 client/src/database/models/moduleModel.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts
index 1db3ba8a9..a0e51d1d3 100644
--- a/client/src/database/models/moduleModel.ts
+++ b/client/src/database/models/moduleModel.ts
@@ -68,6 +68,21 @@ const loadModuleModel = db => {
     return await db.modules.insert(newModule)
   }
 
+  const getSpellModules = async spell => {
+    // should actually look for spells that have a data.module key set to a string
+    const moduleNames = Object.values(spell.chain.graph.nodes)
+      .filter((n: any) => n.name === 'Module')
+      .map((n: any) => n.data.name)
+
+    const moduleDocs = await Promise.all(
+      moduleNames.map(moduleName => getModule(moduleName))
+    )
+
+    // todo need tobe recursive probably.  Or we add the modules used to the spell when created?
+
+    return moduleDocs.map(module => module.toJSON())
+  }
+
   return {
     insert,
     getModules,
@@ -76,6 +91,7 @@ const loadModuleModel = db => {
     updateModule,
     findOneModule,
     updateOrCreate,
+    getSpellModules,
   }
 }
 export default loadModuleModel

From b8e98109d07a4d0a81856cc6be7218a6cca2a733 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 17:57:08 -0700
Subject: [PATCH 10/59] Get save spell working utilizing queryFn

---
 client/src/state/spells.ts | 45 ++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index 8738084a6..760f54bef 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -1,9 +1,14 @@
 import { createSelector } from '@reduxjs/toolkit'
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
+import {
+  createApi,
+  fetchBaseQuery,
+  FetchBaseQueryError,
+} from '@reduxjs/toolkit/query/react'
 import { Spell as SpellType } from '@latitudegames/thoth-core/types'
 
 import { getAuthHeader } from '../utils/authHelper'
 import { initDB } from '../database'
+import { QueryReturnValue } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
 
 function camelize(str) {
   return str
@@ -13,16 +18,23 @@ function camelize(str) {
     .replace(/\s+/g, '')
 }
 
-const _spellModel = async () => {
+// const _spellModel = async () => {
+//   const db = await initDB()
+//   const { spells } = db.models
+//   return spells
+// }
+
+const _moduleModel = async () => {
   const db = await initDB()
-  const { spells } = db.models
-  return spells
+  const { modules } = db.models
+  return modules
 }
 export interface Spell {
   id?: string
   user?: Record<string, unknown> | null | undefined
   name: string
   graph: SpellType
+  modules: SpellType[]
   gameState: Record<string, unknown>
   createdAt?: number
   updatedAt?: number
@@ -70,11 +82,26 @@ export const spellApi = createApi({
     }),
     saveSpell: builder.mutation<Partial<Spell>, Partial<Spell>>({
       invalidatesTags: ['Spell'],
-      async queryFn(spell) {
-        const spellModel = await _spellModel()
-        // get modules here and add the, serialize spell into json blob, and send to sendpoint.
-        const updatedSpell = await spellModel.saveSpell(spell.name, spell)
-        return { data: updatedSpell.toJSON() }
+      // needed to use queryFn as query option didnt seem to allow async functions.
+      async queryFn(spell, api, extraOptions, baseQuery) {
+        const moduleModel = await _moduleModel()
+        const modules = await moduleModel.getSpellModules(spell)
+
+        spell.modules = modules
+
+        const baseQueryOptions = {
+          url: 'spells/save',
+          body: spell,
+          method: 'POST',
+        }
+
+        // cast into proper response shape expected by queryFn return
+        // probbably a way to directly pass in type args to baseQuery but couldnt find.
+        return baseQuery(baseQueryOptions) as QueryReturnValue<
+          Partial<Spell>,
+          FetchBaseQueryError,
+          unknown
+        >
       },
     }),
     newSpell: builder.mutation<Spell, Partial<Spell>>({

From d46067d36803eeb992132aa24887440b597d9c5a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 18:14:11 -0700
Subject: [PATCH 11/59] hook up deploy spell and get deployments

---
 client/src/state/spells.ts | 45 ++++++++++++--------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index 760f54bef..bdd10ece9 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -10,13 +10,13 @@ import { getAuthHeader } from '../utils/authHelper'
 import { initDB } from '../database'
 import { QueryReturnValue } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
 
-function camelize(str) {
-  return str
-    .replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
-      return index === 0 ? word.toLowerCase() : word.toUpperCase()
-    })
-    .replace(/\s+/g, '')
-}
+// function camelize(str) {
+//   return str
+//     .replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
+//       return index === 0 ? word.toLowerCase() : word.toUpperCase()
+//     })
+//     .replace(/\s+/g, '')
+// }
 
 // const _spellModel = async () => {
 //   const db = await initDB()
@@ -52,9 +52,6 @@ export interface DeployArgs {
   message: string
 }
 
-// stubbed temp data
-const versions: Record<string, DeployedSpellVersion[]> = {}
-
 export const spellApi = createApi({
   reducerPath: 'spellApi',
   baseQuery: fetchBaseQuery({
@@ -120,33 +117,19 @@ export const spellApi = createApi({
     }),
     deploySpell: builder.mutation<DeployedSpellVersion, DeployArgs>({
       invalidatesTags: ['Version'],
-      async queryFn({ spellId, message }) {
-        if (!versions[spellId]) versions[spellId] = []
-
-        const _versions = versions[spellId]
-        const version = '0.0.' + (_versions.length + 1)
-        const url = `${process.env.REACT_APP_API_URL}/spells/${camelize(
-          spellId
-        )}/${version}`
-        const deployment = { version, message, spellId, url }
-
-        versions[spellId].push(deployment)
-
+      query({ spellId, message }) {
         return {
-          data: deployment as DeployedSpellVersion,
+          url: `/spells/${spellId}/deploy`,
+          body: {
+            message,
+          },
+          method: 'POST',
         }
       },
     }),
     getDeployments: builder.query<DeployedSpellVersion[], string>({
       providesTags: ['Version'],
-      async queryFn(spellId) {
-        console.log('egtting versions!')
-        const result = versions[spellId] || []
-        console.log('results', result)
-        return {
-          data: result.reverse(),
-        }
-      },
+      query: spellId => ({ url: `/spells/deployed/${spellId}` }),
     }),
   }),
 })

From a8f81feabb764cbcbe095be1bd58c28257ea3689 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 18:14:29 -0700
Subject: [PATCH 12/59] Fix fetching empty deployments bug

---
 .../features/Thoth/components/EditorWindow/Deployment.tsx  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/features/Thoth/components/EditorWindow/Deployment.tsx b/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
index 1ac68143a..9d0ce00ac 100644
--- a/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
+++ b/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
@@ -22,9 +22,10 @@ const DeploymentView = ({ open, setOpen, spellId }) => {
 
   const [deploySpell] = useDeploySpellMutation()
   const spell = useSelector(state => selectSpellById(state, spellId))
-  const { data: deployments, isLoading } = useGetDeploymentsQuery(
-    spell?.name || ''
-  )
+  const name = spell?.name as string
+  const { data: deployments, isLoading } = useGetDeploymentsQuery(name, {
+    skip: !spell?.name,
+  })
 
   const deploy = message => {
     if (!spell) return

From faffb1076459841144912b7d36da388d77a98754 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 18:19:17 -0700
Subject: [PATCH 13/59] Add url to all versions

---
 .../Thoth/components/EditorWindow/Deployment.tsx     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/src/features/Thoth/components/EditorWindow/Deployment.tsx b/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
index 9d0ce00ac..7e6a09541 100644
--- a/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
+++ b/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
@@ -33,6 +33,12 @@ const DeploymentView = ({ open, setOpen, spellId }) => {
     enqueueSnackbar('Spell deployed', { variant: 'success' })
   }
 
+  const buildUrl = version => {
+    return encodeURI(
+      `${process.env.REACT_APP_API_URL}/games/spells/${spellId}/${version}`
+    )
+  }
+
   const copy = url => {
     const el = document.createElement('textarea')
     el.value = url
@@ -128,10 +134,12 @@ const DeploymentView = ({ open, setOpen, spellId }) => {
                       >
                         <Input
                           style={{ flex: 1 }}
-                          value={deploy.url}
+                          value={buildUrl(deploy.version)}
                           readonly
                         />
-                        <button onClick={() => copy(deploy.url)}>copy</button>
+                        <button onClick={() => copy(buildUrl(deploy.version))}>
+                          copy
+                        </button>
                       </div>
                       <p> Change notes </p>
                       <Panel

From d2420fba9e0399371030563c76b28091f40149c1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 18:24:23 -0700
Subject: [PATCH 14/59] Return empty array of no modules on spell

---
 client/src/database/models/moduleModel.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts
index a0e51d1d3..5e9f608c7 100644
--- a/client/src/database/models/moduleModel.ts
+++ b/client/src/database/models/moduleModel.ts
@@ -80,6 +80,7 @@ const loadModuleModel = db => {
 
     // todo need tobe recursive probably.  Or we add the modules used to the spell when created?
 
+    if (moduleDocs.length === 0) return []
     return moduleDocs.map(module => module.toJSON())
   }
 

From f98024728182d9b3a03edf366945963921959721 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 9 Oct 2021 18:25:01 -0700
Subject: [PATCH 15/59] Filter out possible undefined from module fetching

---
 client/src/database/models/moduleModel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts
index 5e9f608c7..fecf7d793 100644
--- a/client/src/database/models/moduleModel.ts
+++ b/client/src/database/models/moduleModel.ts
@@ -81,7 +81,7 @@ const loadModuleModel = db => {
     // todo need tobe recursive probably.  Or we add the modules used to the spell when created?
 
     if (moduleDocs.length === 0) return []
-    return moduleDocs.map(module => module.toJSON())
+    return moduleDocs.filter(Boolean).map(module => module.toJSON())
   }
 
   return {

From b721672f16c72deb21c735c3246a28c76740da1b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 00:07:39 -0700
Subject: [PATCH 16/59] fix readonly dom property eror

---
 .../src/features/Thoth/components/EditorWindow/Deployment.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/components/EditorWindow/Deployment.tsx b/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
index 7e6a09541..cd0645583 100644
--- a/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
+++ b/client/src/features/Thoth/components/EditorWindow/Deployment.tsx
@@ -135,7 +135,7 @@ const DeploymentView = ({ open, setOpen, spellId }) => {
                         <Input
                           style={{ flex: 1 }}
                           value={buildUrl(deploy.version)}
-                          readonly
+                          readOnly
                         />
                         <button onClick={() => copy(buildUrl(deploy.version))}>
                           copy

From cb6c24a76e9de0a4c16a4e650fc019d2f2c16a17 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 00:07:54 -0700
Subject: [PATCH 17/59] Dont invalidate cache on save spell

---
 client/src/state/spells.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index bdd10ece9..1d8d1a74d 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -78,7 +78,7 @@ export const spellApi = createApi({
       },
     }),
     saveSpell: builder.mutation<Partial<Spell>, Partial<Spell>>({
-      invalidatesTags: ['Spell'],
+      // invalidatesTags: ['Spell'],
       // needed to use queryFn as query option didnt seem to allow async functions.
       async queryFn(spell, api, extraOptions, baseQuery) {
         const moduleModel = await _moduleModel()

From 7cf356c7b657205d5db1cb317ca91d8105a27e11 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 00:20:16 -0700
Subject: [PATCH 18/59] Fix module loading bug

---
 client/src/contexts/EditorProvider.tsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/src/contexts/EditorProvider.tsx b/client/src/contexts/EditorProvider.tsx
index 391ae0cf8..c6ee9d126 100644
--- a/client/src/contexts/EditorProvider.tsx
+++ b/client/src/contexts/EditorProvider.tsx
@@ -70,8 +70,6 @@ const EditorProvider = ({ children }) => {
   }
 
   const buildEditor = async (container, _spell, tab, thoth) => {
-    // copy spell in case it is read only
-    const spell = JSON.parse(JSON.stringify(_spell))
     // eslint-disable-next-line no-console
     const newEditor = await initEditor({
       container,
@@ -86,7 +84,11 @@ const EditorProvider = ({ children }) => {
     // set editor to the map
     setEditor(newEditor)
 
-    if (tab.type === 'spell') newEditor.loadGraph(spell.chain.graph)
+    if (tab.type === 'spell') {
+      // copy spell in case it is read onl
+      const spell = JSON.parse(JSON.stringify(_spell))
+      newEditor.loadGraph(spell.chain.graph)
+    }
 
     if (tab.type === 'module') {
       const moduleDoc = await thoth.getModule(tab.module)
@@ -156,10 +158,11 @@ const RawEditor = ({ tab, children }) => {
   useEffect(() => {
     if (!tab) return
 
-    getSpell(tab.spell)
+    if (tab?.spell) getSpell(tab.spell)
   }, [tab])
 
-  if (isLoading || !tab || !spell) return <LoadingScreen />
+  if (!tab || (tab.type === 'spell' && (isLoading || !spell)))
+    return <LoadingScreen />
 
   return (
     <>

From d24b268ae972234ad4c0b35eba61ea2f26d4a63f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:31:26 -0700
Subject: [PATCH 19/59] Remove console log

---
 client/src/database/models/moduleModel.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts
index fecf7d793..b0ca2ceeb 100644
--- a/client/src/database/models/moduleModel.ts
+++ b/client/src/database/models/moduleModel.ts
@@ -26,9 +26,6 @@ const loadModuleModel = db => {
   const updateModule = async (moduleName: string, update: object) => {
     const module = await getModule(moduleName)
 
-    // eslint-disable-next-line
-    console.log('module', module)
-
     const updatedModule = await module.atomicUpdate(oldData => {
       return {
         ...oldData,
@@ -70,7 +67,7 @@ const loadModuleModel = db => {
 
   const getSpellModules = async spell => {
     // should actually look for spells that have a data.module key set to a string
-    const moduleNames = Object.values(spell.chain.graph.nodes)
+    const moduleNames = Object.values(spell.chain.nodes)
       .filter((n: any) => n.name === 'Module')
       .map((n: any) => n.data.name)
 

From 17bb61d63daf67a8d8e859b5063e9caf62a5a637 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:31:55 -0700
Subject: [PATCH 20/59] Use chain instead of graph in editor provider

---
 client/src/contexts/EditorProvider.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/contexts/EditorProvider.tsx b/client/src/contexts/EditorProvider.tsx
index c6ee9d126..1fd831055 100644
--- a/client/src/contexts/EditorProvider.tsx
+++ b/client/src/contexts/EditorProvider.tsx
@@ -41,7 +41,7 @@ const Context = createContext({
   setEditor: (editor: any) => {},
   getNodeMap: () => {},
   getNodes: () => {},
-  loadGraph: (graph: any) => {},
+  loadChain: (chain: any) => {},
   setContainer: () => {},
   undo: () => {},
   redo: () => {},
@@ -52,7 +52,7 @@ export const useEditor = () => useContext(Context)
 const EditorProvider = ({ children }) => {
   const [editor, setEditorState] = useState({
     components: [],
-    loadGraph: (graph: any) => {},
+    loadGraph: (chain: any) => {},
   })
   const editorRef = useRef({
     trigger: (event: string) => {},
@@ -87,7 +87,7 @@ const EditorProvider = ({ children }) => {
     if (tab.type === 'spell') {
       // copy spell in case it is read onl
       const spell = JSON.parse(JSON.stringify(_spell))
-      newEditor.loadGraph(spell.chain.graph)
+      newEditor.loadGraph(spell.chain)
     }
 
     if (tab.type === 'module') {
@@ -120,7 +120,7 @@ const EditorProvider = ({ children }) => {
     return editor && Object.fromEntries(editor.components)
   }
 
-  const loadGraph = graph => {
+  const loadChain = graph => {
     editor.loadGraph(graph)
   }
 
@@ -136,7 +136,7 @@ const EditorProvider = ({ children }) => {
     buildEditor,
     getNodeMap,
     getNodes,
-    loadGraph,
+    loadChain,
     setEditor,
     getEditor,
     undo,

From c619b9d723476790ab1747a468f9f226213dbb61 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:32:14 -0700
Subject: [PATCH 21/59] Remove menu bar console log

---
 client/src/features/common/MenuBar/MenuBar.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/features/common/MenuBar/MenuBar.js b/client/src/features/common/MenuBar/MenuBar.js
index e557509ea..c3ca0527b 100644
--- a/client/src/features/common/MenuBar/MenuBar.js
+++ b/client/src/features/common/MenuBar/MenuBar.js
@@ -220,8 +220,6 @@ const MenuBar = () => {
     eval(func)
   }
 
-  console.log('MENU BAR')
-
   return (
     <ul className={css['menu-bar']}>
       <img className={css['thoth-logo']} alt="Thoth logo" src={thothlogo} />

From f3f7769d1665495fdec5155523b42c72a784a44e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:32:29 -0700
Subject: [PATCH 22/59] Use chain instead of graph in event handler

---
 client/src/features/Thoth/components/EventHandler.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/features/Thoth/components/EventHandler.jsx b/client/src/features/Thoth/components/EventHandler.jsx
index 6734332b4..2cbd23052 100644
--- a/client/src/features/Thoth/components/EventHandler.jsx
+++ b/client/src/features/Thoth/components/EventHandler.jsx
@@ -45,9 +45,9 @@ const EventHandler = ({ pubSub, tab }) => {
 
   const saveSpell = async () => {
     const currentSpell = spellRef.current
-    const graph = serialize(currentSpell)
+    const chain = serialize(currentSpell)
 
-    await saveSpellMutation({ ...currentSpell, graph })
+    await saveSpellMutation({ ...currentSpell, chain })
   }
 
   const createStateManager = () => {

From 0a2fa6a2fd881e22e9375558e687a5644f93a8b5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:32:42 -0700
Subject: [PATCH 23/59] Use chain instead of graph in workspace

---
 client/src/features/Thoth/components/Workspace.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/components/Workspace.jsx b/client/src/features/Thoth/components/Workspace.jsx
index 05a56fcbc..da435323c 100644
--- a/client/src/features/Thoth/components/Workspace.jsx
+++ b/client/src/features/Thoth/components/Workspace.jsx
@@ -29,7 +29,7 @@ const Workspace = ({ tab, appPubSub }) => {
       'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated',
       debounce(() => {
         if (tab.type === 'spell') {
-          saveSpell({ ...spellData, graph: editor.toJSON() }, false)
+          saveSpell({ ...spellData, chain: editor.toJSON() }, false)
         }
         if (tab.type === 'module') {
           saveModule(tab.module, { data: editor.toJSON() }, false)

From 25207a7c95792e1e235a33dd2431f4a968c206c4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:33:18 -0700
Subject: [PATCH 24/59] Update spell interface to use chain instead of graph

---
 client/src/state/spells.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index 1d8d1a74d..c3a974e3b 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -33,7 +33,7 @@ export interface Spell {
   id?: string
   user?: Record<string, unknown> | null | undefined
   name: string
-  graph: SpellType
+  chain: SpellType
   modules: SpellType[]
   gameState: Record<string, unknown>
   createdAt?: number

From b87062e2cbf5d72449dee0f0b59b0a7a261f8b2e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:33:39 -0700
Subject: [PATCH 25/59] Swap graph for chain in create new

---
 client/src/features/StartScreen/components/CreateNew.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/features/StartScreen/components/CreateNew.jsx b/client/src/features/StartScreen/components/CreateNew.jsx
index d29f63e80..d30cdbc21 100644
--- a/client/src/features/StartScreen/components/CreateNew.jsx
+++ b/client/src/features/StartScreen/components/CreateNew.jsx
@@ -43,7 +43,7 @@ const CreateNew = () => {
   const onCreate = async () => {
     const placeholderName = uniqueNamesGenerator(customConfig)
     const { data: spell } = await newSpell({
-      graph: defaultGraph,
+      chain: defaultGraph,
       name: placeholderName,
     })
 

From 24f01410f15120a5aa3f101eee42ab408ab50e26 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 10 Oct 2021 23:33:59 -0700
Subject: [PATCH 26/59] Use proper data access path to chain in module provider

---
 client/src/contexts/ModuleProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/contexts/ModuleProvider.tsx b/client/src/contexts/ModuleProvider.tsx
index af1095d31..db533368e 100644
--- a/client/src/contexts/ModuleProvider.tsx
+++ b/client/src/contexts/ModuleProvider.tsx
@@ -77,7 +77,7 @@ const ModuleProvider = ({ children }) => {
 
   const getSpellModules = async spell => {
     // should actually look for spells that have a data.module key set to a string
-    const moduleNames = Object.values(spell.chain.graph.nodes)
+    const moduleNames = Object.values(spell.chain.nodes)
       .filter((n: any) => n.name === 'Module')
       .map((n: any) => n.data.name)
 

From 4918081d2383550b151b148265fabbab07f8eda9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 11 Oct 2021 15:15:28 -0700
Subject: [PATCH 27/59] Convert window component to tsx

---
 client/src/features/common/Window/Window.js  | 33 -------------
 client/src/features/common/Window/Window.tsx | 52 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 33 deletions(-)
 delete mode 100644 client/src/features/common/Window/Window.js
 create mode 100644 client/src/features/common/Window/Window.tsx

diff --git a/client/src/features/common/Window/Window.js b/client/src/features/common/Window/Window.js
deleted file mode 100644
index 57e70fcd3..000000000
--- a/client/src/features/common/Window/Window.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Scrollbars } from 'react-custom-scrollbars'
-
-import WindowToolbar from './WindowToolbar'
-
-import css from './window.module.css'
-
-const WindowLayout = props => {
-  return (
-    <div className={css['window-layout']}>
-      <Scrollbars>{props.children}</Scrollbars>
-    </div>
-  )
-}
-
-const Window = ({ outline, dark, borderless, darker, grid, ...props }) => {
-  return (
-    <div
-      className={`
-      ${css['window']} 
-      ${css[outline && 'bordered']} 
-      ${css[dark && 'darkened']} 
-      ${css[darker && 'darker']} 
-      ${css[borderless && 'unpadded']}
-      ${css[grid && 'grid']}
-      `}
-    >
-      <WindowToolbar>{props.toolbar}</WindowToolbar>
-      <WindowLayout>{props.children}</WindowLayout>
-    </div>
-  )
-}
-
-export default Window
diff --git a/client/src/features/common/Window/Window.tsx b/client/src/features/common/Window/Window.tsx
new file mode 100644
index 000000000..3a14b24e0
--- /dev/null
+++ b/client/src/features/common/Window/Window.tsx
@@ -0,0 +1,52 @@
+import { Scrollbars } from 'react-custom-scrollbars'
+
+import WindowToolbar from './WindowToolbar'
+
+import css from './window.module.css'
+import { ReactElement } from 'react'
+
+const WindowLayout = props => {
+  return (
+    <div className={css['window-layout']}>
+      <Scrollbars>{props.children}</Scrollbars>
+    </div>
+  )
+}
+
+type Props = {
+  outline?: boolean
+  dark?: boolean
+  borderless?: boolean
+  darker?: boolean
+  grid?: boolean
+  toolbar: ReactElement<any, any>
+  children: ReactElement<any, any> | ReactElement<any, any>[]
+}
+
+const Window = (props: Props) => {
+  const {
+    outline = false,
+    dark = false,
+    borderless = false,
+    darker = false,
+    grid = false,
+  } = props
+
+  return (
+    <div
+      className={`
+      ${css['window']} 
+      ${css[outline ? 'bordered' : '']} 
+      ${css[dark ? 'darkened' : '']} 
+      ${css[darker ? 'darker' : '']} 
+      ${css[borderless ? 'unpadded' : '']}
+      ${css[grid ? 'grid' : '']}
+      `}
+    >
+      <WindowToolbar>{props.toolbar}</WindowToolbar>
+      <WindowLayout>{props.children}</WindowLayout>
+    </div>
+  )
+}
+
+export default Window

From 7fea33f69728ebd347a806b29483114233ca43c7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 11 Oct 2021 15:15:46 -0700
Subject: [PATCH 28/59] Game state reducer

---
 client/src/state/gameState.ts | 54 +++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 client/src/state/gameState.ts

diff --git a/client/src/state/gameState.ts b/client/src/state/gameState.ts
new file mode 100644
index 000000000..2bb82335f
--- /dev/null
+++ b/client/src/state/gameState.ts
@@ -0,0 +1,54 @@
+import { createSelector } from '@reduxjs/toolkit'
+import { v4 as uuidv4 } from 'uuid'
+import {
+  createSlice,
+  // createSelector,
+  createEntityAdapter,
+} from '@reduxjs/toolkit'
+
+export interface GameState {
+  id: string
+  state: Record<string, unknown>
+  history: Record<string, unknown>[]
+  spellId: string
+}
+
+const gameStateAdapater = createEntityAdapter<GameState>()
+const gameStateSelectors = gameStateAdapater.getSelectors()
+const initialState = gameStateAdapater.getInitialState()
+
+const gameStateSlice = createSlice({
+  name: 'gameStates',
+  initialState,
+  reducers: {
+    updateGameState: (state, action) => {
+      const gameState = gameStateSelectors.selectById(state, action.payload.id)
+      const newGameState = {
+        ...action.payload,
+        history: [...action.payload.history, gameState],
+      }
+
+      gameStateAdapater.updateOne(state, newGameState)
+    },
+    createGameState: (state, action) => {
+      const newGameState = {
+        ...action.payload,
+        id: uuidv4(),
+        history: [],
+      }
+
+      gameStateAdapater.addOne(state, newGameState)
+    },
+  },
+})
+
+export const selectGameStateBySpellId = createSelector(
+  [gameStateSelectors.selectEntities, (_, spellId) => spellId],
+  (gameStates: GameState[], spellId) => {
+    return gameStates.find(state => state.spellId === spellId)
+  }
+)
+
+export const { selectById } = gameStateSelectors
+export const { updateGameState, createGameState } = gameStateSlice.actions
+export default gameStateSlice.reducer

From cfdbb2d28c5e6783570f1b036bf102fb91d46db6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 11 Oct 2021 15:15:54 -0700
Subject: [PATCH 29/59] Load game state producer

---
 client/src/state/store.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/state/store.ts b/client/src/state/store.ts
index ba8fca672..bc1ad231b 100644
--- a/client/src/state/store.ts
+++ b/client/src/state/store.ts
@@ -1,11 +1,13 @@
 import { configureStore, ThunkAction, Action } from '@reduxjs/toolkit'
 import { setupListeners } from '@reduxjs/toolkit/query/react'
 import tabReducer from './tabs'
+import gameStateReducer from './gameState'
 import { spellApi } from './spells'
 
 export const store = configureStore({
   reducer: {
     tabs: tabReducer,
+    gameState: gameStateReducer,
     [spellApi.reducerPath]: spellApi.reducer,
   },
   middleware: getDefaultMiddleware =>

From c4a86c982b94313a09edc769b19ab6b83e644573 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 11 Oct 2021 23:57:27 -0700
Subject: [PATCH 30/59] Dispatch update game state on spell save.  Set on spell
 get.

---
 client/src/state/spells.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index c3a974e3b..0c2432ae3 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -9,6 +9,7 @@ import { Spell as SpellType } from '@latitudegames/thoth-core/types'
 import { getAuthHeader } from '../utils/authHelper'
 import { initDB } from '../database'
 import { QueryReturnValue } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
+import { updateGameState } from './gameState'
 
 // function camelize(str) {
 //   return str
@@ -76,14 +77,26 @@ export const spellApi = createApi({
           url: `spells/${spellId}`,
         }
       },
+      async onQueryStarted(id, { dispatch, queryFulfilled }) {
+        const { data: spell } = await queryFulfilled
+
+        dispatch(
+          updateGameState({ state: spell.gameState, spellId: spell.name })
+        )
+      },
     }),
     saveSpell: builder.mutation<Partial<Spell>, Partial<Spell>>({
       // invalidatesTags: ['Spell'],
       // needed to use queryFn as query option didnt seem to allow async functions.
-      async queryFn(spell, api, extraOptions, baseQuery) {
+      async queryFn(spell, { dispatch, getState }, extraOptions, baseQuery) {
         const moduleModel = await _moduleModel()
         const modules = await moduleModel.getSpellModules(spell)
 
+        if (spell.gameState)
+          dispatch(
+            updateGameState({ state: spell.gameState, spellId: spell.name })
+          )
+
         spell.modules = modules
 
         const baseQueryOptions = {

From 3432fde36190a97618f5abe81490cd7659abbd87 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 11 Oct 2021 23:57:51 -0700
Subject: [PATCH 31/59] Modify update game state to be more generic

---
 client/src/state/gameState.ts | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/src/state/gameState.ts b/client/src/state/gameState.ts
index 2bb82335f..69284ddf2 100644
--- a/client/src/state/gameState.ts
+++ b/client/src/state/gameState.ts
@@ -1,5 +1,6 @@
-import { createSelector } from '@reduxjs/toolkit'
+import { createDraftSafeSelector } from '@reduxjs/toolkit'
 import { v4 as uuidv4 } from 'uuid'
+
 import {
   createSlice,
   // createSelector,
@@ -9,7 +10,6 @@ import {
 export interface GameState {
   id: string
   state: Record<string, unknown>
-  history: Record<string, unknown>[]
   spellId: string
 }
 
@@ -18,22 +18,24 @@ const gameStateSelectors = gameStateAdapater.getSelectors()
 const initialState = gameStateAdapater.getInitialState()
 
 const gameStateSlice = createSlice({
-  name: 'gameStates',
+  name: 'gameState',
   initialState,
   reducers: {
     updateGameState: (state, action) => {
-      const gameState = gameStateSelectors.selectById(state, action.payload.id)
-      const newGameState = {
-        ...action.payload,
-        history: [...action.payload.history, gameState],
-      }
+      const gameState = selectGameStateBySpellId(state, action.payload.spellId)
 
-      gameStateAdapater.updateOne(state, newGameState)
+      if (!gameState) {
+        gameStateAdapater.addOne(state, { id: uuidv4(), ...action.payload })
+      } else {
+        gameStateAdapater.updateOne(state, {
+          id: gameState.id,
+          changes: { state: action.payload.state },
+        })
+      }
     },
     createGameState: (state, action) => {
       const newGameState = {
         ...action.payload,
-        id: uuidv4(),
         history: [],
       }
 
@@ -42,8 +44,8 @@ const gameStateSlice = createSlice({
   },
 })
 
-export const selectGameStateBySpellId = createSelector(
-  [gameStateSelectors.selectEntities, (_, spellId) => spellId],
+export const selectGameStateBySpellId = createDraftSafeSelector(
+  [gameStateSelectors.selectAll, (_, spellId) => spellId],
   (gameStates: GameState[], spellId) => {
     return gameStates.find(state => state.spellId === spellId)
   }

From 256fa24bc69fed865c8473e947027c5b1519647d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 11 Oct 2021 23:58:03 -0700
Subject: [PATCH 32/59] Fix path

---
 client/src/features/Thoth/components/TextEditorWindow.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/components/TextEditorWindow.jsx b/client/src/features/Thoth/components/TextEditorWindow.jsx
index 93a3b3797..4cb2fe876 100644
--- a/client/src/features/Thoth/components/TextEditorWindow.jsx
+++ b/client/src/features/Thoth/components/TextEditorWindow.jsx
@@ -3,7 +3,7 @@ import { useSnackbar } from 'notistack'
 import { useState, useEffect } from 'react'
 
 import { useLayout } from '../../../contexts/LayoutProvider'
-import Window from '../../common/Window/Window'
+import Window from '../../common/Window/Window.tsx'
 import WindowMessage from './WindowMessage'
 
 import '../thoth.module.css'

From 0a3209372cb14b815e9bf7e4efa51024cf5d07af Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 00:00:47 -0700
Subject: [PATCH 33/59] Switch state manager to tsx

---
 ...nagerWindow.jsx => StateManagerWindow.tsx} | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)
 rename client/src/features/Thoth/components/{StateManagerWindow.jsx => StateManagerWindow.tsx} (63%)

diff --git a/client/src/features/Thoth/components/StateManagerWindow.jsx b/client/src/features/Thoth/components/StateManagerWindow.tsx
similarity index 63%
rename from client/src/features/Thoth/components/StateManagerWindow.jsx
rename to client/src/features/Thoth/components/StateManagerWindow.tsx
index 3e8caea4c..e5bd482ce 100644
--- a/client/src/features/Thoth/components/StateManagerWindow.jsx
+++ b/client/src/features/Thoth/components/StateManagerWindow.tsx
@@ -2,18 +2,34 @@ import Editor from '@monaco-editor/react'
 import jsonFormat from 'json-format'
 import { useSnackbar } from 'notistack'
 import { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
 
-import { useSpell } from '../../../contexts/SpellProvider'
+import { selectSpellById, useSaveSpellMutation } from '../../../state/spells'
+import {
+  selectGameStateBySpellId,
+  // updateGameState,
+} from '../../../state/gameState'
 import Window from '../../common/Window/Window'
 
 import '../thoth.module.css'
+import { RootState } from '../../../state/store'
+
+const StateManager = ({ tab, ...props }) => {
+  // const dispatch = useDispatch()
+  const [saveSpell] = useSaveSpellMutation()
+  const gameState = useSelector((state: RootState) => {
+    return selectGameStateBySpellId(state.gameState, tab.spell)
+  })
+  const spell = useSelector(state => selectSpellById(state, tab.spell))
+
+  useEffect(() => {
+    console.log('game state', gameState)
+  }, [gameState])
 
-const StateManager = props => {
-  const { currentSpell, rewriteCurrentGameState } = useSpell()
   const { enqueueSnackbar } = useSnackbar()
-  const [typing, setTyping] = useState(null)
+  const [typing, setTyping] = useState<boolean>(false)
   const [code, setCode] = useState('{}')
-  const [height, setHeight] = useState()
+  const [height, setHeight] = useState<number>()
 
   const bottomHeight = 50
 
@@ -41,7 +57,7 @@ const StateManager = props => {
 
   useEffect(() => {
     if (props?.node?.rect?.height)
-      setHeight(props.node.rect.height - bottomHeight)
+      setHeight((props.node.rect.height - bottomHeight) as number)
 
     // this is to dynamically set the appriopriate height so that Monaco editor doesnt break flexbox when resizing
     props.node.setEventListener('resize', data => {
@@ -62,8 +78,8 @@ const StateManager = props => {
   }, [code])
 
   useEffect(() => {
-    if (currentSpell?.gameState) setCode(jsonFormat(currentSpell.gameState))
-  }, [currentSpell])
+    if (spell?.gameState) setCode(jsonFormat(spell.gameState))
+  }, [spell])
 
   const onClear = () => {
     const reset = `{}`
@@ -76,7 +92,16 @@ const StateManager = props => {
   }
 
   const onSave = () => {
-    rewriteCurrentGameState(JSON.parse(code))
+    if (!gameState) return
+    const parsedState = JSON.parse(code)
+    const spellUpdate = {
+      ...spell,
+      gameState: parsedState,
+    }
+    saveSpell(spellUpdate)
+    // dispatch(updateGameState({ id: gameState.id, state: parsed }))
+    // updateGameState()
+    // rewriteCurrentGameState(parsed)
     enqueueSnackbar('State saved', {
       preventDuplicate: true,
       variant: 'success',

From 0a1073b2084d5b0e2731c819a2599a8aedc8310c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 00:01:29 -0700
Subject: [PATCH 34/59] Use update one in tabs reducer

---
 client/src/state/tabs.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index 70bb88b32..cf4753b21 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -59,7 +59,11 @@ export const tabSlice = createSlice({
   reducers: {
     tabOpened: (state, action) => {
       const activeTab = _activeTabSelector(state) as Tab
-      if (activeTab) activeTab.active = false
+      if (activeTab)
+        tabAdapater.updateOne(state, {
+          id: activeTab.id,
+          changes: { active: false },
+        })
 
       const tab = buildTab(action.payload, { active: true })
       tabAdapater.addOne(state, tab)

From 20c5f0058204c4d47bb4cfec77b0dbc4e5c72877 Mon Sep 17 00:00:00 2001
From: Sean Gillespie <info@spg.business>
Date: Tue, 12 Oct 2021 11:29:28 -0400
Subject: [PATCH 35/59] get nestedModules recursively within getSpellModules

---
 client/src/database/models/moduleModel.ts | 34 +++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts
index b0ca2ceeb..ac11bc211 100644
--- a/client/src/database/models/moduleModel.ts
+++ b/client/src/database/models/moduleModel.ts
@@ -65,20 +65,36 @@ const loadModuleModel = db => {
     return await db.modules.insert(newModule)
   }
 
-  const getSpellModules = async spell => {
-    // should actually look for spells that have a data.module key set to a string
-    const moduleNames = Object.values(spell.chain.nodes)
-      .filter((n: any) => n.name === 'Module')
-      .map((n: any) => n.data.name)
-
+  const getNestedModules = async (moduleNames: string[]) => {
     const moduleDocs = await Promise.all(
       moduleNames.map(moduleName => getModule(moduleName))
     )
+    if (moduleDocs.length === 0) return []
+    const modules = moduleDocs.filter(Boolean).map(module => module.toJSON())
+    const nestedModules = await Promise.all(
+      modules.map(async module => {
+        const nestedModuleNames = Object.values(module.data.nodes)
+          .filter((n: any) => n.data.module)
+          .map((n: any) => n.data.module)
+        if (nestedModuleNames.length === 0) {
+          return []
+        } else {
+          const nextModuleLayer = await getNestedModules(nestedModuleNames)
+          return nextModuleLayer.flat()
+        }
+      })
+    )
+    const allModules = modules.concat(nestedModules.flat())
+    console.log('all nested modules flattened', allModules)
+    return allModules
+  }
 
-    // todo need tobe recursive probably.  Or we add the modules used to the spell when created?
+  const getSpellModules = async spell => {
+    const moduleNames = Object.values(spell.chain.nodes)
+      .filter((n: any) => n.data.module)
+      .map((n: any) => n.data.module)
 
-    if (moduleDocs.length === 0) return []
-    return moduleDocs.filter(Boolean).map(module => module.toJSON())
+    await getNestedModules(moduleNames)
   }
 
   return {

From 3ac781d458b5647f379cfbab6811cbc4dcb19ebe Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 10:12:46 -0700
Subject: [PATCH 36/59] Remove use spell from editor provider

---
 client/src/contexts/EditorProvider.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/client/src/contexts/EditorProvider.tsx b/client/src/contexts/EditorProvider.tsx
index 1fd831055..9752703d2 100644
--- a/client/src/contexts/EditorProvider.tsx
+++ b/client/src/contexts/EditorProvider.tsx
@@ -12,7 +12,6 @@ import { useLazyGetSpellQuery, Spell } from '../state/spells'
 import LoadingScreen from '../features/common/LoadingScreen/LoadingScreen'
 import { MyNode } from '../features/common/Node/Node'
 import gridimg from '../grid.png'
-import { useSpell } from './SpellProvider'
 import { usePubSub } from './PubSubProvider'
 import { useRete, ReteContext } from './ReteProvider'
 // import { ThothTab } from './TabManagerProvider'
@@ -151,7 +150,6 @@ const RawEditor = ({ tab, children }) => {
   const [getSpell, { data: spell, isLoading }] = useLazyGetSpellQuery()
   const [loaded, setLoaded] = useState(false)
   const { buildEditor } = useEditor()
-  const { getCurrentGameState, updateCurrentGameState } = useSpell()
   // This will be the main interface between thoth and rete
   const reteInterface = useRete()
 
@@ -183,11 +181,7 @@ const RawEditor = ({ tab, children }) => {
         <div
           ref={el => {
             if (el && !loaded) {
-              buildEditor(el, spell, tab, {
-                ...reteInterface,
-                getCurrentGameState,
-                updateCurrentGameState,
-              })
+              buildEditor(el, spell, tab, reteInterface)
               setLoaded(true)
             }
           }}

From cac975b575a387a329f8f537e65ded69fed56d72 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 10:13:05 -0700
Subject: [PATCH 37/59] Add game state management to rete interface

---
 client/src/contexts/ReteProvider.tsx | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/client/src/contexts/ReteProvider.tsx b/client/src/contexts/ReteProvider.tsx
index f1b87afb7..620ec3a43 100644
--- a/client/src/contexts/ReteProvider.tsx
+++ b/client/src/contexts/ReteProvider.tsx
@@ -1,8 +1,11 @@
 import { EngineContext } from '@latitudegames/thoth-core'
 import { useContext, createContext } from 'react'
+import { useDispatch } from 'react-redux'
 
 import { postEnkiCompletion } from '../services/game-api/enki'
 import { completion as _completion } from '../services/game-api/text'
+import { selectGameStateBySpellId, updateGameState } from '../state/gameState'
+import { store } from '../state/store'
 import { invokeInference } from '../utils/huggingfaceHelper'
 import { useDB } from './DatabaseProvider'
 import { usePubSub } from './PubSubProvider'
@@ -42,6 +45,8 @@ const Context = createContext({
   getGameState: () => {},
   setGameState: () => {},
   getModules: async () => {},
+  getCurrentGameState: () => ({} as Record<string, unknown>),
+  updateCurrentGameState: () => new Promise(() => {}) as Promise<void>,
   completion: _completion,
   enkiCompletion: async (): Promise<{ outputs: string[] }> =>
     await new Promise(resolve => {
@@ -57,6 +62,7 @@ export const useRete = () => useContext(Context)
 
 const ReteProvider = ({ children, tab }) => {
   const { events, publish, subscribe } = usePubSub()
+  const dispatch = useDispatch()
   const {
     models: { spells, modules },
   } = useDB()
@@ -135,6 +141,22 @@ const ReteProvider = ({ children, tab }) => {
     publish($TEXT_EDITOR_CLEAR(tab.id))
   }
 
+  const getCurrentGameState = () => {
+    const currentGameState = selectGameStateBySpellId(
+      store.getState().gameState,
+      tab.spell
+    )
+    return currentGameState?.state
+  }
+
+  const updateCurrentGameState = update => {
+    const newState = {
+      spellId: tab.spell,
+      state: update,
+    }
+    dispatch(updateGameState(newState))
+  }
+
   const publicInterface = {
     onInspector,
     onAddModule,
@@ -148,6 +170,8 @@ const ReteProvider = ({ children, tab }) => {
     completion,
     enkiCompletion,
     huggingface,
+    getCurrentGameState,
+    updateCurrentGameState,
     ...modules,
 
     // going to need to manuall create theses

From fcc9bf5f7f2fb506763c087ffcfca0c0ca4867f1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 10:13:27 -0700
Subject: [PATCH 38/59] Watch game state for changes to display in game state
 window

---
 .../Thoth/components/StateManagerWindow.tsx         | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/src/features/Thoth/components/StateManagerWindow.tsx b/client/src/features/Thoth/components/StateManagerWindow.tsx
index e5bd482ce..9bded76e1 100644
--- a/client/src/features/Thoth/components/StateManagerWindow.tsx
+++ b/client/src/features/Thoth/components/StateManagerWindow.tsx
@@ -22,10 +22,6 @@ const StateManager = ({ tab, ...props }) => {
   })
   const spell = useSelector(state => selectSpellById(state, tab.spell))
 
-  useEffect(() => {
-    console.log('game state', gameState)
-  }, [gameState])
-
   const { enqueueSnackbar } = useSnackbar()
   const [typing, setTyping] = useState<boolean>(false)
   const [code, setCode] = useState('{}')
@@ -77,9 +73,11 @@ const StateManager = ({ tab, ...props }) => {
     return () => clearTimeout(delayDebounceFn)
   }, [code])
 
+  // update code when game state changes
   useEffect(() => {
-    if (spell?.gameState) setCode(jsonFormat(spell.gameState))
-  }, [spell])
+    if (!gameState) return
+    setCode(jsonFormat(gameState.state))
+  }, [gameState])
 
   const onClear = () => {
     const reset = `{}`
@@ -99,9 +97,6 @@ const StateManager = ({ tab, ...props }) => {
       gameState: parsedState,
     }
     saveSpell(spellUpdate)
-    // dispatch(updateGameState({ id: gameState.id, state: parsed }))
-    // updateGameState()
-    // rewriteCurrentGameState(parsed)
     enqueueSnackbar('State saved', {
       preventDuplicate: true,
       variant: 'success',

From 4cc1667b8189e9c4989e9515435ab6b1b693c162 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 10:13:49 -0700
Subject: [PATCH 39/59] Modify update game state

---
 client/src/state/gameState.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/src/state/gameState.ts b/client/src/state/gameState.ts
index 69284ddf2..95105d563 100644
--- a/client/src/state/gameState.ts
+++ b/client/src/state/gameState.ts
@@ -27,9 +27,15 @@ const gameStateSlice = createSlice({
       if (!gameState) {
         gameStateAdapater.addOne(state, { id: uuidv4(), ...action.payload })
       } else {
+        const changes = {
+          state: {
+            ...gameState.state,
+            ...action.payload.state,
+          },
+        }
         gameStateAdapater.updateOne(state, {
           id: gameState.id,
-          changes: { state: action.payload.state },
+          changes: changes,
         })
       }
     },

From 31d1d038986c824ac93a4480507c9147cc0bd394 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 10:16:06 -0700
Subject: [PATCH 40/59] Update type of update game state

---
 core/src/engine.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 92677c2ec..895afaa00 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -38,7 +38,7 @@ export type EngineContext = {
     body: ModelCompletionOpts
   ) => Promise<string | OpenAIResultChoice | undefined>
   getCurrentGameState: () => Record<string, unknown>
-  updateCurrentGameState: () => Record<string, unknown>
+  updateCurrentGameState: () => void
   enkiCompletion: (
     taskName: string,
     inputs: string[]

From e9f05c4732f46cd5695b4304b1721cdfedb7a182 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:51:01 -0700
Subject: [PATCH 41/59] Reactivet tab workspace type component filtering

---
 core/src/editor.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index a7d152331..1942a542a 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -95,10 +95,10 @@ export const initEditor = async function ({
       category: string
     }) => {
       //@seang: disabling component filtering in anticipation of needing to treat spells as "top level modules" in the publishing workflow
-      // const tabType = editor.tab.type
-      // const { workspaceType } = component
+      const tabType = editor.tab.type
+      const { workspaceType } = component
 
-      // if (workspaceType && workspaceType !== tabType) return null
+      if (workspaceType && workspaceType !== tabType) return null
       return [component.category]
     },
   })

From 41b23b315f60d0a222ca5e9bef6c1e7e76382ecf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:52:05 -0700
Subject: [PATCH 42/59] Remove workspace type from module input

---
 core/src/components/ModuleInput.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/components/ModuleInput.ts b/core/src/components/ModuleInput.ts
index 0f37e931f..1a200e5c6 100644
--- a/core/src/components/ModuleInput.ts
+++ b/core/src/components/ModuleInput.ts
@@ -21,7 +21,6 @@ export class ModuleInput extends ThothComponent {
   module: object
   category: string
   info: string
-  workspaceType: 'module' | 'spell'
   contextMenuName: string
 
   constructor() {
@@ -41,7 +40,6 @@ export class ModuleInput extends ThothComponent {
 
     this.category = 'Module'
     this.info = info
-    this.workspaceType = 'module'
   }
 
   // the builder is used to "assemble" the node component.

From ac04a38d430aed9c8285bd1c4209a5a05c78d468 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:52:16 -0700
Subject: [PATCH 43/59] Remove workspace type from module output

---
 core/src/components/ModuleOutput.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/components/ModuleOutput.ts b/core/src/components/ModuleOutput.ts
index fd1ae1d72..0cec178bf 100644
--- a/core/src/components/ModuleOutput.ts
+++ b/core/src/components/ModuleOutput.ts
@@ -16,7 +16,6 @@ export class ModuleOutput extends ThothComponent {
   module: object
   category: string
   info: string
-  workspaceType: 'module' | 'spell'
   contextMenuName: string
 
   constructor() {
@@ -37,7 +36,6 @@ export class ModuleOutput extends ThothComponent {
 
     this.category = 'Module'
     this.info = info
-    this.workspaceType = 'module'
   }
 
   // the builder is used to "assemble" the node component.

From 33aa042398ce9927029c59b80433e62e226596b7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:52:24 -0700
Subject: [PATCH 44/59] Remove workspace type from module trigger in

---
 core/src/components/ModuleTriggerIn.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/components/ModuleTriggerIn.ts b/core/src/components/ModuleTriggerIn.ts
index 113e79452..4950ff066 100644
--- a/core/src/components/ModuleTriggerIn.ts
+++ b/core/src/components/ModuleTriggerIn.ts
@@ -16,7 +16,6 @@ export class ModuleTriggerIn extends ThothComponent {
   module: object
   category: string
   info: string
-  workspaceType: 'module' | 'spell'
   contextMenuName: string
   nodeTaskMap: Record<number, ThothTask> = {}
 
@@ -43,7 +42,6 @@ export class ModuleTriggerIn extends ThothComponent {
 
     this.category = 'Module'
     this.info = info
-    this.workspaceType = 'module'
   }
 
   async run(node: ThothNode, data: NodeData) {

From da7ac7cdc56f364791ac81768a85bcb40f160284 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:52:40 -0700
Subject: [PATCH 45/59] Remove workspace type from module trigger out

---
 core/src/components/ModuleTriggerOut.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/components/ModuleTriggerOut.ts b/core/src/components/ModuleTriggerOut.ts
index 51c46b7e9..37a5e9482 100644
--- a/core/src/components/ModuleTriggerOut.ts
+++ b/core/src/components/ModuleTriggerOut.ts
@@ -16,7 +16,6 @@ export class ModuleTriggerOut extends ThothComponent {
   module: object
   category: string
   info: string
-  workspaceType: 'module' | 'spell'
   contextMenuName: string
 
   constructor() {
@@ -37,7 +36,6 @@ export class ModuleTriggerOut extends ThothComponent {
 
     this.category = 'Module'
     this.info = info
-    this.workspaceType = 'module'
   }
 
   // the builder is used to "assemble" the node component.

From 67673e4beaebabd9fa9bfdfceec8dbec8ba20d2c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:53:02 -0700
Subject: [PATCH 46/59] Add workspace to thoth component abstract class

---
 core/src/thoth-component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/thoth-component.ts b/core/src/thoth-component.ts
index 5159b73f4..c74f76641 100644
--- a/core/src/thoth-component.ts
+++ b/core/src/thoth-component.ts
@@ -36,6 +36,7 @@ export abstract class ThothComponent extends ThothEngineComponent {
   category: string
   info: string
   display: boolean
+  workspaceType: 'module' | 'spell' | null | undefined
 
   constructor(name: string) {
     super(name)

From ad292721611278afac55d018bf11c69e67641b67 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:53:18 -0700
Subject: [PATCH 47/59] Only allow state read inside spell tab

---
 core/src/components/StateRead.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/StateRead.ts b/core/src/components/StateRead.ts
index 6e9d85341..3e24852ed 100644
--- a/core/src/components/StateRead.ts
+++ b/core/src/components/StateRead.ts
@@ -17,6 +17,7 @@ export class StateRead extends ThothComponent {
       outputs: {},
     }
     this.category = 'State'
+    this.workspaceType = 'spell'
     this.info = info
   }
 

From eb5a4f63d70b5dcce3e58825f722a71a8f170747 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:53:31 -0700
Subject: [PATCH 48/59] Only allow state write in spells

---
 core/src/components/StateWrite.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/StateWrite.js b/core/src/components/StateWrite.js
index f2eff5321..407d61427 100644
--- a/core/src/components/StateWrite.js
+++ b/core/src/components/StateWrite.js
@@ -17,6 +17,7 @@ export class StateWrite extends ThothComponent {
       outputs: {},
     }
 
+    this.workspaceType = 'spell'
     this.category = 'State'
     this.info = info
   }

From d61ae4a1fc561b3c5536f9ad8cd0ebbeaf9bb0a2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 12:58:46 -0700
Subject: [PATCH 49/59] Add message to stte manager window when inside module

---
 client/src/features/Thoth/components/StateManagerWindow.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/features/Thoth/components/StateManagerWindow.tsx b/client/src/features/Thoth/components/StateManagerWindow.tsx
index 9bded76e1..7d2411a0c 100644
--- a/client/src/features/Thoth/components/StateManagerWindow.tsx
+++ b/client/src/features/Thoth/components/StateManagerWindow.tsx
@@ -13,6 +13,7 @@ import Window from '../../common/Window/Window'
 
 import '../thoth.module.css'
 import { RootState } from '../../../state/store'
+import WindowMessage from './WindowMessage'
 
 const StateManager = ({ tab, ...props }) => {
   // const dispatch = useDispatch()
@@ -112,6 +113,9 @@ const StateManager = ({ tab, ...props }) => {
     </>
   )
 
+  if (tab.type === 'module')
+    return <WindowMessage content="Modules do not support game state" />
+
   return (
     <Window toolbar={toolbar}>
       <Editor

From be706e28b3241fece3883d87883d8431ab893a50 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 15:46:54 -0700
Subject: [PATCH 50/59] Return nested modules from get spell modules

---
 client/src/database/models/moduleModel.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts
index ac11bc211..30b9bcd6e 100644
--- a/client/src/database/models/moduleModel.ts
+++ b/client/src/database/models/moduleModel.ts
@@ -94,7 +94,8 @@ const loadModuleModel = db => {
       .filter((n: any) => n.data.module)
       .map((n: any) => n.data.module)
 
-    await getNestedModules(moduleNames)
+    const modules = await getNestedModules(moduleNames)
+    return modules
   }
 
   return {

From de17b311785cc2312c83e29385688d98af2a862a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:19:49 -0700
Subject: [PATCH 51/59] Update env example to not use game key

---
 client/.env.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/.env.example b/client/.env.example
index ad0e15c94..8df4edb80 100644
--- a/client/.env.example
+++ b/client/.env.example
@@ -1,4 +1,3 @@
-REACT_APP_GAME_KEY=8144b347-8437-415d-b276-aac68c83b1dc
 REACT_APP_API_URL=https://latitude-game-api.herokuapp.com
 #REACT_APP_API_URL=http://localhost:8000
 EXTEND_ESLINT = true
\ No newline at end of file

From da59c12681b99ecbf611cff0c2b4a9f21c3cd8a7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:20:05 -0700
Subject: [PATCH 52/59] Delete unused openAI helper

---
 client/src/utils/openaiHelper.ts | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 client/src/utils/openaiHelper.ts

diff --git a/client/src/utils/openaiHelper.ts b/client/src/utils/openaiHelper.ts
deleted file mode 100644
index 959b6b32a..000000000
--- a/client/src/utils/openaiHelper.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {
-  ModelCompletionOpts,
-  OpenAIResultChoice,
-} from '@latitudegames/thoth-core/types'
-
-export const completion = async (body: ModelCompletionOpts) => {
-  const url = process.env.REACT_APP_API_URL
-
-  try {
-    const response = await fetch(url + '/ml/text/completions', {
-      method: 'POST',
-      mode: 'cors',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': process.env.REACT_APP_GAME_KEY || '',
-      },
-      body: JSON.stringify({ ...body, prompt: body.prompt?.trimEnd() }),
-    })
-    const parsedResponse = await response.json()
-    const { result }: { result: OpenAIResultChoice | string } = parsedResponse
-    return result
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn('fetch error', err)
-  }
-}

From 0e4108f4d579b1d90d8c54a511c7e2b0a25d1976 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:42:29 -0700
Subject: [PATCH 53/59] Clean up module model

---
 client/src/database/models/moduleModel.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts
index 30b9bcd6e..f5f599d37 100644
--- a/client/src/database/models/moduleModel.ts
+++ b/client/src/database/models/moduleModel.ts
@@ -84,9 +84,7 @@ const loadModuleModel = db => {
         }
       })
     )
-    const allModules = modules.concat(nestedModules.flat())
-    console.log('all nested modules flattened', allModules)
-    return allModules
+    return modules.concat(nestedModules.flat())
   }
 
   const getSpellModules = async spell => {

From 671de522f1b39fec138f735d932952c7fac7ff09 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:43:50 -0700
Subject: [PATCH 54/59] Export new selector function to get spells by module
 name

---
 client/src/state/spells.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index 0c2432ae3..c120ff5a8 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -163,6 +163,16 @@ export const selectSpellById = createSelector(
     })
 )
 
+export const selectSpellsByModuleName = createSelector(
+  [selectAllSpells, (state, moduleName) => moduleName],
+  (spells, moduleName) =>
+    spells.filter(
+      spell =>
+        spell.modules &&
+        spell?.modules.some(module => module.name === moduleName)
+    )
+)
+
 export const {
   useGetSpellQuery,
   useGetSpellsQuery,

From d2125fea2fd45f7d85419cc0ce9217b3c30bc8fe Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:44:28 -0700
Subject: [PATCH 55/59] Invalidate tags and remove unused param

---
 client/src/state/spells.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index c120ff5a8..c92f181d5 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -86,9 +86,9 @@ export const spellApi = createApi({
       },
     }),
     saveSpell: builder.mutation<Partial<Spell>, Partial<Spell>>({
-      // invalidatesTags: ['Spell'],
+      invalidatesTags: ['Spell'],
       // needed to use queryFn as query option didnt seem to allow async functions.
-      async queryFn(spell, { dispatch, getState }, extraOptions, baseQuery) {
+      async queryFn(spell, { dispatch }, extraOptions, baseQuery) {
         const moduleModel = await _moduleModel()
         const modules = await moduleModel.getSpellModules(spell)
 

From 14ded5be8c2722fbbd5e474dfa88ee565dc10e58 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:44:51 -0700
Subject: [PATCH 56/59] Change module type

---
 client/src/state/spells.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index c92f181d5..3c33fde33 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -10,7 +10,7 @@ import { getAuthHeader } from '../utils/authHelper'
 import { initDB } from '../database'
 import { QueryReturnValue } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
 import { updateGameState } from './gameState'
-
+import { Module } from '../database/schemas/module'
 // function camelize(str) {
 //   return str
 //     .replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
@@ -35,7 +35,7 @@ export interface Spell {
   user?: Record<string, unknown> | null | undefined
   name: string
   chain: SpellType
-  modules: SpellType[]
+  modules: Module[]
   gameState: Record<string, unknown>
   createdAt?: number
   updatedAt?: number

From bbf83b71b5bf7e29b1cf10949c43ac0359e4c7d1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:45:01 -0700
Subject: [PATCH 57/59] File cleanup

---
 client/src/state/spells.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/src/state/spells.ts b/client/src/state/spells.ts
index 3c33fde33..37545e97d 100644
--- a/client/src/state/spells.ts
+++ b/client/src/state/spells.ts
@@ -19,12 +19,6 @@ import { Module } from '../database/schemas/module'
 //     .replace(/\s+/g, '')
 // }
 
-// const _spellModel = async () => {
-//   const db = await initDB()
-//   const { spells } = db.models
-//   return spells
-// }
-
 const _moduleModel = async () => {
   const db = await initDB()
   const { modules } = db.models
@@ -156,7 +150,12 @@ export const selectAllSpells = createSelector(
 )
 
 export const selectSpellById = createSelector(
-  [selectAllSpells, (state, spellId) => spellId],
+  [
+    selectAllSpells,
+    (state, spellId) => {
+      return spellId
+    },
+  ],
   (spells, spellId) =>
     spells.find(spell => {
       return spell.name === spellId

From 7c981118edda30ece8040ab808dea22845771831 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:45:25 -0700
Subject: [PATCH 58/59] Pass all tabs into workspaces

---
 client/src/features/Thoth/Thoth.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/Thoth.jsx b/client/src/features/Thoth/Thoth.jsx
index 9502cdd43..5e5068142 100644
--- a/client/src/features/Thoth/Thoth.jsx
+++ b/client/src/features/Thoth/Thoth.jsx
@@ -37,7 +37,12 @@ const Thoth = ({ empty }) => {
     <TabLayout>
       {!empty &&
         tabs.map((tab, i) => (
-          <Workspace tab={tab} key={`${i}-${tab.name}`} appPubSub={pubSub} />
+          <Workspace
+            tab={tab}
+            tabs={tabs}
+            key={`${i}-${tab.name}`}
+            appPubSub={pubSub}
+          />
         ))}
     </TabLayout>
   )

From 1f99a863ebf0d08db1d0704d569300c9f6203681 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 12 Oct 2021 20:45:39 -0700
Subject: [PATCH 59/59] Save connected spells on module changes

---
 .../features/Thoth/components/Workspace.jsx   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/components/Workspace.jsx b/client/src/features/Thoth/components/Workspace.jsx
index da435323c..08f513990 100644
--- a/client/src/features/Thoth/components/Workspace.jsx
+++ b/client/src/features/Thoth/components/Workspace.jsx
@@ -1,11 +1,14 @@
 import { useEffect } from 'react'
 
+import { store } from '../../../state/store'
 import { Editor, useEditor } from '../../../contexts/EditorProvider'
 import { Layout } from '../../../contexts/LayoutProvider'
 import { useModule } from '../../../contexts/ModuleProvider'
 import {
   useLazyGetSpellQuery,
   useSaveSpellMutation,
+  selectSpellsByModuleName,
+  selectSpellById,
 } from '../../../state/spells'
 import WorkspaceProvider from '../../../contexts/WorkspaceProvider'
 import { debounce } from '../../../utils/debounce'
@@ -16,7 +19,7 @@ import Playtest from './PlaytestWindow'
 import StateManager from './StateManagerWindow'
 import TextEditor from './TextEditorWindow'
 
-const Workspace = ({ tab, appPubSub }) => {
+const Workspace = ({ tab, tabs, appPubSub }) => {
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
   const [saveSpell] = useSaveSpellMutation()
   const { saveModule } = useModule()
@@ -33,6 +36,20 @@ const Workspace = ({ tab, appPubSub }) => {
         }
         if (tab.type === 'module') {
           saveModule(tab.module, { data: editor.toJSON() }, false)
+          // when a module is saved, we look for any open spell tabs, and check if they have the module.
+          /// if they do, we trigger a save to ensure the module change is captured to the server
+          tabs
+            .filter(tab => tab.type === 'spell')
+            .forEach(filteredTab => {
+              if (filteredTab.spell) {
+                const spell = selectSpellById(
+                  store.getState(),
+                  filteredTab.spell
+                )
+                if (spell?.modules.some(module => module.name === tab.module))
+                  saveSpell({ ...spell })
+              }
+            })
         }
       }, 500)
     )