From 88bc223daa1869e965351365180856125211d937 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 20 Apr 2022 13:56:06 +0200
Subject: [PATCH 01/56] Began working on build tab

---
 .../ui/creature/CreatureFormDialog.vue        |   7 +-
 .../ui/creature/character/CharacterSheet.vue  |   7 +-
 .../character/CharacterSheetToolbar.vue       |   5 +-
 .../ui/creature/character/CreatureSummary.vue |  56 +++++++++
 .../{CharacterTab.vue => BuildTab.vue}        | 108 +++++-------------
 .../characterSheetTabs/JournalTab.vue         |  60 ++++++++++
 app/package-lock.json                         |   2 +-
 app/package.json                              |   2 +-
 8 files changed, 160 insertions(+), 87 deletions(-)
 create mode 100644 app/imports/ui/creature/character/CreatureSummary.vue
 rename app/imports/ui/creature/character/characterSheetTabs/{CharacterTab.vue => BuildTab.vue} (79%)
 create mode 100644 app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue

diff --git a/app/imports/ui/creature/CreatureFormDialog.vue b/app/imports/ui/creature/CreatureFormDialog.vue
index 7f680da9..9a80adce 100644
--- a/app/imports/ui/creature/CreatureFormDialog.vue
+++ b/app/imports/ui/creature/CreatureFormDialog.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <dialog-base :color="model.color">
+  <dialog-base v-if="model" :color="model.color">
     <template slot="toolbar">
       <v-toolbar-title>
         Character Details
@@ -43,7 +43,10 @@ export default {
     ColorPicker,
 	},
 	props: {
-		_id: String,
+		_id: {
+      type: String,
+      required: true,
+    },
 		startInEditTab: Boolean,
 	},
 	meteor: {
diff --git a/app/imports/ui/creature/character/CharacterSheet.vue b/app/imports/ui/creature/character/CharacterSheet.vue
index 2ae33224..9edaf0fb 100644
--- a/app/imports/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/ui/creature/character/CharacterSheet.vue
@@ -63,6 +63,9 @@ if<template>
           <v-tab-item>
             <character-tab :creature-id="creatureId" />
           </v-tab-item>
+          <v-tab-item>
+            <build-tab :creature-id="creatureId" />
+          </v-tab-item>
           <v-tab-item
             v-if="creature.settings.showTreeTab"
           >
@@ -82,7 +85,8 @@ if<template>
 	import FeaturesTab from '/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue';
 	import InventoryTab from '/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue';
 	import SpellsTab from '/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue';
-	import CharacterTab from '/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue';
+	import CharacterTab from '/imports/ui/creature/character/characterSheetTabs/JournalTab.vue';
+  import BuildTab from '/imports/ui/creature/character/characterSheetTabs/BuildTab.vue';
   import TreeTab from '/imports/ui/creature/character/characterSheetTabs/TreeTab.vue';
   import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
   import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
@@ -95,6 +99,7 @@ if<template>
 			InventoryTab,
 			SpellsTab,
 			CharacterTab,
+      BuildTab,
 			TreeTab,
 		},
 		props: {
diff --git a/app/imports/ui/creature/character/CharacterSheetToolbar.vue b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
index ab087d56..e46ce38c 100644
--- a/app/imports/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/ui/creature/character/CharacterSheetToolbar.vue
@@ -110,7 +110,10 @@
             Spells
           </v-tab>
           <v-tab>
-            Character
+            Journal
+          </v-tab>
+          <v-tab>
+            Build
           </v-tab>
           <v-tab v-if="creature.settings.showTreeTab">
             Tree
diff --git a/app/imports/ui/creature/character/CreatureSummary.vue b/app/imports/ui/creature/character/CreatureSummary.vue
new file mode 100644
index 00000000..4ec23aa3
--- /dev/null
+++ b/app/imports/ui/creature/character/CreatureSummary.vue
@@ -0,0 +1,56 @@
+<template>
+  <v-card
+    hover
+    data-id="creature-summary"
+    @mouseover="hover = true"
+    @mouseleave="hover = false"
+    @click="showCharacterForm"
+  >
+    <v-img
+      v-if="creature.picture"
+      :src="creature.picture"
+    />
+    <v-card-title class="text-h6">
+      {{ creature.name }}
+    </v-card-title>
+    <v-card-text>
+      {{ creature.alignment }}<br>
+      {{ creature.gender }}
+    </v-card-text>
+    <card-highlight :active="hover" />
+  </v-card>
+</template>
+
+<script lang="js">
+import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+
+export default {
+  components: {
+    CardHighlight,
+  },
+  props: {
+    creature: {
+      type: Object,
+      required: true,
+    },
+  },
+  data(){ return {
+    hover: false,
+  }},
+  methods: {
+      showCharacterForm(){
+        this.$store.commit('pushDialogStack', {
+          component: 'creature-form-dialog',
+          elementId: 'creature-summary',
+          data: {
+            _id: this.creature._id,
+          },
+        });
+      },
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
similarity index 79%
rename from app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
rename to app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index 36c768bc..15f3eb49 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/CharacterTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -1,53 +1,6 @@
 <template lang="html">
-  <div class="inventory">
+  <div class="build">
     <column-layout wide-columns>
-      <div>
-        <v-card
-          hover
-          data-id="creature-summary"
-          @mouseover="summaryHover = true"
-          @mouseleave="summaryHover = false"
-          @click="showCharacterForm"
-        >
-          <v-img
-            v-if="creature.picture"
-            :src="creature.picture"
-          />
-          <v-card-title class="text-h6">
-            {{ creature.name }}
-          </v-card-title>
-          <v-card-text>
-            {{ creature.alignment }}<br>
-            {{ creature.gender }}
-          </v-card-text>
-          <card-highlight :active="summaryHover" />
-        </v-card>
-      </div>
-      <div>
-        <toolbar-card
-          data-id="slot-card"
-          @toolbarclick="showSlotDialog"
-        >
-          <template slot="toolbar">
-            <v-toolbar-title>
-              Build
-            </v-toolbar-title>
-            <v-spacer />
-            <v-toolbar-title>
-              <v-icon
-                small
-                style="width: 16px;"
-                class="mr-1"
-              >
-                mdi-pencil
-              </v-icon>
-            </v-toolbar-title>
-          </template>
-          <v-card-text style="background-color: inherit;">
-            <slots :creature-id="creatureId" />
-          </v-card-text>
-        </toolbar-card>
-      </div>
       <div>
         <v-card class="class-details">
           <v-card-title
@@ -117,13 +70,30 @@
           </v-list>
         </v-card>
       </div>
-      <div
-        v-for="note in notes"
-        :key="note._id"
-      >
-        <note-card
-          :model="note"
-        />
+      <div>
+        <toolbar-card
+          data-id="slot-card"
+          @toolbarclick="showSlotDialog"
+        >
+          <template slot="toolbar">
+            <v-toolbar-title>
+              Build
+            </v-toolbar-title>
+            <v-spacer />
+            <v-toolbar-title>
+              <v-icon
+                small
+                style="width: 16px;"
+                class="mr-1"
+              >
+                mdi-pencil
+              </v-icon>
+            </v-toolbar-title>
+          </template>
+          <v-card-text style="background-color: inherit;">
+            <slots :creature-id="creatureId" />
+          </v-card-text>
+        </toolbar-card>
       </div>
     </column-layout>
   </div>
@@ -133,18 +103,16 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
 import Slots from '/imports/ui/creature/slots/Slots.vue';
 import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
 
 export default {
   components: {
     ColumnLayout,
-    NoteCard,
     Slots,
     ToolbarCard,
-    CardHighlight,
+    CreatureSummary,
   },
   props: {
     creatureId: {
@@ -152,9 +120,6 @@ export default {
       required: true,
     },
   },
-  data(){return {
-    summaryHover: false,
-  }},
   computed: {
     highestClassLevels(){
       let highestLevels = {};
@@ -182,16 +147,6 @@ export default {
     }
   },
   meteor: {
-    notes(){
-      return CreatureProperties.find({
-        'ancestors.id': this.creatureId,
-        type: 'note',
-        removed: {$ne: true},
-        inactive: {$ne: true},
-      }, {
-        sort: {order: 1},
-      });
-    },
     creature(){
       return Creatures.findOne(this.creatureId);
     },
@@ -207,15 +162,6 @@ export default {
     },
   },
   methods: {
-    showCharacterForm(){
-      this.$store.commit('pushDialogStack', {
-        component: 'creature-form-dialog',
-        elementId: 'creature-summary',
-        data: {
-          _id: this.creatureId,
-        },
-      });
-    },
     addExperience(){
       this.$store.commit('pushDialogStack', {
         component: 'experience-insert-dialog',
diff --git a/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
new file mode 100644
index 00000000..edbe0967
--- /dev/null
+++ b/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="build-tab">
+    <column-layout wide-columns>
+      <div>
+        <creature-summary :creature="creature" />
+      </div>
+      <div
+        v-for="note in notes"
+        :key="note._id"
+      >
+        <note-card
+          :model="note"
+        />
+      </div>
+    </column-layout>
+  </div>
+</template>
+
+<script lang="js">
+import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import Slots from '/imports/ui/creature/slots/Slots.vue';
+import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
+import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
+import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+
+export default {
+  components: {
+    ColumnLayout,
+    CreatureSummary,
+    NoteCard,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+  },
+  meteor: {
+    notes(){
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'note',
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        sort: {order: 1},
+      });
+    },
+    creature(){
+      return Creatures.findOne(this.creatureId);
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+
+</style>
\ No newline at end of file
diff --git a/app/package-lock.json b/app/package-lock.json
index 90de0f9d..1569bc53 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -2788,7 +2788,7 @@
     },
     "signal-exit": {
       "version": "3.0.2",
-      "resolved": "",
+      "resolved": false,
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simpl-schema": {
diff --git a/app/package.json b/app/package.json
index 79f6de12..5f0787c2 100644
--- a/app/package.json
+++ b/app/package.json
@@ -9,7 +9,7 @@
   },
   "author": "Stefan Zermatten",
   "scripts": {
-    "run": "meteor --once",
+    "run": "meteor",
     "test": "meteor test --driver-package meteortesting:mocha --port 3001"
   },
   "engines": {

From b28bcbe079ce615ab1f0384722a72443823d04a4 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 21 Apr 2022 22:08:18 +0200
Subject: [PATCH 02/56] Work on general UI for user files

---
 app/imports/api/files/UserImages.js | 18 +++++++
 app/imports/ui/layouts/Sidebar.vue  |  1 +
 app/imports/ui/pages/Files.vue      | 75 +++++++++++++++++++++++++++++
 app/imports/ui/router.js            | 16 ++++--
 app/package-lock.json               |  7 ++-
 app/package.json                    |  1 +
 6 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 app/imports/api/files/UserImages.js
 create mode 100644 app/imports/ui/pages/Files.vue

diff --git a/app/imports/api/files/UserImages.js b/app/imports/api/files/UserImages.js
new file mode 100644
index 00000000..ead7271b
--- /dev/null
+++ b/app/imports/api/files/UserImages.js
@@ -0,0 +1,18 @@
+import { createS3FilesCollection } from '/imports/api/files/s3FileStorage.js';
+
+const UserImages = createS3FilesCollection({
+  collectionName: 'userImages',
+  storagePath: Meteor.isDevelopment ? '/DiceCloud/userImages/' : 'assets/app/userImages',
+  onBeforeUpload(file) {
+    // Allow upload files under 10MB
+    if (file.size > 10485760) {
+      return 'Please upload with size equal or less than 10MB';
+    }
+    // Allow common image extensions
+    if (/gif|png|jpe?g|webp/i.test(file.extension || '')) {
+      return 'Please upload an image file only';
+    }
+  }
+});
+
+export default UserImages;
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
index fdd4fcb9..9c050890 100644
--- a/app/imports/ui/layouts/Sidebar.vue
+++ b/app/imports/ui/layouts/Sidebar.vue
@@ -96,6 +96,7 @@
           {title: 'Library', icon: 'mdi-library-shelves', to: '/library', requireLogin: true},
           //{title: 'Tabletops', icon: 'api', to: '/tabletops', requireLogin: true},
           //{title: 'Friends', icon: 'people', to: '/friends', requireLogin: true},
+          {title: 'Files', icon: 'mdi-file-multiple', to: '/my-files'},
           {title: 'Feedback', icon: 'mdi-bug', to: '/feedback'},
           {title: 'About', icon: 'mdi-sign-text', to: '/about'},
           {title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud'},
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
new file mode 100644
index 00000000..6a86d226
--- /dev/null
+++ b/app/imports/ui/pages/Files.vue
@@ -0,0 +1,75 @@
+<template>
+  <v-container>
+    <v-row>
+      <template v-if="archiveFiles && archiveFiles.length">
+        <v-col cols="12">
+          <v-subheader> Archived Characters </v-subheader>
+        </v-col>
+        <v-col
+          v-for="file in archiveFiles"
+          :key="file._id"
+          cols="12"
+          md="4"
+          lg="3"
+        >
+          <v-card>
+            <v-card-title>
+              {{ file.meta.creatureName }}
+            </v-card-title>
+            <v-card-subtitle>
+              {{ file.size }}
+            </v-card-subtitle>
+            <v-card-actions>
+              <v-btn text>
+                Restore
+              </v-btn>
+              <v-flex />
+              <v-btn
+                icon
+              >
+                <v-icon>mdi-delete</v-icon>
+              </v-btn>
+              <v-btn
+                icon
+                :href="`${file.link}?download=true`"
+              >
+                <v-icon>mdi-download</v-icon>
+              </v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-col>
+      </template>
+    </v-row>
+  </v-container>
+</template>
+
+<script lang="js">
+import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
+import prettyBytes from 'pretty-bytes';
+
+export default {
+  meteor: {
+    $subscribe: {
+      'archiveCreatureFiles': [],
+    },
+    archiveFiles() {
+      var userId = Meteor.userId();
+      return ArchiveCreatureFiles.find(
+        {
+          userId,
+        }, {
+          sort: {'size': -1},
+        }
+      ).map(f => {
+        f.json = JSON.stringify(f, null, 2);
+        f.size = prettyBytes(f.size);
+        f.link = ArchiveCreatureFiles.link(f);
+        return f;
+      });
+    },
+  }
+}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/router.js b/app/imports/ui/router.js
index f8fe9442..4295e83a 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/ui/router.js
@@ -30,6 +30,7 @@ const TabletopToolbar = () => import('/imports/ui/tabletop/TabletopToolbar.vue')
 const TabletopRightDrawer = () => import('/imports/ui/tabletop/TabletopRightDrawer.vue');
 const Admin = () => import('/imports/ui/pages/Admin.vue');
 const Maintenance = () => import('/imports/ui/pages/Maintenance.vue');
+const Files = () => import('/imports/ui/pages/Files.vue');
 
 // Not found
 const NotFound = () => import('/imports/ui/pages/NotFound.vue');
@@ -199,8 +200,8 @@ RouterFactory.configure(router => {
       meta: {
         title: 'Register',
       },
-		},{
-			path: '/account',
+    }, {
+      path: '/account',
       components: {
         default: Account,
       },
@@ -208,7 +209,16 @@ RouterFactory.configure(router => {
         title: 'Account',
       },
       beforeEnter: ensureLoggedIn,
-		},{
+    }, {
+      path: '/my-files',
+      components: {
+        default: Files,
+      },
+      meta: {
+        title: 'Files',
+      },
+      beforeEnter: ensureLoggedIn,
+    }, {
       path: '/feedback',
       components: {
         default: Feedback,
diff --git a/app/package-lock.json b/app/package-lock.json
index 1569bc53..85fabfac 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -2564,6 +2564,11 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "pretty-bytes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz",
+      "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg=="
+    },
     "prism-media": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.3.1.tgz",
@@ -2788,7 +2793,7 @@
     },
     "signal-exit": {
       "version": "3.0.2",
-      "resolved": false,
+      "resolved": "",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simpl-schema": {
diff --git a/app/package.json b/app/package.json
index 5f0787c2..456bbc3d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -40,6 +40,7 @@
     "nearley": "^2.19.1",
     "ngraph.graph": "^19.1.0",
     "ngraph.path": "^1.4.0",
+    "pretty-bytes": "^6.0.0",
     "qrcode": "^1.5.0",
     "request": "^2.88.2",
     "simpl-schema": "^1.12.0",

From 13b6689ba466ef9743c2c9b6e143d4b98b1ccab6 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 22 Apr 2022 11:30:59 +0200
Subject: [PATCH 03/56] Progress on file system UI

---
 .../archive/methods/archiveCreatureToFile.js  |  8 +-
 .../methods/restoreCreatureFromFile.js        | 10 ++-
 .../methods/assertHasCharacterSlots.js        | 22 +++++
 .../creatures/methods/insertCreature.js       | 17 +---
 app/imports/api/users/Users.js                |  5 ++
 .../users/methods/updateFileStorageUsed.js    | 71 +++++++++++++++
 app/imports/api/users/patreon/tiers.js        |  9 ++
 app/imports/server/publications/users.js      |  1 +
 .../ui/creature/archive/ArchiveDialog.vue     | 18 ++--
 app/imports/ui/files/ArchiveFileCard.vue      | 68 ++++++++++++++
 app/imports/ui/pages/Files.vue                | 90 +++++++++++++------
 app/package-lock.json                         |  2 +-
 12 files changed, 267 insertions(+), 54 deletions(-)
 create mode 100644 app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js
 create mode 100644 app/imports/api/users/methods/updateFileStorageUsed.js
 create mode 100644 app/imports/ui/files/ArchiveFileCard.vue

diff --git a/app/imports/api/creature/archive/methods/archiveCreatureToFile.js b/app/imports/api/creature/archive/methods/archiveCreatureToFile.js
index 7599299c..308eaccb 100644
--- a/app/imports/api/creature/archive/methods/archiveCreatureToFile.js
+++ b/app/imports/api/creature/archive/methods/archiveCreatureToFile.js
@@ -9,6 +9,7 @@ import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
 import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
+import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
 
 export function getArchiveObj(creatureId){
   // Build the archive document
@@ -31,7 +32,7 @@ export function getArchiveObj(creatureId){
   return archiveCreature;
 }
 
-export function archiveCreature(creatureId){
+export function archiveCreature(creatureId, userId){
   const archive = getArchiveObj(creatureId);
   const buffer = Buffer.from(JSON.stringify(archive, null, 2));
   ArchiveCreatureFiles.write(buffer, {
@@ -43,11 +44,12 @@ export function archiveCreature(creatureId){
       creatureId: archive.creature._id,
       creatureName: archive.creature.name,
     },
-  }, (error) => {
+  }, (error, file) => {
     if (error){
       throw error;
     } else {
       removeCreatureWork(creatureId);
+      incrementFileStorageUsed(userId, file.size);
     }
   }, true);
 }
@@ -68,7 +70,7 @@ const archiveCreatureToFile = new ValidatedMethod({
   async run({creatureId}) {
     assertOwnership(creatureId, this.userId);
     if (Meteor.isServer){
-      archiveCreature(creatureId);
+      archiveCreature(creatureId, this.userId);
     } else {
       removeCreatureWork(creatureId);
     }
diff --git a/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js b/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
index 986bb9ca..9130390a 100644
--- a/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
+++ b/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
@@ -8,6 +8,9 @@ import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
 import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
+import assertHasCharactersSlots from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
+import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
+
 let migrateArchive;
 if (Meteor.isServer){
   migrateArchive = require('/imports/migrations/server/migrateArchive.js').default;
@@ -69,13 +72,18 @@ const restoreCreaturefromFile = new ValidatedMethod({
       throw new Meteor.Error('Permission denied',
       'You can only restore creatures you own');
     }
+
+    assertHasCharactersSlots(this.userId);
+
     if (Meteor.isServer){
       // Read the file data
       const archive = await ArchiveCreatureFiles.readJSONFile(file);
       restoreCreature(archive);
     }
     //Remove the archive once the restore succeeded
-    ArchiveCreatureFiles.remove({_id: fileId});
+    ArchiveCreatureFiles.remove({ _id: fileId });
+    // Update the user's file storage limits
+    incrementFileStorageUsed(userId, -file.size);
   },
 });
 
diff --git a/app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js b/app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js
new file mode 100644
index 00000000..de8aa49c
--- /dev/null
+++ b/app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js
@@ -0,0 +1,22 @@
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+
+export default function assertHasCharactersSlots(userId) {
+  if (characterSlotsRemaining(userId) <= 0) {
+    throw new Meteor.Error('characterSlotLimit',
+      `You are already at your limit of ${tier.characterSlots} characters`)
+  }
+}
+
+export function characterSlotsRemaining(userId) {
+  let tier = getUserTier(userId);
+  const currentCharacterCount = Creatures.find({
+    owner: userId,
+  }, {
+    fields: { _id: 1 },
+  }).count();
+  if (tier.characterSlots === -1) {
+    return Number.POSITIVE_INFINITY;
+  }
+  return tier.characterSlots - currentCharacterCount;
+}
diff --git a/app/imports/api/creature/creatures/methods/insertCreature.js b/app/imports/api/creature/creatures/methods/insertCreature.js
index 79086eb3..7dde2bbb 100644
--- a/app/imports/api/creature/creatures/methods/insertCreature.js
+++ b/app/imports/api/creature/creatures/methods/insertCreature.js
@@ -2,9 +2,9 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import defaultCharacterProperties from '/imports/api/creature/creatures/defaultCharacterProperties.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+import assertHasCharactersSlots from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 
 const insertCreature = new ValidatedMethod({
 
@@ -23,21 +23,8 @@ const insertCreature = new ValidatedMethod({
       throw new Meteor.Error('Creatures.methods.insert.denied',
       'You need to be logged in to insert a creature');
     }
-    let tier = getUserTier(this.userId);
 
-    let currentCharacterCount = Creatures.find({
-      owner: this.userId,
-    }, {
-      fields: {_id: 1},
-    }).count();
-
-    if (
-      tier.characterSlots !== -1 &&
-      currentCharacterCount >= tier.characterSlots
-    ){
-      throw new Meteor.Error('Creatures.methods.insert.denied',
-      `You are already at your limit of ${tier.characterSlots} characters`)
-    }
+    assertHasCharactersSlots(this.userId);
 
 		// Create the creature document
     let creatureId = Creatures.insert({
diff --git a/app/imports/api/users/Users.js b/app/imports/api/users/Users.js
index be3fd3a8..31a4d818 100644
--- a/app/imports/api/users/Users.js
+++ b/app/imports/api/users/Users.js
@@ -4,6 +4,7 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import '/imports/api/users/methods/deleteMyAccount.js';
 import '/imports/api/users/methods/addEmail.js';
 import '/imports/api/users/methods/removeEmail.js';
+import '/imports/api/users/methods/updateFileStorageUsed.js';
 
 import { some } from 'lodash';
 const defaultLibraries = process.env.DEFAULT_LIBRARIES && process.env.DEFAULT_LIBRARIES.split(',') || [];
@@ -84,6 +85,10 @@ const userSchema = new SimpleSchema({
 		type: String,
     regEx: SimpleSchema.RegEx.Id,
 	},
+	fileStorageUsed: {
+		type: Number,
+		optional: true,
+	},
   profile: {
     type: Object,
     blackbox: true,
diff --git a/app/imports/api/users/methods/updateFileStorageUsed.js b/app/imports/api/users/methods/updateFileStorageUsed.js
new file mode 100644
index 00000000..4fad2feb
--- /dev/null
+++ b/app/imports/api/users/methods/updateFileStorageUsed.js
@@ -0,0 +1,71 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
+import UserImages from '/imports/api/files/UserImages.js';
+const fileCollections = [ArchiveCreatureFiles, UserImages];
+
+const updateFileStorageUsed = new ValidatedMethod({
+  name: 'users.recalculateFileStorageUsed',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run() {
+    const userId = Meteor.userId();
+    if (!userId) throw new Meteor.Error('No user',
+      'You must be logged in to recalculate your file use');
+    const user = Meteor.users.findOne(userId);
+    if (!user) {
+      throw new Meteor.Error('noUser', 'User not found');
+    }
+    updateFileStorageUsedWork(userId);
+  }
+});
+
+export default updateFileStorageUsed;
+
+export function updateFileStorageUsedWork(userId) {
+  if (!userId) {
+    throw new Meteor.Error('idRequired',
+    'No user ID was provided to update file storage used')
+  }
+
+  let sum = 0;
+  fileCollections.forEach(collection => {
+    collection.find({ userId }, { fields: { size: 1 } }).forEach(file => {
+      sum += file.size;
+    });
+  });
+
+  Meteor.users.update(userId, {
+    $set: {
+      fileStorageUsed: sum,
+    }
+  });
+}
+
+export function incrementFileStorageUsed(userId, amount) {
+  if (!userId) {
+    throw new Meteor.Error('idRequired',
+      'No user ID was provided to update file storage used')
+  }
+  
+  const user = Meteor.users.findOne(userId);
+  if (!user) {
+    throw new Meteor.Error('noUser', 'User not found');
+  }
+
+  if (user.fileStorageUsed === undefined) {
+    // The user doesn't have a current value for storage used, calculate it
+    // from scratch
+    updateFileStorageUsedWork(userId);
+  } else {
+    Meteor.users.update(userId, {
+      $inc: {
+        fileStorageUsed: amount,
+      }
+    });
+  }
+}
diff --git a/app/imports/api/users/patreon/tiers.js b/app/imports/api/users/patreon/tiers.js
index 32f0465d..2d789993 100644
--- a/app/imports/api/users/patreon/tiers.js
+++ b/app/imports/api/users/patreon/tiers.js
@@ -9,18 +9,21 @@ const TIERS = Object.freeze([
     minimumEntitledCents: 0,
     invites: 0,
     characterSlots: 5,
+    fileStorage: 50,
     paidBenefits: false,
   }, {
     name: 'Dreamer',
     minimumEntitledCents: 100,
     invites: 0,
     characterSlots: 5,
+    fileStorage: 50,
     paidBenefits: false,
   }, {
     name: 'Wanderer',
     minimumEntitledCents: 300,
     invites: 0,
     characterSlots: 5,
+    fileStorage: 50,
     paidBenefits: false,
   }, {
     //cost per user $5
@@ -28,6 +31,7 @@ const TIERS = Object.freeze([
     minimumEntitledCents: 500,
     invites: 0,
     characterSlots: 20,
+    fileStorage: 200,
     paidBenefits: true,
   }, {
     //cost per user $3.33
@@ -35,6 +39,7 @@ const TIERS = Object.freeze([
     minimumEntitledCents: 1000,
     invites: 2,
     characterSlots: 50,
+    fileStorage: 500,
     paidBenefits: true,
   }, {
     //cost per user $3.333
@@ -42,6 +47,7 @@ const TIERS = Object.freeze([
     minimumEntitledCents: 2000,
     invites: 5,
     characterSlots: 120,
+    fileStorage: 1000,
     paidBenefits: true,
   }, {
     //cost per user $3.125
@@ -49,6 +55,7 @@ const TIERS = Object.freeze([
     minimumEntitledCents: 5000,
     invites: 15,
     characterSlots: -1, // Unlimited characters
+    fileStorage: 2000,
     paidBenefits: true,
   },
 ]);
@@ -59,6 +66,7 @@ const GUEST_TIER = Object.freeze({
   guest: true,
   invites: 0,
   characterSlots: 20,
+  fileStorage: 200,
   paidBenefits: true,
 });
 
@@ -68,6 +76,7 @@ const PATREON_DISABLED_TIER = Object.freeze({
   name: 'Outlander',
   invites: 0,
   characterSlots: -1, // Can have infinitely many characters
+  fileStorage: 1000000, // 1TB file storage
   paidBenefits: true,
 });
 
diff --git a/app/imports/server/publications/users.js b/app/imports/server/publications/users.js
index c3e0c101..289f60dc 100644
--- a/app/imports/server/publications/users.js
+++ b/app/imports/server/publications/users.js
@@ -10,6 +10,7 @@ Meteor.publish('user', function(){
       apiKey: 1,
       darkMode: 1,
       subscribedLibraries: 1,
+      fileStorageUsed: 1,
       profile: 1,
       preferences: 1,
       'services.patreon.id': 1,
diff --git a/app/imports/ui/creature/archive/ArchiveDialog.vue b/app/imports/ui/creature/archive/ArchiveDialog.vue
index 0182b339..5d5b041d 100644
--- a/app/imports/ui/creature/archive/ArchiveDialog.vue
+++ b/app/imports/ui/creature/archive/ArchiveDialog.vue
@@ -35,16 +35,15 @@
       slot="actions"
       text
       :loading="archiveActionLoading"
-      :disabled="!numSelected"
+      :disabled="!numSelected || (mode === 'restore' && characterSlots <= 0)"
       color="primary"
       @click="archiveAction"
     >
-      {{ mode === 'archive' ? 'Archive' : 'Restore' }}
-      <template v-if="numSelected > 1">
-        {{ numSelected }} characters
+      <template v-if="mode === 'restore' && characterSlots <= 0">
+        No Character Slots Left
       </template>
-      <template v-else-if="numSelected === 1">
-        character
+      <template v-else>
+        {{ mode === 'archive' ? 'Archive' : 'Restore' }}
       </template>
     </v-btn>
     <v-btn
@@ -65,8 +64,9 @@ import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolder
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import archiveCreatureToFile from '/imports/api/creature/archive/methods/archiveCreatureToFile.js';
 import restoreCreatureFromFile from '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
-import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
 import { uniq, flatten } from 'lodash';
+import { characterSlotsRemaining } from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 
 const characterTransform = function(char){
   char.url = `/character/${char._id}/${char.urlName || '-'}`;
@@ -146,6 +146,10 @@ export default {
     $subscribe: {
       'archivedCreatures': [],
       'archiveCreatureFiles': [],
+      'characterList': [],
+    },
+    characterSlots(){
+      return characterSlotsRemaining(Meteor.userId());
     },
     folders(){
       const userId = Meteor.userId();
diff --git a/app/imports/ui/files/ArchiveFileCard.vue b/app/imports/ui/files/ArchiveFileCard.vue
new file mode 100644
index 00000000..fcad226a
--- /dev/null
+++ b/app/imports/ui/files/ArchiveFileCard.vue
@@ -0,0 +1,68 @@
+<template>
+  <v-card>
+    <v-card-title>
+      {{ model.meta.creatureName }}
+    </v-card-title>
+    <v-card-subtitle>
+      {{ model.size }}
+    </v-card-subtitle>
+    <v-card-actions>
+      <v-btn
+        v-if="characterSlots > 0"
+        text
+        @click="restore(model._id)"
+      >
+        Restore
+      </v-btn>
+      <v-flex />
+      <v-btn
+        icon
+      >
+        <v-icon>mdi-delete</v-icon>
+      </v-btn>
+      <v-btn
+        icon
+        :href="`${model.link}?download=true`"
+      >
+        <v-icon>mdi-download</v-icon>
+      </v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script lang="js">
+import restoreCreatureFromFile from '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { characterSlotsRemaining } from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
+
+export default {
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  data(){return {
+    restoreLoading: false,
+    removeLoading: false,
+  }},
+   meteor: {
+    characterSlots(){
+      return characterSlotsRemaining(Meteor.userId());
+    },
+   },
+  methods: {
+    restore(){
+      this.restoreLoading = true;
+      restoreCreatureFromFile.call({
+        fileId: this.model._id,
+      }, error => {
+        this.restoreLoading = false;
+        if (!error) return;
+        console.error(error);
+        snackbar({text: error.reason});
+      });
+    }
+  },
+}
+</script>
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index 6a86d226..80977072 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -1,5 +1,33 @@
 <template>
   <v-container>
+    <v-row justify="center">
+      <v-col
+        cols="12"
+        md="4"
+        lg="3"
+        class="layout column justify-center align-center"
+      >
+        <v-progress-circular
+          :rotate="-90"
+          :size="100"
+          :width="15"
+          :value="percentFileStorageUsed"
+          :buffer-value="50"
+          color="accent"
+        >
+          {{ percentFileStorageUsed }}%
+        </v-progress-circular>
+        <div class="ma-2 mt-4">
+          {{ prettyBytes(storageUsed) }} / {{ prettyBytes(storageAllowed) }}
+          <v-btn
+            icon
+            @click="updateStorageUsed"
+          >
+            <v-icon>mdi-refresh</v-icon>
+          </v-btn>
+        </div>
+      </v-col>
+    </v-row>
     <v-row>
       <template v-if="archiveFiles && archiveFiles.length">
         <v-col cols="12">
@@ -12,31 +40,7 @@
           md="4"
           lg="3"
         >
-          <v-card>
-            <v-card-title>
-              {{ file.meta.creatureName }}
-            </v-card-title>
-            <v-card-subtitle>
-              {{ file.size }}
-            </v-card-subtitle>
-            <v-card-actions>
-              <v-btn text>
-                Restore
-              </v-btn>
-              <v-flex />
-              <v-btn
-                icon
-              >
-                <v-icon>mdi-delete</v-icon>
-              </v-btn>
-              <v-btn
-                icon
-                :href="`${file.link}?download=true`"
-              >
-                <v-icon>mdi-download</v-icon>
-              </v-btn>
-            </v-card-actions>
-          </v-card>
+          <archive-file-card :model="file" />
         </v-col>
       </template>
     </v-row>
@@ -46,11 +50,31 @@
 <script lang="js">
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import prettyBytes from 'pretty-bytes';
+import ArchiveFileCard from '/imports/ui/files/ArchiveFileCard.vue';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import updateFileStorageUsed from '/imports/api/users/methods/updateFileStorageUsed.js';
 
 export default {
+  components: {
+    ArchiveFileCard,
+  },
+  data(){ return {
+    updateStorageUsedLoading: false,
+  }},
   meteor: {
     $subscribe: {
       'archiveCreatureFiles': [],
+      'characterList': [],
+    },
+    storageUsed(){
+      return Meteor.user().fileStorageUsed || 0;
+    },
+    storageAllowed(){
+      return getUserTier(Meteor.userId()).fileStorage * 1000000;
+    },
+    percentFileStorageUsed(){
+      return Math.round((this.storageUsed / this.storageAllowed) * 100);
     },
     archiveFiles() {
       var userId = Meteor.userId();
@@ -61,13 +85,25 @@ export default {
           sort: {'size': -1},
         }
       ).map(f => {
-        f.json = JSON.stringify(f, null, 2);
         f.size = prettyBytes(f.size);
         f.link = ArchiveCreatureFiles.link(f);
         return f;
       });
     },
-  }
+  },
+  methods: {
+    prettyBytes(input){
+      return prettyBytes(input)
+    },
+    updateStorageUsed(){
+      this.updateStorageUsedLoading = true;
+      updateFileStorageUsed.call(error => {
+        this.updateStorageUsedLoading = false;
+        if (!error) return;
+        snackbar({text: error.reason});
+      });
+    }
+  },
 }
 </script>
 
diff --git a/app/package-lock.json b/app/package-lock.json
index 85fabfac..85fbd09d 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -2793,7 +2793,7 @@
     },
     "signal-exit": {
       "version": "3.0.2",
-      "resolved": "",
+      "resolved": false,
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simpl-schema": {

From f440e030cfd8b49654a90fb3c8f71eddd119d5a5 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 22 Apr 2022 11:31:59 +0200
Subject: [PATCH 04/56] Fixed bug in generating error messages when out of
 character slots

---
 .../api/creature/creatures/methods/assertHasCharacterSlots.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js b/app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js
index de8aa49c..5b368e5f 100644
--- a/app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js
+++ b/app/imports/api/creature/creatures/methods/assertHasCharacterSlots.js
@@ -4,7 +4,7 @@ import Creatures from '/imports/api/creature/creatures/Creatures.js';
 export default function assertHasCharactersSlots(userId) {
   if (characterSlotsRemaining(userId) <= 0) {
     throw new Meteor.Error('characterSlotLimit',
-      `You are already at your limit of ${tier.characterSlots} characters`)
+      'No character slots left')
   }
 }
 

From 7609e916c65b8cfffc2005710fcd95f175a0df76 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 23 Apr 2022 09:35:29 +0200
Subject: [PATCH 05/56] Implemented remove button on archive files

---
 .../api/creature/archive/methods/index.js     |  1 +
 .../archive/methods/removeArchiveCreature.js  | 47 +++++++++++++++++++
 .../dialogStack/DeleteConfirmationDialog.vue  |  5 +-
 app/imports/ui/files/ArchiveFileCard.vue      | 23 ++++++++-
 app/imports/ui/pages/Files.vue                |  7 +--
 5 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 app/imports/api/creature/archive/methods/removeArchiveCreature.js

diff --git a/app/imports/api/creature/archive/methods/index.js b/app/imports/api/creature/archive/methods/index.js
index d3784bde..f2c61b6d 100644
--- a/app/imports/api/creature/archive/methods/index.js
+++ b/app/imports/api/creature/archive/methods/index.js
@@ -2,3 +2,4 @@
 import '/imports/api/creature/archive/methods/archiveCreatureToFile.js';
 import '/imports/api/creature/archive/methods/restoreCreatures.js';
 import '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
+import '/imports/api/creature/archive/methods/removeArchiveCreature.js';
diff --git a/app/imports/api/creature/archive/methods/removeArchiveCreature.js b/app/imports/api/creature/archive/methods/removeArchiveCreature.js
new file mode 100644
index 00000000..22bf858d
--- /dev/null
+++ b/app/imports/api/creature/archive/methods/removeArchiveCreature.js
@@ -0,0 +1,47 @@
+import SCHEMA_VERSION from '/imports/constants/SCHEMA_VERSION.js';
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
+import Experiences from '/imports/api/creature/experience/Experiences.js';
+import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
+import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
+import assertHasCharactersSlots from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
+import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
+
+const removeArchiveCreature = new ValidatedMethod({
+  name: 'ArchiveCreatureFiles.methods.removeArchiveCreature',
+  validate: new SimpleSchema({
+    'fileId': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  async run({ fileId }) {
+    // fetch the file
+    const file = ArchiveCreatureFiles.findOne({ _id: fileId }).get();
+    if (!file) {
+      throw new Meteor.Error('File not found',
+        'The requested creature archive does not exist');
+    }
+    // Assert ownership
+    const userId = file?.userId;
+    if (!userId || userId !== this.userId) {
+      throw new Meteor.Error('Permission denied',
+        'You can only restore creatures you own');
+    }
+    //Remove the archive once the restore succeeded
+    ArchiveCreatureFiles.remove({ _id: fileId });
+    // Update the user's file storage limits
+    incrementFileStorageUsed(userId, -file.size);
+  },
+});
+
+export default removeArchiveCreature;
diff --git a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
index 90fc56c7..3802253b 100644
--- a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
+++ b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
@@ -4,8 +4,11 @@
       Delete {{ typeName }}
     </v-toolbar-title>
     <div>
+      <v-alert type="warning" outlined>
+        This cannot be undone
+      </v-alert>
       <p v-if="name">
-        Type "{{ name }}" to permanenetly delete
+        Type "{{ name }}" to permanenetly delete.
       </p>
       <v-text-field
         v-if="name"
diff --git a/app/imports/ui/files/ArchiveFileCard.vue b/app/imports/ui/files/ArchiveFileCard.vue
index fcad226a..cab9edde 100644
--- a/app/imports/ui/files/ArchiveFileCard.vue
+++ b/app/imports/ui/files/ArchiveFileCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-card>
+  <v-card :data-id="`${model._id}-archive-card`">
     <v-card-title>
       {{ model.meta.creatureName }}
     </v-card-title>
@@ -17,6 +17,7 @@
       <v-flex />
       <v-btn
         icon
+        @click="removeArchiveCharacter"
       >
         <v-icon>mdi-delete</v-icon>
       </v-btn>
@@ -34,6 +35,7 @@
 import restoreCreatureFromFile from '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
 import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
 import { characterSlotsRemaining } from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
+import removeArchiveCreature from '/imports/api/creature/archive/methods/removeArchiveCreature.js';
 
 export default {
   props: {
@@ -62,7 +64,24 @@ export default {
         console.error(error);
         snackbar({text: error.reason});
       });
-    }
+    },
+    removeArchiveCharacter(){
+			let that = this;
+			this.$store.commit('pushDialogStack', {
+				component: 'delete-confirmation-dialog',
+				elementId: `${that.model._id}-archive-card`,
+				data: {
+					name: this.model.meta.creatureName,
+					typeName: 'Character Archive'
+				},
+				callback(confirmation){
+					if(!confirmation) return;
+					removeArchiveCreature.call({fileId: that.model._id}, (error) => {
+						if (error) console.error(error);
+					});
+				}
+			});
+		},
   },
 }
 </script>
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index 80977072..376dd53d 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -28,7 +28,7 @@
         </div>
       </v-col>
     </v-row>
-    <v-row>
+    <v-row dense>
       <template v-if="archiveFiles && archiveFiles.length">
         <v-col cols="12">
           <v-subheader> Archived Characters </v-subheader>
@@ -102,10 +102,7 @@ export default {
         if (!error) return;
         snackbar({text: error.reason});
       });
-    }
+    },
   },
 }
 </script>
-
-<style>
-</style>
\ No newline at end of file

From 2ca9ac53429ce7e8cbbc21e5942dcb70c09a269c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 23 Apr 2022 09:52:20 +0200
Subject: [PATCH 06/56] Added storage stats to the account page

---
 .../CharacterListToolbarItems.vue             | 20 +-----
 .../creatureList/CreatureStorageStats.vue     | 34 ++++++++++
 .../dialogStack/DeleteConfirmationDialog.vue  |  2 +-
 app/imports/ui/files/FileStorageStats.vue     | 66 +++++++++++++++++++
 app/imports/ui/pages/Account.vue              | 18 +++++
 app/imports/ui/pages/Files.vue                | 54 +--------------
 6 files changed, 125 insertions(+), 69 deletions(-)
 create mode 100644 app/imports/ui/creature/creatureList/CreatureStorageStats.vue
 create mode 100644 app/imports/ui/files/FileStorageStats.vue

diff --git a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
index 5c678946..df427b85 100644
--- a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
+++ b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -1,33 +1,19 @@
 <template lang="html">
   <div>
-    {{ creatureCount }} /
-    <v-icon v-if="characterSlots === -1">
-      mdi-infinity
-    </v-icon>
-    <template v-else>
-      {{ characterSlots }}
-    </template>
+    <creature-storage-stats />
     <archive-button />
   </div>
 </template>
 
 <script lang="js">
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import CreatureStorageStats from '/imports/ui/creature/creatureList/CreatureStorageStats.vue';
 import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
 
 export default {
   components: {
+    CreatureStorageStats,
     ArchiveButton,
   },
-  meteor: {
-    creatureCount(){
-      return Creatures.find({owner: Meteor.userId()}).count();
-    },
-    characterSlots(){
-      return getUserTier(Meteor.userId()).characterSlots;
-    }
-  },
 }
 </script>
 
diff --git a/app/imports/ui/creature/creatureList/CreatureStorageStats.vue b/app/imports/ui/creature/creatureList/CreatureStorageStats.vue
new file mode 100644
index 00000000..6bbcfb66
--- /dev/null
+++ b/app/imports/ui/creature/creatureList/CreatureStorageStats.vue
@@ -0,0 +1,34 @@
+<template>
+  <div
+    class="creature-storage-stats"
+    style="display: inline-block;"
+  >
+    {{ creatureCount }} /
+    <v-icon v-if="characterSlots === -1">
+      mdi-infinity
+    </v-icon>
+    <template v-else>
+      {{ characterSlots }}
+    </template>
+  </div>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+
+export default {
+  meteor: {
+    creatureCount(){
+      return Creatures.find({owner: Meteor.userId()}).count();
+    },
+    characterSlots(){
+      return getUserTier(Meteor.userId()).characterSlots;
+    }
+  },
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
index 3802253b..ffe5d186 100644
--- a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
+++ b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
@@ -5,7 +5,7 @@
     </v-toolbar-title>
     <div>
       <v-alert type="warning" outlined>
-        This cannot be undone
+        This can't be undone
       </v-alert>
       <p v-if="name">
         Type "{{ name }}" to permanenetly delete.
diff --git a/app/imports/ui/files/FileStorageStats.vue b/app/imports/ui/files/FileStorageStats.vue
new file mode 100644
index 00000000..c4ad854b
--- /dev/null
+++ b/app/imports/ui/files/FileStorageStats.vue
@@ -0,0 +1,66 @@
+<template>
+  <v-col
+    cols="12"
+    md="4"
+    lg="3"
+    class="layout column justify-center align-center"
+  >
+    <v-progress-circular
+      :rotate="-90"
+      :size="100"
+      :width="15"
+      :value="percentFileStorageUsed"
+      :buffer-value="50"
+      color="accent"
+    >
+      {{ percentFileStorageUsed }}%
+    </v-progress-circular>
+    <div class="ma-2 mt-4">
+      {{ prettyBytes(storageUsed) }} / {{ prettyBytes(storageAllowed) }}
+      <v-btn
+        icon
+        @click="updateStorageUsed"
+      >
+        <v-icon>mdi-refresh</v-icon>
+      </v-btn>
+    </div>
+  </v-col>
+</template>
+
+<script lang="js">
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import updateFileStorageUsed from '/imports/api/users/methods/updateFileStorageUsed.js';
+import prettyBytes from 'pretty-bytes';
+
+export default {
+   meteor: {
+    storageUsed(){
+      return Meteor.user().fileStorageUsed || 0;
+    },
+    storageAllowed(){
+      return getUserTier(Meteor.userId()).fileStorage * 1000000;
+    },
+    percentFileStorageUsed(){
+      return Math.round((this.storageUsed / this.storageAllowed) * 100);
+    },
+  },
+    methods: {
+    prettyBytes(input){
+      return prettyBytes(input)
+    },
+    updateStorageUsed(){
+      this.updateStorageUsedLoading = true;
+      updateFileStorageUsed.call(error => {
+        this.updateStorageUsedLoading = false;
+        if (!error) return;
+        snackbar({text: error.reason});
+      });
+    },
+  },
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/pages/Account.vue b/app/imports/ui/pages/Account.vue
index bbd25a06..1deea14a 100644
--- a/app/imports/ui/pages/Account.vue
+++ b/app/imports/ui/pages/Account.vue
@@ -8,6 +8,18 @@
       style="flex-basis: 900px"
     >
       <v-list>
+        <v-subheader>
+          File storage used
+        </v-subheader>
+        <file-storage-stats />
+        <v-subheader>
+          Character storage used
+        </v-subheader>
+        <v-list-item>
+          <v-list-item-title>
+            <creature-storage-stats />
+          </v-list-item-title>
+        </v-list-item>
         <v-subheader>
           Preferences
         </v-subheader>
@@ -221,8 +233,14 @@
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
   import addEmail from '/imports/api/users/methods/addEmail.js';
   import removeEmail from '/imports/api/users/methods/removeEmail.js';
+  import CreatureStorageStats from '/imports/ui/creature/creatureList/CreatureStorageStats.vue';
+  import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
 
   export default {
+    components: {
+      CreatureStorageStats,
+      FileStorageStats,
+    },
     meteor: {
       $subscribe: {
         'userPublicProfiles'(){
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index 376dd53d..a6f7e917 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -1,32 +1,7 @@
 <template>
   <v-container>
     <v-row justify="center">
-      <v-col
-        cols="12"
-        md="4"
-        lg="3"
-        class="layout column justify-center align-center"
-      >
-        <v-progress-circular
-          :rotate="-90"
-          :size="100"
-          :width="15"
-          :value="percentFileStorageUsed"
-          :buffer-value="50"
-          color="accent"
-        >
-          {{ percentFileStorageUsed }}%
-        </v-progress-circular>
-        <div class="ma-2 mt-4">
-          {{ prettyBytes(storageUsed) }} / {{ prettyBytes(storageAllowed) }}
-          <v-btn
-            icon
-            @click="updateStorageUsed"
-          >
-            <v-icon>mdi-refresh</v-icon>
-          </v-btn>
-        </div>
-      </v-col>
+      <file-storage-stats />
     </v-row>
     <v-row dense>
       <template v-if="archiveFiles && archiveFiles.length">
@@ -51,13 +26,12 @@
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import prettyBytes from 'pretty-bytes';
 import ArchiveFileCard from '/imports/ui/files/ArchiveFileCard.vue';
-import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import updateFileStorageUsed from '/imports/api/users/methods/updateFileStorageUsed.js';
+import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
 
 export default {
   components: {
     ArchiveFileCard,
+    FileStorageStats,
   },
   data(){ return {
     updateStorageUsedLoading: false,
@@ -67,15 +41,6 @@ export default {
       'archiveCreatureFiles': [],
       'characterList': [],
     },
-    storageUsed(){
-      return Meteor.user().fileStorageUsed || 0;
-    },
-    storageAllowed(){
-      return getUserTier(Meteor.userId()).fileStorage * 1000000;
-    },
-    percentFileStorageUsed(){
-      return Math.round((this.storageUsed / this.storageAllowed) * 100);
-    },
     archiveFiles() {
       var userId = Meteor.userId();
       return ArchiveCreatureFiles.find(
@@ -91,18 +56,5 @@ export default {
       });
     },
   },
-  methods: {
-    prettyBytes(input){
-      return prettyBytes(input)
-    },
-    updateStorageUsed(){
-      this.updateStorageUsedLoading = true;
-      updateFileStorageUsed.call(error => {
-        this.updateStorageUsedLoading = false;
-        if (!error) return;
-        snackbar({text: error.reason});
-      });
-    },
-  },
 }
 </script>

From 8b44c83741a132ccb3f969580a5faab36b68794b Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 23 Apr 2022 11:35:11 +0200
Subject: [PATCH 07/56] Added archive upload UI

---
 app/imports/ui/pages/Files.vue | 56 +++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index a6f7e917..8d77f097 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -1,6 +1,9 @@
 <template>
   <v-container>
-    <v-row justify="center">
+    <v-row
+      justify="center"
+      class="mt-2"
+    >
       <file-storage-stats />
     </v-row>
     <v-row dense>
@@ -17,6 +20,37 @@
         >
           <archive-file-card :model="file" />
         </v-col>
+        <v-col
+          key="upload"
+          cols="12"
+          md="4"
+          lg="3"
+          class="layout column justify-center"
+        >
+          <input
+            ref="archiveFileInput"
+            type="file"
+            accept=".json"
+            style="display: none;"
+            @input="inputArchiveFile"
+          >
+          <v-btn
+            outlined
+            style="height: 100%; width: 100%;"
+            :color="archiveFileError ? 'error' : undefined"
+            @click="$refs.archiveFileInput.click()"
+          >
+            <v-icon left>
+              mdi-file-upload-outline
+            </v-icon>
+            <template v-if="archiveFileError">
+              {{ archiveFileError }}
+            </template>
+            <template v-else>
+              Upload archive
+            </template>
+          </v-btn>
+        </v-col>
       </template>
     </v-row>
   </v-container>
@@ -35,6 +69,8 @@ export default {
   },
   data(){ return {
     updateStorageUsedLoading: false,
+    archiveFileError: undefined,
+    archiveFile: undefined,
   }},
   meteor: {
     $subscribe: {
@@ -56,5 +92,23 @@ export default {
       });
     },
   },
+  methods: {
+    inputArchiveFile(){
+      this.archiveFile = undefined;
+      this.archiveFileError = undefined;
+      const file = this.$refs.archiveFileInput.files[0];
+      if (!file) return;
+      if (file.type !== 'application/json'){
+        this.archiveFileError = 'File must be .json';
+        return;
+      }
+      if (file.size > 10000000){
+        this.archiveFileError = 'File too large';
+        return;
+      }
+      this.archiveFile = file;
+      console.log(this.archiveFile);
+    }
+  },
 }
 </script>

From 6b724cf365993a685ce09b7cb855a315e0cd4b30 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 25 Apr 2022 11:16:02 +0200
Subject: [PATCH 08/56] Dicecloud instances without db version numbers won't go
 into migration mode

---
 app/imports/constants/MAINTENANCE_MODE.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/imports/constants/MAINTENANCE_MODE.js b/app/imports/constants/MAINTENANCE_MODE.js
index f81e01e4..42045410 100644
--- a/app/imports/constants/MAINTENANCE_MODE.js
+++ b/app/imports/constants/MAINTENANCE_MODE.js
@@ -6,6 +6,7 @@ if (Meteor.isServer){
     const dbVersion = Migrations.getVersion();
     if (
       !Meteor.settings.public.maintenanceMode &&
+      dbVersion !== undefined &&
       SCHEMA_VERSION !== dbVersion
     ){
       Meteor.settings.public.maintenanceMode =  {

From 3e97baaaaaccb66cb7ee70404763700cb679a25d Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 25 Apr 2022 16:16:17 +0200
Subject: [PATCH 09/56] Progress on storing user images

---
 app/imports/api/files/UserImages.js           |   3 +-
 app/imports/api/files/s3FileStorage.js        |   6 +-
 .../server/imageProcessing/createThumbnail.js |   8 +
 app/imports/server/publications/index.js      |   1 +
 app/imports/server/publications/userImages.js |   7 +
 .../ui/components/ImageUploadInput.vue        |  77 +++++
 app/imports/ui/files/UserImageCard.vue        |  56 ++++
 app/imports/ui/pages/Files.vue                | 111 +++++--
 app/package-lock.json                         | 295 +++++++++++++++++-
 app/package.json                              |   1 +
 10 files changed, 532 insertions(+), 33 deletions(-)
 create mode 100644 app/imports/server/imageProcessing/createThumbnail.js
 create mode 100644 app/imports/server/publications/userImages.js
 create mode 100644 app/imports/ui/components/ImageUploadInput.vue
 create mode 100644 app/imports/ui/files/UserImageCard.vue

diff --git a/app/imports/api/files/UserImages.js b/app/imports/api/files/UserImages.js
index ead7271b..fad4576b 100644
--- a/app/imports/api/files/UserImages.js
+++ b/app/imports/api/files/UserImages.js
@@ -9,9 +9,10 @@ const UserImages = createS3FilesCollection({
       return 'Please upload with size equal or less than 10MB';
     }
     // Allow common image extensions
-    if (/gif|png|jpe?g|webp/i.test(file.extension || '')) {
+    if (!/gif|png|jpe?g|webp/i.test(file.extension || '')) {
       return 'Please upload an image file only';
     }
+    return true
   }
 });
 
diff --git a/app/imports/api/files/s3FileStorage.js b/app/imports/api/files/s3FileStorage.js
index e26e6ac5..affdf9db 100644
--- a/app/imports/api/files/s3FileStorage.js
+++ b/app/imports/api/files/s3FileStorage.js
@@ -47,6 +47,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     collectionName,
     storagePath,
     onBeforeUpload,
+    onAfterUpload,
     debug = Meteor.isProduction,
     allowClientCode = false,
   }){
@@ -54,7 +55,10 @@ if (Meteor.isServer && Meteor.settings.useS3) {
       collectionName,
       storagePath,
       onBeforeUpload,
-      onAfterUpload(fileRef){
+      onAfterUpload(fileRef) {
+        // Call the provided afterUpload hook first
+        onAfterUpload(fileRef);
+        
         // Start moving files to AWS:S3
         // after fully received by the Meteor server
 
diff --git a/app/imports/server/imageProcessing/createThumbnail.js b/app/imports/server/imageProcessing/createThumbnail.js
new file mode 100644
index 00000000..4837133d
--- /dev/null
+++ b/app/imports/server/imageProcessing/createThumbnail.js
@@ -0,0 +1,8 @@
+import * as sharp from 'sharp';
+
+export default async function createThumbnail(image) {
+  await sharp(image)
+  .resize(320, 240)
+  .png()
+  .toBuffer();
+}
diff --git a/app/imports/server/publications/index.js b/app/imports/server/publications/index.js
index 3bdc770a..ce8385af 100644
--- a/app/imports/server/publications/index.js
+++ b/app/imports/server/publications/index.js
@@ -11,3 +11,4 @@ import '/imports/server/publications/ownedDocuments.js';
 import '/imports/server/publications/archivedCreatures.js';
 import '/imports/server/publications/searchLibraryNodes.js';
 import '/imports/server/publications/archiveFiles.js';
+import '/imports/server/publications/userImages.js';
diff --git a/app/imports/server/publications/userImages.js b/app/imports/server/publications/userImages.js
new file mode 100644
index 00000000..765b607a
--- /dev/null
+++ b/app/imports/server/publications/userImages.js
@@ -0,0 +1,7 @@
+import UserImages from '/imports/api/files/UserImages.js';
+
+Meteor.publish('userImages', function () {
+  return UserImages.find({
+    userId: this.userId,
+  }).cursor;
+});
diff --git a/app/imports/ui/components/ImageUploadInput.vue b/app/imports/ui/components/ImageUploadInput.vue
new file mode 100644
index 00000000..c93235b4
--- /dev/null
+++ b/app/imports/ui/components/ImageUploadInput.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="file-upload-input">
+    <v-file-input
+      v-model="file"
+      v-bind="$attrs"
+      accept="image/*"
+    />
+    <v-progress-linear
+      :progress="progress"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import UserImages from '/imports/api/files/UserImages.js';
+
+export default {
+  data(){return {
+    progress: 0,
+    file: undefined,
+    uploadingInProgress: false,
+  }},
+  watch: {
+    file(file){
+      if (!file) return;
+      let self = this;
+      let uploadInstance = UserImages.insert({
+          file: file,
+          /*meta: {
+            userId: Meteor.userId() // Optional, used to check on server for file tampering
+          },*/
+          chunkSize: 'dynamic',
+          allowWebWorkers: true // If you see issues with uploads, change this to false
+        }, false)
+
+        // These are the event functions, don't need most of them, it shows where we are in the process
+        uploadInstance.on('start', function () {
+          console.log('Starting');
+          this.uploadingInProgress = true;
+        });
+
+        uploadInstance.on('end', function (error, fileObj) {
+          console.log('On end File Object: ', fileObj);
+          this.uploadingInProgress = false;
+        });
+
+        uploadInstance.on('uploaded', function (error, fileObj) {
+          console.log('uploaded: ', fileObj);
+
+          // Remove the file from the input box
+          self.file = undefined;
+
+          // Reset our state for the next file
+          self.uploadingInProgress = false;
+          self.progress = 0;
+        });
+
+        uploadInstance.on('error', function (error, fileObj) {
+          console.log('Error during upload: ' + error, fileObj)
+        });
+
+        uploadInstance.on('progress', function (progress, fileObj) {
+          console.log('Upload Percentage: ' + progress, fileObj)
+          // Update our progress bar
+          self.progress = progress;
+        });
+
+        uploadInstance.start(); // Must manually start the upload
+      }
+  },
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/files/UserImageCard.vue b/app/imports/ui/files/UserImageCard.vue
new file mode 100644
index 00000000..e70141a6
--- /dev/null
+++ b/app/imports/ui/files/UserImageCard.vue
@@ -0,0 +1,56 @@
+<template>
+  <v-card
+    :data-id="`${model._id}-archive-card`"
+    tile
+  >
+    <v-img
+      :src="model.link"
+      :aspect-ratio="1.4"
+      class="white--text align-end"
+    >
+      <v-card-title>
+        {{ model.name }}
+      </v-card-title>
+      <v-card-subtitle>
+        {{ model.size }}
+      </v-card-subtitle>
+    </v-img>
+    <v-card-actions>
+      <v-flex />
+      <v-btn
+        icon
+        @click="remove"
+      >
+        <v-icon>mdi-delete</v-icon>
+      </v-btn>
+      <v-btn
+        icon
+        :href="`${model.link}?download=true`"
+      >
+        <v-icon>mdi-download</v-icon>
+      </v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script lang="js">
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+
+export default {
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  data(){return {
+    restoreLoading: false,
+    removeLoading: false,
+  }},
+  methods: {
+    remove(){
+			
+		},
+  },
+}
+</script>
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index 8d77f097..050b6064 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -7,65 +7,103 @@
       <file-storage-stats />
     </v-row>
     <v-row dense>
+      <v-col cols="12">
+        <v-subheader> Archived Characters </v-subheader>
+      </v-col>
       <template v-if="archiveFiles && archiveFiles.length">
-        <v-col cols="12">
-          <v-subheader> Archived Characters </v-subheader>
-        </v-col>
         <v-col
           v-for="file in archiveFiles"
           :key="file._id"
           cols="12"
+          sm="6"
           md="4"
           lg="3"
+          xl="2"
         >
           <archive-file-card :model="file" />
         </v-col>
+      </template>
+      <v-col
+        key="upload"
+        cols="12"
+        sm="6"
+        md="4"
+        lg="3"
+        xl="2"
+        class="layout column justify-center"
+      >
+        <input
+          ref="archiveFileInput"
+          type="file"
+          accept=".json"
+          style="display: none;"
+          @input="inputArchiveFile"
+        >
+        <v-btn
+          outlined
+          style="height: 100%; width: 100%;"
+          :color="archiveFileError ? 'error' : undefined"
+          @click="$refs.archiveFileInput.click()"
+        >
+          <v-icon left>
+            mdi-file-upload-outline
+          </v-icon>
+          <template v-if="archiveFileError">
+            {{ archiveFileError }}
+          </template>
+          <template v-else>
+            Upload archive
+          </template>
+        </v-btn>
+      </v-col>
+    </v-row>
+    <v-row dense>
+      <v-col cols="12">
+        <v-subheader> Images </v-subheader>
+      </v-col>
+      <template v-if="userImages && userImages.length">
         <v-col
-          key="upload"
+          v-for="file in userImages"
+          :key="file._id"
           cols="12"
+          sm="6"
           md="4"
           lg="3"
-          class="layout column justify-center"
+          xl="2"
         >
-          <input
-            ref="archiveFileInput"
-            type="file"
-            accept=".json"
-            style="display: none;"
-            @input="inputArchiveFile"
-          >
-          <v-btn
-            outlined
-            style="height: 100%; width: 100%;"
-            :color="archiveFileError ? 'error' : undefined"
-            @click="$refs.archiveFileInput.click()"
-          >
-            <v-icon left>
-              mdi-file-upload-outline
-            </v-icon>
-            <template v-if="archiveFileError">
-              {{ archiveFileError }}
-            </template>
-            <template v-else>
-              Upload archive
-            </template>
-          </v-btn>
+          <user-image-card :model="file" />
         </v-col>
       </template>
+      <v-col
+        key="image-upload"
+        cols="12"
+        sm="6"
+        md="4"
+        lg="3"
+        xl="2"
+        class="layout column justify-center"
+      >
+        <image-upload-input />
+      </v-col>
     </v-row>
   </v-container>
 </template>
 
 <script lang="js">
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
+import UserImages from '/imports/api/files/UserImages.js';
 import prettyBytes from 'pretty-bytes';
 import ArchiveFileCard from '/imports/ui/files/ArchiveFileCard.vue';
 import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
+import ImageUploadInput from '/imports/ui/components/ImageUploadInput.vue';
+import UserImageCard from '/imports/ui/files/UserImageCard.vue';
 
 export default {
   components: {
     ArchiveFileCard,
     FileStorageStats,
+    ImageUploadInput,
+    UserImageCard,
   },
   data(){ return {
     updateStorageUsedLoading: false,
@@ -76,9 +114,10 @@ export default {
     $subscribe: {
       'archiveCreatureFiles': [],
       'characterList': [],
+      'userImages': [],
     },
     archiveFiles() {
-      var userId = Meteor.userId();
+      const userId = Meteor.userId();
       return ArchiveCreatureFiles.find(
         {
           userId,
@@ -91,6 +130,20 @@ export default {
         return f;
       });
     },
+    userImages() {
+      const userId = Meteor.userId();
+      return UserImages.find({
+        userId
+      }, {
+        sort: {
+          size: -1
+        },
+      }).map(f => {
+        f.size = prettyBytes(f.size);
+        f.link = UserImages.link(f);
+        return f;
+      });
+    }
   },
   methods: {
     inputArchiveFile(){
diff --git a/app/package-lock.json b/app/package-lock.json
index 85fbd09d..a5119f93 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -367,6 +367,37 @@
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -563,6 +594,30 @@
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
+    "color": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+      "requires": {
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        }
+      }
+    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -575,8 +630,16 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
     },
     "combined-stream": {
       "version": "1.0.8",
@@ -661,6 +724,14 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+    "decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "requires": {
+        "mimic-response": "^3.1.0"
+      }
+    },
     "deep-eql": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
@@ -670,6 +741,11 @@
         "type-detect": "^4.0.0"
       }
     },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -749,6 +825,14 @@
       "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
       "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
     },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
     "enquirer": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
@@ -985,6 +1069,11 @@
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
       "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
     },
+    "expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
+    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1069,6 +1158,11 @@
         "mime-types": "^2.1.12"
       }
     },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
     "fs-minipass": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -1129,6 +1223,11 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
+    },
     "glob": {
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -1269,6 +1368,16 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
+    },
     "is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -2324,6 +2433,11 @@
       "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
       "dev": true
     },
+    "mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
+    },
     "minify-css-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/minify-css-string/-/minify-css-string-1.0.0.tgz",
@@ -2337,6 +2451,11 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+    },
     "minipass": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
@@ -2359,6 +2478,11 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
     },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
     "mongo-object": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/mongo-object/-/mongo-object-0.1.4.tgz",
@@ -2374,6 +2498,11 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -2409,6 +2538,14 @@
       "resolved": "https://registry.npmjs.org/ngraph.path/-/ngraph.path-1.4.0.tgz",
       "integrity": "sha512-yJZay4tP0wcjqkkf8zlMQ/T+JOgU+EWfdE4w4TG8OS94B12J/+Z44UOYxVJErE8E6/wFunX1hMZEB1/GHsBYHg=="
     },
+    "node-abi": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz",
+      "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==",
+      "requires": {
+        "semver": "^7.3.5"
+      }
+    },
     "node-addon-api": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
@@ -2558,6 +2695,33 @@
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
       "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
     },
+    "prebuild-install": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz",
+      "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==",
+      "requires": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "npmlog": "^4.0.1",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "dependencies": {
+        "detect-libc": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+          "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
+        }
+      }
+    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -2590,6 +2754,15 @@
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
     },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -2630,6 +2803,24 @@
         "ret": "~0.1.10"
       }
     },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+        }
+      }
+    },
     "readable-stream": {
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -2776,6 +2967,41 @@
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
+    "sharp": {
+      "version": "0.30.4",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.4.tgz",
+      "integrity": "sha512-3Onig53Y6lji4NIZo69s14mERXXY/GV++6CzOYx/Rd8bnTwbhFbL09WZd7Ag/CCnA0WxFID8tkY0QReyfL6v0Q==",
+      "requires": {
+        "color": "^4.2.3",
+        "detect-libc": "^2.0.1",
+        "node-addon-api": "^4.3.0",
+        "prebuild-install": "^7.0.1",
+        "semver": "^7.3.7",
+        "simple-get": "^4.0.1",
+        "tar-fs": "^2.1.1",
+        "tunnel-agent": "^0.6.0"
+      },
+      "dependencies": {
+        "detect-libc": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+          "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
+        },
+        "node-addon-api": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
+          "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="
+        },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2806,6 +3032,29 @@
         "mongo-object": "^0.1.4"
       }
     },
+    "simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
+    },
+    "simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "requires": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
     "slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -3035,6 +3284,48 @@
         "yallist": "^4.0.0"
       }
     },
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+        }
+      }
+    },
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
diff --git a/app/package.json b/app/package.json
index 456bbc3d..64e163f3 100644
--- a/app/package.json
+++ b/app/package.json
@@ -43,6 +43,7 @@
     "pretty-bytes": "^6.0.0",
     "qrcode": "^1.5.0",
     "request": "^2.88.2",
+    "sharp": "^0.30.4",
     "simpl-schema": "^1.12.0",
     "source-map-support": "^0.5.21",
     "speakingurl": "^14.0.1",

From 3a18bce7e6890d009592b887530e45e2a91cade4 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 1 May 2022 22:54:30 +0200
Subject: [PATCH 10/56] Added error message for unsupported accessors

---
 app/imports/parser/parseTree/accessor.js | 26 ++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/imports/parser/parseTree/accessor.js b/app/imports/parser/parseTree/accessor.js
index 64ef1ba9..920e1e6b 100644
--- a/app/imports/parser/parseTree/accessor.js
+++ b/app/imports/parser/parseTree/accessor.js
@@ -1,4 +1,5 @@
 import constant from './constant.js';
+// import array from './array.js';
 import { toString } from '../resolve.js';
 
 const accessor = {
@@ -9,18 +10,18 @@ const accessor = {
       name,
     };
   },
-  compile(node, scope, context){
+  compile(node, scope, context) {
     let value = scope && scope[node.name];
     // For objects, get their value
     node.path.forEach(name => {
       if (value === undefined) return;
       value = value[name];
     });
-    let valueType = typeof value;
+    let valueType = Array.isArray(value) ? 'array' : typeof value;
     // If the accessor returns an objet, get the object's value instead
     while (valueType === 'object'){
       value = value.value;
-      valueType = typeof value;
+      valueType = Array.isArray(value) ? 'array' : typeof value;
     }
     // Return a parse node based on the type returned
     if (valueType === 'string' || valueType === 'number' || valueType === 'boolean'){
@@ -31,7 +32,21 @@ const accessor = {
         }),
         context,
       };
-    } else if (valueType === 'undefined'){
+    }
+    /* Can't access #object.tags until this is fixed
+     * If we activate this, the array node expects values to be an array of
+     * parse nodes, so it will break unless the values are coerced here or at 
+     * in the array node's code to be parse nodes, not raw js
+    else if (valueType === 'array') {
+      return {
+        result: array.create({
+          values: value,
+        }),
+        context,
+      };
+    }
+    */
+    else if (valueType === 'undefined') {
       return {
         result: accessor.create({
           name: node.name,
@@ -40,8 +55,7 @@ const accessor = {
         context,
       };
     } else {
-      context.error(`${node.name} returned an unexpected type`);
-      context.error(JSON.stringify(value, null, 2));
+      context.error(`Accessing ${accessor.toString(node)} is not supported yet`);
       return {
         result: accessor.create({
           name: node.name,

From 8dbcae106004abf1494a6ea866d31e8de452726e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 1 May 2022 23:43:31 +0200
Subject: [PATCH 11/56] Fixed FAB appearing on wrong tabs

---
 app/imports/ui/creature/character/CharacterSheetFab.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/imports/ui/creature/character/CharacterSheetFab.vue b/app/imports/ui/creature/character/CharacterSheetFab.vue
index b9e789b2..4fee5c36 100644
--- a/app/imports/ui/creature/character/CharacterSheetFab.vue
+++ b/app/imports/ui/creature/character/CharacterSheetFab.vue
@@ -1,8 +1,8 @@
 <template lang="html">
   <v-speed-dial
-    v-if="speedDials"
     v-model="fab"
     direction="bottom"
+    :style="!speedDials ? 'visibility: hidden;' : ''"
   >
     <template #activator>
       <v-btn
@@ -25,7 +25,6 @@
         </transition>
       </v-btn>
     </template>
-
     <labeled-fab
       v-for="type in speedDials"
       :key="type"
@@ -101,7 +100,8 @@
     'features',
     'inventory',
     'spells',
-    'character',
+    'journal',
+    'build',
     'tree',
   ];
 
@@ -134,7 +134,7 @@
         'features': ['feature'],
         'inventory': ['item', 'container'],
         'spells': ['spellList', 'spell'],
-        'character': ['note'],
+        'journal': ['note'],
         'tree': [null],
       };},
       properties(){

From abb88900704e1251bfcbc97a1aaee26f9cdb1111 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 2 May 2022 12:32:14 +0200
Subject: [PATCH 12/56] Build card being converted into build tree Still need
 to be able to delete fillers

---
 .../engine/computation/utility/walkdown.js    |   2 +-
 .../ui/creature/buildTree/BuildTreeNode.vue   | 223 ++++++++++++++++++
 .../creature/buildTree/BuildTreeNodeList.vue  |  30 +++
 .../ui/creature/buildTree/FillSlotButton.vue  |  56 +++++
 .../character/characterSheetTabs/BuildTab.vue |  74 +++++-
 .../CreaturePropertiesTree.vue                |   5 +-
 .../properties/treeNodeViews/TreeNodeView.vue |   1 +
 7 files changed, 378 insertions(+), 13 deletions(-)
 create mode 100644 app/imports/ui/creature/buildTree/BuildTreeNode.vue
 create mode 100644 app/imports/ui/creature/buildTree/BuildTreeNodeList.vue
 create mode 100644 app/imports/ui/creature/buildTree/FillSlotButton.vue

diff --git a/app/imports/api/engine/computation/utility/walkdown.js b/app/imports/api/engine/computation/utility/walkdown.js
index e0c4728a..0efad425 100644
--- a/app/imports/api/engine/computation/utility/walkdown.js
+++ b/app/imports/api/engine/computation/utility/walkdown.js
@@ -2,7 +2,7 @@ export default function walkDown(tree, callback){
   let stack = [...tree];
   while(stack.length){
     let node = stack.pop();
-    callback(node);
+    callback(node, stack);
     stack.push(...node.children);
   }
 }
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNode.vue b/app/imports/ui/creature/buildTree/BuildTreeNode.vue
new file mode 100644
index 00000000..42e66f4f
--- /dev/null
+++ b/app/imports/ui/creature/buildTree/BuildTreeNode.vue
@@ -0,0 +1,223 @@
+<template lang="html">
+  <v-sheet
+    class="tree-node"
+    :class="{
+      'empty': !hasChildren,
+    }"
+    :data-id="`tree-node-${node._id}`"
+  >
+    <div
+      class="layout align-center justify-start tree-node-title"
+      style="cursor: pointer;"
+      @click.stop="$emit('selected', node._id)"
+    >
+      <v-btn
+        small
+        icon
+        class="expand-button"
+        :class="{
+          'rotate-90': showExpanded,
+          'accent--text': node._descendantCanFill || canFillWithMany
+        }"
+        :disabled="!canExpand"
+        @click.stop="expanded = !expanded"
+      >
+        <v-icon v-if="canExpand">
+          mdi-chevron-right
+        </v-icon>
+      </v-btn>
+      <div
+        class="layout align-center justify-start pr-1"
+        style="flex-grow: 0;"
+      >
+        <!--{{node && node.order}}-->
+        <div
+          v-if="isSlot"
+        >
+          <span
+            :class="{
+              'text--secondary': !canFill,
+              'accent--text': canFill,
+            }"
+          >
+            {{ node.name }}
+          </span>
+          <fill-slot-button
+            v-if="(node.quantityExpected && node.quantityExpected.value === 1) && node.spaceLeft === 1"
+            :model="node"
+          />
+        </div>
+        <tree-node-view
+          v-else
+          :model="node"
+          :hide-icon="node.type === 'propertySlot'"
+        />
+        <template v-if="condenseChild">
+          <span class="mr-4">:</span>
+          <tree-node-view
+            :model="children[0].node"
+          />
+        </template>
+      </div>
+    </div>
+    <v-expand-transition>
+      <div
+        v-show="showExpanded"
+        class="ml-3 expand-area"
+      >
+        <v-fade-transition hide-on-leave>
+          <build-tree-node-list
+            v-if="showExpanded"
+            :children="computedChildren"
+          />
+          <div v-else>
+            <div
+              v-for="i in computedChildren.length"
+              :key="i"
+              class="dummy-node"
+            />
+          </div>
+        </v-fade-transition>
+        <div
+          v-if="canFillWithMany"
+        >
+          <fill-slot-button
+            class="ml-5"
+            :model="node"
+          />
+        </div>
+      </div>
+    </v-expand-transition>
+  </v-sheet>
+</template>
+
+<script lang="js">
+	/**
+	* TreeNode's are list item views of character properties. Every property which
+	* can belong to the character is shown in the tree view of the character
+	* the tree view shows off the full character structure, and where each part of
+	* character comes from.
+	**/
+  import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+  import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+  import { some } from 'lodash';
+
+	export default {
+		name: 'BuildTreeNode',
+    components: {
+      TreeNodeView,
+      FillSlotButton,
+    },
+		props: {
+			node: {
+        type: Object,
+        required: true,
+      },
+			children: {
+        type: Array,
+        default: () => [],
+      },
+		},
+		data(){return {
+			expanded: this.node._descendantCanFill || (
+        this.node.type === 'propertySlot' &&
+        this. node.quantityExpected?.value === 0 ||
+        (this.node.quantityExpected?.value > 1 && this.node.spaceLeft > 0)
+      ),
+		}},
+		computed: {
+      condenseChild(){
+        return this.node.type === 'propertySlot' && this.children.length === 1;
+      },
+      isSlot(){
+        return this.node.type === 'propertySlot';
+      },
+      canFill(){
+        return !!this.node._canFill;
+      },
+      canFillWithOne(){
+        return this.isSlot &&
+          this.node.quantityExpected && 
+          this.node.quantityExpected.value === 1 &&
+          this.node.spaceLeft === 1
+      },
+      canFillWithMany(){
+        return this.isSlot && (
+          this. node.quantityExpected?.value === 0 ||
+          (this.node.quantityExpected.value > 1 && this.node.spaceLeft > 0)
+        );
+      },
+			hasChildren(){
+				return !!this.children && !!this.computedChildren.length || this.lazy && !this.expanded;
+			},
+			showExpanded(){
+				return this.canExpand && this.expanded;
+			},
+			computedChildren(){
+        if (this.condenseChild){
+          return this.children[0].children;
+        }
+        return this.children;
+			},
+			canExpand(){
+				return !!this.computedChildren.length || this.canFillWithMany;
+			},
+		},
+    watch: {
+      'node._ancestorOfMatchedDocument'(value){
+        this.expanded = !!value ||
+          some(this.selectedNode?.ancestors, ref => ref.id === this.node._id);
+      },
+      'selectedNode.ancestors'(value){
+        this.expanded = !!some(value, ref => ref.id === this.node._id) || this.expanded;
+      },
+    },
+		beforeCreate() {
+      this.$options.components.BuildTreeNodeList = require('./BuildTreeNodeList.vue').default
+		},
+	};
+</script>
+
+<style lang="css" scoped>
+	.rotate-90 {
+		transform: rotate(90deg) translateZ(0);
+	}
+	.expand-area {
+		box-shadow: -2px 0px 0px 0px #808080;
+		margin-left: 0;
+	}
+	.handle {
+		cursor: move;
+	}
+	.empty .drag-area {
+		box-shadow: -2px 0px 0px 0px rgb(128, 128, 128, 0.4);
+	}
+	.empty .expand-button {
+		opacity: 0.4;
+	}
+  .found {
+    background: rgba(200, 0, 0, 0.1) !important;
+  }
+	.ghost {
+    opacity: 0.5;
+    background: rgba(251, 0, 0, 0.3);
+	}
+	.v-icon.v-icon--disabled {
+		opacity: 0;
+	}
+  .v-icon {
+    transition: none !important;
+  }
+	.theme--light .tree-node-title:hover {
+		background-color: rgba(0,0,0,.04);
+	}
+  .theme--dark .tree-node-title:hover {
+		background-color: rgba(255,255,255,.04);
+	}
+  .tree-node-title{
+    transition: background ease 0.3s, color ease 0.15s;
+  }
+  .tree-node-title, .dummy-node {
+    height: 40px;
+  }
+</style>
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNodeList.vue b/app/imports/ui/creature/buildTree/BuildTreeNodeList.vue
new file mode 100644
index 00000000..f6a22de6
--- /dev/null
+++ b/app/imports/ui/creature/buildTree/BuildTreeNodeList.vue
@@ -0,0 +1,30 @@
+<template lang="html">
+  <div class="build-tree-node-list">
+    <build-tree-node
+      v-for="child in children"
+      :key="child.node._id"
+      :node="child.node"
+      :children="child.children"
+      @selected="e => $emit('selected', e)"
+    />
+  </div>
+</template>
+
+<script lang="js">
+	import BuildTreeNode from '/imports/ui/creature/buildTree/BuildTreeNode.vue';
+
+	export default {
+		components: {
+			BuildTreeNode,
+		},
+		props: {
+			children: {
+				type: Array,
+				default: () => [],
+			},
+		},
+		data(){ return {
+			expanded: false,
+		}},
+	};
+</script>
diff --git a/app/imports/ui/creature/buildTree/FillSlotButton.vue b/app/imports/ui/creature/buildTree/FillSlotButton.vue
new file mode 100644
index 00000000..0718f64c
--- /dev/null
+++ b/app/imports/ui/creature/buildTree/FillSlotButton.vue
@@ -0,0 +1,56 @@
+<template functional>
+  <v-btn
+    v-if="!model.quantityExpected || !model.quantityExpected.value || model.spaceLeft"
+    icon
+    :data-id="`slot-add-button-${model._id}`"
+    class="slot-add-button accent--text"
+    @click="fillSlot()"
+  >
+    <v-icon>mdi-plus</v-icon>
+  </v-btn>
+</template>
+
+<script lang="js">
+import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+
+export default {
+  inject: {
+    context: { default: {} }
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  methods: {
+    fillSlot(){
+      let slotId = this.model._id;
+      let creatureId = this.context.creatureId;
+      this.$store.commit('pushDialogStack', {
+        component: 'slot-fill-dialog',
+        elementId: `slot-add-button-${slotId}`,
+        data: {
+          slotId,
+          creatureId,
+        },
+        callback(nodeIds){
+          if (!nodeIds || !nodeIds.length) return;
+          let newPropertyId = insertPropertyFromLibraryNode.call({
+            nodeIds,
+            parentRef: {
+              'id': slotId,
+              'collection': 'creatureProperties',
+            },
+          });
+          return `slot-child-${newPropertyId}`;
+        }
+      });
+    },
+  },
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index 15f3eb49..cfcf3fe8 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -1,8 +1,14 @@
 <template lang="html">
-  <div class="build">
-    <column-layout wide-columns>
-      <div>
-        <v-card class="class-details">
+  <v-container>
+    <v-row dense>
+      <v-col cols="12" md="8" lg="6" style="height: 100%;">
+        <v-card style="height: calc(100vh - 120px); overflow: auto;">
+          <v-card-title>Slots</v-card-title>
+          <build-tree-node-list :children="slotBuildTree" />
+        </v-card>
+      </v-col>
+      <v-col cols="12" md="4" lg="6">
+        <v-card class="class-details mb-2">
           <v-card-title
             v-if="creature.variables.level"
             class="text-h6"
@@ -69,8 +75,6 @@
             </v-list-item>
           </v-list>
         </v-card>
-      </div>
-      <div>
         <toolbar-card
           data-id="slot-card"
           @toolbarclick="showSlotDialog"
@@ -94,9 +98,9 @@
             <slots :creature-id="creatureId" />
           </v-card-text>
         </toolbar-card>
-      </div>
-    </column-layout>
-  </div>
+      </v-col>
+    </v-row>
+  </v-container>
 </template>
 
 <script lang="js">
@@ -105,14 +109,22 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import Slots from '/imports/ui/creature/slots/Slots.vue';
 import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
+import  { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
+import BuildTreeNodeList from '/imports/ui/creature/buildTree/BuildTreeNodeList.vue';
+
+function traverse(tree, callback, parents = []){
+  tree.forEach(node => {
+    callback(node, parents);
+    traverse(node.children, callback, [...parents, node]);
+  });
+}
 
 export default {
   components: {
     ColumnLayout,
     Slots,
     ToolbarCard,
-    CreatureSummary,
+    BuildTreeNodeList,
   },
   props: {
     creatureId: {
@@ -160,6 +172,46 @@ export default {
         sort: {order: 1}
       });
     },
+    slotBuildTree(){
+      const slots = CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'propertySlot',
+        $or: [
+          {'slotCondition.value': {$nin: [false, 0, '']}},
+          {'slotCondition.value': {$exists: false}},
+        ],
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        sort: {order: 1}
+      });
+      const slotIds = slots.map(s => s._id);
+      const slotChildren = CreatureProperties.find({
+        'parent.id': {$in: slotIds},
+        removed: {$ne: true},
+      }, {
+        sort: { order: 1 },
+      });
+      const tree = nodeArrayToTree([
+        ...slots.fetch(),
+        ...slotChildren.fetch()
+      ]);
+      traverse(tree, (child, parents) => {
+        const model = child.node;
+        const isSlotWithSpace = model.type === 'propertySlot' &&
+          model.spaceLeft > 0 || 
+          (model.quantityExpected && model.quantityExpected.value == 0);
+        if(isSlotWithSpace) {
+          model._canFill = true;
+          parents.forEach(node => {
+            if (node.node.type === 'propertySlot'){
+              node.node._descendantCanFill = true;
+            }
+          });
+        }
+      });
+      return tree;
+    },
   },
   methods: {
     addExperience(){
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
index 083e8ca1..b7eb3e34 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
@@ -22,7 +22,10 @@
 			TreeNodeList,
 		},
 		props: {
-			root: Object,
+			root: {
+				type: Object,
+				default: undefined,
+			},
 			organize: Boolean,
 			selectedNode: {
         type: Object,
diff --git a/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue b/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue
index c2a04b65..65a18e0e 100644
--- a/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue
+++ b/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue
@@ -6,6 +6,7 @@
     :class="{
       'inactive': model.inactive,
     }"
+    v-bind="$attrs"
   />
 </template>
 

From 2e3f0320f3bbd8fb41b3772637e5dc0fb30e2695 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 2 May 2022 23:31:10 +0200
Subject: [PATCH 13/56] Added dependency grouping, but commented out for now
 until it's needed

---
 .../creatureProperties/CreatureProperties.js  | 12 ++++--
 .../computation/buildCreatureComputation.js   | 29 ++++++++++++--
 .../utility/assignDependencyGroups.js         | 39 +++++++++++++++++++
 .../writeAlteredProperties.js                 | 14 ++++---
 app/imports/api/engine/computeCreature.js     | 25 ++++++------
 app/package.json                              |  3 +-
 app/server/main.js                            |  2 +
 7 files changed, 99 insertions(+), 25 deletions(-)
 create mode 100644 app/imports/api/engine/computation/utility/assignDependencyGroups.js

diff --git a/app/imports/api/creature/creatureProperties/CreatureProperties.js b/app/imports/api/creature/creatureProperties/CreatureProperties.js
index b70d96d5..653f7346 100644
--- a/app/imports/api/creature/creatureProperties/CreatureProperties.js
+++ b/app/imports/api/creature/creatureProperties/CreatureProperties.js
@@ -82,6 +82,14 @@ const DenormalisedOnlyCreaturePropertySchema = new SimpleSchema({
     index: 1,
     removeBeforeCompute: true,
   },
+  // Dependency tree, the ID of the lowest ordered doc connected to this doc
+  // via dependencies
+  /*depGroupId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1,
+    removeBeforeCompute: true,
+  }*/
 });
 
 CreaturePropertySchema.extend(DenormalisedOnlyCreaturePropertySchema);
@@ -98,10 +106,6 @@ for (let key in propertySchemasIndex){
 	});
 }
 
-import '/imports/api/creature/creatureProperties/methods/index.js';
-//import '/imports/api/creature/actions/doAction.js';
-//import '/imports/api/creature/actions/castSpellWithSlot.js';
-
 export default CreatureProperties;
 export {
   DenormalisedOnlyCreaturePropertySchema,
diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index 8e81e314..142bda59 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -15,6 +15,7 @@ import linkTypeDependencies from './buildComputation/linkTypeDependencies.js';
 import computeSlotQuantityFilled from './buildComputation/computeSlotQuantityFilled.js';
 import CreatureComputation from './CreatureComputation.js';
 import removeSchemaFields from './buildComputation/removeSchemaFields.js';
+// import assignDependencyGroups from '/imports/api/engine/computation/utility/assignDependencyGroups.js';
 
 /**
  * Store index of properties
@@ -37,12 +38,30 @@ export default function buildCreatureComputation(creatureId){
   return computation;
 }
 
-function getProperties(creatureId){
+export function buildDependencyGroupComputation(depGroupIds, creatureId) {
+  const creature = getCreature(creatureId);
+  const properties = getGroupProperties(depGroupIds);
+  const computation = buildComputationFromProps(properties, creature);
+  return computation;
+}
+
+function getProperties(creatureId) {
   return CreatureProperties.find({
     'ancestors.id': creatureId,
     'removed': {$ne: true},
   }, {
-    sort: {order: 1}
+    sort: { order: 1 },
+    fields: { icon: 0 },
+  }).fetch();
+}
+
+function getGroupProperties(depGroupIds) {
+  return CreatureProperties.find({
+    depGroupId: { $in: depGroupIds },
+    'removed': { $ne: true },
+  }, {
+    sort: { order: 1 },
+    fields: { icon: 0 },
   }).fetch();
 }
 
@@ -82,7 +101,7 @@ export function buildComputationFromProps(properties, creature){
   // Process the properties one by one
   properties.forEach(prop => {
 
-    let computedSchema = computedOnlySchemas[prop.type];
+    const computedSchema = computedOnlySchemas[prop.type];
     removeSchemaFields([computedSchema, denormSchema], prop);
 
     // Add a place to store all the computation details
@@ -114,5 +133,9 @@ export function buildComputationFromProps(properties, creature){
     linkTypeDependencies(dependencyGraph, prop, computation);
     linkCalculationDependencies(dependencyGraph, prop, computation);
   });
+
+  // Store the connected groups of the dependency graph
+  // assignDependencyGroups(dependencyGraph);
+
   return computation;
 }
diff --git a/app/imports/api/engine/computation/utility/assignDependencyGroups.js b/app/imports/api/engine/computation/utility/assignDependencyGroups.js
new file mode 100644
index 00000000..a93c2a9e
--- /dev/null
+++ b/app/imports/api/engine/computation/utility/assignDependencyGroups.js
@@ -0,0 +1,39 @@
+export default function assignDependencyGroups(graph) {
+  // Iterate through all the nodes
+  graph.forEachNode(node => {
+    if (node._depGroupVisited) {
+      return;
+    }
+
+    // DFS all the connected nodes to this node, mark visited, put in a group,
+    // store the lowest ordered id
+    const group = [];
+    const stack = [node];
+    let top, lowestOrderId, lowestOrder;
+    while (stack.length) {
+      top = stack.pop();
+      if (top._depGroupVisited) continue;
+      if (
+        (lowestOrderId === undefined && top.data?._id) ||
+        (top.data?._id && top.data?.order < lowestOrder)
+      ) {
+        lowestOrderId = top.data?._id;
+        lowestOrder = top.data?.order;
+      }
+      if (top.data?._id) {
+        group.push(top)
+      }
+      top._depGroupVisited = true;
+      graph.forEachLinkedNode(top.id, linkedNode => stack.push(linkedNode));
+    }
+    // Assign group id
+    group.forEach(node => {
+      if (!lowestOrderId) return;
+      if (group.length > 1) {
+        node.data.depGroupId = lowestOrderId;
+      } else {
+        delete node.data.depGroupId;
+      }
+    });
+  });
+}
\ No newline at end of file
diff --git a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
index cd0372cb..47b72c0f 100644
--- a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
+++ b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
@@ -20,6 +20,7 @@ export default function writeAlteredProperties(computation){
       'deactivatedBySelf',
       'deactivatedByAncestor',
       'deactivatedByToggle',
+      'depGroupId',
       'damage',
       ...schema.objectKeys(),
     ];
@@ -28,7 +29,8 @@ export default function writeAlteredProperties(computation){
       bulkWriteOperations.push(op);
     }
   });
-  writePropertiesSequentially(bulkWriteOperations);
+  bulkWriteProperties(bulkWriteOperations);
+  if (bulkWriteOperations.length) console.log(`Wrote ${bulkWriteOperations.length} props`);
 }
 
 function addChangedKeysToOp(op, keys, original, changed) {
@@ -79,10 +81,10 @@ function addUnsetOp(op, key){
   }
 }
 
-// We use this instead of bulkWriteProperties because it functions with latency
-// compensation without needing to roll back changes, which causes multiple
-// expensive redraws of the character sheet
-function writePropertiesSequentially(bulkWriteOps){
+// If we re-enable client-side sheet recalculation, this needs to be run on
+// both client and server to preserve latency compensation. Bulkwrite breaks
+// latency compensation and causes flickering
+function writePropertiesSequentially(bulkWriteOps) {
   bulkWriteOps.forEach(op => {
     let updateOneOrMany = op.updateOne || op.updateMany;
     CreatureProperties.update(updateOneOrMany.filter, updateOneOrMany.update, {
@@ -101,7 +103,7 @@ function writePropertiesSequentially(bulkWriteOps){
 function bulkWriteProperties(bulkWriteOps){
   if (!bulkWriteOps.length) return;
   // bulkWrite is only available on the server
-  if (Meteor.isServer){
+  if (Meteor.isServer) {
     CreatureProperties.rawCollection().bulkWrite(
       bulkWriteOps,
       {ordered : false},
diff --git a/app/imports/api/engine/computeCreature.js b/app/imports/api/engine/computeCreature.js
index a45188bf..36d58724 100644
--- a/app/imports/api/engine/computeCreature.js
+++ b/app/imports/api/engine/computeCreature.js
@@ -1,4 +1,4 @@
-import buildCreatureComputation from './computation/buildCreatureComputation.js';
+import buildCreatureComputation, { buildDependencyGroupComputation } from './computation/buildCreatureComputation.js';
 import computeCreatureComputation from './computation/computeCreatureComputation.js';
 import writeAlteredProperties from './computation/writeComputation/writeAlteredProperties.js';
 import writeScope from './computation/writeComputation/writeScope.js';
@@ -7,21 +7,31 @@ import writeErrors from './computation/writeComputation/writeErrors.js';
 export default function computeCreature(creatureId){
   if (Meteor.isClient) return;
   const computation = buildCreatureComputation(creatureId);
+  computeComputation(computation, creatureId);
+}
+
+// Recompute only some groups of the dependency tree
+export function computeCreatureDependencyGroup(depGroupIds, creatureId) {
+  const computation = buildDependencyGroupComputation(depGroupIds, creatureId);
+  computeComputation(computation, creatureId);
+}
+
+function computeComputation(computation, creatureId) {
   try {
     computeCreatureComputation(computation);
     writeAlteredProperties(computation);
     writeScope(creatureId, computation.scope);
-  } catch (e){
+  } catch (e) {
     const errorText = e.reason || e.message || e.toString();
     computation.errors.push({
       type: 'crash',
-      details: {error: errorText},
+      details: { error: errorText },
     });
     const logError = {
       creatureId,
       computeError: errorText,
     };
-    if (e.stack){
+    if (e.stack) {
       logError.location = e.stack.split('\n')[1];
     }
     console.error(logError);
@@ -29,10 +39,3 @@ export default function computeCreature(creatureId){
     writeErrors(creatureId, computation.errors);
   }
 }
-
-// For now just recompute the whole creature, TODO only recompute a single
-// connected section of the depdendency graph
-export function computeCreatureDependencyGroup(property){
-  let creatureId = property.ancestors[0].id;
-  computeCreature(creatureId);
-}
diff --git a/app/package.json b/app/package.json
index 64e163f3..0467b8ef 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,6 +10,7 @@
   "author": "Stefan Zermatten",
   "scripts": {
     "run": "meteor",
+    "debug": "meteor debug",
     "test": "meteor test --driver-package meteortesting:mocha --port 3001"
   },
   "engines": {
@@ -115,4 +116,4 @@
       "vuetify/no-deprecated-classes": "error"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/server/main.js b/app/server/main.js
index f377abe9..1982276f 100644
--- a/app/server/main.js
+++ b/app/server/main.js
@@ -13,3 +13,5 @@ import '/imports/api/engine/actions/index.js';
 import '/imports/migrations/server/index.js';
 import '/imports/migrations/methods/index.js'
 import '/imports/constants/MAINTENANCE_MODE.js';
+import '/imports/api/creature/creatureProperties/methods/index.js';
+

From 33fa22c1872874ae9cf02948b685e0e155658d14 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 2 May 2022 23:31:52 +0200
Subject: [PATCH 14/56] Removed stray log

---
 .../computation/writeComputation/writeAlteredProperties.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
index 47b72c0f..82029cfc 100644
--- a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
+++ b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
@@ -30,7 +30,7 @@ export default function writeAlteredProperties(computation){
     }
   });
   bulkWriteProperties(bulkWriteOperations);
-  if (bulkWriteOperations.length) console.log(`Wrote ${bulkWriteOperations.length} props`);
+  //if (bulkWriteOperations.length) console.log(`Wrote ${bulkWriteOperations.length} props`);
 }
 
 function addChangedKeysToOp(op, keys, original, changed) {

From ddc7f87a4a2a93bce08b84ae50b1789870363f93 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 3 May 2022 11:29:27 +0200
Subject: [PATCH 15/56] Replaced unsupported cron manager with new one

---
 app/.meteor/packages                                            | 2 +-
 app/.meteor/versions                                            | 2 +-
 app/imports/server/config/SyncedCronConfig.js                   | 2 +-
 app/imports/server/cron/deleteSoftRemovedDocuments.js           | 2 +-
 .../ui/creature/character/characterSheetTabs/BuildTab.vue       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/.meteor/packages b/app/.meteor/packages
index f87dac0b..46d41ea6 100644
--- a/app/.meteor/packages
+++ b/app/.meteor/packages
@@ -22,7 +22,6 @@ standard-minifier-js@2.8.0
 shell-server@0.5.0
 ecmascript@0.16.1
 es5-shim@4.8.0
-percolate:synced-cron
 service-configuration@1.3.0
 dynamic-import@0.7.2
 ddp-rate-limiter@1.1.0
@@ -47,3 +46,4 @@ meteortesting:mocha
 ostrio:files
 simple:rest-bearer-token-parser
 simple:rest-json-error-handler
+littledata:synced-cron
diff --git a/app/.meteor/versions b/app/.meteor/versions
index b8171bc3..5652121c 100644
--- a/app/.meteor/versions
+++ b/app/.meteor/versions
@@ -51,6 +51,7 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lai:collection-extensions@0.3.0
 launch-screen@1.3.0
+littledata:synced-cron@1.5.1
 localstorage@1.2.0
 logging@1.3.1
 mdg:validated-method@1.2.0
@@ -90,7 +91,6 @@ peerlibrary:reactive-publish@0.10.0
 peerlibrary:server-autorun@0.8.0
 peerlibrary:subscription-data@0.8.0
 percolate:migrations@1.0.3
-percolate:synced-cron@1.3.2
 promise@0.12.0
 raix:eventemitter@1.0.0
 random@1.2.0
diff --git a/app/imports/server/config/SyncedCronConfig.js b/app/imports/server/config/SyncedCronConfig.js
index 8ef48fec..21ab1abd 100644
--- a/app/imports/server/config/SyncedCronConfig.js
+++ b/app/imports/server/config/SyncedCronConfig.js
@@ -1,4 +1,4 @@
-import { SyncedCron } from 'meteor/percolate:synced-cron';
+import { SyncedCron } from 'meteor/littledata:synced-cron';
 
 SyncedCron.config({
   // Log job run details to console
diff --git a/app/imports/server/cron/deleteSoftRemovedDocuments.js b/app/imports/server/cron/deleteSoftRemovedDocuments.js
index 3758aa27..835e3773 100644
--- a/app/imports/server/cron/deleteSoftRemovedDocuments.js
+++ b/app/imports/server/cron/deleteSoftRemovedDocuments.js
@@ -1,7 +1,7 @@
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import { assertAdmin } from '/imports/api/sharing/sharingPermissions.js';
-import { SyncedCron } from 'meteor/percolate:synced-cron';
+import { SyncedCron } from 'meteor/littledata:synced-cron';
 
 Meteor.startup(() => {
 	const collections = [
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index cfcf3fe8..7c0dd224 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <v-container>
+  <v-container fluid>
     <v-row dense>
       <v-col cols="12" md="8" lg="6" style="height: 100%;">
         <v-card style="height: calc(100vh - 120px); overflow: auto;">

From 23fa6fe6342f4303a9d6a22d342aa76d7e9c0928 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 9 May 2022 16:32:15 +0200
Subject: [PATCH 16/56] Progress on dependency updates

---
 .../creatureProperties/CreatureProperties.js  |  4 +-
 .../methods/damageProperty.js                 | 12 ++-
 .../computation/buildCreatureComputation.js   |  8 +-
 .../utility/assignDependencyGroups.js         | 58 ++++++++---
 .../writeAlteredProperties.js                 |  2 +-
 app/imports/api/properties/PointBuys.js       | 96 +++++++++++++++++++
 6 files changed, 159 insertions(+), 21 deletions(-)
 create mode 100644 app/imports/api/properties/PointBuys.js

diff --git a/app/imports/api/creature/creatureProperties/CreatureProperties.js b/app/imports/api/creature/creatureProperties/CreatureProperties.js
index 653f7346..cccf715c 100644
--- a/app/imports/api/creature/creatureProperties/CreatureProperties.js
+++ b/app/imports/api/creature/creatureProperties/CreatureProperties.js
@@ -84,12 +84,12 @@ const DenormalisedOnlyCreaturePropertySchema = new SimpleSchema({
   },
   // Dependency tree, the ID of the lowest ordered doc connected to this doc
   // via dependencies
-  /*depGroupId: {
+  depGroupId: {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
     index: 1,
     removeBeforeCompute: true,
-  }*/
+  },
 });
 
 CreaturePropertySchema.extend(DenormalisedOnlyCreaturePropertySchema);
diff --git a/app/imports/api/creature/creatureProperties/methods/damageProperty.js b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
index 573e004a..2c648c9c 100644
--- a/app/imports/api/creature/creatureProperties/methods/damageProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
@@ -4,7 +4,7 @@ import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import { computeCreatureDependencyGroup } from '/imports/api/engine/computeCreature.js';
+import computeCreature, { computeCreatureDependencyGroup } from '/imports/api/engine/computeCreature.js';
 
 const damageProperty = new ValidatedMethod({
   name: 'creatureProperties.damage',
@@ -37,9 +37,13 @@ const damageProperty = new ValidatedMethod({
 				`Property of type "${property.type}" can't be damaged`
 			);
 		}
-		let result = damagePropertyWork({property, operation, value});
-    // Dependencies can't be changed through damage, only recompute deps
-    computeCreatureDependencyGroup(property);
+    let result = damagePropertyWork({ property, operation, value });
+    if (property.depGroupId) {
+      // Dependencies can't be changed through damage, only recompute deps
+      computeCreatureDependencyGroup([property.depGroupId], rootCreature._id);
+    } else {
+      computeCreature(rootCreature._id);
+    }
     return result;
   },
 });
diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index 8350051c..f86e610b 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -15,7 +15,7 @@ import linkTypeDependencies from './buildComputation/linkTypeDependencies.js';
 import computeSlotQuantityFilled from './buildComputation/computeSlotQuantityFilled.js';
 import CreatureComputation from './CreatureComputation.js';
 import removeSchemaFields from './buildComputation/removeSchemaFields.js';
-// import assignDependencyGroups from '/imports/api/engine/computation/utility/assignDependencyGroups.js';
+import assignDependencyGroups from '/imports/api/engine/computation/utility/assignDependencyGroups.js';
 
 /**
  * Store index of properties
@@ -56,6 +56,10 @@ function getProperties(creatureId) {
 }
 
 function getGroupProperties(depGroupIds) {
+  console.log({ depGroupIds });
+  if (!depGroupIds || depGroupIds.includes(undefined)) {
+    throw `Expected array full of ids, got ${depGroupIds}`
+  }
   return CreatureProperties.find({
     depGroupId: { $in: depGroupIds },
     'removed': { $ne: true },
@@ -135,7 +139,7 @@ export function buildComputationFromProps(properties, creature){
   });
 
   // Store the connected groups of the dependency graph
-  // assignDependencyGroups(dependencyGraph);
+  assignDependencyGroups(dependencyGraph);
 
   return computation;
 }
diff --git a/app/imports/api/engine/computation/utility/assignDependencyGroups.js b/app/imports/api/engine/computation/utility/assignDependencyGroups.js
index a93c2a9e..7a660adf 100644
--- a/app/imports/api/engine/computation/utility/assignDependencyGroups.js
+++ b/app/imports/api/engine/computation/utility/assignDependencyGroups.js
@@ -1,4 +1,10 @@
-export default function assignDependencyGroups(graph) {
+import { union } from "lodash";
+
+export function assignDependencyGroups(graph) {
+  console.log('assigning dep group ids');
+  graph.forEachLink(function (link) {
+    console.dir(link);
+  });
   // Iterate through all the nodes
   graph.forEachNode(node => {
     if (node._depGroupVisited) {
@@ -13,22 +19,20 @@ export default function assignDependencyGroups(graph) {
     while (stack.length) {
       top = stack.pop();
       if (top._depGroupVisited) continue;
-      if (
-        (lowestOrderId === undefined && top.data?._id) ||
-        (top.data?._id && top.data?.order < lowestOrder)
-      ) {
-        lowestOrderId = top.data?._id;
-        lowestOrder = top.data?.order;
-      }
-      if (top.data?._id) {
-        group.push(top)
+      if (top.data?._id && (
+        lowestOrderId === undefined ||
+        top.data?.order < lowestOrder
+      )) {
+        lowestOrderId = top.data._id;
+        lowestOrder = top.data.order;
       }
+      group.push(top)
       top._depGroupVisited = true;
       graph.forEachLinkedNode(top.id, linkedNode => stack.push(linkedNode));
     }
     // Assign group id
     group.forEach(node => {
-      if (!lowestOrderId) return;
+      if (!node.data?._id) return;
       if (group.length > 1) {
         node.data.depGroupId = lowestOrderId;
       } else {
@@ -36,4 +40,34 @@ export default function assignDependencyGroups(graph) {
       }
     });
   });
-}
\ No newline at end of file
+}
+
+
+export default function assignDependencyGroups2(graph) {
+  const groups = new Set();
+  graph.forEachLink(function (link) {
+    const from = graph.getNode(link.fromId);
+    const to = graph.getNode(link.toId);
+    let depGroup;
+    if (from._depGroup) {
+      depGroup = from._depGroup;
+      groups.delete(to._depGroup);
+    } else if (to._depGroup) {
+      depGroup = to._depGroup;
+    } else {
+      depGroup = {};
+      groups.add(depGroup);
+    }
+    depGroup.nodes = union(from._depGroup?.nodes, to._depGroup?.nodes, [from, to])
+    from._depGroup = depGroup;
+    to._depGroup = depGroup;
+  });
+  groups.forEach(g => {
+    if (!g.nodes.length) return;
+    const rootId = g.nodes[0].id;
+    g.nodes.forEach(n => {
+      if (!n.data?._id) return;
+      n.data.depGroupId = rootId;
+    });
+  });
+}
diff --git a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
index 82029cfc..20703856 100644
--- a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
+++ b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
@@ -36,7 +36,7 @@ export default function writeAlteredProperties(computation){
 function addChangedKeysToOp(op, keys, original, changed) {
   // Loop through all keys that can be changed by computation
   // and compile an operation that sets all those keys
-  for (let key of keys){
+  for (let key of keys) {
     if (!EJSON.equals(original[key], changed[key])){
       if (!op) op = newOperation(original._id, changed.type);
       let value = changed[key];
diff --git a/app/imports/api/properties/PointBuys.js b/app/imports/api/properties/PointBuys.js
new file mode 100644
index 00000000..95cc1634
--- /dev/null
+++ b/app/imports/api/properties/PointBuys.js
@@ -0,0 +1,96 @@
+import SimpleSchema from 'simpl-schema';
+import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
+import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
+import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js';
+
+/*
+ * PointBuys are reason-value attached to skills and abilities
+ * that modify their final value or presentation in some way
+ */
+let PointBuySchema = createPropertySchema({
+  name: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.name,
+  },
+  variableName: {
+    type: String,
+    optional: true,
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
+  },
+  ignored: {
+    type: Boolean,
+    optional: true,
+  },
+  'values': {
+    type: Array,
+    defaultValue: [],
+  },
+  'values.$': {
+    type: Object,
+  },
+  'values.$.name': {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.name,
+  },
+  'values.$.variableName': {
+    type: String,
+    optional: true,
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
+  },
+  'values.$.value': {
+    type: Number,
+    optional: true,
+  },
+  min: {
+    type: 'fieldToCompute',
+    optional: true,
+  },
+  max: {
+    type: 'fieldToCompute',
+    optional: true,
+  },
+  total: {
+    type: 'fieldToCompute',
+    optional: true,
+  },
+  cost: {
+    type: 'fieldToCompute',
+    optional: true,
+  },
+});
+
+const ComputedOnlyPointBuySchema = createPropertySchema({
+  min: {
+    type: 'computedOnlyField',
+    optional: true,
+  },
+  max: {
+    type: 'computedOnlyField',
+    optional: true,
+  },
+  total: {
+    type: 'computedOnlyField',
+    optional: true,
+  },
+  cost: {
+    type: 'computedOnlyField',
+    optional: true,
+  },
+  spent: {
+    type: Number,
+    optional: true,
+    removeBeforeCompute: true,
+  },
+});
+
+const ComputedPointBuySchema = new SimpleSchema()
+  .extend(ComputedOnlyPointBuySchema)
+  .extend(PointBuySchema);
+
+export { PointBuySchema, ComputedPointBuySchema, ComputedOnlyPointBuySchema };

From 78cd8ffc8de1b934e12b0ab0b9ff3d32f83a587f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 11 May 2022 13:30:33 +0200
Subject: [PATCH 17/56] Creatures are now cached in memory for computation Also
 removed dependency group calculation because the optimisation isn't as useful
 to reduce DB calls if the creature is in memory anyway

---
 .../creatureProperties/CreatureProperties.js  |   8 --
 .../methods/damageProperty.js                 |   9 +-
 .../computation/buildCreatureComputation.js   |  36 ++----
 .../writeAlteredProperties.js                 |   1 -
 app/imports/api/engine/computeCreature.js     |  10 +-
 app/imports/api/engine/loadCreatures.js       | 117 ++++++++++++++++++
 app/imports/parser/TextField.vue              |  38 ------
 .../server/publications/singleCharacter.js    |  21 ++--
 8 files changed, 145 insertions(+), 95 deletions(-)
 create mode 100644 app/imports/api/engine/loadCreatures.js
 delete mode 100644 app/imports/parser/TextField.vue

diff --git a/app/imports/api/creature/creatureProperties/CreatureProperties.js b/app/imports/api/creature/creatureProperties/CreatureProperties.js
index cccf715c..33183ddc 100644
--- a/app/imports/api/creature/creatureProperties/CreatureProperties.js
+++ b/app/imports/api/creature/creatureProperties/CreatureProperties.js
@@ -82,14 +82,6 @@ const DenormalisedOnlyCreaturePropertySchema = new SimpleSchema({
     index: 1,
     removeBeforeCompute: true,
   },
-  // Dependency tree, the ID of the lowest ordered doc connected to this doc
-  // via dependencies
-  depGroupId: {
-    type: String,
-    regEx: SimpleSchema.RegEx.Id,
-    index: 1,
-    removeBeforeCompute: true,
-  },
 });
 
 CreaturePropertySchema.extend(DenormalisedOnlyCreaturePropertySchema);
diff --git a/app/imports/api/creature/creatureProperties/methods/damageProperty.js b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
index 2c648c9c..51c37749 100644
--- a/app/imports/api/creature/creatureProperties/methods/damageProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
@@ -4,7 +4,7 @@ import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import computeCreature, { computeCreatureDependencyGroup } from '/imports/api/engine/computeCreature.js';
+import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const damageProperty = new ValidatedMethod({
   name: 'creatureProperties.damage',
@@ -38,12 +38,7 @@ const damageProperty = new ValidatedMethod({
 			);
 		}
     let result = damagePropertyWork({ property, operation, value });
-    if (property.depGroupId) {
-      // Dependencies can't be changed through damage, only recompute deps
-      computeCreatureDependencyGroup([property.depGroupId], rootCreature._id);
-    } else {
-      computeCreature(rootCreature._id);
-    }
+    computeCreature(rootCreature._id);
     return result;
   },
 });
diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index f86e610b..f2b07158 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -2,6 +2,7 @@ import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import CreatureProperties,
   { DenormalisedOnlyCreaturePropertySchema as denormSchema }
   from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { loadedCreatures } from '../loadCreatures.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import computedOnlySchemas from '/imports/api/properties/computedOnlyPropertySchemasIndex.js';
 import computedSchemas from '/imports/api/properties/computedPropertySchemasIndex.js';
@@ -15,7 +16,6 @@ import linkTypeDependencies from './buildComputation/linkTypeDependencies.js';
 import computeSlotQuantityFilled from './buildComputation/computeSlotQuantityFilled.js';
 import CreatureComputation from './CreatureComputation.js';
 import removeSchemaFields from './buildComputation/removeSchemaFields.js';
-import assignDependencyGroups from '/imports/api/engine/computation/utility/assignDependencyGroups.js';
 
 /**
  * Store index of properties
@@ -38,35 +38,22 @@ export default function buildCreatureComputation(creatureId){
   return computation;
 }
 
-export function buildDependencyGroupComputation(depGroupIds, creatureId) {
-  const creature = getCreature(creatureId);
-  const properties = getGroupProperties(depGroupIds);
-  const computation = buildComputationFromProps(properties, creature);
-  return computation;
-}
-
 function getProperties(creatureId) {
-  return CreatureProperties.find({
+  if (loadedCreatures.has(creatureId)) {
+    const creature = loadedCreatures.get(creatureId);
+    const props = Array.from(creature.properties.values());
+    return props;
+  }
+  console.time(`fetching from db: ${creatureId}`)
+  const props = CreatureProperties.find({
     'ancestors.id': creatureId,
     'removed': {$ne: true},
   }, {
     sort: { order: 1 },
     fields: { icon: 0 },
   }).fetch();
-}
-
-function getGroupProperties(depGroupIds) {
-  console.log({ depGroupIds });
-  if (!depGroupIds || depGroupIds.includes(undefined)) {
-    throw `Expected array full of ids, got ${depGroupIds}`
-  }
-  return CreatureProperties.find({
-    depGroupId: { $in: depGroupIds },
-    'removed': { $ne: true },
-  }, {
-    sort: { order: 1 },
-    fields: { icon: 0 },
-  }).fetch();
+  console.timeEnd(`fetching from db: ${creatureId}`);
+  return props;
 }
 
 function getCreature(creatureId){
@@ -138,8 +125,5 @@ export function buildComputationFromProps(properties, creature){
     linkCalculationDependencies(dependencyGraph, prop, computation);
   });
 
-  // Store the connected groups of the dependency graph
-  assignDependencyGroups(dependencyGraph);
-
   return computation;
 }
diff --git a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
index 20703856..ccf8246e 100644
--- a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
+++ b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
@@ -20,7 +20,6 @@ export default function writeAlteredProperties(computation){
       'deactivatedBySelf',
       'deactivatedByAncestor',
       'deactivatedByToggle',
-      'depGroupId',
       'damage',
       ...schema.objectKeys(),
     ];
diff --git a/app/imports/api/engine/computeCreature.js b/app/imports/api/engine/computeCreature.js
index 55de9359..84c90e8a 100644
--- a/app/imports/api/engine/computeCreature.js
+++ b/app/imports/api/engine/computeCreature.js
@@ -1,4 +1,4 @@
-import buildCreatureComputation, { buildDependencyGroupComputation } from './computation/buildCreatureComputation.js';
+import buildCreatureComputation from './computation/buildCreatureComputation.js';
 import computeCreatureComputation from './computation/computeCreatureComputation.js';
 import writeAlteredProperties from './computation/writeComputation/writeAlteredProperties.js';
 import writeScope from './computation/writeComputation/writeScope.js';
@@ -6,14 +6,10 @@ import writeErrors from './computation/writeComputation/writeErrors.js';
 
 export default function computeCreature(creatureId){
   if (Meteor.isClient) return;
+  console.time('Compute');
   const computation = buildCreatureComputation(creatureId);
   computeComputation(computation, creatureId);
-}
-
-// Recompute only some groups of the dependency tree
-export function computeCreatureDependencyGroup(depGroupIds, creatureId) {
-  const computation = buildDependencyGroupComputation(depGroupIds, creatureId);
-  computeComputation(computation, creatureId);
+  console.timeEnd('Compute');
 }
 
 function computeComputation(computation, creatureId) {
diff --git a/app/imports/api/engine/loadCreatures.js b/app/imports/api/engine/loadCreatures.js
new file mode 100644
index 00000000..46090140
--- /dev/null
+++ b/app/imports/api/engine/loadCreatures.js
@@ -0,0 +1,117 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+
+export const loadedCreatures = new Map(); // creatureId => {creature, properties, etc.}
+
+export function loadCreature(creatureId, subscription) {
+  if (!creatureId) throw 'creatureId is required';
+  let creature = loadedCreatures.get(creatureId);
+  if (loadedCreatures.has(creatureId)) {
+    creature.subs.add(subscription);
+  } else {
+    console.time(`loading to memory ${creatureId}`);
+    creature = new LoadedCreature(subscription, creatureId);
+    loadedCreatures.set(creatureId, creature);
+    console.timeEnd(`loading to memory ${creatureId}`);
+    console.log('Creatures in memory: ', loadedCreatures.size);
+  }
+  subscription.onStop(() => {
+    unloadCreature(creatureId, subscription);
+  });
+}
+
+function unloadCreature(creatureId, subscription) {
+  if (!creatureId) throw 'creatureId is required';
+  const creature = loadedCreatures.get(creatureId);
+  if (!creature) return;
+  creature.subs.delete(subscription);
+  if (creature.subs.size === 0) {
+    creature.stop();
+    loadedCreatures.delete(creatureId);
+  }
+  console.log('Creatures in memory: ', loadedCreatures.size);
+}
+
+class LoadedCreature {
+  constructor(sub, creatureId) {
+    // This may be called from a subscription, but we don't want the observers
+    // to be destroyed with it, so use a non-reactive context to observe
+    // the required documents
+    const self = this;
+    Tracker.nonreactive(() => {
+
+      self.subs = new Set([sub]);
+
+      self.properties = new Map();
+      // Observe all creature properties which are needed for computation
+      self.propertyObserver = CreatureProperties.find({
+        'ancestors.id': creatureId,
+        removed: { $ne: true },
+      }, {
+        // sort: { order: 1 },
+        fields: { icon: 0 },
+      }).observeChanges({
+        added(id, fields) {
+          fields._id = id;
+          return self.addProperty(fields)
+        },
+        changed(id, fields) {
+          return self.changeProperty(id, fields);
+        },
+        removed(id) {
+          return self.removeProperty(id);
+        },
+      });
+      
+      self.creatures = new Map();
+      // Observe the creature itself
+      self.creatureObserver = Creatures.find({
+        _id: creatureId,
+      }).observeChanges({
+        added(id, fields) {
+          fields._id = id;
+          self.addCreature(fields)
+        },
+        changed(id, fields) {
+          return self.changeCreature(id, fields);
+        },
+        removed(id) {
+          return self.removeCreature(id);
+        },
+      });
+
+    });
+  }
+  stop() {
+    this.creatureObserver.stop();
+    this.propertyObserver.stop();
+  }
+  addProperty(prop) {
+    this.properties.set(prop._id, prop);
+  }
+  addCreature(creature) {
+    this.creatures.set(creature._id, creature);
+  }
+  changeProperty(id, fields) {
+    this.changeMap(id, fields, this.properties);
+  }
+  changeCreature(id, fields) {
+    this.changeMap(id, fields, this.creatures);
+  }
+  changeMap(id, fields, map) {
+    const doc = map.get(id);
+    for (let key in fields) {
+      if (key === undefined) {
+        delete doc[key];
+      } else {
+        doc[key] = fields[key];
+      }
+    }
+  }
+  removeProperty(id) {
+    this.properties.delete(id)
+  }
+  removeCreature(id) {
+    this.creatures.delete(id)
+  }
+}
diff --git a/app/imports/parser/TextField.vue b/app/imports/parser/TextField.vue
deleted file mode 100644
index 9c9f0919..00000000
--- a/app/imports/parser/TextField.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template lang="html">
-  <v-text-field
-    ref="input"
-    v-bind="$attrs"
-    class="dc-text-field"
-    :loading="loading"
-    :error-messages="errors"
-    :value="safeValue"
-    :disabled="isDisabled"
-    :outlined="!regular"
-    @input="input"
-    @focus="focused = true"
-    @blur="focused = false"
-    @keyup="e => $emit('keyup', e)"
-  >
-    <template #append>
-      <slot name="value" />
-    </template>
-  </v-text-field>
-</template>
-
-<script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
-
-  export default {
-    mixins: [SmartInput],
-    props: {
-      regular: Boolean,
-    },
-  };
-</script>
-
-<style lang="css">
-.dc-text-field .v-input__append-inner{
-  font-size: 12px;
-  margin-top: 36px;
-}
-</style>
diff --git a/app/imports/server/publications/singleCharacter.js b/app/imports/server/publications/singleCharacter.js
index 611f1d23..c2ca8c0c 100644
--- a/app/imports/server/publications/singleCharacter.js
+++ b/app/imports/server/publications/singleCharacter.js
@@ -5,6 +5,7 @@ import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import { assertViewPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import computeCreature from '/imports/api/engine/computeCreature.js';
 import VERSION from '/imports/constants/VERSION.js';
+import { loadCreature } from '/imports/api/engine/loadCreatures.js';
 
 let schema = new SimpleSchema({
   creatureId: {
@@ -13,7 +14,8 @@ let schema = new SimpleSchema({
   },
 });
 
-Meteor.publish('singleCharacter', function(creatureId){
+Meteor.publish('singleCharacter', function (creatureId) {
+  const self = this;
   try {
     schema.validate({ creatureId });
   } catch (e){
@@ -21,21 +23,24 @@ Meteor.publish('singleCharacter', function(creatureId){
   }
   this.autorun(function (computation){
     let userId = this.userId;
-    let creatureCursor
-    creatureCursor = Creatures.find({
+    let permissionCreature = Creatures.findOne({
       _id: creatureId,
+    }, {
+      fields: { owner: 1, readers: 1, writers: 1, public: 1, computeVersion: 1 }
     });
-    let creature = creatureCursor.fetch()[0];
-    try { assertViewPermission(creature, userId) }
-    catch(e){ return [] }
-    if (creature.computeVersion !== VERSION && computation.firstRun){
+    try { assertViewPermission(permissionCreature, userId) }
+    catch (e) { return [] }
+    loadCreature(creatureId, self);
+    if (permissionCreature.computeVersion !== VERSION && computation.firstRun){
       try {
         computeCreature(creatureId)
       }
       catch(e){ console.error(e) }
     }
     return [
-      creatureCursor,
+      Creatures.find({
+        _id: creatureId,
+      }),
       CreatureProperties.find({
         'ancestors.id': creatureId,
       }),

From 7a35c66904c48765d6db639ca1deeab548b14fc6 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 11 May 2022 13:33:56 +0200
Subject: [PATCH 18/56] Removed performance logging from loading creatures

---
 .../api/engine/computation/buildCreatureComputation.js        | 4 ++--
 app/imports/api/engine/computeCreature.js                     | 2 --
 app/imports/api/engine/loadCreatures.js                       | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index f2b07158..47612830 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -44,7 +44,7 @@ function getProperties(creatureId) {
     const props = Array.from(creature.properties.values());
     return props;
   }
-  console.time(`fetching from db: ${creatureId}`)
+  console.time(`Cache miss fetching from db: ${creatureId}`)
   const props = CreatureProperties.find({
     'ancestors.id': creatureId,
     'removed': {$ne: true},
@@ -52,7 +52,7 @@ function getProperties(creatureId) {
     sort: { order: 1 },
     fields: { icon: 0 },
   }).fetch();
-  console.timeEnd(`fetching from db: ${creatureId}`);
+  console.timeEnd(`Cache miss fetching from db: ${creatureId}`);
   return props;
 }
 
diff --git a/app/imports/api/engine/computeCreature.js b/app/imports/api/engine/computeCreature.js
index 84c90e8a..75064776 100644
--- a/app/imports/api/engine/computeCreature.js
+++ b/app/imports/api/engine/computeCreature.js
@@ -6,10 +6,8 @@ import writeErrors from './computation/writeComputation/writeErrors.js';
 
 export default function computeCreature(creatureId){
   if (Meteor.isClient) return;
-  console.time('Compute');
   const computation = buildCreatureComputation(creatureId);
   computeComputation(computation, creatureId);
-  console.timeEnd('Compute');
 }
 
 function computeComputation(computation, creatureId) {
diff --git a/app/imports/api/engine/loadCreatures.js b/app/imports/api/engine/loadCreatures.js
index 46090140..f7870440 100644
--- a/app/imports/api/engine/loadCreatures.js
+++ b/app/imports/api/engine/loadCreatures.js
@@ -9,11 +9,8 @@ export function loadCreature(creatureId, subscription) {
   if (loadedCreatures.has(creatureId)) {
     creature.subs.add(subscription);
   } else {
-    console.time(`loading to memory ${creatureId}`);
     creature = new LoadedCreature(subscription, creatureId);
     loadedCreatures.set(creatureId, creature);
-    console.timeEnd(`loading to memory ${creatureId}`);
-    console.log('Creatures in memory: ', loadedCreatures.size);
   }
   subscription.onStop(() => {
     unloadCreature(creatureId, subscription);
@@ -29,7 +26,6 @@ function unloadCreature(creatureId, subscription) {
     creature.stop();
     loadedCreatures.delete(creatureId);
   }
-  console.log('Creatures in memory: ', loadedCreatures.size);
 }
 
 class LoadedCreature {

From 1b3efae81a6d335bf4d34ef2ac992d103ddaeed2 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 11 May 2022 15:42:29 +0200
Subject: [PATCH 19/56] Replaced manual recompute calls with dirty flag
 settings

---
 .../creatureProperties/CreatureProperties.js  |  7 ++++
 .../methods/adjustQuantity.js                 | 10 ++----
 .../methods/damageProperty.js                 |  4 +--
 .../creatureProperties/methods/dealDamage.js  |  2 --
 .../methods/duplicateProperty.js              |  7 ++--
 .../creatureProperties/methods/equipItem.js   |  5 +--
 .../creatureProperties/methods/flipToggle.js  |  5 +--
 .../methods/insertProperty.js                 |  4 +--
 .../methods/insertPropertyFromLibraryNode.js  |  7 ++--
 .../methods/pullFromProperty.js               |  8 ++---
 .../methods/pushToProperty.js                 |  7 ++--
 .../methods/restoreProperty.js                | 12 ++++---
 .../methods/selectAmmoItem.js                 |  8 +----
 .../methods/softRemoveProperty.js             |  4 ---
 .../methods/updateCreatureProperty.js         |  9 ++---
 .../api/creature/creatures/Creatures.js       |  5 +++
 .../creatures/methods/restCreature.js         | 19 ++++++----
 .../api/creature/experience/Experiences.js    | 35 ++++++++++---------
 app/imports/api/engine/actions/doAction.js    |  8 ++---
 app/imports/api/engine/actions/doCastSpell.js | 13 ++++---
 app/imports/api/engine/actions/doCheck.js     |  4 ---
 .../computation/buildCreatureComputation.js   | 18 ++++++++--
 .../writeAlteredProperties.js                 |  1 +
 .../writeComputation/writeScope.js            |  1 -
 app/imports/api/engine/computeCreature.js     |  1 +
 app/imports/api/engine/loadCreatures.js       | 25 ++++++++-----
 app/imports/api/parenting/organizeMethods.js  | 22 +++++++-----
 app/imports/api/parenting/softRemove.js       | 15 +++++---
 28 files changed, 138 insertions(+), 128 deletions(-)

diff --git a/app/imports/api/creature/creatureProperties/CreatureProperties.js b/app/imports/api/creature/creatureProperties/CreatureProperties.js
index 33183ddc..e4cc728e 100644
--- a/app/imports/api/creature/creatureProperties/CreatureProperties.js
+++ b/app/imports/api/creature/creatureProperties/CreatureProperties.js
@@ -82,6 +82,13 @@ const DenormalisedOnlyCreaturePropertySchema = new SimpleSchema({
     index: 1,
     removeBeforeCompute: true,
   },
+  // When this is true on any property, the creature needs to be recomputed
+  dirty: {
+    type: Boolean,
+    // Default to true because new properties cause a recomputation
+    defaultValue: true,
+    optional: true,
+  },
 });
 
 CreaturePropertySchema.extend(DenormalisedOnlyCreaturePropertySchema);
diff --git a/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js b/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js
index b9958fcb..06ca6459 100644
--- a/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js
+++ b/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js
@@ -4,7 +4,6 @@ import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const adjustQuantity = new ValidatedMethod({
   name: 'creatureProperties.adjustQuantity',
@@ -29,10 +28,6 @@ const adjustQuantity = new ValidatedMethod({
 
     // Do work
     adjustQuantityWork({property, operation, value});
-
-    // Changing quantity does not change dependencies, but recomputing the
-    // inventory changes many deps at once, so recompute fully
-    computeCreature(rootCreature._id);
   },
 });
 
@@ -47,7 +42,7 @@ export function adjustQuantityWork({property, operation, value}){
   }
   if (operation === 'set'){
     CreatureProperties.update(property._id, {
-      $set: {quantity: value}
+      $set: {quantity: value, dirty: true}
     }, {
       selector: property
     });
@@ -57,7 +52,8 @@ export function adjustQuantityWork({property, operation, value}){
     let currentQuantity = property.quantity;
     if (currentQuantity + value < 0) value = -currentQuantity;
     CreatureProperties.update(property._id, {
-      $inc: {quantity: value}
+      $inc: { quantity: value },
+      $set: { dirty: true }
     }, {
       selector: property
     });
diff --git a/app/imports/api/creature/creatureProperties/methods/damageProperty.js b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
index 51c37749..315b6f2c 100644
--- a/app/imports/api/creature/creatureProperties/methods/damageProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
@@ -4,7 +4,6 @@ import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const damageProperty = new ValidatedMethod({
   name: 'creatureProperties.damage',
@@ -38,7 +37,6 @@ const damageProperty = new ValidatedMethod({
 			);
 		}
     let result = damagePropertyWork({ property, operation, value });
-    computeCreature(rootCreature._id);
     return result;
   },
 });
@@ -69,7 +67,7 @@ export function damagePropertyWork({property, operation, value}){
 
   // Write the results
   CreatureProperties.update(property._id, {
-    $set: {damage, value: newValue}
+    $set: {damage, value: newValue, dirty: true}
   }, {
     selector: property
   });
diff --git a/app/imports/api/creature/creatureProperties/methods/dealDamage.js b/app/imports/api/creature/creatureProperties/methods/dealDamage.js
index b93aa495..ddb3dcc1 100644
--- a/app/imports/api/creature/creatureProperties/methods/dealDamage.js
+++ b/app/imports/api/creature/creatureProperties/methods/dealDamage.js
@@ -5,7 +5,6 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const dealDamage = new ValidatedMethod({
   name: 'creatureProperties.dealDamage',
@@ -33,7 +32,6 @@ const dealDamage = new ValidatedMethod({
     assertEditPermission(creature, this.userId);
 
     const totalDamage = dealDamageWork({creature, damageType, amount})
-    computeCreature(creatureId);
     return totalDamage;
   },
 });
diff --git a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
index 03c505c2..3e640714 100644
--- a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
@@ -9,7 +9,6 @@ import {
 	renewDocIds
 } from '/imports/api/parenting/parenting.js';
 import { reorderDocs } from '/imports/api/parenting/order.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 var snackbar;
 if (Meteor.isClient){
   snackbar = require(
@@ -77,6 +76,9 @@ const duplicateProperty = new ValidatedMethod({
 
     // Order the root node
     property.order += 0.5;
+    
+    // Mark the sheet as needing recompute
+    property.dirty = true;
 
     // Insert the properties
 		CreatureProperties.batchInsert([property, ...nodes]);
@@ -87,9 +89,6 @@ const duplicateProperty = new ValidatedMethod({
       ancestorId: property.ancestors[0].id,
     });
 
-    // Inserting a creature property invalidates dependencies: full recompute
-    computeCreature(creature._id);
-
     return propertyId;
   },
 });
diff --git a/app/imports/api/creature/creatureProperties/methods/equipItem.js b/app/imports/api/creature/creatureProperties/methods/equipItem.js
index 24cb51fa..a8bbb911 100644
--- a/app/imports/api/creature/creatureProperties/methods/equipItem.js
+++ b/app/imports/api/creature/creatureProperties/methods/equipItem.js
@@ -4,7 +4,6 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
 import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
 
@@ -29,7 +28,7 @@ const equipItem = new ValidatedMethod({
     let creature = getRootCreatureAncestor(item);
     assertEditPermission(creature, this.userId);
     CreatureProperties.update(_id, {
-      $set: {equipped},
+      $set: { equipped, dirty: true },
     }, {
 			selector: {type: 'item'},
 		});
@@ -46,8 +45,6 @@ const equipItem = new ValidatedMethod({
       order: Number.MAX_SAFE_INTEGER,
       skipRecompute: true,
     });
-
-    computeCreature(creature._id);
   },
 });
 
diff --git a/app/imports/api/creature/creatureProperties/methods/flipToggle.js b/app/imports/api/creature/creatureProperties/methods/flipToggle.js
index e39d0c75..df563cdc 100644
--- a/app/imports/api/creature/creatureProperties/methods/flipToggle.js
+++ b/app/imports/api/creature/creatureProperties/methods/flipToggle.js
@@ -3,7 +3,6 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const flipToggle = new ValidatedMethod({
   name: 'creatureProperties.flipToggle',
@@ -36,12 +35,10 @@ const flipToggle = new ValidatedMethod({
 		CreatureProperties.update(_id, {$set: {
       enabled: !currentValue,
       disabled: currentValue,
+      dirty: true,
     }}, {
 			selector: {type: 'toggle'},
 		});
-
-    // Updating a toggle is likely to change the whole tree, do a full recompute
-    computeCreature(rootCreature._id);
   },
 });
 
diff --git a/app/imports/api/creature/creatureProperties/methods/insertProperty.js b/app/imports/api/creature/creatureProperties/methods/insertProperty.js
index 4535e1fe..5d3567b0 100644
--- a/app/imports/api/creature/creatureProperties/methods/insertProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/insertProperty.js
@@ -5,7 +5,6 @@ import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/ge
 import SimpleSchema from 'simpl-schema';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { reorderDocs } from '/imports/api/parenting/order.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 import { getAncestry } from '/imports/api/parenting/parenting.js';
 import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
 import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
@@ -132,14 +131,13 @@ const insertPropertyAsChildOfTag = new ValidatedMethod({
 
 export function insertPropertyWork({property, creature}){
   delete property._id;
+  property.dirty = true;
   let _id = CreatureProperties.insert(property);
   // Tree structure changed by insert, reorder the tree
   reorderDocs({
     collection: CreatureProperties,
     ancestorId: creature._id,
   });
-  // Inserting a creature property invalidates dependencies: full recompute
-  computeCreature(creature._id);
   return _id;
 }
 
diff --git a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
index e73cbe33..1360ffc3 100644
--- a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
+++ b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
@@ -5,7 +5,6 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import {
 	setLineageOfDocs,
@@ -71,9 +70,6 @@ const insertPropertyFromLibraryNode = new ValidatedMethod({
       collection: CreatureProperties,
       ancestorId: rootCreature._id,
     });
-
-		// Inserting a creature property invalidates dependencies: full recompute
-    computeCreature(rootCreature._id);
 		// Return the docId of the last property, the inserted root property
 		return rootId;
 	},
@@ -135,6 +131,9 @@ function insertPropertyFromNode(nodeId, ancestors, order){
     node.order = order;
   }
 
+  // Mark root as dirty
+  node.dirty = true;
+
   // Insert the creature properties
   CreatureProperties.batchInsert(nodes);
   return node;
diff --git a/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js b/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js
index fa2acf78..3d8f99ea 100644
--- a/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js
@@ -3,7 +3,6 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const pullFromProperty = new ValidatedMethod({
 	name: 'creatureProperties.pull',
@@ -21,15 +20,12 @@ const pullFromProperty = new ValidatedMethod({
 
     // Do work
 		CreatureProperties.update(_id, {
-			$pull: {[path.join('.')]: {_id: itemId}},
+      $pull: { [path.join('.')]: { _id: itemId } },
+      $set: { dirty: true }
 		}, {
 			selector: {type: property.type},
 			getAutoValues: false,
 		});
-
-    // TODO figure out if this method can change deps or not
-    computeCreature(rootCreature._id);
-    // recomputePropertyDependencies(property);
 	}
 });
 
diff --git a/app/imports/api/creature/creatureProperties/methods/pushToProperty.js b/app/imports/api/creature/creatureProperties/methods/pushToProperty.js
index e730065c..0ec4719c 100644
--- a/app/imports/api/creature/creatureProperties/methods/pushToProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/pushToProperty.js
@@ -3,7 +3,6 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 import { get } from 'lodash';
 
 const pushToProperty = new ValidatedMethod({
@@ -39,13 +38,11 @@ const pushToProperty = new ValidatedMethod({
 
     // Do work
 		CreatureProperties.update(_id, {
-			$push: {[joinedPath]: value},
+      $push: { [joinedPath]: value },
+      $set: { dirty: true },
 		}, {
 			selector: {type: property.type},
 		});
-
-    // TODO figure out if this method can change deps or not
-    computeCreature(rootCreature._id);
 	}
 });
 
diff --git a/app/imports/api/creature/creatureProperties/methods/restoreProperty.js b/app/imports/api/creature/creatureProperties/methods/restoreProperty.js
index b612e6c7..02ed7637 100644
--- a/app/imports/api/creature/creatureProperties/methods/restoreProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/restoreProperty.js
@@ -5,7 +5,6 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { restore } from '/imports/api/parenting/softRemove.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const restoreProperty = new ValidatedMethod({
 	name: 'creatureProperties.restore',
@@ -24,10 +23,13 @@ const restoreProperty = new ValidatedMethod({
     assertEditPermission(rootCreature, this.userId);
 
     // Do work
-    restore({_id, collection: CreatureProperties});
-
-    // Changes dependency tree by restoring children
-    computeCreature(rootCreature._id);
+    restore({
+      _id,
+      collection: CreatureProperties,
+      extraUpdates: {
+        $set: { dirty: true }
+      },
+    });
 	}
 });
 
diff --git a/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js b/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js
index c1e4baa3..4f460287 100644
--- a/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js
+++ b/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js
@@ -4,7 +4,6 @@ import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const selectAmmoItem = new ValidatedMethod({
   name: 'creatureProperties.selectAmmoItem',
@@ -37,15 +36,10 @@ const selectAmmoItem = new ValidatedMethod({
     }
     let path = `resources.itemsConsumed.${itemConsumedIndex}.itemId`;
     CreatureProperties.update(actionId, {
-      $set: {[path]: itemId}
+      $set: { [path]: itemId, dirty: true }
     }, {
       selector: action,
     });
-
-    // Changing the linked item does change the dependency tree
-    // TODO: We can predict exactly which deps will be affected instead of
-    //       recomputing the entire creature
-    computeCreature(rootCreature._id);
   },
 });
 
diff --git a/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js b/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js
index 86df9247..96110e8e 100644
--- a/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js
@@ -5,7 +5,6 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { softRemove } from '/imports/api/parenting/softRemove.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const softRemoveProperty = new ValidatedMethod({
 	name: 'creatureProperties.softRemove',
@@ -25,9 +24,6 @@ const softRemoveProperty = new ValidatedMethod({
 
     // Do work
 		softRemove({_id, collection: CreatureProperties});
-
-    // Changes dependency tree by removing children
-    computeCreature(rootCreature._id);
 	}
 });
 
diff --git a/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js b/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js
index d53ddc6e..d6bf733c 100644
--- a/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js
@@ -3,7 +3,6 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const updateCreatureProperty = new ValidatedMethod({
   name: 'creatureProperties.update',
@@ -37,17 +36,13 @@ const updateCreatureProperty = new ValidatedMethod({
     let modifier;
     // unset empty values
     if (value === null || value === undefined){
-      modifier = {$unset: {[pathString]: 1}};
+      modifier = { $unset: {[pathString]: 1}, $set: { dirty: true } };
     } else {
-      modifier = {$set: {[pathString]: value}};
+      modifier = { $set: {[pathString]: value, dirty: true } };
     }
 		CreatureProperties.update(_id, modifier, {
 			selector: {type: property.type},
 		});
-
-    // Updating a property is likely to change dependencies, do a full recompute
-    // denormalised stats might change, so fetch the creature again
-    computeCreature(rootCreature._id);
   },
 });
 
diff --git a/app/imports/api/creature/creatures/Creatures.js b/app/imports/api/creature/creatures/Creatures.js
index 1c118fee..ef05ff40 100644
--- a/app/imports/api/creature/creatures/Creatures.js
+++ b/app/imports/api/creature/creatures/Creatures.js
@@ -100,6 +100,11 @@ let CreatureSchema = new SimpleSchema({
     type: SimpleSchema.Integer,
     defaultValue: 0,
   },
+  // Does the character need a recompute?
+  dirty: {
+    type: Boolean,
+    optional: true,
+  },
   // Version of computation engine that was last used to compute this creature
   computeVersion: {
 		type: String,
diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 07a607ee..c75e3cd8 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -4,10 +4,9 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const restCreature = new ValidatedMethod({
-  name: 'creature.methods.longRest',
+  name: 'creature.methods.rest',
   validate: new SimpleSchema({
     creatureId: {
       type: String,
@@ -51,7 +50,10 @@ const restCreature = new ValidatedMethod({
     // update all attribute's damage
     filter.type = 'attribute';
     CreatureProperties.update(filter, {
-      $set: {damage: 0}
+      $set: {
+        damage: 0,
+        dirty: true,
+      }
     }, {
       selector: {type: 'attribute'},
       multi: true,
@@ -63,7 +65,10 @@ const restCreature = new ValidatedMethod({
       'spell'
     ]};
     CreatureProperties.update(filter, {
-      $set: {usesUsed: 0}
+      $set: {
+        usesUsed: 0,
+        dirty: true,
+      }
     }, {
       selector: {type: 'action'},
       multi: true,
@@ -103,13 +108,15 @@ const restCreature = new ValidatedMethod({
         recoverableHd -= amountToRecover;
         resultingDamage = hd.damage - amountToRecover;
         CreatureProperties.update(hd._id, {
-          $set: {damage: resultingDamage}
+          $set: {
+            damage: resultingDamage,
+            dirty: true,
+          }
         }, {
           selector: {type: 'attribute'},
         });
       });
     }
-    computeCreature(creatureId);
   },
 });
 
diff --git a/app/imports/api/creature/experience/Experiences.js b/app/imports/api/creature/experience/Experiences.js
index 7c0bb002..60501d02 100644
--- a/app/imports/api/creature/experience/Experiences.js
+++ b/app/imports/api/creature/experience/Experiences.js
@@ -3,7 +3,6 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
 
 let Experiences = new Mongo.Collection('experiences');
@@ -50,18 +49,19 @@ Experiences.attachSchema(ExperienceSchema);
 const insertExperienceForCreature = function({experience, creatureId, userId}){
   assertEditPermission(creatureId, userId);
   if (experience.xp){
-    Creatures.update(creatureId, {$inc: {
-      'denormalizedStats.xp': experience.xp
-    }});
+    Creatures.update(creatureId, {
+      $inc: { 'denormalizedStats.xp': experience.xp },
+      $set: { dirty: true },
+    });
   }
   if (experience.levels) {
-    Creatures.update(creatureId, {$inc: {
-      'denormalizedStats.milestoneLevels': experience.levels
-    }});
+    Creatures.update(creatureId, {
+      $inc: { 'denormalizedStats.milestoneLevels': experience.levels },
+      $set: { dirty: true },
+    });
   }
   experience.creatureId = creatureId;
   let id = Experiences.insert(experience);
-  computeCreature(creatureId);
   return id;
 };
 
@@ -124,18 +124,19 @@ const removeExperience = new ValidatedMethod({
     let creatureId = experience.creatureId
     assertEditPermission(creatureId, userId);
     if (experience.xp){
-      Creatures.update(creatureId, {$inc: {
-        'denormalizedStats.xp': -experience.xp
-      }});
+      Creatures.update(creatureId, {
+        $inc: { 'denormalizedStats.xp': -experience.xp },
+        $set: { dirty: true },
+      });
     }
     if (experience.levels) {
-      Creatures.update(creatureId, {$inc: {
-        'denormalizedStats.milestoneLevels': -experience.levels
-      }});
+      Creatures.update(creatureId, {
+        $inc: { 'denormalizedStats.milestoneLevels': -experience.levels },
+        $set: { dirty: true },
+      });
     }
     experience.creatureId = creatureId;
     let numRemoved = Experiences.remove(experienceId);
-    computeCreature(creatureId);
     return numRemoved;
   },
 });
@@ -173,9 +174,9 @@ const recomputeExperiences = new ValidatedMethod({
     });
     Creatures.update(creatureId, {$set: {
       'denormalizedStats.xp': xp,
-      'denormalizedStats.milestoneLevels': milestoneLevels
+      'denormalizedStats.milestoneLevels': milestoneLevels,
+      dirty: true,
     }});
-    computeCreature(creatureId);
   },
 });
 
diff --git a/app/imports/api/engine/actions/doAction.js b/app/imports/api/engine/actions/doAction.js
index e72e43bc..a53f628d 100644
--- a/app/imports/api/engine/actions/doAction.js
+++ b/app/imports/api/engine/actions/doAction.js
@@ -8,7 +8,6 @@ import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import applyProperty from './applyProperty.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 
 const doAction = new ValidatedMethod({
   name: 'creatureProperties.doAction',
@@ -77,9 +76,10 @@ const doAction = new ValidatedMethod({
     doActionWork({creature, targets, properties, ancestors, method: this, methodScope: scope});
 
     // Recompute all involved creatures
-    computeCreature(creature._id);
-    targets.forEach(target => {
-      computeCreature(target._id);
+    Creatures.update({
+      _id: { $in: [creature._id, ...targetIds] }
+    }, {
+      dirty: true
     });
   },
 });
diff --git a/app/imports/api/engine/actions/doCastSpell.js b/app/imports/api/engine/actions/doCastSpell.js
index 890c4879..8e0da001 100644
--- a/app/imports/api/engine/actions/doCastSpell.js
+++ b/app/imports/api/engine/actions/doCastSpell.js
@@ -7,7 +7,6 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import { doActionWork } from '/imports/api/engine/actions/doAction.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 import { CreatureLogSchema } from '/imports/api/creature/log/CreatureLogs.js';
 
 const doAction = new ValidatedMethod({
@@ -129,12 +128,12 @@ const doAction = new ValidatedMethod({
     }
 
     // Do the action
-    doActionWork({creature, targets, properties, ancestors, method: this, methodScope: scope, log});
-
-    // Recompute all involved creatures
-    computeCreature(creature._id);
-    targets.forEach(target => {
-      computeCreature(target._id);
+    doActionWork({ creature, targets, properties, ancestors, method: this, methodScope: scope, log });
+    
+    Creatures.update({
+      _id: { $in: [creature._id, ...targetIds] }
+    }, {
+      dirty: true
     });
   },
 });
diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js
index ce66db02..9f139f2c 100644
--- a/app/imports/api/engine/actions/doCheck.js
+++ b/app/imports/api/engine/actions/doCheck.js
@@ -5,7 +5,6 @@ import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/ge
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
 import rollDice from '/imports/parser/rollDice.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
@@ -32,9 +31,6 @@ const doCheck = new ValidatedMethod({
 
     // Do the check
     doCheckWork({creature, prop, method: this, methodScope: scope});
-
-    // Recompute all involved creatures
-    computeCreature(creature._id);
   },
 });
 
diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index 47612830..0da96e21 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -42,7 +42,8 @@ function getProperties(creatureId) {
   if (loadedCreatures.has(creatureId)) {
     const creature = loadedCreatures.get(creatureId);
     const props = Array.from(creature.properties.values());
-    return props;
+    const cloneProps = EJSON.clone(props);
+    return cloneProps
   }
   console.time(`Cache miss fetching from db: ${creatureId}`)
   const props = CreatureProperties.find({
@@ -56,10 +57,19 @@ function getProperties(creatureId) {
   return props;
 }
 
-function getCreature(creatureId){
-  return Creatures.findOne(creatureId, {
+function getCreature(creatureId) {
+  if (loadedCreatures.has(creatureId)) {
+    const loadedCreature = loadedCreatures.get(creatureId);
+    const creature = loadedCreature.creatures.get(creatureId);
+    if (creature) return creature;
+  }
+  console.time(`Cache miss on Creature: ${creatureId}`);
+  const creature = Creatures.findOne(creatureId, {
     denormalizedStats: 1,
+    variables: 1,
   });
+  console.timeEnd(`Cache miss on Creature: ${creatureId}`);
+  return creature;
 }
 
 export function buildComputationFromProps(properties, creature){
@@ -91,6 +101,8 @@ export function buildComputationFromProps(properties, creature){
 
   // Process the properties one by one
   properties.forEach(prop => {
+    // The prop has been processed, it's no longer dirty
+    delete prop.dirty;
 
     const computedSchema = computedOnlySchemas[prop.type];
     removeSchemaFields([computedSchema, denormSchema], prop);
diff --git a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
index ccf8246e..fcad024c 100644
--- a/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
+++ b/app/imports/api/engine/computation/writeComputation/writeAlteredProperties.js
@@ -21,6 +21,7 @@ export default function writeAlteredProperties(computation){
       'deactivatedByAncestor',
       'deactivatedByToggle',
       'damage',
+      'dirty',
       ...schema.objectKeys(),
     ];
     op = addChangedKeysToOp(op, keys, original, changed);
diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index c318fb9e..abee4290 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -20,7 +20,6 @@ export default function writeScope(creatureId, computation) {
     // Only update changed fields
     if (!EJSON.equals(variables[key], scope[key])) {
       if (!$set) $set = {};
-
       // Set the changed key in the creature variables
       $set[`variables.${key}`] = scope[key];
     }
diff --git a/app/imports/api/engine/computeCreature.js b/app/imports/api/engine/computeCreature.js
index 75064776..7bc1a953 100644
--- a/app/imports/api/engine/computeCreature.js
+++ b/app/imports/api/engine/computeCreature.js
@@ -6,6 +6,7 @@ import writeErrors from './computation/writeComputation/writeErrors.js';
 
 export default function computeCreature(creatureId){
   if (Meteor.isClient) return;
+  console.log('compute')
   const computation = buildCreatureComputation(creatureId);
   computeComputation(computation, creatureId);
 }
diff --git a/app/imports/api/engine/loadCreatures.js b/app/imports/api/engine/loadCreatures.js
index f7870440..0a60250b 100644
--- a/app/imports/api/engine/loadCreatures.js
+++ b/app/imports/api/engine/loadCreatures.js
@@ -1,6 +1,7 @@
+import { debounce } from 'lodash';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-
+import computeCreature from './computeCreature';
 export const loadedCreatures = new Map(); // creatureId => {creature, properties, etc.}
 
 export function loadCreature(creatureId, subscription) {
@@ -35,27 +36,33 @@ class LoadedCreature {
     // the required documents
     const self = this;
     Tracker.nonreactive(() => {
-
       self.subs = new Set([sub]);
 
+      const compute = debounce(Meteor.bindEnvironment(() => {
+        computeCreature(creatureId);
+      }), 100);
+
       self.properties = new Map();
       // Observe all creature properties which are needed for computation
       self.propertyObserver = CreatureProperties.find({
         'ancestors.id': creatureId,
         removed: { $ne: true },
       }, {
-        // sort: { order: 1 },
+        sort: { order: 1 },
         fields: { icon: 0 },
       }).observeChanges({
         added(id, fields) {
           fields._id = id;
-          return self.addProperty(fields)
+          self.addProperty(fields);
+          if (fields.dirty) compute();
         },
         changed(id, fields) {
-          return self.changeProperty(id, fields);
+          self.changeProperty(id, fields);
+          if (fields.dirty) compute();
         },
         removed(id) {
-          return self.removeProperty(id);
+          self.removeProperty(id);
+          compute();
         },
       });
       
@@ -67,12 +74,14 @@ class LoadedCreature {
         added(id, fields) {
           fields._id = id;
           self.addCreature(fields)
+          if (fields.dirty) compute();
         },
         changed(id, fields) {
-          return self.changeCreature(id, fields);
+          self.changeCreature(id, fields);
+          if (fields.dirty) compute();
         },
         removed(id) {
-          return self.removeCreature(id);
+          self.removeCreature(id);
         },
       });
 
diff --git a/app/imports/api/parenting/organizeMethods.js b/app/imports/api/parenting/organizeMethods.js
index f104154c..c4b822b2 100644
--- a/app/imports/api/parenting/organizeMethods.js
+++ b/app/imports/api/parenting/organizeMethods.js
@@ -8,7 +8,7 @@ import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
 import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
-import computeCreature from '/imports/api/engine/computeCreature.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
 
 const organizeDoc = new ValidatedMethod({
   name: 'organize.organizeDoc',
@@ -57,10 +57,11 @@ const organizeDoc = new ValidatedMethod({
     let parentCreatures = getCreatureAncestors(parent);
     if (!skipRecompute){
       let creaturesToRecompute = union(docCreatures, parentCreatures);
-      // Recompute the creatures
-      creaturesToRecompute.forEach(id => {
-        // Some Dependencies depend on ancestry, so a full recompute is needed
-        computeCreature(id);
+      // Mark the creatures for recompute
+      Creatures.update({
+        _id: { $in: creaturesToRecompute }
+      }, {
+        dirty: true
       });
     }
   },
@@ -85,9 +86,14 @@ const reorderDoc = new ValidatedMethod({
     assertDocEditPermission(doc, this.userId);
     safeUpdateDocOrder({docRef, order});
     // Recompute the affected creatures
-    getCreatureAncestors(doc).forEach(id => {
-      computeCreature(id);
-    });
+    const ancestors = getCreatureAncestors(doc);
+    if (ancestors.length) {
+      Creatures.update({
+        _id: { $in: ancestors }
+      }, {
+        dirty: true
+      });
+    }
   },
 });
 
diff --git a/app/imports/api/parenting/softRemove.js b/app/imports/api/parenting/softRemove.js
index 9ef16f8c..099abfc2 100644
--- a/app/imports/api/parenting/softRemove.js
+++ b/app/imports/api/parenting/softRemove.js
@@ -40,17 +40,22 @@ const restoreError = function(){
   );
 };
 
-export function restore({_id, collection}){
+export function restore({ _id, collection, extraUpdates}){
   if (typeof collection === 'string') {
     collection = getCollectionByName(collection);
   }
+  const update = {
+    $unset: {
+      removed: 1,
+      removedAt: 1,
+    },
+    ...extraUpdates
+  }
+
   let numUpdated = collection.update({
     _id,
     removedWith: {$exists: false}
-  }, { $unset: {
-    removed: 1,
-    removedAt: 1,
-  }}, {
+  }, update , {
     selector: {type: 'any'},
   },);
   if (numUpdated === 0) restoreError();

From a04935c5b4be683f6402f563da245d0697f3135e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 7 Jun 2022 18:51:07 +0200
Subject: [PATCH 20/56] Updated packages

---
 app/.meteor/packages  |  10 +--
 app/.meteor/release   |   2 +-
 app/.meteor/versions  |  48 ++++++-------
 app/package-lock.json | 160 ++++++++++++++++++++++--------------------
 app/package.json      |  24 +++----
 5 files changed, 127 insertions(+), 117 deletions(-)

diff --git a/app/.meteor/packages b/app/.meteor/packages
index 17aedfd9..6bfb61c4 100644
--- a/app/.meteor/packages
+++ b/app/.meteor/packages
@@ -3,24 +3,24 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-accounts-password@2.2.0
+accounts-password@2.3.1
 random@1.2.0
 underscore@1.0.10
 dburles:mongo-collection-instances
 accounts-google@1.4.0
-email@2.2.0
+email@2.2.1
 meteor-base@1.5.1
 mobile-experience@1.1.0
-mongo@1.14.6
+mongo@1.15.0
 session@1.2.0
 tracker@1.2.0
 logging@1.3.1
 reload@1.3.1
-ejson@1.1.1
+ejson@1.1.2
 check@1.3.1
 standard-minifier-js@2.8.0
 shell-server@0.5.0
-ecmascript@0.16.1
+ecmascript@0.16.2
 es5-shim@4.8.0
 service-configuration@1.3.0
 dynamic-import@0.7.2
diff --git a/app/.meteor/release b/app/.meteor/release
index b1b0cceb..66dd7b66 100644
--- a/app/.meteor/release
+++ b/app/.meteor/release
@@ -1 +1 @@
-METEOR@2.6.1
+METEOR@2.7.3
diff --git a/app/.meteor/versions b/app/.meteor/versions
index 65dfa36d..dbabbb8b 100644
--- a/app/.meteor/versions
+++ b/app/.meteor/versions
@@ -1,7 +1,7 @@
-accounts-base@2.2.1
+accounts-base@2.2.3
 accounts-google@1.4.0
-accounts-oauth@1.4.0
-accounts-password@2.2.0
+accounts-oauth@1.4.1
+accounts-password@2.3.1
 accounts-patreon@0.1.0
 akryum:npm-check@0.1.2
 akryum:vue-component@0.15.2
@@ -12,13 +12,13 @@ aldeed:collection2@3.5.0
 aldeed:schema-index@3.0.0
 allow-deny@1.1.1
 autoupdate@1.8.0
-babel-compiler@7.8.1
-babel-runtime@1.5.0
+babel-compiler@7.9.0
+babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-blaze-tools@1.1.2
+blaze-tools@1.1.3
 boilerplate-generator@1.7.1
-bozhao:link-accounts@2.4.0
+bozhao:link-accounts@2.6.1
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
 callback-hook@1.4.0
@@ -33,18 +33,18 @@ ddp-rate-limiter@1.1.0
 ddp-server@2.5.0
 diff-sequence@1.1.1
 dynamic-import@0.7.2
-ecmascript@0.16.1
+ecmascript@0.16.2
 ecmascript-runtime@0.8.0
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
-ejson@1.1.1
-email@2.2.0
+ejson@1.1.2
+email@2.2.1
 es5-shim@4.8.0
 fetch@0.1.1
 geojson-utils@1.0.10
-google-oauth@1.4.1
+google-oauth@1.4.2
 hot-code-push@1.0.4
-html-tools@1.1.2
+html-tools@1.1.3
 htmljs@1.1.1
 http@2.0.0
 id-map@1.1.1
@@ -64,23 +64,23 @@ meteortesting:mocha@2.0.3
 meteortesting:mocha-core@8.1.2
 mikowals:batch-insert@1.3.0
 minifier-css@1.6.0
-minifier-js@2.7.3
+minifier-js@2.7.4
 minimongo@1.8.0
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
-modern-browsers@0.1.7
+modern-browsers@0.1.8
 modules@0.18.0
-modules-runtime@0.12.0
-mongo@1.14.6
-mongo-decimal@0.1.2
+modules-runtime@0.13.0
+mongo@1.15.0
+mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
 mongo-livedata@1.0.12
 npm-mongo@4.3.1
-oauth@2.1.1
+oauth@2.1.2
 oauth2@1.3.1
 ordered-dict@1.1.0
-ostrio:cookies@2.7.0
+ostrio:cookies@2.7.2
 ostrio:files@2.0.1
 patreon-oauth@0.1.0
 peerlibrary:assert@0.3.0
@@ -98,7 +98,7 @@ promise@0.12.0
 raix:eventemitter@1.0.0
 random@1.2.0
 rate-limit@1.0.9
-react-fast-refresh@0.2.2
+react-fast-refresh@0.2.3
 reactive-dict@1.3.0
 reactive-var@1.0.11
 reload@1.3.1
@@ -114,14 +114,14 @@ simple:rest@1.2.1
 simple:rest-bearer-token-parser@1.1.1
 simple:rest-json-error-handler@1.1.1
 simple:rest-method-mixin@1.1.0
-socket-stream-client@0.4.0
-spacebars-compiler@1.3.0
+socket-stream-client@0.5.0
+spacebars-compiler@1.3.1
 standard-minifier-js@2.8.0
 static-html@1.3.2
-templating-tools@1.2.1
+templating-tools@1.2.2
 tmeasday:check-npm-versions@1.0.2
 tracker@1.2.0
-typescript@4.4.1
+typescript@4.5.4
 underscore@1.0.10
 url@1.3.2
 webapp@1.13.1
diff --git a/app/package-lock.json b/app/package-lock.json
index a5119f93..3ce518a8 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -50,9 +50,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
+      "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -279,25 +279,25 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "aws-sdk": {
-      "version": "2.1059.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1059.0.tgz",
-      "integrity": "sha512-Q+6T9kpO6aobUNboTOk9MVAmWbs/KK0pxgCNFK0M8YO+7EWUFkNOLHM9tdYOP5vsJK5pLz6D2t2w3lHQjKzGlg==",
+      "version": "2.1148.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1148.0.tgz",
+      "integrity": "sha512-FUYAyveKmS5eqIiGQgrGVsLZwwtI+K6S6Gz8oJf56pgypZCo9dV+cXO4aaS+vN0+LSmGh6dSKc6G8h8FYASIJg==",
       "requires": {
         "buffer": "4.9.2",
         "events": "1.1.1",
         "ieee754": "1.1.13",
-        "jmespath": "0.15.0",
+        "jmespath": "0.16.0",
         "querystring": "0.2.0",
         "sax": "1.2.1",
         "url": "0.10.3",
-        "uuid": "3.3.2",
+        "uuid": "8.0.0",
         "xml2js": "0.4.19"
       },
       "dependencies": {
         "uuid": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+          "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="
         }
       }
     },
@@ -448,15 +448,16 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chai": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
-      "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
         "deep-eql": "^3.0.1",
         "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
         "pathval": "^1.1.1",
         "type-detect": "^4.0.5"
       }
@@ -515,13 +516,13 @@
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
       "dev": true
     },
     "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.2",
@@ -587,7 +588,7 @@
     "clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
     },
     "code-point-at": {
       "version": "1.1.0",
@@ -802,9 +803,9 @@
       }
     },
     "dompurify": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz",
-      "integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ=="
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.8.tgz",
+      "integrity": "sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw=="
     },
     "ecc-jsbn": {
       "version": "0.1.2",
@@ -1067,7 +1068,7 @@
     "events": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="
     },
     "expand-template": {
       "version": "2.0.3",
@@ -1212,7 +1213,7 @@
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
       "dev": true
     },
     "getpass": {
@@ -1226,7 +1227,7 @@
     "github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
     },
     "glob": {
       "version": "7.1.6",
@@ -1333,9 +1334,9 @@
       "integrity": "sha1-tJ7yJ0va/NikiAqWa/440aC/RnE="
     },
     "immutable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
-      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
+      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
       "dev": true
     },
     "import-fresh": {
@@ -1438,9 +1439,9 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jmespath": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
+      "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw=="
     },
     "js-tokens": {
       "version": "4.0.0",
@@ -1540,7 +1541,7 @@
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="
     },
     "lodash.merge": {
       "version": "4.6.2",
@@ -1576,6 +1577,15 @@
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
       "dev": true
     },
+    "loupe": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
+      "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.0"
+      }
+    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -1609,9 +1619,9 @@
       }
     },
     "marked": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
-      "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw=="
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.16.tgz",
+      "integrity": "sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA=="
     },
     "mem": {
       "version": "6.1.1",
@@ -1632,13 +1642,13 @@
       }
     },
     "meteor-node-stubs": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.1.0.tgz",
-      "integrity": "sha512-YvMQb4zcfWA82wFdRVTyxq28GO+Us7GSdtP+bTtC/mV35yipKnWo4W4665O57AmLVFnz4zR+WIZW11b4sfCtJw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.3.tgz",
+      "integrity": "sha512-2kyYFh45428+q8EjydBhyHqPO30CG09yQ6xRNHMJSiFLqHaVoRJE1tWr7QrBKstjy8HkNH4UuKSp5S11HeZv/w==",
       "requires": {
         "assert": "^2.0.0",
         "browserify-zlib": "^0.2.0",
-        "buffer": "^6.0.3",
+        "buffer": "^5.7.1",
         "console-browserify": "^1.2.0",
         "constants-browserify": "^1.0.0",
         "crypto-browserify": "^3.12.0",
@@ -1649,7 +1659,7 @@
         "os-browserify": "^0.3.0",
         "path-browserify": "^1.0.0",
         "process": "^0.11.10",
-        "punycode": "^2.1.1",
+        "punycode": "^1.4.1",
         "querystring-es3": "^0.2.1",
         "readable-stream": "^3.6.0",
         "stream-browserify": "^3.0.0",
@@ -1766,11 +1776,11 @@
           }
         },
         "buffer": {
-          "version": "6.0.3",
+          "version": "5.7.1",
           "bundled": true,
           "requires": {
             "base64-js": "^1.3.1",
-            "ieee754": "^1.2.1"
+            "ieee754": "^1.1.13"
           }
         },
         "buffer-xor": {
@@ -2219,7 +2229,7 @@
           }
         },
         "punycode": {
-          "version": "2.1.1",
+          "version": "1.4.1",
           "bundled": true
         },
         "querystring": {
@@ -2539,9 +2549,9 @@
       "integrity": "sha512-yJZay4tP0wcjqkkf8zlMQ/T+JOgU+EWfdE4w4TG8OS94B12J/+Z44UOYxVJErE8E6/wFunX1hMZEB1/GHsBYHg=="
     },
     "node-abi": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz",
-      "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz",
+      "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==",
       "requires": {
         "semver": "^7.3.5"
       }
@@ -2787,7 +2797,7 @@
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="
     },
     "railroad-diagrams": {
       "version": "1.0.0",
@@ -2934,9 +2944,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.48.0.tgz",
-      "integrity": "sha512-hQi5g4DcfjcipotoHZ80l7GNJHGqQS5LwMBjVYB/TaT0vcSSpbgM8Ad7cgfsB2M0MinbkEQQPO9+sjjSiwxqmw==",
+      "version": "1.52.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.2.tgz",
+      "integrity": "sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -2968,14 +2978,14 @@
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
     "sharp": {
-      "version": "0.30.4",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.4.tgz",
-      "integrity": "sha512-3Onig53Y6lji4NIZo69s14mERXXY/GV++6CzOYx/Rd8bnTwbhFbL09WZd7Ag/CCnA0WxFID8tkY0QReyfL6v0Q==",
+      "version": "0.30.6",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.6.tgz",
+      "integrity": "sha512-lSdVxFxcndzcXggDrak6ozdGJgmIgES9YVZWtAFrwi+a/H5vModaf51TghBtMPw+71sLxUsTy2j+aB7qLIODQg==",
       "requires": {
         "color": "^4.2.3",
         "detect-libc": "^2.0.1",
-        "node-addon-api": "^4.3.0",
-        "prebuild-install": "^7.0.1",
+        "node-addon-api": "^5.0.0",
+        "prebuild-install": "^7.1.0",
         "semver": "^7.3.7",
         "simple-get": "^4.0.1",
         "tar-fs": "^2.1.1",
@@ -2988,9 +2998,9 @@
           "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
         },
         "node-addon-api": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
-          "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz",
+          "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA=="
         },
         "semver": {
           "version": "7.3.7",
@@ -3019,13 +3029,13 @@
     },
     "signal-exit": {
       "version": "3.0.2",
-      "resolved": false,
+      "resolved": "",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simpl-schema": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/simpl-schema/-/simpl-schema-1.12.0.tgz",
-      "integrity": "sha512-lzXC3L8jJbPhNXGR3cjlyIauqqrC5WUJS4O34Ym/wLIvb8K3ZieK+1OfTzs4mBpDc3Y8u53gQFAr1X37DmTcEg==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/simpl-schema/-/simpl-schema-1.12.2.tgz",
+      "integrity": "sha512-FaisAjfJEt7Ie7K39wNqb/0F7FQ1q7yXmZcNa5JEBiPA9hIt4MpWMouL9mLqNB89alGpZAEiU7U9BelDxRqCVg==",
       "requires": {
         "clone": "^2.1.2",
         "message-box": "^0.2.7",
@@ -3109,9 +3119,9 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
-      "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "dev": true
     },
     "source-map-support": {
@@ -3390,9 +3400,9 @@
       "dev": true
     },
     "underscore": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
-      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.4.tgz",
+      "integrity": "sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ=="
     },
     "uri-js": {
       "version": "4.2.2",
@@ -3414,7 +3424,7 @@
         "punycode": {
           "version": "1.3.2",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+          "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
         }
       }
     },
@@ -3503,9 +3513,9 @@
       "integrity": "sha512-hx2JtRPRvne9NY4s1r7ASsCaO8CIby30qwC1kGQRxsrWApO3he+rziGOzTDSfvmr852zWMb11n6qAwHCz6C/vw=="
     },
     "vue-router": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz",
-      "integrity": "sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz",
+      "integrity": "sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ=="
     },
     "vuedraggable": {
       "version": "2.24.3",
@@ -3516,9 +3526,9 @@
       }
     },
     "vuetify": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.2.tgz",
-      "integrity": "sha512-nx3uZkO8MZNMshUEh1xKaQ1hQYepNwWFn3FVxKt+XBVf7ZFscd0GS/a3KZo4B3baXQmziCQAZKNIQF5IWeaIUw=="
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.6.tgz",
+      "integrity": "sha512-H4KtxDFmDN8QiTRiGfBySyjMhVaHAJTKB0llGGKZT5jKxtnx9gvEtMWXKtVuRP0NJJP0H6xBPJHNOH7nT18qiQ=="
     },
     "vuetify-upload-button": {
       "version": "2.0.2",
diff --git a/app/package.json b/app/package.json
index 0467b8ef..bc90f96d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,7 +10,7 @@
   "author": "Stefan Zermatten",
   "scripts": {
     "run": "meteor",
-    "debug": "meteor debug",
+    "debug": "meteor --inspect",
     "test": "meteor test --driver-package meteortesting:mocha --port 3001"
   },
   "engines": {
@@ -18,11 +18,11 @@
     "npm": "6.13.x"
   },
   "dependencies": {
-    "@babel/runtime": "^7.16.7",
+    "@babel/runtime": "^7.18.3",
     "@chenfengyuan/vue-countdown": "^1.1.5",
     "@tozd/vue-observer-utils": "^0.5.0",
     "animejs": "^2.2.0",
-    "aws-sdk": "^2.1059.0",
+    "aws-sdk": "^2.1148.0",
     "bcrypt": "^5.0.0",
     "chroma-js": "^2.4.2",
     "core-js": "^2.6.11",
@@ -30,12 +30,12 @@
     "date-fns": "^1.30.1",
     "ddp-rate-limiter-mixin": "^1.1.10",
     "discord.js": "^12.5.3",
-    "dompurify": "^2.3.4",
+    "dompurify": "^2.3.8",
     "ignore": "^5.2.0",
     "ignore-styles": "^5.0.1",
     "lodash": "^4.17.20",
-    "marked": "^4.0.10",
-    "meteor-node-stubs": "^1.1.0",
+    "marked": "^4.0.16",
+    "meteor-node-stubs": "^1.2.3",
     "minify-css-string": "^1.0.0",
     "moo": "^0.5.1",
     "nearley": "^2.19.1",
@@ -45,27 +45,27 @@
     "qrcode": "^1.5.0",
     "request": "^2.88.2",
     "sharp": "^0.30.4",
-    "simpl-schema": "^1.12.0",
+    "simpl-schema": "^1.12.2",
     "source-map-support": "^0.5.21",
     "speakingurl": "^14.0.1",
     "styles": "^0.2.1",
-    "underscore": "^1.13.2",
+    "underscore": "^1.13.4",
     "vue": "2.6.10",
     "vue-meteor-tracker": "^2.0.0-beta.5",
     "vue-reactive-provide": "^0.3.0",
-    "vue-router": "^3.5.3",
+    "vue-router": "^3.5.4",
     "vuedraggable": "^2.23.2",
-    "vuetify": "^2.6.2",
+    "vuetify": "^2.6.6",
     "vuetify-upload-button": "^2.0.2",
     "vuex": "^3.1.3"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^7.20.0",
     "eslint-plugin-vuetify": "^1.1.0",
     "mem": "^6.1.1",
-    "sass": "^1.48.0"
+    "sass": "^1.52.2"
   },
   "eslintConfig": {
     "extends": [

From 385ac17812b88d9cb740f37b182c984eaa2c62d0 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 7 Jun 2022 21:43:35 +0200
Subject: [PATCH 21/56] Added big slot cards to build tab, improved build tab

---
 .../creatures/methods/restCreature.js         |   4 +-
 app/imports/api/engine/computeCreature.js     |   2 +-
 app/imports/api/engine/loadCreatures.js       |   4 +-
 app/imports/ui/components/CardHighlight.vue   |   2 +-
 .../ui/creature/buildTree/BuildTreeNode.vue   |  23 ++-
 .../ui/creature/buildTree/FillSlotButton.vue  |   2 +-
 .../character/characterSheetTabs/BuildTab.vue |  65 ++++---
 .../characterSheetTabs/JournalTab.vue         |   2 -
 app/imports/ui/creature/slots/SlotCard.vue    |  70 ++++++++
 .../ui/creature/slots/SlotCardsToFill.vue     | 104 ++++++++++++
 .../ui/creature/slots/SlotDetailsDialog.vue   |  36 ----
 app/imports/ui/creature/slots/Slots.vue       | 160 ------------------
 .../ui/dialogStack/DialogComponentIndex.js    |   2 -
 13 files changed, 228 insertions(+), 248 deletions(-)
 create mode 100644 app/imports/ui/creature/slots/SlotCard.vue
 create mode 100644 app/imports/ui/creature/slots/SlotCardsToFill.vue
 delete mode 100644 app/imports/ui/creature/slots/SlotDetailsDialog.vue
 delete mode 100644 app/imports/ui/creature/slots/Slots.vue

diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index c75e3cd8..0115db52 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -44,8 +44,8 @@ const restCreature = new ValidatedMethod({
     let filter = {
       'ancestors.id': creatureId,
       reset: resetFilter,
-      removed: {$ne: true},
-      inactive: {$ne: true},
+      removed: { $ne: true },
+      inactive: { $ne: true },
     };
     // update all attribute's damage
     filter.type = 'attribute';
diff --git a/app/imports/api/engine/computeCreature.js b/app/imports/api/engine/computeCreature.js
index 7bc1a953..c1de8c44 100644
--- a/app/imports/api/engine/computeCreature.js
+++ b/app/imports/api/engine/computeCreature.js
@@ -6,7 +6,7 @@ import writeErrors from './computation/writeComputation/writeErrors.js';
 
 export default function computeCreature(creatureId){
   if (Meteor.isClient) return;
-  console.log('compute')
+  // console.log('compute ' + creatureId);
   const computation = buildCreatureComputation(creatureId);
   computeComputation(computation, creatureId);
 }
diff --git a/app/imports/api/engine/loadCreatures.js b/app/imports/api/engine/loadCreatures.js
index 0a60250b..c6021b22 100644
--- a/app/imports/api/engine/loadCreatures.js
+++ b/app/imports/api/engine/loadCreatures.js
@@ -2,6 +2,8 @@ import { debounce } from 'lodash';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import computeCreature from './computeCreature';
+
+const COMPUTE_DEBOUNCE_TIME = 100; // ms
 export const loadedCreatures = new Map(); // creatureId => {creature, properties, etc.}
 
 export function loadCreature(creatureId, subscription) {
@@ -40,7 +42,7 @@ class LoadedCreature {
 
       const compute = debounce(Meteor.bindEnvironment(() => {
         computeCreature(creatureId);
-      }), 100);
+      }), COMPUTE_DEBOUNCE_TIME);
 
       self.properties = new Map();
       // Observe all creature properties which are needed for computation
diff --git a/app/imports/ui/components/CardHighlight.vue b/app/imports/ui/components/CardHighlight.vue
index 42a25fcc..714cdb28 100644
--- a/app/imports/ui/components/CardHighlight.vue
+++ b/app/imports/ui/components/CardHighlight.vue
@@ -18,7 +18,7 @@
     props: {
       active: Boolean,
       dark: Boolean,
-    }
+    },
   }
 </script>
 
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNode.vue b/app/imports/ui/creature/buildTree/BuildTreeNode.vue
index 42e66f4f..45d4d07d 100644
--- a/app/imports/ui/creature/buildTree/BuildTreeNode.vue
+++ b/app/imports/ui/creature/buildTree/BuildTreeNode.vue
@@ -4,7 +4,7 @@
     :class="{
       'empty': !hasChildren,
     }"
-    :data-id="`tree-node-${node._id}`"
+    :data-id="`build-tree-node-${node._id}`"
   >
     <div
       class="layout align-center justify-start tree-node-title"
@@ -50,7 +50,6 @@
         <tree-node-view
           v-else
           :model="node"
-          :hide-icon="node.type === 'propertySlot'"
         />
         <template v-if="condenseChild">
           <span class="mr-4">:</span>
@@ -69,6 +68,7 @@
           <build-tree-node-list
             v-if="showExpanded"
             :children="computedChildren"
+            @selected="e => $emit('selected', e)"
           />
           <div v-else>
             <div
@@ -119,15 +119,22 @@
       },
 		},
 		data(){return {
-			expanded: this.node._descendantCanFill || (
-        this.node.type === 'propertySlot' &&
-        this. node.quantityExpected?.value === 0 ||
-        (this.node.quantityExpected?.value > 1 && this.node.spaceLeft > 0)
-      ),
+			expanded: false,
+      /* expand if there's a slot needing attention:
+        this.node._descendantCanFill || (
+          this.node.type === 'propertySlot' &&
+          this. node.quantityExpected?.value === 0 ||
+          (this.node.quantityExpected?.value > 1 && this.node.spaceLeft > 0)
+        )
+      */
 		}},
 		computed: {
       condenseChild(){
-        return this.node.type === 'propertySlot' && this.children.length === 1;
+        return this.node.type === 'propertySlot' &&
+        this.children.length === 1 &&
+        this.children[0].node.type !== 'propertySlot' &&
+        this.node.quantityExpected &&
+        this.node.quantityExpected.value === 1;
       },
       isSlot(){
         return this.node.type === 'propertySlot';
diff --git a/app/imports/ui/creature/buildTree/FillSlotButton.vue b/app/imports/ui/creature/buildTree/FillSlotButton.vue
index 0718f64c..a0f03233 100644
--- a/app/imports/ui/creature/buildTree/FillSlotButton.vue
+++ b/app/imports/ui/creature/buildTree/FillSlotButton.vue
@@ -4,7 +4,7 @@
     icon
     :data-id="`slot-add-button-${model._id}`"
     class="slot-add-button accent--text"
-    @click="fillSlot()"
+    @click.stop="fillSlot()"
   >
     <v-icon>mdi-plus</v-icon>
   </v-btn>
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index 7c0dd224..2aad0870 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -1,13 +1,30 @@
 <template lang="html">
   <v-container fluid>
     <v-row dense>
-      <v-col cols="12" md="8" lg="6" style="height: 100%;">
-        <v-card style="height: calc(100vh - 120px); overflow: auto;">
+      <v-col cols="12">
+        <slot-cards-to-fill :creature-id="creatureId" />
+      </v-col>
+    </v-row>
+    <v-row dense>
+      <v-col
+        cols="12"
+        md="8"
+        lg="6"
+      >
+        <v-card class="pb-4">
           <v-card-title>Slots</v-card-title>
-          <build-tree-node-list :children="slotBuildTree" />
+          <build-tree-node-list
+            :children="slotBuildTree"
+            class="mx-2"
+            @selected="_id => propertyClicked({_id, prefix: 'build-tree-node-'})"
+          />
         </v-card>
       </v-col>
-      <v-col cols="12" md="4" lg="6">
+      <v-col
+        cols="12"
+        md="4"
+        lg="6"
+      >
         <v-card class="class-details mb-2">
           <v-card-title
             v-if="creature.variables.level"
@@ -75,29 +92,6 @@
             </v-list-item>
           </v-list>
         </v-card>
-        <toolbar-card
-          data-id="slot-card"
-          @toolbarclick="showSlotDialog"
-        >
-          <template slot="toolbar">
-            <v-toolbar-title>
-              Build
-            </v-toolbar-title>
-            <v-spacer />
-            <v-toolbar-title>
-              <v-icon
-                small
-                style="width: 16px;"
-                class="mr-1"
-              >
-                mdi-pencil
-              </v-icon>
-            </v-toolbar-title>
-          </template>
-          <v-card-text style="background-color: inherit;">
-            <slots :creature-id="creatureId" />
-          </v-card-text>
-        </toolbar-card>
       </v-col>
     </v-row>
   </v-container>
@@ -106,11 +100,9 @@
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import Slots from '/imports/ui/creature/slots/Slots.vue';
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import  { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
+import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import BuildTreeNodeList from '/imports/ui/creature/buildTree/BuildTreeNodeList.vue';
+import SlotCardsToFill from '/imports/ui/creature/slots/SlotCardsToFill.vue';
 
 function traverse(tree, callback, parents = []){
   tree.forEach(node => {
@@ -121,10 +113,8 @@ function traverse(tree, callback, parents = []){
 
 export default {
   components: {
-    ColumnLayout,
-    Slots,
-    ToolbarCard,
     BuildTreeNodeList,
+    SlotCardsToFill,
   },
   props: {
     creatureId: {
@@ -214,6 +204,13 @@ export default {
     },
   },
   methods: {
+    propertyClicked({_id, prefix}){
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `${prefix}${_id}`,
+        data: {_id},
+      });
+    },
     addExperience(){
       this.$store.commit('pushDialogStack', {
         component: 'experience-insert-dialog',
diff --git a/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
index edbe0967..f37e7b5b 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -19,8 +19,6 @@
 <script lang="js">
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import Slots from '/imports/ui/creature/slots/Slots.vue';
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
 import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
 import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
diff --git a/app/imports/ui/creature/slots/SlotCard.vue b/app/imports/ui/creature/slots/SlotCard.vue
new file mode 100644
index 00000000..704ddfe5
--- /dev/null
+++ b/app/imports/ui/creature/slots/SlotCard.vue
@@ -0,0 +1,70 @@
+<template>
+  <v-card
+    v-if="model"
+    v-bind="$attrs"
+    :data-id="`slot-card-${model._id}`"
+    :style="`border: solid 1px ${accentColor};`"
+    hover
+    class="slot-card d-flex flex-column"
+    style="max-width: 400px;"
+    @mouseover="hover = true"
+    @mouseleave="hover = false"
+    @click="$emit('click')"
+  >
+    <card-highlight 
+      :active="hover"
+    />
+    <v-card-title>
+      {{ model.name }}
+    </v-card-title>
+    <v-card-text v-if="model.description">
+      {{ model.description.value }}
+    </v-card-text>
+    <v-spacer />
+    <v-card-actions>
+      <v-spacer />
+      <v-btn
+        text
+        color="primary"
+        @click.stop="$emit('ignore')"
+      >
+        Skip
+      </v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script lang="js">
+import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+
+export default {
+  components: {
+    CardHighlight,
+  },
+  inject: {
+    theme: {
+      default: {
+        isDark: false,
+      },
+    },
+  },
+  props: {
+    model: {
+      type: Object,
+      default: undefined,
+    },
+  },
+  data(){ return {
+    hover: false,
+  }},
+  computed: {
+    accentColor(){
+      if (this.theme.isDark){
+        return this.$vuetify.theme.themes.dark.primary;
+      } else {
+        return this.$vuetify.theme.themes.light.primary;
+      }
+    }
+  },
+}
+</script>
diff --git a/app/imports/ui/creature/slots/SlotCardsToFill.vue b/app/imports/ui/creature/slots/SlotCardsToFill.vue
new file mode 100644
index 00000000..88d3e816
--- /dev/null
+++ b/app/imports/ui/creature/slots/SlotCardsToFill.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="slots-to-fill">
+    <v-slide-y-transition
+      group
+      class="d-flex flex-row flex-wrap"
+    >
+      <slot-card
+        v-for="slot in slots"
+        :key="slot._id"
+        :model="slot"
+        class="ma-1"
+        hover
+        @ignore="ignoreSlot(slot._id)"
+        @click="fillSlot(slot._id)"
+      />
+    </v-slide-y-transition>
+  </div>
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import SlotCard from '/imports/ui/creature/slots/SlotCard.vue';
+import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
+import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+
+export default {
+  components: {
+    SlotCard,
+  },
+  inject: {
+    context: { default: {} }
+  },
+  methods: {
+    ignoreSlot(_id){
+      updateCreatureProperty.call({
+        _id,
+        path: ['ignored'],
+        value: true
+      }, error => {
+        if (error){
+          console.error(error);
+          snackbar(error);
+        }
+      });
+    },
+    fillSlot(slotId){
+      this.$store.commit('pushDialogStack', {
+        component: 'slot-fill-dialog',
+        elementId: `slot-card-${slotId}`,
+        data: {
+          slotId,
+          creatureId: this.context.creatureId,
+        },
+        callback(nodeIds){
+          if (!nodeIds || !nodeIds.length) return;
+          let newPropertyId = insertPropertyFromLibraryNode.call({
+            nodeIds,
+            parentRef: {
+              'id': slotId,
+              'collection': 'creatureProperties',
+            },
+          }, error => {
+            if (error){
+              console.error(error);
+              snackbar(error);
+            }
+          });
+          return `slot-child-${newPropertyId}`;
+        }
+      });
+    },
+  },
+  meteor: {
+    slots(){
+      return CreatureProperties.find({
+        type: 'propertySlot',
+        'ancestors.id': this.context.creatureId,
+        ignored: { $ne: true },
+        $and: [
+          { 
+            $or: [
+              {'slotCondition.value': {$nin: [false, 0, '']}},
+              {'slotCondition.value': {$exists: false}},
+            ]
+          },{
+            $or: [
+              { quantityExpected: {exists: false} },
+              { 'quantityExpected.value': 0 },
+              {spaceLeft: {$gt: 0}},
+            ]
+          },
+        ],        
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      });
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/app/imports/ui/creature/slots/SlotDetailsDialog.vue b/app/imports/ui/creature/slots/SlotDetailsDialog.vue
deleted file mode 100644
index c8a14aff..00000000
--- a/app/imports/ui/creature/slots/SlotDetailsDialog.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template lang="html">
-  <dialog-base>
-    <v-toolbar-title slot="toolbar">
-      Build
-    </v-toolbar-title>
-    <slots
-      :creature-id="creatureId"
-      show-hidden-slots
-    />
-  </dialog-base>
-</template>
-
-<script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import Slots from '/imports/ui/creature/slots/Slots.vue'
-
-export default {
-  components: {
-    DialogBase,
-    Slots,
-  },
-  props: {
-    creatureId: {
-      type: String,
-      required: true,
-    },
-  },
-  reactiveProvide: {
-    name: 'context',
-    include: ['creatureId'],
-  },
-}
-</script>
-
-<style lang="css" scoped>
-</style>
diff --git a/app/imports/ui/creature/slots/Slots.vue b/app/imports/ui/creature/slots/Slots.vue
deleted file mode 100644
index cf5570d9..00000000
--- a/app/imports/ui/creature/slots/Slots.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template lang="html">
-  <div class="slots">
-    <div
-      v-for="slot in slots"
-      :key="slot._id"
-      class="slot"
-    >
-      <h3 class="layout align-center">
-        {{ slot.name }}
-        <v-spacer />
-        <span v-if="slot.quantityExpected && slot.quantityExpected.value > 1">
-          {{ slot.totalFilled }} / {{ slot.quantityExpected.value }}
-        </span>
-      </h3>
-      <v-list v-if="slot.children.length">
-        <v-list-item
-          v-for="child in slot.children"
-          :key="child._id"
-          :data-id="`slot-child-${child._id}`"
-          @click="clickSlotChild(child)"
-        >
-          <v-list-item-content>
-            <tree-node-view
-              class="slotChild"
-              :model="child"
-            />
-          </v-list-item-content>
-          <v-list-item-action>
-            <v-btn
-              icon
-              small
-              @click.stop="remove(child)"
-            >
-              <v-icon>mdi-delete</v-icon>
-            </v-btn>
-          </v-list-item-action>
-        </v-list-item>
-      </v-list>
-      <v-btn
-        v-if="!slot.quantityExpected || !slot.quantityExpected.value || slot.spaceLeft"
-        icon
-        :data-id="`slot-add-button-${slot._id}`"
-        class="slot-add-button"
-        style="background-color: inherit;"
-        @click="fillSlot(slot)"
-      >
-        <v-icon>mdi-plus</v-icon>
-      </v-btn>
-    </div>
-  </div>
-</template>
-
-<script lang="js">
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
-import restoreProperty from '/imports/api/creature/creatureProperties/methods/restoreProperty.js';
-import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
-import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-
-export default {
-  components: {
-    TreeNodeView,
-  },
-  props: {
-    creatureId: {
-      type: String,
-      required: true,
-    },
-    showHiddenSlots: {
-      type: Boolean,
-    },
-  },
-  methods: {
-    clickSlotChild({_id}){
-			this.$store.commit('pushDialogStack', {
-				component: 'creature-property-dialog',
-				elementId: `slot-child-${_id}`,
-				data: {_id},
-			});
-    },
-    fillSlot(slot){
-      let slotId = slot._id;
-      let creatureId = this.creatureId;
-      this.$store.commit('pushDialogStack', {
-        component: 'slot-fill-dialog',
-        elementId: `slot-add-button-${slotId}`,
-        data: {
-          slotId,
-          creatureId,
-        },
-        callback(nodeIds){
-          if (!nodeIds || !nodeIds.length) return;
-          let newPropertyId = insertPropertyFromLibraryNode.call({
-            nodeIds,
-            parentRef: {
-              'id': slotId,
-              'collection': 'creatureProperties',
-            },
-          });
-          return `slot-child-${newPropertyId}`;
-				}
-      });
-    },
-    remove(model){
-      softRemoveProperty.call({_id: model._id});
-      snackbar({
-        text: `Deleted ${getPropertyTitle(model)}`,
-        callbackName: 'undo',
-        callback(){
-          restoreProperty.call({_id: model._id});
-        },
-      });
-    }
-  },
-  meteor: {
-    slots(){
-      return CreatureProperties.find({
-        'ancestors.id': this.creatureId,
-        type: 'propertySlot',
-        $or: [
-          {'slotCondition.value': {$nin: [false, 0, '']}},
-          {'slotCondition.value': {$exists: false}},
-        ],
-        removed: {$ne: true},
-        inactive: {$ne: true},
-      }, {
-        sort: {order: 1}
-      }).map(slot => {
-        if (
-          !this.showHiddenSlots &&
-          (slot.quantityExpected && slot.quantityExpected.value) === 0 &&
-          slot.hideWhenFull
-        ){
-          slot.children = []
-        } else {
-          slot.children = CreatureProperties.find({
-            'parent.id': slot._id,
-            removed: {$ne: true},
-          }, {
-            sort: { order: 1 },
-          }).fetch();
-        }
-        return slot;
-      }).filter(slot => !( // Hide full and ignored slots
-        !this.showHiddenSlots && (
-          slot.hideWhenFull &&
-          (slot.quantityExpected && slot.quantityExpected.value) > 0 &&
-          slot.spaceLeft <= 0 ||
-          slot.ignored
-        )
-      ));
-    },
-  },
-}
-</script>
-
-<style lang="css" scoped>
-</style>
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 7c32d4b9..4f0f96e0 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -18,7 +18,6 @@ const MoveLibraryNodeDialog = () => import('/imports/ui/library/MoveLibraryNodeD
 const SelectCreaturesDialog = () => import('/imports/ui/tabletop/SelectCreaturesDialog.vue');
 const SelectLibraryNodeDialog = () => import('/imports/ui/library/SelectLibraryNodeDialog.vue');
 const ShareDialog = () => import('/imports/ui/sharing/ShareDialog.vue');
-const SlotDetailsDialog = () => import('/imports/ui/creature/slots/SlotDetailsDialog.vue');
 const SlotFillDialog = () => import('/imports/ui/creature/slots/SlotFillDialog.vue');
 const TierTooLowDialog = () => import('/imports/ui/user/TierTooLowDialog.vue');
 const TransferOwnershipDialog = () => import('/imports/ui/sharing/TransferOwnershipDialog.vue');
@@ -45,7 +44,6 @@ export default {
   SelectCreaturesDialog,
   SelectLibraryNodeDialog,
   ShareDialog,
-  SlotDetailsDialog,
   SlotFillDialog,
   TierTooLowDialog,
   TransferOwnershipDialog,

From 28934baac9d277226264d07d1c0aa5c9a22dc9ac Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 7 Jun 2022 23:01:06 +0200
Subject: [PATCH 22/56] Implemented archive upload handling

---
 .../creature/archive/ArchiveCreatureFiles.js  | 39 +++++++++
 .../api/creature/archive/ArchivedCreatures.js | 57 -------------
 .../api/creature/archive/methods/index.js     |  2 -
 .../archive/methods/removeArchiveCreature.js  |  7 --
 .../methods/restoreCreatureFromFile.js        | 14 +++-
 .../archive/methods/restoreCreatures.js       | 77 -----------------
 .../writeComputation/writeScope.js            |  2 +-
 app/imports/api/files/s3FileStorage.js        |  6 +-
 app/imports/migrations/server/dbv1/dbv1.js    | 26 ------
 .../server/publications/archivedCreatures.js  | 19 -----
 app/imports/server/publications/index.js      |  1 -
 app/imports/ui/pages/Files.vue                | 84 ++++++++++++++++++-
 app/server/main.js                            |  1 +
 13 files changed, 139 insertions(+), 196 deletions(-)
 delete mode 100644 app/imports/api/creature/archive/ArchivedCreatures.js
 delete mode 100644 app/imports/api/creature/archive/methods/restoreCreatures.js
 delete mode 100644 app/imports/server/publications/archivedCreatures.js

diff --git a/app/imports/api/creature/archive/ArchiveCreatureFiles.js b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
index 99f4f7f2..22d5080e 100644
--- a/app/imports/api/creature/archive/ArchiveCreatureFiles.js
+++ b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
@@ -1,4 +1,6 @@
 import { createS3FilesCollection } from '/imports/api/files/s3FileStorage.js';
+import SimpleSchema from 'simpl-schema';
+import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
 
 const ArchiveCreatureFiles = createS3FilesCollection({
   collectionName: 'archiveCreatureFiles',
@@ -11,7 +13,44 @@ const ArchiveCreatureFiles = createS3FilesCollection({
     if (!/json/i.test(file.extension)){
       return 'Please upload only a JSON file';
     }
+    return true;
+  },
+  onAfterUpload(file) {
+    incrementFileStorageUsed(file.userId, file.size);
   }
 });
 
+let archiveSchema = new SimpleSchema({
+  meta: {
+    type: Object,
+    blackbox: true,
+  },
+  creature: {
+    type: Object,
+    blackbox: true,
+  },
+  properties: {
+    type: Array,
+  },
+  'properties.$': {
+    type: Object,
+    blackbox: true,
+  },
+  experiences: {
+    type: Array,
+  },
+  'experiences.$': {
+    type: Object,
+    blackbox: true,
+  },
+  logs: {
+    type: Array,
+  },
+  'logs.$': {
+    type: Object,
+    blackbox: true,
+  },
+});
+
 export default ArchiveCreatureFiles;
+export { archiveSchema };
diff --git a/app/imports/api/creature/archive/ArchivedCreatures.js b/app/imports/api/creature/archive/ArchivedCreatures.js
deleted file mode 100644
index 4a572482..00000000
--- a/app/imports/api/creature/archive/ArchivedCreatures.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-
-// Archived creatures is an immutable collection of creatures that are no longer
-// in use and can be safely archived by the mongoDB hosting service.
-// It keeps the working datasets like creatureProperties much smaller
-// than they would otherwise be.
-let ArchivedCreatures = new Mongo.Collection('archivedCreatures');
-
-// We use blackbox objects for everything:
-// - saves time checking every object against a schema
-// - doesn't accidentaly create indices defined in subschemas
-// - The objects we are archiving have already been checked against their
-//   own schemas
-let ArchivedCreatureSchema = new SimpleSchema({
-  owner: {
-		type: String,
-		regEx: SimpleSchema.RegEx.Id,
-    // The primary index on this collection
-		index: 1,
-	},
-  archiveDate: {
-    type: Date,
-    // Indexed so the archiving system can archive documents when they
-    // get to a certain age
-    index: 1,
-  },
-	creature: {
-    type: Object,
-    blackbox: true,
-  },
-  properties: {
-    type: Array,
-  },
-  'properties.$': {
-    type: Object,
-    blackbox: true,
-  },
-  experiences: {
-    type: Array,
-  },
-  'experiences.$': {
-    type: Object,
-    blackbox: true,
-  },
-  logs: {
-    type: Array,
-  },
-  'logs.$': {
-    type: Object,
-    blackbox: true,
-  },
-});
-
-ArchivedCreatures.attachSchema(ArchivedCreatureSchema);
-
-import '/imports/api/creature/archive/methods/index.js';
-export default ArchivedCreatures;
diff --git a/app/imports/api/creature/archive/methods/index.js b/app/imports/api/creature/archive/methods/index.js
index f2c61b6d..491ba038 100644
--- a/app/imports/api/creature/archive/methods/index.js
+++ b/app/imports/api/creature/archive/methods/index.js
@@ -1,5 +1,3 @@
-// import '/imports/api/creature/archive/methods/archiveCreatures.js';
 import '/imports/api/creature/archive/methods/archiveCreatureToFile.js';
-import '/imports/api/creature/archive/methods/restoreCreatures.js';
 import '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
 import '/imports/api/creature/archive/methods/removeArchiveCreature.js';
diff --git a/app/imports/api/creature/archive/methods/removeArchiveCreature.js b/app/imports/api/creature/archive/methods/removeArchiveCreature.js
index 22bf858d..f4ba608b 100644
--- a/app/imports/api/creature/archive/methods/removeArchiveCreature.js
+++ b/app/imports/api/creature/archive/methods/removeArchiveCreature.js
@@ -1,14 +1,7 @@
-import SCHEMA_VERSION from '/imports/constants/SCHEMA_VERSION.js';
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
-import Experiences from '/imports/api/creature/experience/Experiences.js';
-import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
-import assertHasCharactersSlots from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
 
 const removeArchiveCreature = new ValidatedMethod({
diff --git a/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js b/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
index 9130390a..1c0feff9 100644
--- a/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
+++ b/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
@@ -16,7 +16,7 @@ if (Meteor.isServer){
   migrateArchive = require('/imports/migrations/server/migrateArchive.js').default;
 }
 
-function restoreCreature(archive){
+function restoreCreature(archive, userId){
   if (SCHEMA_VERSION < archive.meta.schemaVersion){
     throw new Meteor.Error('Incompatible',
       'The archive file is from a newer version. Update required to read.')
@@ -25,6 +25,16 @@ function restoreCreature(archive){
   // Migrate and verify the archive meets the current schema
   migrateArchive(archive);
 
+  // Don't upload creatures twice
+  const existingCreature = Creatures.findOne(archive.creature._id, {
+    fields: { _id: 1 }
+  });
+  if (existingCreature) throw new Meteor.Error('Already exists',
+    'The creature you are trying to restore already exists.')
+  
+  // Ensure the user owns the restored creature
+  archive.creature.owner = userId;
+
   // Insert the creature sub documents
   // They still have their original _id's
   Creatures.insert(archive.creature);
@@ -78,7 +88,7 @@ const restoreCreaturefromFile = new ValidatedMethod({
     if (Meteor.isServer){
       // Read the file data
       const archive = await ArchiveCreatureFiles.readJSONFile(file);
-      restoreCreature(archive);
+      restoreCreature(archive, this.userId);
     }
     //Remove the archive once the restore succeeded
     ArchiveCreatureFiles.remove({ _id: fileId });
diff --git a/app/imports/api/creature/archive/methods/restoreCreatures.js b/app/imports/api/creature/archive/methods/restoreCreatures.js
deleted file mode 100644
index 5da270e7..00000000
--- a/app/imports/api/creature/archive/methods/restoreCreatures.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import { assertOwnership } from '/imports/api/sharing/sharingPermissions.js';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
-import Experiences from '/imports/api/creature/experience/Experiences.js';
-import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
-import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
-
-export function restoreCreature(archiveId){
-  // Get the archive
-  const archivedCreature = ArchivedCreatures.findOne(archiveId);
-
-  // Insert the creature sub documents
-  // They still have their original _id's
-  Creatures.insert(archivedCreature.creature);
-  try {
-    // Add all the properties
-    if (archivedCreature.properties && archivedCreature.properties.length){
-      CreatureProperties.batchInsert(archivedCreature.properties);
-    }
-    if (archivedCreature.experiences && archivedCreature.experiences.length){
-      Experiences.batchInsert(archivedCreature.experiences);
-    }
-    if (archivedCreature.logs && archivedCreature.logs.length){
-      CreatureLogs.batchInsert(archivedCreature.logs);
-    }
-    // Remove the archived creature
-    ArchivedCreatures.remove(archiveId);
-  } catch (e) {
-    // If the above fails, delete the inserted creature
-    removeCreatureWork(archivedCreature.creature._id);
-    throw e;
-  }
-
-  // Do not recompute. The creature was in a computed and ordered state when
-  // we archived it, just restore everything as-is
-
-  return archivedCreature.creature._id;
-}
-
-const restoreCreatures = new ValidatedMethod({
-  name: 'Creatures.methods.restoreCreatures',
-  validate: new SimpleSchema({
-    archiveIds: {
-      type: Array,
-      max: 10,
-    },
-    'archiveIds.$': {
-      type: String,
-      regEx: SimpleSchema.RegEx.Id,
-    },
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 1,
-    timeInterval: 5000,
-  },
-  run({archiveIds}) {
-    for (let id of archiveIds){
-      let archivedCreature = ArchivedCreatures.findOne(id, {
-        fields: {owner: 1}
-      });
-      assertOwnership(archivedCreature, this.userId)
-    }
-    let creatureIds = [];
-    for (let id of archiveIds){
-      let creatureId = restoreCreature(id);
-      creatureIds.push(creatureId);
-    }
-    return creatureIds;
-  },
-});
-
-export default restoreCreatures;
diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index abee4290..6d0aecbc 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -3,7 +3,7 @@ import { EJSON } from 'meteor/ejson';
 
 export default function writeScope(creatureId, computation) {
   const scope = computation.scope;
-  const variables = computation.creature.variables || {};
+  const variables = computation.creature?.variables || {};
   let $set;
   for (const key in scope){
     // Remove large properties that aren't likely to be accessed
diff --git a/app/imports/api/files/s3FileStorage.js b/app/imports/api/files/s3FileStorage.js
index affdf9db..c23bf198 100644
--- a/app/imports/api/files/s3FileStorage.js
+++ b/app/imports/api/files/s3FileStorage.js
@@ -57,7 +57,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
       onBeforeUpload,
       onAfterUpload(fileRef) {
         // Call the provided afterUpload hook first
-        onAfterUpload(fileRef);
+        onAfterUpload?.(fileRef);
         
         // Start moving files to AWS:S3
         // after fully received by the Meteor server
@@ -221,6 +221,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     collectionName,
     storagePath,
     onBeforeUpload,
+    onAfterUpload,
     debug = Meteor.isProduction,
     allowClientCode = false,
   }){
@@ -228,11 +229,12 @@ if (Meteor.isServer && Meteor.settings.useS3) {
       collectionName,
       storagePath,
       onBeforeUpload,
+      onAfterUpload,
       debug,
       allowClientCode,
     });
 
-    if (Meteor.isServer){
+    if (Meteor.isServer) {
       // Use the normal file system to read files
       collection.readJSONFile = async function(file){
         const fileString = await fsp.readFile(file.path, 'utf8');
diff --git a/app/imports/migrations/server/dbv1/dbv1.js b/app/imports/migrations/server/dbv1/dbv1.js
index b265cd9d..8ecfef81 100644
--- a/app/imports/migrations/server/dbv1/dbv1.js
+++ b/app/imports/migrations/server/dbv1/dbv1.js
@@ -1,9 +1,6 @@
 import { Migrations } from 'meteor/percolate:migrations';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
-import { restoreCreature } from '/imports/api/creature/archive/methods/restoreCreatures.js';
-import { archiveCreature } from '/imports/api/creature/archive/methods/archiveCreatureToFile.js';
 import transformFields from '/imports/migrations/server/transformFields.js';
 import SCHEMA_VERSION from '/imports/constants/SCHEMA_VERSION.js';
 import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
@@ -22,34 +19,11 @@ Migrations.add({
 });
 
 function migrate({reversed} = {}){
-  console.log('restoring all characters from database archive');
-  const restoredIds = restoreAllCreatures();
-
   console.log('migrating creature properties');
   migrateCollection({collection: CreatureProperties, reversed});
 
   console.log('migrating library nodes')
   migrateCollection({collection: LibraryNodes, reversed});
-
-  console.log('archiving characters to file system archive');
-  rearchiveAllCreatures(restoredIds);
-}
-
-function restoreAllCreatures(){
-  const ids = [];
-  ArchivedCreatures.find({}, {
-    fields: {_id: 1}
-  }).forEach(archive => {
-    const id = restoreCreature(archive._id);
-    ids.push(id);
-  });
-  return ids;
-}
-
-function rearchiveAllCreatures(ids){
-  ids.forEach(id => {
-    archiveCreature(id);
-  });
 }
 
 function migrateCollection({collection, reversed}){
diff --git a/app/imports/server/publications/archivedCreatures.js b/app/imports/server/publications/archivedCreatures.js
deleted file mode 100644
index 93043407..00000000
--- a/app/imports/server/publications/archivedCreatures.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import ArchivedCreatures from '/imports/api/creature/archive/ArchivedCreatures.js';
-
-Meteor.publish('archivedCreatures', function(){
-  this.autorun(function (){
-    var userId = this.userId;
-    if (!userId) {
-      return [];
-    }
-    return ArchivedCreatures.find({
-        owner: userId,
-      }, {
-        fields: {
-          creature: 1,
-          owner: 1,
-        }
-      }
-    );
-  });
-});
diff --git a/app/imports/server/publications/index.js b/app/imports/server/publications/index.js
index ce8385af..eba626eb 100644
--- a/app/imports/server/publications/index.js
+++ b/app/imports/server/publications/index.js
@@ -8,7 +8,6 @@ import '/imports/server/publications/icons.js';
 import '/imports/server/publications/tabletops.js';
 import '/imports/server/publications/slotFillers.js';
 import '/imports/server/publications/ownedDocuments.js';
-import '/imports/server/publications/archivedCreatures.js';
 import '/imports/server/publications/searchLibraryNodes.js';
 import '/imports/server/publications/archiveFiles.js';
 import '/imports/server/publications/userImages.js';
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index 050b6064..cfe449f5 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -41,7 +41,7 @@
         >
         <v-btn
           outlined
-          style="height: 100%; width: 100%;"
+          style="height: 100%; width: 100%; min-height: 120px;"
           :color="archiveFileError ? 'error' : undefined"
           @click="$refs.archiveFileInput.click()"
         >
@@ -54,9 +54,15 @@
           <template v-else>
             Upload archive
           </template>
+          <v-progress-linear
+            v-if="archiveUploadInProgress"
+            :progress="archiveUploadProgress"
+            :indeterminate="archiveUploadIndeterminate"
+          />
         </v-btn>
       </v-col>
     </v-row>
+    <!--
     <v-row dense>
       <v-col cols="12">
         <v-subheader> Images </v-subheader>
@@ -86,6 +92,7 @@
         <image-upload-input />
       </v-col>
     </v-row>
+    -->
   </v-container>
 </template>
 
@@ -97,6 +104,8 @@ import ArchiveFileCard from '/imports/ui/files/ArchiveFileCard.vue';
 import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
 import ImageUploadInput from '/imports/ui/components/ImageUploadInput.vue';
 import UserImageCard from '/imports/ui/files/UserImageCard.vue';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { archiveSchema } from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 
 export default {
   components: {
@@ -109,6 +118,9 @@ export default {
     updateStorageUsedLoading: false,
     archiveFileError: undefined,
     archiveFile: undefined,
+    archiveUploadInProgress: false,
+    archiveUploadProgress: undefined,
+    archiveUploadIndeterminate: false,
   }},
   meteor: {
     $subscribe: {
@@ -160,7 +172,75 @@ export default {
         return;
       }
       this.archiveFile = file;
-      console.log(this.archiveFile);
+      this.archiveUploadIndeterminate = true;
+
+      const fr = new FileReader();
+      const self = this;
+
+      fr.addEventListener('load', () => {
+        let data;
+        try {
+          data = JSON.parse(fr.result);
+        } catch (e){
+          self.archiveFileError = 'File could not be parsed';
+        }
+        console.log(data);
+        try {
+          archiveSchema.validate(data);
+        } catch (e){
+          self.archiveFileError = e.reason || e.message || e.toString();
+        }
+
+        let uploadInstance = ArchiveCreatureFiles.insert({
+          file: file,
+          meta: {
+            creatureName: data?.creature?.name,
+            userId: Meteor.userId()
+          },
+          chunkSize: 'dynamic',
+          allowWebWorkers: true // If you see issues with uploads, change this to false
+        }, false)
+
+        // These are the event functions, don't need most of them, it shows where we are in the process
+        uploadInstance.on('start', function () {
+          console.log('Starting');
+          self.archiveUploadIndeterminate = false;
+          self.archiveUploadInProgress = true;
+        });
+
+        uploadInstance.on('end', function (error, fileObj) {
+          console.log('On end File Object: ', fileObj);
+          self.archiveUploadInProgress = false;
+        });
+
+        uploadInstance.on('uploaded', function (error, fileObj) {
+          console.log('uploaded: ', fileObj);
+
+          // Remove the file from the input box
+          self.file = undefined;
+
+          // Reset our state for the next file
+          self.archiveUploadInProgress = false;
+          self.archiveUploadProgress = 0;
+        });
+
+        uploadInstance.on('error', function (error, fileObj) {
+          console.log('Error during upload: ' + error, fileObj)
+          const text = error.reason || error.message || error;
+          snackbar({text});
+          self.archiveFileError = text;
+        });
+
+        uploadInstance.on('progress', function (progress, fileObj) {
+          console.log('Upload Percentage: ' + progress, fileObj)
+          // Update our progress bar
+          self.archiveUploadProgress = progress;
+        });
+
+        uploadInstance.start(); // Must manually start the upload
+      });
+
+      fr.readAsText(file);
     }
   },
 }
diff --git a/app/server/main.js b/app/server/main.js
index 1982276f..31140ade 100644
--- a/app/server/main.js
+++ b/app/server/main.js
@@ -14,4 +14,5 @@ import '/imports/migrations/server/index.js';
 import '/imports/migrations/methods/index.js'
 import '/imports/constants/MAINTENANCE_MODE.js';
 import '/imports/api/creature/creatureProperties/methods/index.js';
+import '/imports/api/creature/archive/methods/index.js';
 

From e7e8f938ed483bf092590c5dca781a2e8dc6cfc3 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 7 Jun 2022 23:21:48 +0200
Subject: [PATCH 23/56] Improved archive storage calculations and errors

---
 .../creature/archive/ArchiveCreatureFiles.js   | 14 +++++---------
 .../archive/methods/archiveCreatureToFile.js   |  6 ++----
 app/imports/ui/pages/Files.vue                 | 18 +++++++++++++++---
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/imports/api/creature/archive/ArchiveCreatureFiles.js b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
index 22d5080e..1b699c0b 100644
--- a/app/imports/api/creature/archive/ArchiveCreatureFiles.js
+++ b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
@@ -1,6 +1,8 @@
 import { createS3FilesCollection } from '/imports/api/files/s3FileStorage.js';
 import SimpleSchema from 'simpl-schema';
 import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
+import { CreaturePropertySchema } from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { CreatureSchema } from '/imports/api/creature/creatures/Creatures.js';
 
 const ArchiveCreatureFiles = createS3FilesCollection({
   collectionName: 'archiveCreatureFiles',
@@ -16,7 +18,7 @@ const ArchiveCreatureFiles = createS3FilesCollection({
     return true;
   },
   onAfterUpload(file) {
-    incrementFileStorageUsed(file.userId, file.size);
+    if (Meteor.isServer) incrementFileStorageUsed(file.userId, file.size);
   }
 });
 
@@ -25,17 +27,11 @@ let archiveSchema = new SimpleSchema({
     type: Object,
     blackbox: true,
   },
-  creature: {
-    type: Object,
-    blackbox: true,
-  },
+  creature: CreatureSchema,
   properties: {
     type: Array,
   },
-  'properties.$': {
-    type: Object,
-    blackbox: true,
-  },
+  'properties.$': CreaturePropertySchema,
   experiences: {
     type: Array,
   },
diff --git a/app/imports/api/creature/archive/methods/archiveCreatureToFile.js b/app/imports/api/creature/archive/methods/archiveCreatureToFile.js
index 308eaccb..92b6f3bd 100644
--- a/app/imports/api/creature/archive/methods/archiveCreatureToFile.js
+++ b/app/imports/api/creature/archive/methods/archiveCreatureToFile.js
@@ -9,7 +9,6 @@ import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
 import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
-import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
 
 export function getArchiveObj(creatureId){
   // Build the archive document
@@ -32,7 +31,7 @@ export function getArchiveObj(creatureId){
   return archiveCreature;
 }
 
-export function archiveCreature(creatureId, userId){
+export function archiveCreature(creatureId){
   const archive = getArchiveObj(creatureId);
   const buffer = Buffer.from(JSON.stringify(archive, null, 2));
   ArchiveCreatureFiles.write(buffer, {
@@ -44,12 +43,11 @@ export function archiveCreature(creatureId, userId){
       creatureId: archive.creature._id,
       creatureName: archive.creature.name,
     },
-  }, (error, file) => {
+  }, (error) => {
     if (error){
       throw error;
     } else {
       removeCreatureWork(creatureId);
-      incrementFileStorageUsed(userId, file.size);
     }
   }, true);
 }
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index cfe449f5..b30856e7 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -42,6 +42,7 @@
         <v-btn
           outlined
           style="height: 100%; width: 100%; min-height: 120px;"
+          class="archive-button"
           :color="archiveFileError ? 'error' : undefined"
           @click="$refs.archiveFileInput.click()"
         >
@@ -183,12 +184,16 @@ export default {
           data = JSON.parse(fr.result);
         } catch (e){
           self.archiveFileError = 'File could not be parsed';
+          console.error(e);
+          return;
         }
-        console.log(data);
+
         try {
-          archiveSchema.validate(data);
+          archiveSchema.validate(archiveSchema.clean(data));
         } catch (e){
-          self.archiveFileError = e.reason || e.message || e.toString();
+          self.archiveFileError = 'File failed validation: ' + (e.reason || e.message || e.toString());
+          console.error(e);
+          return;
         }
 
         let uploadInstance = ArchiveCreatureFiles.insert({
@@ -245,3 +250,10 @@ export default {
   },
 }
 </script>
+
+<style>
+  .v-btn.archive-button > .v-btn__content {
+    white-space: normal;
+    max-width: 100%;
+  }
+</style>

From 11f373ddd8da4bd5a005015518eb32794481f4b1 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 7 Jun 2022 23:27:14 +0200
Subject: [PATCH 24/56] Improved slotCard UI

---
 app/imports/ui/creature/slots/SlotCard.vue        | 6 +++---
 app/imports/ui/creature/slots/SlotCardsToFill.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/imports/ui/creature/slots/SlotCard.vue b/app/imports/ui/creature/slots/SlotCard.vue
index 704ddfe5..b282bfff 100644
--- a/app/imports/ui/creature/slots/SlotCard.vue
+++ b/app/imports/ui/creature/slots/SlotCard.vue
@@ -24,11 +24,11 @@
     <v-card-actions>
       <v-spacer />
       <v-btn
-        text
-        color="primary"
+        icon
+        color="accent"
         @click.stop="$emit('ignore')"
       >
-        Skip
+        <v-icon>mdi-close</v-icon>
       </v-btn>
     </v-card-actions>
   </v-card>
diff --git a/app/imports/ui/creature/slots/SlotCardsToFill.vue b/app/imports/ui/creature/slots/SlotCardsToFill.vue
index 88d3e816..506ebc20 100644
--- a/app/imports/ui/creature/slots/SlotCardsToFill.vue
+++ b/app/imports/ui/creature/slots/SlotCardsToFill.vue
@@ -40,7 +40,7 @@ export default {
       }, error => {
         if (error){
           console.error(error);
-          snackbar(error);
+          snackbar({text: error.reason || error.message || error.toString()});
         }
       });
     },
@@ -63,7 +63,7 @@ export default {
           }, error => {
             if (error){
               console.error(error);
-              snackbar(error);
+              snackbar({text: error.reason || error.message || error.toString()});
             }
           });
           return `slot-child-${newPropertyId}`;

From 9b1ec4606444547ef10d170e97f169e971ba74d6 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 8 Jun 2022 12:22:51 +0200
Subject: [PATCH 25/56] Added children properties to prop edit dialog

---
 .../ui/components/global/IconPicker.vue       | 46 +++++-----
 .../ui/creature/buildTree/FillSlotButton.vue  |  7 +-
 .../CreaturePropertyDialog.vue                | 66 ++++++++------
 .../ui/properties/forms/ActionForm.vue        |  8 +-
 .../ui/properties/forms/AdjustmentForm.vue    |  6 ++
 .../ui/properties/forms/AttackForm.vue        | 16 ----
 .../ui/properties/forms/AttributeForm.vue     |  4 +
 .../ui/properties/forms/BranchForm.vue        |  6 ++
 app/imports/ui/properties/forms/BuffForm.vue  |  6 ++
 .../ui/properties/forms/ClassLevelForm.vue    |  6 ++
 .../ui/properties/forms/ConstantForm.vue      |  6 ++
 .../ui/properties/forms/ContainerForm.vue     | 51 ++++++-----
 .../ui/properties/forms/DamageForm.vue        |  6 ++
 .../properties/forms/DamageMultiplierForm.vue |  3 +
 .../ui/properties/forms/EffectForm.vue        | 54 +++++++-----
 .../ui/properties/forms/FeatureForm.vue       |  6 ++
 .../ui/properties/forms/FolderForm.vue        | 34 ++++---
 app/imports/ui/properties/forms/ItemForm.vue  | 88 ++++++++++---------
 app/imports/ui/properties/forms/NoteForm.vue  |  6 ++
 .../ui/properties/forms/ProficiencyForm.vue   |  6 ++
 .../ui/properties/forms/ResourcesForm.vue     | 56 ++++++------
 app/imports/ui/properties/forms/RollForm.vue  |  4 +
 .../ui/properties/forms/SavingThrowForm.vue   |  6 ++
 .../ui/properties/forms/SlotFillerForm.vue    | 53 +++++++----
 app/imports/ui/properties/forms/SlotForm.vue  | 67 +++++++-------
 app/imports/ui/properties/forms/SpellForm.vue |  8 +-
 .../ui/properties/forms/SpellListForm.vue     |  7 ++
 .../ui/properties/forms/ToggleForm.vue        |  7 ++
 .../forms/shared/propertyFormIndex.js         |  2 -
 .../forms/shared/propertyFormMixin.js         |  3 +
 .../ui/properties/viewers/SlotViewer.vue      | 23 +++--
 31 files changed, 413 insertions(+), 254 deletions(-)
 delete mode 100644 app/imports/ui/properties/forms/AttackForm.vue

diff --git a/app/imports/ui/components/global/IconPicker.vue b/app/imports/ui/components/global/IconPicker.vue
index d7f3ed1a..9d7dbc2b 100644
--- a/app/imports/ui/components/global/IconPicker.vue
+++ b/app/imports/ui/components/global/IconPicker.vue
@@ -7,28 +7,28 @@
     style="overflow-y: auto;"
   >
     <template #activator="{ on }">
-      <div class="layout align-center">
-        <v-btn
-          :loading="loading"
-          outlined
-          :min-width="108"
-          v-on="on"
+      <v-btn
+        :loading="loading"
+        outlined
+        :min-width="108"
+        v-bind="$attrs"
+        :style="buttonStyle"
+        v-on="on"
+      >
+        {{ label }}
+        <svg-icon
+          v-if="safeValue && safeValue.shape"
+          right
+          class="ml-2"
+          :shape="safeValue.shape"
+        />
+        <v-icon
+          v-else
+          right
         >
-          {{ label }}
-          <svg-icon
-            v-if="safeValue && safeValue.shape"
-            right
-            class="ml-2"
-            :shape="safeValue.shape"
-          />
-          <v-icon
-            v-else
-            right
-          >
-            mdi-select-search
-          </v-icon>
-        </v-btn>
-      </div>
+          mdi-select-search
+        </v-icon>
+      </v-btn>
     </template>
     <v-card>
       <v-card-text>
@@ -91,6 +91,10 @@ export default {
     label: {
       type: String,
       default: 'Icon',
+    },
+    buttonStyle: {
+      type: String,
+      default: undefined,
     },
 	},
 	data(){return {
diff --git a/app/imports/ui/creature/buildTree/FillSlotButton.vue b/app/imports/ui/creature/buildTree/FillSlotButton.vue
index a0f03233..a871ed3b 100644
--- a/app/imports/ui/creature/buildTree/FillSlotButton.vue
+++ b/app/imports/ui/creature/buildTree/FillSlotButton.vue
@@ -1,12 +1,15 @@
 <template functional>
   <v-btn
     v-if="!model.quantityExpected || !model.quantityExpected.value || model.spaceLeft"
-    icon
+    :icon="!$slots.default"
+    v-bind="$attrs"
     :data-id="`slot-add-button-${model._id}`"
     class="slot-add-button accent--text"
     @click.stop="fillSlot()"
   >
-    <v-icon>mdi-plus</v-icon>
+    <slot>
+      <v-icon>mdi-plus</v-icon>
+    </slot>
   </v-btn>
 </template>
 
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index 64f684ff..f83a071c 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -17,19 +17,40 @@
       <v-fade-transition
         mode="out-in"
       >
-        <component
-          :is="model.type + 'Form'"
-          v-if="editing"
-          :key="_id"
-          class="creature-property-form"
-          :model="model"
-          @change="change"
-          @push="push"
-          @pull="pull"
-        />
-        <div
-          v-else-if="!editing && $options.components[model.type + 'Viewer']"
-        >
+        <div v-if="editing">
+          <component
+            :is="model.type + 'Form'"
+            :key="_id"
+            class="creature-property-form"
+            :model="model"
+            @change="change"
+            @push="push"
+            @pull="pull"
+          >
+            <template #children>
+              <creature-properties-tree
+                style="width: 100%;"
+                class="mb-2"
+                organize
+                :root="{collection: 'creatureProperties', id: model._id}"
+                @length="childrenLength = $event"
+                @selected="selectSubProperty"
+              />
+              <v-btn
+                icon
+                outlined
+                color="accent"
+                data-id="insert-creature-property-btn"
+                @click="addProperty"
+              >
+                <v-icon>
+                  mdi-plus
+                </v-icon>
+              </v-btn>
+            </template>
+          </component>
+        </div>
+        <div v-else>
           <div
             class="layout mb-4"
           >
@@ -65,9 +86,6 @@
             </property-field>
           </v-row>
         </div>
-        <p v-else>
-          This property can't be viewed yet.
-        </p>
       </v-fade-transition>
     </template>
     <div
@@ -75,17 +93,6 @@
       slot="actions"
       class="layout"
     >
-      <v-btn
-        v-if="!editing && !embedded"
-        text
-        data-id="insert-creature-property-btn"
-        @click="addProperty"
-      >
-        <v-icon left>
-          mdi-plus
-        </v-icon>
-        Child Property
-      </v-btn>
       <v-spacer />
       <v-btn
         text
@@ -256,7 +263,10 @@ export default {
       this.$store.commit('pushDialogStack', {
         component: 'creature-property-dialog',
         elementId: `tree-node-${_id}`,
-        data: {_id},
+        data: {
+          _id,
+          startInEditTab: this.editing,
+        },
       });
     },
     addProperty(){
diff --git a/app/imports/ui/properties/forms/ActionForm.vue b/app/imports/ui/properties/forms/ActionForm.vue
index 7e7431ed..41d00847 100644
--- a/app/imports/ui/properties/forms/ActionForm.vue
+++ b/app/imports/ui/properties/forms/ActionForm.vue
@@ -79,7 +79,10 @@
     />
 
     <form-sections>
-      <form-section name="Resources">
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+      <form-section name="Resources Consumed">
         <resources-form
           :model="model.resources"
           @change="({path, value, ack}) => $emit('change', {path: ['resources', ...path], value, ack})"
@@ -153,15 +156,12 @@
 </template>
 
 <script lang="js">
-  import FormSection, {FormSections} from '/imports/ui/properties/forms/shared/FormSection.vue';
   import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
   import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
   import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
 
   export default {
     components: {
-      FormSection,
-      FormSections,
       ResourcesForm,
       IconColorMenu,
     },
diff --git a/app/imports/ui/properties/forms/AdjustmentForm.vue b/app/imports/ui/properties/forms/AdjustmentForm.vue
index 19387a28..6f2b58ab 100644
--- a/app/imports/ui/properties/forms/AdjustmentForm.vue
+++ b/app/imports/ui/properties/forms/AdjustmentForm.vue
@@ -59,6 +59,12 @@
       :value="model.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/AttackForm.vue b/app/imports/ui/properties/forms/AttackForm.vue
deleted file mode 100644
index 7e0d6ba9..00000000
--- a/app/imports/ui/properties/forms/AttackForm.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template lang="html">
-  <action-form
-    attack-form
-    v-bind="$attrs"
-    v-on="$listeners"
-  />
-</template>
-
-<script lang="js">
-	import ActionForm from '/imports/ui/properties/forms/ActionForm.vue';
-	export default {
-		components: {
-			ActionForm,
-		},
-	};
-</script>
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index 5d23e2bf..d5473933 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -93,6 +93,10 @@
         </form-section>
       </v-expand-transition>
 
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+
       <form-section
         name="Advanced"
       >
diff --git a/app/imports/ui/properties/forms/BranchForm.vue b/app/imports/ui/properties/forms/BranchForm.vue
index 03e39587..1d6fe81c 100644
--- a/app/imports/ui/properties/forms/BranchForm.vue
+++ b/app/imports/ui/properties/forms/BranchForm.vue
@@ -38,6 +38,12 @@
       :value="model.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/BuffForm.vue b/app/imports/ui/properties/forms/BuffForm.vue
index f55f05b0..36630bfa 100644
--- a/app/imports/ui/properties/forms/BuffForm.vue
+++ b/app/imports/ui/properties/forms/BuffForm.vue
@@ -45,6 +45,12 @@
       :value="model.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ClassLevelForm.vue b/app/imports/ui/properties/forms/ClassLevelForm.vue
index e34fe57f..7768cbcb 100644
--- a/app/imports/ui/properties/forms/ClassLevelForm.vue
+++ b/app/imports/ui/properties/forms/ClassLevelForm.vue
@@ -55,6 +55,12 @@
       :error-messages="errors.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ConstantForm.vue b/app/imports/ui/properties/forms/ConstantForm.vue
index cf160914..1db29569 100644
--- a/app/imports/ui/properties/forms/ConstantForm.vue
+++ b/app/imports/ui/properties/forms/ConstantForm.vue
@@ -24,6 +24,12 @@
       @change="change('calculation', ...arguments)"
     />
     <calculation-error-list :errors="clientErrors" />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ContainerForm.vue b/app/imports/ui/properties/forms/ContainerForm.vue
index 39b9defd..0efce16f 100644
--- a/app/imports/ui/properties/forms/ContainerForm.vue
+++ b/app/imports/ui/properties/forms/ContainerForm.vue
@@ -55,30 +55,35 @@
         $emit('change', {path: ['description', ...path], value, ack})"
     />
 
-    <form-section
-      name="Advanced"
-      standalone
-    >
-      <smart-combobox
-        label="Tags"
-        multiple
-        chips
-        deletable-chips
-        hint="Used to let slots find this property in a library, should otherwise be left blank"
-        :value="model.tags"
-        @change="change('tags', ...arguments)"
-      />
-      <div class="layout justify-center">
-        <div>
-          <smart-switch
-            label="Contents are weightless"
-            :value="model.contentsWeightless"
-            :error-messages="errors.contentsWeightless"
-            @change="change('contentsWeightless', ...arguments)"
-          />
+    <form-sections>
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+
+      <form-section
+        name="Advanced"
+      >
+        <smart-combobox
+          label="Tags"
+          multiple
+          chips
+          deletable-chips
+          hint="Used to let slots find this property in a library, should otherwise be left blank"
+          :value="model.tags"
+          @change="change('tags', ...arguments)"
+        />
+        <div class="layout justify-center">
+          <div>
+            <smart-switch
+              label="Contents are weightless"
+              :value="model.contentsWeightless"
+              :error-messages="errors.contentsWeightless"
+              @change="change('contentsWeightless', ...arguments)"
+            />
+          </div>
         </div>
-      </div>
-    </form-section>
+      </form-section>
+    </form-sections>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/DamageForm.vue b/app/imports/ui/properties/forms/DamageForm.vue
index 7acf3e36..cdcd0b54 100644
--- a/app/imports/ui/properties/forms/DamageForm.vue
+++ b/app/imports/ui/properties/forms/DamageForm.vue
@@ -53,6 +53,12 @@
       :error-messages="errors.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/DamageMultiplierForm.vue b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
index 7f0b25bc..7aeb23ec 100644
--- a/app/imports/ui/properties/forms/DamageMultiplierForm.vue
+++ b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
@@ -46,6 +46,9 @@
       </v-col>
     </v-row>
     <form-sections>
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
       <form-section
         name="Advanced"
       >
diff --git a/app/imports/ui/properties/forms/EffectForm.vue b/app/imports/ui/properties/forms/EffectForm.vue
index c4fcecdb..4e3b59e1 100644
--- a/app/imports/ui/properties/forms/EffectForm.vue
+++ b/app/imports/ui/properties/forms/EffectForm.vue
@@ -149,30 +149,38 @@
         </v-btn>
       </div>
     </v-slide-x-transition>
-    <form-section
-      name="Advanced"
-      standalone
-    >
-      <v-expand-transition>
-        <text-field
-          v-if="model.targetByTags"
-          label="Target field"
-          :value="model.targetField"
-          hint="Target a specific calculation field on the affected properties"
-          :error-messages="errors.targetField"
-          @change="change('targetField', ...arguments)"
+    <form-sections>
+      <form-section
+        name="Children"
+        standalone
+      >
+        <slot name="children" />
+      </form-section>
+
+      <form-section
+        name="Advanced"
+      >
+        <v-expand-transition>
+          <text-field
+            v-if="model.targetByTags"
+            label="Target field"
+            :value="model.targetField"
+            hint="Target a specific calculation field on the affected properties"
+            :error-messages="errors.targetField"
+            @change="change('targetField', ...arguments)"
+          />
+        </v-expand-transition>
+        <smart-combobox
+          label="Tags"
+          multiple
+          chips
+          deletable-chips
+          :value="model.tags"
+          :error-messages="errors.tags"
+          @change="change('tags', ...arguments)"
         />
-      </v-expand-transition>
-      <smart-combobox
-        label="Tags"
-        multiple
-        chips
-        deletable-chips
-        :value="model.tags"
-        :error-messages="errors.tags"
-        @change="change('tags', ...arguments)"
-      />
-    </form-section>
+      </form-section>
+    </form-sections>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/FeatureForm.vue b/app/imports/ui/properties/forms/FeatureForm.vue
index 77f3a77b..a423f35b 100644
--- a/app/imports/ui/properties/forms/FeatureForm.vue
+++ b/app/imports/ui/properties/forms/FeatureForm.vue
@@ -35,6 +35,12 @@
       :error-messages="errors.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/FolderForm.vue b/app/imports/ui/properties/forms/FolderForm.vue
index 8f55fe54..c17e1de4 100644
--- a/app/imports/ui/properties/forms/FolderForm.vue
+++ b/app/imports/ui/properties/forms/FolderForm.vue
@@ -9,19 +9,27 @@
         :error-messages="errors.name"
         @change="change('name', ...arguments)"
       />
-      <form-section
-        name="Advanced"
-        standalone
-      >
-        <smart-combobox
-          label="Tags"
-          multiple
-          chips
-          deletable-chips
-          :value="model.tags"
-          @change="change('tags', ...arguments)"
-        />
-      </form-section>
+      <form-sections>
+        <form-section
+          name="Children"
+          standalone
+        >
+          <slot name="children" />
+        </form-section>
+
+        <form-section
+          name="Advanced"
+        >
+          <smart-combobox
+            label="Tags"
+            multiple
+            chips
+            deletable-chips
+            :value="model.tags"
+            @change="change('tags', ...arguments)"
+          />
+        </form-section>
+      </form-sections>
     </div>
   </div>
 </template>
diff --git a/app/imports/ui/properties/forms/ItemForm.vue b/app/imports/ui/properties/forms/ItemForm.vue
index 08a9e586..e3525717 100644
--- a/app/imports/ui/properties/forms/ItemForm.vue
+++ b/app/imports/ui/properties/forms/ItemForm.vue
@@ -100,47 +100,53 @@
         $emit('change', {path: ['description', ...path], value, ack})"
     />
 
-    <form-section
-      name="Advanced"
-      standalone
-    >
-      <smart-combobox
-        label="Tags"
-        class="mr-2"
-        multiple
-        chips
-        deletable-chips
-        hint="Used to let slots find this property in a library, should otherwise be left blank"
-        :value="model.tags"
-        :error-messages="errors.tags"
-        @change="change('tags', ...arguments)"
-      />
-      <smart-switch
-        label="Show increment button"
-        :value="model.showIncrement"
-        :error-messages="errors.showIncrement"
-        @change="change('showIncrement', ...arguments)"
-      />
-      <smart-switch
-        label="Requires attunement"
-        :value="model.requiresAttunement"
-        :error-messages="errors.requiresAttunement"
-        @change="change('requiresAttunement', ...arguments)"
-      />
-      <v-expand-transition>
-        <div
-          v-show="model.requiresAttunement"
-          style="padding-top: 0.1px;"
-        >
-          <smart-switch
-            label="Attuned"
-            :value="model.attuned"
-            :error-messages="errors.attuned"
-            @change="change('attuned', ...arguments)"
-          />
-        </div>
-      </v-expand-transition>
-    </form-section>
+    <form-sections>
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+
+      <form-section
+        name="Advanced"
+        standalone
+      >
+        <smart-combobox
+          label="Tags"
+          class="mr-2"
+          multiple
+          chips
+          deletable-chips
+          hint="Used to let slots find this property in a library, should otherwise be left blank"
+          :value="model.tags"
+          :error-messages="errors.tags"
+          @change="change('tags', ...arguments)"
+        />
+        <smart-switch
+          label="Show increment button"
+          :value="model.showIncrement"
+          :error-messages="errors.showIncrement"
+          @change="change('showIncrement', ...arguments)"
+        />
+        <smart-switch
+          label="Requires attunement"
+          :value="model.requiresAttunement"
+          :error-messages="errors.requiresAttunement"
+          @change="change('requiresAttunement', ...arguments)"
+        />
+        <v-expand-transition>
+          <div
+            v-show="model.requiresAttunement"
+            style="padding-top: 0.1px;"
+          >
+            <smart-switch
+              label="Attuned"
+              :value="model.attuned"
+              :error-messages="errors.attuned"
+              @change="change('attuned', ...arguments)"
+            />
+          </div>
+        </v-expand-transition>
+      </form-section>
+    </form-sections>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/NoteForm.vue b/app/imports/ui/properties/forms/NoteForm.vue
index a328de80..470c9280 100644
--- a/app/imports/ui/properties/forms/NoteForm.vue
+++ b/app/imports/ui/properties/forms/NoteForm.vue
@@ -35,6 +35,12 @@
       :value="model.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ProficiencyForm.vue b/app/imports/ui/properties/forms/ProficiencyForm.vue
index 41961c69..604553bc 100644
--- a/app/imports/ui/properties/forms/ProficiencyForm.vue
+++ b/app/imports/ui/properties/forms/ProficiencyForm.vue
@@ -37,6 +37,12 @@
       :value="model.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ResourcesForm.vue b/app/imports/ui/properties/forms/ResourcesForm.vue
index 886ba8c4..5c3e92d9 100644
--- a/app/imports/ui/properties/forms/ResourcesForm.vue
+++ b/app/imports/ui/properties/forms/ResourcesForm.vue
@@ -24,35 +24,33 @@
       @push="({path, value, ack}) => $emit('push', {path: ['itemsConsumed', ...path], value, ack})"
       @pull="({path, ack}) => $emit('pull', {path: ['itemsConsumed', ...path], ack})"
     />
-    <div class="layout justify-center">
-      <v-menu
-        origin="center center"
-        transition="scale-transition"
-        nudge-top="50%"
-        nudge-left="50%"
-      >
-        <template #activator="{ on }">
-          <v-btn
-            :loading="addResourceLoading"
-            :disabled="addResourceLoading || context.editPermission === false"
-            icon
-            large
-            outlined
-            v-on="on"
-          >
-            <v-icon>mdi-plus</v-icon>
-          </v-btn>
-        </template>
-        <v-list>
-          <v-list-item @click="addAttributesConsumed">
-            <v-list-item-title>Add Resource</v-list-item-title>
-          </v-list-item>
-          <v-list-item @click="addItemsConsumed">
-            <v-list-item-title>Add Ammo</v-list-item-title>
-          </v-list-item>
-        </v-list>
-      </v-menu>
-    </div>
+    <v-menu
+      origin="center center"
+      transition="scale-transition"
+      nudge-top="50%"
+      nudge-left="50%"
+    >
+      <template #activator="{ on }">
+        <v-btn
+          :loading="addResourceLoading"
+          :disabled="addResourceLoading || context.editPermission === false"
+          icon
+          outlined
+          color="accent"
+          v-on="on"
+        >
+          <v-icon>mdi-plus</v-icon>
+        </v-btn>
+      </template>
+      <v-list>
+        <v-list-item @click="addAttributesConsumed">
+          <v-list-item-title>Add Resource</v-list-item-title>
+        </v-list-item>
+        <v-list-item @click="addItemsConsumed">
+          <v-list-item-title>Add Ammo</v-list-item-title>
+        </v-list-item>
+      </v-list>
+    </v-menu>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/RollForm.vue b/app/imports/ui/properties/forms/RollForm.vue
index 0355018f..803217e3 100644
--- a/app/imports/ui/properties/forms/RollForm.vue
+++ b/app/imports/ui/properties/forms/RollForm.vue
@@ -35,6 +35,10 @@
         $emit('change', {path: ['roll', ...path], value, ack})"
     />
     <form-sections>
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+      
       <form-section name="Advanced">
         <v-row dense>
           <v-col
diff --git a/app/imports/ui/properties/forms/SavingThrowForm.vue b/app/imports/ui/properties/forms/SavingThrowForm.vue
index a0e8a02e..100358ed 100644
--- a/app/imports/ui/properties/forms/SavingThrowForm.vue
+++ b/app/imports/ui/properties/forms/SavingThrowForm.vue
@@ -65,6 +65,12 @@
       :error-messages="errors.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/ui/properties/forms/SlotFillerForm.vue
index d0f84567..5ea5ee44 100644
--- a/app/imports/ui/properties/forms/SlotFillerForm.vue
+++ b/app/imports/ui/properties/forms/SlotFillerForm.vue
@@ -1,20 +1,37 @@
 <template lang="html">
   <div class="slot-filler-form">
-    <div class="layout column align-center">
-      <icon-picker
-        label="Icon"
-        :value="model.icon"
-        :error-messages="errors.icon"
-        @change="change('icon', ...arguments)"
-      />
-    </div>
-    <text-field
-      ref="focusFirst"
-      label="Name"
-      :value="model.name"
-      :error-messages="errors.name"
-      @change="change('name', ...arguments)"
-    />
+    <v-row
+      dense
+      align="start"
+    >
+      <v-col
+        cols="12"
+        sm="9"
+        md="10"
+      >
+        <text-field
+          ref="focusFirst"
+          label="Name"
+          :value="model.name"
+          :error-messages="errors.name"
+          @change="change('name', ...arguments)"
+        />
+      </v-col>
+      <v-col
+        cols="12"
+        sm="3"
+        md="2"
+      >
+        <icon-picker
+          :value="model.icon"
+          :error-messages="errors.icon"
+          height="56"
+          width="100%"
+          button-style="margin-bottom: 30px;"
+          @change="change('icon', ...arguments)"
+        />
+      </v-col>
+    </v-row>
     <text-area
       label="Description"
       :value="model.description"
@@ -67,6 +84,12 @@
       :error-messages="errors.tags"
       @change="change('tags', ...arguments)"
     />
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/ui/properties/forms/SlotForm.vue
index df857437..394808e7 100644
--- a/app/imports/ui/properties/forms/SlotForm.vue
+++ b/app/imports/ui/properties/forms/SlotForm.vue
@@ -157,38 +157,43 @@
         $emit('change', {path: ['description', ...path], value, ack})"
     />
 
-    <form-section
-      name="Advanced"
-      standalone
-    >
-      <div class="layout wrap justify-space-between">
-        <smart-switch
-          label="Hide when full"
-          style="width: 200px; flex-grow: 0;"
-          class="mx-2"
-          :value="model.hideWhenFull"
-          :error-messages="errors.hideWhenFull"
-          @change="change('hideWhenFull', ...arguments)"
+    <form-sections>
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+
+      <form-section
+        name="Advanced"
+      >
+        <div class="layout wrap justify-space-between">
+          <smart-switch
+            label="Hide when full"
+            style="width: 200px; flex-grow: 0;"
+            class="mx-2"
+            :value="model.hideWhenFull"
+            :error-messages="errors.hideWhenFull"
+            @change="change('hideWhenFull', ...arguments)"
+          />
+          <smart-switch
+            label="Ignored"
+            style="width: 200px; flex-grow: 0;"
+            class="mx-2"
+            :value="model.ignored"
+            :error-messages="errors.ignored"
+            @change="change('ignored', ...arguments)"
+          />
+        </div>
+        <smart-combobox
+          label="Tags"
+          hint="This slot's own tags which will be used to fill other slots"
+          multiple
+          chips
+          deletable-chips
+          :value="model.tags"
+          @change="change('tags', ...arguments)"
         />
-        <smart-switch
-          label="Ignored"
-          style="width: 200px; flex-grow: 0;"
-          class="mx-2"
-          :value="model.ignored"
-          :error-messages="errors.ignored"
-          @change="change('ignored', ...arguments)"
-        />
-      </div>
-      <smart-combobox
-        label="Tags"
-        hint="This slot's own tags which will be used to fill other slots"
-        multiple
-        chips
-        deletable-chips
-        :value="model.tags"
-        @change="change('tags', ...arguments)"
-      />
-    </form-section>
+      </form-section>
+    </form-sections>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/SpellForm.vue b/app/imports/ui/properties/forms/SpellForm.vue
index 7fafb173..88f609d4 100644
--- a/app/imports/ui/properties/forms/SpellForm.vue
+++ b/app/imports/ui/properties/forms/SpellForm.vue
@@ -238,7 +238,7 @@
         $emit('change', {path: ['description', ...path], value, ack})"
     />
     <form-sections>
-      <form-section name="Resources">
+      <form-section name="Resources Consumed">
         <resources-form
           :model="model.resources"
           @change="({path, value, ack}) => $emit('change', {path: ['resources', ...path], value, ack})"
@@ -246,6 +246,7 @@
           @pull="({path, ack}) => $emit('pull', {path: ['resources', ...path], ack})"
         />
       </form-section>
+
       <form-section
         name="Limit Uses"
       >
@@ -291,6 +292,11 @@
           @change="change('reset', ...arguments)"
         />
       </form-section>
+
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+
       <form-section name="Advanced">
         <smart-combobox
           label="Tags"
diff --git a/app/imports/ui/properties/forms/SpellListForm.vue b/app/imports/ui/properties/forms/SpellListForm.vue
index e2040971..4c9cfd5c 100644
--- a/app/imports/ui/properties/forms/SpellListForm.vue
+++ b/app/imports/ui/properties/forms/SpellListForm.vue
@@ -54,6 +54,13 @@
       :value="model.tags"
       @change="change('tags', ...arguments)"
     />
+
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ToggleForm.vue b/app/imports/ui/properties/forms/ToggleForm.vue
index a10de795..abbff445 100644
--- a/app/imports/ui/properties/forms/ToggleForm.vue
+++ b/app/imports/ui/properties/forms/ToggleForm.vue
@@ -84,6 +84,13 @@
       :value="model.tags"
       @change="change('tags', ...arguments)"
     />
+    
+    <form-section
+      name="Children"
+      standalone
+    >
+      <slot name="children" />
+    </form-section>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
index 2e28b01c..09627057 100644
--- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js
+++ b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
@@ -1,6 +1,5 @@
 const ActionForm = () => import('/imports/ui/properties/forms/ActionForm.vue');
 const AdjustmentForm = () => import('/imports/ui/properties/forms/AdjustmentForm.vue');
-const AttackForm = () => import('/imports/ui/properties/forms/AttackForm.vue');
 const AttributeForm = () => import('/imports/ui/properties/forms/AttributeForm.vue');
 const BuffForm = () => import('/imports/ui/properties/forms/BuffForm.vue');
 const BranchForm = () => import('/imports/ui/properties/forms/BranchForm.vue');
@@ -28,7 +27,6 @@ const ToggleForm = () => import('/imports/ui/properties/forms/ToggleForm.vue');
 export default {
   action: ActionForm,
   adjustment: AdjustmentForm,
-  attack: AttackForm,
   attribute: AttributeForm,
   buff: BuffForm,
   branch: BranchForm,
diff --git a/app/imports/ui/properties/forms/shared/propertyFormMixin.js b/app/imports/ui/properties/forms/shared/propertyFormMixin.js
index e9eed2f4..172db58f 100644
--- a/app/imports/ui/properties/forms/shared/propertyFormMixin.js
+++ b/app/imports/ui/properties/forms/shared/propertyFormMixin.js
@@ -1,10 +1,13 @@
 import ComputedField from '/imports/ui/properties/forms/shared/ComputedField.vue';
 import InlineComputationField from '/imports/ui/properties/forms/shared/InlineComputationField.vue';
+import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
 
 export default {
   components: {
     ComputedField,
     InlineComputationField,
+    FormSection,
+    FormSections,
   },
   props: {
     model: {
diff --git a/app/imports/ui/properties/viewers/SlotViewer.vue b/app/imports/ui/properties/viewers/SlotViewer.vue
index bdd07cd5..2c5bb3f6 100644
--- a/app/imports/ui/properties/viewers/SlotViewer.vue
+++ b/app/imports/ui/properties/viewers/SlotViewer.vue
@@ -39,18 +39,28 @@
           </div>
         </div>
       </property-field>
+      <property-description
+        name="Description"
+        :model="model.description"
+      />
+      <property-field
+        v-if="!model.quantityExpected || !model.quantityExpected.value || model.spaceLeft"
+        name="Fill"
+        :cols="{cols: 12}"
+      >
+        <fill-slot-button :model="model">
+          <v-icon left>mdi-plus</v-icon>
+          Fill Slot
+        </fill-slot-button>
+      </property-field>
     </v-row>
-    <property-description
-      :string="model.description"
-      :calculations="model.descriptionCalculations"
-      :inactive="model.inactive"
-    />
   </div>
 </template>
 
 <script lang="js">
 	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
   import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+  import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
 
   const uniqueText = {
     uniqueInSlot: 'Each property inside this slot should be unique',
@@ -59,6 +69,9 @@
 
 	export default {
 		mixins: [propertyViewerMixin],
+    components: {
+      FillSlotButton,
+    },
     computed: {
       slotTypeName(){
         if (!this.model.slotType) return;

From a8ffa2f7868739a4541717f302bc556cfac8fe6a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 20 Jun 2022 13:05:38 +0200
Subject: [PATCH 26/56] Fixed denormalized creature variables not removed

---
 .../computation/writeComputation/writeScope.js   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index 6d0aecbc..3bb550f8 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -4,7 +4,8 @@ import { EJSON } from 'meteor/ejson';
 export default function writeScope(creatureId, computation) {
   const scope = computation.scope;
   const variables = computation.creature?.variables || {};
-  let $set;
+  let $set, $unset;
+
   for (const key in scope){
     // Remove large properties that aren't likely to be accessed
     delete scope[key].parent;
@@ -24,7 +25,16 @@ export default function writeScope(creatureId, computation) {
       $set[`variables.${key}`] = scope[key];
     }
   }
-  if ($set) {
-    Creatures.update(creatureId, {$set});
+
+  // Remove all the keys that no longer exist in scope
+  for (const key in variables) {
+    if (!scope[key]) {
+      if (!$unset) $unset = {};
+      $unset[`variables.${key}`] = 1;
+    }
+  }
+
+  if ($set || $unset) {
+    Creatures.update(creatureId, {$set, $unset});
   }
 }

From b31760af0c6927bad0d101ade52a252e9d6b0319 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 20 Jun 2022 14:22:13 +0200
Subject: [PATCH 27/56] Don't show children expansion panel if not needed

---
 .../ui/properties/forms/ActionForm.vue        |  5 +-
 .../ui/properties/forms/AdjustmentForm.vue    |  1 +
 .../ui/properties/forms/AttributeForm.vue     |  5 +-
 app/imports/ui/properties/forms/BuffForm.vue  |  1 +
 .../ui/properties/forms/ClassLevelForm.vue    |  1 +
 .../ui/properties/forms/ConstantForm.vue      |  1 +
 .../ui/properties/forms/ContainerForm.vue     |  5 +-
 .../ui/properties/forms/DamageForm.vue        |  1 +
 .../properties/forms/DamageMultiplierForm.vue |  5 +-
 .../ui/properties/forms/EffectForm.vue        |  2 +-
 .../ui/properties/forms/FeatureForm.vue       |  1 +
 .../ui/properties/forms/FolderForm.vue        |  2 +-
 app/imports/ui/properties/forms/ItemForm.vue  |  5 +-
 app/imports/ui/properties/forms/NoteForm.vue  |  1 +
 .../ui/properties/forms/ProficiencyForm.vue   |  1 +
 app/imports/ui/properties/forms/RollForm.vue  |  5 +-
 .../ui/properties/forms/SavingThrowForm.vue   |  1 +
 app/imports/ui/properties/forms/SkillForm.vue | 66 +++++++++++--------
 .../ui/properties/forms/SlotFillerForm.vue    |  1 +
 app/imports/ui/properties/forms/SlotForm.vue  |  5 +-
 app/imports/ui/properties/forms/SpellForm.vue |  5 +-
 .../ui/properties/forms/SpellListForm.vue     |  1 +
 .../ui/properties/forms/ToggleForm.vue        |  1 +
 23 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/app/imports/ui/properties/forms/ActionForm.vue b/app/imports/ui/properties/forms/ActionForm.vue
index 41d00847..c550d75a 100644
--- a/app/imports/ui/properties/forms/ActionForm.vue
+++ b/app/imports/ui/properties/forms/ActionForm.vue
@@ -79,7 +79,10 @@
     />
 
     <form-sections>
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
       <form-section name="Resources Consumed">
diff --git a/app/imports/ui/properties/forms/AdjustmentForm.vue b/app/imports/ui/properties/forms/AdjustmentForm.vue
index 6f2b58ab..c1df6cdb 100644
--- a/app/imports/ui/properties/forms/AdjustmentForm.vue
+++ b/app/imports/ui/properties/forms/AdjustmentForm.vue
@@ -60,6 +60,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index d5473933..b07c394f 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -93,7 +93,10 @@
         </form-section>
       </v-expand-transition>
 
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
 
diff --git a/app/imports/ui/properties/forms/BuffForm.vue b/app/imports/ui/properties/forms/BuffForm.vue
index 36630bfa..7ee4b38a 100644
--- a/app/imports/ui/properties/forms/BuffForm.vue
+++ b/app/imports/ui/properties/forms/BuffForm.vue
@@ -46,6 +46,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/ClassLevelForm.vue b/app/imports/ui/properties/forms/ClassLevelForm.vue
index 7768cbcb..0da622ec 100644
--- a/app/imports/ui/properties/forms/ClassLevelForm.vue
+++ b/app/imports/ui/properties/forms/ClassLevelForm.vue
@@ -56,6 +56,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/ConstantForm.vue b/app/imports/ui/properties/forms/ConstantForm.vue
index 1db29569..27817bf3 100644
--- a/app/imports/ui/properties/forms/ConstantForm.vue
+++ b/app/imports/ui/properties/forms/ConstantForm.vue
@@ -25,6 +25,7 @@
     />
     <calculation-error-list :errors="clientErrors" />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/ContainerForm.vue b/app/imports/ui/properties/forms/ContainerForm.vue
index 0efce16f..78990b4d 100644
--- a/app/imports/ui/properties/forms/ContainerForm.vue
+++ b/app/imports/ui/properties/forms/ContainerForm.vue
@@ -56,7 +56,10 @@
     />
 
     <form-sections>
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
 
diff --git a/app/imports/ui/properties/forms/DamageForm.vue b/app/imports/ui/properties/forms/DamageForm.vue
index cdcd0b54..81bb3a10 100644
--- a/app/imports/ui/properties/forms/DamageForm.vue
+++ b/app/imports/ui/properties/forms/DamageForm.vue
@@ -54,6 +54,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/DamageMultiplierForm.vue b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
index 7aeb23ec..7705196b 100644
--- a/app/imports/ui/properties/forms/DamageMultiplierForm.vue
+++ b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
@@ -46,7 +46,10 @@
       </v-col>
     </v-row>
     <form-sections>
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
       <form-section
diff --git a/app/imports/ui/properties/forms/EffectForm.vue b/app/imports/ui/properties/forms/EffectForm.vue
index 4e3b59e1..9ef23c9a 100644
--- a/app/imports/ui/properties/forms/EffectForm.vue
+++ b/app/imports/ui/properties/forms/EffectForm.vue
@@ -151,8 +151,8 @@
     </v-slide-x-transition>
     <form-sections>
       <form-section
+        v-if="$slots.children"
         name="Children"
-        standalone
       >
         <slot name="children" />
       </form-section>
diff --git a/app/imports/ui/properties/forms/FeatureForm.vue b/app/imports/ui/properties/forms/FeatureForm.vue
index a423f35b..cb900962 100644
--- a/app/imports/ui/properties/forms/FeatureForm.vue
+++ b/app/imports/ui/properties/forms/FeatureForm.vue
@@ -36,6 +36,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/FolderForm.vue b/app/imports/ui/properties/forms/FolderForm.vue
index c17e1de4..84f29b84 100644
--- a/app/imports/ui/properties/forms/FolderForm.vue
+++ b/app/imports/ui/properties/forms/FolderForm.vue
@@ -11,8 +11,8 @@
       />
       <form-sections>
         <form-section
+          v-if="$slots.children"
           name="Children"
-          standalone
         >
           <slot name="children" />
         </form-section>
diff --git a/app/imports/ui/properties/forms/ItemForm.vue b/app/imports/ui/properties/forms/ItemForm.vue
index e3525717..ced109d9 100644
--- a/app/imports/ui/properties/forms/ItemForm.vue
+++ b/app/imports/ui/properties/forms/ItemForm.vue
@@ -101,7 +101,10 @@
     />
 
     <form-sections>
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
 
diff --git a/app/imports/ui/properties/forms/NoteForm.vue b/app/imports/ui/properties/forms/NoteForm.vue
index 470c9280..ba9eeafd 100644
--- a/app/imports/ui/properties/forms/NoteForm.vue
+++ b/app/imports/ui/properties/forms/NoteForm.vue
@@ -36,6 +36,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/ProficiencyForm.vue b/app/imports/ui/properties/forms/ProficiencyForm.vue
index 604553bc..87b35b4a 100644
--- a/app/imports/ui/properties/forms/ProficiencyForm.vue
+++ b/app/imports/ui/properties/forms/ProficiencyForm.vue
@@ -38,6 +38,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/RollForm.vue b/app/imports/ui/properties/forms/RollForm.vue
index 803217e3..26432790 100644
--- a/app/imports/ui/properties/forms/RollForm.vue
+++ b/app/imports/ui/properties/forms/RollForm.vue
@@ -35,7 +35,10 @@
         $emit('change', {path: ['roll', ...path], value, ack})"
     />
     <form-sections>
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
       
diff --git a/app/imports/ui/properties/forms/SavingThrowForm.vue b/app/imports/ui/properties/forms/SavingThrowForm.vue
index 100358ed..a9da6172 100644
--- a/app/imports/ui/properties/forms/SavingThrowForm.vue
+++ b/app/imports/ui/properties/forms/SavingThrowForm.vue
@@ -66,6 +66,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/SkillForm.vue b/app/imports/ui/properties/forms/SkillForm.vue
index 0bfe5ebb..2854013e 100644
--- a/app/imports/ui/properties/forms/SkillForm.vue
+++ b/app/imports/ui/properties/forms/SkillForm.vue
@@ -45,36 +45,44 @@
         $emit('change', {path: ['description', ...path], value, ack})"
     />
 
-    <form-section
-      name="Advanced"
-      standalone
-    >
-      <smart-combobox
-        label="Tags"
-        multiple
-        chips
-        deletable-chips
-        :value="model.tags"
-        @change="change('tags', ...arguments)"
-      />
-      <div class="layout justify-center">
-        <computed-field
-          label="Base Value"
-          hint="This is the value of the skill before effects are applied"
-          :model="model.baseValue"
-          :error-messages="errors.baseValue"
-          @change="({path, value, ack}) =>
-            $emit('change', {path: ['baseValue', ...path], value, ack})"
+    <form-sections>
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
+        <slot name="children" />
+      </form-section>
+
+      <form-section
+        name="Advanced"
+      >
+        <smart-combobox
+          label="Tags"
+          multiple
+          chips
+          deletable-chips
+          :value="model.tags"
+          @change="change('tags', ...arguments)"
         />
-        <proficiency-select
-          style="flex-basis: 300px;"
-          label="Base Proficiency"
-          :value="model.baseProficiency"
-          :error-messages="errors.baseProficiency"
-          @change="change('baseProficiency', ...arguments)"
-        />
-      </div>
-    </form-section>
+        <div class="layout justify-center">
+          <computed-field
+            label="Base Value"
+            hint="This is the value of the skill before effects are applied"
+            :model="model.baseValue"
+            :error-messages="errors.baseValue"
+            @change="({path, value, ack}) =>
+              $emit('change', {path: ['baseValue', ...path], value, ack})"
+          />
+          <proficiency-select
+            style="flex-basis: 300px;"
+            label="Base Proficiency"
+            :value="model.baseProficiency"
+            :error-messages="errors.baseProficiency"
+            @change="change('baseProficiency', ...arguments)"
+          />
+        </div>
+      </form-section>
+    </form-sections>
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/ui/properties/forms/SlotFillerForm.vue
index 5ea5ee44..64ce1c51 100644
--- a/app/imports/ui/properties/forms/SlotFillerForm.vue
+++ b/app/imports/ui/properties/forms/SlotFillerForm.vue
@@ -85,6 +85,7 @@
       @change="change('tags', ...arguments)"
     />
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/ui/properties/forms/SlotForm.vue
index 394808e7..719d83ed 100644
--- a/app/imports/ui/properties/forms/SlotForm.vue
+++ b/app/imports/ui/properties/forms/SlotForm.vue
@@ -158,7 +158,10 @@
     />
 
     <form-sections>
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
 
diff --git a/app/imports/ui/properties/forms/SpellForm.vue b/app/imports/ui/properties/forms/SpellForm.vue
index 88f609d4..db36d5b0 100644
--- a/app/imports/ui/properties/forms/SpellForm.vue
+++ b/app/imports/ui/properties/forms/SpellForm.vue
@@ -293,7 +293,10 @@
         />
       </form-section>
 
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
 
diff --git a/app/imports/ui/properties/forms/SpellListForm.vue b/app/imports/ui/properties/forms/SpellListForm.vue
index 4c9cfd5c..b44ea60c 100644
--- a/app/imports/ui/properties/forms/SpellListForm.vue
+++ b/app/imports/ui/properties/forms/SpellListForm.vue
@@ -56,6 +56,7 @@
     />
 
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >
diff --git a/app/imports/ui/properties/forms/ToggleForm.vue b/app/imports/ui/properties/forms/ToggleForm.vue
index abbff445..f3d01b0f 100644
--- a/app/imports/ui/properties/forms/ToggleForm.vue
+++ b/app/imports/ui/properties/forms/ToggleForm.vue
@@ -86,6 +86,7 @@
     />
     
     <form-section
+      v-if="$slots.children"
       name="Children"
       standalone
     >

From fdaa035bfbc21b345a29f546a1c8558c6a00ef61 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 20 Jun 2022 14:50:04 +0200
Subject: [PATCH 28/56] Fixed Shakespearean typo in slot filer description

---
 app/imports/constants/PROPERTIES.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/constants/PROPERTIES.js b/app/imports/constants/PROPERTIES.js
index 4c35c038..503f893e 100644
--- a/app/imports/constants/PROPERTIES.js
+++ b/app/imports/constants/PROPERTIES.js
@@ -138,7 +138,7 @@ const PROPERTIES = Object.freeze({
   slotFiller: {
     icon: 'mdi-power-plug-outline',
     name: 'Slot filler',
-    helpText: 'A slot filler allows for more advanced logic when it attemptst to fill a slot. It can masquarade as any property type, and calculate whether it should fill a slot or not.',
+    helpText: 'A slot filler allows for more advanced logic when it attempts to fill a slot. It can masquarade as any property type, and calculate whether it should fill a slot or not.',
     suggestedParents: ['propertySlot'],
   },
   spellList: {

From 9f59a6cf867c7b757482c1eab169451d1b601f90 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 20 Jun 2022 15:11:39 +0200
Subject: [PATCH 29/56] Fixed long folder names not truncating correctly

---
 .../creatureList/CreatureFolderHeader.vue     | 56 +++++++++----------
 .../creatureList/CreatureFolderList.vue       |  6 +-
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue b/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
index 1b2d6bd3..3f826f6f 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
+++ b/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
@@ -1,28 +1,29 @@
 <template lang="html">
-  <v-list-item style="min-height: 60px;">
-    <v-list-item-content>
-      <v-list-item-title>
-        <template v-if="!renaming">
-          {{ model.name }}
-        </template>
-        <text-field
-          v-if="renaming"
-          ref="name-input"
-          regular
-          hide-details
-          dense
-          :value="model.name"
-          @change="renameFolder"
-          @click.native.stop=""
-          @input.native.stop=""
-          @keydown.native.stop=""
-          @keyup.native.stop=""
-        />
-      </v-list-item-title>
-    </v-list-item-content>
-    <template v-if="!selection && !dense">
-      <v-list-item-action v-if="renaming || open">
+  <v-list-item-content style="min-height: 60px;">
+    <v-list-item-title class="d-flex align-center">
+      <div
+        v-if="!renaming"
+        class="text-truncate text-no-wrap"
+      >
+        {{ model.name }}
+      </div>
+      <text-field
+        v-if="renaming"
+        ref="name-input"
+        regular
+        hide-details
+        dense
+        :value="model.name"
+        @change="renameFolder"
+        @click.native.stop=""
+        @input.native.stop=""
+        @keydown.native.stop=""
+        @keyup.native.stop=""
+      />
+      <template v-if="!selection && !dense">
+        <v-spacer />
         <v-btn
+          v-if="renaming || open"
           icon
           style="flex-grow: 0"
           @click.stop="renaming = !renaming"
@@ -34,18 +35,17 @@
             mdi-pencil
           </v-icon>
         </v-btn>
-      </v-list-item-action>
-      <v-list-item-action v-if="open">
         <v-btn
+          v-if="open"
           icon
           style="flex-grow: 0"
           @click.stop="removeFolder"
         >
           <v-icon>mdi-delete</v-icon>
         </v-btn>
-      </v-list-item-action>
-    </template>
-  </v-list-item>
+      </template>
+    </v-list-item-title>
+  </v-list-item-content>
 </template>
 
 <script lang="js">
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderList.vue b/app/imports/ui/creature/creatureList/CreatureFolderList.vue
index d98e2103..8310e939 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderList.vue
+++ b/app/imports/ui/creature/creatureList/CreatureFolderList.vue
@@ -1,6 +1,7 @@
 <template lang="html">
   <v-list
     expand
+    class="creature-folder-list"
   >
     <creature-list
       :creatures="creatures"
@@ -66,5 +67,8 @@ export default {
 }
 </script>
 
-<style lang="css" scoped>
+<style lang="css">
+.creature-folder-list .v-list-item__icon.v-list-group__header__append-icon {
+  margin-left: 0 !important;
+}
 </style>

From 9cc4186171b7e51681b398d06b5f40afde72f5b3 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 21 Jun 2022 11:00:50 +0200
Subject: [PATCH 30/56] Reduced data load in slot fill dialog

---
 app/imports/server/publications/library.js    | 64 ++++++++++---------
 .../server/publications/slotFillers.js        | 22 +++++--
 .../ui/creature/slots/SlotFillDialog.vue      | 26 ++++----
 .../library/LibraryNodeExpansionContent.vue   |  3 +
 4 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index 10553aab..778d08a8 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -3,6 +3,39 @@ import Libraries from '/imports/api/library/Libraries.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import { assertViewPermission, assertDocViewPermission } from '/imports/api/sharing/sharingPermissions.js';
 
+const LIBRARY_NODE_TREE_FIELDS = {
+  _id: 1,
+  name: 1,
+  type: 1,
+  icon: 1,
+  color: 1,
+  order: 1,
+  parent: 1,
+  ancestors: 1,
+  // Effect
+  operation: 1,
+  targetTags: 1,
+  stats: 1,
+  // Item
+  quantity: 1,
+  plural: 1,
+  equipped: 1,
+  // Branch
+  branchType: 1,
+  // Damage:
+  damageType: 1,
+  stat: 1,
+  amount: 1,
+  // Class level
+  level: 1,
+  // Proficiency
+  value: 1,
+  // Reference
+  cache: 1,
+}
+
+export { LIBRARY_NODE_TREE_FIELDS };
+
 Meteor.publish('libraries', function(){
   this.autorun(function (){
     let userId = this.userId;
@@ -64,36 +97,7 @@ Meteor.publish('libraryNodes', function(libraryId){
         'ancestors.id': libraryId,
       }, {
         sort: { order: 1 },
-        fields: {
-          _id: 1,
-          name: 1,
-          type: 1,
-          icon: 1,
-          color: 1,
-          order: 1,
-          parent: 1,
-          ancestors: 1,
-          // Effect
-          operation: 1,
-          targetTags: 1,
-          stats: 1,
-          // Item
-          quantity: 1,
-          plural: 1,
-          equipped: 1,
-          // Branch
-          branchType: 1,
-          // Damage:
-          damageType: 1,
-          stat: 1,
-          amount: 1,
-          // Class level
-          level: 1,
-          // Proficiency
-          value: 1,
-          // Reference
-          cache: 1,
-        }
+        fields: LIBRARY_NODE_TREE_FIELDS,
       }),
     ];
   });
diff --git a/app/imports/server/publications/slotFillers.js b/app/imports/server/publications/slotFillers.js
index c5b3397f..3dd6d141 100644
--- a/app/imports/server/publications/slotFillers.js
+++ b/app/imports/server/publications/slotFillers.js
@@ -3,6 +3,13 @@ import Libraries from '/imports/api/library/Libraries.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
+import { LIBRARY_NODE_TREE_FIELDS } from '/imports/server/publications/library.js';
+
+const FIELDS = {
+  ...LIBRARY_NODE_TREE_FIELDS,
+  slotFillerCondition: 1,
+  tags: 1,
+}
 
 Meteor.publish('slotFillers', function(slotId, searchTerm){
   if (searchTerm) check(searchTerm, String);
@@ -50,7 +57,8 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
         options = {
           // relevant documents have a higher score.
           fields: {
-            _score: { $meta: 'textScore' }
+            _score: { $meta: 'textScore' },
+            ...FIELDS,
           },
           sort: {
             // `score` property specified in the projection fields above.
@@ -61,10 +69,13 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
         }
       } else {
         delete filter.$text
-        options = {sort: {
-          name: 1,
-          order: 1,
-        }};
+        options = {
+          sort: {
+            name: 1,
+            order: 1,
+          },
+          fields: FIELDS,
+        };
       }
       options.limit = limit;
 
@@ -72,7 +83,6 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
         self.setData('countAll', LibraryNodes.find(filter).count());
       });
       self.autorun(function () {
-        Meteor._sleepForMs(1000);
         return [LibraryNodes.find(filter, options), libraries];
       });
     });
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index 0b63870f..497b0401 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -27,20 +27,18 @@
     />
     <p>
       {{ slotPropertyTypeName }} with tags:
-      <template v-for="(tags, index) in tagsSearched.or">
-        <property-tags
-          :key="index"
-          :tags="tags"
-          :prefix="index ? 'OR' : undefined"
-        />
-      </template>
-      <template v-for="(tags, index) in tagsSearched.not">
-        <property-tags
-          :key="index"
-          :tags="tags"
-          prefix="NOT"
-        />
-      </template>
+      <property-tags
+        v-for="(tags, index) in tagsSearched.or"
+        :key="index"
+        :tags="tags"
+        :prefix="index ? 'OR' : undefined"
+      />
+      <property-tags
+        v-for="(tags, index) in tagsSearched.not"
+        :key="index"
+        :tags="tags"
+        prefix="NOT"
+      />
     </p>
     <v-expansion-panels
       multiple
diff --git a/app/imports/ui/library/LibraryNodeExpansionContent.vue b/app/imports/ui/library/LibraryNodeExpansionContent.vue
index aac0f104..30e614db 100644
--- a/app/imports/ui/library/LibraryNodeExpansionContent.vue
+++ b/app/imports/ui/library/LibraryNodeExpansionContent.vue
@@ -44,6 +44,9 @@ export default {
   },
   meteor: {
     $subscribe: {
+      libraryNode(){
+        return [this.model._id];
+      },
       descendantLibraryNodes(){
         return [this.model._id];
       },

From da5143693f4f82665f599e1203ba5eec662665a5 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 21 Jun 2022 11:08:45 +0200
Subject: [PATCH 31/56] Iterated on class UI

---
 app/imports/api/properties/Classes.js         |  93 ++++++--
 app/imports/ui/properties/forms/ClassForm.vue | 222 ++++++++++++++++++
 .../forms/shared/propertyFormIndex.js         |   3 +-
 .../ui/properties/viewers/ClassViewer.vue     |  91 +++++++
 .../ui/properties/viewers/SlotViewer.vue      |  15 +-
 .../viewers/shared/propertyViewerIndex.js     |   3 +-
 6 files changed, 405 insertions(+), 22 deletions(-)
 create mode 100644 app/imports/ui/properties/forms/ClassForm.vue
 create mode 100644 app/imports/ui/properties/viewers/ClassViewer.vue

diff --git a/app/imports/api/properties/Classes.js b/app/imports/api/properties/Classes.js
index ee631246..e6e6471f 100644
--- a/app/imports/api/properties/Classes.js
+++ b/app/imports/api/properties/Classes.js
@@ -1,34 +1,95 @@
 import SimpleSchema from 'simpl-schema';
 import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
 import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js';
-import { SlotSchema, ComputedOnlySlotSchema } from './Slots.js';
 
 // Classes are like slots, except they only take class levels and enforce that
 // lower levels are taken before higher levels
 let ClassSchema = createPropertySchema({
+  name: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.name,
+  },
+  description: {
+    type: 'inlineCalculationFieldToCompute',
+    optional: true,
+  },
   // Only `classLevel`s with the same variable name can fill the class
   variableName: {
     type: String,
     optional: true,
     max: STORAGE_LIMITS.variableName,
   },
-}).extend(SlotSchema);
+  slotTags: {
+    type: Array,
+    defaultValue: [],
+    maxCount: STORAGE_LIMITS.tagCount,
+  },
+  'slotTags.$': {
+    type: String,
+    max: STORAGE_LIMITS.tagLength,
+  },
+  extraTags: {
+    type: Array,
+    defaultValue: [],
+    maxCount: STORAGE_LIMITS.extraTagsCount,
+  },
+  'extraTags.$': {
+    type: Object,
+  },
+  'extraTags.$._id': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+  'extraTags.$.operation': {
+    type: String,
+    allowedValues: ['OR', 'NOT'],
+    defaultValue: 'OR',
+  },
+  'extraTags.$.tags': {
+    type: Array,
+    defaultValue: [],
+    maxCount: STORAGE_LIMITS.tagCount,
+  },
+  'extraTags.$.tags.$': {
+    type: String,
+    max: STORAGE_LIMITS.tagLength,
+  },
+  slotCondition: {
+    type: 'fieldToCompute',
+    optional: true,
+  },
+});
 
 const ComputedOnlyClassSchema = createPropertySchema({
-    level: {
-      type: SimpleSchema.Integer,
-      optional: true,
-      removeBeforeCompute: true,
-    },
-    missingLevels: {
-      type: Array,
-      optional: true,
-      removeBeforeCompute: true,
-    },
-    'missingLevels.$': {
-      type: SimpleSchema.Integer,
-    },
-  }).extend(ComputedOnlySlotSchema);
+  // Computed fields
+  description: {
+    type: 'computedOnlyInlineCalculationField',
+    optional: true,
+  },
+  slotCondition: {
+    type: 'computedOnlyField',
+    optional: true,
+  },
+  
+  // Denormalised fields
+  level: {
+    type: SimpleSchema.Integer,
+    optional: true,
+    removeBeforeCompute: true,
+  },
+  missingLevels: {
+    type: Array,
+    optional: true,
+    removeBeforeCompute: true,
+  },
+  'missingLevels.$': {
+    type: SimpleSchema.Integer,
+  },
+});
 
 const ComputedClassSchema = new SimpleSchema()
   .extend(ClassSchema)
diff --git a/app/imports/ui/properties/forms/ClassForm.vue b/app/imports/ui/properties/forms/ClassForm.vue
new file mode 100644
index 00000000..50003919
--- /dev/null
+++ b/app/imports/ui/properties/forms/ClassForm.vue
@@ -0,0 +1,222 @@
+<template lang="html">
+  <div class="class-form">
+    <v-row
+      dense
+    >
+      <v-col
+        cols="12"
+        md="6"
+      >
+        <text-field
+          ref="focusFirst"
+          label="Name"
+          :value="model.name"
+          :error-messages="errors.name"
+          @change="change('name', ...arguments)"
+        />
+      </v-col>
+      <v-col
+        cols="12"
+        md="6"
+      >
+        <text-field
+          label="Variable name"
+          :value="model.variableName"
+          hint="Use this name in calculations to reference this attribute"
+          :error-messages="errors.variableName"
+          @change="change('variableName', ...arguments)"
+        />
+      </v-col>
+    </v-row>
+    <v-layout align-center>
+      <v-btn
+        icon
+        style="margin-top: -30px;"
+        class="mr-2"
+        :loading="addExtraTagsLoading"
+        :disabled="extraTagsFull"
+        @click="addExtraTags"
+      >
+        <v-icon>
+          mdi-plus
+        </v-icon>
+      </v-btn>
+      <smart-combobox
+        label="Tags Required"
+        hint="The slot must be filled with a property which has all the listed tags"
+        multiple
+        chips
+        deletable-chips
+        :value="model.slotTags"
+        :error-messages="errors.slotTags"
+        @change="change('slotTags', ...arguments)"
+      />
+    </v-layout>
+    <v-slide-x-transition group>
+      <div
+        v-for="(extras, i) in model.extraTags"
+        :key="extras._id"
+        class="extra-tags layout align-center justify-space-between"
+      >
+        <smart-select
+          label="Operation"
+          style="width: 90px; flex-grow: 0;"
+          :items="extraTagOperations"
+          :value="extras.operation"
+          :error-messages="errors.extraTags && errors.extraTags[i]"
+          @change="change(['extraTags', i, 'operation'], ...arguments)"
+        />
+        <smart-combobox
+          label="Tags"
+          :hint="extras.operation === 'OR' ? 'The slot can be filled with a property that has all of these tags instead' : 'The slot cannot be filled with a property that has any of these tags'"
+          class="mx-2"
+          multiple
+          chips
+          deletable-chips
+          :value="extras.tags"
+          @change="change(['extraTags', i, 'tags'], ...arguments)"
+        />
+        <v-btn
+          icon
+          style="margin-top: -30px;"
+          @click="$emit('pull', {path: ['extraTags', i]})"
+        >
+          <v-icon>mdi-delete</v-icon>
+        </v-btn>
+      </div>
+    </v-slide-x-transition>
+
+    <computed-field
+      label="Quantity"
+      hint="How many matching properties must be used to fill this slot, 0 is unlimited"
+      :model="model.quantityExpected"
+      :error-messages="errors.quantityExpected"
+      @change="({path, value, ack}) =>
+        $emit('change', {path: ['quantityExpected', ...path], value, ack})"
+    />
+
+    <computed-field
+      label="Condition"
+      hint="A caclulation to determine if this slot should be active"
+      placeholder="Always active"
+      :model="model.slotCondition"
+      :error-messages="errors.slotCondition"
+      @change="({path, value, ack}) =>
+        $emit('change', {path: ['slotCondition', ...path], value, ack})"
+    />
+
+    <v-layout justify-center>
+      <v-btn
+        v-if="context.isLibraryForm"
+        color="accent"
+        class="ma-2 mb-4"
+        data-id="test-slot-button"
+        @click="testSlot"
+      >
+        Test Slot
+      </v-btn>
+    </v-layout>
+
+    <inline-computation-field
+      label="Description"
+      :model="model.description"
+      :error-messages="errors.description"
+      @change="({path, value, ack}) =>
+        $emit('change', {path: ['description', ...path], value, ack})"
+    />
+
+    <form-sections>
+      <form-section name="Children">
+        <slot name="children" />
+      </form-section>
+
+      <form-section
+        name="Advanced"
+      >
+        <div class="layout wrap justify-space-between">
+          <smart-switch
+            label="Hide when full"
+            style="width: 200px; flex-grow: 0;"
+            class="mx-2"
+            :value="model.hideWhenFull"
+            :error-messages="errors.hideWhenFull"
+            @change="change('hideWhenFull', ...arguments)"
+          />
+          <smart-switch
+            label="Ignored"
+            style="width: 200px; flex-grow: 0;"
+            class="mx-2"
+            :value="model.ignored"
+            :error-messages="errors.ignored"
+            @change="change('ignored', ...arguments)"
+          />
+        </div>
+        <smart-combobox
+          label="Tags"
+          hint="This slot's own tags which will be used to fill other slots"
+          multiple
+          chips
+          deletable-chips
+          :value="model.tags"
+          @change="change('tags', ...arguments)"
+        />
+      </form-section>
+    </form-sections>
+  </div>
+</template>
+
+<script lang="js">
+  // TODO: Make this form match the class schema
+  import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+  import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+  import PROPERTIES from '/imports/constants/PROPERTIES.js';
+  import { SlotSchema } from '/imports/api/properties/Slots.js';
+
+	export default {
+    components: {
+			FormSection,
+		},
+    mixins: [propertyFormMixin],
+    inject: {
+      context: { default: {} }
+    },
+    props: {
+      classForm: Boolean,
+    },
+    data(){
+      let slotTypes = [];
+      for (let key in PROPERTIES){
+         slotTypes.push({text: PROPERTIES[key].name, value: key});
+      }
+      return {
+        slotTypes,
+        addExtraTagsLoading: false,
+        extraTagOperations: ['OR', 'NOT'],
+      };
+    },
+    computed: {
+      extraTagsFull(){
+        if (!this.model.extraTags) return false;
+        let maxCount = SlotSchema.get('extraTags', 'maxCount');
+        return this.model.extraTags.length >= maxCount;
+      }
+    },
+    methods: {
+			acknowledgeAddResult(){
+				this.addExtraTagsLoading = false;
+			},
+      addExtraTags(){
+				this.addExtraTagsLoading = true;
+				this.$emit('push', {
+					path: ['extraTags'],
+          value: {
+            _id: Random.id(),
+            operation: 'OR',
+            tags: [],
+          },
+					ack: this.acknowledgeAddResult,
+				});
+			},
+		},
+	};
+</script>
diff --git a/app/imports/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
index 09627057..1687a2cb 100644
--- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js
+++ b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
@@ -3,6 +3,7 @@ const AdjustmentForm = () => import('/imports/ui/properties/forms/AdjustmentForm
 const AttributeForm = () => import('/imports/ui/properties/forms/AttributeForm.vue');
 const BuffForm = () => import('/imports/ui/properties/forms/BuffForm.vue');
 const BranchForm = () => import('/imports/ui/properties/forms/BranchForm.vue');
+const ClassForm = () => import('/imports/ui/properties/forms/ClassForm.vue');
 const ClassLevelForm = () => import('/imports/ui/properties/forms/ClassLevelForm.vue');
 const ConstantForm = () => import('/imports/ui/properties/forms/ConstantForm.vue');
 const ContainerForm = () => import('/imports/ui/properties/forms/ContainerForm.vue');
@@ -32,8 +33,8 @@ export default {
   branch: BranchForm,
   constant: ConstantForm,
   container: ContainerForm,
+  class: ClassForm,
   classLevel: ClassLevelForm,
-  class: SlotForm,
   damage: DamageForm,
   damageMultiplier: DamageMultiplierForm,
   effect: EffectForm,
diff --git a/app/imports/ui/properties/viewers/ClassViewer.vue b/app/imports/ui/properties/viewers/ClassViewer.vue
new file mode 100644
index 00000000..26e4ffbd
--- /dev/null
+++ b/app/imports/ui/properties/viewers/ClassViewer.vue
@@ -0,0 +1,91 @@
+<template lang="html">
+  <div class="class-viewer">
+    <v-row dense>
+      <property-field
+        name="Variable Name"
+        mono
+        :value="model.variableName"
+      />
+      <property-field
+        name="Condition"
+        :value="model.slotCondition && (model.slotCondition.value || model.slotCondition.calculation)"
+      />
+      <property-field
+        name="Tags Required"
+        :cols="{cols: 12}"
+      >
+        <div>
+          <property-tags :tags="model.slotTags" />
+          <div
+            v-for="tags in model.extraTags"
+            :key="tags._id"
+          >
+            <div class="text-caption">
+              {{ tags.operation }}
+            </div>
+            <property-tags :tags="tags.tags" />
+          </div>
+        </div>
+      </property-field>
+      <property-description
+        name="Missing Levels"
+        mono
+        :model="model.missingLevels &&
+          (model.missingLevels.length || undefined) &&
+          model.missingLevels.join(', ')
+        "
+      />
+      <property-field
+        v-if="context.creatureId"
+        name="Level"
+        :value="model.level"
+      />
+      <property-field
+        v-if="context.creatureId"
+        name="Level Up"
+        :cols="{cols: 12}"
+      >
+        <v-btn
+          v-if="model.missingLevels && model.missingLevels.length"
+          outlined
+          color="accent"
+        >
+          <v-icon left>
+            mdi-plus
+          </v-icon>
+          Get Missing Levels
+        </v-btn>
+        <v-btn
+          v-else
+          outlined
+          color="accent"
+        >
+          <v-icon left>
+            mdi-plus
+          </v-icon>
+          Level Up
+        </v-btn>
+      </property-field>
+      <property-description
+        name="Description"
+        :model="model.description"
+      />
+    </v-row>
+  </div>
+</template>
+
+<script lang="js">
+import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+
+export default {
+  mixins: [propertyViewerMixin],
+  inject: {
+    context: {
+      default: {},
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/properties/viewers/SlotViewer.vue b/app/imports/ui/properties/viewers/SlotViewer.vue
index 2c5bb3f6..36e432f1 100644
--- a/app/imports/ui/properties/viewers/SlotViewer.vue
+++ b/app/imports/ui/properties/viewers/SlotViewer.vue
@@ -16,7 +16,7 @@
       />
       <property-field
         name="Quantity"
-        :value="model.quantityExpected && model.quantityExpected.value"
+        :calculation="model.quantityExpected"
       />
       <property-field
         name="Unique"
@@ -44,12 +44,14 @@
         :model="model.description"
       />
       <property-field
-        v-if="!model.quantityExpected || !model.quantityExpected.value || model.spaceLeft"
+        v-if="context.creatureId && (!model.quantityExpected || !model.quantityExpected.value || model.spaceLeft)"
         name="Fill"
         :cols="{cols: 12}"
       >
         <fill-slot-button :model="model">
-          <v-icon left>mdi-plus</v-icon>
+          <v-icon left>
+            mdi-plus
+          </v-icon>
           Fill Slot
         </fill-slot-button>
       </property-field>
@@ -68,9 +70,14 @@
   }
 
 	export default {
-		mixins: [propertyViewerMixin],
     components: {
       FillSlotButton,
+    },
+		mixins: [propertyViewerMixin],
+    inject: {
+      context: {
+        default: {},
+      },
     },
     computed: {
       slotTypeName(){
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
index 8845fac6..1df889ee 100644
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -4,6 +4,7 @@ const AttributeViewer = () => import ('/imports/ui/properties/viewers/AttributeV
 const BuffViewer = () => import ('/imports/ui/properties/viewers/BuffViewer.vue');
 const BranchViewer = () => import ('/imports/ui/properties/viewers/BranchViewer.vue');
 const ContainerViewer = () => import ('/imports/ui/properties/viewers/ContainerViewer.vue');
+const ClassViewer = () => import ('/imports/ui/properties/viewers/ClassViewer.vue');
 const ClassLevelViewer = () => import ('/imports/ui/properties/viewers/ClassLevelViewer.vue');
 const ConstantViewer = () => import ('/imports/ui/properties/viewers/ConstantViewer.vue');
 const DamageViewer = () => import ('/imports/ui/properties/viewers/DamageViewer.vue');
@@ -31,7 +32,7 @@ export default {
   buff: BuffViewer,
   branch: BranchViewer,
   container: ContainerViewer,
-  class: SlotViewer,
+  class: ClassViewer,
   classLevel: ClassLevelViewer,
   constant: ConstantViewer,
   damage: DamageViewer,

From b484a27637e004ca4bce5a387261a6cde2ccc5c9 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 23 Jun 2022 08:39:15 +0200
Subject: [PATCH 32/56] iterated on class form to match new schema

---
 app/imports/ui/properties/forms/ClassForm.vue | 55 +++----------------
 1 file changed, 9 insertions(+), 46 deletions(-)

diff --git a/app/imports/ui/properties/forms/ClassForm.vue b/app/imports/ui/properties/forms/ClassForm.vue
index 50003919..b97e6b3b 100644
--- a/app/imports/ui/properties/forms/ClassForm.vue
+++ b/app/imports/ui/properties/forms/ClassForm.vue
@@ -22,7 +22,7 @@
         <text-field
           label="Variable name"
           :value="model.variableName"
-          hint="Use this name in calculations to reference this attribute"
+          hint="Use this name in calculations to reference this class"
           :error-messages="errors.variableName"
           @change="change('variableName', ...arguments)"
         />
@@ -43,7 +43,7 @@
       </v-btn>
       <smart-combobox
         label="Tags Required"
-        hint="The slot must be filled with a property which has all the listed tags"
+        hint="Class levels added to this class must have these tags"
         multiple
         chips
         deletable-chips
@@ -68,7 +68,7 @@
         />
         <smart-combobox
           label="Tags"
-          :hint="extras.operation === 'OR' ? 'The slot can be filled with a property that has all of these tags instead' : 'The slot cannot be filled with a property that has any of these tags'"
+          :hint="extras.operation === 'OR' ? 'The class levels can have these tags instead' : 'The class levels can not have any of these tags'"
           class="mx-2"
           multiple
           chips
@@ -86,37 +86,16 @@
       </div>
     </v-slide-x-transition>
 
-    <computed-field
-      label="Quantity"
-      hint="How many matching properties must be used to fill this slot, 0 is unlimited"
-      :model="model.quantityExpected"
-      :error-messages="errors.quantityExpected"
-      @change="({path, value, ack}) =>
-        $emit('change', {path: ['quantityExpected', ...path], value, ack})"
-    />
-
     <computed-field
       label="Condition"
-      hint="A caclulation to determine if this slot should be active"
-      placeholder="Always active"
+      hint="A caclulation to determine if this class can have levels added to it"
+      placeholder="Always allow"
       :model="model.slotCondition"
       :error-messages="errors.slotCondition"
       @change="({path, value, ack}) =>
         $emit('change', {path: ['slotCondition', ...path], value, ack})"
     />
 
-    <v-layout justify-center>
-      <v-btn
-        v-if="context.isLibraryForm"
-        color="accent"
-        class="ma-2 mb-4"
-        data-id="test-slot-button"
-        @click="testSlot"
-      >
-        Test Slot
-      </v-btn>
-    </v-layout>
-
     <inline-computation-field
       label="Description"
       :model="model.description"
@@ -126,31 +105,16 @@
     />
 
     <form-sections>
-      <form-section name="Children">
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
         <slot name="children" />
       </form-section>
 
       <form-section
         name="Advanced"
       >
-        <div class="layout wrap justify-space-between">
-          <smart-switch
-            label="Hide when full"
-            style="width: 200px; flex-grow: 0;"
-            class="mx-2"
-            :value="model.hideWhenFull"
-            :error-messages="errors.hideWhenFull"
-            @change="change('hideWhenFull', ...arguments)"
-          />
-          <smart-switch
-            label="Ignored"
-            style="width: 200px; flex-grow: 0;"
-            class="mx-2"
-            :value="model.ignored"
-            :error-messages="errors.ignored"
-            @change="change('ignored', ...arguments)"
-          />
-        </div>
         <smart-combobox
           label="Tags"
           hint="This slot's own tags which will be used to fill other slots"
@@ -166,7 +130,6 @@
 </template>
 
 <script lang="js">
-  // TODO: Make this form match the class schema
   import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
   import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
   import PROPERTIES from '/imports/constants/PROPERTIES.js';

From b2f89eceee5ac40d43721fa6e2b7d634f39e1008 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 23 Jun 2022 08:39:48 +0200
Subject: [PATCH 33/56] Fixed some bugs with characters not recomputing TODO:
 remove .variables cache from creature document, it's not viable

---
 .../actions/applyPropertyByType/applyDamage.js       |  3 +--
 app/imports/api/engine/actions/doAction.js           |  2 +-
 app/imports/api/engine/actions/doCastSpell.js        |  2 +-
 .../engine/computation/buildCreatureComputation.js   |  1 +
 .../computation/writeComputation/writeScope.js       | 12 +++++++++++-
 app/imports/api/parenting/organizeMethods.js         |  4 ++--
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
index 0978d07a..ebf7448b 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
@@ -18,10 +18,9 @@ export default function applyDamage(node, {
   const prop = node.node;
 
   // Skip if there is no parse node to work with
-  if (!prop.amount.parseNode) return;
+  if (!prop.amount?.parseNode) return;
 
   // Choose target
-
   let damageTargets = prop.target === 'self' ? [creature] : targets;
   // Determine if the hit is critical
   let criticalHit = scope['$criticalHit']?.value &&
diff --git a/app/imports/api/engine/actions/doAction.js b/app/imports/api/engine/actions/doAction.js
index a53f628d..7d75fdc5 100644
--- a/app/imports/api/engine/actions/doAction.js
+++ b/app/imports/api/engine/actions/doAction.js
@@ -79,7 +79,7 @@ const doAction = new ValidatedMethod({
     Creatures.update({
       _id: { $in: [creature._id, ...targetIds] }
     }, {
-      dirty: true
+      $set: {dirty: true},
     });
   },
 });
diff --git a/app/imports/api/engine/actions/doCastSpell.js b/app/imports/api/engine/actions/doCastSpell.js
index 8e0da001..e403e271 100644
--- a/app/imports/api/engine/actions/doCastSpell.js
+++ b/app/imports/api/engine/actions/doCastSpell.js
@@ -133,7 +133,7 @@ const doAction = new ValidatedMethod({
     Creatures.update({
       _id: { $in: [creature._id, ...targetIds] }
     }, {
-      dirty: true
+      $set: { dirty: true },
     });
   },
 });
diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index 0da96e21..2fe3c4b2 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -67,6 +67,7 @@ function getCreature(creatureId) {
   const creature = Creatures.findOne(creatureId, {
     denormalizedStats: 1,
     variables: 1,
+    dirty: 1,
   });
   console.timeEnd(`Cache miss on Creature: ${creatureId}`);
   return creature;
diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index 3bb550f8..6ab6a1e0 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -1,11 +1,16 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { EJSON } from 'meteor/ejson';
+import { omitBy } from 'lodash';
 
 export default function writeScope(creatureId, computation) {
   const scope = computation.scope;
   const variables = computation.creature?.variables || {};
   let $set, $unset;
 
+  if (computation.creature.dirty) {
+    $unset = { dirty: 1 };
+  }
+
   for (const key in scope){
     // Remove large properties that aren't likely to be accessed
     delete scope[key].parent;
@@ -22,6 +27,10 @@ export default function writeScope(creatureId, computation) {
     if (!EJSON.equals(variables[key], scope[key])) {
       if (!$set) $set = {};
       // Set the changed key in the creature variables
+      const diff = omitBy(variables[key], (v, k) => EJSON.equals(scope[key][k], v));
+      for (let subkey in diff) {
+        console.log(`${key}.${subkey}: ${variables[key][subkey]} => ${scope[key][subkey]}`)
+      }
       $set[`variables.${key}`] = scope[key];
     }
   }
@@ -35,6 +44,7 @@ export default function writeScope(creatureId, computation) {
   }
 
   if ($set || $unset) {
-    Creatures.update(creatureId, {$set, $unset});
+    const updates = Creatures.update(creatureId, { $set, $unset });
+    console.log('wrote scope: ', updates);
   }
 }
diff --git a/app/imports/api/parenting/organizeMethods.js b/app/imports/api/parenting/organizeMethods.js
index c4b822b2..88500085 100644
--- a/app/imports/api/parenting/organizeMethods.js
+++ b/app/imports/api/parenting/organizeMethods.js
@@ -61,7 +61,7 @@ const organizeDoc = new ValidatedMethod({
       Creatures.update({
         _id: { $in: creaturesToRecompute }
       }, {
-        dirty: true
+        $set: { dirty: true },
       });
     }
   },
@@ -91,7 +91,7 @@ const reorderDoc = new ValidatedMethod({
       Creatures.update({
         _id: { $in: ancestors }
       }, {
-        dirty: true
+        $set: { dirty: true },
       });
     }
   },

From 9dd84a83d2bd1d0c1618f5bba4f2e24957cb2552 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 24 Jun 2022 10:50:35 +0200
Subject: [PATCH 34/56] Started removing scope from creature doc

---
 .../utility/assignDependencyGroups.js         | 73 -------------------
 app/imports/api/engine/loadCreatures.js       |  1 +
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 app/imports/api/engine/computation/utility/assignDependencyGroups.js

diff --git a/app/imports/api/engine/computation/utility/assignDependencyGroups.js b/app/imports/api/engine/computation/utility/assignDependencyGroups.js
deleted file mode 100644
index 7a660adf..00000000
--- a/app/imports/api/engine/computation/utility/assignDependencyGroups.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import { union } from "lodash";
-
-export function assignDependencyGroups(graph) {
-  console.log('assigning dep group ids');
-  graph.forEachLink(function (link) {
-    console.dir(link);
-  });
-  // Iterate through all the nodes
-  graph.forEachNode(node => {
-    if (node._depGroupVisited) {
-      return;
-    }
-
-    // DFS all the connected nodes to this node, mark visited, put in a group,
-    // store the lowest ordered id
-    const group = [];
-    const stack = [node];
-    let top, lowestOrderId, lowestOrder;
-    while (stack.length) {
-      top = stack.pop();
-      if (top._depGroupVisited) continue;
-      if (top.data?._id && (
-        lowestOrderId === undefined ||
-        top.data?.order < lowestOrder
-      )) {
-        lowestOrderId = top.data._id;
-        lowestOrder = top.data.order;
-      }
-      group.push(top)
-      top._depGroupVisited = true;
-      graph.forEachLinkedNode(top.id, linkedNode => stack.push(linkedNode));
-    }
-    // Assign group id
-    group.forEach(node => {
-      if (!node.data?._id) return;
-      if (group.length > 1) {
-        node.data.depGroupId = lowestOrderId;
-      } else {
-        delete node.data.depGroupId;
-      }
-    });
-  });
-}
-
-
-export default function assignDependencyGroups2(graph) {
-  const groups = new Set();
-  graph.forEachLink(function (link) {
-    const from = graph.getNode(link.fromId);
-    const to = graph.getNode(link.toId);
-    let depGroup;
-    if (from._depGroup) {
-      depGroup = from._depGroup;
-      groups.delete(to._depGroup);
-    } else if (to._depGroup) {
-      depGroup = to._depGroup;
-    } else {
-      depGroup = {};
-      groups.add(depGroup);
-    }
-    depGroup.nodes = union(from._depGroup?.nodes, to._depGroup?.nodes, [from, to])
-    from._depGroup = depGroup;
-    to._depGroup = depGroup;
-  });
-  groups.forEach(g => {
-    if (!g.nodes.length) return;
-    const rootId = g.nodes[0].id;
-    g.nodes.forEach(n => {
-      if (!n.data?._id) return;
-      n.data.depGroupId = rootId;
-    });
-  });
-}
diff --git a/app/imports/api/engine/loadCreatures.js b/app/imports/api/engine/loadCreatures.js
index c6021b22..e6336680 100644
--- a/app/imports/api/engine/loadCreatures.js
+++ b/app/imports/api/engine/loadCreatures.js
@@ -107,6 +107,7 @@ class LoadedCreature {
   }
   changeMap(id, fields, map) {
     const doc = map.get(id);
+    if (!doc) return;
     for (let key in fields) {
       if (key === undefined) {
         delete doc[key];

From f07f05ca2c49db37f106aad8263435972aee3cfe Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 29 Jun 2022 14:54:25 +0200
Subject: [PATCH 35/56] Moved creature variables to their own collection
 Another big change to the engine, expect bugs

---
 .../creature/creatures/CreatureVariables.js   | 21 +++++++
 app/imports/api/creature/log/CreatureLogs.js  |  9 +--
 app/imports/api/engine/actions/doAction.js    | 13 ++++
 .../engine/computation/CreatureComputation.js |  3 +-
 .../computation/buildCreatureComputation.js   | 30 +++++++---
 .../writeComputation/writeScope.js            | 26 ++++----
 app/imports/api/engine/computeCreature.js     |  1 +
 app/imports/api/engine/loadCreatures.js       | 60 ++++++++++++++-----
 .../server/publications/singleCharacter.js    |  4 ++
 .../character/characterSheetTabs/BuildTab.vue | 34 ++++++-----
 .../characterSheetTabs/InventoryTab.vue       | 16 +++--
 .../ui/creature/slots/SlotFillDialog.vue      | 10 ++--
 app/imports/ui/log/CharacterLog.vue           |  6 +-
 .../ui/properties/viewers/SkillViewer.vue     | 11 ++--
 14 files changed, 174 insertions(+), 70 deletions(-)
 create mode 100644 app/imports/api/creature/creatures/CreatureVariables.js

diff --git a/app/imports/api/creature/creatures/CreatureVariables.js b/app/imports/api/creature/creatures/CreatureVariables.js
new file mode 100644
index 00000000..27fe0af7
--- /dev/null
+++ b/app/imports/api/creature/creatures/CreatureVariables.js
@@ -0,0 +1,21 @@
+//set up the collection for creature variables
+let CreatureVariables = new Mongo.Collection('creatureVariables');
+
+// Unique index on _creatureId
+if (Meteor.isServer) {
+  CreatureVariables._ensureIndex({ _creatureId: 1 }, { unique: true })
+}
+
+/** No schema because the structure isn't known until compute time
+ * Expect documents to looke like:
+ * {
+ *   _id: "nE8Ngd6K4L4jSxLY2",
+ *   _creatureId: "nE8Ngd6K4L4jSxLY2", // indexed reference to the creature
+ *   explicitlyDefinedVariableName: {...some creatureProperty}
+ *   implicitVariableName: {value: 10},
+ *   undefinedVariableName: {},
+ * }
+ * Where top level fields that don't start with `_` are variables on the sheet
+**/
+
+export default CreatureVariables;
diff --git a/app/imports/api/creature/log/CreatureLogs.js b/app/imports/api/creature/log/CreatureLogs.js
index 1cab572f..1ba50c1d 100644
--- a/app/imports/api/creature/log/CreatureLogs.js
+++ b/app/imports/api/creature/log/CreatureLogs.js
@@ -1,5 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import LogContentSchema from '/imports/api/creature/log/LogContentSchema.js';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
@@ -154,7 +155,6 @@ const logRoll = new ValidatedMethod({
 	}).validator(),
   run({roll, creatureId}){
     const creature = Creatures.findOne(creatureId, {fields: {
-      variables: 1,
       readers: 1,
       writers: 1,
       owner: 1,
@@ -163,6 +163,7 @@ const logRoll = new ValidatedMethod({
       avatarPicture: 1,
     }});
     assertEditPermission(creature, this.userId);
+    const variables = CreatureVariables.findOne({ _creatureId: creatureId });
     let logContent = []
     let parsedResult = undefined;
     try {
@@ -175,7 +176,7 @@ const logRoll = new ValidatedMethod({
       let {
         result: compiled,
         context
-      } = resolve('compile', parsedResult, creature.variables);
+      } = resolve('compile', parsedResult, variables);
       const compiledString = toString(compiled);
       if (!equalIgnoringWhitespace(compiledString, roll)) logContent.push({
         value: roll
@@ -183,12 +184,12 @@ const logRoll = new ValidatedMethod({
       logContent.push({
         value: compiledString
       });
-      let {result: rolled} = resolve('roll', compiled, creature.variables, context);
+      let {result: rolled} = resolve('roll', compiled, variables, context);
       let rolledString = toString(rolled);
       if (rolledString !== compiledString) logContent.push({
         value: rolledString
       });
-      let {result} = resolve('reduce', rolled, creature.variables, context);
+      let {result} = resolve('reduce', rolled, variables, context);
       let resultString = toString(result);
       if (resultString !== rolledString) logContent.push({
         value: resultString
diff --git a/app/imports/api/engine/actions/doAction.js b/app/imports/api/engine/actions/doAction.js
index 7d75fdc5..c22deff2 100644
--- a/app/imports/api/engine/actions/doAction.js
+++ b/app/imports/api/engine/actions/doAction.js
@@ -3,6 +3,7 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
@@ -38,6 +39,12 @@ const doAction = new ValidatedMethod({
     let action = CreatureProperties.findOne(actionId);
 		// Check permissions
     let creature = getRootCreatureAncestor(action);
+    const variables = CreatureVariables.findOne({
+      _creatureId: creature._id
+    }, {
+      fields: {_id: 0, _creatureId: 0},
+    });
+    creature.variables = variables;
 
     assertEditPermission(creature, this.userId);
 
@@ -46,6 +53,12 @@ const doAction = new ValidatedMethod({
     targetIds.forEach(targetId => {
       let target = Creatures.findOne(targetId);
       assertEditPermission(target, this.userId);
+      const variables = CreatureVariables.findOne({
+        _creatureId: targetId
+      }, {
+        fields: {_id: 0, _creatureId: 0},
+      });
+      target.variables = variables;
       targets.push(target);
     });
 
diff --git a/app/imports/api/engine/computation/CreatureComputation.js b/app/imports/api/engine/computation/CreatureComputation.js
index 278b3276..fb850129 100644
--- a/app/imports/api/engine/computation/CreatureComputation.js
+++ b/app/imports/api/engine/computation/CreatureComputation.js
@@ -2,7 +2,7 @@ import { EJSON } from 'meteor/ejson';
 import createGraph from 'ngraph.graph';
 
 export default class CreatureComputation {
-  constructor(properties, creature){
+  constructor(properties, creature, variables){
     // Set up fields
     this.originalPropsById =  {};
     this.propsById =  {};
@@ -12,6 +12,7 @@ export default class CreatureComputation {
     this.dependencyGraph = createGraph();
     this.errors = [];
     this.creature = creature;
+    this.variables = variables;
 
     // Store properties for easy access later
     properties.forEach(prop => {
diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index 2fe3c4b2..83cadace 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -4,6 +4,7 @@ import CreatureProperties,
   from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { loadedCreatures } from '../loadCreatures.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import computedOnlySchemas from '/imports/api/properties/computedOnlyPropertySchemasIndex.js';
 import computedSchemas from '/imports/api/properties/computedPropertySchemasIndex.js';
 import linkInventory from './buildComputation/linkInventory.js';
@@ -33,8 +34,9 @@ import removeSchemaFields from './buildComputation/removeSchemaFields.js';
 
 export default function buildCreatureComputation(creatureId){
   const creature = getCreature(creatureId);
+  const variables = getVariables(creatureId);
   const properties = getProperties(creatureId);
-  const computation = buildComputationFromProps(properties, creature);
+  const computation = buildComputationFromProps(properties, creature, variables);
   return computation;
 }
 
@@ -45,7 +47,7 @@ function getProperties(creatureId) {
     const cloneProps = EJSON.clone(props);
     return cloneProps
   }
-  console.time(`Cache miss fetching from db: ${creatureId}`)
+  // console.time(`Cache miss on creature properties: ${creatureId}`)
   const props = CreatureProperties.find({
     'ancestors.id': creatureId,
     'removed': {$ne: true},
@@ -53,29 +55,41 @@ function getProperties(creatureId) {
     sort: { order: 1 },
     fields: { icon: 0 },
   }).fetch();
-  console.timeEnd(`Cache miss fetching from db: ${creatureId}`);
+  // console.timeEnd(`Cache miss on creature properties: ${creatureId}`);
   return props;
 }
 
 function getCreature(creatureId) {
   if (loadedCreatures.has(creatureId)) {
     const loadedCreature = loadedCreatures.get(creatureId);
-    const creature = loadedCreature.creatures.get(creatureId);
+    const creature = loadedCreature.creature;
     if (creature) return creature;
   }
-  console.time(`Cache miss on Creature: ${creatureId}`);
+  // console.time(`Cache miss on Creature: ${creatureId}`);
   const creature = Creatures.findOne(creatureId, {
     denormalizedStats: 1,
     variables: 1,
     dirty: 1,
   });
-  console.timeEnd(`Cache miss on Creature: ${creatureId}`);
+  // console.timeEnd(`Cache miss on Creature: ${creatureId}`);
   return creature;
 }
 
-export function buildComputationFromProps(properties, creature){
+function getVariables(creatureId) {
+  if (loadedCreatures.has(creatureId)) {
+    const loadedCreature = loadedCreatures.get(creatureId);
+    const variables = loadedCreature.variables;
+    if (variables) return variables;
+  }
+  // console.time(`Cache miss on variables: ${creatureId}`);
+  const variables = CreatureVariables.findOne({_creatureId: creatureId});
+  // console.timeEnd(`Cache miss on variables: ${creatureId}`);
+  return variables;
+}
 
-  const computation = new CreatureComputation(properties, creature);
+export function buildComputationFromProps(properties, creature, variables){
+
+  const computation = new CreatureComputation(properties, creature, variables);
   // Dependency graph where edge(a, b) means a depends on b
   // The graph includes all dependencies even of inactive properties
   // such that any properties changing without changing their dependencies
diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index 6ab6a1e0..04858b8f 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -1,15 +1,14 @@
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { EJSON } from 'meteor/ejson';
 import { omitBy } from 'lodash';
 
 export default function writeScope(creatureId, computation) {
   const scope = computation.scope;
-  const variables = computation.creature?.variables || {};
-  let $set, $unset;
+  const variables = computation.variables || {};
+  delete variables._id;
 
-  if (computation.creature.dirty) {
-    $unset = { dirty: 1 };
-  }
+  let $set, $unset;
 
   for (const key in scope){
     // Remove large properties that aren't likely to be accessed
@@ -26,12 +25,14 @@ export default function writeScope(creatureId, computation) {
     // Only update changed fields
     if (!EJSON.equals(variables[key], scope[key])) {
       if (!$set) $set = {};
-      // Set the changed key in the creature variables
+      /* Log detailed diffs
       const diff = omitBy(variables[key], (v, k) => EJSON.equals(scope[key][k], v));
       for (let subkey in diff) {
         console.log(`${key}.${subkey}: ${variables[key][subkey]} => ${scope[key][subkey]}`)
       }
-      $set[`variables.${key}`] = scope[key];
+      */
+      // Set the changed key in the creature variables
+      $set[key] = scope[key];
     }
   }
 
@@ -39,12 +40,17 @@ export default function writeScope(creatureId, computation) {
   for (const key in variables) {
     if (!scope[key]) {
       if (!$unset) $unset = {};
-      $unset[`variables.${key}`] = 1;
+      $unset[key] = 1;
     }
   }
 
   if ($set || $unset) {
-    const updates = Creatures.update(creatureId, { $set, $unset });
-    console.log('wrote scope: ', updates);
+    const update = {};
+    if ($set) update.$set = $set;
+    if ($unset) update.$unset = $unset;
+    CreatureVariables.upsert({_creatureId: creatureId}, update);
+  }
+  if (computation.creature.dirty) {
+    Creatures.update({_creatureId: creatureId}, {$unset: { dirty: 1 }});
   }
 }
diff --git a/app/imports/api/engine/computeCreature.js b/app/imports/api/engine/computeCreature.js
index c1de8c44..d0a3d469 100644
--- a/app/imports/api/engine/computeCreature.js
+++ b/app/imports/api/engine/computeCreature.js
@@ -30,6 +30,7 @@ function computeComputation(computation, creatureId) {
       logError.location = e.stack.split('\n')[1];
     }
     console.error(logError);
+    throw e;
   } finally {
     writeErrors(creatureId, computation.errors);
   }
diff --git a/app/imports/api/engine/loadCreatures.js b/app/imports/api/engine/loadCreatures.js
index e6336680..d7a07154 100644
--- a/app/imports/api/engine/loadCreatures.js
+++ b/app/imports/api/engine/loadCreatures.js
@@ -1,6 +1,7 @@
 import { debounce } from 'lodash';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import computeCreature from './computeCreature';
 
 const COMPUTE_DEBOUNCE_TIME = 100; // ms
@@ -68,7 +69,6 @@ class LoadedCreature {
         },
       });
       
-      self.creatures = new Map();
       // Observe the creature itself
       self.creatureObserver = Creatures.find({
         _id: creatureId,
@@ -87,26 +87,62 @@ class LoadedCreature {
         },
       });
 
+      // Observe the creature's variables
+      self.variablesObserver = CreatureVariables.find({
+        _creatureId: creatureId,
+      }, {
+        fields: { _creatureId: 0},
+      }).observeChanges({
+        added(id, fields) {
+          fields._id = id;
+          self.addVariables(fields)
+        },
+        changed(id, fields) {
+          self.changeVariables(id, fields);
+        },
+        removed(id) {
+          self.removeVariables(id);
+        },
+      });
     });
   }
   stop() {
-    this.creatureObserver.stop();
     this.propertyObserver.stop();
+    this.creatureObserver.stop();
+    this.variablesObserver.stop();
   }
   addProperty(prop) {
     this.properties.set(prop._id, prop);
   }
-  addCreature(creature) {
-    this.creatures.set(creature._id, creature);
-  }
   changeProperty(id, fields) {
-    this.changeMap(id, fields, this.properties);
+    LoadedCreature.changeMap(id, fields, this.properties);
+  }
+  removeProperty(id) {
+    this.properties.delete(id)
+  }
+  addCreature(creature) {
+    this.creature = creature;
   }
   changeCreature(id, fields) {
-    this.changeMap(id, fields, this.creatures);
+    LoadedCreature.changeDoc(this.creature, fields);
   }
-  changeMap(id, fields, map) {
+  removeCreature() {
+    delete this.creature;
+  }
+  addVariables(variables) {
+    this.variables = variables;
+  }
+  changeVariables(id, fields) {
+    LoadedCreature.changeDoc(this.variables, fields);
+  }
+  removeVariables() {
+    delete this.variables;
+  }
+  static changeMap(id, fields, map) {
     const doc = map.get(id);
+    LoadedCreature.changeDoc(doc, fields);
+  }
+  static changeDoc(doc, fields) {
     if (!doc) return;
     for (let key in fields) {
       if (key === undefined) {
@@ -116,10 +152,4 @@ class LoadedCreature {
       }
     }
   }
-  removeProperty(id) {
-    this.properties.delete(id)
-  }
-  removeCreature(id) {
-    this.creatures.delete(id)
-  }
 }
diff --git a/app/imports/server/publications/singleCharacter.js b/app/imports/server/publications/singleCharacter.js
index c2ca8c0c..28d2da6f 100644
--- a/app/imports/server/publications/singleCharacter.js
+++ b/app/imports/server/publications/singleCharacter.js
@@ -1,5 +1,6 @@
 import SimpleSchema from 'simpl-schema';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import { assertViewPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
@@ -41,6 +42,9 @@ Meteor.publish('singleCharacter', function (creatureId) {
       Creatures.find({
         _id: creatureId,
       }),
+      CreatureVariables.find({
+        _creatureId: creatureId,
+      }),
       CreatureProperties.find({
         'ancestors.id': creatureId,
       }),
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index 2aad0870..d9ae0e03 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -27,33 +27,33 @@
       >
         <v-card class="class-details mb-2">
           <v-card-title
-            v-if="creature.variables.level"
+            v-if="variables.level"
             class="text-h6"
           >
-            Level {{ creature.variables.level.value }}
+            Level {{ variables.level.value }}
           </v-card-title>
           <v-list two-line>
             <v-list-item>
               <v-list-item-content>
                 <v-list-item-title
                   v-if="
-                    creature.variables.milestoneLevels &&
-                      creature.variables.milestoneLevels.value
+                    variables.milestoneLevels &&
+                      variables.milestoneLevels.value
                   "
                 >
-                  {{ creature.variables.milestoneLevels.value }} Milestone levels
+                  {{ variables.milestoneLevels.value }} Milestone levels
                 </v-list-item-title>
                 <v-list-item-title
                   v-if="
-                    !(creature.variables.milestoneLevels &&
-                      creature.variables.milestoneLevels.value) ||
-                      (creature.variables.xp &&
-                        creature.variables.xp.value)
+                    !(variables.milestoneLevels &&
+                      variables.milestoneLevels.value) ||
+                      (variables.xp &&
+                        variables.xp.value)
                   "
                 >
                   {{
-                    creature.variables.xp &&
-                      creature.variables.xp.value ||
+                    variables.xp &&
+                      variables.xp.value ||
                       0
                   }} XP
                 </v-list-item-title>
@@ -103,6 +103,7 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import BuildTreeNodeList from '/imports/ui/creature/buildTree/BuildTreeNodeList.vue';
 import SlotCardsToFill from '/imports/ui/creature/slots/SlotCardsToFill.vue';
+import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
 
 function traverse(tree, callback, parents = []){
   tree.forEach(node => {
@@ -152,6 +153,9 @@ export default {
     creature(){
       return Creatures.findOne(this.creatureId);
     },
+    variables() {
+      return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {};
+    },
     classLevels(){
       return CreatureProperties.find({
         'ancestors.id': this.creatureId,
@@ -217,8 +221,8 @@ export default {
         elementId: 'experience-add-button',
         data: {
           creatureIds: [this.creatureId],
-          startAsMilestone: this.creature.variables.milestoneLevels &&
-            !!this.creature.variables.milestoneLevels.value,
+          startAsMilestone: this.variables.milestoneLevels &&
+            !!this.variables.milestoneLevels.value,
         },
       });
     },
@@ -228,8 +232,8 @@ export default {
         elementId: 'experience-info-button',
         data: {
           creatureId: this.creatureId,
-          startAsMilestone: this.creature.variables.milestoneLevels &&
-            !!this.creature.variables.milestoneLevels.value,
+          startAsMilestone: this.variables.milestoneLevels &&
+            !!this.variables.milestoneLevels.value,
         },
       });
     },
diff --git a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
index 6e3faac6..ad8ef5d7 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -31,12 +31,12 @@
               <v-list-item-action>
                 <v-list-item-title>
                   <coin-value
-                    :value="creature.variables && creature.variables.valueTotal && creature.variables.valueTotal.value|| 0"
+                    :value="variables && variables.valueTotal && variables.valueTotal.value|| 0"
                   />
                 </v-list-item-title>
               </v-list-item-action>
             </v-list-item>
-            <v-list-item v-if="creature.variables && creature.variables.itemsAttuned && creature.variables.itemsAttuned.value">
+            <v-list-item v-if="variables && variables.itemsAttuned && variables.itemsAttuned.value">
               <v-list-item-avatar>
                 <v-icon>$vuetify.icons.spell</v-icon>
               </v-list-item-avatar>
@@ -47,7 +47,7 @@
               </v-list-item-content>
               <v-list-item-action>
                 <v-list-item-title>
-                  {{ creature.variables.itemsAttuned.value }}
+                  {{ variables.itemsAttuned.value }}
                 </v-list-item-title>
               </v-list-item-action>
             </v-list-item>
@@ -104,6 +104,7 @@ import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/
 import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
 import CoinValue from '/imports/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
+import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
 
 export default {
 	components: {
@@ -138,6 +139,9 @@ export default {
         color: 1,
         variables: 1,
       }});
+    },
+    variables() {
+      return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {};
     },
 		containersWithoutAncestorContainers(){
 			return CreatureProperties.find({
@@ -206,9 +210,9 @@ export default {
 		},
     weightCarried(){
       return stripFloatingPointOddities(
-        this.creature.variables &&
-        this.creature.variables.weightCarried &&
-        this.creature.variables.weightCarried.value || 0
+        this.variables &&
+        this.variables.weightCarried &&
+        this.variables.weightCarried.value || 0
       );
     },
 	},
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index 497b0401..e8c19896 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -180,7 +180,7 @@
 </template>
 
 <script lang="js">
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
@@ -297,9 +297,9 @@ export default {
         return model;
       }
     },
-    creature(){
-      if (!this.creatureId) return {variables: {}};
-      return Creatures.findOne(this.creatureId);
+    variables() {
+      if (!this.creatureId) return {};
+      return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {};
     },
     currentLimit(){
       return this._subs['slotFillers'].data('limit') || 50;
@@ -363,7 +363,7 @@ export default {
         if (node.slotFillerCondition){
           try {
             let parseNode = parse(node.slotFillerCondition);
-            const {result: resultNode} = resolve('reduce', parseNode, this.creature.variables);
+            const {result: resultNode} = resolve('reduce', parseNode, this.variables);
             if (resultNode?.parseType === 'constant'){
               if (!resultNode.value){
                 node._disabledBySlotFillerCondition = true;
diff --git a/app/imports/ui/log/CharacterLog.vue b/app/imports/ui/log/CharacterLog.vue
index 6cc4e8c4..4cfdcdab 100644
--- a/app/imports/ui/log/CharacterLog.vue
+++ b/app/imports/ui/log/CharacterLog.vue
@@ -35,6 +35,7 @@
 <script lang="js">
 import CreatureLogs, { logRoll } from '/imports/api/creature/log/CreatureLogs.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { parse, prettifyParseError } from '/imports/parser/parser.js';
 import resolve, { toString } from '/imports/parser/resolve.js';
@@ -73,7 +74,7 @@ export default {
         return;
       }
       try {
-        let {result: compiled} = resolve('compile', result, this.creature.variables);
+        let {result: compiled} = resolve('compile', result, this.variables);
         this.inputHint = toString(compiled);
         return;
       } catch (e){
@@ -107,6 +108,9 @@ export default {
     creature(){
       return Creatures.findOne(this.creatureId) || {};
     },
+    variables(){
+      return CreatureVariables.findOne({_creatureId: this.creatureId}) || {};
+    },
     editPermission(){
       try {
         assertEditPermission(this.creature, Meteor.userId());
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 580be486..62adf4a7 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -126,7 +126,7 @@ import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
 import SkillProficiency from '/imports/ui/properties/components/skills/SkillProficiency.vue';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
 
 export default {
@@ -185,6 +185,9 @@ export default {
     },
   },
   meteor: {
+    variables(){
+      return CreatureVariables.findOne({_creatureId: this.context.creatureId}) || {};
+    },
     baseEffects(){
       if (this.context.creatureId){
         let creatureId = this.context.creatureId;
@@ -280,10 +283,8 @@ export default {
     proficiencyBonus(){
       let creatureId = this.context.creatureId;
       if (!creatureId) return;
-      let creature = Creatures.findOne(creatureId)
-      return creature &&
-        creature.variables.proficiencyBonus &&
-        creature.variables.proficiencyBonus.value;
+      return this.variables.proficiencyBonus &&
+        this.variables.proficiencyBonus.value;
     },
   },
 }

From 00272e7b5536d798d1d59173815fece9f653cd6c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 29 Jun 2022 15:27:12 +0200
Subject: [PATCH 36/56] Action cards now show their decendants

---
 app/imports/server/publications/library.js    |  2 ++
 app/imports/ui/components/tree/TreeNode.vue   |  8 +++--
 .../ui/components/tree/TreeNodeList.vue       |  4 ++-
 .../character/characterSheetTabs/StatsTab.vue |  8 +++++
 .../CreaturePropertiesTree.vue                |  4 ++-
 .../components/actions/ActionCard.vue         | 12 ++++++-
 .../treeNodeViews/SavingThrowTreeNode.vue     | 36 +++++++++++++++++++
 .../treeNodeViews/treeNodeViewIndex.js        |  2 ++
 8 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue

diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index 778d08a8..f1d04175 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -32,6 +32,8 @@ const LIBRARY_NODE_TREE_FIELDS = {
   value: 1,
   // Reference
   cache: 1,
+  // Saving throw
+  dc: 1,
 }
 
 export { LIBRARY_NODE_TREE_FIELDS };
diff --git a/app/imports/ui/components/tree/TreeNode.vue b/app/imports/ui/components/tree/TreeNode.vue
index a044730f..4579c441 100644
--- a/app/imports/ui/components/tree/TreeNode.vue
+++ b/app/imports/ui/components/tree/TreeNode.vue
@@ -14,6 +14,7 @@
       @click.stop="$emit('selected', node._id)"
     >
       <v-btn
+        v-if="!startExpanded"
         small
         icon
         :class="showExpanded ? 'rotate-90' : null"
@@ -26,6 +27,7 @@
       </v-btn>
       <div
         class="layout align-center justify-start pr-1"
+        :class="{'ml-4': startExpanded}"
         style="flex-grow: 0;"
       >
         <v-icon
@@ -56,6 +58,7 @@
             :group="group"
             :organize="organize"
             :selected-node="selectedNode"
+            :start-expanded="startExpanded"
             @reordered="e => $emit('reordered', e)"
             @reorganized="e => $emit('reorganized', e)"
             @selected="e => $emit('selected', e)"
@@ -112,10 +115,11 @@
         type: Object,
         default: undefined,
       },
-			selected: Boolean,
+      selected: Boolean,
+      startExpanded: Boolean,
 		},
 		data(){return {
-			expanded: this.node._ancestorOfMatchedDocument ||
+			expanded: this.startExpanded || this.node._ancestorOfMatchedDocument ||
         some(this.selectedNode?.ancestors, ref => ref.id === this.node._id) ||
         false,
 		}},
diff --git a/app/imports/ui/components/tree/TreeNodeList.vue b/app/imports/ui/components/tree/TreeNodeList.vue
index 80e11e45..f5915ca2 100644
--- a/app/imports/ui/components/tree/TreeNodeList.vue
+++ b/app/imports/ui/components/tree/TreeNodeList.vue
@@ -23,6 +23,7 @@
       :ancestors-of-selected-node="ancestorsOfSelectedNode"
       :organize="organize"
       :lazy="lazy"
+      :start-expanded="startExpanded"
       @selected="e => $emit('selected', e)"
       @reordered="e => $emit('reordered', e)"
       @reorganized="e => $emit('reorganized', e)"
@@ -58,9 +59,10 @@
         type: Array,
         default: () => [],
       },
+      startExpanded: Boolean,
 		},
 		data(){ return {
-			expanded: false,
+			expanded: this.startExpanded || false,
       displayedChildren: [],
 		}},
 		computed: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 9862591f..17dfce2d 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -250,6 +250,7 @@
           :model="action"
           :data-id="action._id"
           @click="clickProperty({_id: action._id})"
+          @sub-click="_id => clickTreeProperty({_id})"
         />
       </div>
       <div
@@ -515,6 +516,13 @@
 					elementId: `${_id}`,
 					data: {_id},
 				});
+      },
+      clickTreeProperty({_id}){
+				this.$store.commit('pushDialogStack', {
+					component: 'creature-property-dialog',
+					elementId: `tree-node-${_id}`,
+					data: {_id},
+				});
 			},
 			incrementChange(_id, {type, value}){
 				if (type === 'increment'){
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
index b7eb3e34..9c1adf87 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
@@ -5,6 +5,7 @@
     :group="group"
     :organize="organize"
     :selected-node="selectedNode"
+    :start-expanded="expanded"
     @selected="e => $emit('selected', e)"
     @reordered="reordered"
     @reorganized="reorganized"
@@ -38,7 +39,8 @@
 			group: {
 				type: String,
 				default: 'creatureProperties'
-			}
+			},
+			expanded: Boolean,
 		},
 		meteor: {
 			children(){
diff --git a/app/imports/ui/properties/components/actions/ActionCard.vue b/app/imports/ui/properties/components/actions/ActionCard.vue
index be20ce44..50f22c18 100644
--- a/app/imports/ui/properties/components/actions/ActionCard.vue
+++ b/app/imports/ui/properties/components/actions/ActionCard.vue
@@ -93,6 +93,14 @@
           :markdown="model.summary.value || model.summary.text"
         />
       </template>
+      <v-divder v-if="model.children && model.children.length" />
+      <creature-properties-tree
+        style="width: 100%;"
+        expanded
+        :root="{collection: 'creatureProperties', id: model._id}"
+        @length="childrenLength = $event"
+        @selected="e => $emit('sub-click', e)"
+      />
     </div>
     <card-highlight :active="hovering" />
   </v-card>
@@ -109,6 +117,7 @@ import RollPopup from '/imports/ui/components/RollPopup.vue';
 import MarkdownText from '/imports/ui/components/MarkdownText.vue';
 import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
 import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
 
 export default {
   components: {
@@ -117,7 +126,8 @@ export default {
     MarkdownText,
     PropertyIcon,
     RollPopup,
-    CardHighlight
+    CardHighlight,
+    CreaturePropertiesTree,
   },
   inject: {
     context: {
diff --git a/app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue b/app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
new file mode 100644
index 00000000..10767f99
--- /dev/null
+++ b/app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
@@ -0,0 +1,36 @@
+<template lang="html">
+  <div class="layout align-center justify-start">
+    <property-icon
+      v-if="!hideIcon"
+      class="mr-2"
+      :model="model"
+      :color="model.color"
+      :class="selected && 'primary--text'"
+    />
+    <div class="text-no-wrap text-truncate">
+      <template v-if="model.dc && Number.isFinite(model.dc.value)">
+        DC {{ model.dc.value }}
+      </template>
+      {{ title }}
+    </div>
+  </div>
+</template>
+
+<script lang="js">
+import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import PROPERTIES from '/imports/constants/PROPERTIES.js';
+
+export default {
+mixins: [treeNodeViewMixin],
+computed: {
+  title() {
+    let model = this.model;
+    if (!model) return;
+    if (model.name) return model.name;
+    if (model.stat) return model.stat;
+    let prop = PROPERTIES[model.type]
+    return prop && prop.name;
+    }
+  }
+}
+</script>
diff --git a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js b/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
index 26d52ca0..1f9772e8 100644
--- a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
+++ b/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
@@ -7,6 +7,7 @@ import EffectTreeNode from '/imports/ui/properties/treeNodeViews/EffectTreeNode.
 import ClassLevelTreeNode from '/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue';
 import ProficiencyTreeNode from '/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue';
 import ReferenceTreeNode from '/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue';
+import SavingThrowTreeNode from '/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue';
 
 export default {
   default: DefaultTreeNode,
@@ -18,4 +19,5 @@ export default {
   item: ItemTreeNode,
   proficiency: ProficiencyTreeNode,
   reference: ReferenceTreeNode,
+  savingThrow: SavingThrowTreeNode,
 }

From 292388dead31517932f39aa8ccf187d6aa9f448a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 29 Jun 2022 15:35:12 +0200
Subject: [PATCH 37/56] Iterated on class UI

---
 app/imports/ui/properties/forms/ClassForm.vue | 136 +++++++++---------
 .../ui/properties/viewers/ClassViewer.vue     |   1 +
 2 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/app/imports/ui/properties/forms/ClassForm.vue b/app/imports/ui/properties/forms/ClassForm.vue
index b97e6b3b..d301b750 100644
--- a/app/imports/ui/properties/forms/ClassForm.vue
+++ b/app/imports/ui/properties/forms/ClassForm.vue
@@ -28,73 +28,6 @@
         />
       </v-col>
     </v-row>
-    <v-layout align-center>
-      <v-btn
-        icon
-        style="margin-top: -30px;"
-        class="mr-2"
-        :loading="addExtraTagsLoading"
-        :disabled="extraTagsFull"
-        @click="addExtraTags"
-      >
-        <v-icon>
-          mdi-plus
-        </v-icon>
-      </v-btn>
-      <smart-combobox
-        label="Tags Required"
-        hint="Class levels added to this class must have these tags"
-        multiple
-        chips
-        deletable-chips
-        :value="model.slotTags"
-        :error-messages="errors.slotTags"
-        @change="change('slotTags', ...arguments)"
-      />
-    </v-layout>
-    <v-slide-x-transition group>
-      <div
-        v-for="(extras, i) in model.extraTags"
-        :key="extras._id"
-        class="extra-tags layout align-center justify-space-between"
-      >
-        <smart-select
-          label="Operation"
-          style="width: 90px; flex-grow: 0;"
-          :items="extraTagOperations"
-          :value="extras.operation"
-          :error-messages="errors.extraTags && errors.extraTags[i]"
-          @change="change(['extraTags', i, 'operation'], ...arguments)"
-        />
-        <smart-combobox
-          label="Tags"
-          :hint="extras.operation === 'OR' ? 'The class levels can have these tags instead' : 'The class levels can not have any of these tags'"
-          class="mx-2"
-          multiple
-          chips
-          deletable-chips
-          :value="extras.tags"
-          @change="change(['extraTags', i, 'tags'], ...arguments)"
-        />
-        <v-btn
-          icon
-          style="margin-top: -30px;"
-          @click="$emit('pull', {path: ['extraTags', i]})"
-        >
-          <v-icon>mdi-delete</v-icon>
-        </v-btn>
-      </div>
-    </v-slide-x-transition>
-
-    <computed-field
-      label="Condition"
-      hint="A caclulation to determine if this class can have levels added to it"
-      placeholder="Always allow"
-      :model="model.slotCondition"
-      :error-messages="errors.slotCondition"
-      @change="({path, value, ack}) =>
-        $emit('change', {path: ['slotCondition', ...path], value, ack})"
-    />
 
     <inline-computation-field
       label="Description"
@@ -117,13 +50,80 @@
       >
         <smart-combobox
           label="Tags"
-          hint="This slot's own tags which will be used to fill other slots"
+          hint="This class's own tags"
           multiple
           chips
           deletable-chips
           :value="model.tags"
           @change="change('tags', ...arguments)"
         />
+        <v-layout align-center>
+          <v-btn
+            icon
+            style="margin-top: -30px;"
+            class="mr-2"
+            :loading="addExtraTagsLoading"
+            :disabled="extraTagsFull"
+            @click="addExtraTags"
+          >
+            <v-icon>
+              mdi-plus
+            </v-icon>
+          </v-btn>
+          <smart-combobox
+            label="Tags Required"
+            hint="Class levels added to this class must have these tags"
+            multiple
+            chips
+            deletable-chips
+            :value="model.slotTags"
+            :error-messages="errors.slotTags"
+            @change="change('slotTags', ...arguments)"
+          />
+        </v-layout>
+        <v-slide-x-transition group>
+          <div
+            v-for="(extras, i) in model.extraTags"
+            :key="extras._id"
+            class="extra-tags layout align-center justify-space-between"
+          >
+            <smart-select
+              label="Operation"
+              style="width: 90px; flex-grow: 0;"
+              :items="extraTagOperations"
+              :value="extras.operation"
+              :error-messages="errors.extraTags && errors.extraTags[i]"
+              @change="change(['extraTags', i, 'operation'], ...arguments)"
+            />
+            <smart-combobox
+              label="Tags"
+              :hint="extras.operation === 'OR' ? 'The class levels can have these tags instead' : 'The class levels can not have any of these tags'"
+              class="mx-2"
+              multiple
+              chips
+              deletable-chips
+              :value="extras.tags"
+              @change="change(['extraTags', i, 'tags'], ...arguments)"
+            />
+            <v-btn
+              icon
+              style="margin-top: -30px;"
+              @click="$emit('pull', {path: ['extraTags', i]})"
+            >
+              <v-icon>mdi-delete</v-icon>
+            </v-btn>
+          </div>
+        </v-slide-x-transition>
+
+        <computed-field
+          label="Condition"
+          hint="A caclulation to determine if this class can have levels added to it"
+          placeholder="Always allow"
+          :model="model.slotCondition"
+          :error-messages="errors.slotCondition"
+          @change="({path, value, ack}) =>
+            $emit('change', {path: ['slotCondition', ...path], value, ack})"
+        />
       </form-section>
     </form-sections>
   </div>
diff --git a/app/imports/ui/properties/viewers/ClassViewer.vue b/app/imports/ui/properties/viewers/ClassViewer.vue
index 26e4ffbd..44322a52 100644
--- a/app/imports/ui/properties/viewers/ClassViewer.vue
+++ b/app/imports/ui/properties/viewers/ClassViewer.vue
@@ -11,6 +11,7 @@
         :value="model.slotCondition && (model.slotCondition.value || model.slotCondition.calculation)"
       />
       <property-field
+        v-if="(model.slotTags && model.slotTags.length) || (model.extraTags && model.extraTags.length)"
         name="Tags Required"
         :cols="{cols: 12}"
       >

From 1a71c2cfa7feed3a82d4ccbe192221d8e7b0c391 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 4 Jul 2022 13:55:41 +0200
Subject: [PATCH 38/56] Began implementing class level up UI

---
 .../methods/getSlotFillFilter.js              |  29 +-
 app/imports/server/publications/library.js    |   1 +
 .../server/publications/slotFillers.js        |  59 +++
 .../ui/creature/slots/LevelUpDialog.vue       | 406 ++++++++++++++++++
 .../ui/dialogStack/DialogComponentIndex.js    |   2 +
 .../ui/properties/viewers/ClassViewer.vue     |  32 +-
 6 files changed, 513 insertions(+), 16 deletions(-)
 create mode 100644 app/imports/ui/creature/slots/LevelUpDialog.vue

diff --git a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
index 1bba9421..177225b0 100644
--- a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
+++ b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
@@ -15,9 +15,30 @@ export default function getSlotFillFilter({slot, libraryIds}){
         slotFillerType: slot.slotType,
       }]
     });
+  } else if (slot.type === 'class') {
+    filter.$and.push({
+      $or: [{
+        type: 'classLevel',
+      },{
+        type: 'slotFiller',
+        slotFillerType: 'classLevel',
+      }]
+    });
+    filter.variableName = slot.variableName;
+
+    // Only search for levels the class needs
+    const levels = [];
+    if (slot.missingLevels && slot.missingLevels.length) {
+      levels.push(...slot.missingLevels);
+    } else if (slot.level) {
+      levels.push(slot.level);
+    }
+    if (levels.length) {
+      filter.level = {$or: levels};
+    }
   }
   let tagsOr = [];
-  let tagsNor = [];
+  let tagsNin = [];
   if (slot.slotTags && slot.slotTags.length){
     tagsOr.push({tags: {$all: slot.slotTags}});
   }
@@ -27,15 +48,15 @@ export default function getSlotFillFilter({slot, libraryIds}){
       if (extra.operation === 'OR'){
         tagsOr.push({tags: {$all: extra.tags}});
       } else if (extra.operation === 'NOT'){
-        tagsNor.push({tags: {$all: extra.tags}});
+        tagsNin.push(...extra.tags);
       }
     });
   }
   if (tagsOr.length){
     filter.$and.push({$or: tagsOr});
   }
-  if (tagsNor.length){
-    filter.$and.push({$nor: tagsNor});
+  if (tagsNin.length){
+    filter.$and.push({$nin: tagsNin});
   }
   if (!filter.$and.length){
     delete filter.$and;
diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index f1d04175..00a45a5b 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -28,6 +28,7 @@ const LIBRARY_NODE_TREE_FIELDS = {
   amount: 1,
   // Class level
   level: 1,
+  variableName: 1,
   // Proficiency
   value: 1,
   // Reference
diff --git a/app/imports/server/publications/slotFillers.js b/app/imports/server/publications/slotFillers.js
index 3dd6d141..e97fa20f 100644
--- a/app/imports/server/publications/slotFillers.js
+++ b/app/imports/server/publications/slotFillers.js
@@ -88,3 +88,62 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
     });
   });
 });
+
+Meteor.publish('classFillers', function(classId){
+  let self = this;
+  if (!classId) return [];
+
+  this.autorun(function (){
+    let userId = this.userId;
+    if (!userId) {
+      return [];
+    }
+    // Get the class
+    let classProp = CreatureProperties.findOne(classId);
+    if (!classProp){
+      return [];
+    }
+
+    // Get all the ids of libraries the user can access
+    const user = Meteor.users.findOne(userId, {
+      fields: {subscribedLibraries: 1}
+    });
+    const subs = user && user.subscribedLibraries || [];
+    let libraries = Libraries.find({
+      $or: [
+        {owner: userId},
+        {writers: userId},
+        {readers: userId},
+        {_id: {$in: subs}},
+      ]
+    }, {
+      fields: {_id: 1, name: 1},
+    });
+    let libraryIds = libraries.map(lib => lib._id);
+
+    // Build a filter for nodes in those libraries that match the slot
+    let filter = getSlotFillFilter({slot: classProp, libraryIds});
+
+    this.autorun(function(){
+      // Get the limit of the documents the user can fetch
+      var limit = self.data('limit') || 50;
+      check(limit, Number);
+
+      let options = {
+        sort: {
+          name: 1,
+          order: 1,
+        },
+        fields: FIELDS,
+        limit,
+      };
+
+      self.autorun(function () {
+        self.setData('countAll', LibraryNodes.find(filter).count());
+      });
+      self.autorun(function () {
+        return [LibraryNodes.find(filter, options), libraries];
+      });
+    });
+  });
+});
diff --git a/app/imports/ui/creature/slots/LevelUpDialog.vue b/app/imports/ui/creature/slots/LevelUpDialog.vue
new file mode 100644
index 00000000..4eba1043
--- /dev/null
+++ b/app/imports/ui/creature/slots/LevelUpDialog.vue
@@ -0,0 +1,406 @@
+<template lang="html">
+  <dialog-base
+    :color="model.color"
+    dark-body
+  >
+    <template slot="toolbar">
+      <v-toolbar-title>
+        {{ model.name }}
+      </v-toolbar-title>
+      <v-spacer />
+      <v-text-field
+        v-model="searchInput"
+        prepend-inner-icon="mdi-magnify"
+        regular
+        clearable
+        hide-details
+        class="flex-grow-0"
+        style="flex-basis: 300px;"
+        :loading="searchLoading"
+        @change="searchValue = searchInput || undefined"
+        @click:clear="searchValue = undefined"
+      />
+    </template>
+    <property-description
+      text
+      :string="model.description"
+    />
+    <p>
+      {{ slotPropertyTypeName }} with tags:
+      <property-tags
+        v-for="(tags, index) in tagsSearched.or"
+        :key="index"
+        :tags="tags"
+        :prefix="index ? 'OR' : undefined"
+      />
+      <property-tags
+        v-for="(tags, index) in tagsSearched.not"
+        :key="index"
+        :tags="tags"
+        prefix="NOT"
+      />
+    </p>
+    <v-expansion-panels
+      multiple
+      inset
+    >
+      <template v-for="libraryNode in libraryNodes">
+        <v-expansion-panel
+          v-if="showDisabled || !libraryNode._disabledBySlotFillerCondition"
+          :key="libraryNode._id"
+          :model="libraryNode"
+          :data-id="libraryNode._id"
+          :class="{disabled: isDisabled(libraryNode)}"
+        >
+          <v-expansion-panel-header>
+            <template #default="{ open }">
+              <v-layout
+                align-center
+                class="flex-grow-0 mr-2"
+              >
+                <v-checkbox
+                  v-if="libraryNode._disabledByAlreadyAdded"
+                  class="my-0 py-0"
+                  hide-details
+                  :input-value="true"
+                  disabled
+                />
+                <v-checkbox
+                  v-else
+                  v-model="selectedNodeIds"
+                  class="my-0 py-0"
+                  hide-details
+                  :disabled="isDisabled(libraryNode)"
+                  :value="libraryNode._id"
+                  @click.stop
+                />
+              </v-layout>
+              <v-layout column>
+                <v-layout align-center>
+                  <tree-node-view :model="libraryNode" />
+                  <div
+                    v-if="libraryNode._disabledBySlotFillerCondition"
+                    class="error--text text-no-wrap text-truncate"
+                  >
+                    {{ libraryNode.slotFillerCondition }}
+                  </div>
+                </v-layout>
+                <div class="text-caption text-no-wrap text-truncate">
+                  {{ libraryNames[libraryNode.ancestors[0].id ] }}
+                </div>
+              </v-layout>
+              <div
+                v-if="libraryNode.slotQuantityFilled !== undefined && libraryNode.slotQuantityFilled !== 1"
+                class="text-overline flex-grow-0 text-no-wrap"
+                :class="{
+                  'error--text': isDisabled(libraryNode) &&
+                    libraryNode._disabledByQuantityFilled
+                }"
+              >
+                {{ libraryNode.slotQuantityFilled }} slots
+              </div>
+              <template v-if="open">
+                <v-btn
+                  icon
+                  class="flex-grow-0"
+                  @click.stop="openPropertyDetails(libraryNode._id)"
+                >
+                  <v-icon>mdi-window-restore</v-icon>
+                </v-btn>
+              </template>
+            </template>
+          </v-expansion-panel-header>
+          <v-expansion-panel-content>
+            <library-node-expansion-content :model="libraryNode" />
+          </v-expansion-panel-content>
+        </v-expansion-panel>
+      </template>
+    </v-expansion-panels>
+    <v-layout
+      v-if="(!$subReady.classFillers && !searchValue) || currentLimit < countAll"
+      column
+      align-center
+      justify-center
+      class="ma-3"
+    >
+      <v-btn
+        :loading="!$subReady.classFillers"
+        color="accent"
+        @click="loadMore"
+      >
+        Load More
+      </v-btn>
+    </v-layout>
+    <template v-if="!showDisabled && disabledNodeCount">
+      <v-layout
+        column
+        align-center
+        justify-center
+        class="ma-3"
+      >
+        <div>
+          Requirements of {{ disabledNodeCount }} properties were not met
+        </div>
+        <v-btn
+          class="mt-2"
+          elevation="0"
+          color="accent"
+          @click="showDisabled = true"
+        >
+          Show All
+        </v-btn>
+      </v-layout>
+    </template>
+    <template slot="actions">
+      <v-btn
+        text
+        @click="$store.dispatch('popDialogStack')"
+      >
+        Cancel
+      </v-btn>
+      <v-spacer />
+      <v-btn
+        text
+        color="primary"
+        :disabled="!dummySlot && !selectedNodeIds.length"
+        @click="$store.dispatch('popDialogStack', selectedNodeIds)"
+      >
+        <template v-if="model.spaceLeft">
+          {{ totalQuantitySelected }} / {{ model.spaceLeft }}
+        </template>
+        <template v-if="classId">
+          Insert
+        </template>
+        <template v-else>
+          Close Test
+        </template>
+      </v-btn>
+    </template>
+  </dialog-base>
+</template>
+
+<script lang="js">
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import resolve, { toString } from '/imports/parser/resolve.js';
+import { prettifyParseError, parse } from '/imports/parser/parser.js';
+// import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
+import Libraries from '/imports/api/library/Libraries.js';
+import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
+import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+import { clone } from 'lodash';
+
+export default {
+  components: {
+		DialogBase,
+    TreeNodeView,
+    PropertyDescription,
+    LibraryNodeExpansionContent,
+    PropertyTags,
+	},
+  props:{
+    classId: {
+      type: String,
+      default: undefined,
+    },
+    creatureId: {
+      type: String,
+      default: undefined,
+    },
+    dummySlot: {
+      type: Object,
+      default: undefined,
+    },
+  },
+  data(){return {
+    selectedNodeIds: [],
+    searchInput: undefined,
+    searchValue: undefined,
+    showDisabled: false,
+    disabledNodeCount: undefined,
+  }},
+  reactiveProvide: {
+    name: 'context',
+    include: ['creatureId'],
+  },
+  computed: {
+    tagsSearched(){
+      let or = [];
+      let not = [];
+      if (this.model.slotTags && this.model.slotTags.length){
+        or.push(this.model.slotTags);
+      }
+      this.model.extraTags?.forEach(extras => {
+        if (extras.tags?.length){
+          if(extras.operation === 'OR'){
+            or.push(extras.tags);
+          } else if (extras.operation === 'NOT'){
+            not.push(extras.tags);
+          }
+        }
+      });
+      return {or, not};
+    },
+    slotPropertyTypeName(){
+      if (!this.model) return;
+      if (!this.model.slotType) return 'Property';
+      let propName = getPropertyName(this.model.slotType);
+      return propName;
+    },
+  },
+  methods: {
+    loadMore(){
+      if (this.currentLimit >= this.countAll) return;
+      this._subs['classFillers'].setData('limit', this.currentLimit + 50);
+    },
+    openPropertyDetails(id){
+      this.$store.commit('pushDialogStack', {
+        component: 'library-node-dialog',
+        elementId: id,
+        data: {
+          _id: id,
+        },
+      });
+    },
+    isDisabled(node){
+      return node._disabledBySlotFillerCondition ||
+        node._disabledByAlreadyAdded ||
+      (
+        node._disabledByQuantityFilled &&
+        !this.selectedNodeIds.includes(node._id)
+      )
+    },
+  },
+  meteor: {
+    $subscribe: {
+      'classFillers'(){
+        return [this.classId, this.searchValue || undefined]
+      },
+    },
+    searchLoading(){
+      return !!this.searchValue && !this.$subReady.classFillers;
+    },
+    model(){
+      if (this.classId){
+        return CreatureProperties.findOne(this.classId);
+      } else if (this.dummySlot) {
+        let model = clone(this.dummySlot)
+        if (!model.quantityExpected) model.quantityExpected = {};
+        model.quantityExpected.value = +model.quantityExpected.calculation;
+        model.spaceLeft = model.quantityExpected.value;
+        return model;
+      }
+    },
+    variables() {
+      if (!this.creatureId) return {};
+      return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {};
+    },
+    currentLimit(){
+      return this._subs['classFillers'].data('limit') || 50;
+    },
+    countAll(){
+      return this._subs['classFillers'].data('countAll');
+    },
+    alreadyAdded(){
+      let added = new Set();
+      if (!this.model.unique) return added;
+      let ancestorId;
+      if (this.model.unique === 'uniqueInSlot'){
+        ancestorId = this.model._id;
+      } else if (this.model.unique === 'uniqueInCreature'){
+        ancestorId = this.creatureId;
+      }
+      CreatureProperties.find({
+        'ancestors.id': ancestorId,
+        libraryNodeId: {$exists: true},
+        removed: {$ne: true},
+      }, {
+        fields: {libraryNodeId: 1},
+      }).forEach(prop => {
+        added.add(prop.libraryNodeId);
+      });
+      return added;
+    },
+    totalQuantitySelected(){
+      let quantitySelected = 0;
+      LibraryNodes.find({
+        _id: {$in: this.selectedNodeIds}
+      }, {
+        fields: {slotQuantityFilled: 1},
+      }).forEach(node => {
+        if (Number.isFinite(node.slotQuantityFilled)){
+          quantitySelected += node.slotQuantityFilled;
+        } else {
+          quantitySelected += 1;
+        }
+      });
+      return quantitySelected;
+    },
+    spaceLeft(){
+      if (!this.model.quantityExpected || this.model.quantityExpected.value === 0) return undefined;
+      return this.model.spaceLeft - this.totalQuantitySelected;
+    },
+    libraryNames(){
+      let names = {};
+      Libraries.find().forEach(lib => names[lib._id] = lib.name)
+      return names;
+    },
+    libraryNodes(){
+      let filter = getSlotFillFilter({slot: this.model});
+      let nodes = LibraryNodes.find(filter, {
+        sort: {name: 1, order: 1}
+      }).fetch();
+      let disabledNodeCount = 0;
+      // Mark classFillers whose condition isn't met or are too big to fit
+      // the quantity to fill
+      nodes.forEach(node => {
+        if (node.slotFillerCondition){
+          try {
+            let parseNode = parse(node.slotFillerCondition);
+            const {result: resultNode} = resolve('reduce', parseNode, this.variables);
+            if (resultNode?.parseType === 'constant'){
+              if (!resultNode.value){
+                node._disabledBySlotFillerCondition = true;
+                disabledNodeCount += 1;
+              }
+            } else {
+              node._disabledBySlotFillerCondition = true;
+              node._conditionError = toString(resultNode);
+              disabledNodeCount += 1;
+            }
+          } catch (e){
+            console.warn(e);
+            let error = prettifyParseError(e);
+            node._disabledBySlotFillerCondition = true;
+            node._conditionError = error;
+            disabledNodeCount += 1;
+          }
+        }
+        let quantityToFill = node.type === 'slotFiller' ? node.slotQuantityFilled : 1;
+        if (
+          quantityToFill > this.spaceLeft
+        ){
+          node._disabledByQuantityFilled = true;
+        }
+        if (this.alreadyAdded.has(node._id)){
+          node._disabledByAlreadyAdded = true;
+        }
+      });
+      this.disabledNodeCount = disabledNodeCount;
+      return nodes;
+    },
+  }
+}
+</script>
+
+<style lang="css" scoped>
+  .disabled {
+    opacity: 0.7;
+  }
+</style>
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 4f0f96e0..8fb87bc7 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -10,6 +10,7 @@ const DeleteUserAccountDialog = () => import('/imports/ui/user/DeleteUserAccount
 const ExperienceInsertDialog = () => import( '/imports/ui/creature/experiences/ExperienceInsertDialog.vue');
 const ExperienceListDialog = () => import( '/imports/ui/creature/experiences/ExperienceListDialog.vue');
 const InviteDialog = () => import('/imports/ui/user/InviteDialog.vue');
+const LevelUpDialog = () => import('/imports/ui/creature/slots/LevelUpDialog.vue');
 const LibraryCreationDialog = () => import('/imports/ui/library/LibraryCreationDialog.vue');
 const LibraryEditDialog = () => import('/imports/ui/library/LibraryEditDialog.vue');
 const LibraryNodeCreationDialog = () => import('/imports/ui/library/LibraryNodeCreationDialog.vue');
@@ -36,6 +37,7 @@ export default {
   ExperienceInsertDialog,
   ExperienceListDialog,
   InviteDialog,
+  LevelUpDialog,
   LibraryCreationDialog,
   LibraryEditDialog,
   LibraryNodeCreationDialog,
diff --git a/app/imports/ui/properties/viewers/ClassViewer.vue b/app/imports/ui/properties/viewers/ClassViewer.vue
index 44322a52..d474faec 100644
--- a/app/imports/ui/properties/viewers/ClassViewer.vue
+++ b/app/imports/ui/properties/viewers/ClassViewer.vue
@@ -47,24 +47,20 @@
         :cols="{cols: 12}"
       >
         <v-btn
-          v-if="model.missingLevels && model.missingLevels.length"
           outlined
           color="accent"
+          data-id="level-up-btn"
+          @click="levelUpDialog"
         >
           <v-icon left>
             mdi-plus
           </v-icon>
-          Get Missing Levels
-        </v-btn>
-        <v-btn
-          v-else
-          outlined
-          color="accent"
-        >
-          <v-icon left>
-            mdi-plus
-          </v-icon>
-          Level Up
+          <template v-if="model.missingLevels && model.missingLevels.length">
+            Get Missing Levels 
+          </template>
+          <template v-else>
+            Level Up
+          </template> 
         </v-btn>
       </property-field>
       <property-description
@@ -85,6 +81,18 @@ export default {
       default: {},
     },
   },
+  methods: {
+    levelUpDialog(){
+      this.$store.commit('pushDialogStack', {
+        component: 'level-up-dialog',
+        elementId: 'level-up-btn',
+        data: {
+          creatureId: this.creatureId,
+          classId: this.model._id,
+        },
+      });
+    },
+  }
 }
 </script>
 

From b8a03245ea5baf0a02851bbe01c43f37ad24c7db Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 5 Jul 2022 15:40:55 +0200
Subject: [PATCH 39/56] Level up dialog now working

---
 .../methods/getSlotFillFilter.js              | 10 +++-------
 app/imports/server/publications/library.js    |  2 ++
 .../ui/creature/slots/LevelUpDialog.vue       |  9 +--------
 .../ui/properties/viewers/ClassViewer.vue     | 19 ++++++++++++++++---
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
index 177225b0..21df0bdb 100644
--- a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
+++ b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
@@ -27,14 +27,10 @@ export default function getSlotFillFilter({slot, libraryIds}){
     filter.variableName = slot.variableName;
 
     // Only search for levels the class needs
-    const levels = [];
     if (slot.missingLevels && slot.missingLevels.length) {
-      levels.push(...slot.missingLevels);
-    } else if (slot.level) {
-      levels.push(slot.level);
-    }
-    if (levels.length) {
-      filter.level = {$or: levels};
+      filter.level = {$in: slot.missingLevels};
+    } else {
+      filter.level = (slot.level || 0) + 1;
     }
   }
   let tagsOr = [];
diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index 00a45a5b..ebfdc936 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -12,6 +12,8 @@ const LIBRARY_NODE_TREE_FIELDS = {
   order: 1,
   parent: 1,
   ancestors: 1,
+  // SlotFillers
+  slotQuantityFilled: 1,
   // Effect
   operation: 1,
   targetTags: 1,
diff --git a/app/imports/ui/creature/slots/LevelUpDialog.vue b/app/imports/ui/creature/slots/LevelUpDialog.vue
index 4eba1043..7a09eb1b 100644
--- a/app/imports/ui/creature/slots/LevelUpDialog.vue
+++ b/app/imports/ui/creature/slots/LevelUpDialog.vue
@@ -26,7 +26,6 @@
       :string="model.description"
     />
     <p>
-      {{ slotPropertyTypeName }} with tags:
       <property-tags
         v-for="(tags, index) in tagsSearched.or"
         :key="index"
@@ -247,12 +246,6 @@ export default {
       });
       return {or, not};
     },
-    slotPropertyTypeName(){
-      if (!this.model) return;
-      if (!this.model.slotType) return 'Property';
-      let propName = getPropertyName(this.model.slotType);
-      return propName;
-    },
   },
   methods: {
     loadMore(){
@@ -352,7 +345,7 @@ export default {
       return names;
     },
     libraryNodes(){
-      let filter = getSlotFillFilter({slot: this.model});
+      let filter = getSlotFillFilter({ slot: this.model });
       let nodes = LibraryNodes.find(filter, {
         sort: {name: 1, order: 1}
       }).fetch();
diff --git a/app/imports/ui/properties/viewers/ClassViewer.vue b/app/imports/ui/properties/viewers/ClassViewer.vue
index d474faec..ead3181c 100644
--- a/app/imports/ui/properties/viewers/ClassViewer.vue
+++ b/app/imports/ui/properties/viewers/ClassViewer.vue
@@ -28,10 +28,10 @@
           </div>
         </div>
       </property-field>
-      <property-description
+      <property-field
         name="Missing Levels"
         mono
-        :model="model.missingLevels &&
+        :value="model.missingLevels &&
           (model.missingLevels.length || undefined) &&
           model.missingLevels.join(', ')
         "
@@ -73,6 +73,7 @@
 
 <script lang="js">
 import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
 
 export default {
   mixins: [propertyViewerMixin],
@@ -83,13 +84,25 @@ export default {
   },
   methods: {
     levelUpDialog(){
+      let classId = this.model._id;
       this.$store.commit('pushDialogStack', {
         component: 'level-up-dialog',
         elementId: 'level-up-btn',
         data: {
-          creatureId: this.creatureId,
+          creatureId: this.context.creatureId,
           classId: this.model._id,
         },
+        callback(nodeIds){
+          if (!nodeIds || !nodeIds.length) return;
+          let newPropertyId = insertPropertyFromLibraryNode.call({
+            nodeIds,
+            parentRef: {
+              'id': classId,
+              'collection': 'creatureProperties',
+            },
+          });
+          return `tree-node-${newPropertyId}`;
+        }
       });
     },
   }

From 59ef7527b7720f61b7c63ee42be2f6157317baa6 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 9 Jul 2022 12:53:44 +0200
Subject: [PATCH 40/56] Fixed some errors with character insertion/deletion

---
 .../creatures/methods/removeCreature.js         |  2 ++
 .../computation/writeComputation/writeScope.js  |  4 ++--
 .../ui/creature/character/CharacterSheet.vue    | 11 +++++++++++
 .../character/characterSheetTabs/BuildTab.vue   |  6 ------
 .../character/characterSheetTabs/StatsTab.vue   |  5 +++--
 .../ui/dialogStack/DialogComponentIndex.js      |  2 ++
 app/imports/ui/pages/CharacterList.vue          | 17 +++++++++++++----
 7 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/app/imports/api/creature/creatures/methods/removeCreature.js b/app/imports/api/creature/creatures/methods/removeCreature.js
index 66eaa0b4..d157f5d7 100644
--- a/app/imports/api/creature/creatures/methods/removeCreature.js
+++ b/app/imports/api/creature/creatures/methods/removeCreature.js
@@ -3,11 +3,13 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertOwnership } from '/imports/api/creature/creatures/creaturePermissions.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
 
 function removeRelatedDocuments(creatureId){
+  CreatureVariables.remove({_creatureId: creatureId});
   CreatureProperties.remove({'ancestors.id': creatureId});
   CreatureLogs.remove({creatureId});
   Experiences.remove({creatureId});
diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index 04858b8f..1c5bfde3 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -1,9 +1,9 @@
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import { EJSON } from 'meteor/ejson';
-import { omitBy } from 'lodash';
 
 export default function writeScope(creatureId, computation) {
+  if (!creatureId) throw 'creatureId is required';
   const scope = computation.scope;
   const variables = computation.variables || {};
   delete variables._id;
@@ -50,7 +50,7 @@ export default function writeScope(creatureId, computation) {
     if ($unset) update.$unset = $unset;
     CreatureVariables.upsert({_creatureId: creatureId}, update);
   }
-  if (computation.creature.dirty) {
+  if (computation.creature?.dirty) {
     Creatures.update({_creatureId: creatureId}, {$unset: { dirty: 1 }});
   }
 }
diff --git a/app/imports/ui/creature/character/CharacterSheet.vue b/app/imports/ui/creature/character/CharacterSheet.vue
index 9edaf0fb..0b4870f0 100644
--- a/app/imports/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/ui/creature/character/CharacterSheet.vue
@@ -129,6 +129,16 @@ if<template>
     },
     mounted(){
       this.$store.commit('setPageTitle', this.creature && this.creature.name || 'Character Sheet');
+      this.nameObserver = Creatures.find({
+        creatureId: this.creatureId,
+      }, {
+        fields: {name: 1},
+      }).observe({
+        added: ({name}) => 
+          this.$store.commit('setPageTitle', name || 'Character Sheet'),
+        changed: ({ name }) =>
+          this.$store.commit('setPageTitle', name || 'Character Sheet'),
+      });
       let that = this;
       this.logObserver = CreatureLogs.find({
         creatureId: this.creatureId,
@@ -141,6 +151,7 @@ if<template>
       });
     },
     beforeDestroy(){
+      this.nameObserver.stop();
       this.logObserver.stop();
     },
 		meteor: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index d9ae0e03..727e1d1a 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -143,12 +143,6 @@ export default {
       return highestLevelsList;
     },
   },
-  mounted(){
-    if (this.$store.state.showDetailsDialog){
-      this.$store.commit('setShowDetailsDialog', false);
-      this.showCharacterForm();
-    }
-  },
   meteor: {
     creature(){
       return Creatures.findOne(this.creatureId);
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 17dfce2d..53f98146 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -454,9 +454,10 @@
 				return getAttributeOfType(this.creature, 'spellSlot');
 			},
       hasSpells(){
-        return getProperties(this.creature, {
+        const cursor = getProperties(this.creature, {
           type: 'spell',
-        }).count();
+        })
+        return cursor && cursor.count();
       },
 			hitDice(){
         return getAttributeOfType(this.creature, 'hitDice');
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index 8fb87bc7..c3ccea03 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -1,5 +1,6 @@
 const AddCreaturePropertyDialog = () => import('/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue');
 const ArchiveDialog = () => import('/imports/ui/creature/archive/ArchiveDialog.vue');
+const CharacterCreationDialog = () => import('/imports/ui/creature/character/CharacterCreationDialog.vue');
 const CastSpellWithSlotDialog = () => import('/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue');
 const CreatureFormDialog = () => import('/imports/ui/creature/CreatureFormDialog.vue');
 const CreaturePropertyCreationDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue');
@@ -28,6 +29,7 @@ export default {
   AddCreaturePropertyDialog,
   ArchiveDialog,
   CastSpellWithSlotDialog,
+  CharacterCreationDialog,
   CreatureFormDialog,
   CreaturePropertyCreationDialog,
   CreaturePropertyDialog,
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 953530a5..05a8c707 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -74,6 +74,7 @@
 </template>
 
 <script lang="js">
+  import { defer } from 'lodash';
   import Creatures from '/imports/api/creature/creatures/Creatures.js';
   import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
   import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
@@ -159,7 +160,7 @@
     },
     methods: {
       insertCharacter(){
-        insertCreature.call((error, result) => {
+        insertCreature.call((error, creatureId) => {
           if (error){
             console.error(error);
             snackbar({
@@ -168,10 +169,18 @@
           } else {
             this.$store.commit(
               'setTabForCharacterSheet',
-              {id: result, tab: 4}
+              {id: creatureId, tab: 4}
             );
-            this.$store.commit('setShowDetailsDialog', true);
-            this.$router.push({ path: `/character/${result}`});
+            defer(() => {
+              this.$store.commit('pushDialogStack', {
+                component: 'character-creation-dialog',
+                elementId: 'new-character-button',
+                data: {
+                  creatureId,
+                },
+              });
+            })
+            this.$router.push({ path: `/character/${creatureId}` });
           }
         });
       },

From ee89a052bc2ec77d5dfca0efbc98837d08851fef Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 13 Jul 2022 23:16:25 +0200
Subject: [PATCH 41/56] Added libraryCollections on server

---
 app/imports/api/library/LibraryCollections.js | 128 ++++++++++++++++++
 app/imports/api/users/Users.js                |  40 ++++++
 app/imports/constants/STORAGE_LIMITS.js       |   1 +
 3 files changed, 169 insertions(+)
 create mode 100644 app/imports/api/library/LibraryCollections.js

diff --git a/app/imports/api/library/LibraryCollections.js b/app/imports/api/library/LibraryCollections.js
new file mode 100644
index 00000000..9a31e99e
--- /dev/null
+++ b/app/imports/api/library/LibraryCollections.js
@@ -0,0 +1,128 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import SharingSchema from '/imports/api/sharing/SharingSchema.js';
+import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
+import { assertEditPermission, assertOwnership } from '/imports/api/sharing/sharingPermissions.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js'
+import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
+
+/**
+ * LibraryCollections are groups of libraries that are subscribed together at once
+ */
+let LibraryCollections = new Mongo.Collection('librarycollections');
+
+let LibraryCollectionSchema = new SimpleSchema({
+  name: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.name,
+  },
+  description: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.summary,
+  },
+  libraries: {
+    type: Array,
+    defaultValue: [],
+    maxCount: STORAGE_LIMITS.libraryCollectionCount,
+  },
+  'libraries.$': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+  },
+});
+
+LibraryCollectionSchema.extend(SharingSchema);
+LibraryCollections.attachSchema(LibraryCollectionSchema);
+
+export default LibraryCollections;
+
+const insertLibraryCollection = new ValidatedMethod({
+  name: 'libraryCollections.insert',
+  mixins: [
+    simpleSchemaMixin,
+  ],
+  schema: LibraryCollectionSchema.omit('owner'),
+  run(libraryCollection) {
+    if (!this.userId) {
+      throw new Meteor.Error('LibraryCollections.methods.insert.denied',
+      'You need to be logged in to insert a library');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('LibraryCollections.methods.insert.denied',
+      `The ${tier.name} tier does not allow you to insert a library collection`);
+    }
+    libraryCollection.owner = this.userId;
+    return LibraryCollections.insert(libraryCollection);
+  },
+});
+
+const updateLibraryCollection = new ValidatedMethod({
+  name: 'libraryCollections.update',
+  mixins: [
+    simpleSchemaMixin,
+  ],
+  schema: {
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    update: {
+      type: LibraryCollectionSchema.pick('name', 'description', 'libraries')
+    }
+  },
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, update}){
+    const libraryCollection = LibraryCollections.findOne(_id, {
+      fields: {
+        owner: 1,
+        writers: 1,
+      }
+    });
+    assertEditPermission(libraryCollection, this.userId);
+    return LibraryCollections.update(_id, {$set: update});
+  },
+});
+
+const removeLibraryCollection = new ValidatedMethod({
+  name: 'libraryCollections.remove',
+  validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.id
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id}){
+    const libraryCollection = LibraryCollections.findOne(_id, {
+      fields: {
+        owner: 1,
+      }
+    });
+    assertOwnership(libraryCollection, this.userId);
+    return LibraryCollections.remove(_id);
+  }
+});
+
+function getLibraryIdsByCollectionId(libraryCollectionId) {
+  const libraryCollection = LibraryCollections.findOne(libraryCollectionId)
+  return libraryCollection?.libraries || [];
+}
+
+export {
+  LibraryCollectionSchema,
+  insertLibraryCollection,
+  updateLibraryCollection,
+  removeLibraryCollection,
+  getLibraryIdsByCollectionId,
+};
diff --git a/app/imports/api/users/Users.js b/app/imports/api/users/Users.js
index 31a4d818..6f228322 100644
--- a/app/imports/api/users/Users.js
+++ b/app/imports/api/users/Users.js
@@ -8,6 +8,7 @@ import '/imports/api/users/methods/updateFileStorageUsed.js';
 
 import { some } from 'lodash';
 const defaultLibraries = process.env.DEFAULT_LIBRARIES && process.env.DEFAULT_LIBRARIES.split(',') || [];
+const defaultLibraryCollections = process.env.DEFAULT_LIBRARY_COLLECTIONS && process.env.DEFAULT_LIBRARY_COLLECTIONS.split(',') || [];
 
 const userSchema = new SimpleSchema({
 	username: {
@@ -74,6 +75,15 @@ const userSchema = new SimpleSchema({
 	},
 	'subscribedLibraries.$': {
 		type: String,
+    regEx: SimpleSchema.RegEx.Id,
+	},
+	subscribedLibraryCollections: {
+		type: Array,
+		defaultValue: defaultLibraryCollections,
+		max: 100,
+	},
+	'subscribedLibraryCollections.$': {
+		type: String,
     regEx: SimpleSchema.RegEx.Id,
 	},
   subscribedCharacters: {
@@ -270,6 +280,36 @@ Meteor.users.subscribeToLibrary = new ValidatedMethod({
 	}
 });
 
+Meteor.users.subscribeToLibraryCollection = new ValidatedMethod({
+  name: 'users.subscribeToLibraryCollection',
+	validate: new SimpleSchema({
+		libraryCollectionId:{
+			type: String,
+      regEx: SimpleSchema.RegEx.Id,
+		},
+    subscribe: {
+      type: Boolean,
+    },
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({libraryCollectionId, subscribe}){
+		if (!this.userId) throw 'Can only subscribe if logged in';
+    if (subscribe){
+      return Meteor.users.update(this.userId, {
+        $addToSet: {subscribedLibraryCollections: libraryCollectionId},
+      });
+    } else {
+      return Meteor.users.update(this.userId, {
+        $pullAll: {subscribedLibraryCollections: libraryCollectionId},
+      });
+    }
+	}
+});
+
 Meteor.users.findUserByUsernameOrEmail = new ValidatedMethod({
 	name: 'users.findUserByUsernameOrEmail',
 	validate: new SimpleSchema({
diff --git a/app/imports/constants/STORAGE_LIMITS.js b/app/imports/constants/STORAGE_LIMITS.js
index f2bd1e1f..6e116b07 100644
--- a/app/imports/constants/STORAGE_LIMITS.js
+++ b/app/imports/constants/STORAGE_LIMITS.js
@@ -31,6 +31,7 @@ const STORAGE_LIMITS = Object.freeze({
   statsToTarget: 64,
   tagCount: 64,
   writersCount: 20,
+  libraryCollectionCount: 32,
 });
 
 export default STORAGE_LIMITS;

From bf9639ae595f1248a8bb7ca8e119a97b919b5cc2 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 17 Jul 2022 22:48:48 +0200
Subject: [PATCH 42/56] Library Collections UI built

---
 app/imports/api/library/Libraries.js          |  30 ++-
 app/imports/api/library/LibraryCollections.js |  13 +-
 app/imports/server/publications/library.js    |  92 ++++++-
 app/imports/server/publications/users.js      |   1 +
 app/imports/ui/components/SharedIcon.vue      |  19 +-
 .../ui/dialogStack/DialogComponentIndex.js    |   4 +
 .../LibraryCollectionCreationDialog.vue       | 107 +++++++++
 .../library/LibraryCollectionEditDialog.vue   | 147 ++++++++++++
 .../ui/library/LibraryCollectionHeader.vue    |  86 +++++++
 .../ui/library/LibraryCollectionToolbar.vue   | 109 +++++++++
 .../ui/library/LibraryCreationDialog.vue      |  15 +-
 app/imports/ui/library/LibraryEditDialog.vue  |  25 +-
 app/imports/ui/library/LibraryListTile.vue    |  37 +++
 app/imports/ui/pages/Library.vue              | 226 ++++++++++++++++--
 app/imports/ui/pages/LibraryCollection.vue    |  72 ++++++
 app/imports/ui/pages/SingleLibrary.vue        |  18 ++
 app/imports/ui/router.js                      |  23 +-
 app/imports/ui/styles/cardTitles.css          |   3 +
 app/imports/ui/styles/stylesIndex.js          |   1 +
 19 files changed, 982 insertions(+), 46 deletions(-)
 create mode 100644 app/imports/ui/library/LibraryCollectionCreationDialog.vue
 create mode 100644 app/imports/ui/library/LibraryCollectionEditDialog.vue
 create mode 100644 app/imports/ui/library/LibraryCollectionHeader.vue
 create mode 100644 app/imports/ui/library/LibraryCollectionToolbar.vue
 create mode 100644 app/imports/ui/library/LibraryListTile.vue
 create mode 100644 app/imports/ui/pages/LibraryCollection.vue
 create mode 100644 app/imports/ui/pages/SingleLibrary.vue
 create mode 100644 app/imports/ui/styles/cardTitles.css

diff --git a/app/imports/api/library/Libraries.js b/app/imports/api/library/Libraries.js
index 358489ea..95444bc3 100644
--- a/app/imports/api/library/Libraries.js
+++ b/app/imports/api/library/Libraries.js
@@ -24,6 +24,11 @@ let LibrarySchema = new SimpleSchema({
     type: String,
     max: STORAGE_LIMITS.name,
   },
+  description: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.summary,
+  },
 });
 
 LibrarySchema.extend(SharingSchema);
@@ -76,6 +81,29 @@ const updateLibraryName = new ValidatedMethod({
 	},
 });
 
+const updateLibraryDescription = new ValidatedMethod({
+	name: 'libraries.updateDescription',
+	validate: new SimpleSchema({
+		_id: {
+			type: String,
+			regEx: SimpleSchema.RegEx.id
+		},
+		description: {
+			type: String,
+		},
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id, description}){
+		let library = Libraries.findOne(_id);
+		assertEditPermission(library, this.userId);
+		Libraries.update(_id, {$set: {description}});
+	},
+});
+
 const removeLibrary = new ValidatedMethod({
 	name: 'libraries.remove',
 	validate: new SimpleSchema({
@@ -102,4 +130,4 @@ export function removeLibaryWork(libraryId){
   LibraryNodes.remove({'ancestors.id': libraryId});
 }
 
-export { LibrarySchema, insertLibrary, updateLibraryName, removeLibrary };
+export { LibrarySchema, insertLibrary, updateLibraryName, updateLibraryDescription, removeLibrary };
diff --git a/app/imports/api/library/LibraryCollections.js b/app/imports/api/library/LibraryCollections.js
index 9a31e99e..aec4d351 100644
--- a/app/imports/api/library/LibraryCollections.js
+++ b/app/imports/api/library/LibraryCollections.js
@@ -10,9 +10,9 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
 /**
  * LibraryCollections are groups of libraries that are subscribed together at once
  */
-let LibraryCollections = new Mongo.Collection('librarycollections');
+const LibraryCollections = new Mongo.Collection('libraryCollections');
 
-let LibraryCollectionSchema = new SimpleSchema({
+const LibraryCollectionSchema = new SimpleSchema({
   name: {
     type: String,
     optional: true,
@@ -71,7 +71,14 @@ const updateLibraryCollection = new ValidatedMethod({
       regEx: SimpleSchema.RegEx.Id,
     },
     update: {
-      type: LibraryCollectionSchema.pick('name', 'description', 'libraries')
+      type: LibraryCollectionSchema
+        .pick('name', 'description', 'libraries')
+        .extend({ //make libraries optional
+          libraries: {
+            optional: true,
+            defaultValue: undefined,
+          },
+        }),
     }
   },
   rateLimit: {
diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index ebfdc936..808327ee 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -1,7 +1,9 @@
 import SimpleSchema from 'simpl-schema';
 import Libraries from '/imports/api/library/Libraries.js';
+import LibraryCollections from '/imports/api/library/LibraryCollections.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import { assertViewPermission, assertDocViewPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { union } from 'lodash';
 
 const LIBRARY_NODE_TREE_FIELDS = {
   _id: 1,
@@ -40,26 +42,90 @@ const LIBRARY_NODE_TREE_FIELDS = {
 }
 
 export { LIBRARY_NODE_TREE_FIELDS };
+  
+Meteor.publish('libraryCollection', function (libraryCollectionId) {
+  this.autorun(function () {
+    let userId = this.userId;
+    if (!userId) return [];
+    this.autorun(function () {
+      const libraryCollectionCursor = LibraryCollections.find({
+        _id: libraryCollectionId,
+        $or: [
+          { owner: userId },
+          { writers: userId },
+          { readers: userId },
+          { public: true },
+        ]
+      });
+      const libraryCollection = libraryCollectionCursor.fetch()[0];
+      if (!libraryCollection) return [ libraryCollectionCursor ];
+      this.autorun(function () {
+        const libraryCursor = Libraries.find({
+          _id: {$in: libraryCollection.libraries},
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { public: true },
+          ]
+        }, {
+          sort: { name: 1 }
+        });
+        return [ libraryCollectionCursor, libraryCursor ];
+      });
+    });
+  })
+});
 
-Meteor.publish('libraries', function(){
-  this.autorun(function (){
+Meteor.publish('libraries', function () {
+  this.autorun(function () {
     let userId = this.userId;
     if (!userId) {
       return [];
     }
     const user = Meteor.users.findOne(userId, {
-      fields: {subscribedLibraries: 1}
+      fields: { subscribedLibraries: 1, subscribedLibraryCollections: 1 }
     });
-    const subs = user && user.subscribedLibraries || [];
-    return Libraries.find({
-      $or: [
-        {owner: this.userId},
-        {writers: this.userId},
-        {readers: this.userId},
-        { _id: {$in: subs}, public: true },
-      ]
-    }, {
-      sort: {name: 1}
+
+    this.autorun(function () {
+      // Get the collections the user is subscribed to
+      const subCollections = user && user.subscribedLibraryCollections || [];
+      const libraryCollectionsCursor = LibraryCollections.find({
+        $or: [
+          { owner: userId },
+          { writers: userId },
+          { readers: userId },
+          { _id: { $in: subCollections }, public: true },
+        ]
+      }, {
+        sort: { name: 1 }
+      });
+
+      // Collate all the libraryIds in those collections
+      let collectionLibIds = [];
+      libraryCollectionsCursor.forEach(libCollection => {
+        collectionLibIds = union(collectionLibIds, libCollection.libraries);
+      });
+
+      // Get the libraries the user is subscribed to directly
+      const subs = user && user.subscribedLibraries || [];
+
+      // Combine all the library Ids
+      const libIds = union(collectionLibIds, subs);
+
+      this.autorun(function () {
+        const librariesCursor = Libraries.find({
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { _id: { $in: libIds }, public: true },
+          ]
+        }, {
+          sort: { name: 1 }
+        });
+        return [librariesCursor, libraryCollectionsCursor];
+      });
     });
   });
 });
diff --git a/app/imports/server/publications/users.js b/app/imports/server/publications/users.js
index 289f60dc..f096ccd2 100644
--- a/app/imports/server/publications/users.js
+++ b/app/imports/server/publications/users.js
@@ -10,6 +10,7 @@ Meteor.publish('user', function(){
       apiKey: 1,
       darkMode: 1,
       subscribedLibraries: 1,
+      subscribedLibraryCollections: 1,
       fileStorageUsed: 1,
       profile: 1,
       preferences: 1,
diff --git a/app/imports/ui/components/SharedIcon.vue b/app/imports/ui/components/SharedIcon.vue
index 568bd91c..936f01d0 100644
--- a/app/imports/ui/components/SharedIcon.vue
+++ b/app/imports/ui/components/SharedIcon.vue
@@ -1,6 +1,6 @@
 <template lang="html">
   <v-tooltip
-    v-if="accessRights === 'reader' || accessRights === 'writer'"
+    v-if="accessRights === 'reader' || accessRights === 'writer' || accessRights === 'public'"
     bottom
   >
     <template #activator="{ on }">
@@ -8,7 +8,7 @@
         style="opacity: 0.4"
         v-on="on"
       >
-        {{ accessRights === 'reader' ? 'mdi-file-eye' : 'mdi-file-edit' }}
+        {{ accessIcon }}
       </v-icon>
     </template>
     <span>{{ accessText }}</span>
@@ -32,13 +32,24 @@ export default {
       else if (this.model.public) return 'public';
       else return 'denied'
     },
+  },
+  computed: {
+    accessIcon() {
+      switch (this.accessRights){
+        case 'writer': return 'mdi-file-edit';
+        case 'reader': return 'mdi-file-eye';
+        case 'public': return 'mdi-cloud';
+        default: return '';
+      }
+    },
     accessText(){
       switch (this.accessRights){
         case 'writer': return 'Shared with edit permission';
         case 'reader': return 'Shared as view-only';
-        case 'public': return 'Shared as publicly viewable';
+        case 'public': return 'Shared publically';
+        default: return '';
       }
-    }
+    },
   }
 }
 </script>
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index c3ccea03..cd9e7322 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -12,6 +12,8 @@ const ExperienceInsertDialog = () => import( '/imports/ui/creature/experiences/E
 const ExperienceListDialog = () => import( '/imports/ui/creature/experiences/ExperienceListDialog.vue');
 const InviteDialog = () => import('/imports/ui/user/InviteDialog.vue');
 const LevelUpDialog = () => import('/imports/ui/creature/slots/LevelUpDialog.vue');
+const LibraryCollectionCreationDialog = () => import('/imports/ui/library/LibraryCollectionCreationDialog.vue');
+const LibraryCollectionEditDialog = () => import('/imports/ui/library/LibraryCollectionEditDialog.vue');
 const LibraryCreationDialog = () => import('/imports/ui/library/LibraryCreationDialog.vue');
 const LibraryEditDialog = () => import('/imports/ui/library/LibraryEditDialog.vue');
 const LibraryNodeCreationDialog = () => import('/imports/ui/library/LibraryNodeCreationDialog.vue');
@@ -40,6 +42,8 @@ export default {
   ExperienceListDialog,
   InviteDialog,
   LevelUpDialog,
+  LibraryCollectionCreationDialog,
+  LibraryCollectionEditDialog,
   LibraryCreationDialog,
   LibraryEditDialog,
   LibraryNodeCreationDialog,
diff --git a/app/imports/ui/library/LibraryCollectionCreationDialog.vue b/app/imports/ui/library/LibraryCollectionCreationDialog.vue
new file mode 100644
index 00000000..ed764930
--- /dev/null
+++ b/app/imports/ui/library/LibraryCollectionCreationDialog.vue
@@ -0,0 +1,107 @@
+<template lang="html">
+  <dialog-base>
+    <template slot="toolbar">
+      <v-toolbar-title>
+        New Collection
+      </v-toolbar-title>
+    </template>
+    <template>
+      <text-field
+        label="Name"
+        :value="libraryCollection.name"
+        :debounce-time="0"
+        @change="nameChanged"
+      />
+      <text-area
+        label="Description"
+        :value="libraryCollection.description"
+        :debounce-time="0"
+        @change="descriptionChanged"
+      />
+      <smart-select
+        label="Libraries"
+        :items="libraryOptions"
+        :value="libraryCollection.libraries"
+        :debounce-time="0"
+        multiple
+        chips
+        deletable-chips
+        no-data-text="No libraries found"
+        @change="librariesChanged"
+      />
+    </template>
+    <template slot="actions">
+      <v-spacer />
+      <v-btn
+        text
+        :disabled="!valid"
+        @click="$store.dispatch('popDialogStack', libraryCollection)"
+      >
+        Insert Collection
+      </v-btn>
+    </template>
+  </dialog-base>
+</template>
+
+<script lang="js">
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import Libraries from '/imports/api/library/Libraries.js';
+
+export default {
+  components: {
+    DialogBase,
+  },
+  data(){ return {
+    libraryCollection: {
+      name: 'New Collection',
+      description: undefined,
+      libraries: [],
+    },
+    valid: true,
+  }},
+  meteor: {
+    libraryOptions() {
+      const userId = Meteor.userId();
+      return Libraries.find(
+        {
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { public: true },
+          ]
+        },
+        {sort: {name: 1}}
+      ).map(library => {
+        return {
+          text: library.name,
+          value: library._id,
+        };
+      });
+    }
+  },
+  methods: {
+    nameChanged(val, ack){
+      if (val){
+        this.libraryCollection.name = val;
+        this.valid = true,
+        ack();
+      } else {
+        this.valid = false;
+        ack('Name is required')
+      }
+    },
+    descriptionChanged(val, ack){
+      this.libraryCollection.description = val;
+      ack();
+    },
+    librariesChanged(val, ack){
+      this.libraryCollection.libraries = val;
+      ack();
+    },
+  },
+};
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/library/LibraryCollectionEditDialog.vue b/app/imports/ui/library/LibraryCollectionEditDialog.vue
new file mode 100644
index 00000000..8cf2e70c
--- /dev/null
+++ b/app/imports/ui/library/LibraryCollectionEditDialog.vue
@@ -0,0 +1,147 @@
+<template lang="html">
+  <dialog-base>
+    <template slot="toolbar">
+      <v-toolbar-title>
+        {{ model && model.name }}
+      </v-toolbar-title>
+      <v-spacer />
+      <v-btn
+        icon
+        data-id="share-library-button"
+        @click="share"
+      >
+        <v-icon>mdi-share-variant</v-icon>
+      </v-btn>
+      <v-btn
+        icon
+        data-id="delete-library-button"
+        @click="remove"
+      >
+        <v-icon>mdi-delete</v-icon>
+      </v-btn>
+    </template>
+    <template v-if="model">
+      <text-field
+        label="name"
+        :value="model.name"
+        @change="(name, ack) => updateLibraryCollection({name}, ack)"
+      />
+      <text-area
+        label="Description"
+        :value="model.description"
+        @change="(description, ack) => updateLibraryCollection({description}, ack)"
+      />
+      <smart-select
+        label="Libraries"
+        :items="libraryOptions"
+        :value="model.libraries"
+        :debounce-time="0"
+        multiple
+        chips
+        deletable-chips
+        no-data-text="No libraries found"
+        @change="(libraries, ack) => updateLibraryCollection({libraries}, ack)"
+      />
+    </template>
+    <template slot="actions">
+      <v-spacer />
+      <v-btn
+        text
+        data-id="delete-library-button"
+        @click="$store.dispatch('popDialogStack')"
+      >
+        Done
+      </v-btn>
+    </template>
+  </dialog-base>
+</template>
+
+<script lang="js">
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import LibraryCollections, { updateLibraryCollection, removeLibraryCollection } from '/imports/api/library/LibraryCollections.js';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import Libraries from '/imports/api/library/Libraries.js';
+
+export default {
+	components: {
+		DialogBase,
+	},
+	props: {
+		_id: String,
+	},
+	methods: {
+    updateLibraryCollection(update, ack){
+			updateLibraryCollection.call({_id: this._id, update}, (error) =>{
+				ack(error && error.reason || error);
+			});
+    },
+		remove(){
+			let that = this;
+			this.$store.commit('pushDialogStack', {
+				component: 'delete-confirmation-dialog',
+				elementId: 'delete-library-button',
+				data: {
+					name: this.model.name,
+					typeName: 'Collection'
+				},
+				callback(confirmation){
+					if(!confirmation) return;
+					removeLibraryCollection.call({_id: that._id}, (error) => {
+            if (error) {
+              console.error(error);
+              snackbar({
+                text: error.reason,
+              });
+						} else {
+              that.$router.push({ name: 'library', replace: true });
+              that.$store.dispatch('popDialogStack');
+						}
+					});
+				}
+			});
+		},
+    share(){
+			this.$store.commit('pushDialogStack', {
+				component: 'share-dialog',
+				elementId: 'share-library-button',
+				data: {
+					docRef: {
+            id: this._id,
+            collection: 'libraryCollections',
+          }
+				},
+			});
+		},
+	},
+	meteor: {
+    '$subscribe':{
+      libraries: [],
+    },
+		model(){
+			return LibraryCollections.findOne(this._id);
+    },
+    libraryOptions() {
+      const userId = Meteor.userId();
+      return Libraries.find(
+        {
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { public: true },
+          ]
+        },
+        {sort: {name: 1}}
+      ).map(library => {
+        return {
+          text: library.name,
+          value: library._id,
+        };
+      });
+    },
+	}
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/library/LibraryCollectionHeader.vue b/app/imports/ui/library/LibraryCollectionHeader.vue
new file mode 100644
index 00000000..c31bc9fe
--- /dev/null
+++ b/app/imports/ui/library/LibraryCollectionHeader.vue
@@ -0,0 +1,86 @@
+<template lang="html">
+  <v-list-item
+    style="min-height: 60px; min-width: 0;"
+    class="px-0 font-weight-bold"
+  >
+    <v-list-item-avatar>
+      <shared-icon :model="model" />
+    </v-list-item-avatar>
+    <v-list-item-title class="d-flex align-center">
+      <div
+        class="text-truncate text-no-wrap"
+        style="opacity: 0.7"
+      >
+        {{ model.name }}
+      </div>
+      <template v-if="!selection && !dense">
+        <v-spacer />
+        <v-btn
+          v-if="canEdit"
+          icon
+          style="flex-grow: 0"
+          @click.stop="editLibraryCollection"
+        >
+          <v-icon>
+            mdi-pencil
+          </v-icon>
+        </v-btn>
+        <v-btn
+          icon
+          style="flex-grow: 0"
+          :to="{name: 'libraryCollection', params: {id: model._id}}"
+          @click.stop
+        >
+          <v-icon>
+            mdi-forward
+          </v-icon>
+        </v-btn>
+      </template>
+    </v-list-item-title>
+  </v-list-item>
+</template>
+
+<script lang="js">
+import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+
+export default {
+  components: {
+    SharedIcon,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+    open: Boolean,
+    selection: Boolean,
+    dense: Boolean,
+  },
+  data(){return {
+    renaming: false,
+  }},
+  meteor: {
+    canEdit(){
+      try {
+        assertDocEditPermission(this.model, Meteor.userId());
+        return true
+      } catch (e) {
+        return false;
+      }
+    }
+  },
+  methods: {
+    editLibraryCollection() {
+      this.$store.commit('pushDialogStack', {
+        data: { _id: this.model._id},
+        component: 'library-collection-edit-dialog',
+        elementId: `library-collection-${this.model._id}`,
+      });
+    }
+  }
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/library/LibraryCollectionToolbar.vue b/app/imports/ui/library/LibraryCollectionToolbar.vue
new file mode 100644
index 00000000..4147836e
--- /dev/null
+++ b/app/imports/ui/library/LibraryCollectionToolbar.vue
@@ -0,0 +1,109 @@
+<template lang="html">
+  <v-app-bar
+    app
+    color="secondary"
+    dark
+    tabs
+    extended
+    dense
+  >
+    <v-app-bar-nav-icon @click="toggleDrawer" />
+    <v-btn
+      icon
+      @click="$router.push('/library')"
+    >
+      <v-icon>mdi-arrow-left</v-icon>
+    </v-btn>
+    <v-toolbar-title>
+      {{ libraryCollection && libraryCollection.name }}
+    </v-toolbar-title>
+    <v-spacer />
+    <v-btn
+      v-if="showSubscribeButton"
+      text
+      :loading="loading"
+      @click="subscribe(!subscribed)"
+    >
+      {{ subscribed ? 'Unsubscribe' : 'Subscribe' }}
+    </v-btn>
+    <v-btn
+      v-if="canEdit"
+      icon
+      data-id="library-collection-edit-button"
+      @click="editLibraryCollection"
+    >
+      <v-icon>mdi-cog</v-icon>
+    </v-btn>
+  </v-app-bar>
+</template>
+
+<script lang="js">
+import LibraryCollections from '/imports/api/library/LibraryCollections.js';
+import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { mapMutations } from 'vuex';
+
+export default {
+  data(){ return {
+    loading: false,
+  }},
+  meteor: {
+    libraryCollection(){
+      return LibraryCollections.findOne(this.$route.params.id);
+    },
+    subscribed(){
+      const libraryCollectionId = this.$route.params.id;
+      const user = Meteor.user();
+      return user?.subscribedLibraryCollections?.includes(libraryCollectionId);
+    },
+    showSubscribeButton(){
+      let user = Meteor.user();
+      let libraryCollection = this.libraryCollection;
+      if (!user || !libraryCollection) return;
+      let userId = user._id;
+      if (user.subscribedLibraryCollections?.includes(libraryCollection._id)){
+        return true
+      } else if (
+        libraryCollection.readers.includes(userId) ||
+        libraryCollection.writers.includes(userId) ||
+        libraryCollection.owner === userId
+      ) {
+        return false
+      } else {
+        return true;
+      }
+    },
+    canEdit(){
+      try {
+        assertDocEditPermission(this.libraryCollection, Meteor.userId());
+        return true
+      } catch (e) {
+        return false;
+      }
+    }
+  },
+  methods: {
+    ...mapMutations([
+      'toggleDrawer',
+    ]),
+    subscribe(value){
+      this.loading = true;
+      Meteor.users.subscribeToLibraryCollection.call({
+        libraryCollectionId: this.$route.params.id,
+        subscribe: value,
+      }, () => {
+        this.loading = false;
+      });
+    },
+    editLibraryCollection(){
+			this.$store.commit('pushDialogStack', {
+				component: 'library-collection-edit-dialog',
+				elementId: 'library-collection-edit-button',
+				data: {_id: this.$route.params.id},
+			});
+		},
+  },
+}
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/library/LibraryCreationDialog.vue b/app/imports/ui/library/LibraryCreationDialog.vue
index a68deee1..55f6894d 100644
--- a/app/imports/ui/library/LibraryCreationDialog.vue
+++ b/app/imports/ui/library/LibraryCreationDialog.vue
@@ -7,11 +7,17 @@
     </template>
     <template>
       <text-field
-        label="name"
+        label="Name"
         :value="library.name"
         :debounce-time="0"
         @change="nameChanged"
       />
+      <text-area
+        label="Description"
+        :value="library.description"
+        :debounce-time="0"
+        @change="descriptionChanged"
+      />
     </template>
     <template slot="actions">
       <v-spacer />
@@ -35,7 +41,8 @@
 		},
 		data(){ return {
 			library: {
-				name: 'New Library',
+        name: 'New Library',
+        description: undefined,
 			},
 			valid: true,
 		}},
@@ -49,6 +56,10 @@
 					this.valid = false;
 					ack('Name is required')
 				}
+      },
+      descriptionChanged(val, ack){
+        this.library.description = val;
+        ack();
 			},
 		},
 	};
diff --git a/app/imports/ui/library/LibraryEditDialog.vue b/app/imports/ui/library/LibraryEditDialog.vue
index 145799da..2b08a9ae 100644
--- a/app/imports/ui/library/LibraryEditDialog.vue
+++ b/app/imports/ui/library/LibraryEditDialog.vue
@@ -26,6 +26,11 @@
         :value="model.name"
         @change="updateName"
       />
+      <text-area
+        label="Description"
+        :value="model.description"
+        @change="updateDescription"
+      />
     </template>
     <template v-if="removedDocs.length">
       <h3>Recently Deleted Properties</h3>
@@ -71,9 +76,10 @@
 
 <script lang="js">
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import Libraries, { updateLibraryName, removeLibrary } from '/imports/api/library/Libraries.js';
+import Libraries, { updateLibraryName, updateLibraryDescription, removeLibrary } from '/imports/api/library/Libraries.js';
 import LibraryNodes, { restoreLibraryNode } from '/imports/api/library/LibraryNodes.js';
 import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
 	components: {
@@ -88,7 +94,12 @@ export default {
 			updateLibraryName.call({_id: this._id, name: value}, (error) =>{
 				ack(error && error.reason || error);
 			});
-		},
+    },
+    updateDescription(value, ack){
+			updateLibraryDescription.call({_id: this._id, description: value}, (error) =>{
+				ack(error && error.reason || error);
+			});
+    },
 		remove(){
 			let that = this;
 			this.$store.commit('pushDialogStack', {
@@ -101,10 +112,14 @@ export default {
 				callback(confirmation){
 					if(!confirmation) return;
 					removeLibrary.call({_id: that._id}, (error) => {
-						if (error) {
-							console.error(error);
+            if (error) {
+              console.error(error);
+              snackbar({
+                text: error.reason,
+              });
 						} else {
-							that.$store.dispatch('popDialogStack')
+              that.$router.push({ name: 'library', replace: true });
+              that.$store.dispatch('popDialogStack');
 						}
 					});
 				}
diff --git a/app/imports/ui/library/LibraryListTile.vue b/app/imports/ui/library/LibraryListTile.vue
new file mode 100644
index 00000000..7ae679cb
--- /dev/null
+++ b/app/imports/ui/library/LibraryListTile.vue
@@ -0,0 +1,37 @@
+<template
+  lang="html"
+  functional
+>
+  <v-list-item
+    v-bind="$attrs"
+    :class="isSelected && 'primary--text v-list-item--active'"
+  >
+    <v-list-item-avatar>
+      <shared-icon :model="model" />
+    </v-list-item-avatar>
+    <v-list-item-content>
+      <v-list-item-title>
+        {{ model.name }}
+      </v-list-item-title>
+    </v-list-item-content>
+  </v-list-item>
+</template>
+
+<script lang="js" functional>
+import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+
+export default {
+  components: {
+    SharedIcon,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+    selection: Boolean,
+    isSelected: Boolean,
+    dense: Boolean,
+  }
+}
+</script>
diff --git a/app/imports/ui/pages/Library.vue b/app/imports/ui/pages/Library.vue
index d564dee1..a1f1866a 100644
--- a/app/imports/ui/pages/Library.vue
+++ b/app/imports/ui/pages/Library.vue
@@ -1,18 +1,216 @@
-<template lang="html">
-  <single-card-layout>
-    <library-and-node
-      :library-id="$route.params.id"
-    />
-  </single-card-layout>
+<template>
+  <div
+    class="card-background"
+    style="height: 100%"
+  >
+    <v-container>
+      <v-row justify="center">
+        <v-col
+          cols="12"
+          xl="8"
+        >
+          <v-card :class="{'mb-4': libraryCollections && libraryCollections.length}">
+            <v-list
+              expand
+              class="library-folder-list"
+            >
+              <library-list-tile
+                v-for="library in librariesWithoutCollection"
+                :key="library._id"
+                :model="library"
+                :to="{ name: 'singleLibrary', params: { id: library._id }}"
+              />
+              <v-list-group
+                v-for="libraryCollection in libraryCollections"
+                :key="libraryCollection._id"
+                v-model="openCollections[libraryCollection._id]"
+                group="library-collection"
+                :data-id="`library-collection-${libraryCollection._id}`"
+              >
+                <template #activator>
+                  <library-collection-header
+                    :open="openCollections[libraryCollection._id]"
+                    :model="libraryCollection"
+                  />
+                </template>
+                <library-list-tile
+                  v-for="library in libraryCollection.libraryDocuments"
+                  :key="library._id"
+                  :model="library"
+                  :to="{ name: 'singleLibrary', params: { id: library._id }}"
+                  class="ml-4"
+                />
+              </v-list-group>
+            </v-list>
+            <v-expand-transition>
+              <v-row
+                v-if="!$subReady.libraries"
+                align="center"
+                justify="center"
+                class="pa-4"
+              >
+                <v-progress-circular
+                  indeterminate
+                  color="primary"
+                  size="32"
+                />
+              </v-row>
+            </v-expand-transition>
+          </v-card>
+          <div class="layout justify-end mt-2">
+            <v-btn
+              v-if="paidBenefits"
+              text
+              data-id="insert-library-collection-button"
+              :loading="loadingInsertLibraryCollection"
+              @click="insertLibraryCollection"
+            >
+              Add Collection
+            </v-btn>
+          </div>
+          <v-btn
+            color="accent"
+            fab
+            fixed
+            bottom
+            right
+            data-id="insert-library-button"
+            :disabled="!paidBenefits"
+            @click="insertLibrary"
+          >
+            <v-icon>mdi-plus</v-icon>
+          </v-btn>
+        </v-col>
+      </v-row>
+    </v-container>
+  </div>
 </template>
 
 <script lang="js">
-  import SingleCardLayout from '/imports/ui/layouts/SingleCardLayout.vue';
-	import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
-	export default {
-		components: {
-      SingleCardLayout,
-			LibraryAndNode,
-		},
-	};
+import { union } from 'lodash';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import LibraryCollections, { insertLibraryCollection } from '/imports/api/library/LibraryCollections.js';
+import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
+import LibraryListTile from '/imports/ui/library/LibraryListTile.vue'
+import LibraryCollectionHeader from '/imports/ui/library/LibraryCollectionHeader.vue';
+
+export default {
+  components: {
+    LibraryListTile,
+    LibraryCollectionHeader,
+  },
+  data(){ return{
+    loadingInsertLibraryCollection: false,
+    openCollections: [],
+  }},
+  meteor: {
+    $subscribe: {
+      'libraries': [],
+    },
+    paidBenefits(){
+      let tier = getUserTier(Meteor.userId());
+      return tier && tier.paidBenefits;
+    },
+    libraryCollections(){
+      const userId = Meteor.userId();
+      if (!userId) return;
+      const subCollections = Meteor.user().subscribedLibraryCollections || [];
+      return LibraryCollections.find({
+        $or: [
+          { owner: userId },
+          { writers: userId },
+          { readers: userId },
+          { _id: { $in: subCollections }, public: true },
+        ]
+      }, {
+        sort: { name: 1 }
+      }).map(libCollection => {
+        libCollection.libraryDocuments = Libraries.find({
+          _id: {$in: libCollection.libraries},
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { public: true },
+          ]
+        }, {
+          sort: { name: 1 }
+        }).fetch();
+        return libCollection;
+      });
+    },
+    librariesWithoutCollection() {
+      const userId = Meteor.userId();
+      if (!this.libraryCollections) return;
+      // Collate the IDs of all the libraries in collections
+      let collectedLibraries = [];
+      this.libraryCollections.forEach(libCollection => {
+        collectedLibraries = union(collectedLibraries, libCollection.libraries);
+      });
+      // return the libraries with IDs not in that list
+      return Libraries.find(
+        {
+          _id: {$nin: collectedLibraries},
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { public: true },
+          ]
+        },
+        {sort: {name: 1}}
+      );
+    },
+  },
+  methods: {
+    insertLibrary() {
+      const self = this;
+      if (this.paidBenefits){
+        this.$store.commit('pushDialogStack', {
+          component: 'library-creation-dialog',
+          elementId: 'insert-library-button',
+          callback(library){
+            if (!library) return;
+            return insertLibrary.call(library, (error, libraryId) => {
+              if (error){
+                console.error(error);
+                snackbar({
+                  text: error.reason,
+                });
+              } else {
+                self.$router.push({
+                  name: 'singleLibrary',
+                  params: { id: libraryId }
+                });
+              }
+            });
+          }
+        });
+      } else {
+        this.$store.commit('pushDialogStack', {
+          component: 'tier-too-low-dialog',
+          elementId: 'insert-library-button',
+        });
+      }
+    },
+    insertLibraryCollection() {
+      this.$store.commit('pushDialogStack', {
+        component: 'library-collection-creation-dialog',
+        elementId: 'insert-library-collection-button',
+        callback(libraryCollection){
+          if (!libraryCollection) return;
+          const id = insertLibraryCollection.call(libraryCollection, error => {
+            if (!error) return;
+            console.error(error);
+            snackbar({
+              text: error.reason,
+            });
+          });
+          return `library-collection-${id}`
+        }
+      });
+    },
+  },
+};
 </script>
diff --git a/app/imports/ui/pages/LibraryCollection.vue b/app/imports/ui/pages/LibraryCollection.vue
new file mode 100644
index 00000000..414e2320
--- /dev/null
+++ b/app/imports/ui/pages/LibraryCollection.vue
@@ -0,0 +1,72 @@
+<template lang="html">
+  <v-container class="pa-6">
+    <v-row
+      v-if="collection && collection.description"
+      justify="center"
+      align="stretch"
+    >
+      <v-col
+        cols="12"
+      >
+        <v-card>
+          <v-card-text>
+            <markdown-text :markdown="collection.description" />
+          </v-card-text>
+        </v-card>
+      </v-col>
+    </v-row>
+    <v-row
+      align="stretch"
+    >
+      <v-col
+        v-for="library in libraries"
+        :key="library._id"
+        cols="12"
+        sm="6"
+        md="4"
+        lg="3"
+        xl="2"
+      >
+        <v-card
+          style="height: 100%;"
+          :to="{name: 'singleLibrary', params: {id: library._id}}"
+        >
+          <v-card-title>
+            {{ library.name }}
+          </v-card-title>
+          <v-card-text>
+            <markdown-text :markdown="library.description" />
+          </v-card-text>
+        </v-card>
+      </v-col>
+    </v-row> 
+  </v-container>
+</template>
+
+<script lang="js">
+import LibraryCollections from '/imports/api/library/LibraryCollections.js';
+import Libraries from '/imports/api/library/Libraries.js';
+import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+
+export default {
+  components: {
+    MarkdownText,
+  },
+  meteor: {
+    $subscribe: {
+      'libraryCollection'() {
+        return [this.$route.params.id];
+      },
+    },
+    collection() {
+      return LibraryCollections.findOne(this.$route.params.id);
+    },
+    libraries() {
+      if (!this.collection) return;
+      return Libraries.find({
+        _id: { $in: this.collection.libraries },
+      });
+    }
+  }   
+}
+</script>
diff --git a/app/imports/ui/pages/SingleLibrary.vue b/app/imports/ui/pages/SingleLibrary.vue
new file mode 100644
index 00000000..d564dee1
--- /dev/null
+++ b/app/imports/ui/pages/SingleLibrary.vue
@@ -0,0 +1,18 @@
+<template lang="html">
+  <single-card-layout>
+    <library-and-node
+      :library-id="$route.params.id"
+    />
+  </single-card-layout>
+</template>
+
+<script lang="js">
+  import SingleCardLayout from '/imports/ui/layouts/SingleCardLayout.vue';
+	import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+	export default {
+		components: {
+      SingleCardLayout,
+			LibraryAndNode,
+		},
+	};
+</script>
diff --git a/app/imports/ui/router.js b/app/imports/ui/router.js
index 4295e83a..3108b505 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/ui/router.js
@@ -7,7 +7,8 @@ const About = () => import('/imports/ui/pages/About.vue');
 const CharacterList = () => import('/imports/ui/pages/CharacterList.vue');
 const CharacterListToolbarItems = () => import('/imports/ui/creature/creatureList/CharacterListToolbarItems.vue');
 const Library = () => import('/imports/ui/pages/Library.vue');
-const SingleLibraryToolbar = () => import('/imports/ui/library/SingleLibraryToolbar.vue');
+const LibraryCollection = () => import('/imports/ui/pages/LibraryCollection.vue');
+const LibraryCollectionToolbar = () => import('/imports/ui/library/LibraryCollectionToolbar.vue');
 const CharacterSheetPage = () => import('/imports/ui/pages/CharacterSheetPage.vue');
 const CharacterSheetToolbar = () => import('/imports/ui/creature/character/CharacterSheetToolbar.vue');
 const CharacterSheetRightDrawer = () => import('/imports/ui/creature/character/CharacterSheetRightDrawer.vue');
@@ -24,6 +25,8 @@ const EmailVerificationError = () => import('/imports/ui/pages/EmailVerification
 const ResetPassword = () => import('/imports/ui/pages/ResetPassword.vue' );
 const NotImplemented = () => import('/imports/ui/pages/NotImplemented.vue');
 const PatreonLevelTooLow = () => import('/imports/ui/pages/PatreonLevelTooLow.vue');
+const SingleLibrary = () => import('/imports/ui/pages/SingleLibrary.vue');
+const SingleLibraryToolbar = () => import('/imports/ui/library/SingleLibraryToolbar.vue');
 const Tabletops = () => import('/imports/ui/pages/Tabletops.vue');
 const Tabletop = () => import('/imports/ui/pages/Tabletop.vue');
 const TabletopToolbar = () => import('/imports/ui/tabletop/TabletopToolbar.vue');
@@ -120,7 +123,8 @@ RouterFactory.configure(router => {
         title: 'Home',
       },
     },{
-      path: '/characterList',
+      path: '/character-list',
+      alias: '/characterList',
       components: {
         default: CharacterList,
         toolbarItems: CharacterListToolbarItems,
@@ -129,7 +133,8 @@ RouterFactory.configure(router => {
         title: 'Character List',
       },
       beforeEnter: ensureLoggedIn,
-    },{
+    }, {
+      name: 'library',
       path: '/library',
       components: {
         default: Library,
@@ -142,12 +147,22 @@ RouterFactory.configure(router => {
       name: 'singleLibrary',
       path: '/library/:id',
       components: {
-        default: Library,
+        default: SingleLibrary,
         toolbar: SingleLibraryToolbar,
       },
       meta: {
         title: 'Library',
       },
+    },{
+      name: 'libraryCollection',
+      path: '/library-collection/:id',
+      components: {
+        default: LibraryCollection,
+        toolbar: LibraryCollectionToolbar,
+      },
+      meta: {
+        title: 'Library Collection',
+      },
     },{
       path: '/character/:id',
       alias: '/character/:id/:urlName',
diff --git a/app/imports/ui/styles/cardTitles.css b/app/imports/ui/styles/cardTitles.css
new file mode 100644
index 00000000..b45ce973
--- /dev/null
+++ b/app/imports/ui/styles/cardTitles.css
@@ -0,0 +1,3 @@
+.v-card__title {
+  word-break: normal !important;
+}
\ No newline at end of file
diff --git a/app/imports/ui/styles/stylesIndex.js b/app/imports/ui/styles/stylesIndex.js
index a49f5cd0..383664b1 100644
--- a/app/imports/ui/styles/stylesIndex.js
+++ b/app/imports/ui/styles/stylesIndex.js
@@ -1,4 +1,5 @@
 import './cardColors.css';
+import './cardTitles.css';
 import './centeredInputs.css';
 import './denseLists.css';
 import './fitAvatars.css';

From f8e9131bdda032862f603ef60ea530023f1b99bd Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 18 Jul 2022 13:45:14 +0200
Subject: [PATCH 43/56] Vastly improved new character UX Characters now can
 limit which libraries they allow

---
 .../methods/insertPropertyFromLibraryNode.js  |  11 +-
 .../api/creature/creatures/Creatures.js       |  25 +-
 .../creatures/defaultCharacterProperties.js   |   2 +-
 .../creatures/methods/insertCreature.js       |  89 +++-
 .../api/creature/experience/Experiences.js    |   4 +-
 .../writeComputation/writeScope.js            |  11 +-
 .../api/library/getCreatureLibraryIds.js      |  39 ++
 app/imports/api/library/getUserLibraryIds.js  |  31 ++
 app/imports/api/users/Users.js                |   4 +-
 .../server/publications/slotFillers.js        |  24 +-
 .../character/CharacterCreationDialog.vue     | 440 ++++++------------
 .../ui/creature/creatureList/CreatureList.vue |   1 +
 .../ui/creature/slots/SlotCardsToFill.vue     |   7 +-
 .../dialogStack/DeleteConfirmationDialog.vue  |   2 +
 .../ui/library/LibraryCollectionHeader.vue    |  15 +-
 app/imports/ui/library/LibraryList.vue        | 202 ++++++++
 app/imports/ui/library/LibraryListTile.vue    |  23 +-
 app/imports/ui/pages/CharacterList.vue        | 215 ++++-----
 app/imports/ui/pages/Library.vue              |  39 +-
 app/imports/ui/router.js                      |   3 +-
 app/server/main.js                            |   2 +-
 21 files changed, 686 insertions(+), 503 deletions(-)
 create mode 100644 app/imports/api/library/getCreatureLibraryIds.js
 create mode 100644 app/imports/api/library/getUserLibraryIds.js
 create mode 100644 app/imports/ui/library/LibraryList.vue

diff --git a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
index 1360ffc3..10de2b4a 100644
--- a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
+++ b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js
@@ -131,15 +131,14 @@ function insertPropertyFromNode(nodeId, ancestors, order){
     node.order = order;
   }
 
-  // Mark root as dirty
-  node.dirty = true;
+  // Mark all nodes as dirty
+  dirtyNodes(nodes);
 
   // Insert the creature properties
   CreatureProperties.batchInsert(nodes);
   return node;
 }
 
-
 function storeLibraryNodeReferences(nodes){
   nodes.forEach(node => {
     if (node.libraryNodeId) return;
@@ -147,6 +146,12 @@ function storeLibraryNodeReferences(nodes){
   });
 }
 
+function dirtyNodes(nodes) {
+  nodes.forEach(node => {
+    node.dirty = true;
+  });
+}
+
 // Covert node references into actual nodes
 // TODO: check permissions for each library a reference node references
 function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0){
diff --git a/app/imports/api/creature/creatures/Creatures.js b/app/imports/api/creature/creatures/Creatures.js
index ef05ff40..311a013e 100644
--- a/app/imports/api/creature/creatures/Creatures.js
+++ b/app/imports/api/creature/creatures/Creatures.js
@@ -80,6 +80,27 @@ let CreatureSchema = new SimpleSchema({
     optional: true,
     max: STORAGE_LIMITS.url,
   },
+
+  // Libraries
+  allowedLibraries: {
+    type: Array,
+    optional: true,
+		maxCount: 100,
+	},
+	'allowedLibraries.$': {
+		type: String,
+    regEx: SimpleSchema.RegEx.Id,
+	},
+	allowedLibraryCollections: {
+		type: Array,
+    optional: true,
+		maxCount: 100,
+	},
+	'allowedLibraryCollections.$': {
+		type: String,
+    regEx: SimpleSchema.RegEx.Id,
+  },
+
 	// Mechanics
 	deathSave: {
 		type: deathSaveSchema,
@@ -165,8 +186,8 @@ CreatureSchema.extend(SharingSchema);
 Creatures.attachSchema(CreatureSchema);
 
 
-import '/imports/api/creature/creatures/methods/index.js';
-import '/imports/api/engine/actions/doAction.js';
 
 export default Creatures;
 export { CreatureSchema };
+
+import '/imports/api/engine/actions/doAction.js';
diff --git a/app/imports/api/creature/creatures/defaultCharacterProperties.js b/app/imports/api/creature/creatures/defaultCharacterProperties.js
index dd3d5499..e7f05a11 100644
--- a/app/imports/api/creature/creatures/defaultCharacterProperties.js
+++ b/app/imports/api/creature/creatures/defaultCharacterProperties.js
@@ -10,7 +10,7 @@ export default function defaultCharacterProperties(creatureId){
     {
       type: 'propertySlot',
       name: 'Ruleset',
-      description: {text: 'Choose a starting point for your character, this will define the basic setup of your character sheet. Without a base, your sheet will be empty.'},
+      description: {text: 'Choose a starting point for your character, this will define the basic setup of your character sheet. Without a base ruleset, your sheet will be empty.'},
       slotTags: ['base'],
       tags: [],
       quantityExpected: {calculation: '1'},
diff --git a/app/imports/api/creature/creatures/methods/insertCreature.js b/app/imports/api/creature/creatures/methods/insertCreature.js
index 7dde2bbb..210f7b49 100644
--- a/app/imports/api/creature/creatures/methods/insertCreature.js
+++ b/app/imports/api/creature/creatures/methods/insertCreature.js
@@ -1,57 +1,104 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
+import Creatures, { CreatureSchema } from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import defaultCharacterProperties from '/imports/api/creature/creatures/defaultCharacterProperties.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
 import assertHasCharactersSlots from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
+import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js';
+import getUserLibraryIds from '/imports/api/library/getUserLibraryIds.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import { insertExperienceForCreature } from '/imports/api/creature/experience/Experiences.js';
+import SimpleSchema from 'simpl-schema';
 
 const insertCreature = new ValidatedMethod({
-
   name: 'creatures.insertCreature',
-
-  validate: null,
-
-  mixins: [RateLimiterMixin],
+  mixins: [RateLimiterMixin, simpleSchemaMixin],
+  schema: CreatureSchema.pick(
+    'name',
+    'gender',
+    'alignment',
+    'allowedLibraries',
+    'allowedLibraryCollections',
+  ).extend({
+    'startingLevel': {
+      type: SimpleSchema.Integer,
+      min: 0,
+    },
+  }),
   rateLimit: {
     numRequests: 5,
     timeInterval: 5000,
   },
 
-  run() {
-    if (!this.userId) {
+  run({ name, gender, alignment, startingLevel,
+    allowedLibraries, allowedLibraryCollections }) {
+    const userId = this.userId
+    if (!userId) {
       throw new Meteor.Error('Creatures.methods.insert.denied',
-      'You need to be logged in to insert a creature');
+        'You need to be logged in to insert a creature');
     }
 
-    assertHasCharactersSlots(this.userId);
+    assertHasCharactersSlots(userId);
 
-		// Create the creature document
+    // Create the creature document
     let creatureId = Creatures.insert({
-			owner: this.userId,
-		});
+      owner: userId,
+      name,
+      gender,
+      alignment,
+      allowedLibraries,
+      allowedLibraryCollections,
+    });
+    
+    // Insert experience to get character to starting level
+    if (startingLevel) {
+      insertExperienceForCreature({
+        experience: {
+          name: 'Starting level',
+          levels: startingLevel,
+          creatureId
+        },
+        creatureId,
+        userId,
+      });
+    }
 
     // Insert the default properties
     // Not batchInsert because we want the properties cleaned by the schema
-    let baseId;
+    let baseId, rulesetSlot;
     defaultCharacterProperties(creatureId).forEach(prop => {
       let id = CreatureProperties.insert(prop);
       if (prop.name === 'Ruleset'){
         baseId = id;
+        rulesetSlot = prop;
       }
     });
 
-    if (Meteor.isServer){
-      // Insert the 5e ruleset as the default base
-      insertPropertyFromLibraryNode.call({
-        nodeIds: ['iHbhfcg3AL5isSWbw'],
-        parentRef: {id: baseId, collection: 'creatureProperties'},
-        order: 0.5,
-      });
+    // If the user only has a single ruleset subscribed, use it by default
+    if (Meteor.isServer) {
+      insertDefaultRuleset(baseId, userId, rulesetSlot);
     }
 
 		return creatureId;
   },
 });
 
+// If the user only has a single ruleset subscribed, insert it by default
+function insertDefaultRuleset(baseId, userId, slot) {
+  const libraryIds = getUserLibraryIds(userId);
+  const filter = getSlotFillFilter({ slot, libraryIds });
+  const fillCursor = LibraryNodes.find(filter, { fields: { _id: 1 } });
+  const numRulesets = fillCursor.count();
+  if (numRulesets === 1) {
+    const ruleset = fillCursor.fetch()[0]
+    insertPropertyFromLibraryNode.call({
+      nodeIds: [ruleset._id],
+      parentRef: {id: baseId, collection: 'creatureProperties'},
+      order: 0.5,
+    });
+  }
+}
+
 export default insertCreature;
diff --git a/app/imports/api/creature/experience/Experiences.js b/app/imports/api/creature/experience/Experiences.js
index 60501d02..58b1aeed 100644
--- a/app/imports/api/creature/experience/Experiences.js
+++ b/app/imports/api/creature/experience/Experiences.js
@@ -47,7 +47,6 @@ let ExperienceSchema = new SimpleSchema({
 Experiences.attachSchema(ExperienceSchema);
 
 const insertExperienceForCreature = function({experience, creatureId, userId}){
-  assertEditPermission(creatureId, userId);
   if (experience.xp){
     Creatures.update(creatureId, {
       $inc: { 'denormalizedStats.xp': experience.xp },
@@ -93,6 +92,7 @@ const insertExperience = new ValidatedMethod({
     }
     let insertedIds = [];
     creatureIds.forEach(creatureId => {
+      assertEditPermission(creatureId, userId);
       let id = insertExperienceForCreature({experience, creatureId, userId});
       insertedIds.push(id);
     });
@@ -181,4 +181,4 @@ const recomputeExperiences = new ValidatedMethod({
 });
 
 export default Experiences;
-export { ExperienceSchema, insertExperience, removeExperience, recomputeExperiences };
+export { ExperienceSchema, insertExperience, insertExperienceForCreature, removeExperience, recomputeExperiences };
diff --git a/app/imports/api/engine/computation/writeComputation/writeScope.js b/app/imports/api/engine/computation/writeComputation/writeScope.js
index 1c5bfde3..d96c2bfe 100644
--- a/app/imports/api/engine/computation/writeComputation/writeScope.js
+++ b/app/imports/api/engine/computation/writeComputation/writeScope.js
@@ -5,8 +5,13 @@ import { EJSON } from 'meteor/ejson';
 export default function writeScope(creatureId, computation) {
   if (!creatureId) throw 'creatureId is required';
   const scope = computation.scope;
-  const variables = computation.variables || {};
+  let variables = computation.variables;
+  if (!variables) {
+    CreatureVariables.insert({ _creatureId: creatureId });
+    variables = {};
+  }
   delete variables._id;
+  delete variables._creatureId;
 
   let $set, $unset;
 
@@ -48,9 +53,9 @@ export default function writeScope(creatureId, computation) {
     const update = {};
     if ($set) update.$set = $set;
     if ($unset) update.$unset = $unset;
-    CreatureVariables.upsert({_creatureId: creatureId}, update);
+    CreatureVariables.update({_creatureId: creatureId}, update);
   }
   if (computation.creature?.dirty) {
-    Creatures.update({_creatureId: creatureId}, {$unset: { dirty: 1 }});
+    Creatures.update({_id: creatureId}, {$unset: { dirty: 1 }});
   }
 }
diff --git a/app/imports/api/library/getCreatureLibraryIds.js b/app/imports/api/library/getCreatureLibraryIds.js
new file mode 100644
index 00000000..beb9c7d3
--- /dev/null
+++ b/app/imports/api/library/getCreatureLibraryIds.js
@@ -0,0 +1,39 @@
+import LibraryCollections from '/imports/api/library/LibraryCollections.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import getUserLibraryIds from './getUserLibraryIds';
+import { intersection, union } from 'lodash';
+
+export default function getCreatureLibraryIds(creature, userId) {
+  if (!userId) return [];
+
+  // Get the ids of libraries the user is permitted to view
+  const userLibIds = getUserLibraryIds(userId);
+
+  // If given a creature Id, get the creature document
+  if (typeof creature === 'string') {
+    creature = Creatures.findOne(creature, {
+      fields: {
+        allowedLibraries: 1,
+        allowedLibraryCollections: 1,
+      }
+    });
+    if (!creature) return [];
+  }
+
+  // If the creature does not restrict the libraries, let it use them all
+  if (!creature.allowedLibraryCollections && !creature.allowedLibraries) {
+    return userLibIds;
+  }
+  
+  // Get the ids of the libraries that the creature allows
+  const allowedCollections = creature.allowedLibraryCollections || [];
+  let creatureLibIds = creature.allowedLibraries || [];
+  LibraryCollections.find({
+    _id: { $in: allowedCollections }
+  }, { fields: { libraries: 1 } }).forEach(collection => {
+    creatureLibIds = union(creatureLibIds, collection.libraries);
+  });
+
+  // return all the ids that the creature allows and the user can view
+  return intersection(userLibIds, creatureLibIds);
+}
\ No newline at end of file
diff --git a/app/imports/api/library/getUserLibraryIds.js b/app/imports/api/library/getUserLibraryIds.js
new file mode 100644
index 00000000..55f7498d
--- /dev/null
+++ b/app/imports/api/library/getUserLibraryIds.js
@@ -0,0 +1,31 @@
+import LibraryCollections from '/imports/api/library/LibraryCollections.js';
+import Libraries from '/imports/api/library/Libraries.js';
+import { union } from 'lodash';
+
+export default function getUserLibraryIds(userId) {
+  if (!userId) return [];
+  const user = Meteor.users.findOne(userId);
+  let subbedIds = user?.subscribedLibraries || [];
+  const subCollections = user?.subscribedLibraryCollections || [];
+  LibraryCollections.find({
+    $or: [
+      { owner: userId },
+      { writers: userId },
+      { readers: userId },
+      { _id: { $in: subCollections }, public: true },
+    ]
+  }, { fields: { libraries: 1 } }).forEach(collection => {
+    subbedIds = union(subbedIds, collection.libraries);
+  });
+  const libraryIds = Libraries.find({
+    $or: [
+      { owner: userId },
+      { writers: userId },
+      { readers: userId },
+      { _id: { $in: subbedIds }, public: true },
+    ]
+  }, {
+    fields: { _id: 1 }
+  }).map(lib => lib._id);
+  return libraryIds;
+}
\ No newline at end of file
diff --git a/app/imports/api/users/Users.js b/app/imports/api/users/Users.js
index 6f228322..b3152af8 100644
--- a/app/imports/api/users/Users.js
+++ b/app/imports/api/users/Users.js
@@ -71,7 +71,7 @@ const userSchema = new SimpleSchema({
 	subscribedLibraries: {
 		type: Array,
 		defaultValue: defaultLibraries,
-		max: 100,
+		maxCount: 100,
 	},
 	'subscribedLibraries.$': {
 		type: String,
@@ -80,7 +80,7 @@ const userSchema = new SimpleSchema({
 	subscribedLibraryCollections: {
 		type: Array,
 		defaultValue: defaultLibraryCollections,
-		max: 100,
+		maxCount: 100,
 	},
 	'subscribedLibraryCollections.$': {
 		type: String,
diff --git a/app/imports/server/publications/slotFillers.js b/app/imports/server/publications/slotFillers.js
index e97fa20f..95a77c6c 100644
--- a/app/imports/server/publications/slotFillers.js
+++ b/app/imports/server/publications/slotFillers.js
@@ -3,6 +3,7 @@ import Libraries from '/imports/api/library/Libraries.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
+import getUserLibraryIds from '/imports/api/library/getUserLibraryIds.js';
 import { LIBRARY_NODE_TREE_FIELDS } from '/imports/server/publications/library.js';
 
 const FIELDS = {
@@ -27,21 +28,17 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
     }
 
     // Get all the ids of libraries the user can access
-    const user = Meteor.users.findOne(userId, {
-      fields: {subscribedLibraries: 1}
-    });
-    const subs = user && user.subscribedLibraries || [];
-    let libraries = Libraries.find({
+    const libraryIds = getUserLibraryIds(userId);
+    const libraries = Libraries.find({
       $or: [
-        {owner: this.userId},
-        {writers: this.userId},
-        {readers: this.userId},
-        {_id: {$in: subs}},
+        { owner: userId },
+        { writers: userId },
+        { readers: userId },
+        { _id: { $in: libraryIds }, public: true },
       ]
     }, {
-      fields: {_id: 1, name: 1},
+      sort: { name: 1 }
     });
-    let libraryIds = libraries.map(lib => lib._id);
 
     // Build a filter for nodes in those libraries that match the slot
     let filter = getSlotFillFilter({slot, libraryIds});
@@ -83,7 +80,10 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
         self.setData('countAll', LibraryNodes.find(filter).count());
       });
       self.autorun(function () {
-        return [LibraryNodes.find(filter, options), libraries];
+        return [
+          LibraryNodes.find(filter, options),
+          libraries
+        ];
       });
     });
   });
diff --git a/app/imports/ui/creature/character/CharacterCreationDialog.vue b/app/imports/ui/creature/character/CharacterCreationDialog.vue
index c9be196f..69e33330 100644
--- a/app/imports/ui/creature/character/CharacterCreationDialog.vue
+++ b/app/imports/ui/creature/character/CharacterCreationDialog.vue
@@ -4,29 +4,28 @@
       New Character
     </v-toolbar-title>
     <v-stepper
+      slot="unwrapped-content"
       v-model="step"
-      class="no-shadow"
+      flat
+      non-linear
     >
-      <v-stepper-header class="no-shadow">
+      <v-stepper-header>
         <v-stepper-step
+          editable
           :complete="step > 1"
           step="1"
+          :rules="[() => biographyAlert || true]"
         >
-          Name
+          Biography
+          <small v-if="biographyAlert">{{ biographyAlert }}</small>
         </v-stepper-step>
         <v-divider />
         <v-stepper-step
+          editable
           :complete="step > 2"
           step="2"
         >
-          Ability Scores
-        </v-stepper-step>
-        <v-divider />
-        <v-stepper-step
-          :complete="step > 3"
-          step="3"
-        >
-          Class
+          Libraries
         </v-stepper-step>
       </v-stepper-header>
 
@@ -34,195 +33,44 @@
         <v-stepper-content step="1">
           <v-text-field
             v-model="name"
+            outlined
             label="Name"
-          />
-          <v-text-field
-            v-model="gender"
-            label="Gender"
+            class="mt-1"
+            :error="!name"
           />
           <v-text-field
             v-model="alignment"
+            outlined
             label="Alignment"
+          />
+          <v-text-field
+            v-model="gender"
+            outlined
+            label="Gender"
+          />
+          <v-text-field
+            v-model.number="startingLevel"
+            outlined
+            label="Level"
+            type="number"
+            height="20"
+            min="0"
             @keydown.tab="step++"
           />
         </v-stepper-content>
         <v-stepper-content step="2">
-          <v-text-field
-            v-model="race"
-            label="Race"
+          <v-switch
+            v-model="allSubscribedLibraries"
+            label="All user libraries"
           />
-          <v-layout
-            justify-center
-            align-center
-          >
-            <h3>Point Cost:</h3>
-            <h1
-              class="ml-2"
-              :class="cost > 27 ? 'error--text' : ''"
-            >
-              {{ cost }}
-            </h1>
-            <span class="ml-1">/27</span>
-          </v-layout>
-          <table class="point-buy-table mt-2">
-            <thead>
-              <tr class="font-weight-bold">
-                <td />
-                <td>Base Values</td>
-                <td>Race Bonus</td>
-                <td>Score</td>
-                <td>Modifier</td>
-              </tr>
-            </thead>
-            <tr>
-              <td>Strength</td>
-              <td>
-                <v-text-field
-                  v-model.number="baseStrength"
-                  type="number"
-                  height="20"
-                  reverse
-                  min="8"
-                  max="15"
-                />
-              </td>
-              <td>
-                <v-text-field
-                  v-model.number="strengthBonus"
-                  type="number"
-                  height="20"
-                  reverse
-                />
-              </td>
-              <td>{{ baseStrength + strengthBonus }}</td>
-              <td>{{ mod(baseStrength + strengthBonus) }}</td>
-            </tr>
-            <tr>
-              <td>Dexterity</td>
-              <td>
-                <v-text-field
-                  v-model.number="baseDexterity"
-                  type="number"
-                  height="20"
-                  reverse
-                  min="8"
-                  max="15"
-                />
-              </td>
-              <td>
-                <v-text-field
-                  v-model.number="dexterityBonus"
-                  type="number"
-                  height="20"
-                  reverse
-                />
-              </td>
-              <td>{{ baseDexterity + dexterityBonus }}</td>
-              <td>{{ mod(baseDexterity + dexterityBonus) }}</td>
-            </tr>
-            <tr>
-              <td>Constitution</td>
-              <td>
-                <v-text-field
-                  v-model.number="baseConstitution"
-                  type="number"
-                  height="20"
-                  reverse
-                  min="8"
-                  max="15"
-                />
-              </td>
-              <td>
-                <v-text-field
-                  v-model.number="constitutionBonus"
-                  type="number"
-                  height="20"
-                  reverse
-                />
-              </td>
-              <td>{{ baseConstitution + constitutionBonus }}</td>
-              <td>{{ mod(baseConstitution + constitutionBonus) }}</td>
-            </tr>
-            <tr>
-              <td>Intelligence</td>
-              <td>
-                <v-text-field
-                  v-model.number="baseIntelligence"
-                  type="number"
-                  height="20"
-                  reverse
-                  min="8"
-                  max="15"
-                />
-              </td>
-              <td>
-                <v-text-field
-                  v-model.number="intelligenceBonus"
-                  type="number"
-                  height="20"
-                  reverse
-                />
-              </td>
-              <td>{{ baseIntelligence + intelligenceBonus }}</td>
-              <td>{{ mod(baseIntelligence + intelligenceBonus) }}</td>
-            </tr>
-            <tr>
-              <td>Wisdom</td>
-              <td>
-                <v-text-field
-                  v-model.number="baseWisdom"
-                  type="number"
-                  height="20"
-                  reverse
-                  min="8"
-                  max="15"
-                />
-              </td>
-              <td>
-                <v-text-field
-                  v-model.number="wisdomBonus"
-                  type="number"
-                  height="20"
-                  reverse
-                />
-              </td>
-              <td>{{ baseWisdom + wisdomBonus }}</td>
-              <td>{{ mod(baseWisdom + wisdomBonus) }}</td>
-            </tr>
-            <tr>
-              <td>Charisma</td>
-              <td>
-                <v-text-field
-                  v-model.number="baseCharisma"
-                  type="number"
-                  height="20"
-                  reverse
-                  min="8"
-                  max="15"
-                />
-              </td>
-              <td>
-                <v-text-field
-                  v-model.number="charismaBonus"
-                  type="number"
-                  height="20"
-                  reverse
-                />
-              </td>
-              <td>{{ baseCharisma + charismaBonus }}</td>
-              <td>{{ mod(baseCharisma + charismaBonus) }}</td>
-            </tr>
-          </table>
-        </v-stepper-content>
-        <v-stepper-content step="3">
-          <v-text-field
-            v-model="cls"
-            label="Class"
-          />
-          <v-select
-            v-model="hitDice"
-            :items="hitDiceItems"
-            label="Hit Dice"
+          <library-list
+            selection
+            :disabled="allSubscribedLibraries"
+            :libraries-selected="librariesSelected"
+            :library-collections-selected="libraryCollectionsSelected"
+            :libraries-selected-by-collections="librariesSelectedByCollections"
+            @select-library="selectLibrary"
+            @select-library-collection="selectLibraryCollection"
           />
         </v-stepper-content>
       </v-stepper-items>
@@ -243,15 +91,16 @@
       </v-btn>
       <v-spacer />
       <v-btn
-        v-if="step < 3"
+        v-if="step < 2"
         color="accent"
         @click="step++"
       >
         Next
       </v-btn>
       <v-btn
-        :flat="step < 3"
-        :color="step < 3? '' : 'accent'"
+        :disabled="biographyAlert"
+        :text="step < 2"
+        :color="step < 2? '' : 'accent'"
         @click="submit"
       >
         Create
@@ -261,109 +110,112 @@
 </template>
 
 <script lang="js">
-  import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-	const getCost = function(score){
-		const costs = {
-			8: 0,
-			9: 1,
-			10: 2,
-			11: 3,
-			12: 4,
-			13: 5,
-			14: 7,
-			15: 9,
-		};
-		if (costs[score] || costs[score] === 0){
-			return costs[score];
-		} else {
-			return NaN;
-		}
-	};
-  export default {
-    components: {
-      DialogBase,
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { defer, union, without } from 'lodash';
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
+import LibraryList from '/imports/ui/library/LibraryList.vue';
+import LibraryCollections from '/imports/api/library/LibraryCollections.js';
+
+export default {
+  components: {
+    DialogBase,
+    LibraryList,
+  },
+  data(){return {
+    step: 1,
+    name: 'New Character',
+    gender: '',
+    alignment: '',
+    startingLevel: 1,
+    librariesSelected: [],
+    libraryCollectionsSelected: [],
+    librariesSelectedByCollections: [],
+    allSubscribedLibraries: true,
+  }},
+  computed: {
+    biographyAlert() {
+      if (!this.name) return 'Name required';
+      return undefined;
+    }
+  },
+  meteor: {
+    $subscribe: {
+      'libraries': [],
     },
-    data(){return {
-      step: 1,
-			name: 'New Character',
-			gender: '',
-			alignment: '',
-			race: 'Race',
-			baseStrength: 10,
-			baseDexterity: 10,
-			baseConstitution: 10,
-			baseIntelligence: 10,
-			baseWisdom: 10,
-			baseCharisma: 10,
-			strengthBonus: 0,
-			dexterityBonus: 0,
-			constitutionBonus: 0,
-			intelligenceBonus: 0,
-			wisdomBonus: 0,
-			charismaBonus: 0,
-			hitDiceItems: ['d6', 'd8', 'd10', 'd12'],
-			hitDice: 'd8',
-			cls: 'Class',
-    }},
-		computed: {
-			cost(){
-				return [
-					this.baseStrength,
-					this.baseDexterity,
-					this.baseConstitution,
-					this.baseIntelligence,
-					this.baseWisdom,
-					this.baseCharisma,
-				].map(getCost)
-				.reduce((memo, score) => memo + score, 0);
-			},
-		},
-		methods: {
-			mod(score){
-				let mod = Math.floor((score - 10) / 2);
-				if (mod >= 0) {
-					return `+${mod}`;
-				} else {
-					return `${mod}`;
-				}
-			},
-			submit(){
-				let char = {
-					name: this.name,
-					gender: this.gender,
-					alignment: this.alignment,
-					race: this.race,
-					baseStrength: this.baseStrength,
-					baseDexterity: this.baseDexterity,
-					baseConstitution: this.baseConstitution,
-					baseIntelligence: this.baseIntelligence,
-					baseWisdom: this.baseWisdom,
-					baseCharisma: this.baseCharisma,
-					strengthBonus: this.strengthBonus,
-					dexterityBonus: this.dexterityBonus,
-					constitutionBonus: this.constitutionBonus,
-					intelligenceBonus: this.intelligenceBonus,
-					wisdomBonus: this.wisdomBonus,
-					charismaBonus: this.charismaBonus,
-					hitDice: this.hitDice,
-					cls: this.cls,
-				};
-				this.$emit('pop', char);
-			},
-		},
-  };
+  },
+  methods: {
+    selectLibrary(libraryId, val) {
+      if (val) {
+        this.librariesSelected = union(this.librariesSelected, [libraryId]);
+      } else {
+        this.librariesSelected = without(this.librariesSelected, libraryId);
+      }
+    },
+    selectLibraryCollection(libraryCollectionId, val) {
+      const collection = LibraryCollections.findOne(libraryCollectionId);
+      if (!collection) return;
+      if (val) {
+        this.libraryCollectionsSelected = union(
+          this.libraryCollectionsSelected,
+          [libraryCollectionId]
+        );
+        this.librariesSelectedByCollections = union(
+          this.librariesSelectedByCollections,
+          collection.libraries
+        );
+      } else {
+        this.libraryCollectionsSelected = without(
+          this.libraryCollectionsSelected,
+          libraryCollectionId,
+        );
+        this.librariesSelectedByCollections = without(
+          this.librariesSelectedByCollections,
+          ...collection.libraries
+        );
+      }
+    },
+    submit(){
+      let char = {
+        name: this.name,
+        gender: this.gender,
+        alignment: this.alignment,
+        startingLevel: this.startingLevel,
+      };
+      if (!this.allSubscribedLibraries) {
+        char.allowedLibraries = this.librariesSelected;
+        char.allowedLibraryCollections = this.libraryCollectionsSelected;
+      }
+      insertCreature.call(char, (error, creatureId) => {
+        if (error){
+          console.error(error);
+          snackbar({
+            text: error.reason,
+          });
+        } else {
+          this.$store.commit(
+              'setTabForCharacterSheet',
+              {id: creatureId, tab: 4}
+            );
+          this.$emit('pop', creatureId);
+          defer(() => {
+            this.$router.push({ name: 'characterSheet', params: {id: creatureId} });
+          });
+          return creatureId;
+        }
+      });
+    },
+  }
+};
 </script>
 
 <style scoped>
-	.no-shadow {
-		box-shadow: none;
-	}
-	.point-buy-table {
-		width: 100%;
-	}
-	.point-buy-table td {
-		text-align: center;
-		padding: 0 8px 0 8px;
-		max-width: 50px;
-	}
+.point-buy-table {
+  width: 100%;
+}
+.point-buy-table td {
+  text-align: center;
+  padding: 0 8px 0 8px;
+  max-width: 50px;
+}
 </style>
diff --git a/app/imports/ui/creature/creatureList/CreatureList.vue b/app/imports/ui/creature/creatureList/CreatureList.vue
index 1cdcdf96..dac86161 100644
--- a/app/imports/ui/creature/creatureList/CreatureList.vue
+++ b/app/imports/ui/creature/creatureList/CreatureList.vue
@@ -19,6 +19,7 @@
       :is-selected="selectedCreature === creature._id"
       v-bind="selection ? {} : {to: creature.url}"
       :dense="dense"
+      :data-id="dense ? undefined : creature._id"
       @click="$emit('creature-selected', creature._id)"
     />
   </draggable>
diff --git a/app/imports/ui/creature/slots/SlotCardsToFill.vue b/app/imports/ui/creature/slots/SlotCardsToFill.vue
index 506ebc20..0decfebf 100644
--- a/app/imports/ui/creature/slots/SlotCardsToFill.vue
+++ b/app/imports/ui/creature/slots/SlotCardsToFill.vue
@@ -2,7 +2,7 @@
   <div class="slots-to-fill">
     <v-slide-y-transition
       group
-      class="d-flex flex-row flex-wrap"
+      leave-absolute
     >
       <slot-card
         v-for="slot in slots"
@@ -10,6 +10,7 @@
         :model="slot"
         class="ma-1"
         hover
+        style="display: inline-block !important; transition: all 0.3s !important;"
         @ignore="ignoreSlot(slot._id)"
         @click="fillSlot(slot._id)"
       />
@@ -54,7 +55,7 @@ export default {
         },
         callback(nodeIds){
           if (!nodeIds || !nodeIds.length) return;
-          let newPropertyId = insertPropertyFromLibraryNode.call({
+          insertPropertyFromLibraryNode.call({
             nodeIds,
             parentRef: {
               'id': slotId,
@@ -66,7 +67,6 @@ export default {
               snackbar({text: error.reason || error.message || error.toString()});
             }
           });
-          return `slot-child-${newPropertyId}`;
         }
       });
     },
@@ -100,5 +100,4 @@ export default {
 </script>
 
 <style>
-
 </style>
diff --git a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
index ffe5d186..d7f90460 100644
--- a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
+++ b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
@@ -12,6 +12,8 @@
       </p>
       <v-text-field
         v-if="name"
+        label="Confirmation"
+        outlined
         v-model="inputName"
       />
       <div class="layout justify-center">
diff --git a/app/imports/ui/library/LibraryCollectionHeader.vue b/app/imports/ui/library/LibraryCollectionHeader.vue
index c31bc9fe..39713450 100644
--- a/app/imports/ui/library/LibraryCollectionHeader.vue
+++ b/app/imports/ui/library/LibraryCollectionHeader.vue
@@ -2,8 +2,19 @@
   <v-list-item
     style="min-height: 60px; min-width: 0;"
     class="px-0 font-weight-bold"
+    :class="isSelected && !disabled && 'primary--text v-list-item--active'"
   >
-    <v-list-item-avatar>
+    <v-list-item-action
+      v-if="selection"
+    >
+      <v-checkbox
+        :disabled="disabled"
+        :input-value="disabled || isSelected"
+        @change="e => $emit('select', e)"
+        @click.stop
+      />
+    </v-list-item-action>
+    <v-list-item-avatar v-else>
       <shared-icon :model="model" />
     </v-list-item-avatar>
     <v-list-item-title class="d-flex align-center">
@@ -56,6 +67,8 @@ export default {
     open: Boolean,
     selection: Boolean,
     dense: Boolean,
+    isSelected: Boolean,
+    disabled: Boolean,
   },
   data(){return {
     renaming: false,
diff --git a/app/imports/ui/library/LibraryList.vue b/app/imports/ui/library/LibraryList.vue
new file mode 100644
index 00000000..c850ddd7
--- /dev/null
+++ b/app/imports/ui/library/LibraryList.vue
@@ -0,0 +1,202 @@
+<template>
+  <v-list
+    expand
+    class="library-list"
+  >
+    <library-list-tile
+      v-for="library in librariesWithoutCollection"
+      :key="library._id"
+      :model="library"
+      :to="{ name: 'singleLibrary', params: { id: library._id }}"
+      :selection="selection"
+      :is-selected="librariesSelected && librariesSelected.includes(library._id)"
+      :selected-by-collection="librariesSelectedByCollections && librariesSelectedByCollections.includes(library._id)"
+      :disabled="disabled"
+      @select="val => $emit('select-library', library._id, val)"
+    />
+    <v-list-group
+      v-for="libraryCollection in libraryCollections"
+      :key="libraryCollection._id"
+      v-model="openCollections[libraryCollection._id]"
+      group="library-collection"
+      :data-id="`library-collection-${libraryCollection._id}`"
+    >
+      <template #activator>
+        <library-collection-header
+          :open="openCollections[libraryCollection._id]"
+          :model="libraryCollection"
+          :selection="selection"
+          :is-selected="libraryCollectionsSelected && libraryCollectionsSelected.includes(libraryCollection._id)"
+          :disabled="disabled"
+          @select="val => $emit('select-library-collection', libraryCollection._id, val)"
+        />
+      </template>
+      <library-list-tile
+        v-for="library in libraryCollection.libraryDocuments"
+        :key="library._id"
+        :model="library"
+        :to="{ name: 'singleLibrary', params: { id: library._id }}"
+        :selection="selection"
+        :is-selected="librariesSelected && librariesSelected.includes(library._id)"
+        :selected-by-collection="librariesSelectedByCollections && librariesSelectedByCollections.includes(library._id)"
+        :disabled="disabled"
+        class="ml-4"
+        @select="val => $emit('select-library', library._id, val)"
+      />
+    </v-list-group>
+    <v-expand-transition>
+      <v-row
+        v-if="!$subReady.libraries"
+        align="center"
+        justify="center"
+        class="pa-4"
+      >
+        <v-progress-circular
+          indeterminate
+          color="primary"
+          size="32"
+        />
+      </v-row>
+    </v-expand-transition>
+  </v-list>
+</template>
+
+<script lang="js">
+import { union } from 'lodash';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import LibraryCollections, { insertLibraryCollection } from '/imports/api/library/LibraryCollections.js';
+import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
+import LibraryListTile from '/imports/ui/library/LibraryListTile.vue'
+import LibraryCollectionHeader from '/imports/ui/library/LibraryCollectionHeader.vue';
+
+export default {
+  components: {
+    LibraryListTile,
+    LibraryCollectionHeader,
+  },
+  props: {
+    selection: Boolean,
+    disabled: Boolean,
+    librariesSelected: {
+      type: Array,
+      default: undefined,
+    },
+    libraryCollectionsSelected: {
+      type: Array,
+      default: undefined,
+    },
+    librariesSelectedByCollections: {
+      type: Array,
+      default: undefined,
+    },
+  },
+  data(){ return{
+    loadingInsertLibraryCollection: false,
+    openCollections: [],
+  }},
+  meteor: {
+    $subscribe: {
+      'libraries': [],
+    },
+    libraryCollections(){
+      const userId = Meteor.userId();
+      if (!userId) return;
+      const subCollections = Meteor.user().subscribedLibraryCollections || [];
+      return LibraryCollections.find({
+        $or: [
+          { owner: userId },
+          { writers: userId },
+          { readers: userId },
+          { _id: { $in: subCollections }, public: true },
+        ]
+      }, {
+        sort: { name: 1 }
+      }).map(libCollection => {
+        libCollection.libraryDocuments = Libraries.find({
+          _id: {$in: libCollection.libraries},
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { public: true },
+          ]
+        }, {
+          sort: { name: 1 }
+        }).fetch();
+        return libCollection;
+      });
+    },
+    librariesWithoutCollection() {
+      const userId = Meteor.userId();
+      if (!this.libraryCollections) return;
+      // Collate the IDs of all the libraries in collections
+      let collectedLibraries = [];
+      this.libraryCollections.forEach(libCollection => {
+        collectedLibraries = union(collectedLibraries, libCollection.libraries);
+      });
+      // return the libraries with IDs not in that list
+      return Libraries.find(
+        {
+          _id: {$nin: collectedLibraries},
+          $or: [
+            { owner: userId },
+            { writers: userId },
+            { readers: userId },
+            { public: true },
+          ]
+        },
+        {sort: {name: 1}}
+      );
+    },
+  },
+  methods: {
+    insertLibrary() {
+      const self = this;
+      if (this.paidBenefits){
+        this.$store.commit('pushDialogStack', {
+          component: 'library-creation-dialog',
+          elementId: 'insert-library-button',
+          callback(library){
+            if (!library) return;
+            return insertLibrary.call(library, (error, libraryId) => {
+              if (error){
+                console.error(error);
+                snackbar({
+                  text: error.reason,
+                });
+              } else {
+                self.$router.push({
+                  name: 'singleLibrary',
+                  params: { id: libraryId }
+                });
+              }
+            });
+          }
+        });
+      } else {
+        this.$store.commit('pushDialogStack', {
+          component: 'tier-too-low-dialog',
+          elementId: 'insert-library-button',
+        });
+      }
+    },
+    insertLibraryCollection() {
+      this.$store.commit('pushDialogStack', {
+        component: 'library-collection-creation-dialog',
+        elementId: 'insert-library-collection-button',
+        callback(libraryCollection){
+          if (!libraryCollection) return;
+          const id = insertLibraryCollection.call(libraryCollection, error => {
+            if (!error) return;
+            console.error(error);
+            snackbar({
+              text: error.reason,
+            });
+          });
+          return `library-collection-${id}`
+        }
+      });
+    },
+  },
+};
+</script>
diff --git a/app/imports/ui/library/LibraryListTile.vue b/app/imports/ui/library/LibraryListTile.vue
index 7ae679cb..d2a9fa7f 100644
--- a/app/imports/ui/library/LibraryListTile.vue
+++ b/app/imports/ui/library/LibraryListTile.vue
@@ -4,9 +4,21 @@
 >
   <v-list-item
     v-bind="$attrs"
-    :class="isSelected && 'primary--text v-list-item--active'"
+    :class="(isSelected || selectedByCollection) && !disabled && 'primary--text v-list-item--active'"
+    :to="selection ? undefined : to"
   >
-    <v-list-item-avatar>
+    <v-list-item-action
+      v-if="selection"
+    >
+      <v-checkbox
+        :disabled="disabled"
+        :input-value="disabled || isSelected"
+        :off-icon="selectedByCollection ? 'mdi-checkbox-intermediate' : undefined"
+        @change="e => $emit('select', e)"
+        @click.stop
+      />
+    </v-list-item-action>
+    <v-list-item-avatar v-else>
       <shared-icon :model="model" />
     </v-list-item-avatar>
     <v-list-item-content>
@@ -31,7 +43,12 @@ export default {
     },
     selection: Boolean,
     isSelected: Boolean,
-    dense: Boolean,
+    selectedByCollection: Boolean,
+    disabled: Boolean,
+    to: {
+      type: Object,
+      required: true,
+    }
   }
 }
 </script>
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/ui/pages/CharacterList.vue
index 05a8c707..3a675911 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/ui/pages/CharacterList.vue
@@ -74,127 +74,108 @@
 </template>
 
 <script lang="js">
-  import { defer } from 'lodash';
-  import Creatures from '/imports/api/creature/creatures/Creatures.js';
-  import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
-  import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
-  import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-  import insertCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
-  import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
-  import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
-  import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import insertCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
+import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
+import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
+import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
 
-  const characterTransform = function(char){
-    char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
-    char.initial = char.name && char.name[0] || '?';
-    return char;
-  };
-  export default {
-    components: {
-      CreatureFolderList,
-      ArchiveButton,
+const characterTransform = function(char){
+  char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
+  char.initial = char.name && char.name[0] || '?';
+  return char;
+};
+export default {
+  components: {
+    CreatureFolderList,
+    ArchiveButton,
+  },
+  data(){ return{
+    fab: false,
+    loadingInsertFolder: false,
+    renamingFolder: undefined,
+  }},
+  meteor: {
+    $subscribe: {
+      'characterList': [],
     },
-    data(){ return{
-      fab: false,
-      loadingInsertFolder: false,
-      renamingFolder: undefined,
-    }},
-    meteor: {
-      $subscribe: {
-        'characterList': [],
-      },
-      folders(){
-        const userId = Meteor.userId();
-        let folders =  CreatureFolders.find(
-          {owner: userId, archived: {$ne: true}},
-          {sort: {order: 1}},
-        ).map(folder => {
-          folder.creatures = Creatures.find(
-            {
-              _id: {$in: folder.creatures || []},
-              $or: [{readers: userId}, {writers: userId}, {owner: userId}],
-            }, {
-              sort: {name: 1},
-            }
-          ).map(characterTransform);
-          return folder;
-        });
-        return folders;
-      },
-      CreaturesWithNoParty() {
-        var userId = Meteor.userId();
-        var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
-        var folderChars = _.uniq(_.flatten(charArrays));
-        return Creatures.find(
+    folders(){
+      const userId = Meteor.userId();
+      let folders =  CreatureFolders.find(
+        {owner: userId, archived: {$ne: true}},
+        {sort: {order: 1}},
+      ).map(folder => {
+        folder.creatures = Creatures.find(
           {
-            _id: {$nin: folderChars},
+            _id: {$in: folder.creatures || []},
             $or: [{readers: userId}, {writers: userId}, {owner: userId}],
-          },
-          {sort: {name: 1}}
-        ).map(characterTransform);
-      },
-      creatureCount(){
-        let userId = Meteor.userId();
-        return Creatures.find({
-          owner: userId,
-        }, {
-          fields: {_id: 1},
-        }).count();
-      },
-      tier(){
-        let userId = Meteor.userId();
-        return getUserTier(userId);
-      },
-      characterSpaceLeft(){
-        let tier = this.tier;
-        let currentCharacterCount = this.creatureCount;
-        if (tier.characterSlots === -1) return Number.POSITIVE_INFINITY;
-        return tier.characterSlots - currentCharacterCount
-      },
-      exceededCharacterSpace(){
-        let tier = this.tier;
-        let currentCharacterCount = this.creatureCount;
-        return tier.characterSlots !== -1 && currentCharacterCount > tier.characterSlots
-      },
-    },
-    methods: {
-      insertCharacter(){
-        insertCreature.call((error, creatureId) => {
-          if (error){
-            console.error(error);
-            snackbar({
-              text: error.reason,
-            });
-          } else {
-            this.$store.commit(
-              'setTabForCharacterSheet',
-              {id: creatureId, tab: 4}
-            );
-            defer(() => {
-              this.$store.commit('pushDialogStack', {
-                component: 'character-creation-dialog',
-                elementId: 'new-character-button',
-                data: {
-                  creatureId,
-                },
-              });
-            })
-            this.$router.push({ path: `/character/${creatureId}` });
+          }, {
+            sort: {name: 1},
           }
-        });
-      },
-      insertFolder(){
-        this.loadingInsertFolder = true;
-        insertCreatureFolder.call(error => {
-          this.loadingInsertFolder = false;
-          if (!error) return;
-          console.error(error);
-          snackbar({
-            text: error.reason,
-          });
-        });
-      },
+        ).map(characterTransform);
+        return folder;
+      });
+      return folders;
     },
-  };
+    CreaturesWithNoParty() {
+      var userId = Meteor.userId();
+      var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
+      var folderChars = _.uniq(_.flatten(charArrays));
+      return Creatures.find(
+        {
+          _id: {$nin: folderChars},
+          $or: [{readers: userId}, {writers: userId}, {owner: userId}],
+        },
+        {sort: {name: 1}}
+      ).map(characterTransform);
+    },
+    creatureCount(){
+      let userId = Meteor.userId();
+      return Creatures.find({
+        owner: userId,
+      }, {
+        fields: {_id: 1},
+      }).count();
+    },
+    tier(){
+      let userId = Meteor.userId();
+      return getUserTier(userId);
+    },
+    characterSpaceLeft(){
+      let tier = this.tier;
+      let currentCharacterCount = this.creatureCount;
+      if (tier.characterSlots === -1) return Number.POSITIVE_INFINITY;
+      return tier.characterSlots - currentCharacterCount
+    },
+    exceededCharacterSpace(){
+      let tier = this.tier;
+      let currentCharacterCount = this.creatureCount;
+      return tier.characterSlots !== -1 && currentCharacterCount > tier.characterSlots
+    },
+  },
+  methods: {
+    insertCharacter() {
+      const self = this;
+      self.$store.commit('pushDialogStack', {
+        component: 'character-creation-dialog',
+        elementId: 'new-character-button',
+        callback: creatureId => creatureId,
+      });
+    },
+    insertFolder(){
+      this.loadingInsertFolder = true;
+      insertCreatureFolder.call(error => {
+        this.loadingInsertFolder = false;
+        if (!error) return;
+        console.error(error);
+        snackbar({
+          text: error.reason,
+        });
+      });
+    },
+  },
+};
 </script>
diff --git a/app/imports/ui/pages/Library.vue b/app/imports/ui/pages/Library.vue
index a1f1866a..65a2d18f 100644
--- a/app/imports/ui/pages/Library.vue
+++ b/app/imports/ui/pages/Library.vue
@@ -10,38 +10,7 @@
           xl="8"
         >
           <v-card :class="{'mb-4': libraryCollections && libraryCollections.length}">
-            <v-list
-              expand
-              class="library-folder-list"
-            >
-              <library-list-tile
-                v-for="library in librariesWithoutCollection"
-                :key="library._id"
-                :model="library"
-                :to="{ name: 'singleLibrary', params: { id: library._id }}"
-              />
-              <v-list-group
-                v-for="libraryCollection in libraryCollections"
-                :key="libraryCollection._id"
-                v-model="openCollections[libraryCollection._id]"
-                group="library-collection"
-                :data-id="`library-collection-${libraryCollection._id}`"
-              >
-                <template #activator>
-                  <library-collection-header
-                    :open="openCollections[libraryCollection._id]"
-                    :model="libraryCollection"
-                  />
-                </template>
-                <library-list-tile
-                  v-for="library in libraryCollection.libraryDocuments"
-                  :key="library._id"
-                  :model="library"
-                  :to="{ name: 'singleLibrary', params: { id: library._id }}"
-                  class="ml-4"
-                />
-              </v-list-group>
-            </v-list>
+            <library-list />
             <v-expand-transition>
               <v-row
                 v-if="!$subReady.libraries"
@@ -92,13 +61,11 @@ import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
 import LibraryCollections, { insertLibraryCollection } from '/imports/api/library/LibraryCollections.js';
 import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
-import LibraryListTile from '/imports/ui/library/LibraryListTile.vue'
-import LibraryCollectionHeader from '/imports/ui/library/LibraryCollectionHeader.vue';
+import LibraryList from '/imports/ui/library/LibraryList.vue';
 
 export default {
   components: {
-    LibraryListTile,
-    LibraryCollectionHeader,
+    LibraryList
   },
   data(){ return{
     loadingInsertLibraryCollection: false,
diff --git a/app/imports/ui/router.js b/app/imports/ui/router.js
index 3108b505..37d8e562 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/ui/router.js
@@ -163,7 +163,8 @@ RouterFactory.configure(router => {
       meta: {
         title: 'Library Collection',
       },
-    },{
+    }, {
+      name: 'characterSheet',
       path: '/character/:id',
       alias: '/character/:id/:urlName',
       components: {
diff --git a/app/server/main.js b/app/server/main.js
index 31140ade..642113e0 100644
--- a/app/server/main.js
+++ b/app/server/main.js
@@ -15,4 +15,4 @@ import '/imports/migrations/methods/index.js'
 import '/imports/constants/MAINTENANCE_MODE.js';
 import '/imports/api/creature/creatureProperties/methods/index.js';
 import '/imports/api/creature/archive/methods/index.js';
-
+import '/imports/api/creature/creatures/methods/index.js';

From 0c06f60b7e568f0001edd4882a5b793c43fbdbf2 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 19 Jul 2022 19:25:12 +0200
Subject: [PATCH 44/56] Fixed typo "Transfer Onwership"

---
 app/imports/ui/sharing/ShareDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/ui/sharing/ShareDialog.vue b/app/imports/ui/sharing/ShareDialog.vue
index 728688e6..181b23fe 100644
--- a/app/imports/ui/sharing/ShareDialog.vue
+++ b/app/imports/ui/sharing/ShareDialog.vue
@@ -92,7 +92,7 @@
                   <v-list-item-action>
                     <v-icon>mdi-signature</v-icon>
                   </v-list-item-action>
-                  <v-list-item-title>Transfer Onwership</v-list-item-title>
+                  <v-list-item-title>Transfer Ownership</v-list-item-title>
                 </v-list-item>
                 <v-list-item @click="updateSharing(user._id, 'none')">
                   <v-list-item-action>

From 6f7e742eb9c104f62f743d79de1d77588cfa59f3 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 20 Jul 2022 00:09:58 +0200
Subject: [PATCH 45/56] More of the sheet conforms to library allowances

---
 .../methods/changeAllowedLibraries.js         |  90 ++++++
 .../api/creature/creatures/methods/index.js   |   1 +
 .../creatures/methods/insertCreature.js       |   8 +-
 .../server/publications/searchLibraryNodes.js |  28 +-
 .../server/publications/slotFillers.js        |   5 +-
 app/imports/ui/creature/CreatureForm.vue      | 118 ++++++-
 .../character/CharacterCreationDialog.vue     |   2 +-
 .../creature/character/CharacterSheetFab.vue  |   1 +
 .../AddCreaturePropertyDialog.vue             | 296 +++++++++---------
 .../CreaturePropertyDialog.vue                |   1 +
 10 files changed, 377 insertions(+), 173 deletions(-)
 create mode 100644 app/imports/api/creature/creatures/methods/changeAllowedLibraries.js

diff --git a/app/imports/api/creature/creatures/methods/changeAllowedLibraries.js b/app/imports/api/creature/creatures/methods/changeAllowedLibraries.js
new file mode 100644
index 00000000..29057f55
--- /dev/null
+++ b/app/imports/api/creature/creatures/methods/changeAllowedLibraries.js
@@ -0,0 +1,90 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
+import SimpleSchema from 'simpl-schema';
+import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
+
+const changeAllowedLibraries = new ValidatedMethod({
+  name: 'creatures.changeAllowedLibraries',
+  mixins: [RateLimiterMixin, simpleSchemaMixin],
+  schema: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    allowedLibraries: {
+      type: Array,
+      optional: true,
+      maxCount: 100,
+    },
+    'allowedLibraries.$': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    allowedLibraryCollections: {
+      type: Array,
+      optional: true,
+      maxCount: 100,
+    },
+    'allowedLibraryCollections.$': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }),
+  rateLimit: {
+    numRequests: 10,
+    timeInterval: 5000,
+  },
+  run({_id, allowedLibraries, allowedLibraryCollections}) {
+		let creature = Creatures.findOne(_id);
+    assertEditPermission(creature, this.userId);
+    let $set;
+    if (allowedLibraries) {
+      $set = { allowedLibraries }
+    }
+    if (allowedLibraryCollections) {
+      if (!$set) $set = {};
+      $set.allowedLibraryCollections = allowedLibraryCollections;
+    }
+    if (!$set) return;
+    Creatures.update(_id, {$set});
+  },
+});
+
+const toggleAllUserLibraries = new ValidatedMethod({
+  name: 'creatures.removeLibraryLimits',
+  mixins: [RateLimiterMixin, simpleSchemaMixin],
+  schema: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    value: {
+      type: Boolean,
+    },
+  }),
+  rateLimit: {
+    numRequests: 10,
+    timeInterval: 5000,
+  },
+  run({_id, value}) {
+    if (value) {
+      Creatures.update(_id, {
+        $unset: {
+          allowedLibraryCollections: 1,
+          allowedLibraries: 1,
+        },
+      });
+    } else {
+      Creatures.update(_id, {
+        $set: {
+          allowedLibraryCollections: [],
+          allowedLibraries: [],
+        },
+      });
+    }
+  },
+});
+
+export {changeAllowedLibraries, toggleAllUserLibraries};
diff --git a/app/imports/api/creature/creatures/methods/index.js b/app/imports/api/creature/creatures/methods/index.js
index 42e9c99e..85aefc77 100644
--- a/app/imports/api/creature/creatures/methods/index.js
+++ b/app/imports/api/creature/creatures/methods/index.js
@@ -2,3 +2,4 @@ import '/imports/api/creature/creatures/methods/insertCreature.js';
 import '/imports/api/creature/creatures/methods/removeCreature.js';
 import '/imports/api/creature/creatures/methods/restCreature.js';
 import '/imports/api/creature/creatures/methods/updateCreature.js';
+import '/imports/api/creature/creatures/methods/changeAllowedLibraries.js';
diff --git a/app/imports/api/creature/creatures/methods/insertCreature.js b/app/imports/api/creature/creatures/methods/insertCreature.js
index 210f7b49..da72f6ed 100644
--- a/app/imports/api/creature/creatures/methods/insertCreature.js
+++ b/app/imports/api/creature/creatures/methods/insertCreature.js
@@ -7,7 +7,7 @@ import defaultCharacterProperties from '/imports/api/creature/creatures/defaultC
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
 import assertHasCharactersSlots from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js';
-import getUserLibraryIds from '/imports/api/library/getUserLibraryIds.js';
+import getCreatureLibraryIds from '/imports/api/library/getCreatureLibraryIds.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import { insertExperienceForCreature } from '/imports/api/creature/experience/Experiences.js';
 import SimpleSchema from 'simpl-schema';
@@ -78,7 +78,7 @@ const insertCreature = new ValidatedMethod({
 
     // If the user only has a single ruleset subscribed, use it by default
     if (Meteor.isServer) {
-      insertDefaultRuleset(baseId, userId, rulesetSlot);
+      insertDefaultRuleset(creatureId, baseId, userId, rulesetSlot);
     }
 
 		return creatureId;
@@ -86,8 +86,8 @@ const insertCreature = new ValidatedMethod({
 });
 
 // If the user only has a single ruleset subscribed, insert it by default
-function insertDefaultRuleset(baseId, userId, slot) {
-  const libraryIds = getUserLibraryIds(userId);
+function insertDefaultRuleset(creatureId, baseId, userId, slot) {
+  const libraryIds = getCreatureLibraryIds(creatureId, userId);
   const filter = getSlotFillFilter({ slot, libraryIds });
   const fillCursor = LibraryNodes.find(filter, { fields: { _id: 1 } });
   const numRulesets = fillCursor.count();
diff --git a/app/imports/server/publications/searchLibraryNodes.js b/app/imports/server/publications/searchLibraryNodes.js
index ddbbf4ba..cedbc7a8 100644
--- a/app/imports/server/publications/searchLibraryNodes.js
+++ b/app/imports/server/publications/searchLibraryNodes.js
@@ -1,6 +1,8 @@
 import { check } from 'meteor/check';
 import Libraries from '/imports/api/library/Libraries.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import getCreatureLibraryIds from '/imports/api/library/getCreatureLibraryIds.js';
+import getUserLibraryIds from '/imports/api/library/getUserLibraryIds.js';
 import { assertViewPermission } from '/imports/api/sharing/sharingPermissions.js';
 
 Meteor.publish('selectedLibraryNodes', function(selectedNodeIds){
@@ -37,7 +39,7 @@ Meteor.publish('selectedLibraryNodes', function(selectedNodeIds){
   })];
 });
 
-Meteor.publish('searchLibraryNodes', function(){
+Meteor.publish('searchLibraryNodes', function(creatureId){
   let self = this;
   this.autorun(function (){
     let type = self.data('type');
@@ -49,23 +51,12 @@ Meteor.publish('searchLibraryNodes', function(){
     }
 
     // Get all the ids of libraries the user can access
-    const user = Meteor.users.findOne(userId, {
-      fields: {subscribedLibraries: 1}
-    });
-    if (!user) return [];
-
-    const subs = user.subscribedLibraries || [];
-    let libraries = Libraries.find({
-      $or: [
-        {owner: this.userId},
-        {writers: this.userId},
-        {readers: this.userId},
-        {_id: {$in: subs}},
-      ]
-    }, {
-      fields: {_id: 1, name: 1},
-    });
-    let libraryIds = libraries.map(lib => lib._id);
+    let libraryIds;
+    if (creatureId) {
+      libraryIds = getCreatureLibraryIds(creatureId, userId)
+    } else {
+      libraryIds = getUserLibraryIds(userId)
+    }
 
     // Build a filter for nodes in those libraries that match the type
     let filter = {
@@ -122,6 +113,7 @@ Meteor.publish('searchLibraryNodes', function(){
       });
 
       let cursor = LibraryNodes.find(filter, options);
+      const libraries = Libraries.find({ _id: { $in: libraryIds } });
 
       Mongo.Collection._publishCursor(libraries, self, 'libraries');
 
diff --git a/app/imports/server/publications/slotFillers.js b/app/imports/server/publications/slotFillers.js
index 95a77c6c..ab6e781d 100644
--- a/app/imports/server/publications/slotFillers.js
+++ b/app/imports/server/publications/slotFillers.js
@@ -3,7 +3,7 @@ import Libraries from '/imports/api/library/Libraries.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
-import getUserLibraryIds from '/imports/api/library/getUserLibraryIds.js';
+import getCreatureLibraryIds from '/imports/api/library/getCreatureLibraryIds.js';
 import { LIBRARY_NODE_TREE_FIELDS } from '/imports/server/publications/library.js';
 
 const FIELDS = {
@@ -28,7 +28,8 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
     }
 
     // Get all the ids of libraries the user can access
-    const libraryIds = getUserLibraryIds(userId);
+    const creatureId = slot.ancestors[0].id;
+    const libraryIds = getCreatureLibraryIds(creatureId, userId);
     const libraries = Libraries.find({
       $or: [
         { owner: userId },
diff --git a/app/imports/ui/creature/CreatureForm.vue b/app/imports/ui/creature/CreatureForm.vue
index f5506393..b9103ff8 100644
--- a/app/imports/ui/creature/CreatureForm.vue
+++ b/app/imports/ui/creature/CreatureForm.vue
@@ -33,7 +33,7 @@
       @change="(value, ack) => $emit('change', {path: ['avatarPicture'], value, ack})"
     />
     <form-sections>
-      <form-section name="settings">
+      <form-section name="Settings">
         <v-switch
           label="Hide redundant stats"
           :input-value="model.settings.hideUnusedStats"
@@ -88,17 +88,48 @@
 				/>
         -->
       </form-section>
+      <form-section name="Libraries">
+        <smart-switch
+          label="All user libraries"
+          @change="allUserLibrariesChange"
+        />
+        <library-list
+          selection
+          :disabled="!model.allowedLibraries && !model.allowedLibraryCollections"
+          :libraries-selected="model.allowedLibraries"
+          :library-collections-selected="model.allowedLibraryCollections"
+          :libraries-selected-by-collections="librariesSelectedByCollections"
+          @select-library="selectLibrary"
+          @select-library-collection="selectLibraryCollection"
+        />
+        <v-progress-linear
+          v-if="libraryWriteLoading"
+          style="margin: 12px -24px -16px -24px; width: calc(100% + 48px);"
+          indeterminate
+        />
+        <p
+          v-if="libraryWriteError"
+          class="text--error"
+        >
+          {{ libraryWriteError }}
+        </p>
+      </form-section>
     </form-sections>
   </div>
 </template>
 
 <script lang="js">
+import { union, without, debounce } from 'lodash';
 import FormSection, {FormSections} from '/imports/ui/properties/forms/shared/FormSection.vue';
+import LibraryList from '/imports/ui/library/LibraryList.vue';
+import LibraryCollections from '/imports/api/library/LibraryCollections.js';
+import {changeAllowedLibraries, toggleAllUserLibraries} from '/imports/api/creature/creatures/methods/changeAllowedLibraries.js';
 
 export default {
 	components: {
 		FormSection,
-		FormSections,
+    FormSections,
+    LibraryList,
 	},
 	props: {
 		stored: {
@@ -116,7 +147,64 @@ export default {
 			type: Boolean,
 		},
     disabled: Boolean,
-	},
+  },
+  data() { return {
+    libraryCollections: this.model.allowedLibraryCollections,
+    libraries: this.model.allowedLibraries,
+    libraryWriteLoading: false,
+    libraryWriteError: undefined,
+    dirty: false, // If there are pending changes
+  }
+  },
+  watch: {
+    'model.allowedLibraryCollections': function (newVal) {
+      if (!this.dirty) this.libraryCollections = newVal;
+    },
+    'model.allowedLibraries': function (newVal) {
+      if (!this.dirty) this.libraries = newVal;
+    },
+  },
+  mounted() {
+
+    this.updateAllowedLibraryCollections = debounce(() => {
+      this.libraryWriteLoading = true;
+      this.dirty = false;
+      changeAllowedLibraries.call({
+        _id: this.model._id,
+        allowedLibraryCollections: this.libraryCollections,
+      }, error => {
+        this.libraryWriteLoading = false;
+        this.libraryWriteError = error;
+      });
+    }, 500);
+
+    this.updateAllowedLibraries = debounce(() => {
+      this.libraryWriteLoading = true;
+      this.dirty = false;
+      changeAllowedLibraries.call({
+        _id: this.model._id,
+        allowedLibraries: this.libraries,
+      }, error => {
+        this.libraryWriteLoading = false;
+        this.libraryWriteError = error;
+      });
+    }, 500);
+
+  },
+  meteor: {
+    $subscribe: {
+      'libraries': [],
+    },
+    librariesSelectedByCollections() {
+      let ids = [];
+      LibraryCollections.find({
+        _id: { $in: this.model.allowedLibraryCollections }
+      }).forEach(collection => {
+        ids = union(ids, collection.libraries);
+      });
+      return ids;
+    },
+  },
   methods: {
     changeShowTreeTab(value){
       this.$emit('change', {
@@ -144,6 +232,30 @@ export default {
         );
       }
     },
+    allUserLibrariesChange(val, ack) {
+      toggleAllUserLibraries.call({
+        _id: this.model._id,
+        val
+      }, error => ack(error));
+    },
+    selectLibrary(id, val) {
+      if (val) {
+        this.libraries = union(this.libraries, [id]);
+      } else {
+        this.libraries = without(this.libraries, id);
+      }
+      this.dirty = true;
+      this.updateAllowedLibraries();
+    },
+    selectLibraryCollection(id, val) {
+      if (val) {
+        this.libraryCollections = union(this.libraryCollections, [id]);
+      } else {
+        this.libraryCollections = without(this.libraryCollections, id);
+      }
+      this.dirty = true;
+      this.updateAllowedLibraryCollections();
+    },
   },
 };
 </script>
diff --git a/app/imports/ui/creature/character/CharacterCreationDialog.vue b/app/imports/ui/creature/character/CharacterCreationDialog.vue
index 69e33330..568ae394 100644
--- a/app/imports/ui/creature/character/CharacterCreationDialog.vue
+++ b/app/imports/ui/creature/character/CharacterCreationDialog.vue
@@ -195,7 +195,7 @@ export default {
         } else {
           this.$store.commit(
               'setTabForCharacterSheet',
-              {id: creatureId, tab: 4}
+              {id: creatureId, tab: 5}
             );
           this.$emit('pop', creatureId);
           defer(() => {
diff --git a/app/imports/ui/creature/character/CharacterSheetFab.vue b/app/imports/ui/creature/character/CharacterSheetFab.vue
index 4fee5c36..49590d75 100644
--- a/app/imports/ui/creature/character/CharacterSheetFab.vue
+++ b/app/imports/ui/creature/character/CharacterSheetFab.vue
@@ -170,6 +170,7 @@
           data: {
             parentDoc: forcedType ? undefined : parent,
             forcedType,
+            creatureId: this.creatureId,
           },
           callback(result){
             if (!result){
diff --git a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
index 133d713b..944c7642 100644
--- a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
@@ -171,160 +171,166 @@
 </template>
 
 <script lang="js">
-  import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-  import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-  import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-  import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-  import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
-  import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
-  import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-  import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
-  import Libraries from '/imports/api/library/Libraries.js';
-  import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-  import PropertySelector from '/imports/ui/properties/shared/PropertySelector.vue';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
+import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
+import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
+import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
+import Libraries from '/imports/api/library/Libraries.js';
+import getThemeColor from '/imports/ui/utility/getThemeColor.js';
+import PropertySelector from '/imports/ui/properties/shared/PropertySelector.vue';
+import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
 
-  export default {
-    components: {
-      PropertySelector,
-      DialogBase,
-      TreeNodeView,
-      LibraryNodeExpansionContent,
-      ...propertyFormIndex,
+export default {
+  components: {
+    PropertySelector,
+    DialogBase,
+    TreeNodeView,
+    LibraryNodeExpansionContent,
+    ...propertyFormIndex,
+  },
+  mixins: [schemaFormMixin],
+  props: {
+    creatureId: {
+      type: String,
+      default: undefined,
     },
-    mixins: [schemaFormMixin],
-    props: {
-      forcedType: {
-        type: String,
-        default: undefined,
-      },
-      suggestedTypes: {
-        type: Array,
-        default: undefined,
-      },
-      suggestedType: {
-        type: String,
-        default: undefined,
-      },
-      parentDoc: {
-        type: Object,
-        default: undefined,
-      },
+    forcedType: {
+      type: String,
+      default: undefined,
     },
-    reactiveProvide: {
-      name: 'context',
-      include: ['debounceTime'],
+    suggestedTypes: {
+      type: Array,
+      default: undefined,
     },
-    data(){return {
-      selectedNodeIds: [],
-      type: this.forcedType || this.suggestedType,
-      model: {
-        type: this.type,
-      },
-      searchValue: undefined,
-      debounceTime: 0,
-      tab: 0,
-    };},
-    computed: {
-      typeName(){
-        return getPropertyName(this.type) || 'Property';
-      },
-      toolbarColor(){
-        return getThemeColor('secondary');
-      }
+    suggestedType: {
+      type: String,
+      default: undefined,
     },
-    watch: {
-      type(newType){
-        this.changeType(newType);
-      },
+    parentDoc: {
+      type: Object,
+      default: undefined,
     },
-    mounted(){
-      this.changeType(this.type);
+  },
+  reactiveProvide: {
+    name: 'context',
+    include: ['debounceTime'],
+  },
+  data(){return {
+    selectedNodeIds: [],
+    type: this.forcedType || this.suggestedType,
+    model: {
+      type: this.type,
     },
-    methods: {
-
-      propertyHelpChanged(value){
-        Meteor.users.setPreference.call({
-          preference: 'hidePropertySelectDialogHelp',
-          value: !value
-        }, error => {
-          if (!error) return;
-          console.error(error);
-          snackbar({
-            text: error.reason,
-          });
-        });
-      },
-      searchChanged(val, ack){
-        this._subs.searchLibraryNodes.setData('searchTerm', val);
-        this._subs.searchLibraryNodes.setData('limit', undefined);
-        this.selectedNode = undefined;
-        this.searchValue = val;
-        setTimeout(ack, 200);
-      },
-      loadMore(){
-        if (this.currentLimit >= this.countAll) return;
-        this._subs.searchLibraryNodes.setData('limit', this.currentLimit + 32);
-      },
-      insert(){
-        if (!this.selectedNodeIds.length) return;
-        this.$store.dispatch('popDialogStack', this.selectedNodeIds);
-      },
-      changeType(type){
-        this._subs.searchLibraryNodes.setData('type', type);
-        if (!type) return;
-        this.tab = 1;
-        this.schema = propertySchemasIndex[type];
-        this.validationContext = this.schema.newContext();
-        let model = this.schema.clean({});
-        model.type = type;
-        this.model = model;
-      },
-      openPropertyDetails(id){
-        this.$store.commit('pushDialogStack', {
-          component: 'library-node-dialog',
-          elementId: id,
-          data: {
-            _id: id,
-          },
-        });
-      },
+    searchValue: undefined,
+    debounceTime: 0,
+    tab: 0,
+  };},
+  computed: {
+    typeName(){
+      return getPropertyName(this.type) || 'Property';
     },
-    meteor: {
-      '$subscribe':{
-        'searchLibraryNodes': [],
-        'selectedLibraryNodes'(){
-          return [this.selectedNodeIds];
-        },
-      },
-      showPropertyHelp(){
-        let user = Meteor.user();
-        return !(user?.preferences?.hidePropertySelectDialogHelp)
-      },
-      currentLimit(){
-        return this._subs.searchLibraryNodes.data('limit') || 32;
-      },
-      countAll(){
-        return this._subs.searchLibraryNodes.data('countAll');
-      },
-      libraryNodes(){
-        return LibraryNodes.find({
-          _searchResult: true
-        },{
-          sort: {
-            'ancestors.0.id': 1,
-            name: 1,
-            order: 1,
-          },
-        });
-      },
-      libraryNames(){
-        let names = {};
-        Libraries.find().forEach(lib => names[lib._id] = lib.name)
-        return names;
-      }
+    toolbarColor(){
+      return getThemeColor('secondary');
     }
-  };
+  },
+  watch: {
+    type(newType){
+      this.changeType(newType);
+    },
+  },
+  mounted(){
+    this.changeType(this.type);
+  },
+  methods: {
+
+    propertyHelpChanged(value){
+      Meteor.users.setPreference.call({
+        preference: 'hidePropertySelectDialogHelp',
+        value: !value
+      }, error => {
+        if (!error) return;
+        console.error(error);
+        snackbar({
+          text: error.reason,
+        });
+      });
+    },
+    searchChanged(val, ack){
+      this._subs.searchLibraryNodes.setData('searchTerm', val);
+      this._subs.searchLibraryNodes.setData('limit', undefined);
+      this.selectedNode = undefined;
+      this.searchValue = val;
+      setTimeout(ack, 200);
+    },
+    loadMore(){
+      if (this.currentLimit >= this.countAll) return;
+      this._subs.searchLibraryNodes.setData('limit', this.currentLimit + 32);
+    },
+    insert(){
+      if (!this.selectedNodeIds.length) return;
+      this.$store.dispatch('popDialogStack', this.selectedNodeIds);
+    },
+    changeType(type){
+      this._subs.searchLibraryNodes.setData('type', type);
+      if (!type) return;
+      this.tab = 1;
+      this.schema = propertySchemasIndex[type];
+      this.validationContext = this.schema.newContext();
+      let model = this.schema.clean({});
+      model.type = type;
+      this.model = model;
+    },
+    openPropertyDetails(id){
+      this.$store.commit('pushDialogStack', {
+        component: 'library-node-dialog',
+        elementId: id,
+        data: {
+          _id: id,
+        },
+      });
+    },
+  },
+  meteor: {
+    '$subscribe':{
+      'searchLibraryNodes'() {
+        return [this.creatureId]
+      },
+      'selectedLibraryNodes'(){
+        return [this.selectedNodeIds];
+      },
+    },
+    showPropertyHelp(){
+      let user = Meteor.user();
+      return !(user?.preferences?.hidePropertySelectDialogHelp)
+    },
+    currentLimit(){
+      return this._subs.searchLibraryNodes.data('limit') || 32;
+    },
+    countAll(){
+      return this._subs.searchLibraryNodes.data('countAll');
+    },
+    libraryNodes(){
+      return LibraryNodes.find({
+        _searchResult: true
+      },{
+        sort: {
+          'ancestors.0.id': 1,
+          name: 1,
+          order: 1,
+        },
+      });
+    },
+    libraryNames(){
+      let names = {};
+      Libraries.find().forEach(lib => names[lib._id] = lib.name)
+      return names;
+    }
+  }
+};
 </script>
 
 <style lang="css" scoped>
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index f83a071c..c77026ba 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -276,6 +276,7 @@ export default {
         elementId: 'insert-creature-property-btn',
         data: {
           parentDoc: this.model,
+          creatureId: this.creatureId,
         },
         callback(result){
           if (!result) return;

From 566d6a4fefe46e0abcfb81b84537b72d28f3b708 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 20 Jul 2022 15:57:38 +0200
Subject: [PATCH 46/56] =?UTF-8?q?Triggers=20=F0=9F=A4=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creatures/methods/restCreature.js         | 228 +++++++++++-------
 .../api/engine/actions/applyProperty.js       |   7 +-
 .../api/engine/actions/applyTriggers.js       |  96 ++++++++
 app/imports/api/engine/actions/doAction.js    |  73 +++---
 .../computation/buildCreatureComputation.js   |  54 +----
 app/imports/api/engine/loadCreatures.js       | 147 +++++++++++
 app/imports/api/properties/Actions.js         |   3 -
 app/imports/api/properties/Triggers.js        | 136 +++++++++++
 .../computedOnlyPropertySchemasIndex.js       |   2 +
 .../computedPropertySchemasIndex.js           |   2 +
 .../api/properties/propertySchemasIndex.js    |   2 +
 app/imports/constants/PROPERTIES.js           |   6 +
 .../ui/properties/forms/TriggerForm.vue       | 206 ++++++++++++++++
 .../forms/shared/propertyFormIndex.js         |   2 +
 .../ui/properties/viewers/TriggerViewer.vue   |  74 ++++++
 .../viewers/shared/propertyViewerIndex.js     |   2 +
 16 files changed, 853 insertions(+), 187 deletions(-)
 create mode 100644 app/imports/api/engine/actions/applyTriggers.js
 create mode 100644 app/imports/api/properties/Triggers.js
 create mode 100644 app/imports/ui/properties/forms/TriggerForm.vue
 create mode 100644 app/imports/ui/properties/viewers/TriggerViewer.vue

diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 0115db52..2f630a5b 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -1,9 +1,14 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
+import { groupBy, remove, rest, union } from 'lodash';
+import {
+  getCreature, getVariables, getPropertiesOfType
+} from '/imports/api/engine/loadCreatures.js';
+import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
+import { applyTrigger } from '/imports/api/engine/actions/applyTriggers.js';
 
 const restCreature = new ValidatedMethod({
   name: 'creature.methods.rest',
@@ -23,101 +28,142 @@ const restCreature = new ValidatedMethod({
     timeInterval: 5000,
   },
   run({creatureId, restType}) {
-    let creature = Creatures.findOne(creatureId, {
-      fields: {
-        owner: 1,
-        writers: 1,
-        settings: 1,
-      }
-    }) ;
-    // Need edit permissions
+    // Check permissions
+    let creature = getCreature(creatureId);
     assertEditPermission(creature, this.userId);
 
-    // Long rests reset short rest properties as well
-    let resetFilter;
-    if (restType === 'shortRest'){
-      resetFilter = 'shortRest'
-    } else {
-      resetFilter = {$in: ['shortRest', 'longRest']}
+    // Add the variables to the creature document
+    const variables = getVariables(creatureId);
+    delete variables._id;
+    delete variables._creatureId;
+    creature.variables = variables;
+    const scope = creature.variables;
+
+    // Get the triggers
+    let triggers = getPropertiesOfType(creatureId, 'trigger');
+    remove(triggers, trigger =>
+      trigger.event !== 'anyRest' &&
+      trigger.event !== 'longRest' &&
+      trigger.event !== 'shortRest'
+    );
+    triggers = groupBy(triggers, 'event');
+    for (let type in triggers) {
+      triggers[type] = groupBy(triggers[type], 'timing')
     }
-    // Only apply to active properties
-    let filter = {
-      'ancestors.id': creatureId,
-      reset: resetFilter,
-      removed: { $ne: true },
-      inactive: { $ne: true },
-    };
-    // update all attribute's damage
-    filter.type = 'attribute';
-    CreatureProperties.update(filter, {
-      $set: {
-        damage: 0,
-        dirty: true,
-      }
-    }, {
-      selector: {type: 'attribute'},
-      multi: true,
+
+    // Create the log
+    const log = CreatureLogSchema.clean({
+      creatureId: creature._id,
+      creatureName: creature.name,
     });
-    // Update all action-like properties' usesUsed
-    filter.type = {$in: [
-      'action',
-      'attack',
-      'spell'
-    ]};
-    CreatureProperties.update(filter, {
-      $set: {
-        usesUsed: 0,
-        dirty: true,
-      }
-    }, {
-      selector: {type: 'action'},
-      multi: true,
-    });
-    // Reset half hit dice on a long rest, starting with the highest dice
-    if (restType === 'longRest'){
-      let hitDice = CreatureProperties.find({
-        'ancestors.id': creatureId,
-        type: 'attribute',
-        attributeType: 'hitDice',
-        removed: {$ne: true},
-        inactive: {$ne: true},
-      }, {
-        fields: {
-          hitDiceSize: 1,
-          damage: 1,
-          value: 1,
-        }
-      }).fetch();
-      // Use a collator to do sorting in natural order
-      let collator = new Intl.Collator('en', {
-        numeric: true, sensitivity: 'base'
-      });
-      // Get the hit dice in decending order of hitDiceSize
-      let compare = (a, b) => collator.compare(b.hitDiceSize, a.hitDiceSize)
-      hitDice.sort(compare);
-      // Get the total number of hit dice that can be recovered this rest
-      let totalHd = hitDice.reduce((sum, hd) => sum + (hd.value || 0), 0);
-      let resetMultiplier = creature.settings.hitDiceResetMultiplier || 0.5;
-      let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
-      // recover each hit dice in turn until the recoverable amount is used up
-      let amountToRecover, resultingDamage;
-      hitDice.forEach(hd => {
-        if (!recoverableHd) return;
-        amountToRecover = Math.min(recoverableHd, hd.damage || 0);
-        if (!amountToRecover) return;
-        recoverableHd -= amountToRecover;
-        resultingDamage = hd.damage - amountToRecover;
-        CreatureProperties.update(hd._id, {
-          $set: {
-            damage: resultingDamage,
-            dirty: true,
-          }
-        }, {
-          selector: {type: 'attribute'},
-        });
-      });
-    }
+
+    const targets = [creature];
+
+    applyTriggers(triggers, restType, 'before', { creature, targets, scope, log });
+    doRestWork(creature, restType);
+    applyTriggers(triggers, restType, 'after', { creature, targets, scope, log });
+
+    insertCreatureLogWork({log, creature, method: this});
   },
 });
 
+function applyTriggers(triggers, restType, timing, opts) {
+  // Get matching triggers
+  let selectedTriggers = triggers[restType]?.[timing] || [];
+  // Get any rest triggers as well
+  selectedTriggers = union(selectedTriggers, triggers['anyRest']?.[timing]);
+  selectedTriggers.sort((a, b) => a.order - b.order);
+  // Apply the triggers
+  selectedTriggers.forEach(trigger => {
+    applyTrigger(trigger, opts)
+  });
+}
+
+function doRestWork(creature, restType) {
+  // Long rests reset short rest properties as well
+  let resetFilter;
+  if (restType === 'shortRest'){
+    resetFilter = 'shortRest'
+  } else {
+    resetFilter = {$in: ['shortRest', 'longRest']}
+  }
+  // Only apply to active properties
+  let filter = {
+    'ancestors.id': creature._id,
+    reset: resetFilter,
+    removed: { $ne: true },
+    inactive: { $ne: true },
+  };
+  // update all attribute's damage
+  filter.type = 'attribute';
+  CreatureProperties.update(filter, {
+    $set: {
+      damage: 0,
+      dirty: true,
+    }
+  }, {
+    selector: {type: 'attribute'},
+    multi: true,
+  });
+  // Update all action-like properties' usesUsed
+  filter.type = {$in: [
+    'action',
+    'attack',
+    'spell'
+  ]};
+  CreatureProperties.update(filter, {
+    $set: {
+      usesUsed: 0,
+      dirty: true,
+    }
+  }, {
+    selector: {type: 'action'},
+    multi: true,
+  });
+  // Reset half hit dice on a long rest, starting with the highest dice
+  if (restType === 'longRest'){
+    let hitDice = CreatureProperties.find({
+      'ancestors.id': creature._id,
+      type: 'attribute',
+      attributeType: 'hitDice',
+      removed: {$ne: true},
+      inactive: {$ne: true},
+    }, {
+      fields: {
+        hitDiceSize: 1,
+        damage: 1,
+        value: 1,
+      }
+    }).fetch();
+    // Use a collator to do sorting in natural order
+    let collator = new Intl.Collator('en', {
+      numeric: true, sensitivity: 'base'
+    });
+    // Get the hit dice in decending order of hitDiceSize
+    let compare = (a, b) => collator.compare(b.hitDiceSize, a.hitDiceSize)
+    hitDice.sort(compare);
+    // Get the total number of hit dice that can be recovered this rest
+    let totalHd = hitDice.reduce((sum, hd) => sum + (hd.value || 0), 0);
+    let resetMultiplier = creature.settings.hitDiceResetMultiplier || 0.5;
+    let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
+    // recover each hit dice in turn until the recoverable amount is used up
+    let amountToRecover, resultingDamage;
+    hitDice.forEach(hd => {
+      if (!recoverableHd) return;
+      amountToRecover = Math.min(recoverableHd, hd.damage || 0);
+      if (!amountToRecover) return;
+      recoverableHd -= amountToRecover;
+      resultingDamage = hd.damage - amountToRecover;
+      CreatureProperties.update(hd._id, {
+        $set: {
+          damage: resultingDamage,
+          dirty: true,
+        }
+      }, {
+        selector: {type: 'attribute'},
+      });
+    });
+  }
+}
+
 export default restCreature;
diff --git a/app/imports/api/engine/actions/applyProperty.js b/app/imports/api/engine/actions/applyProperty.js
index 32542390..5930a93d 100644
--- a/app/imports/api/engine/actions/applyProperty.js
+++ b/app/imports/api/engine/actions/applyProperty.js
@@ -7,6 +7,7 @@ import note from './applyPropertyByType/applyNote.js';
 import roll from './applyPropertyByType/applyRoll.js';
 import savingThrow from './applyPropertyByType/applySavingThrow.js';
 import toggle from './applyPropertyByType/applyToggle.js';
+import applyTriggers from '/imports/api/engine/actions/applyTriggers.js';
 
 const applyPropertyByType = {
   action,
@@ -21,7 +22,9 @@ const applyPropertyByType = {
   toggle,
 };
 
-export default function applyProperty(node, opts, ...rest){
+export default function applyProperty(node, opts, ...rest) {
+  applyTriggers(node, opts, 'before');
   opts.scope[`#${node.node.type}`] = node.node;
-  return applyPropertyByType[node.node.type]?.(node, opts, ...rest);
+  applyPropertyByType[node.node.type]?.(node, opts, ...rest);
+  applyTriggers(node, opts, 'after');
 }
diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js
new file mode 100644
index 00000000..3844ae15
--- /dev/null
+++ b/app/imports/api/engine/actions/applyTriggers.js
@@ -0,0 +1,96 @@
+import recalculateCalculation from '/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js';
+import recalculateInlineCalculations from '/imports/api/engine/actions/applyPropertyByType/shared/recalculateInlineCalculations.js';
+import { getPropertyDecendants } from '/imports/api/engine/loadCreatures.js';
+import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
+import applyProperty from '/imports/api/engine/actions/applyProperty.js';
+import { difference, intersection } from 'lodash';
+
+export default function applyTriggers(node, { creature, targets, scope, log }, timing) {
+  const prop = node.node;
+  const type = prop.type;
+  if (creature.triggers?.[type]?.[timing]) {
+    creature.triggers[type][timing].forEach(trigger => {
+      // Tags
+      if (!triggerMatchTags(trigger, prop)) return;
+      // Condition
+      if (trigger.condition?.parseNode) {
+        recalculateCalculation(trigger.condition, scope, log);
+        if (!trigger.condition.value) return;
+      }
+      // Apply
+      applyTrigger(trigger, { creature, targets, scope, log });
+    });
+  }
+}
+
+function triggerMatchTags(trigger, prop) {
+  let matched = false;
+  // Check the target tags
+  if (
+    !trigger.targetTags?.length ||
+    difference(trigger.targetTags, prop.tags).length === 0
+  ) {
+    matched = true;
+  }
+  // Check the extra tags
+  trigger.extraTags?.forEach(extra => {
+    if (extra.operation === 'OR') {
+      if (matched) return;
+      if (
+        !extra.tags.length ||
+        difference(extra.tags, prop.tags).length === 0
+      ) {
+        matched = true;
+      }
+    } else if (extra.operation === 'NOT') {
+      if (
+        extra.tags.length &&
+        intersection(extra.tags, prop.tags)
+      ) {
+        return false;
+      }
+    }
+  });
+  return matched;
+}
+
+export function applyTrigger(trigger, { creature, targets, scope, log }) {
+  if (trigger.firing) {
+    /*
+    log.content.push({
+      name: trigger.name || 'Trigger',
+      value: 'Trigger can\'t fire itself',
+      inline: true,
+    });
+    */
+    return;
+  }
+  trigger.firing = true;
+
+  // Fire the trigger
+  const content = {
+    name: trigger.name || 'Trigger',
+    value: trigger.summary,
+    inline: false,
+  }
+  if (trigger.summary?.text){
+    recalculateInlineCalculations(trigger.summary, scope, log);
+    content.value = trigger.summary.value;
+  }
+  log.content.push(content);
+
+  // Get all the trigger's properties and apply them
+  const properties = getPropertyDecendants(creature._id, trigger._id);
+  properties.sort((a, b) => a.order - b.order);
+  const propertyForest = nodeArrayToTree(properties);
+  propertyForest.forEach(node => {
+    applyProperty(node, {
+      creature,
+      targets,
+      scope,
+      log,
+    });
+  });
+
+  trigger.firing = false;
+}
diff --git a/app/imports/api/engine/actions/doAction.js b/app/imports/api/engine/actions/doAction.js
index c22deff2..75a4112c 100644
--- a/app/imports/api/engine/actions/doAction.js
+++ b/app/imports/api/engine/actions/doAction.js
@@ -1,14 +1,16 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
+import {
+  getCreature, getVariables, getProperyAncestors, getPropertyDecendants, getPropertiesOfType
+} from '/imports/api/engine/loadCreatures.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import applyProperty from './applyProperty.js';
+import { groupBy, remove } from 'lodash';
 
 const doAction = new ValidatedMethod({
   name: 'creatureProperties.doAction',
@@ -38,52 +40,37 @@ const doAction = new ValidatedMethod({
   run({actionId, targetIds = [], scope}) {
     let action = CreatureProperties.findOne(actionId);
 		// Check permissions
-    let creature = getRootCreatureAncestor(action);
-    const variables = CreatureVariables.findOne({
-      _creatureId: creature._id
-    }, {
-      fields: {_id: 0, _creatureId: 0},
-    });
-    creature.variables = variables;
-
+    const creatureId = action.ancestors[0].id;
+    let creature = getCreature(action.ancestors[0].id);
     assertEditPermission(creature, this.userId);
 
+    // Add the variables to the creature document
+    const variables = getVariables(creatureId);
+    delete variables._id;
+    delete variables._creatureId;
+    creature.variables = variables;
+
     // Get all the targets and make sure we can edit them
     let targets = [];
     targetIds.forEach(targetId => {
-      let target = Creatures.findOne(targetId);
+      let target = getCreature(targetId);
       assertEditPermission(target, this.userId);
-      const variables = CreatureVariables.findOne({
-        _creatureId: targetId
-      }, {
-        fields: {_id: 0, _creatureId: 0},
-      });
+
+      // add the variables to the target documents
+      const variables = getVariables(creatureId);
+      delete variables._id;
+      delete variables._creatureId;
       target.variables = variables;
+
       targets.push(target);
     });
 
-    // Fetch all the action's ancestor creatureProperties
-    const ancestorIds = [];
-    action.ancestors.forEach(ref => {
-      if (ref.collection === 'creatureProperties') {
-        ancestorIds.push(ref.id);
-      }
-    });
+    const ancestors = getProperyAncestors(creatureId, action._id);
+    ancestors.sort((a, b) => a.order - b.order);
 
-    // Get cursor of ancestors
-    const ancestors = CreatureProperties.find({
-      _id: {$in: ancestorIds},
-    }, {
-      sort: {order: 1},
-    });
-
-    // Get cursor of the properties
-    const properties = CreatureProperties.find({
-      $or: [{_id: action._id}, {'ancestors.id': action._id}],
-      removed: {$ne: true},
-    }, {
-      sort: {order: 1},
-    });
+    const properties = getPropertyDecendants(creatureId, action._id);
+    properties.push(action);
+    properties.sort((a, b) => a.order - b.order);
 
     // Do the action
     doActionWork({creature, targets, properties, ancestors, method: this, methodScope: scope});
@@ -109,6 +96,14 @@ export function doActionWork({
     throw new Meteor.Error(`The action has ${propertyForest.length} top level properties, expected 1`);
   }
 
+  // Get the triggers
+  const triggers = getPropertiesOfType(creature._id, 'trigger');
+  remove(triggers, trigger => trigger.event !== 'doActionProperty');
+  creature.triggers = groupBy(triggers, 'actionPropertyType');
+  for (let type in creature.triggers) {
+    creature.triggers[type] = groupBy(creature.triggers[type], 'timing')
+  }
+
   // Create the log
   if (!log) log = CreatureLogSchema.clean({
     creatureId: creature._id,
diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js
index 83cadace..d99d9290 100644
--- a/app/imports/api/engine/computation/buildCreatureComputation.js
+++ b/app/imports/api/engine/computation/buildCreatureComputation.js
@@ -1,10 +1,7 @@
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
-import CreatureProperties,
-  { DenormalisedOnlyCreaturePropertySchema as denormSchema }
+import { DenormalisedOnlyCreaturePropertySchema as denormSchema }
   from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import { loadedCreatures } from '../loadCreatures.js';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
+import { getProperties, getCreature, getVariables } from '/imports/api/engine/loadCreatures.js';
 import computedOnlySchemas from '/imports/api/properties/computedOnlyPropertySchemasIndex.js';
 import computedSchemas from '/imports/api/properties/computedPropertySchemasIndex.js';
 import linkInventory from './buildComputation/linkInventory.js';
@@ -40,53 +37,6 @@ export default function buildCreatureComputation(creatureId){
   return computation;
 }
 
-function getProperties(creatureId) {
-  if (loadedCreatures.has(creatureId)) {
-    const creature = loadedCreatures.get(creatureId);
-    const props = Array.from(creature.properties.values());
-    const cloneProps = EJSON.clone(props);
-    return cloneProps
-  }
-  // console.time(`Cache miss on creature properties: ${creatureId}`)
-  const props = CreatureProperties.find({
-    'ancestors.id': creatureId,
-    'removed': {$ne: true},
-  }, {
-    sort: { order: 1 },
-    fields: { icon: 0 },
-  }).fetch();
-  // console.timeEnd(`Cache miss on creature properties: ${creatureId}`);
-  return props;
-}
-
-function getCreature(creatureId) {
-  if (loadedCreatures.has(creatureId)) {
-    const loadedCreature = loadedCreatures.get(creatureId);
-    const creature = loadedCreature.creature;
-    if (creature) return creature;
-  }
-  // console.time(`Cache miss on Creature: ${creatureId}`);
-  const creature = Creatures.findOne(creatureId, {
-    denormalizedStats: 1,
-    variables: 1,
-    dirty: 1,
-  });
-  // console.timeEnd(`Cache miss on Creature: ${creatureId}`);
-  return creature;
-}
-
-function getVariables(creatureId) {
-  if (loadedCreatures.has(creatureId)) {
-    const loadedCreature = loadedCreatures.get(creatureId);
-    const variables = loadedCreature.variables;
-    if (variables) return variables;
-  }
-  // console.time(`Cache miss on variables: ${creatureId}`);
-  const variables = CreatureVariables.findOne({_creatureId: creatureId});
-  // console.timeEnd(`Cache miss on variables: ${creatureId}`);
-  return variables;
-}
-
 export function buildComputationFromProps(properties, creature, variables){
 
   const computation = new CreatureComputation(properties, creature, variables);
diff --git a/app/imports/api/engine/loadCreatures.js b/app/imports/api/engine/loadCreatures.js
index d7a07154..9823f892 100644
--- a/app/imports/api/engine/loadCreatures.js
+++ b/app/imports/api/engine/loadCreatures.js
@@ -32,6 +32,153 @@ function unloadCreature(creatureId, subscription) {
   }
 }
 
+export function getSingleProperty(creatureId, propertyId) {
+  if (loadedCreatures.has(creatureId)) {
+    const creature = loadedCreatures.get(creatureId);
+    const property = creature.properties.get(propertyId);
+    const cloneProp = EJSON.clone(property);
+    return cloneProp;
+  }
+  // console.time(`Cache miss on creature properties: ${creatureId}`)
+  const prop = CreatureProperties.findOne({
+    _id: propertyId,
+    'ancestors.id': creatureId,
+    'removed': {$ne: true},
+  }, {
+    sort: { order: 1 },
+    fields: { icon: 0 },
+  });
+  // console.timeEnd(`Cache miss on creature properties: ${creatureId}`);
+  return prop;
+}
+
+export function getProperties(creatureId) {
+  if (loadedCreatures.has(creatureId)) {
+    const creature = loadedCreatures.get(creatureId);
+    const props = Array.from(creature.properties.values());
+    const cloneProps = EJSON.clone(props);
+    return cloneProps
+  }
+  // console.time(`Cache miss on creature properties: ${creatureId}`)
+  const props = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    'removed': {$ne: true},
+  }, {
+    sort: { order: 1 },
+    fields: { icon: 0 },
+  }).fetch();
+  // console.timeEnd(`Cache miss on creature properties: ${creatureId}`);
+  return props;
+}
+
+export function getPropertiesOfType(creatureId, propType) {
+  if (loadedCreatures.has(creatureId)) {
+    const creature = loadedCreatures.get(creatureId);
+    const props = []
+    for (const prop of creature.properties.values()){
+      if (prop.type === propType) {
+        props.push(prop);
+      }
+    }
+    const cloneProps = EJSON.clone(props);
+    return cloneProps
+  }
+  // console.time(`Cache miss on creature properties: ${creatureId}`)
+  const props = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    'removed': { $ne: true },
+    'type': propType,
+  }, {
+    sort: { order: 1 },
+    fields: { icon: 0 },
+  }).fetch();
+  // console.timeEnd(`Cache miss on creature properties: ${creatureId}`);
+  return props;
+}
+
+export function getCreature(creatureId) {
+  if (loadedCreatures.has(creatureId)) {
+    const loadedCreature = loadedCreatures.get(creatureId);
+    const creature = loadedCreature.creature;
+    if (creature) return creature;
+  }
+  // console.time(`Cache miss on Creature: ${creatureId}`);
+  const creature = Creatures.findOne(creatureId, {
+    denormalizedStats: 1,
+    variables: 1,
+    dirty: 1,
+  });
+  // console.timeEnd(`Cache miss on Creature: ${creatureId}`);
+  return creature;
+}
+
+export function getVariables(creatureId) {
+  if (loadedCreatures.has(creatureId)) {
+    const loadedCreature = loadedCreatures.get(creatureId);
+    const variables = loadedCreature.variables;
+    if (variables) return variables;
+  }
+  // console.time(`Cache miss on variables: ${creatureId}`);
+  const variables = CreatureVariables.findOne({_creatureId: creatureId});
+  // console.timeEnd(`Cache miss on variables: ${creatureId}`);
+  return variables;
+}
+
+export function getProperyAncestors(creatureId, propertyId) {
+  const prop = getSingleProperty(creatureId, propertyId);
+  if (!prop) return [];
+  const ancestorIds = [];
+  prop.ancestors.forEach(ref => {
+    if (ref.collection === 'creatureProperties') {
+      ancestorIds.push(ref.id);
+    }
+  });
+  if (loadedCreatures.has(creatureId)) {
+    // Get the ancestor properties from the cache
+    const creature = loadedCreatures.get(creatureId);
+    const props = [];
+    ancestorIds.forEach(id => {
+      const prop = creature.properties.get(id);
+      if (prop) {
+        props.push(prop);
+      }
+    });
+    const cloneProps = EJSON.clone(props);
+    return cloneProps
+  } else {
+    // Fetch from database
+    return CreatureProperties.find({
+      _id: { $in: ancestorIds },
+    }, {
+      sort: { order: 1 },
+    }).fetch();
+  }
+}
+
+export function getPropertyDecendants(creatureId, propertyId) {
+  const property = getSingleProperty(creatureId, propertyId);
+  if (!property) return [];
+  // This prop will always appear at the same position in the ancestor array
+  // of its decendants, so only check there
+  const expectedAncestorPostition = property.ancestors.length;
+  if (loadedCreatures.has(creatureId)) {
+    const creature = loadedCreatures.get(creatureId);
+    const props = [];
+    for(const prop of creature.properties.values()){
+      if (prop.ancestors[expectedAncestorPostition]?.id === propertyId) {
+        props.push(prop);
+      }
+    }
+    const cloneProps = EJSON.clone(props);
+    return cloneProps
+  } else {
+    return CreatureProperties.find({
+      'ancestors.id': propertyId,
+      removed: { $ne: true },
+    }).fetch();
+  }
+}
+
 class LoadedCreature {
   constructor(sub, creatureId) {
     // This may be called from a subscription, but we don't want the observers
diff --git a/app/imports/api/properties/Actions.js b/app/imports/api/properties/Actions.js
index ccda82d1..53e57afa 100644
--- a/app/imports/api/properties/Actions.js
+++ b/app/imports/api/properties/Actions.js
@@ -5,9 +5,6 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
 
 /*
  * Actions are things a character can do
- * Any rolls that are children of actions will be rolled when taking the action
- * Any actions that are children of this action will be considered alternatives
- * to this action
  */
 let ActionSchema = createPropertySchema({
   name: {
diff --git a/app/imports/api/properties/Triggers.js b/app/imports/api/properties/Triggers.js
new file mode 100644
index 00000000..3b9b0d13
--- /dev/null
+++ b/app/imports/api/properties/Triggers.js
@@ -0,0 +1,136 @@
+import SimpleSchema from 'simpl-schema';
+import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js';
+import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
+
+const eventOptions = {
+  doActionProperty: 'Do action',
+  // receiveActionProperty: 'Receiving action property',
+  // flipToggle: 'Toggle changed',
+  // adjustProperty: 'Attribute adjusted',
+  anyRest: 'Short or long rest',
+  longRest: 'Long rest',
+  shortRest: 'Short rest',
+}
+
+const timingOptions = {
+  before: 'Before',
+  after: 'After',
+}
+
+const actionPropertyTypeOptions = {
+  action: 'Action',
+  adjustment: 'Attribute damage',
+  branch: 'Branch',
+  buff: 'Buff',
+  damage: 'Damage',
+  note: 'Note',
+  roll: 'Roll',
+  savingThrow: 'Saving throw',
+  toggle: 'Toggle',
+}
+
+/*
+ * Triggers are like actions that fire themselves when certain things happen on
+ * the sheet. Either during another action or as its own action after a sheet
+ * event. The same trigger can't fire twice in the same action step.
+ */
+let TriggerSchema = createPropertySchema({
+  name: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.name,
+  },
+  summary: {
+    type: 'inlineCalculationFieldToCompute',
+    optional: true,
+  },
+  description: {
+    type: 'inlineCalculationFieldToCompute',
+    optional: true,
+  },
+  event: {
+    type: String,
+    allowedValues: Object.keys(eventOptions),
+    defaultValue: 'doActionProperty',
+  },
+  // Action type
+  actionPropertyType: {
+    type: String,
+    allowedValues: Object.keys(actionPropertyTypeOptions),
+    optional: true,
+  },
+  timing: {
+    type: String,
+    allowedValues: Object.keys(timingOptions),
+    defaultValue: 'after',
+  },
+  condition: {
+    type: 'fieldToCompute',
+    optional: true,
+    parseLevel: 'compile',
+  },
+  // Which tags the trigger is applied to
+  targetTags: {
+    type: Array,
+    optional: true,
+    maxCount: STORAGE_LIMITS.tagCount,
+  },
+  'targetTags.$': {
+    type: String,
+    max: STORAGE_LIMITS.tagLength,
+  },
+  extraTags: {
+    type: Array,
+    optional: true,
+    maxCount: STORAGE_LIMITS.extraTagsCount,
+  },
+  'extraTags.$': {
+    type: Object,
+  },
+  'extraTags.$._id': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+  'extraTags.$.operation': {
+    type: String,
+    allowedValues: ['OR', 'NOT'],
+    defaultValue: 'OR',
+  },
+  'extraTags.$.tags': {
+    type: Array,
+    defaultValue: [],
+    maxCount: STORAGE_LIMITS.tagCount,
+  },
+  'extraTags.$.tags.$': {
+    type: String,
+    max: STORAGE_LIMITS.tagLength,
+  },
+});
+
+const ComputedOnlyTriggerSchema = createPropertySchema({
+  summary: {
+    type: 'computedOnlyInlineCalculationField',
+    optional: true,
+  },
+  description: {
+    type: 'computedOnlyInlineCalculationField',
+    optional: true,
+  },
+  condition: {
+    type: 'computedOnlyField',
+    optional: true,
+    parseLevel: 'compile',
+  },
+});
+
+const ComputedTriggerSchema = new SimpleSchema()
+  .extend(TriggerSchema)
+  .extend(ComputedOnlyTriggerSchema);
+
+export {
+  TriggerSchema, ComputedOnlyTriggerSchema, ComputedTriggerSchema,
+  eventOptions, timingOptions, actionPropertyTypeOptions
+};
diff --git a/app/imports/api/properties/computedOnlyPropertySchemasIndex.js b/app/imports/api/properties/computedOnlyPropertySchemasIndex.js
index d47d560d..d490e4e3 100644
--- a/app/imports/api/properties/computedOnlyPropertySchemasIndex.js
+++ b/app/imports/api/properties/computedOnlyPropertySchemasIndex.js
@@ -25,6 +25,7 @@ import { ComputedOnlySlotFillerSchema } from '/imports/api/properties/SlotFiller
 import { ComputedOnlySpellSchema } from '/imports/api/properties/Spells.js';
 import { ComputedOnlySpellListSchema } from '/imports/api/properties/SpellLists.js';
 import { ComputedOnlyToggleSchema } from '/imports/api/properties/Toggles.js';
+import { ComputedOnlyTriggerSchema } from '/imports/api/properties/Triggers.js';
 
 const propertySchemasIndex = {
   action: ComputedOnlyActionSchema,
@@ -53,6 +54,7 @@ const propertySchemasIndex = {
   spellList: ComputedOnlySpellListSchema,
   spell: ComputedOnlySpellSchema,
   toggle: ComputedOnlyToggleSchema,
+  trigger: ComputedOnlyTriggerSchema,
   any: new SimpleSchema({}),
 };
 
diff --git a/app/imports/api/properties/computedPropertySchemasIndex.js b/app/imports/api/properties/computedPropertySchemasIndex.js
index 1fa8c9d8..9084e3b7 100644
--- a/app/imports/api/properties/computedPropertySchemasIndex.js
+++ b/app/imports/api/properties/computedPropertySchemasIndex.js
@@ -25,6 +25,7 @@ import { SlotFillerSchema } from '/imports/api/properties/SlotFillers.js';
 import { ComputedSpellSchema } from '/imports/api/properties/Spells.js';
 import { ComputedSpellListSchema } from '/imports/api/properties/SpellLists.js';
 import { ComputedToggleSchema } from '/imports/api/properties/Toggles.js';
+import { ComputedTriggerSchema } from '/imports/api/properties/Triggers.js';
 
 const propertySchemasIndex = {
   action: ComputedActionSchema,
@@ -51,6 +52,7 @@ const propertySchemasIndex = {
   spellList: ComputedSpellListSchema,
   spell: ComputedSpellSchema,
   toggle: ComputedToggleSchema,
+  trigger: ComputedTriggerSchema,
   container: ComputedContainerSchema,
   item: ComputedItemSchema,
   any: new SimpleSchema({}),
diff --git a/app/imports/api/properties/propertySchemasIndex.js b/app/imports/api/properties/propertySchemasIndex.js
index 0cba80a0..cc4b77ee 100644
--- a/app/imports/api/properties/propertySchemasIndex.js
+++ b/app/imports/api/properties/propertySchemasIndex.js
@@ -23,6 +23,7 @@ import { SlotFillerSchema } from '/imports/api/properties/SlotFillers.js';
 import { SpellListSchema } from '/imports/api/properties/SpellLists.js';
 import { SpellSchema } from '/imports/api/properties/Spells.js';
 import { ToggleSchema } from '/imports/api/properties/Toggles.js';
+import { TriggerSchema } from '/imports/api/properties/Triggers.js';
 import { ContainerSchema } from '/imports/api/properties/Containers.js';
 import { ItemSchema } from '/imports/api/properties/Items.js';
 
@@ -51,6 +52,7 @@ const propertySchemasIndex = {
   spellList: SpellListSchema,
   spell: SpellSchema,
   toggle: ToggleSchema,
+  trigger: TriggerSchema,
   container: ContainerSchema,
   item: ItemSchema,
   any: new SimpleSchema({}),
diff --git a/app/imports/constants/PROPERTIES.js b/app/imports/constants/PROPERTIES.js
index 503f893e..c2aa3be1 100644
--- a/app/imports/constants/PROPERTIES.js
+++ b/app/imports/constants/PROPERTIES.js
@@ -159,6 +159,12 @@ const PROPERTIES = Object.freeze({
     helpText: 'Togggles allow parts of the character sheet to be turned on and off, either manually or as the result of a calculation.',
     suggestedParents: [],
   },
+  trigger: {
+    icon: 'mdi-electric-switch',
+    name: 'Trigger',
+    helpText: 'Triggers apply their children in response to events on the character sheet, such as taking an action or receiving damage',
+    suggestedParents: [],
+  },
 });
 
 export default PROPERTIES;
diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/ui/properties/forms/TriggerForm.vue
new file mode 100644
index 00000000..59e7f479
--- /dev/null
+++ b/app/imports/ui/properties/forms/TriggerForm.vue
@@ -0,0 +1,206 @@
+<template lang="html">
+  <div class="slot-form">
+    <text-field
+      ref="focusFirst"
+      label="Name"
+      :value="model.name"
+      :error-messages="errors.name"
+      @change="change('name', ...arguments)"
+    />
+
+    <v-layout align-center>
+      <v-btn
+        icon
+        style="margin-top: -30px;"
+        class="mr-2"
+        :loading="addExtraTagsLoading"
+        :disabled="extraTagsFull"
+        @click="addExtraTags"
+      >
+        <v-icon>
+          mdi-plus
+        </v-icon>
+      </v-btn>
+      <smart-combobox
+        label="Tags Required"
+        hint="The slot must be filled with a property which has all the listed tags"
+        multiple
+        chips
+        deletable-chips
+        :value="model.targetTags"
+        :error-messages="errors.targetTags"
+        @change="change('targetTags', ...arguments)"
+      />
+    </v-layout>
+    <v-slide-x-transition group>
+      <div
+        v-for="(extras, i) in model.extraTags"
+        :key="extras._id"
+        class="extra-tags layout align-center justify-space-between"
+      >
+        <smart-select
+          label="Operation"
+          style="width: 90px; flex-grow: 0;"
+          :items="extraTagOperations"
+          :value="extras.operation"
+          :error-messages="errors.extraTags && errors.extraTags[i]"
+          @change="change(['extraTags', i, 'operation'], ...arguments)"
+        />
+        <smart-combobox
+          label="Tags"
+          :hint="extras.operation === 'OR' ? 'The slot can be filled with a property that has all of these tags instead' : 'The slot cannot be filled with a property that has any of these tags'"
+          class="mx-2"
+          multiple
+          chips
+          deletable-chips
+          :value="extras.tags"
+          @change="change(['extraTags', i, 'tags'], ...arguments)"
+        />
+        <v-btn
+          icon
+          style="margin-top: -30px;"
+          @click="$emit('pull', {path: ['extraTags', i]})"
+        >
+          <v-icon>mdi-delete</v-icon>
+        </v-btn>
+      </div>
+    </v-slide-x-transition>
+
+    <smart-select
+      label="Timing"
+      style="flex-basis: 300px;"
+      hint="When this trigger will fire"
+      :items="timingOptions"
+      :value="model.timing"
+      :error-messages="errors.timing"
+      @change="change('timing', ...arguments)"
+    />
+    <smart-select
+      label="Event"
+      style="flex-basis: 300px;"
+      hint="What causes this trigger to fire"
+      :items="eventOptions"
+      :value="model.event"
+      :error-messages="errors.event"
+      @change="change('event', ...arguments)"
+    />
+    <smart-select
+      v-if="model.event === 'doActionProperty' || model.event === 'receiveActionProperty'"
+      label="Event Type"
+      style="flex-basis: 300px;"
+      hint="Which action event causes this trigger to fire"
+      :items="actionPropertyTypeOptions"
+      :value="model.actionPropertyType"
+      :error-messages="errors.actionPropertyType"
+      @change="change('actionPropertyType', ...arguments)"
+    />
+
+    <computed-field
+      label="Condition"
+      hint="A caclulation to determine if this trigger should fire"
+      placeholder="Always active"
+      :model="model.condition"
+      :error-messages="errors.condition"
+      @change="({path, value, ack}) =>
+        $emit('change', {path: ['condition', ...path], value, ack})"
+    />
+
+    <inline-computation-field
+      label="Summary"
+      hint="This will appear in the feature card in the character sheet"
+      :model="model.summary"
+      :error-messages="errors.summary"
+      @change="({path, value, ack}) =>
+        $emit('change', {path: ['summary', ...path], value, ack})"
+    />
+
+    <inline-computation-field
+      label="Description"
+      hint="The rest of the description that doesn't fit in the summary goes here"
+      :model="model.description"
+      :error-messages="errors.description"
+      @change="({path, value, ack}) =>
+        $emit('change', {path: ['description', ...path], value, ack})"
+    />
+
+    <form-sections>
+      <form-section
+        v-if="$slots.children"
+        name="Children"
+      >
+        <slot name="children" />
+      </form-section>
+
+      <form-section
+        name="Advanced"
+      >
+        <smart-combobox
+          label="Tags"
+          hint="This trigger's own tags"
+          multiple
+          chips
+          deletable-chips
+          :value="model.tags"
+          @change="change('tags', ...arguments)"
+        />
+      </form-section>
+    </form-sections>
+  </div>
+</template>
+
+<script lang="js">
+import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import {
+  TriggerSchema, eventOptions, timingOptions, actionPropertyTypeOptions
+} from '/imports/api/properties/Triggers.js';
+
+export default {
+  components: {
+    FormSection,
+  },
+  mixins: [propertyFormMixin],
+  inject: {
+    context: { default: {} }
+  },
+  data(){
+    return {
+      addExtraTagsLoading: false,
+      extraTagOperations: ['OR', 'NOT'],
+      eventOptions: Object.keys(eventOptions).map(value => {
+        return { value, text: eventOptions[value] };
+      }),
+      timingOptions: Object.keys(timingOptions).map(value => {
+        return { value, text: timingOptions[value] };
+      }),
+      actionPropertyTypeOptions: Object.keys(actionPropertyTypeOptions).map(value => {
+        return { value, text: actionPropertyTypeOptions[value] };
+      }),
+    };
+  },
+  computed: {
+    extraTagsFull(){
+      if (!this.model.extraTags) return false;
+      let maxCount = TriggerSchema.get('extraTags', 'maxCount');
+      return this.model.extraTags.length >= maxCount;
+    }
+  },
+  methods: {
+    acknowledgeAddResult(){
+      this.addExtraTagsLoading = false;
+    },
+    addExtraTags(){
+      this.addExtraTagsLoading = true;
+      this.$emit('push', {
+        path: ['extraTags'],
+        value: {
+          _id: Random.id(),
+          operation: 'OR',
+          tags: [],
+        },
+        ack: this.acknowledgeAddResult,
+      });
+    },
+  },
+};
+</script>
diff --git a/app/imports/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
index 1687a2cb..1aa8f42e 100644
--- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js
+++ b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
@@ -24,6 +24,7 @@ const SlotFillerForm = () => import('/imports/ui/properties/forms/SlotFillerForm
 const SpellListForm = () => import('/imports/ui/properties/forms/SpellListForm.vue');
 const SpellForm = () => import('/imports/ui/properties/forms/SpellForm.vue');
 const ToggleForm = () => import('/imports/ui/properties/forms/ToggleForm.vue');
+const TriggerForm = () => import('/imports/ui/properties/forms/TriggerForm.vue');
 
 export default {
   action: ActionForm,
@@ -52,4 +53,5 @@ export default {
   spellList: SpellListForm,
   spell: SpellForm,
   toggle: ToggleForm,
+  trigger: TriggerForm,
 };
diff --git a/app/imports/ui/properties/viewers/TriggerViewer.vue b/app/imports/ui/properties/viewers/TriggerViewer.vue
new file mode 100644
index 00000000..dbecd9c3
--- /dev/null
+++ b/app/imports/ui/properties/viewers/TriggerViewer.vue
@@ -0,0 +1,74 @@
+<template lang="html">
+  <div class="trigger-viewer">
+    <v-row dense>
+      <property-field
+        name="Event"
+        :value="eventText"
+      />
+      <property-field
+        v-if="(model.targetTags && model.targetTags.length) || (model.extraTags && model.extraTags.length)"
+        name="Tags Required"
+        :cols="{cols: 12}"
+      >
+        <div>
+          <property-tags :tags="model.targetTags" />
+          <div
+            v-for="tags in model.extraTags"
+            :key="tags._id"
+          >
+            <div class="text-caption">
+              {{ tags.operation }}
+            </div>
+            <property-tags :tags="tags.tags" />
+          </div>
+        </div>
+      </property-field>
+      <property-description
+        name="Summary"
+        :model="model.summary"
+      />
+      <property-description
+        name="Description"
+        :model="model.description"
+      />
+    </v-row>
+  </div>
+</template>
+
+<script lang="js">
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+  import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+
+  const eventText = {
+    doActionProperty: 'Do action property',
+    receiveActionProperty: 'Receiving action property',
+    flipToggle: 'Toggle changed',
+    adjustProperty: 'Attribute adjusted',
+    anyRest: 'Short or long rest',
+    longRest: 'Long rest',
+    shortRest: 'Short rest',
+  }
+
+	export default {
+    components: {
+      FillSlotButton,
+    },
+		mixins: [propertyViewerMixin],
+    inject: {
+      context: {
+        default: {},
+      },
+    },
+    computed: {
+      slotTypeName(){
+        if (!this.model.slotType) return;
+        return getPropertyName(this.model.slotType);
+      },
+      eventText(){
+        if (!this.model.event) return;
+        return eventText[this.model.event]
+      },
+    }
+	}
+</script>
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
index 1df889ee..572bfad0 100644
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -24,6 +24,7 @@ const SlotFillerViewer = () => import ('/imports/ui/properties/viewers/SlotFille
 const SpellListViewer = () => import ('/imports/ui/properties/viewers/SpellListViewer.vue');
 const SpellViewer = () => import ('/imports/ui/properties/viewers/SpellViewer.vue');
 const ToggleViewer = () => import ('/imports/ui/properties/viewers/ToggleViewer.vue');
+const TriggerViewer = () => import ('/imports/ui/properties/viewers/TriggerViewer.vue');
 
 export default {
   action: ActionViewer,
@@ -52,4 +53,5 @@ export default {
   spellList: SpellListViewer,
   spell: SpellViewer,
   toggle: ToggleViewer,
+  trigger: TriggerViewer,
 };

From e698b4b838ef8be80cc2ceb58ef41471e7452b1f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 21 Jul 2022 09:05:27 +0200
Subject: [PATCH 47/56] Added Dai as Paragon

---
 app/imports/ui/pages/About.vue     |   6 +++++-
 app/public/images/paragons/dai.png | Bin 0 -> 111880 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 app/public/images/paragons/dai.png

diff --git a/app/imports/ui/pages/About.vue b/app/imports/ui/pages/About.vue
index 0f3c922b..e643dcd1 100644
--- a/app/imports/ui/pages/About.vue
+++ b/app/imports/ui/pages/About.vue
@@ -32,7 +32,7 @@
           <b>Sam;</b> without her love, DiceCloud could not hope to exist
         </p><p>
           <b>The "Heroes" of Asaea</b> The D&amp;D party whose joy was the fuel
-          with which the early versions of DiceCloud was powered
+          powering the early versions of DiceCloud.
         </p>
         <h3 class="text-h6">
           Paragon tier Patrons
@@ -83,6 +83,10 @@ export default {
       name: 'Lord of Junk',
       title: 'Archwizard of the Odd',
       avatar: 'lordOfJunk'
+    },{
+      name: 'Dai',
+      title: 'A Kobold\'s Best Friend',
+      avatar: 'dai'
     },],
   }},
 }
diff --git a/app/public/images/paragons/dai.png b/app/public/images/paragons/dai.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ec8fcfb82ff4a1d20fee4d7a002396026306b67
GIT binary patch
literal 111880
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%0AN8@%_cUz7V8@mh~E?PAiLbI}DJ>>P6c?nCDH
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
Q$^ZZW07*qoM6N<$f<eC!{r~^~

literal 0
HcmV?d00001


From 8b62bac83fda9a11d5078d2fb69e4103bdf183dd Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 14:17:27 +0200
Subject: [PATCH 48/56] Added classes and level up button to build tab

---
 .../character/characterSheetTabs/BuildTab.vue | 73 +++++++++++++++++--
 .../ui/properties/viewers/ClassViewer.vue     |  1 +
 2 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index 727e1d1a..068b136d 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -78,17 +78,38 @@
               </v-list-item-action>
             </v-list-item>
             <v-list-item
-              v-for="classLevel in highestClassLevels"
-              :key="classLevel._id"
+              v-for="cls in classes"
+              :key="cls._id"
+              :data-id="`class-${cls._id}`"
+              v-on="cls.type === 'class' ? {click: () => propertyClicked({_id: cls._id, prefix: 'class-'})} : {}"
             >
               <v-list-item-content>
                 <v-list-item-title>
-                  {{ classLevel.name }}
+                  {{ cls.name }}
                 </v-list-item-title>
               </v-list-item-content>
               <v-list-item-avatar>
-                {{ classLevel.level }}
+                {{ cls.level }}
               </v-list-item-avatar>
+              <v-list-item-action v-if="cls.type === 'class'">
+                <v-btn
+                  outlined
+                  color="accent"
+                  data-id="level-up-btn"
+                  :disabled="cls.slotCondition && cls.slotCondition.hasOwnProperty('value') && !cls.slotCondition.value"
+                  @click.stop="levelUpDialog(cls._id)"
+                >
+                  <v-icon left>
+                    mdi-plus
+                  </v-icon>
+                  <template v-if="cls.missingLevels && cls.missingLevels.length">
+                    Get Missing Levels 
+                  </template>
+                  <template v-else>
+                    Level Up
+                  </template> 
+                </v-btn>
+              </v-list-item-action>
             </v-list-item>
           </v-list>
         </v-card>
@@ -104,6 +125,7 @@ import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import BuildTreeNodeList from '/imports/ui/creature/buildTree/BuildTreeNodeList.vue';
 import SlotCardsToFill from '/imports/ui/creature/slots/SlotCardsToFill.vue';
 import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
+import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
 
 function traverse(tree, callback, parents = []){
   tree.forEach(node => {
@@ -124,7 +146,7 @@ export default {
     },
   },
   computed: {
-    highestClassLevels(){
+    highestLevels(){
       let highestLevels = {};
       let highestLevelsList = [];
       this.classLevels.forEach(classLevel => {
@@ -142,6 +164,12 @@ export default {
       highestLevelsList.sort((a, b) => a.level - b.level);
       return highestLevelsList;
     },
+    classes() {
+      return [
+        ...this.highestLevels,
+        ...this.classProperties
+      ].sort((a, b) => a.order - b.order);
+    }
   },
   meteor: {
     creature(){
@@ -150,10 +178,22 @@ export default {
     variables() {
       return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {};
     },
-    classLevels(){
+    classProperties(){
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'class',
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        sort: {order: 1}
+      }).fetch();
+    },
+    classLevels() {
+      const classVariableNames = this.classProperties.map(c => c.variableName)
       return CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'classLevel',
+        variableName: {$nin: classVariableNames},
         removed: {$ne: true},
         inactive: {$ne: true},
       }, {
@@ -240,6 +280,27 @@ export default {
         },
       });
     },
+    levelUpDialog(classId){
+      this.$store.commit('pushDialogStack', {
+        component: 'level-up-dialog',
+        elementId: 'level-up-btn',
+        data: {
+          creatureId: this.creatureId,
+          classId,
+        },
+        callback(nodeIds){
+          if (!nodeIds || !nodeIds.length) return;
+          let newPropertyId = insertPropertyFromLibraryNode.call({
+            nodeIds,
+            parentRef: {
+              'id': classId,
+              'collection': 'creatureProperties',
+            },
+          });
+          return `tree-node-${newPropertyId}`;
+        }
+      });
+    },
   },
 };
 </script>
diff --git a/app/imports/ui/properties/viewers/ClassViewer.vue b/app/imports/ui/properties/viewers/ClassViewer.vue
index ead3181c..a03d3431 100644
--- a/app/imports/ui/properties/viewers/ClassViewer.vue
+++ b/app/imports/ui/properties/viewers/ClassViewer.vue
@@ -50,6 +50,7 @@
           outlined
           color="accent"
           data-id="level-up-btn"
+          :disabled="model.slotCondition && model.slotCondition.hasOwnProperty('value') && !model.slotCondition.value"
           @click="levelUpDialog"
         >
           <v-icon left>

From f88ffcf0c3441f27bfddb9490b2b946df7394658 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 14:17:39 +0200
Subject: [PATCH 49/56] Hardened archive upload slightly

---
 .../methods/restoreCreatureFromFile.js        |  4 +++
 .../archive/methods/verifyArchiveSafety.js    | 28 +++++++++++++++++++
 app/imports/api/creature/log/CreatureLogs.js  |  2 +-
 .../v1Migration/migrateCharacter.js           | 12 --------
 4 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 app/imports/api/creature/archive/methods/verifyArchiveSafety.js
 delete mode 100644 app/imports/migrations/v1Migration/migrateCharacter.js

diff --git a/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js b/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
index 1c0feff9..9479b0c7 100644
--- a/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
+++ b/app/imports/api/creature/archive/methods/restoreCreatureFromFile.js
@@ -10,6 +10,7 @@ import { removeCreatureWork } from '/imports/api/creature/creatures/methods/remo
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import assertHasCharactersSlots from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
+import verifyArchiveSafety from '/imports/api/creature/archive/methods/verifyArchiveSafety.js';
 
 let migrateArchive;
 if (Meteor.isServer){
@@ -25,6 +26,9 @@ function restoreCreature(archive, userId){
   // Migrate and verify the archive meets the current schema
   migrateArchive(archive);
 
+  // Asset that the archive is safe
+  verifyArchiveSafety(archive);
+
   // Don't upload creatures twice
   const existingCreature = Creatures.findOne(archive.creature._id, {
     fields: { _id: 1 }
diff --git a/app/imports/api/creature/archive/methods/verifyArchiveSafety.js b/app/imports/api/creature/archive/methods/verifyArchiveSafety.js
new file mode 100644
index 00000000..734b2582
--- /dev/null
+++ b/app/imports/api/creature/archive/methods/verifyArchiveSafety.js
@@ -0,0 +1,28 @@
+import { slice } from 'lodash';
+import PER_CREATURE_LOG_LIMIT from '/imports/api/creature/log/CreatureLogs.js';
+
+export default function verifyArchiveSafety({ meta, creature, properties, experiences, logs }){
+  const creatureId = creature._id;
+
+  // Check lengths of arrays
+  if (logs.length > PER_CREATURE_LOG_LIMIT) {
+    logs = slice(logs, 0, PER_CREATURE_LOG_LIMIT);
+  }
+
+  // Check that everything belongs to the right creature
+  logs.forEach(log => {
+    if (log.creatureId !== creatureId) {
+      throw new Meteor.Error('Malicious log', 'Log contains an entry for the wrong creature');
+    }
+  });
+  experiences.forEach(experience => {
+    if (experience.creatureId !== creatureId) {
+      throw new Meteor.Error('Malicious experience', 'Experiences contains an entry for the wrong creature');
+    }
+  });
+  properties.forEach(prop => {
+    if (prop.ancestors[0].id !== creatureId) {
+      throw new Meteor.Error('Malicious prop', 'Properties contains an entry for the wrong creature');
+    }
+  });
+}
diff --git a/app/imports/api/creature/log/CreatureLogs.js b/app/imports/api/creature/log/CreatureLogs.js
index 1ba50c1d..de7777b7 100644
--- a/app/imports/api/creature/log/CreatureLogs.js
+++ b/app/imports/api/creature/log/CreatureLogs.js
@@ -211,4 +211,4 @@ const logRoll = new ValidatedMethod({
 });
 
 export default CreatureLogs;
-export { CreatureLogSchema, insertCreatureLog, logRoll};
+export { CreatureLogSchema, insertCreatureLog, logRoll, PER_CREATURE_LOG_LIMIT};
diff --git a/app/imports/migrations/v1Migration/migrateCharacter.js b/app/imports/migrations/v1Migration/migrateCharacter.js
deleted file mode 100644
index f4246d19..00000000
--- a/app/imports/migrations/v1Migration/migrateCharacter.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { fetch } from 'meteor/fetch'
-
-export default function importCharacter(url){
-  // Using v1's JSON API to fetch the character data in a usable format
-  // url -> https://dicecloud.com/character/<id>/json?key=<key>
-  fetch(url)
-    .then(response => response.json())
-    .then(data => {
-      let character = data.characters[0];
-      console.log(character.name  + ' fetched successfuly')
-    });
-}

From be654d5d45f80a0027ec319c41a7b04e545b05e2 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 14:46:27 +0200
Subject: [PATCH 50/56] Added tree root dialog to breadcrumbs

---
 .../creature/character/CreatureRootDialog.vue | 189 ++++++++++++++++++
 .../creatureProperties/Breadcrumbs.vue        |  36 +++-
 .../ui/dialogStack/DialogComponentIndex.js    |   2 +
 3 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100644 app/imports/ui/creature/character/CreatureRootDialog.vue

diff --git a/app/imports/ui/creature/character/CreatureRootDialog.vue b/app/imports/ui/creature/character/CreatureRootDialog.vue
new file mode 100644
index 00000000..9d9ecffe
--- /dev/null
+++ b/app/imports/ui/creature/character/CreatureRootDialog.vue
@@ -0,0 +1,189 @@
+<template lang="html">
+  <dialog-base>
+    <template #replace-toolbar="{flat}">
+      <property-toolbar
+        :model="creature"
+        :editing="editing"
+        :flat="flat"
+        :embedded="embedded"
+        style="flex-grow: 0;"
+        @toggle-editing="editing = !editing"
+      />
+    </template>
+    <template v-if="_id">
+      <v-fade-transition
+        mode="out-in"
+      >
+        <div v-if="editing">
+          <creature-properties-tree
+            style="width: 100%;"
+            class="mb-2"
+            organize
+            :root="{collection: 'creatures', id: _id}"
+            @length="childrenLength = $event"
+            @selected="selectSubProperty"
+          />
+          <v-btn
+            icon
+            outlined
+            color="accent"
+            data-id="insert-creature-property-btn"
+            @click="addProperty"
+          >
+            <v-icon>
+              mdi-plus
+            </v-icon>
+          </v-btn>
+        </div>
+        <div v-else>
+          <creature-properties-tree
+            style="width: 100%;"
+            :root="{collection: 'creatures', id: _id}"
+            @length="childrenLength = $event"
+            @selected="selectSubProperty"
+          />
+        </div>
+      </v-fade-transition>
+    </template>
+    <div
+      v-if="!embedded"
+      slot="actions"
+      class="layout"
+    >
+      <v-spacer />
+      <v-btn
+        text
+        color="accent"
+        @click="$store.dispatch('popDialogStack')"
+      >
+        Close
+      </v-btn>
+    </div>
+  </dialog-base>
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
+import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
+import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
+import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
+import { getHighestOrder } from '/imports/api/parenting/order.js';
+import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
+import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+
+let formIndex = {};
+for (let key in propertyFormIndex){
+  formIndex[key + 'Form'] = propertyFormIndex[key];
+}
+
+let viewerIndex = {};
+for (let key in propertyViewerIndex){
+  formIndex[key + 'Viewer'] = propertyViewerIndex[key];
+}
+
+export default {
+  components: {
+    ...formIndex,
+    ...viewerIndex,
+    DialogBase,
+    PropertyToolbar,
+    CreaturePropertiesTree,
+  },
+  props: {
+    _id: String,
+    embedded: Boolean, // This dialog is embedded in a page
+    startInEditTab: Boolean,
+  },
+  data(){ return {
+    editing: !!this.startInEditTab,
+    // CurrentId lags behind Id by one tick so that events fired by destroying
+    // forms keyed to the old ID are applied before the new ID overwrites it
+    currentId: undefined,
+    childrenLength: 0,
+  }},
+  meteor: {
+    editPermission(){
+      try {
+        assertEditPermission(this.creature, Meteor.userId());
+        return true;
+      } catch (e) {
+        return false;
+      }
+    },
+  },
+  computed: {
+    creature(){
+      return Creatures.findOne(this._id);
+    },
+  },
+  watch: {
+    _id: {
+      immediate: true,
+      handler(newId){
+        this.$nextTick(() => {
+          this.currentId = newId;
+        });
+      }
+    },
+  },
+  reactiveProvide: {
+    name: 'context',
+    include: ['creatureId', 'editPermission'],
+  },
+  methods: {
+    getPropertyName,
+    selectSubProperty(_id){
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `tree-node-${_id}`,
+        data: {
+          _id,
+          startInEditTab: this.editing,
+        },
+      });
+    },
+    addProperty(){
+      let parentPropertyId = this._id;
+      this.$store.commit('pushDialogStack', {
+        component: 'add-creature-property-dialog',
+        elementId: 'insert-creature-property-btn',
+        data: {
+          parentDoc: this.creature,
+          creatureId: this._id,
+        },
+        callback(result){
+          if (!result) return;
+          let parentRef = {
+            id: parentPropertyId,
+            collection: 'creatures',
+          };
+          let order = getHighestOrder({
+            collection: CreatureProperties,
+            ancestorId: parentRef.id,
+          }) + 0.5;
+          if (Array.isArray(result)){
+            let nodeIds = result;
+            let id = insertPropertyFromLibraryNode.call({nodeIds, parentRef, order});
+            return `tree-node-${id}`;
+          } else {
+            let creatureProperty = result;
+            // Get order and parent
+            creatureProperty.order = order;
+            // Insert the property
+            let id = insertProperty.call({creatureProperty, parentRef});
+            return `tree-node-${id}`;
+          }
+        }
+      });
+    },
+  }
+};
+</script>
+
+<style lang="css" scoped>
+</style>
diff --git a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
index 2cd94af0..abc790c6 100644
--- a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
+++ b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
@@ -3,9 +3,16 @@
     class="breadcrumbs layout align-center wrap"
     :class="{'no-icons': noIcons}"
   >
+    <a
+      data-id="breadcrumb-root"
+      @click="clickRootCreature"
+    >
+      <v-icon color="accent">
+        mdi-account
+      </v-icon>
+    </a> 
     <template v-for="(prop, index) in props">
       <v-icon
-        v-if="index !== 0"
         :key="index"
       >
         mdi-chevron-right
@@ -60,7 +67,7 @@
     },
     methods: {
       click(id){
-        let store = this.$store;
+        const store = this.$store;
         // Check if there is a dialog open for this doc already
         let dialogFound;
         let dialogsToPop = 0;
@@ -84,6 +91,31 @@
           });
         }
       },
+      clickRootCreature() {
+        const store = this.$store;
+        // Check if there is a dialog open for this doc already
+        let dialogFound;
+        let dialogsToPop = 0;
+        store.state.dialogStack.dialogs.forEach(dialog => {
+          if (dialog.component === 'creature-root-dialog'){
+            dialogFound = true;
+            dialogsToPop = 0;
+          } else {
+            dialogsToPop += 1;
+          }
+        });
+        if (dialogFound){
+          // Pop dialogs until we get to it
+          store.dispatch('popDialogStacks', dialogsToPop);
+        } else {
+          // Otherwise open it as a new dialog
+          store.commit('pushDialogStack', {
+            component: 'creature-root-dialog',
+            elementId: 'breadcrumb-root',
+            data: {_id: this.model.ancestors[0].id},
+          });
+        }
+      }
     }
   }
 </script>
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
index cd9e7322..c8079709 100644
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ b/app/imports/ui/dialogStack/DialogComponentIndex.js
@@ -6,6 +6,7 @@ const CreatureFormDialog = () => import('/imports/ui/creature/CreatureFormDialog
 const CreaturePropertyCreationDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue');
 const CreaturePropertyDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue');
 const CreaturePropertyFromLibraryDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue');
+const CreatureRootDialog = () => import('/imports/ui/creature/character/CreatureRootDialog.vue');
 const DeleteConfirmationDialog = () => import('/imports/ui/dialogStack/DeleteConfirmationDialog.vue');
 const DeleteUserAccountDialog = () => import('/imports/ui/user/DeleteUserAccountDialog.vue');
 const ExperienceInsertDialog = () => import( '/imports/ui/creature/experiences/ExperienceInsertDialog.vue');
@@ -36,6 +37,7 @@ export default {
   CreaturePropertyCreationDialog,
   CreaturePropertyDialog,
   CreaturePropertyFromLibraryDialog,
+  CreatureRootDialog,
   DeleteConfirmationDialog,
   DeleteUserAccountDialog,
   ExperienceInsertDialog,

From 82879aaa60b4dc07b39170db33842433ddbe3e6e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 15:12:12 +0200
Subject: [PATCH 51/56] Added admin override to view permission

---
 app/imports/api/sharing/sharingPermissions.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/imports/api/sharing/sharingPermissions.js b/app/imports/api/sharing/sharingPermissions.js
index 6f48ed4b..58629c62 100644
--- a/app/imports/api/sharing/sharingPermissions.js
+++ b/app/imports/api/sharing/sharingPermissions.js
@@ -35,7 +35,7 @@ export function assertOwnership(doc, userId){
 export function assertEditPermission(doc, userId) {
   assertIdValid(userId);
   assertdocExists(doc);
-  let user = Meteor.users.findOne(userId, {
+  const user = Meteor.users.findOne(userId, {
     fields: {
       'services.patreon': 1,
       'roles': 1,
@@ -83,6 +83,7 @@ export function assertViewPermission(doc, userId) {
   assertdocExists(doc);
   if (doc.public) return true;
   assertIdValid(userId);
+
   if (
     doc.owner === userId ||
     _.contains(doc.readers, userId) ||
@@ -90,6 +91,17 @@ export function assertViewPermission(doc, userId) {
   ){
     return true;
   } else {
+    
+    // Admin override
+    const user = Meteor.users.findOne(userId, {
+      fields: {
+        'roles': 1,
+      }
+    });
+    if (user.roles && user.roles.includes('admin')){
+      return true;
+    }
+
     throw new Meteor.Error('View permission denied',
       'You do not have permission to view this document');
   }

From 1da2d319fbaea7d556944b97153750b6462e995e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 15:22:07 +0200
Subject: [PATCH 52/56] Improved handling of tag targeting

---
 .../buildComputation/linkTypeDependencies.js       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
index 848cf1d3..3de06818 100644
--- a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
+++ b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
@@ -1,4 +1,4 @@
-import { get, intersection, difference } from 'lodash';
+import { get, intersection, difference, union } from 'lodash';
 
 const linkDependenciesByType = {
   action: linkAction,
@@ -144,16 +144,18 @@ function linkEffects(dependencyGraph, prop, computation){
 
 // Returns an array of IDs of the properties the effect targets
 function getEffectTagTargets(effect, computation){
-  const targets = getTargetListFromTags(effect.targetTags, computation);
-  const notIds = [];
+  let targets = getTargetListFromTags(effect.targetTags, computation);
+  let notIds = [];
   if (effect.extraTags){
     effect.extraTags.forEach(ex => {
-      if (ex.operation === 'OR'){
-        targets.push(...getTargetListFromTags(ex.tags, computation));
+      if (ex.operation === 'OR') {
+        targets = union(targets, getTargetListFromTags(ex.tags, computation));
       } else if (ex.operation === 'NOT'){
         ex.tags.forEach(tag => {
           const idList = computation.propsWithTag[tag];
-          if (idList) notIds.push(...computation.propsWithTag[tag])
+          if (idList) {
+            notIds = union(notIds, computation.propsWithTag[tag]);
+          }
         });
       }
     });

From 27a21aed59968e1f11f05a20b221bcb84aec6331 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 19:59:43 +0200
Subject: [PATCH 53/56] Added error alert to stat tab for dependency loops

---
 .../ui/creature/character/CharacterSheet.vue  |  2 +-
 .../character/characterSheetTabs/StatsTab.vue |  9 +-
 .../character/errors/CharacterErrors.vue      | 60 ++++++++++++
 .../character/errors/DependencyLoopError.vue  | 95 +++++++++++++++++++
 .../creatureProperties/Breadcrumbs.vue        |  8 ++
 .../ui/properties/viewers/EffectViewer.vue    |  3 +-
 6 files changed, 174 insertions(+), 3 deletions(-)
 create mode 100644 app/imports/ui/creature/character/errors/CharacterErrors.vue
 create mode 100644 app/imports/ui/creature/character/errors/DependencyLoopError.vue

diff --git a/app/imports/ui/creature/character/CharacterSheet.vue b/app/imports/ui/creature/character/CharacterSheet.vue
index 0b4870f0..e0af7187 100644
--- a/app/imports/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/ui/creature/character/CharacterSheet.vue
@@ -1,4 +1,4 @@
-if<template>
+<template>
   <div class="character-sheet fill-height">
     <v-fade-transition mode="out-in">
       <div
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 53f98146..803ec1e4 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -2,6 +2,11 @@
   <div
     class="stats-tab ma-2"
   >
+    <character-errors
+      class="mx-2 mt-4"
+      :creature-id="creatureId"
+    />
+
     <health-bar-card-container :creature-id="creatureId" />
 
     <column-layout>
@@ -369,7 +374,8 @@
   import ToggleCard from '/imports/ui/properties/components/toggles/ToggleCard.vue';
   import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
   import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
-
+  import CharacterErrors from '/imports/ui/creature/character/errors/CharacterErrors.vue';
+  
   const getProperties = function(creature, filter, options = {
     sort: {order: 1}
   }){
@@ -413,6 +419,7 @@
 			SpellSlotListTile,
       ActionCard,
       ToggleCard,
+      CharacterErrors,
 		},
 		props: {
 			creatureId: {
diff --git a/app/imports/ui/creature/character/errors/CharacterErrors.vue b/app/imports/ui/creature/character/errors/CharacterErrors.vue
new file mode 100644
index 00000000..eec78814
--- /dev/null
+++ b/app/imports/ui/creature/character/errors/CharacterErrors.vue
@@ -0,0 +1,60 @@
+<template>
+  <div
+    v-if="creature && creature.computeErrors"
+    class="character-sheet-errors"
+  >
+    <template v-for="(error, index) in creature.computeErrors">
+      <dependency-loop-error
+        v-if="error.type === 'dependencyLoop'"
+        :key="index + 'dependencyLoopError'"
+        :model="error"
+      />
+      <v-alert
+        v-else
+        :key="index + 'otherError'"
+        outlined
+        dense
+        type="error"
+      >
+        {{ error.type }}
+      </v-alert>
+    </template>
+  </div>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import DependencyLoopError from '/imports/ui/creature/character/errors/DependencyLoopError.vue';
+
+export default {
+  components: {
+    DependencyLoopError,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      default: undefined,
+    }
+  },
+  meteor: {
+    creature() {
+      if (!this.creatureId) return;
+      return Creatures.findOne(this.creatureId, {fields: {computeErrors: 1}});
+    }
+  },
+  computed: {
+    errors() {
+      if (!this.creature || !this.creature.computeErrors) return;
+      return this.creature.computeErrors.map(error => {
+        error.text = error.type;
+        if (error.type === 'dependencyLoop') {
+          error.text = 'Dependency Loop Detected';
+        }
+      });
+    }
+  },
+}
+</script>
+
+<style>
+</style>
diff --git a/app/imports/ui/creature/character/errors/DependencyLoopError.vue b/app/imports/ui/creature/character/errors/DependencyLoopError.vue
new file mode 100644
index 00000000..8e7a45e8
--- /dev/null
+++ b/app/imports/ui/creature/character/errors/DependencyLoopError.vue
@@ -0,0 +1,95 @@
+<template>
+  <v-alert
+    v-if="model"
+    outlined
+    dense
+    type="warning"
+    class="dependency-loop-error"
+  >
+    <p>
+      The character contains a dependency loop.
+    </p>
+    <p>
+      A set of properties may have been calculated incorrectly, because they form an infinite loop:
+    </p>
+    <div class="d-flex align-center flex-wrap">
+      <template
+        v-for="(prop, index) in loopProperties"
+      >
+        <v-icon
+          v-if="index !== 0"
+          :key="index"
+        >
+          mdi-chevron-right
+        </v-icon>
+        <a
+          v-if="prop.type"
+          :key="index + 'link'"
+          :data-id="`breadcrumb-${prop._id}`"
+          @click="click(prop._id)"
+        >
+          <tree-node-view
+            :model="prop"
+            class="breadcrumb-tree-node-view"
+          />
+        </a>
+        <span
+          v-else
+          :key="index + 'variable'"
+          style="font-family: monospace !important;"
+        >
+          {{ prop.name }} {{ prop.path }}
+        </span>
+      </template>
+    </div>
+  </v-alert>
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import { reverse } from 'lodash';
+
+export default {
+  components: {
+    TreeNodeView,
+  },
+  props: {
+    model: {
+      type: Object,
+      default: undefined,
+    }
+  },
+  meteor: {
+    loopProperties() {
+      if (!this.model) return;
+      const propAddresses = this.model.details?.nodes || [];
+      const props = propAddresses.map(propAddress => {
+        const [id, ...path] = propAddress.split('.');
+        const prop = CreatureProperties.findOne(id);
+        if (prop) {
+          prop.path = path && path.join('.');
+          if (prop.name && prop.path) prop.name += ` [${prop.path}]`;
+          return prop;
+        } else {
+          return { name: propAddress };
+        }
+      });
+      return reverse(props);
+    }
+  },
+  methods: {
+    click(id){
+      // Otherwise open it as a new dialog
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `breadcrumb-${id}`,
+        data: {_id: id},
+      });
+      },
+  }
+}
+</script>
+
+<style>
+</style>
diff --git a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
index abc790c6..cf321a10 100644
--- a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
+++ b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
@@ -3,7 +3,15 @@
     class="breadcrumbs layout align-center wrap"
     :class="{'no-icons': noIcons}"
   >
+    <span
+      v-if="noLinks"
+    >
+      <v-icon>
+        mdi-account
+      </v-icon>
+    </span>
     <a
+      v-else
       data-id="breadcrumb-root"
       @click="clickRootCreature"
     >
diff --git a/app/imports/ui/properties/viewers/EffectViewer.vue b/app/imports/ui/properties/viewers/EffectViewer.vue
index 772a02fd..ef72d816 100644
--- a/app/imports/ui/properties/viewers/EffectViewer.vue
+++ b/app/imports/ui/properties/viewers/EffectViewer.vue
@@ -101,12 +101,13 @@
 					case 'mul': return 'Multiply';
 					case 'min': return 'Minimum';
 					case 'max': return 'Maximum';
+					case 'set': return 'Set';
 					case 'advantage': return 'Advantage';
 					case 'disadvantage': return 'Disadvantage';
 					case 'passiveAdd': return 'Passive bonus';
 					case 'fail': return 'Always fail';
 					case 'conditional': return 'Conditional benefit' ;
-          default: return '';
+          default: return this.model.operation;
 				}
 			},
 			displayedValue(){

From a0c2822dacb3d08c1b24c80c5c50c66ef8e1de60 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 20:38:42 +0200
Subject: [PATCH 54/56] Added "extra" damage type Takes on the same damage type
 as the last damage applied during the same action, otherwise deals "extra"
 damage

---
 .../applyPropertyByType/applyDamage.js        |  9 ++++++++
 .../api/engine/actions/applyTriggers.js       |  8 ++++---
 .../engine/computation/CreatureComputation.js | 22 +++++--------------
 .../utility/getEffectivePropTags.js           | 17 ++++++++++++++
 app/imports/constants/DAMAGE_TYPES.js         |  1 +
 5 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 app/imports/api/engine/computation/utility/getEffectivePropTags.js

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
index ebf7448b..f8b6eb8b 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
@@ -68,6 +68,15 @@ export default function applyDamage(node, {
   // Round the damage to a whole number
   damage = Math.floor(damage);
 
+  // Convert extra damage into the stored type
+  if (prop.damageType === 'extra' && scope['$lastDamageType']) {
+    prop.damageType = scope['$lastDamageType'];
+  }
+  // Store current damage type
+  if (prop.damageType !== 'healing') {
+    scope['$lastDamageType'] = prop.damageType;
+  }
+
   // Memoise the damage suffix for the log
   let suffix = (criticalHit ? ' critical ' : ' ') +
     prop.damageType +
diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js
index 3844ae15..30b1790e 100644
--- a/app/imports/api/engine/actions/applyTriggers.js
+++ b/app/imports/api/engine/actions/applyTriggers.js
@@ -4,6 +4,7 @@ import { getPropertyDecendants } from '/imports/api/engine/loadCreatures.js';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import applyProperty from '/imports/api/engine/actions/applyProperty.js';
 import { difference, intersection } from 'lodash';
+import getEffectivePropTags from '/imports/api/engine/computation/utility/getEffectivePropTags.js';
 
 export default function applyTriggers(node, { creature, targets, scope, log }, timing) {
   const prop = node.node;
@@ -25,10 +26,11 @@ export default function applyTriggers(node, { creature, targets, scope, log }, t
 
 function triggerMatchTags(trigger, prop) {
   let matched = false;
+  const propTags = getEffectivePropTags(prop);
   // Check the target tags
   if (
     !trigger.targetTags?.length ||
-    difference(trigger.targetTags, prop.tags).length === 0
+    difference(trigger.targetTags, propTags).length === 0
   ) {
     matched = true;
   }
@@ -38,14 +40,14 @@ function triggerMatchTags(trigger, prop) {
       if (matched) return;
       if (
         !extra.tags.length ||
-        difference(extra.tags, prop.tags).length === 0
+        difference(extra.tags, propTags).length === 0
       ) {
         matched = true;
       }
     } else if (extra.operation === 'NOT') {
       if (
         extra.tags.length &&
-        intersection(extra.tags, prop.tags)
+        intersection(extra.tags, propTags)
       ) {
         return false;
       }
diff --git a/app/imports/api/engine/computation/CreatureComputation.js b/app/imports/api/engine/computation/CreatureComputation.js
index fb850129..1fe14769 100644
--- a/app/imports/api/engine/computation/CreatureComputation.js
+++ b/app/imports/api/engine/computation/CreatureComputation.js
@@ -1,5 +1,6 @@
 import { EJSON } from 'meteor/ejson';
 import createGraph from 'ngraph.graph';
+import getEffectivePropTags from '/imports/api/engine/computation/utility/getEffectivePropTags.js';
 
 export default class CreatureComputation {
   constructor(properties, creature, variables){
@@ -22,28 +23,15 @@ export default class CreatureComputation {
       // Store by id
       this.propsById[prop._id] = prop;
 
-      // Store tags
-      const storePropOnTag = (prop, tag) => {
+      // Store sets of ids in each tag
+      getEffectivePropTags(prop).forEach(tag => {
         if (!tag) return;
-        if (this.propsWithTag[tag]){
+        if (this.propsWithTag[tag]) {
           this.propsWithTag[tag].push(prop._id);
         } else {
           this.propsWithTag[tag] = [prop._id];
         }
-      }
-      // Store sets of ids in each tag
-      if (prop.tags){
-        prop.tags.forEach(tag => {
-          storePropOnTag(prop, tag);
-        });
-      }
-      // Store tags for the property type
-      storePropOnTag(prop, `#${prop.type}`);
-      // Store tags for some string properties
-      storePropOnTag(prop, prop.damageType);
-      storePropOnTag(prop, prop.skillType);
-      storePropOnTag(prop, prop.attributeType);
-      storePropOnTag(prop, prop.reset);
+      });
 
       // Store the prop in the dependency graph
       this.dependencyGraph.addNode(prop._id, prop);
diff --git a/app/imports/api/engine/computation/utility/getEffectivePropTags.js b/app/imports/api/engine/computation/utility/getEffectivePropTags.js
new file mode 100644
index 00000000..e3e52bf2
--- /dev/null
+++ b/app/imports/api/engine/computation/utility/getEffectivePropTags.js
@@ -0,0 +1,17 @@
+export default function getEffectivePropTags(prop) {
+  if (!prop.tags) return [];
+  const tags = [...prop.tags];
+  // Tags for the property type, separate #damage from #healing
+  if (prop.type === 'damage' && prop.damageType === 'healing') {
+    tags.push('#healing');
+  } else {
+    tags.push(`#${prop.type}`);
+  }
+
+  // Tags for some string properties
+  if (prop.damageType) tags.push(prop.damageType);
+  if (prop.skillType) tags.push(prop.skillType);
+  if (prop.attributeType) tags.push(prop.attributeType);
+  if (prop.reset) tags.push(prop.reset);
+  return tags;
+}
diff --git a/app/imports/constants/DAMAGE_TYPES.js b/app/imports/constants/DAMAGE_TYPES.js
index 9e544266..beb02518 100644
--- a/app/imports/constants/DAMAGE_TYPES.js
+++ b/app/imports/constants/DAMAGE_TYPES.js
@@ -13,6 +13,7 @@ const DAMAGE_TYPES = Object.freeze([
   'psychic',
   'radiant',
   'thunder',
+  'extra',
 ]);
 
 export default DAMAGE_TYPES;

From 4c5c537f293c76ad02811168381263154d471c7d Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 21:50:31 +0200
Subject: [PATCH 55/56] Improved slot tag handling

---
 .../creatureProperties/methods/getSlotFillFilter.js  |  4 ++--
 app/imports/server/publications/library.js           |  2 ++
 app/imports/server/publications/slotFillers.js       | 12 +++---------
 app/imports/ui/creature/CreatureForm.vue             | 12 ++++++++----
 app/imports/ui/creature/buildTree/BuildTreeNode.vue  |  3 ++-
 .../character/characterSheetTabs/BuildTab.vue        |  4 +++-
 app/imports/ui/creature/slots/SlotCardsToFill.vue    |  4 ++--
 app/imports/ui/creature/slots/SlotFillDialog.vue     |  4 ++--
 app/imports/ui/properties/forms/SlotForm.vue         |  7 +++++--
 9 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
index 21df0bdb..c80f7fa3 100644
--- a/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
+++ b/app/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js
@@ -49,10 +49,10 @@ export default function getSlotFillFilter({slot, libraryIds}){
     });
   }
   if (tagsOr.length){
-    filter.$and.push({$or: tagsOr});
+    filter.$or = tagsOr;
   }
   if (tagsNin.length){
-    filter.$and.push({$nin: tagsNin});
+    filter.$and.push({tags: {$nin: tagsNin}});
   }
   if (!filter.$and.length){
     delete filter.$and;
diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index 808327ee..217f9b00 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -14,6 +14,8 @@ const LIBRARY_NODE_TREE_FIELDS = {
   order: 1,
   parent: 1,
   ancestors: 1,
+  tags: 1,
+  slotFillerCondition: 1,
   // SlotFillers
   slotQuantityFilled: 1,
   // Effect
diff --git a/app/imports/server/publications/slotFillers.js b/app/imports/server/publications/slotFillers.js
index ab6e781d..30dadc9f 100644
--- a/app/imports/server/publications/slotFillers.js
+++ b/app/imports/server/publications/slotFillers.js
@@ -6,12 +6,6 @@ import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/
 import getCreatureLibraryIds from '/imports/api/library/getCreatureLibraryIds.js';
 import { LIBRARY_NODE_TREE_FIELDS } from '/imports/server/publications/library.js';
 
-const FIELDS = {
-  ...LIBRARY_NODE_TREE_FIELDS,
-  slotFillerCondition: 1,
-  tags: 1,
-}
-
 Meteor.publish('slotFillers', function(slotId, searchTerm){
   if (searchTerm) check(searchTerm, String);
 
@@ -56,7 +50,7 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
           // relevant documents have a higher score.
           fields: {
             _score: { $meta: 'textScore' },
-            ...FIELDS,
+            ...LIBRARY_NODE_TREE_FIELDS,
           },
           sort: {
             // `score` property specified in the projection fields above.
@@ -72,7 +66,7 @@ Meteor.publish('slotFillers', function(slotId, searchTerm){
             name: 1,
             order: 1,
           },
-          fields: FIELDS,
+          fields: LIBRARY_NODE_TREE_FIELDS,
         };
       }
       options.limit = limit;
@@ -135,7 +129,7 @@ Meteor.publish('classFillers', function(classId){
           name: 1,
           order: 1,
         },
-        fields: FIELDS,
+        fields: LIBRARY_NODE_TREE_FIELDS,
         limit,
       };
 
diff --git a/app/imports/ui/creature/CreatureForm.vue b/app/imports/ui/creature/CreatureForm.vue
index b9103ff8..ad35a5e1 100644
--- a/app/imports/ui/creature/CreatureForm.vue
+++ b/app/imports/ui/creature/CreatureForm.vue
@@ -91,6 +91,7 @@
       <form-section name="Libraries">
         <smart-switch
           label="All user libraries"
+          :value="allUserLibraries"
           @change="allUserLibrariesChange"
         />
         <library-list
@@ -156,6 +157,11 @@ export default {
     dirty: false, // If there are pending changes
   }
   },
+  computed: {
+    allUserLibraries() {
+      return !this.model.allowedLibraries && !this.model.allowedLibraryCollections
+    },
+  },
   watch: {
     'model.allowedLibraryCollections': function (newVal) {
       if (!this.dirty) this.libraryCollections = newVal;
@@ -165,7 +171,6 @@ export default {
     },
   },
   mounted() {
-
     this.updateAllowedLibraryCollections = debounce(() => {
       this.libraryWriteLoading = true;
       this.dirty = false;
@@ -189,7 +194,6 @@ export default {
         this.libraryWriteError = error;
       });
     }, 500);
-
   },
   meteor: {
     $subscribe: {
@@ -232,10 +236,10 @@ export default {
         );
       }
     },
-    allUserLibrariesChange(val, ack) {
+    allUserLibrariesChange(value, ack) {
       toggleAllUserLibraries.call({
         _id: this.model._id,
-        val
+        value,
       }, error => ack(error));
     },
     selectLibrary(id, val) {
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNode.vue b/app/imports/ui/creature/buildTree/BuildTreeNode.vue
index 45d4d07d..5664453c 100644
--- a/app/imports/ui/creature/buildTree/BuildTreeNode.vue
+++ b/app/imports/ui/creature/buildTree/BuildTreeNode.vue
@@ -150,7 +150,8 @@
       },
       canFillWithMany(){
         return this.isSlot && (
-          this. node.quantityExpected?.value === 0 ||
+          !this.node.quantityExpected ||
+          this.node.quantityExpected.value === 0 ||
           (this.node.quantityExpected.value > 1 && this.node.spaceLeft > 0)
         );
       },
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
index 068b136d..96de600c 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -207,6 +207,7 @@ export default {
         $or: [
           {'slotCondition.value': {$nin: [false, 0, '']}},
           {'slotCondition.value': {$exists: false}},
+          {'slotCondition': {$exists: false}},
         ],
         removed: {$ne: true},
         inactive: {$ne: true},
@@ -228,7 +229,8 @@ export default {
         const model = child.node;
         const isSlotWithSpace = model.type === 'propertySlot' &&
           model.spaceLeft > 0 || 
-          (model.quantityExpected && model.quantityExpected.value == 0);
+          !model.quantityExpected ||
+          model.quantityExpected.value === 0;
         if(isSlotWithSpace) {
           model._canFill = true;
           parents.forEach(node => {
diff --git a/app/imports/ui/creature/slots/SlotCardsToFill.vue b/app/imports/ui/creature/slots/SlotCardsToFill.vue
index 0decfebf..b2137955 100644
--- a/app/imports/ui/creature/slots/SlotCardsToFill.vue
+++ b/app/imports/ui/creature/slots/SlotCardsToFill.vue
@@ -85,8 +85,8 @@ export default {
             ]
           },{
             $or: [
-              { quantityExpected: {exists: false} },
-              { 'quantityExpected.value': 0 },
+              { 'quantityExpected.value': {$in: [false, 0, '', undefined]} },
+              { 'quantityExpected.value': {exists: false} },
               {spaceLeft: {$gt: 0}},
             ]
           },
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue
index e8c19896..caee497e 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/ui/creature/slots/SlotFillDialog.vue
@@ -29,13 +29,13 @@
       {{ slotPropertyTypeName }} with tags:
       <property-tags
         v-for="(tags, index) in tagsSearched.or"
-        :key="index"
+        :key="index + 'tags'"
         :tags="tags"
         :prefix="index ? 'OR' : undefined"
       />
       <property-tags
         v-for="(tags, index) in tagsSearched.not"
-        :key="index"
+        :key="index + 'not'"
         :tags="tags"
         prefix="NOT"
       />
diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/ui/properties/forms/SlotForm.vue
index 719d83ed..6c001c2c 100644
--- a/app/imports/ui/properties/forms/SlotForm.vue
+++ b/app/imports/ui/properties/forms/SlotForm.vue
@@ -72,11 +72,14 @@
         @change="change('slotTags', ...arguments)"
       />
     </v-layout>
-    <v-slide-x-transition group>
+    <v-slide-x-transition
+      group
+    >
       <div
         v-for="(extras, i) in model.extraTags"
         :key="extras._id"
-        class="extra-tags layout align-center justify-space-between"
+        class="extra-tags layout align-center justify-space-between" 
+        style="transition: all 0.3s !important;"
       >
         <smart-select
           label="Operation"

From 0483a7effc52794964dc632adbe91b7b7a829a23 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 24 Jul 2022 22:32:40 +0200
Subject: [PATCH 56/56] Tag targeting attributes and skills with effects now
 works like normal effects would

---
 .../buildComputation/linkTypeDependencies.js  | 19 +++++++++++++++----
 .../computeVariable/computeVariableAsSkill.js |  2 ++
 app/imports/api/properties/Attributes.js      |  9 +++++++++
 app/imports/api/properties/Skills.js          |  9 +++++++++
 .../ui/properties/viewers/AttributeViewer.vue | 16 ++++------------
 .../ui/properties/viewers/SkillViewer.vue     | 17 ++++-------------
 6 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
index 3de06818..5e907acc 100644
--- a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
+++ b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
@@ -128,10 +128,21 @@ function linkEffects(dependencyGraph, prop, computation){
   if (prop.targetByTags){
     getEffectTagTargets(prop, computation).forEach(targetId => {
       const targetProp = computation.propsById[targetId];
-      const key = prop.targetField || getDefaultCalculationField(targetProp);
-      const calcObj = get(targetProp, key);
-      if (calcObj && calcObj.calculation){
-        dependencyGraph.addLink(`${targetProp._id}.${key}`, prop._id , 'effect');
+      if (
+        (targetProp.type === 'attribute' || targetProp.type === 'skill')
+        && targetProp.variableName
+        && !prop.targetField
+      ) {
+        // If the field wasn't specified and we're targeting an attribute or
+        // skill, just treat it like a normal effect on its variable name
+        dependencyGraph.addLink(targetProp.variableName, prop._id, 'effect');
+      } else {
+        // Otherwise target a field on that property
+        const key = prop.targetField || getDefaultCalculationField(targetProp);
+        const calcObj = get(targetProp, key);
+        if (calcObj && calcObj.calculation){
+          dependencyGraph.addLink(`${targetProp._id}.${key}`, prop._id , 'effect');
+        }
       }
     });
   } else {
diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
index 6b9c3222..828059c0 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
@@ -71,6 +71,8 @@ export default function computeVariableAsSkill(computation, node, prop){
   prop.fail = aggregator.fail;
   // Rollbonus
   prop.rollBonuses = aggregator.rollBonus;
+  // Store effects
+  prop.effects = node.data.effects;
 }
 
 function aggregateAbilityEffects({computation, skillNode, abilityNode}){
diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index 5c83a660..4b4537c0 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -145,6 +145,15 @@ let ComputedOnlyAttributeSchema = createPropertySchema({
     optional: true,
     removeBeforeCompute: true,
   },
+  // A list of effect ids targeting this attribute
+  effects: {
+    type: Array,
+    optional: true,
+  },
+  'effects.$': {
+    type: Object,
+    blackbox: true,
+  },
 });
 
 const ComputedAttributeSchema = new SimpleSchema()
diff --git a/app/imports/api/properties/Skills.js b/app/imports/api/properties/Skills.js
index 281fe985..47ba2a76 100644
--- a/app/imports/api/properties/Skills.js
+++ b/app/imports/api/properties/Skills.js
@@ -131,6 +131,15 @@ let ComputedOnlySkillSchema = createPropertySchema({
     optional: true,
     removeBeforeCompute: true,
   },
+  // A list of effect ids targeting this skill
+  effects: {
+    type: Array,
+    optional: true,
+  },
+  'effects.$': {
+    type: Object,
+    blackbox: true,
+  },
 })
 
 const ComputedSkillSchema = new SimpleSchema()
diff --git a/app/imports/ui/properties/viewers/AttributeViewer.vue b/app/imports/ui/properties/viewers/AttributeViewer.vue
index 8e9cc4a4..6a2844c8 100644
--- a/app/imports/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/ui/properties/viewers/AttributeViewer.vue
@@ -232,18 +232,10 @@
           return [];
         }
       },
-      effects(){
-        if (this.context.creatureId && this.model.variableName){
-          let creatureId = this.context.creatureId;
-          return CreatureProperties.find({
-            'ancestors.id': creatureId,
-            'stats': this.model.variableName,
-            removed: {$ne: true},
-            inactive: {$ne: true},
-          });
-        } else {
-          return [];
-        }
+      effects() {
+        return CreatureProperties.find({
+          _id: { $in: this.model.effects?.map(e => e._id) || [] }
+        });
       },
     },
   }
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 62adf4a7..5cc7479e 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -210,19 +210,10 @@ export default {
         return [];
       }
     },
-    effects(){
-      if (this.context.creatureId && this.model.variableName){
-        let creatureId = this.context.creatureId;
-        return CreatureProperties.find({
-          'ancestors.id': creatureId,
-          stats: this.model.variableName,
-          type: 'effect',
-          removed: {$ne: true},
-          inactive: {$ne: true},
-        }).fetch();
-      } else {
-        return [];
-      }
+    effects() {
+      return CreatureProperties.find({
+        _id: { $in: this.model.effects?.map(e => e._id) || [] }
+      });
     },
     baseProficiencies(){
       if (this.context.creatureId){