diff --git a/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js b/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js index 497943b4..ebae17f4 100644 --- a/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js +++ b/app/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js @@ -22,7 +22,7 @@ const insertCreatureFolder = new ValidatedMethod({ owner: userId }, { fields: { order: 1 }, - sort: { order: -1 } + sort: { left: -1 } }); if (existingFolders.count() >= 50) { throw new Meteor.Error('creatureFolders.methods.insert.denied', diff --git a/app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js b/app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js index 3cdc7c5a..f57aaa8a 100644 --- a/app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js +++ b/app/imports/api/creature/creatureFolders/methods.js/reorderCreatureFolder.js @@ -31,7 +31,7 @@ const reorderCreatureFolder = new ValidatedMethod({ owner: userId }, { fields: { order: 1, }, - sort: { order: -1 } + sort: { left: -1 } }).forEach((folder, index) => { if (folder.order !== index) { CreatureFolders.update(_id, { $set: { order: index } }) diff --git a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js index ad5665c3..7c1b1aa7 100644 --- a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js @@ -55,7 +55,7 @@ const duplicateProperty = new ValidatedMethod({ removed: { $ne: true }, }, { limit: DUPLICATE_CHILDREN_LIMIT + 1, - sort: { order: 1 }, + sort: { left: 1 }, }).fetch(); // Alert the user if the limit was hit diff --git a/app/imports/api/creature/creatureProperties/methods/getParentRefByTag.js b/app/imports/api/creature/creatureProperties/methods/getParentRefByTag.js index 1c664692..cda68469 100644 --- a/app/imports/api/creature/creatureProperties/methods/getParentRefByTag.js +++ b/app/imports/api/creature/creatureProperties/methods/getParentRefByTag.js @@ -8,7 +8,7 @@ export default function getParentRefByTag(creatureId, tag) { inactive: { $ne: true }, tags: tag, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); return prop && { id: prop._id, collection: 'creatureProperties' }; } diff --git a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js index f582ad29..87fc681a 100644 --- a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js +++ b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js @@ -159,7 +159,7 @@ function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0) { ...getFilter.descendants(referencedNode), removed: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }).fetch(); // We are adding the referenced node and its descendants diff --git a/app/imports/api/docs/Docs.js b/app/imports/api/docs/Docs.js index 4cfa992c..291c045b 100644 --- a/app/imports/api/docs/Docs.js +++ b/app/imports/api/docs/Docs.js @@ -103,7 +103,7 @@ const insertDoc = new ValidatedMethod({ doc.parentId = parentId; - const lastOrder = Docs.find({}, { sort: { order: -1 } }).fetch()[0]?.order || 0; + const lastOrder = Docs.find({}, { sort: { left: -1 } }).fetch()[0]?.order || 0; doc.order = lastOrder + 1; doc.urlName = 'new-doc-' + (lastOrder + 1); diff --git a/app/imports/api/engine/loadCreatures.ts b/app/imports/api/engine/loadCreatures.ts index 4e091553..d8ac1cab 100644 --- a/app/imports/api/engine/loadCreatures.ts +++ b/app/imports/api/engine/loadCreatures.ts @@ -207,7 +207,7 @@ export function getPropertyChildren(creatureId, property) { 'parentId': property._id, removed: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }).fetch(); } } @@ -238,7 +238,7 @@ class LoadedCreature { 'root.id': creatureId, removed: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }).observeChanges({ added(id, fields) { fields._id = id; diff --git a/app/imports/api/library/methods/copyLibraryNodeTo.js b/app/imports/api/library/methods/copyLibraryNodeTo.js index 5c703253..a77f8d39 100644 --- a/app/imports/api/library/methods/copyLibraryNodeTo.js +++ b/app/imports/api/library/methods/copyLibraryNodeTo.js @@ -58,7 +58,7 @@ const copyLibraryNodeTo = new ValidatedMethod({ removed: { $ne: true }, }, { limit: DUPLICATE_CHILDREN_LIMIT + 1, - sort: { order: 1 }, + sort: { left: 1 }, }).fetch(); if (decendants.length > DUPLICATE_CHILDREN_LIMIT) { diff --git a/app/imports/api/library/methods/duplicateLibraryNode.js b/app/imports/api/library/methods/duplicateLibraryNode.js index 0983f97b..ee8116b9 100644 --- a/app/imports/api/library/methods/duplicateLibraryNode.js +++ b/app/imports/api/library/methods/duplicateLibraryNode.js @@ -47,7 +47,7 @@ const duplicateLibraryNode = new ValidatedMethod({ removed: { $ne: true }, }, { limit: DUPLICATE_CHILDREN_LIMIT + 1, - sort: { order: 1 }, + sort: { left: 1 }, }).fetch(); if (nodes.length > DUPLICATE_CHILDREN_LIMIT) { diff --git a/app/imports/client/ui/creature/archive/ArchiveDialog.vue b/app/imports/client/ui/creature/archive/ArchiveDialog.vue index d834c604..8113ac42 100644 --- a/app/imports/client/ui/creature/archive/ArchiveDialog.vue +++ b/app/imports/client/ui/creature/archive/ArchiveDialog.vue @@ -155,7 +155,7 @@ export default { const userId = Meteor.userId(); let folders = CreatureFolders.find( {owner: userId, archived: {$ne: true}}, - {sort: {order: 1}}, + {sort: {left: 1}}, ).map(folder => { folder.creatures = Creatures.find( { @@ -189,7 +189,7 @@ export default { const userId = Meteor.userId(); let folders = CreatureFolders.find( {owner: userId}, - {sort: {order: 1}}, + {sort: {left: 1}}, ).map(folder => { folder.creatures = ArchiveCreatureFiles.find( { diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue index b4e1bf74..68cdb813 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue @@ -319,7 +319,7 @@ export default { removed: {$ne: true}, inactive: {$ne: true}, }, { - sort: {order: 1} + sort: {left: 1} }).fetch(); }, classLevels() { @@ -331,7 +331,7 @@ export default { removed: {$ne: true}, inactive: {$ne: true}, }, { - sort: {order: 1} + sort: {left: 1} }); }, slotBuildTree(){ diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue index 3a127733..9f4f752a 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue @@ -76,7 +76,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }); }, }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue index c660367c..13655b90 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue @@ -163,7 +163,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }).fetch(); }, creature() { @@ -188,7 +188,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, carriedItems() { @@ -204,7 +204,7 @@ export default { deactivatedByAncestor: { $ne: true }, deactivatedByToggle: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, equippedItems() { @@ -215,7 +215,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, equipmentParentRef() { diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue index bd53a20e..7ea6007c 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue @@ -90,7 +90,7 @@ export default { ...getFilter.descendantsOfRoot(this.creatureId), $nor: [getFilter.descendantsOfAll(allNotes)], }, { - sort: {order: 1}, + sort: {left: 1}, }); }, creature(){ diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue index cfba26e8..a84c9872 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue @@ -115,7 +115,7 @@ export default { { hideWhenValueZero: true, value: 0 }, ], }, { - sort: { order: 1 } + sort: { left: 1 } }); }, spellLists() { @@ -168,7 +168,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }); }, }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue index e2e819e1..d3c34203 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue @@ -557,7 +557,7 @@ export default { if (creature.settings.hideUnusedStats) { filter.hide = { $ne: true }; } - const allProps = CreatureProperties.find(filter, { sort: { order: -1 } }).fetch(); + const allProps = CreatureProperties.find(filter, { sort: { left: -1 } }).fetch(); const forest = docsToForest(allProps); const properties = { folder: {}, attribute: {}, skill: {} }; walkDown(forest, node => { @@ -593,7 +593,7 @@ export default { deactivatedByToggle: { $ne: true }, showUI: true, }, { - sort: { order: 1 } + sort: { left: 1 } }); }, }, diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue index 47fd6bcf..445c5675 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue @@ -212,7 +212,7 @@ export default { removed: {$ne: true}, inactive: {$ne: true}, }, { - sort: {order: 1} + sort: {left: 1} }).fetch(); }, classLevels() { @@ -224,7 +224,7 @@ export default { removed: {$ne: true}, inactive: {$ne: true}, }, { - sort: {order: 1} + sort: {left: 1} }); }, editPermission() { diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue index 1baafe46..a11ffc0f 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue @@ -111,7 +111,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, creature() { @@ -133,7 +133,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }).map(c => { c.items = CreatureProperties.find({ 'parentId': c._id, @@ -143,7 +143,7 @@ export default { deactivatedByAncestor: { $ne: true }, deactivatedByToggle: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }).fetch(); return c; }); @@ -158,7 +158,7 @@ export default { deactivatedByAncestor: { $ne: true }, deactivatedByToggle: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, equippedItems() { @@ -169,7 +169,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, equipmentParentRef() { diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue index d02c246d..2e1d8e62 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue @@ -70,7 +70,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }).fetch(); }, spellsWithoutList() { @@ -96,7 +96,7 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }).map(sl => { sl.spells = CreatureProperties.find({ ...getFilter.descendants(sl), diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue index f83647f8..e558770a 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue @@ -363,7 +363,7 @@ import { uniqBy } from 'lodash'; import { getFilter } from '/imports/api/parenting/parentingFunctions'; const getProperties = function (creature, filter, options = { - sort: { order: 1 } + sort: { left: 1 } }) { if (!creature) return; if (creature.settings.hideUnusedStats) { @@ -434,7 +434,7 @@ export default { deactivatedByToggle: { $ne: true }, showUI: true, }, { - sort: { order: 1 } + sort: { left: 1 } }); }, healthBars() { diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue index e3c2c69d..7f7bd0c1 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue @@ -175,7 +175,7 @@ export default { 'ancestors.id': this.model._id, 'removed': { $ne: true }, }, { - sort: {order: 1} + sort: {left: 1} }).map(prop => { // Get all the props we don't want to show the decendants of and // where they might appear in the ancestor list diff --git a/app/imports/client/ui/docs/DocsRightDrawer.vue b/app/imports/client/ui/docs/DocsRightDrawer.vue index 01831f79..c63f6bc7 100644 --- a/app/imports/client/ui/docs/DocsRightDrawer.vue +++ b/app/imports/client/ui/docs/DocsRightDrawer.vue @@ -47,7 +47,7 @@ export default { return Session.get('editingDocs'); }, docs() { - const docs = Docs.find({ removed: {$ne: true} }, { sort: {order: 1} }).fetch(); + const docs = Docs.find({ removed: {$ne: true} }, { sort: {left: 1} }).fetch(); return docsToForest(docs); }, }, diff --git a/app/imports/client/ui/layouts/Sidebar.vue b/app/imports/client/ui/layouts/Sidebar.vue index 8d371f7d..7ab264bd 100644 --- a/app/imports/client/ui/layouts/Sidebar.vue +++ b/app/imports/client/ui/layouts/Sidebar.vue @@ -113,7 +113,7 @@ export default { const userId = Meteor.userId(); let folders = CreatureFolders.find( { owner: userId, archived: { $ne: true } }, - { sort: { order: 1 } }, + { sort: { left: 1 } }, ).map(folder => { folder.creatures = Creatures.find( { diff --git a/app/imports/client/ui/library/LibraryEditDialog.vue b/app/imports/client/ui/library/LibraryEditDialog.vue index 1ef7f63a..43a0d08e 100644 --- a/app/imports/client/ui/library/LibraryEditDialog.vue +++ b/app/imports/client/ui/library/LibraryEditDialog.vue @@ -190,7 +190,7 @@ export default { removed: true, removedWith: { $exists: false }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, isOwner() { diff --git a/app/imports/client/ui/pages/CharacterList.vue b/app/imports/client/ui/pages/CharacterList.vue index 9a976b5a..f8b1ef46 100644 --- a/app/imports/client/ui/pages/CharacterList.vue +++ b/app/imports/client/ui/pages/CharacterList.vue @@ -112,7 +112,7 @@ export default { const userId = Meteor.userId(); let folders = CreatureFolders.find( { owner: userId, archived: { $ne: true } }, - { sort: { order: 1 } }, + { sort: { left: 1 } }, ).map(folder => { folder.creatures = Creatures.find( { diff --git a/app/imports/client/ui/pages/DocsPage.vue b/app/imports/client/ui/pages/DocsPage.vue index 51dd9014..10779948 100644 --- a/app/imports/client/ui/pages/DocsPage.vue +++ b/app/imports/client/ui/pages/DocsPage.vue @@ -113,13 +113,13 @@ export default { 'parent': undefined, removed: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }); return Docs.find({ 'parentId': this.doc._id, removed: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }) }, siblingDocs() { @@ -128,7 +128,7 @@ export default { 'parentId': this.doc.parent?.id, removed: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }); }, editing() { diff --git a/app/imports/client/ui/properties/components/actions/ActionCard.vue b/app/imports/client/ui/properties/components/actions/ActionCard.vue index f2bdf8ea..d64bb514 100644 --- a/app/imports/client/ui/properties/components/actions/ActionCard.vue +++ b/app/imports/client/ui/properties/components/actions/ActionCard.vue @@ -198,7 +198,7 @@ export default { 'ancestors.id': this.model._id, 'removed': { $ne: true }, }, { - sort: {order: 1} + sort: {left: 1} }).map(prop => { // Get all the props we don't want to show the decendants of and // where they might appear in the ancestor list diff --git a/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue b/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue index d1c042b9..1e307984 100644 --- a/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue +++ b/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue @@ -46,7 +46,7 @@ export default { removed: {$ne: true}, inactive: {$ne: true}, }, { - sort: {order: 1}, + sort: {left: 1}, fields: {equipped: false}, }); } diff --git a/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue index 51dc33e8..00fddff2 100644 --- a/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue +++ b/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue @@ -51,7 +51,7 @@ export default { filter.hide = { $ne: true }; } return CreatureProperties.find(filter, { - sort: { order: 1 } + sort: { left: 1 } }); }, }, diff --git a/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue index 3074024b..4523d7bd 100644 --- a/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue +++ b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue @@ -61,7 +61,7 @@ export default { { hideWhenValueZero: true, value: 0 }, ], }, { - sort: { order: 1 }, + sort: { left: 1 }, }).forEach(prop => { if (propComponents[prop.type]) { props.push(prop); diff --git a/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue b/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue index abfdbcdb..30cfd16d 100644 --- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue +++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue @@ -54,7 +54,7 @@ export default { { hideWhenValueZero: true, value: 0 }, ], }, { - sort: { order: 1 }, + sort: { left: 1 }, }).forEach(prop => { if (propComponents[prop.type]) { props.push(prop); diff --git a/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue b/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue index 60f9d455..49e9df68 100644 --- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue +++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue @@ -48,14 +48,14 @@ export default { removed: { $ne: true }, inactive: { $ne: true }, }, { - sort: { order: 1 } + sort: { left: 1 } }); const slotIds = slots.map(s => s._id); const slotChildren = CreatureProperties.find({ 'parentId': { $in: slotIds }, removed: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); const tree = nodeArrayToTree([ ...slots.fetch(), diff --git a/app/imports/client/ui/properties/components/inventory/ContainerCard.vue b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue index a9d8ecc9..734cde9b 100644 --- a/app/imports/client/ui/properties/components/inventory/ContainerCard.vue +++ b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue @@ -101,7 +101,7 @@ export default { deactivatedByAncestor: { $ne: true }, deactivatedByToggle: { $ne: true }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }); }, } diff --git a/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue b/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue index 0651be34..4788c219 100644 --- a/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue +++ b/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue @@ -403,7 +403,7 @@ export default { }; } return CreatureProperties.find(filter, { - sort: { order: 1 } + sort: { left: 1 } }); }, spellSlots() { diff --git a/app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js b/app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js index 84e242f5..9282281b 100644 --- a/app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js +++ b/app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js @@ -15,7 +15,7 @@ export default function createListOfProperties(filter = {}, getNamesWithValues) }); } } - let options = { sort: { order: 1, variableName: 1 } } + let options = { sort: { left: 1, variableName: 1 } } CreatureProperties.find(filter, options).forEach(addUniquePropertys); LibraryNodes.find(filter, options).forEach(addUniquePropertys); if (getNamesWithValues) return propertyList; diff --git a/app/imports/client/ui/properties/viewers/SkillViewer.vue b/app/imports/client/ui/properties/viewers/SkillViewer.vue index b7385750..a9604589 100644 --- a/app/imports/client/ui/properties/viewers/SkillViewer.vue +++ b/app/imports/client/ui/properties/viewers/SkillViewer.vue @@ -193,7 +193,7 @@ export default { return CreatureProperties.find({ _id: {$in: this.model.proficiencyIds}, }, { - sort: {order: 1} + sort: {left: 1} }).fetch(); }, ability() { diff --git a/app/imports/client/ui/tabletop/TabletopActionCard.vue b/app/imports/client/ui/tabletop/TabletopActionCard.vue index cd84216f..70450776 100644 --- a/app/imports/client/ui/tabletop/TabletopActionCard.vue +++ b/app/imports/client/ui/tabletop/TabletopActionCard.vue @@ -248,7 +248,7 @@ export default { 'ancestors.id': this.model._id, 'removed': { $ne: true }, }, { - sort: {order: 1} + sort: {left: 1} }).map(prop => { // Get all the props we don't want to show the decendants of and // where they might appear in the ancestor list diff --git a/app/imports/client/ui/tabletop/TabletopComponent.vue b/app/imports/client/ui/tabletop/TabletopComponent.vue index 432d45f9..cb51f8b3 100644 --- a/app/imports/client/ui/tabletop/TabletopComponent.vue +++ b/app/imports/client/ui/tabletop/TabletopComponent.vue @@ -149,7 +149,7 @@ const getProperties = function (creatureId, selector = {}) { ], ...selector, }, { - sort: { order: 1 } + sort: { left: 1 } }); } diff --git a/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue b/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue index 0e8cb681..f57db9ee 100644 --- a/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue +++ b/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue @@ -327,7 +327,7 @@ export default { const propsById = {}; const props = []; CreatureProperties.find(filter, { - sort: { order: -1 }, + sort: { left: -1 }, fields: { _id: 1, type: 1 }, }).forEach(prop => { props.push(prop); diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js index 9d69ec3f..2466617c 100644 --- a/app/imports/server/publications/library.js +++ b/app/imports/server/publications/library.js @@ -243,7 +243,7 @@ Meteor.publish('libraryNodes', function (libraryId, extraFields) { LibraryNodes.find({ 'root.id': libraryId, }, { - sort: { order: 1 }, + sort: { left: 1 }, fields, }), ]; @@ -288,7 +288,7 @@ Meteor.publish('softRemovedLibraryNodes', function (libraryId) { removed: true, removedWith: { $exists: false }, }, { - sort: { order: 1 }, + sort: { left: 1 }, }), ]; }); @@ -309,7 +309,7 @@ Meteor.publish('descendantLibraryNodes', function (nodeId) { LibraryNodes.find({ 'ancestors.id': nodeId, }, { - sort: { order: 1 }, + sort: { left: 1 }, }), ]; });