@@ -110,7 +111,7 @@
-
+
@@ -120,11 +121,12 @@
column
align-center
justify-center
- class="ma-3"
+ class="ma-3 mt-8"
>
Load More
@@ -192,7 +194,7 @@ import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/
import Libraries from '/imports/api/library/Libraries.js';
import LibraryNodeExpansionContent from '/imports/client/ui/library/LibraryNodeExpansionContent.vue';
import PropertyTags from '/imports/client/ui/properties/viewers/shared/PropertyTags.vue';
-import { clone, difference } from 'lodash';
+import { clone, difference, isEqual } from 'lodash';
export default {
components: {
@@ -247,29 +249,69 @@ export default {
});
return { or, not };
},
+ filledLevels() {
+ return LibraryNodes.find({
+ _id: { $in: this.selectedNodeIds }
+ }).map(
+ node => node.level || node.cache?.node?.level || 0
+ ).sort((a, b) => a - b);
+ }
},
watch: {
selectedNodeIds(selectedIds, oldSelectedIds) {
- // Skip if we didn't increase the length by adding a new Id
- if (oldSelectedIds.length >= selectedIds.length) return;
- // Find out which library node was added
- const addedId = difference(selectedIds, oldSelectedIds)[0];
- if (!addedId) return;
- const addedNode = LibraryNodes.findOne(addedId);
- if (!addedNode) return;
- // Tick any unchecked nodes of a lower level, but only one per level
- const backFilledLevels = new Set();
- this.libraryNodes.forEach(node => {
- if (
- !selectedIds.includes(node._id)
- && node.level < addedNode.level
- && !backFilledLevels.has(node.level)
- ) {
- selectedIds.push(node._id);
- }
- });
- this.selectedNodeIds = selectedIds;
- }
+ // Skip if we increased the length by adding a new Id, see if we need to backfill levels
+ if (oldSelectedIds.length < selectedIds.length) {
+ // Find out which library node was added
+ const addedId = difference(selectedIds, oldSelectedIds)[0];
+ if (!addedId) return;
+ const addedNode = LibraryNodes.findOne(addedId);
+ if (!addedNode) return;
+ // Check which levels are already backfilled
+ const backFilledLevels = new Set();
+ const sortedIds = LibraryNodes.find({
+ _id: { $in: selectedIds }
+ }).map(node => backFilledLevels.add(node.level || node.cache?.node?.level || 0));
+ // Tick any unchecked nodes of a lower level, but only one per level
+ this.libraryNodes.forEach(node => {
+ if (
+ !selectedIds.includes(node._id)
+ && (node.level < addedNode.level)
+ && !backFilledLevels.has(node.level)
+ && !this.isDisabled(node)
+ && !node._disabledBySlotFillerCondition
+ ) {
+ selectedIds.push(node._id);
+ backFilledLevels.add(node.level)
+ }
+ });
+ this.selectedNodeIds = sortedIds;
+ }
+
+ // Refetch the library nodes to sort them correctly
+ const sortedIds = LibraryNodes.find({
+ _id: { $in: selectedIds }
+ }, {
+ sort: { level: 1, name: 1, order: 1 }
+ })
+ .fetch()
+ .sort((a, b) => (a.level || a.cache?.node?.level || 0) - (b.level || b.cache?.node?.level || 0))
+ .map(node => node._id);
+ // Only update if the order changed
+ if (!isEqual(this.selectedNodeIds, sortedIds)) {
+ this.selectedNodeIds = sortedIds;
+ }
+ },
+ activeCount(val) {
+ // Still loading fillers
+ if (!this._subs['classFillers'].ready()) return;
+ // Can load more, and not showing enough active choices, so load more
+ if (
+ this.currentLimit < this.countAll
+ && val < 20
+ ) {
+ this.loadMore();
+ }
+ },
},
methods: {
loadMore() {
@@ -286,12 +328,10 @@ export default {
});
},
isDisabled(node) {
- return node._disabledBySlotFillerCondition ||
- node._disabledByAlreadyAdded ||
- (
- node._disabledByQuantityFilled &&
- !this.selectedNodeIds.includes(node._id)
- )
+ const selected = this.selectedNodeIds.includes(node._id);
+ return node._disabledByAlreadyAdded
+ || ( node._disabledByQuantityFilled && !selected )
+ || ( this.filledLevels.includes(node.level || node.cache?.node?.level || 0) && !selected )
},
},
meteor: {
@@ -324,6 +364,10 @@ export default {
countAll() {
return this._subs['classFillers'].data('countAll');
},
+ activeCount() {
+ if (!this.libraryNodes) return;
+ return this.libraryNodes.length - (this.disabledNodeCount || 0);
+ },
alreadyAdded() {
let added = new Set();
if (!this.model.unique) return added;
@@ -377,12 +421,15 @@ export default {
if (!this.libraryNodeFilter) return [];
if (!this.$subReady.classFillers) return [];
let nodes = LibraryNodes.find(this.libraryNodeFilter, {
- sort: { name: 1, order: 1 }
+ sort: { level: 1, 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.cache?.node) {
+ node.level = node.cache.node.level;
+ }
if (node.slotFillerCondition) {
try {
let parseNode = parse(node.slotFillerCondition);
@@ -390,18 +437,19 @@ export default {
if (resultNode?.parseType === 'constant') {
if (!resultNode.value) {
node._disabledBySlotFillerCondition = true;
+ node._conditionError = node.slotFillerConditionNote || node.slotFillerCondition;
disabledNodeCount += 1;
}
} else {
node._disabledBySlotFillerCondition = true;
- node._conditionError = toString(resultNode);
+ node._conditionError = node.slotFillerConditionNote || toString(resultNode);
disabledNodeCount += 1;
}
} catch (e) {
console.warn(e);
let error = prettifyParseError(e);
node._disabledBySlotFillerCondition = true;
- node._conditionError = error;
+ node._conditionError = 'Condition error: ' + error;
disabledNodeCount += 1;
}
}
@@ -415,6 +463,7 @@ export default {
node._disabledByAlreadyAdded = true;
}
});
+ nodes.sort((a, b) => a.level - b.level);
this.disabledNodeCount = disabledNodeCount;
return nodes;
},
diff --git a/app/imports/client/ui/creature/slots/SlotFillDialog.vue b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
index 75af7420..197aedd0 100644
--- a/app/imports/client/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
@@ -64,7 +64,7 @@
:key="libraryNode._id"
:model="libraryNode"
:data-id="libraryNode._id"
- :class="{disabled: isDisabled(libraryNode)}"
+ :class="{disabled: isDisabled(libraryNode) || libraryNode._disabledBySlotFillerCondition}"
>
@@ -84,6 +84,7 @@
v-model="selectedNodeIds"
class="my-0 py-0"
hide-details
+ :color="libraryNode._disabledBySlotFillerCondition ? 'error' : ''"
:disabled="isDisabled(libraryNode)"
:value="libraryNode._id"
@click.stop
@@ -125,7 +126,7 @@
-
+
@@ -136,16 +137,38 @@
column
align-center
justify-center
- class="ma-3"
+ class="ma-3 mt-8"
>
Load More
+
+
+
+ Requirements of {{ disabledNodeCount }} properties were not met
+
+
+ Show All
+
+
+
-
-
-
- Requirements of {{ disabledNodeCount }} properties were not met
-
-
- Show All
-
-
-
+
= this.countAll) return;
@@ -327,8 +345,7 @@ export default {
});
},
isDisabled(node) {
- return node._disabledBySlotFillerCondition ||
- node._disabledByAlreadyAdded ||
+ return node._disabledByAlreadyAdded ||
(
node._disabledByQuantityFilled &&
!this.selectedNodeIds.includes(node._id)
@@ -408,6 +425,10 @@ export default {
countAll() {
return this._subs['slotFillers'].data('countAll');
},
+ activeCount() {
+ if (!this.libraryNodes) return;
+ return this.libraryNodes.length - (this.disabledNodeCount || 0);
+ },
libraryNodeFilter() {
const filterString = this._subs['slotFillers'].data('libraryNodeFilter');
if (!filterString) return;
diff --git a/app/imports/client/ui/library/LibraryListTile.vue b/app/imports/client/ui/library/LibraryListTile.vue
index 10216f0c..c19e64d8 100644
--- a/app/imports/client/ui/library/LibraryListTile.vue
+++ b/app/imports/client/ui/library/LibraryListTile.vue
@@ -5,7 +5,7 @@
-
+
@@ -96,6 +96,9 @@ export default {
_id: this.model._id,
operation: change.type,
value: change.value
+ }, e => {
+ console.log(change);
+ change.ack?.(e);
});
},
log({_id}) {
diff --git a/app/imports/server/publications/slotFillers.js b/app/imports/server/publications/slotFillers.js
index fba54ca6..207ba336 100644
--- a/app/imports/server/publications/slotFillers.js
+++ b/app/imports/server/publications/slotFillers.js
@@ -41,16 +41,21 @@ Meteor.publish('slotFillers', function (slotId, searchTerm, isDummySlot) {
sort: { name: 1 }
});
- // Build a filter for nodes in those libraries that match the slot
- let filter = getSlotFillFilter({ slot, libraryIds });
this.autorun(function () {
+ // Build a filter for nodes in those libraries that match the slot
+ let filter = getSlotFillFilter({ slot, libraryIds });
// Get the limit of the documents the user can fetch
var limit = self.data('limit') || 50;
check(limit, Number);
let options = undefined;
if (searchTerm) {
- filter.name = { $regex: escapeRegex(searchTerm), '$options': 'i' };
+ filter.$and.push({
+ $or: [
+ { name: { $regex: escapeRegex(searchTerm), '$options': 'i' } },
+ { libraryTags: searchTerm }
+ ]
+ });
//filter.$text = { $search: searchTerm };
options = {
// relevant documents have a higher score.
diff --git a/app/package.json b/app/package.json
index 7be55595..d89e22b6 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "dicecloud",
- "version": "2.0.53",
+ "version": "2.0.55",
"description": "Unofficial Online Realtime D&D 5e App",
"license": "GPL-3.0",
"repository": {