replaced all sorting by order with sorting by left

2024-04-30 12:51:34 +02:00
parent 9d3f9ce14a
commit e62f536749
40 changed files with 60 additions and 60 deletions
--- 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',
--- 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 } })
--- 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
--- 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' };
 }
--- 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
--- 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);

--- 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;
--- 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) {
--- 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) {
--- 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(
          {
--- 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(){
--- 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 }
      });
    },
  },
--- 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() {
--- 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(){
--- 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 }
      });
    },
  },
--- 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 }
      });
    },
  },
--- 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() {
--- 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() {
--- 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),
--- 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() {
--- 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
--- 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);
    },
  },
--- 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(
          {
--- 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() {
--- 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(
          {
--- 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() {
--- 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
--- 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},
      });
    }
--- 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 }
      });
    },
  },
--- 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);
--- 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);
--- 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(),
--- 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 },
      });
    },
  }
--- 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() {
--- 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;
--- 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() {
--- 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
--- 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 }
  });
 }

--- 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);
--- 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 },
      }),
    ];
  });