coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: GA should load on public share pages, closes #1992

Browse Source
This commit is contained in:
Tom Moor
2021-03-29 22:02:38 -07:00
parent 8599b60a6c
commit ae57cdea2a
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/Layout.js
View File

@ -21,7 +21,6 @@ import PoliciesStore from "stores/PoliciesStore";
import UiStore from "stores/UiStore"; import UiStore from "stores/UiStore";
import ErrorSuspended from "scenes/ErrorSuspended"; import ErrorSuspended from "scenes/ErrorSuspended";
import KeyboardShortcuts from "scenes/KeyboardShortcuts"; import KeyboardShortcuts from "scenes/KeyboardShortcuts";
import Analytics from "components/Analytics";
import Button from "components/Button"; import Button from "components/Button";
import DocumentHistory from "components/DocumentHistory"; import DocumentHistory from "components/DocumentHistory";
import Flex from "components/Flex"; import Flex from "components/Flex";
@ -121,7 +120,6 @@ class Layout extends React.Component<Props> {
/> />
</Helmet> </Helmet>
<SkipNavLink /> <SkipNavLink />
<Analytics />
{this.props.ui.progressBarVisible && <LoadingIndicatorBar />} {this.props.ui.progressBarVisible && <LoadingIndicatorBar />}
{this.props.notifications} {this.props.notifications}

29
app/index.js
View File

@ -7,6 +7,7 @@ import { render } from "react-dom";
import { Router } from "react-router-dom"; import { Router } from "react-router-dom";
import { initI18n } from "shared/i18n"; import { initI18n } from "shared/i18n";
import stores from "stores"; import stores from "stores";
import Analytics from "components/Analytics";
import ErrorBoundary from "components/ErrorBoundary"; import ErrorBoundary from "components/ErrorBoundary";
import PageTheme from "components/PageTheme"; import PageTheme from "components/PageTheme";
import ScrollToTop from "components/ScrollToTop"; import ScrollToTop from "components/ScrollToTop";
@ -43,19 +44,21 @@ if ("serviceWorker" in window.navigator) {
if (element) { if (element) {
render( render(
<Provider {...stores}> <Provider {...stores}>
<Theme> <Analytics>
<ErrorBoundary> <Theme>
<Router history={history}> <ErrorBoundary>
<> <Router history={history}>
<PageTheme /> <>
<ScrollToTop> <PageTheme />
<Routes /> <ScrollToTop>
</ScrollToTop> <Routes />
<Toasts /> </ScrollToTop>
</> <Toasts />
</Router> </>
</ErrorBoundary> </Router>
</Theme> </ErrorBoundary>
</Theme>
</Analytics>
</Provider>, </Provider>,
element element
); );