Only request basket counts and display in_basket filter toggle for no…

…n-guest users (#346)
VEuPathDB · Jul 6, 2023 · 8d240ed · 8d240ed
1 parent 2177d08
commit 8d240ed
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/...tomization/js/client/components/records/TranscriptRecordClasses.TranscriptRecordClass.jsx b/...tomization/js/client/components/records/TranscriptRecordClasses.TranscriptRecordClass.jsx
@@ -65,6 +65,7 @@ function TranscriptViewFilter({
   requestTranscriptFilterUpdate,
   inBasketFilterEnabled,
   updateInBasketFilter,
+  isGuest,
 }) {
   const display = displayTotalCount === 1 ? displayName : displayNamePlural;
   const nativeDisplay =
@@ -116,18 +117,20 @@ function TranscriptViewFilter({
           </div>
         </>
       )}
-      <div>
-        <input
-          id={basketToggleId}
-          type="checkbox"
-          checked={inBasketFilterEnabled}
-          onChange={(e) => updateInBasketFilter(e.currentTarget.checked)}
-        />
-        <label htmlFor={basketToggleId}>
-          <BasketIcon enabled />
-          &nbsp;&nbsp; Show only the {displayNamePlural} in my basket.
-        </label>
-      </div>
+      {!isGuest && (
+        <div>
+          <input
+            id={basketToggleId}
+            type="checkbox"
+            checked={inBasketFilterEnabled}
+            onChange={(e) => updateInBasketFilter(e.currentTarget.checked)}
+          />
+          <label htmlFor={basketToggleId}>
+            <BasketIcon enabled />
+            &nbsp;&nbsp; Show only the {displayNamePlural} in my basket.
+          </label>
+        </div>
+      )}
     </div>
   );
 }
@@ -143,6 +146,7 @@ const ConnectedTranscriptViewFilter = connect(
       ['resultTableSummaryView', props.viewId, 'globalViewFilters'],
       {}
     ),
+    isGuest: get(state, ['globalData', 'user', 'isGuest'], true),
   }),
   (dispatch, props) => ({
     requestTranscriptFilterUpdate: (...args) =>

diff --git a/...mics-site/webapp/wdkCustomization/js/client/components/records/gene-list-export-utils.tsx b/...mics-site/webapp/wdkCustomization/js/client/components/records/gene-list-export-utils.tsx
@@ -83,19 +83,24 @@ export function useSendToBasketConfig(
   | undefined {
   const dispatch = useDispatch();
 
-  useEffect(() => {
-    if (!clearFirst) {
-      dispatch(requestBasketCounts());
+  const basketCount = useSelector((state: RootState) => {
+    if (resultType.type === 'step') {
+      return state.basket.counts?.[resultType.step.recordClassName] ?? 0;
     }
-  }, [clearFirst, dispatch]);
-
-  const basketCounts = useSelector((state: RootState) => state.basket.counts);
+    return 0;
+  });
 
   const isGuest = useWdkService(
     async (wdkService) => (await wdkService.getCurrentUser()).isGuest,
     []
   );
 
+  useEffect(() => {
+    if (!clearFirst && !(isGuest ?? true)) {
+      dispatch(requestBasketCounts());
+    }
+  }, [clearFirst, dispatch, isGuest]);
+
   return useMemo(
     () =>
       isGeneListStep(resultType)
@@ -115,11 +120,7 @@ export function useSendToBasketConfig(
                     Basket (
                     {clearFirst
                       ? 'replace'
-                      : 'add to ' +
-                        basketCounts?.[
-                          resultType.step.recordClassName
-                        ].toLocaleString() +
-                        ' genes'}
+                      : 'add to ' + basketCount.toLocaleString() + ' genes'}
                     )
                   </span>
                 </div>
@@ -132,7 +133,7 @@ export function useSendToBasketConfig(
             onSelectionFulfillment: dispatch,
           }
         : undefined,
-    [resultType, clearFirst, dispatch, isGuest, basketCounts]
+    [resultType, clearFirst, dispatch, isGuest, basketCount]
   );
 }