Skip to content

Commit

Permalink
Merge pull request #31 from rciam/develop
Browse files Browse the repository at this point in the history
improve frontend error logs
  • Loading branch information
ioigoume authored Oct 24, 2023
2 parents 693ec81 + c3fd112 commit d7cd641
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 34 deletions.
3 changes: 0 additions & 3 deletions javascript/src/components/Common/middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '/'});
}, []);
Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Communities/communitiesChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Communities/communitiesMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Dashboard/loginDataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Dashboard/loginLineChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Idps/idpMapToDataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Idps/idpsDataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Sps/spsDataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Users/registeredUsersChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
2 changes: 1 addition & 1 deletion javascript/src/components/Users/registeredUsersMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
2 changes: 1 addition & 1 deletion javascript/src/utils/api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
38 changes: 19 additions & 19 deletions javascript/src/utils/queries/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit d7cd641

Please sign in to comment.