From c2a0bb854db56c6176adeaf82b6b9daa5dfa5c05 Mon Sep 17 00:00:00 2001
From: fboulnois <fboulnois@users.noreply.github.com>
Date: Thu, 11 Jan 2024 08:59:35 -0500
Subject: [PATCH] [DUOS-2869] Fix various errors in dev (#2431)

---
 src/components/SignIn.js          |  2 +-
 src/pages/DatasetCatalog.js       | 20 ++++++++++----------
 src/pages/manage_dac/ManageDac.js | 27 +++++++++++++--------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/components/SignIn.js b/src/components/SignIn.js
index dc633d032..0399ff048 100644
--- a/src/components/SignIn.js
+++ b/src/components/SignIn.js
@@ -25,7 +25,7 @@ export const SignIn = (props) => {
       if (isSubscribed) {
         const googleClientId = await Config.getGoogleClientId();
         setClientId(googleClientId);
-        if (GoogleIS.client === null) {
+        if (window.google !== undefined && GoogleIS.client === null) {
           await GoogleIS.initTokenClient(googleClientId, onSuccess, onFailure);
         }
       }
diff --git a/src/pages/DatasetCatalog.js b/src/pages/DatasetCatalog.js
index 2e3ab73cd..cab59aa68 100644
--- a/src/pages/DatasetCatalog.js
+++ b/src/pages/DatasetCatalog.js
@@ -85,6 +85,16 @@ export default function DatasetCatalog(props) {
   const [filterToOnlySelected, setFilterToOnlySelected] = useState(false);
 
 
+  const applyDatasetSort = useCallback((sortParams, datasets) => {
+    const sortedList = datasets.sort((a, b) => {
+      const aVal = a[sortParams.field] || findPropertyValue(a, sortParams.field);
+      const bVal = b[sortParams.field] || findPropertyValue(b, sortParams.field);
+      return aVal.localeCompare(bVal, 'en', {numeric: true}) * sortParams.dir;
+    });
+    setSort(sortParams);
+    setDatasetList(sortedList);
+  }, []);
+
   const getDatasets = useCallback(async () => {
     let datasets = await DataSet.getDatasets();
     let localDacs = await getDacs();
@@ -172,16 +182,6 @@ export default function DatasetCatalog(props) {
 
   }, [searchDulText, pageSize, selectedDatasets, datasetList, filterToOnlySelected, currentPageOnlySelected, currentPageAllDatasets, dacFilter, useCustomFilter]);
 
-  const applyDatasetSort = useCallback((sortParams, datasets) => {
-    const sortedList = datasets.sort((a, b) => {
-      const aVal = a[sortParams.field] || findPropertyValue(a, sortParams.field);
-      const bVal = b[sortParams.field] || findPropertyValue(b, sortParams.field);
-      return aVal.localeCompare(bVal, 'en', {numeric: true}) * sortParams.dir;
-    });
-    setSort(sortParams);
-    setDatasetList(sortedList);
-  }, []);
-
   const getDacs = async () => {
     let dacs = await DAC.list(false);
     dacs = dacs.map(dac => {
diff --git a/src/pages/manage_dac/ManageDac.js b/src/pages/manage_dac/ManageDac.js
index b4a815233..f9b97f00d 100644
--- a/src/pages/manage_dac/ManageDac.js
+++ b/src/pages/manage_dac/ManageDac.js
@@ -34,6 +34,19 @@ export const ManageDac = function ManageDac() {
   const [selectedDatasets, setSelectedDatasets] = useState([]);
 
 
+  const reloadDacList = useCallback(async () => {
+    setIsLoading(true);
+    DAC.list().then(
+      dacs => {
+        if (userRole === CHAIR) {
+          dacs = dacs.filter((dac) => dacIDs.includes(dac.dacId));
+        }
+        setDacs(dacs);
+        setIsLoading(false);
+      }
+    );
+  }, [dacIDs, userRole]);
+
   useEffect(() => {
     Promise.all([
       reloadUserRole(),
@@ -55,20 +68,6 @@ export const ManageDac = function ManageDac() {
     }
   };
 
-  const reloadDacList = useCallback(async () => {
-    setIsLoading(true);
-    DAC.list().then(
-      dacs => {
-        if (userRole === CHAIR) {
-          dacs = dacs.filter((dac) => dacIDs.includes(dac.dacId));
-        }
-        setDacs(dacs);
-        setIsLoading(false);
-      }
-    );
-  }, [dacIDs, userRole]);
-
-
   const reloadUserRole = useCallback(async () => {
     setIsLoading(true);
     const currentUser = Storage.getCurrentUser();