changed backend for filtering buttons to store only one list - the list of icon buttons in Doc.MyFilterHotKeys.

1 files changed, 12 insertions, 15 deletions

diff --git a/src/client/views/collections/CollectionCardDeckView.tsx b/src/client/views/collections/CollectionCardDeckView.tsx
index cab7d51e4..bcb42111f 100644
--- a/src/client/views/collections/CollectionCardDeckView.tsx
+++ b/src/client/views/collections/CollectionCardDeckView.tsx
@@ -328,24 +328,22 @@ export class CollectionCardView extends CollectionSubView() {
      */
 
     tagValue = (doc: Doc) => {
-        const keys = StrListCast(Doc.UserDoc().myFilterHotKeyTitles);
+        const keys = Doc.MyFilterHotKeys;
 
-        const isTagActive = (buttonID: number) => {
-            return BoolCast(doc[StrCast(Doc.UserDoc()[keys[buttonID]])]);
-        };
+        const isTagActive = (key: Doc) => BoolCast(key.active);
 
         let base = '';
         let fraction = '';
 
-        for (let i = 0; i < keys.length; i++) {
-            if (isTagActive(i)) {
+        keys.forEach(key => {
+            if (isTagActive(key)) {
                 if (base === '') {
-                    base = i.toString(); // First active tag becomes the base
+                    base = StrCast(key.toolType); // First active tag becomes the base
                 } else {
-                    fraction += i.toString(); // Subsequent active tags become part of the fraction
+                    fraction += StrCast(key.toolType); // Subsequent active tags become part of the fraction
                 }
             }
-        }
+        });
 
         // If no tag was active, return 0 by default
         if (base === '') {
@@ -553,17 +551,16 @@ export class CollectionCardView extends CollectionSubView() {
                         doc.chatIndex = index;
                         break;
                     case '1': {
-                        const allHotKeys = StrListCast(Doc.UserDoc().myFilterHotKeyTitles);
+                        const allHotKeys = Doc.MyFilterHotKeys;
 
                         let myTag = '';
 
                         if (tag) {
                             for (let i = 0; i < allHotKeys.length; i++) {
-                                if (tag.includes(allHotKeys[i])) {
-                                    myTag = StrCast(Doc.UserDoc()[allHotKeys[i]]);
-                                    break;
-                                } else if (tag.includes(StrCast(Doc.UserDoc()[allHotKeys[i]]))) {
-                                    myTag = StrCast(Doc.UserDoc()[allHotKeys[i]]);
+                                // bcz: CHECK THIS CODE OUT -- SOMETHING CHANGED
+                                const keyTag = StrCast(allHotKeys[i].toolType);
+                                if (tag.includes(keyTag)) {
+                                    myTag = keyTag;
                                     break;
                                 }
                             }