10650421536

Committed 01 Sep 2024 02:54AM UTC coverage: 31.882% (-0.03%) from 31.915%

Build # 10650421536

Build Type

Pull #9335

github

Committed by

jimrandomh

Commit Message

Hopefully fix an import-order issue in integration tests

Pull Request Pull Request #9335: Uninvert control flow with callbacks

Run Details

5022 of 41113 branches covered (12.22%)

Branch coverage included in aggregate %.

133 of 209 new or added lines in 23 files covered. (63.64%)

10 existing lines in 7 files now uncovered.

29324 of 66616 relevant lines covered (44.02%)

187.37 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

20.59

/packages/lesswrong/components/vulcan-core/App.tsx

import React, { useEffect, useRef } from 'react';
import moment from 'moment';
import { DatabasePublicSetting, localeSetting } from '../../lib/publicSettings';
import { Components, registerComponent } from '../../lib/vulcan-lib';
import { EnvironmentOverride, EnvironmentOverrideContext } from '../../lib/utils/timeUtil';
// eslint-disable-next-line no-restricted-imports
import { useLocation, withRouter } from 'react-router';
import { useQueryCurrentUser } from '../../lib/crud/withCurrentUser';
import {
  LocationContext,
  parseRoute,
  ServerRequestStatusContext,
  SubscribeLocationContext,
  ServerRequestStatusContextType,
  NavigationContext,
  checkUserRouteAccess,
} from '../../lib/vulcan-core/appContext'
import type { RouterLocation } from '../../lib/vulcan-lib/routes';
import { MessageContextProvider } from '../common/FlashMessages';
import type { History } from 'history'
import { RefetchCurrentUserContext } from '../common/withUser';

export const siteImageSetting = new DatabasePublicSetting<string>('siteImage', 'https://res.cloudinary.com/lesswrong-2-0/image/upload/v1654295382/new_mississippi_river_fjdmww.jpg') // An image used to represent the site on social media

interface ExternalProps {
  apolloClient: AnyBecauseTodo,
  serverRequestStatus?: ServerRequestStatusContextType,
  envOverride: EnvironmentOverride,
}

const App = ({serverRequestStatus, envOverride, history}: ExternalProps & {
  history: History
}) => {
  const {currentUser, refetchCurrentUser, currentUserLoading} = useQueryCurrentUser();
  const reactDomLocation = useLocation();
  const locationContext = useRef<RouterLocation | null>(null);
  const subscribeLocationContext = useRef<RouterLocation | null>(null);
  const navigationContext = useRef<{ history: History<unknown> } | null>();

  const locale = localeSetting.get();

  useEffect(() => {
    if (!bundleIsServer) {
      const { onUserChanged } = require('@/client/logging');
      onUserChanged(currentUser);
    }
    moment.locale(locale);
  }, [currentUser, locale]);

  useEffect(() => {
    if (!bundleIsServer) {
      const { onUserChanged } = require('@/client/logging');
      onUserChanged(currentUser);
    }
  // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [currentUser?._id]);

  // Parse the location into a route/params/query/etc.
  const location = checkUserRouteAccess(currentUser, parseRoute({location: reactDomLocation}));
  
  if (location.redirected) {
    return (
      <Components.PermanentRedirect url={location.url} />
    );
  }

  // Reuse the container objects for location and navigation context, so that
  // they will be reference-stable and won't trigger spurious rerenders.
  if (!locationContext.current) {
    locationContext.current = {...location};
  } else {
    Object.assign(locationContext.current, location);
  }
  
  if (!navigationContext.current) {
    navigationContext.current = { history };
  } else {
    navigationContext.current.history = history;
  }

  // subscribeLocationContext changes (by shallow comparison) whenever the
  // URL changes.
  // FIXME: Also needs to include changes to hash and to query params
  if (!subscribeLocationContext.current ||
    subscribeLocationContext.current.pathname !== location.pathname ||
    JSON.stringify(subscribeLocationContext.current.query) !== JSON.stringify(location.query) ||
    subscribeLocationContext.current.hash !== location.hash
  ) {
    subscribeLocationContext.current = {...location};
  } else {
    Object.assign(subscribeLocationContext.current, location);
  }

  // If logged in but waiting for currentUser to load, don't render stuff.
  // (Otherwise the logged-in SSR winds up doing the queries for, and sending
  // an Apollo cache containing the results of, the union of both logged-in
  // and logged-out views.)
  if (currentUserLoading && !currentUser) {
    return (
      <Components.Loading />
    );
  }

  return (
    <LocationContext.Provider value={locationContext.current}>
    <NavigationContext.Provider value={navigationContext.current}>
    <SubscribeLocationContext.Provider value={subscribeLocationContext.current}>
    <ServerRequestStatusContext.Provider value={serverRequestStatus||null}>
    <EnvironmentOverrideContext.Provider value={envOverride}>
    <RefetchCurrentUserContext.Provider value={refetchCurrentUser}>
      <MessageContextProvider>
        <Components.HeadTags image={siteImageSetting.get()} />
        <Components.ScrollToTop />
        <Components.Layout currentUser={currentUser}>
          <location.RouteComponent />
        </Components.Layout>
      </MessageContextProvider>
    </RefetchCurrentUserContext.Provider>
    </EnvironmentOverrideContext.Provider>
    </ServerRequestStatusContext.Provider>
    </SubscribeLocationContext.Provider>
    </NavigationContext.Provider>
    </LocationContext.Provider>
  );
}

const AppComponent = registerComponent<ExternalProps>('App', App, {
  hocs: [withRouter],
});

declare global {
  interface ComponentTypes {
    App: typeof AppComponent
  }
}

export default App;

1	import React, { useEffect, useRef } from 'react';	3✔
2	import moment from 'moment';	1✔
3	import { DatabasePublicSetting, localeSetting } from '../../lib/publicSettings';	1✔
4	import { Components, registerComponent } from '../../lib/vulcan-lib';	1✔
5	import { EnvironmentOverride, EnvironmentOverrideContext } from '../../lib/utils/timeUtil';	1✔
6	// eslint-disable-next-line no-restricted-imports
7	import { useLocation, withRouter } from 'react-router';	1✔
8	import { useQueryCurrentUser } from '../../lib/crud/withCurrentUser';	1✔
9	import {
10	LocationContext,
11	parseRoute,
12	ServerRequestStatusContext,
13	SubscribeLocationContext,
14	ServerRequestStatusContextType,
15	NavigationContext,
16	checkUserRouteAccess,
17	} from '../../lib/vulcan-core/appContext'	1✔
18	import type { RouterLocation } from '../../lib/vulcan-lib/routes';
19	import { MessageContextProvider } from '../common/FlashMessages';	1✔
20	import type { History } from 'history'
21	import { RefetchCurrentUserContext } from '../common/withUser';	1✔
22
23	export const siteImageSetting = new DatabasePublicSetting<string>('siteImage', 'https://res.cloudinary.com/lesswrong-2-0/image/upload/v1654295382/new_mississippi_river_fjdmww.jpg') // An image used to represent the site on social media	1✔
24
25	interface ExternalProps {
26	apolloClient: AnyBecauseTodo,
27	serverRequestStatus?: ServerRequestStatusContextType,
28	envOverride: EnvironmentOverride,
29	}
30
31	const App = ({serverRequestStatus, envOverride, history}: ExternalProps & {	1✔
32	history: History
33	}) => {
34	const {currentUser, refetchCurrentUser, currentUserLoading} = useQueryCurrentUser();	×
35	const reactDomLocation = useLocation();	×
36	const locationContext = useRef<RouterLocation \| null>(null);	×
37	const subscribeLocationContext = useRef<RouterLocation \| null>(null);	×
38	const navigationContext = useRef<{ history: History<unknown> } \| null>();	×
39
40	const locale = localeSetting.get();	×
41
42	useEffect(() => {	×
NEW 43	if (!bundleIsServer) {	×
NEW 44	const { onUserChanged } = require('@/client/logging');	×
NEW 45	onUserChanged(currentUser);	×
46	}
UNCOV 47	moment.locale(locale);	×
48	}, [currentUser, locale]);
49
50	useEffect(() => {	×
NEW 51	if (!bundleIsServer) {	×
NEW 52	const { onUserChanged } = require('@/client/logging');	×
NEW 53	onUserChanged(currentUser);	×
54	}
55	// eslint-disable-next-line react-hooks/exhaustive-deps
56	}, [currentUser?._id]);	×
57
58	// Parse the location into a route/params/query/etc.
59	const location = checkUserRouteAccess(currentUser, parseRoute({location: reactDomLocation}));	×
60
61	if (location.redirected) {	×
62	return (	×
63	<Components.PermanentRedirect url={location.url} />
64	);
65	}
66
67	// Reuse the container objects for location and navigation context, so that
68	// they will be reference-stable and won't trigger spurious rerenders.
69	if (!locationContext.current) {	×
70	locationContext.current = {...location};	×
71	} else {
72	Object.assign(locationContext.current, location);	×
73	}
74
75	if (!navigationContext.current) {	×
76	navigationContext.current = { history };	×
77	} else {
78	navigationContext.current.history = history;	×
79	}
80
81	// subscribeLocationContext changes (by shallow comparison) whenever the
82	// URL changes.
83	// FIXME: Also needs to include changes to hash and to query params
84	if (!subscribeLocationContext.current \|\|	×
85	subscribeLocationContext.current.pathname !== location.pathname \|\|
86	JSON.stringify(subscribeLocationContext.current.query) !== JSON.stringify(location.query) \|\|
87	subscribeLocationContext.current.hash !== location.hash
88	) {
89	subscribeLocationContext.current = {...location};	×
90	} else {
91	Object.assign(subscribeLocationContext.current, location);	×
92	}
93
94	// If logged in but waiting for currentUser to load, don't render stuff.
95	// (Otherwise the logged-in SSR winds up doing the queries for, and sending
96	// an Apollo cache containing the results of, the union of both logged-in
97	// and logged-out views.)
98	if (currentUserLoading && !currentUser) {	×
99	return (	×
100	<Components.Loading />
101	);
102	}
103
104	return (	×
105	<LocationContext.Provider value={locationContext.current}>
106	<NavigationContext.Provider value={navigationContext.current}>
107	<SubscribeLocationContext.Provider value={subscribeLocationContext.current}>
108	<ServerRequestStatusContext.Provider value={serverRequestStatus\|\|null}>	×
109	<EnvironmentOverrideContext.Provider value={envOverride}>
110	<RefetchCurrentUserContext.Provider value={refetchCurrentUser}>
111	<MessageContextProvider>
112	<Components.HeadTags image={siteImageSetting.get()} />
113	<Components.ScrollToTop />
114	<Components.Layout currentUser={currentUser}>
115	<location.RouteComponent />
116	</Components.Layout>
117	</MessageContextProvider>
118	</RefetchCurrentUserContext.Provider>
119	</EnvironmentOverrideContext.Provider>
120	</ServerRequestStatusContext.Provider>
121	</SubscribeLocationContext.Provider>
122	</NavigationContext.Provider>
123	</LocationContext.Provider>
124	);
125	}
126
127	const AppComponent = registerComponent<ExternalProps>('App', App, {	1✔
128	hocs: [withRouter],
129	});
130
131	declare global {
132	interface ComponentTypes {
133	App: typeof AppComponent
134	}
135	}
136
137	export default App;	1✔

ForumMagnum / ForumMagnum / 10650421536

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous