From 2f92d924a8dc1675cd12b08bbac7f57b2335a7b2 Mon Sep 17 00:00:00 2001
From: aidahosa1 <aisosa_idahosa@brown.edu>
Date: Mon, 24 Jun 2024 12:04:43 -0400
Subject: fixing

---
 src/client/views/collections/CollectionCardDeckView.tsx | 10 ----------
 src/client/views/global/globalScripts.ts                | 10 +++++-----
 2 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'src/client/views')

diff --git a/src/client/views/collections/CollectionCardDeckView.tsx b/src/client/views/collections/CollectionCardDeckView.tsx
index 2ad7f0ed1..09cddda19 100644
--- a/src/client/views/collections/CollectionCardDeckView.tsx
+++ b/src/client/views/collections/CollectionCardDeckView.tsx
@@ -660,16 +660,6 @@ export class CollectionCardView extends CollectionSubView() {
                     onMouseLeave={() => this.setHoveredNodeIndex(-1)}>
                     {this.renderCards()}
                 </div>
-                <div className="collectionNotetaking-pivotField" style={{ right: 0, top: 0, position: 'absolute' }}>
-                    <FieldsDropdown
-                        Document={this.Document}
-                        selectFunc={undoable(fieldKey => {
-                            this.layoutDoc._pivotField = fieldKey;
-                            // this.removeEmptyColumns();
-                        }, 'change pivot field')}
-                        placeholder={StrCast(this.layoutDoc._pivotField)}
-                    />
-                </div>
             </div>
         );
     }
diff --git a/src/client/views/global/globalScripts.ts b/src/client/views/global/globalScripts.ts
index cef913837..1344dd071 100644
--- a/src/client/views/global/globalScripts.ts
+++ b/src/client/views/global/globalScripts.ts
@@ -175,15 +175,15 @@ ScriptingGlobals.add(function showFreeform(attr: 'center' | 'grid' | 'snaplines'
         }],
         ['time', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "time",
-            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort = "time",
+            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort === "time" ? doc.cardSort = '' : doc.cardSort = 'time',
         }],
         ['docType', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "type",
-            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort = "type",
+            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort === "type" ? doc.cardSort = '' : doc.cardSort = 'type',
         }],
         ['color', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "color",
-            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort = "color",
+            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort === "color" ? doc.cardSort = '' : doc.cardSort = 'color',
         }],
         ['links', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "links",
@@ -216,8 +216,8 @@ ScriptingGlobals.add(function showFreeform(attr: 'center' | 'grid' | 'snaplines'
         ['chat', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "custom"  && StrCast(doc?.cardSort_customField) === "chat",
             setDoc: (doc: Doc, dv: DocumentView) => {
-                doc.cardSort = "custom";
-                doc.cardSort_customField = "chat";
+                doc.cardSort === "custom" ? doc.cardSort = '' : doc.cardSort = 'custom';
+                doc.cardSort_customField === "chat" ? doc.cardSort_customField = '' : doc.cardSort_customField = 'chat';
                 doc.cardSort_visibleSortGroups = new List<number>();
             },
         }],
-- 
cgit v1.2.3-70-g09d2