Merge pull request #727 from slumbering/fixe-amplitude

rewrite useEffect + use location props
This commit is contained in:
Andrea Luzzardi 2021-06-25 18:28:04 +02:00 committed by GitHub
commit 4ecced99fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -148,17 +148,16 @@ function DocPage(props) {
if (typeof window !== "undefined") return JSON.parse(window.localStorage.getItem('user')) if (typeof window !== "undefined") return JSON.parse(window.localStorage.getItem('user'))
})()) })())
useEffect(async () => { useEffect(async () => {
if (!isEmpty(authQuery) && userAccessStatus === null) { //callback after successful auth with github if (!isEmpty(authQuery) && userAccessStatus === null) { //callback after successful auth with github
const user = await checkUserCollaboratorStatus(authQuery.code); const user = await checkUserCollaboratorStatus(authQuery.code);
if (user?.permission) { if (user?.permission) {
setUserAccessStatus(user?.permission) setUserAccessStatus(user)
if (typeof window !== "undefined") window.localStorage.setItem('user', JSON.stringify(user)); if (typeof window !== "undefined") window.localStorage.setItem('user', JSON.stringify(user));
} }
} }
setIsLoading(false) setIsLoading(false)
}, [userAccessStatus]) }, [])
useEffect(() => { useEffect(() => {
import('amplitude-js').then(amplitude => { import('amplitude-js').then(amplitude => {
@ -166,10 +165,10 @@ function DocPage(props) {
var amplitudeInstance = amplitude.getInstance().init(process.env.REACT_APP_AMPLITUDE_ID, userAccessStatus?.login.toLowerCase(), { var amplitudeInstance = amplitude.getInstance().init(process.env.REACT_APP_AMPLITUDE_ID, userAccessStatus?.login.toLowerCase(), {
apiEndpoint: `${window.location.hostname}/t` apiEndpoint: `${window.location.hostname}/t`
}); });
amplitude.getInstance().logEvent('Docs Viewed', { "hostname": window.location.hostname, "path": window.location.pathname }); amplitude.getInstance().logEvent('Docs Viewed', { "hostname": window.location.hostname, "path": location.pathname });
} }
}) })
}, [(typeof window !== "undefined" && window.location.pathname)]) }, [location.pathname, userAccessStatus])
if (isLoading) return <Spinner /> if (isLoading) return <Spinner />