Merge pull request #17 from rciam/develop

Develop
rciam · Oct 10, 2023 · 27ea141 · 27ea141
2 parents f252d3d + d7517b7
commit 27ea141
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 44 deletions.
diff --git a/javascript/config.json b/javascript/config.json
diff --git a/javascript/src/components/Communities/communitiesChart.js b/javascript/src/components/Communities/communitiesChart.js
@@ -25,16 +25,14 @@ const CommunitiesChart = ({tenenvId}) => {
   const [communities, setCommunities] = useState();
   const [global_options, setGlobalOptions] = useState();
   const queryClient = useQueryClient();
-  const controller = new AbortController
 
 
   let params = {
     params: {
       'interval': selected,
       'count_interval': options[selected]["count_interval"],
       'tenenv_id': tenenvId,
-    },
-    signal: controller.signal
+    }
   }
 
   const communitiesGroupBy = useQuery(
@@ -51,8 +49,7 @@ const CommunitiesChart = ({tenenvId}) => {
         'interval': selected,
         'count_interval': options[selected]["count_interval"],
         'tenenv_id': tenenvId,
-      },
-      signal: controller.signal
+      }
     }
 
     try {
@@ -61,10 +58,6 @@ const CommunitiesChart = ({tenenvId}) => {
       // todo: Here we can handle any authentication or authorization errors
       console.log(error)
     }
-
-    return () => {
-      controller.abort()
-    }
   }, [selected, tenenvId])
 
 

diff --git a/javascript/src/components/Communities/communitiesDataTable.js b/javascript/src/components/Communities/communitiesDataTable.js
@@ -33,7 +33,6 @@ const CommunitiesDataTable = ({tenenvId}) => {
   const [startDate, setStartDate] = useState(oneYearAgo);
   const [dropdownOptionsState, setDropdownOptions] = useState(dropdownOptions);
   const [groupBy, setGroupBy] = useState("month")
-  const controller = new AbortController
 
 
   const queryClient = useQueryClient();
@@ -43,8 +42,7 @@ const CommunitiesDataTable = ({tenenvId}) => {
       'startDate': !startDate ? oneYearAgo : format(startDate, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
       'endDate': !endDate ? today : format(endDate, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
       'tenenv_id': tenenvId
-    },
-    signal: controller.signal
+    }
   }
 
   const communitiesGroupBy = useQuery(
@@ -71,8 +69,7 @@ const CommunitiesDataTable = ({tenenvId}) => {
         'startDate': !startDate ? oneYearAgo : format(startDate, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
         'endDate': !endDate ? today : format(endDate, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
         'tenenv_id': tenenvId
-      },
-      signal: controller.signal
+      }
     }
 
     try {
@@ -82,10 +79,6 @@ const CommunitiesDataTable = ({tenenvId}) => {
       // todo: Here we can handle any authentication or authorization errors
       console.log(error)
     }
-
-    return () => {
-      controller.abort()
-    }
   }, [groupBy])
 
 

diff --git a/javascript/src/components/Users/registeredUsersChart.js b/javascript/src/components/Users/registeredUsersChart.js
@@ -24,15 +24,13 @@ const RegisteredUsersChart = ({
   const [registeredUsers, setRegisteredUsers] = useState([]);
   const [global_options, setGlobalOptions] = useState();
   const queryClient = useQueryClient();
-  const controller = new AbortController
 
   let params = {
     params: {
       'interval': selected,
       'count_interval': regUsersOptions[selected]["count_interval"],
       'tenenv_id': tenenvId
-    },
-    signa: controller.signal
+    }
   }
 
   const registeredUsersGroup = useQuery(
@@ -50,8 +48,7 @@ const RegisteredUsersChart = ({
         'interval': selected,
         'count_interval': regUsersOptions[selected]["count_interval"],
         'tenenv_id': tenenvId,
-      },
-      signal: controller.signal
+      }
     }
 
     try {
@@ -60,11 +57,6 @@ const RegisteredUsersChart = ({
       // todo: Here we can handle any authentication or authorization errors
       console.log(error)
     }
-
-    return () => {
-      controller.abort()
-    }
-
   }, [selected, tenenvId])
 
 

diff --git a/javascript/src/components/Users/registeredUsersDataTable.js b/javascript/src/components/Users/registeredUsersDataTable.js
@@ -33,7 +33,6 @@ const RegisteredUsersDataTable = ({
   const [minDate, setMinDate] = useState("");
   const [groupBy, setGroupBy] = useState("month")
   const queryClient = useQueryClient();
-  const controller = new AbortController();
 
 
   let params = {
@@ -73,8 +72,7 @@ const RegisteredUsersDataTable = ({
         'endDate': !endDate ? null : format(endDate, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
         'tenenv_id': tenenvId,
         'groupBy': groupBy
-      },
-      signal: controller.signal
+      }
     }
 
     try {
@@ -88,11 +86,6 @@ const RegisteredUsersDataTable = ({
       // todo: Here we can handle any authentication or authorization errors
       console.log(error)
     }
-
-    return () => {
-      controller.abort()
-    }
-
   }, [groupBy])
 
   // Construct the data required for the datatable

diff --git a/javascript/src/components/Users/registeredUsersMap.js b/javascript/src/components/Users/registeredUsersMap.js
@@ -15,16 +15,14 @@ const RegisteredUsersMap = ({
                               endDate,
                               tenenvId
                             }) => {
-  const queryClient = useQueryClient();
-  const controller = new AbortController
+  const queryClient = useQueryClient()
 
   let params = {
     params: {
       'startDate': !startDate ? null : format(startDate, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
       'endDate': !endDate ? null : format(endDate, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
       'tenenv_id': tenenvId,
-    },
-    signal: controller.signal
+    }
   }
 
   const registeredUsersByCountry = useQuery(
@@ -42,10 +40,6 @@ const RegisteredUsersMap = ({
     } catch (error) {
       console.log(error)
     }
-
-    return () => {
-      controller.abort()
-    }
   }, [startDate, endDate, tenenvId])
 
   if (registeredUsersByCountry.isLoading