From c3fd112abe9ce6b5880e83aba8a7d18dec4ec106 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 24 Oct 2023 13:26:14 +0300 Subject: [PATCH] improve frontend error logs --- .../src/components/Common/middleware.js | 3 -- .../Communities/communitiesChart.js | 2 +- .../Communities/communitiesDataTable.js | 2 +- .../components/Communities/communitiesMap.js | 2 +- .../components/Dashboard/loginDataTable.js | 2 +- .../components/Dashboard/loginLineChart.js | 2 +- .../src/components/Idps/idpMapToDataTable.js | 2 +- .../src/components/Idps/idpsDataTable.js | 2 +- javascript/src/components/Sps/spsDataTable.js | 2 +- .../components/Users/registeredUsersChart.js | 2 +- .../Users/registeredUsersDataTable.js | 2 +- .../components/Users/registeredUsersMap.js | 2 +- javascript/src/utils/api/index.js | 2 +- javascript/src/utils/queries/index.js | 38 +++++++++---------- 14 files changed, 31 insertions(+), 34 deletions(-) diff --git a/javascript/src/components/Common/middleware.js b/javascript/src/components/Common/middleware.js index 6aa2ae5..3e044b1 100644 --- a/javascript/src/components/Common/middleware.js +++ b/javascript/src/components/Common/middleware.js @@ -19,9 +19,6 @@ const Middleware = ({elementName}) => { // rerender in case we do not. useEffect(() => { // XXX We set the environment and tenant globally - console.log('config tenant', config) - console.log('config environment', config) - console.log('hostname', window.location.hostname) setCookie('x-tenant', config.tenant, {path: '/'}); setCookie('x-environment', config.environment, {path: '/'}); }, []); diff --git a/javascript/src/components/Communities/communitiesChart.js b/javascript/src/components/Communities/communitiesChart.js index e6e19ae..988eedc 100644 --- a/javascript/src/components/Communities/communitiesChart.js +++ b/javascript/src/components/Communities/communitiesChart.js @@ -56,7 +56,7 @@ const CommunitiesChart = ({tenenvId}) => { const response = queryClient.refetchQueries([communitiesGroupByKey, {groupBy: selected, params: params}]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(CommunitiesChart.name + " error: " + error) } }, [selected, tenenvId]) diff --git a/javascript/src/components/Communities/communitiesDataTable.js b/javascript/src/components/Communities/communitiesDataTable.js index c6e8b16..a58e6dc 100644 --- a/javascript/src/components/Communities/communitiesDataTable.js +++ b/javascript/src/components/Communities/communitiesDataTable.js @@ -77,7 +77,7 @@ const CommunitiesDataTable = ({tenenvId}) => { queryClient.refetchQueries([minDateCommunitiesKey, {params:{tenenv_id: tenenvId}}]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(CommunitiesDataTable.name + " error: " + error) } }, [groupBy]) diff --git a/javascript/src/components/Communities/communitiesMap.js b/javascript/src/components/Communities/communitiesMap.js index cf723b3..aa74a46 100644 --- a/javascript/src/components/Communities/communitiesMap.js +++ b/javascript/src/components/Communities/communitiesMap.js @@ -66,7 +66,7 @@ const CommunitiesMap = ({tenenvId}) => { }]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(CommunitiesMap.name + " error: " + error) } } diff --git a/javascript/src/components/Dashboard/loginDataTable.js b/javascript/src/components/Dashboard/loginDataTable.js index b34d524..f7ac6ab 100644 --- a/javascript/src/components/Dashboard/loginDataTable.js +++ b/javascript/src/components/Dashboard/loginDataTable.js @@ -88,7 +88,7 @@ const LoginDataTable = ({ queryClient.refetchQueries([minDateLoginsKey, {params:{tenenv_id: tenenvId}}]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(LoginDataTable.name + " error: " + error) } }, [uniqueLogins, groupBy]) diff --git a/javascript/src/components/Dashboard/loginLineChart.js b/javascript/src/components/Dashboard/loginLineChart.js index d005a3a..54d167e 100644 --- a/javascript/src/components/Dashboard/loginLineChart.js +++ b/javascript/src/components/Dashboard/loginLineChart.js @@ -53,7 +53,7 @@ const LoginLineChart = ({ const response = queryClient.refetchQueries([loginsGroupByDayKey, params]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(LoginLineChart.name + " error: " + error) } }, [uniqueLogins]) diff --git a/javascript/src/components/Idps/idpMapToDataTable.js b/javascript/src/components/Idps/idpMapToDataTable.js index 7f2c435..25b636a 100644 --- a/javascript/src/components/Idps/idpMapToDataTable.js +++ b/javascript/src/components/Idps/idpMapToDataTable.js @@ -58,7 +58,7 @@ const IdpMapToDataTable = ({ const response = queryClient.refetchQueries([loginsPerCountryKey, params]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(IdpMapToDataTable.name + " error: " + error) } }, [uniqueLogins]) diff --git a/javascript/src/components/Idps/idpsDataTable.js b/javascript/src/components/Idps/idpsDataTable.js index 13b0154..c2bc8ed 100644 --- a/javascript/src/components/Idps/idpsDataTable.js +++ b/javascript/src/components/Idps/idpsDataTable.js @@ -82,7 +82,7 @@ const IdpsDataTable = ({ queryClient.refetchQueries([minDateLoginsKey, {params:{tenenv_id: tenenvId}}]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(IdpsDataTable.name + " error: " + error) } }, [uniqueLogins, btnPressed]) diff --git a/javascript/src/components/Sps/spsDataTable.js b/javascript/src/components/Sps/spsDataTable.js index 73f5bd2..b055335 100644 --- a/javascript/src/components/Sps/spsDataTable.js +++ b/javascript/src/components/Sps/spsDataTable.js @@ -80,7 +80,7 @@ const SpsDataTable = ({ queryClient.refetchQueries([minDateLoginsKey, {params:{tenenv_id: tenenvId}}]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(SpsDataTable.name + " error: " + error) } }, [uniqueLogins, btnPressed]) diff --git a/javascript/src/components/Users/registeredUsersChart.js b/javascript/src/components/Users/registeredUsersChart.js index d85c6f8..d903b67 100644 --- a/javascript/src/components/Users/registeredUsersChart.js +++ b/javascript/src/components/Users/registeredUsersChart.js @@ -55,7 +55,7 @@ const RegisteredUsersChart = ({ const response = queryClient.refetchQueries([registeredUsersGroupByKey, {groupBy: selected, params: params}]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.error(RegisteredUsersChart.name + " error: " + error) } }, [selected, tenenvId]) diff --git a/javascript/src/components/Users/registeredUsersDataTable.js b/javascript/src/components/Users/registeredUsersDataTable.js index a003360..f10ffb0 100644 --- a/javascript/src/components/Users/registeredUsersDataTable.js +++ b/javascript/src/components/Users/registeredUsersDataTable.js @@ -83,7 +83,7 @@ const RegisteredUsersDataTable = ({ queryClient.refetchQueries([minDateRegisteredUsersKey, {params:{tenenv_id: tenenvId}}]) } catch (error) { // todo: Here we can handle any authentication or authorization errors - console.log(error) + console.log(RegisteredUsersDataTable.name + " error: " + error) } }, [groupBy]) diff --git a/javascript/src/components/Users/registeredUsersMap.js b/javascript/src/components/Users/registeredUsersMap.js index 085c397..f2525fd 100644 --- a/javascript/src/components/Users/registeredUsersMap.js +++ b/javascript/src/components/Users/registeredUsersMap.js @@ -38,7 +38,7 @@ const RegisteredUsersMap = ({ try { var response = queryClient.refetchQueries([registeredUsersByCountryKey, params]) } catch (error) { - console.log(error) + console.error(RegisteredUsersMap.name + " error: " + error) } }, [startDate, endDate, tenenvId]) diff --git a/javascript/src/utils/api/index.js b/javascript/src/utils/api/index.js index 504afec..420c753 100644 --- a/javascript/src/utils/api/index.js +++ b/javascript/src/utils/api/index.js @@ -32,7 +32,7 @@ const deleteCookie = (name, path, domain) => { } const handleError = (error) => { - console.log('error', error) + console.error('API::index.js::' + handleError.name + ' error', error) if (error?.response?.status == 401 && error?.response?.headers?.['x-authenticated'] == "false" && error?.response?.headers?.['x-redirect'] == "true" diff --git a/javascript/src/utils/queries/index.js b/javascript/src/utils/queries/index.js index 72381e2..e616170 100644 --- a/javascript/src/utils/queries/index.js +++ b/javascript/src/utils/queries/index.js @@ -12,7 +12,7 @@ export const getTenenv = async ({queryKey}) => { const response = await apiClient.get("tenenv/" + params.tenantId + "/" + params.environment) return response.data } catch (error) { - console.log('error', error) + console.error(getTenenv.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -26,7 +26,7 @@ export const getLoginsPerSP = async ({queryKey}) => { const response = await apiClient.get("logins_per_sp", params) return response.data } catch (error) { - console.log('error', error) + console.error(getLoginsPerSP.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -39,7 +39,7 @@ export const getLoginsPerIdp = async ({queryKey}) => { const response = await apiClient.get("logins_per_idp", params) return response.data } catch (error) { - console.log('error', error) + console.error(getLoginsPerIdp.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -52,7 +52,7 @@ export const getLoginsPerCountry = async ({queryKey}) => { const response = await apiClient.get("logins_per_country", params) return response.data } catch (error) { - console.log('error', error) + console.error(getLoginsPerCountry.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -65,7 +65,7 @@ export const getMinDateLogins = async ({queryKey}) => { const response = await apiClient.get("min_date_logins", params) return response.data } catch (error) { - console.log('error', error) + console.error(getMinDateLogins.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -78,7 +78,7 @@ export const getMinDateCommunities = async ({queryKey}) => { const response = await apiClient.get("min_date_communities", params) return response.data } catch (error) { - console.log('error', error) + console.error(getMinDateCommunities.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -91,7 +91,7 @@ export const getMinDateRegisteredUsers = async ({queryKey}) => { const response = await apiClient.get("min_date_registered_users", params) return response.data } catch (error) { - console.log('error', error) + console.error(getMinDateRegisteredUsers.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -104,7 +104,7 @@ export const getLoginsGroupByDay = async ({queryKey}) => { const response = await apiClient.get("logins_groupby/day", params) return response.data } catch (error) { - console.log('error', error) + console.error(getLoginsGroupByDay.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -117,7 +117,7 @@ export const getLoginsCountBy = async ({queryKey}) => { const response = await apiClient.get("logins_countby", params) return response.data } catch (error) { - console.log('error', error) + console.error(getLoginsCountBy.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -131,7 +131,7 @@ export const getIdps = async ({queryKey}) => { const response = await apiClient.get("idps", params) return response.data } catch (error) { - console.log('error', error) + console.error(getIdps.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -144,7 +144,7 @@ export const getSps = async ({queryKey}) => { const response = await apiClient.get("sps", params) return response.data } catch (error) { - console.log('error', error) + console.error(getSps.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -158,7 +158,7 @@ export const getRegisteredUsersCountby = async ({queryKey}) => { const response = await apiClient.get("registered_users_countby", params) return response.data } catch (error) { - console.log('error', error) + console.error(getRegisteredUsersCountby.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -171,7 +171,7 @@ export const getRegisteredUsersByCountry = async ({queryKey}) => { const response = await apiClient.get("registered_users_country", params) return response.data } catch (error) { - console.log('error', error) + console.error(getRegisteredUsersByCountry.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -185,7 +185,7 @@ export const getCommunities = async ({queryKey}) => { const response = await apiClient.get("communities", params) return response.data } catch (error) { - console.log('error', error) + console.error(getCommunities.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -198,7 +198,7 @@ export const getCommunityMembersByStatus = async ({queryKey}) => { const response = await apiClient.get("members_bystatus", params) return response.data } catch (error) { - console.log('error', error) + console.error(getCommunityMembersByStatus.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -211,7 +211,7 @@ export const getCountryStatsByVo = async ({queryKey}) => { const response = await apiClient.get(`country_stats_by_vo/${params.countryId}`, params) return response.data } catch (error) { - console.log('error', error) + console.error(getCountryStatsByVo.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -226,7 +226,7 @@ export const getCommunitiesGroupBy = async ({queryKey}) => { , params.params) return response.data } catch (error) { - console.log('error', error) + console.error(getCommunitiesGroupBy.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -241,7 +241,7 @@ export const getRegisteredUsersPerCountryGroupBy = async ({queryKey}) => { , params.params) return response.data } catch (error) { - console.log('error', error) + console.error(getRegisteredUsersPerCountryGroupBy.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response @@ -256,7 +256,7 @@ export const getRegisteredUsersGroupBy = async ({queryKey}) => { , params.params) return response.data } catch (error) { - console.log('error', error) + console.error(getRegisteredUsersGroupBy.name + ' error', error) console.log('queryKeys', queryKey) handleError(error) return error.response