9035669643

Committed 10 May 2024 05:08PM UTC coverage: 31.902% (+0.003%) from 31.899%

Build # 9035669643

Build Type

Pull #9193

github

Committed by

Stvad

Commit Message

Merge remote-tracking branch 'upstream/master' into better-defaults-batch

Pull Request Pull Request #9193: New forum setup updates batch #3

Run Details

4764 of 39009 branches covered (12.21%)

Branch coverage included in aggregate %.

22 of 30 new or added lines in 13 files covered. (73.33%)

1 existing line in 1 file now uncovered.

27771 of 62976 relevant lines covered (44.1%)

177.82 hits per line

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

19.61

/packages/lesswrong/components/recentDiscussion/RecentDiscussionFeed.tsx

import React, { useState, useCallback, useRef } from 'react';
import { Components, registerComponent } from '../../lib/vulcan-lib';
import { useCurrentUser } from '../common/withUser';
import { useGlobalKeydown } from '../common/withGlobalKeydown';
import { forumSelect } from '../../lib/forumTypeUtils';
import { AnalyticsContext } from '../../lib/analyticsEvents';
import AddBoxIcon from '@material-ui/icons/AddBox'
import { isLWorAF } from '../../lib/instanceSettings';
import {showSubscribeReminderInFeed} from '../../lib/publicSettings'

const recentDisucssionFeedComponents = forumSelect({
  LWAF: {
    ThreadComponent: Components.RecentDiscussionThread,
    ShortformComponent: Components.RecentDiscussionThread,
    TagCommentedComponent: Components.RecentDiscussionTag,
    TagRevisionComponent: Components.RecentDiscussionTagRevisionItem,
    SubscribeReminderComponent: Components.RecentDiscussionSubscribeReminder,
    MeetupsPokeComponent: Components.RecentDiscussionMeetupsPoke,
  },
  default: {
    ThreadComponent: Components.EARecentDiscussionThread,
    ShortformComponent: Components.EARecentDiscussionQuickTake,
    TagCommentedComponent: Components.EARecentDiscussionTagCommented,
    TagRevisionComponent: Components.EARecentDiscussionTagRevision,
    SubscribeReminderComponent: Components.RecentDiscussionSubscribeReminder,
    MeetupsPokeComponent: () => null,
  },
});

const RecentDiscussionFeed = ({
  commentsLimit, maxAgeHours, af,
  title="Recent Discussion", shortformButton=true
}: {
  commentsLimit?: number,
  maxAgeHours?: number,
  af?: boolean,
  title?: string,
  shortformButton?: boolean,
}) => {
  const [expandAllThreads, setExpandAllThreads] = useState(false);
  const [showShortformFeed, setShowShortformFeed] = useState(false);
  const refetchRef = useRef<null|(() => void)>(null);
  const currentUser = useCurrentUser();
  const expandAll = currentUser?.noCollapseCommentsFrontpage || expandAllThreads

  useGlobalKeydown(event => {
    const F_Key = 70
    if ((event.metaKey || event.ctrlKey) && event.keyCode === F_Key) {
      setExpandAllThreads(true);
    }
  });

  const toggleShortformFeed = useCallback(
    () => {
      setShowShortformFeed(!showShortformFeed);
    },
    [setShowShortformFeed, showShortformFeed]
  );

  const {
    SingleColumnSection,
    SectionTitle,
    MixedTypeFeed,
    AnalyticsInViewTracker,
  } = Components;

  const refetch = useCallback(() => {
    if (refetchRef.current)
      refetchRef.current();
  }, [refetchRef]);

  const {
    ThreadComponent,
    ShortformComponent,
    TagCommentedComponent,
    TagRevisionComponent,
    SubscribeReminderComponent,
    MeetupsPokeComponent,
  } = recentDisucssionFeedComponents;

  return (
    <AnalyticsContext pageSectionContext="recentDiscussion">
      <AnalyticsInViewTracker eventProps={{inViewType: "recentDiscussion"}}>
        <SingleColumnSection>
          <SectionTitle title={title} />
          <MixedTypeFeed
            firstPageSize={10}
            pageSize={20}
            refetchRef={refetchRef}
            resolverName="RecentDiscussionFeed"
            sortKeyType="Date"
            resolverArgs={{ af: 'Boolean' }}
            resolverArgsValues={{ af }}
            fragmentArgs={{
              commentsLimit: 'Int',
              maxAgeHours: 'Int',
              tagCommentsLimit: 'Int',
            }}
            fragmentArgsValues={{
              commentsLimit, maxAgeHours,
              tagCommentsLimit: commentsLimit,
            }}
            renderers={{
              postCommented: {
                fragmentName: "PostsRecentDiscussion",
                render: (post: PostsRecentDiscussion) => (
                  <ThreadComponent
                    post={post}
                    refetch={refetch}
                    comments={post.recentComments}
                    expandAllThreads={expandAll}
                  />
                )
              },
              shortformCommented: {
                fragmentName: "ShortformRecentDiscussion",
                render: (post: ShortformRecentDiscussion) => (
                  <ShortformComponent
                    post={post}
                    refetch={refetch}
                    comments={post.recentComments}
                    expandAllThreads={expandAll}
                  />
                )
              },
              tagDiscussed: {
                fragmentName: "TagRecentDiscussion",
                render: (tag: TagRecentDiscussion) => (
                  <TagCommentedComponent
                    tag={tag}
                    refetch={refetch}
                    comments={tag.recentComments}
                    expandAllThreads={expandAll}
                  />
                )
              },
              tagRevised: {
                fragmentName: "RecentDiscussionRevisionTagFragment",
                render: (revision: RecentDiscussionRevisionTagFragment) => <div>
                  {revision.tag && <TagRevisionComponent
                    tag={revision.tag}
                    revision={revision}
                    headingStyle="full"
                    documentId={revision.documentId}
                  />}
                </div>,
              },
              meetupsPoke: {
                fragmentName: null,
                render: () => <MeetupsPokeComponent />
              },
              ...(showSubscribeReminderInFeed.get() ? {
                subscribeReminder: {
                  fragmentName: null,
                  render: () => <SubscribeReminderComponent/>,
                },
              } : {}),
            }}
          />
        </SingleColumnSection>
      </AnalyticsInViewTracker>
    </AnalyticsContext>
  )
}

const RecentDiscussionFeedComponent = registerComponent('RecentDiscussionFeed', RecentDiscussionFeed, {
  areEqual: "auto",
});

declare global {
  interface ComponentTypes {
    RecentDiscussionFeed: typeof RecentDiscussionFeedComponent,
  }
}

1	import React, { useState, useCallback, useRef } from 'react';	1✔
2	import { Components, registerComponent } from '../../lib/vulcan-lib';	1✔
3	import { useCurrentUser } from '../common/withUser';	1✔
4	import { useGlobalKeydown } from '../common/withGlobalKeydown';	1✔
5	import { forumSelect } from '../../lib/forumTypeUtils';	1✔
6	import { AnalyticsContext } from '../../lib/analyticsEvents';	1✔
7	import AddBoxIcon from '@material-ui/icons/AddBox'
8	import { isLWorAF } from '../../lib/instanceSettings';
9	import {showSubscribeReminderInFeed} from '../../lib/publicSettings'	1✔
10
11	const recentDisucssionFeedComponents = forumSelect({	1✔
12	LWAF: {
13	ThreadComponent: Components.RecentDiscussionThread,
14	ShortformComponent: Components.RecentDiscussionThread,
15	TagCommentedComponent: Components.RecentDiscussionTag,
16	TagRevisionComponent: Components.RecentDiscussionTagRevisionItem,
17	SubscribeReminderComponent: Components.RecentDiscussionSubscribeReminder,
18	MeetupsPokeComponent: Components.RecentDiscussionMeetupsPoke,
19	},
20	default: {
21	ThreadComponent: Components.EARecentDiscussionThread,
22	ShortformComponent: Components.EARecentDiscussionQuickTake,
23	TagCommentedComponent: Components.EARecentDiscussionTagCommented,
24	TagRevisionComponent: Components.EARecentDiscussionTagRevision,
25	SubscribeReminderComponent: Components.RecentDiscussionSubscribeReminder,
26	MeetupsPokeComponent: () => null,	×
27	},
28	});
29
30	const RecentDiscussionFeed = ({	1✔
31	commentsLimit, maxAgeHours, af,
32	title="Recent Discussion", shortformButton=true	×
33	}: {
34	commentsLimit?: number,
35	maxAgeHours?: number,
36	af?: boolean,
37	title?: string,
38	shortformButton?: boolean,
39	}) => {
40	const [expandAllThreads, setExpandAllThreads] = useState(false);	×
41	const [showShortformFeed, setShowShortformFeed] = useState(false);	×
42	const refetchRef = useRef<null\|(() => void)>(null);	×
43	const currentUser = useCurrentUser();	×
44	const expandAll = currentUser?.noCollapseCommentsFrontpage \|\| expandAllThreads	×
45
46	useGlobalKeydown(event => {	×
47	const F_Key = 70	×
48	if ((event.metaKey \|\| event.ctrlKey) && event.keyCode === F_Key) {	×
49	setExpandAllThreads(true);	×
50	}
51	});
52
53	const toggleShortformFeed = useCallback(	×
54	() => {
55	setShowShortformFeed(!showShortformFeed);	×
56	},
57	[setShowShortformFeed, showShortformFeed]
58	);
59
60	const {
61	SingleColumnSection,
62	SectionTitle,
63	MixedTypeFeed,
64	AnalyticsInViewTracker,
65	} = Components;	×
66
67	const refetch = useCallback(() => {	×
68	if (refetchRef.current)	×
69	refetchRef.current();	×
70	}, [refetchRef]);
71
72	const {
73	ThreadComponent,
74	ShortformComponent,
75	TagCommentedComponent,
76	TagRevisionComponent,
77	SubscribeReminderComponent,
78	MeetupsPokeComponent,
79	} = recentDisucssionFeedComponents;	×
80
81	return (	×
82	<AnalyticsContext pageSectionContext="recentDiscussion">
83	<AnalyticsInViewTracker eventProps={{inViewType: "recentDiscussion"}}>
84	<SingleColumnSection>
85	<SectionTitle title={title} />
86	<MixedTypeFeed
87	firstPageSize={10}
88	pageSize={20}
89	refetchRef={refetchRef}
90	resolverName="RecentDiscussionFeed"
91	sortKeyType="Date"
92	resolverArgs={{ af: 'Boolean' }}
93	resolverArgsValues={{ af }}
94	fragmentArgs={{
95	commentsLimit: 'Int',
96	maxAgeHours: 'Int',
97	tagCommentsLimit: 'Int',
98	}}
99	fragmentArgsValues={{
100	commentsLimit, maxAgeHours,
101	tagCommentsLimit: commentsLimit,
102	}}
103	renderers={{
104	postCommented: {
105	fragmentName: "PostsRecentDiscussion",
106	render: (post: PostsRecentDiscussion) => (
107	<ThreadComponent	×
108	post={post}
109	refetch={refetch}
110	comments={post.recentComments}
111	expandAllThreads={expandAll}
112	/>
113	)
114	},
115	shortformCommented: {
116	fragmentName: "ShortformRecentDiscussion",
117	render: (post: ShortformRecentDiscussion) => (
118	<ShortformComponent	×
119	post={post}
120	refetch={refetch}
121	comments={post.recentComments}
122	expandAllThreads={expandAll}
123	/>
124	)
125	},
126	tagDiscussed: {
127	fragmentName: "TagRecentDiscussion",
128	render: (tag: TagRecentDiscussion) => (
129	<TagCommentedComponent	×
130	tag={tag}
131	refetch={refetch}
132	comments={tag.recentComments}
133	expandAllThreads={expandAll}
134	/>
135	)
136	},
137	tagRevised: {
138	fragmentName: "RecentDiscussionRevisionTagFragment",
139	render: (revision: RecentDiscussionRevisionTagFragment) => <div>	×
140	{revision.tag && <TagRevisionComponent	×
141	tag={revision.tag}
142	revision={revision}
143	headingStyle="full"
144	documentId={revision.documentId}
145	/>}
146	</div>,
147	},
148	meetupsPoke: {
149	fragmentName: null,
150	render: () => <MeetupsPokeComponent />	×
151	},
152	...(showSubscribeReminderInFeed.get() ? {	×
153	subscribeReminder: {
154	fragmentName: null,
NEW 155	render: () => <SubscribeReminderComponent/>,	×
156	},
157	} : {}),
158	}}
159	/>
160	</SingleColumnSection>
161	</AnalyticsInViewTracker>
162	</AnalyticsContext>
163	)
164	}
165
166	const RecentDiscussionFeedComponent = registerComponent('RecentDiscussionFeed', RecentDiscussionFeed, {	1✔
167	areEqual: "auto",
168	});
169
170	declare global {
171	interface ComponentTypes {
172	RecentDiscussionFeed: typeof RecentDiscussionFeedComponent,
173	}
174	}

ForumMagnum / ForumMagnum / 9035669643

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