fix: Sort tokens and categories alphabetically

mcavallo · Sep 28, 2022 · e230a8b · e230a8b
1 parent c6660d8
commit e230a8b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/apps/random-target.js b/src/apps/random-target.js
@@ -23,8 +23,9 @@ export class RandomTarget extends FormApplication {
   getData() {
     const data = super.getData();
     const tokenCategories = {};
+    const sortedTokens = game.scenes.active.tokens.contents.sort(game.randomTarget.utils.sortTokensByName);
 
-    game.scenes.active.tokens.forEach(token => {
+    sortedTokens.forEach(token => {
       const type = token._actor.type;
       const defeated = game.randomTarget.utils.isTokenDefeated(token);
 
@@ -53,7 +54,15 @@ export class RandomTarget extends FormApplication {
       tokenCategories[type].totalItems++;
     });
 
-    data.tokenCategories = tokenCategories;
+    const sortedCategoryKeys = Object.keys(tokenCategories).sort();
+
+    data.tokenCategories = sortedCategoryKeys.reduce(
+      (accum, key) => ({
+        ...accum,
+        [key]: tokenCategories[key],
+      }),
+      {}
+    );
     data.areThereTokens = !!Object.keys(tokenCategories).length;
     return data;
   }

diff --git a/src/module.mjs b/src/module.mjs
@@ -39,12 +39,23 @@ function isTokenDefeated(token) {
   }
 }
 
+function sortTokensByName(a, b) {
+  if (a.name > b.name) {
+    return 1;
+  } else if (b.name > a.name) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
 Hooks.once('init', function () {
   game.randomTarget = {
     run: run,
     settings: computeSettings(),
     utils: {
       isTokenDefeated,
+      sortTokensByName,
     },
   };
 });