From 35ebed81ddfef5aac2413f03d1b86c9cb78b8cae Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 7 Jun 2023 11:16:07 +0200
Subject: [PATCH] Fixed slot fill test in library prop edit

---
 .../client/ui/creature/slots/SlotFillDialog.vue |  3 ++-
 .../client/ui/properties/forms/SlotForm.vue     | 17 ++++++++++++-----
 app/imports/server/publications/slotFillers.js  | 15 ++++++++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/imports/client/ui/creature/slots/SlotFillDialog.vue b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
index c2f5042f..7eeddf22 100644
--- a/app/imports/client/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
@@ -153,6 +153,7 @@
       class="ma-4"
     >
       <v-btn
+        v-if="!dummySlot"
         text
         color="accent"
         :disabled="!model"
@@ -358,7 +359,7 @@ export default {
   meteor: {
     $subscribe: {
       'slotFillers'() {
-        return [this.slotId, this.searchValue || undefined]
+        return [this.slotId || this.dummySlot?._id, this.searchValue || undefined, !!this.dummySlot]
       },
     },
     searchLoading() {
diff --git a/app/imports/client/ui/properties/forms/SlotForm.vue b/app/imports/client/ui/properties/forms/SlotForm.vue
index be45974e..64091ff7 100644
--- a/app/imports/client/ui/properties/forms/SlotForm.vue
+++ b/app/imports/client/ui/properties/forms/SlotForm.vue
@@ -79,17 +79,22 @@
         cols="12"
         md="6"
       >
-        <v-layout justify-center>
+        <outlined-input
+          name="Test"
+          data-id="test-slot-button"
+        >
           <v-btn
             v-if="context.isLibraryForm"
-            color="accent"
-            class="ma-2 mb-4"
-            data-id="test-slot-button"
+            text
+            class="ma-0"
+            height="54"
+            width="100%"
+            style="justify-content: start;"
             @click="testSlot"
           >
             Test Slot
           </v-btn>
-        </v-layout>
+        </outlined-input>
       </v-col>
     </v-row>
     <inline-computation-field
@@ -148,11 +153,13 @@ import propertyFormMixin from '/imports/client/ui/properties/forms/shared/proper
 import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 import TagTargeting from '/imports/client/ui/properties/forms/shared/TagTargeting.vue';
+import OutlinedInput from '/imports/client/ui/properties/viewers/shared/OutlinedInput.vue';
 
 export default {
   components: {
     FormSection,
     TagTargeting,
+    OutlinedInput,
   },
   mixins: [propertyFormMixin],
   inject: {
diff --git a/app/imports/server/publications/slotFillers.js b/app/imports/server/publications/slotFillers.js
index dde6b8ed..fba54ca6 100644
--- a/app/imports/server/publications/slotFillers.js
+++ b/app/imports/server/publications/slotFillers.js
@@ -7,7 +7,7 @@ import getCreatureLibraryIds from '/imports/api/library/getCreatureLibraryIds.js
 import { LIBRARY_NODE_TREE_FIELDS } from '/imports/server/publications/library.js';
 import escapeRegex from '/imports/api/utility/escapeRegex.js';
 
-Meteor.publish('slotFillers', function (slotId, searchTerm) {
+Meteor.publish('slotFillers', function (slotId, searchTerm, isDummySlot) {
   if (searchTerm) check(searchTerm, String);
 
   let self = this;
@@ -16,12 +16,17 @@ Meteor.publish('slotFillers', function (slotId, searchTerm) {
     if (!userId) {
       return [];
     }
-    // Get the slot
-    let slot = CreatureProperties.findOne(slotId);
-    if (!slot) {
-      return [];
+
+    // Get the slot from the right collection
+    let slot;
+    if (isDummySlot) {
+      slot = LibraryNodes.findOne(slotId);
+    } else {
+      slot = CreatureProperties.findOne(slotId);
     }
 
+    if (!slot) return [];
+
     // Get all the ids of libraries the user can access
     const creatureId = slot.ancestors[0].id;
     const libraryIds = getCreatureLibraryIds(creatureId, userId);