From 352e89ee9a7b1a72f893402691d3f97ad3ed081c Mon Sep 17 00:00:00 2001 From: Thaum Rystra <9525416+ThaumRystra@users.noreply.github.com> Date: Tue, 26 Mar 2024 09:58:01 +0200 Subject: [PATCH] Fixed parent.id => parentId --- app/imports/api/engine/loadCreatures.ts | 2 +- .../ui/creature/character/characterSheetTabs/ActionsTab.vue | 2 +- .../creature/character/characterSheetTabs/FeaturesTab.vue | 2 +- .../creature/character/characterSheetTabs/InventoryTab.vue | 2 +- .../character/printedCharacterSheet/PrintedInventory.vue | 2 +- app/imports/client/ui/docs/DocEditForm.vue | 2 +- app/imports/client/ui/pages/DocsPage.vue | 6 +++--- .../ui/properties/components/folders/FolderGroupCard.vue | 2 +- .../folders/folderGroupComponents/FolderGroupChildren.vue | 2 +- .../folders/folderGroupComponents/SlotBuildTree.vue | 2 +- .../ui/properties/components/inventory/ContainerCard.vue | 2 +- app/imports/client/ui/tabletop/TabletopCreatureCard.vue | 2 +- .../ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/imports/api/engine/loadCreatures.ts b/app/imports/api/engine/loadCreatures.ts index a514c434..4e091553 100644 --- a/app/imports/api/engine/loadCreatures.ts +++ b/app/imports/api/engine/loadCreatures.ts @@ -204,7 +204,7 @@ export function getPropertyChildren(creatureId, property) { return cloneProps.sort((a, b) => a.left - b.left); } else { return CreatureProperties.find({ - 'parent.id': property._id, + 'parentId': property._id, removed: { $ne: true }, }, { sort: { order: 1 }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue index d9da510d..ce89f4ad 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue @@ -71,7 +71,7 @@ export default { return CreatureProperties.find({ ...getFilter.descendantsOfRoot(this.creatureId), - 'parent.id': { + 'parentId': { $nin: folderIds, }, type: 'action', diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue index c2a0d007..3a127733 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue @@ -69,7 +69,7 @@ export default { return CreatureProperties.find({ ...getFilter.descendantsOfRoot(this.creatureId), - 'parent.id': { + 'parentId': { $nin: folderIds, }, type: 'feature', diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue index d934e54f..c660367c 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue @@ -156,7 +156,7 @@ export default { containers() { return CreatureProperties.find({ ...getFilter.descendantsOfRoot(this.creatureId), - 'parent.id': { + 'parend': { $nin: this.folderIds, }, type: 'container', diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue index ea8c7056..1baafe46 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue @@ -136,7 +136,7 @@ export default { sort: { order: 1 }, }).map(c => { c.items = CreatureProperties.find({ - 'parent.id': c._id, + 'parentId': c._id, type: { $in: ['item', 'container'] }, removed: { $ne: true }, equipped: { $ne: true }, diff --git a/app/imports/client/ui/docs/DocEditForm.vue b/app/imports/client/ui/docs/DocEditForm.vue index 4ac78106..adec415b 100644 --- a/app/imports/client/ui/docs/DocEditForm.vue +++ b/app/imports/client/ui/docs/DocEditForm.vue @@ -188,7 +188,7 @@ export default { const docName = this.doc.name; let parentHref = '/docs'; if (this.doc.parent) { - const parent = Docs.findOne({ _id: this.doc.parent.id }); + const parent = Docs.findOne({ _id: this.doc.parentId }); parentHref = parent?.href || parentHref; } softRemoveDoc.call({ _id }, (error) => { diff --git a/app/imports/client/ui/pages/DocsPage.vue b/app/imports/client/ui/pages/DocsPage.vue index 264eecfe..51dd9014 100644 --- a/app/imports/client/ui/pages/DocsPage.vue +++ b/app/imports/client/ui/pages/DocsPage.vue @@ -97,7 +97,7 @@ export default { let currentDoc = undefined; this.path.split('/').forEach(urlName => { currentDoc = Docs.findOne({ - urlName, 'parent.id': currentDoc?._id, + urlName, 'parentId': currentDoc?._id, removed: { $ne: true }, }) if (currentDoc) { @@ -116,7 +116,7 @@ export default { sort: { order: 1 } }); return Docs.find({ - 'parent.id': this.doc._id, + 'parentId': this.doc._id, removed: { $ne: true }, }, { sort: { order: 1 } @@ -125,7 +125,7 @@ export default { siblingDocs() { if (!this.doc) return []; return Docs.find({ - 'parent.id': this.doc.parent?.id, + 'parentId': this.doc.parent?.id, removed: { $ne: true }, }, { sort: { order: 1 } diff --git a/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue index 2b9765f3..3074024b 100644 --- a/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue +++ b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue @@ -41,7 +41,7 @@ export default { properties() { const props = []; CreatureProperties.find({ - 'parent.id': this.model._id, + 'parentId': this.model._id, removed: { $ne: true }, overridden: { $ne: true }, $or: [ 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 83b9ac6e..abfdbcdb 100644 --- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue +++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue @@ -34,7 +34,7 @@ export default { properties() { const props = []; CreatureProperties.find({ - 'parent.id': this.model._id, + 'parentId': this.model._id, removed: { $ne: true }, overridden: { $ne: true }, $or: [ 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 7d5424a5..60f9d455 100644 --- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue +++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue @@ -52,7 +52,7 @@ export default { }); const slotIds = slots.map(s => s._id); const slotChildren = CreatureProperties.find({ - 'parent.id': { $in: slotIds }, + 'parentId': { $in: slotIds }, removed: { $ne: true }, }, { sort: { order: 1 }, diff --git a/app/imports/client/ui/properties/components/inventory/ContainerCard.vue b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue index 0eb2c815..a9d8ecc9 100644 --- a/app/imports/client/ui/properties/components/inventory/ContainerCard.vue +++ b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue @@ -94,7 +94,7 @@ export default { meteor: { items() { return CreatureProperties.find({ - 'parent.id': this.model._id, + 'parentId': this.model._id, type: { $in: ['item', 'container'] }, removed: { $ne: true }, equipped: { $ne: true }, diff --git a/app/imports/client/ui/tabletop/TabletopCreatureCard.vue b/app/imports/client/ui/tabletop/TabletopCreatureCard.vue index e1fc460b..bf64fb75 100644 --- a/app/imports/client/ui/tabletop/TabletopCreatureCard.vue +++ b/app/imports/client/ui/tabletop/TabletopCreatureCard.vue @@ -100,7 +100,7 @@ export default { // Get the properties that need to be shown as a health bar return CreatureProperties.find({ 'ancestors.id': this.model._id, - 'parent.id': { + 'parentId': { $nin: folderIds, }, type: 'attribute', diff --git a/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue b/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue index 039d5726..532d2e76 100644 --- a/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue +++ b/app/imports/client/ui/tabletop/selectedCreatureBar/SelectedCreatureBar.vue @@ -297,7 +297,7 @@ export default { // Get the properties that need to be shown as an icon const filter = { 'ancestors.id': this.creatureId, - 'parent.id': { + 'parentId': { $nin: folderIds, }, $and: [