9472509084

Committed 11 Jun 2024 08:40PM UTC coverage: 31.985% (+0.1%) from 31.868%

Build # 9472509084

Build Type

Pull #9389

github

Committed by

b0b3rt

Commit Message

fix missing negation

Pull Request Pull Request #9389: Further Subscribed Tab Improvements, 2024-06-11

Run Details

3803 of 31555 branches covered (12.05%)

Branch coverage included in aggregate %.

2 of 14 new or added lines in 2 files covered. (14.29%)

58 existing lines in 3 files now uncovered.

22671 of 51216 relevant lines covered (44.27%)

223.5 hits per line

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

17.48

/packages/lesswrong/components/users/ViewSubscriptionsPage.tsx

import React, {ReactNode} from 'react';
import { Components, registerComponent } from '../../lib/vulcan-lib';
import { useSingle } from '../../lib/crud/withSingle';
import { useMulti } from '../../lib/crud/withMulti';
import { useCurrentUser } from '../common/withUser';
import { Link } from '../../lib/reactRouterWrapper';
import { commentGetPageUrlFromIds } from '../../lib/collections/comments/helpers';
import { tagGetUrl } from '../../lib/collections/tags/helpers';
import { allowSubscribeToSequencePosts, allowSubscribeToUserComments, userHasSubscribeTabFeed } from '../../lib/betas';
import { sequenceGetPageUrl } from '../../lib/collections/sequences/helpers';
import { isLW } from '../../lib/instanceSettings';

const styles = (theme: ThemeType): JssStyles => ({
  subscribedItem: {
    display: "flex",
    ...theme.typography.commentStyle
  },
  subscribedItemDescription: {
    flexGrow: 1,
  },
});

const SubscriptionsList = ({collectionName, fragmentName, subscriptionType, noSubscriptionsMessage, renderDocument, title, classes}: {
  collectionName: CollectionNameString,
  fragmentName: keyof FragmentTypes,
  subscriptionType: string,
  noSubscriptionsMessage: string,
  renderDocument: (document: any) => ReactNode,
  title: React.ReactNode,
  classes: ClassesType,
}) => {
  const { SubscribedItem, SectionTitle, Loading, LoadMore } = Components;
  const currentUser = useCurrentUser();
  
  const { results, loading, loadMoreProps, showLoadMore } = useMulti({
    terms: {
      view: "subscriptionsOfType",
      userId: currentUser?._id,
      collectionName: collectionName,
      subscriptionType: subscriptionType,
      limit: 50
    },
    collectionName: "Subscriptions",
    fragmentName: "SubscriptionState",
  });
  
  if (!currentUser)
    return null;
  if (loading)
    return <Loading/>
  if (!results)
    return null;
  
  return <div>
    <SectionTitle title={title}/>
    {results.map(result =>
      <SubscribedItem
        key={result._id}
        collectionName={collectionName}
        fragmentName={fragmentName}
        subscription={result}
        renderDocument={renderDocument}
      />
    )}
    {results.length===0 && <div className={classes.subscribedItem}>
      {noSubscriptionsMessage}
    </div>}
    {showLoadMore && <LoadMore {...loadMoreProps} />}
  </div>
}

const SubscriptionsListComponent = registerComponent("SubscriptionsList", SubscriptionsList, {styles});

declare global {
  interface ComponentTypes {
    SubscriptionsList: typeof SubscriptionsListComponent
  }
}

const SubscribedItem = ({collectionName, fragmentName, subscription, renderDocument, classes}: {
  collectionName: CollectionNameString,
  fragmentName: keyof FragmentTypes,
  subscription: SubscriptionState,
  renderDocument: (document: any) => ReactNode,
  classes: ClassesType,
}) => {
  const { Loading, NotifyMeButton } = Components;
  const { document, loading } = useSingle({
    documentId: subscription.documentId,
    collectionName, fragmentName,
  });
  
  if (!document && !loading) return null
  if (loading) return <Loading/>
  
  return <div className={classes.subscribedItem}>
    <div className={classes.subscribedItemDescription}>
    {renderDocument(document)}
    </div>
    <NotifyMeButton
      document={document}
      subscriptionType={subscription.type}
      subscribeMessage="Resubscribe"
      unsubscribeMessage="Unsubscribe"
    />
  </div>
  
}

const SubscribedItemComponent = registerComponent("SubscribedItem", SubscribedItem, {styles});

declare global {
  interface ComponentTypes {
    SubscribedItem: typeof SubscribedItemComponent
  }
}

const ViewSubscriptionsPage = ({classes}: {
  classes: ClassesType,
}) => {
  const { SingleColumnSection, SubscriptionsList, UsersNameDisplay } = Components;
  const currentUser = useCurrentUser();
  
  if (!currentUser) {
    return <SingleColumnSection>
      Log in to manage your subscriptions.
    </SingleColumnSection>;
  }
  
  return <SingleColumnSection>
    {userHasSubscribeTabFeed(currentUser) && <SubscriptionsList
      title="Subscribed to Users for Subscribed Activity Feed"
      collectionName="Users"
      subscriptionType="newActivityForFeed"
      fragmentName="UsersMinimumInfo"
      renderDocument={(user: UsersMinimumInfo) => <UsersNameDisplay user={user}/>}
      noSubscriptionsMessage="You are not subscribed to any users on your Subscribed Feed."
    />}
    <SubscriptionsList
      title="Subscribed to Posts By Users"
      collectionName="Users"
      subscriptionType="newPosts"
      fragmentName="UsersMinimumInfo"
      renderDocument={(user: UsersMinimumInfo) => <UsersNameDisplay user={user}/>}
      noSubscriptionsMessage="You are not subscribed to any users' posts."
    />
    {allowSubscribeToUserComments && <SubscriptionsList
      title="Subscribed to All Comments By Users"
      collectionName="Users"
      subscriptionType="newUserComments"
      fragmentName="UsersMinimumInfo"
      renderDocument={(user: UsersMinimumInfo) => <UsersNameDisplay user={user}/>}
      noSubscriptionsMessage="You are not subscribed to any users' comments."
    />}
    
    <SubscriptionsList
      title="Subscribed to Comments on Posts"
      collectionName="Posts"
      subscriptionType="newComments"
      fragmentName="PostsList"
      renderDocument={(post: PostsList) => post.title}
      noSubscriptionsMessage="You are not subscribed to comments on any posts."
    />

    <SubscriptionsList
      title="Subscribed to Dialogues (as a reader)"
      collectionName="Posts"
      subscriptionType="newPublishedDialogueMessages"
      fragmentName="PostsList"
      renderDocument={(post: PostsList) => post.title}
      noSubscriptionsMessage="You are not subscribed to any dialogues as a reader."
    />

    <SubscriptionsList
      title="Subscribed to Dialogues (as a participant)"
      collectionName="Posts"
      subscriptionType="newDialogueMessages"
      fragmentName="PostsList"
      renderDocument={(post: PostsList) => post.title}
      noSubscriptionsMessage="You are not subscribed to any dialogues as a participant."
    />
  
    {isLW && <SubscriptionsList
      title="Subscribed to Old-Style Dialogues (as a reader)"
      collectionName="Posts"
      subscriptionType="newDebateComments"
      fragmentName="PostsList"
      renderDocument={(post: PostsList) => post.title}
      noSubscriptionsMessage="You are not subscribed to any dialogues as a reader."
    />}
  
    <SubscriptionsList
      title="Subscribed to Old-Style dialogues (as a participant)"
      collectionName="Posts"
      subscriptionType="newDebateReplies"
      fragmentName="PostsList"
      renderDocument={(post: PostsList) => post.title}
      noSubscriptionsMessage="You are not subscribed to any dialogues as a participant."
    />

    <SubscriptionsList
      title="Subscribed to Comment Replies"
      collectionName="Comments"
      subscriptionType="newReplies"
      fragmentName="CommentsListWithParentMetadata"
      renderDocument={(comment: CommentsListWithParentMetadata) => <Link to={commentGetPageUrlFromIds({postId: comment?.post?._id, postSlug: comment?.post?.slug, tagSlug: comment?.tag?.slug, tagCommentType: comment?.tagCommentType, commentId: comment?._id, permalink: true})}>
        author: {comment?.user?.displayName} post: {comment?.post?.title}
      </Link>}
      noSubscriptionsMessage="You are not subscribed to any comment replies."
    />

    <SubscriptionsList
      title="Subscribed to Local Groups"
      collectionName="Localgroups"
      subscriptionType="newEvents"
      fragmentName="localGroupsBase"
      renderDocument={(group: localGroupsBase) => group.name}
      noSubscriptionsMessage="You are not subscribed to any local groups."
    />

    <SubscriptionsList
      title="Subscribed to Tags"
      collectionName="Tags"
      subscriptionType="newTagPosts"
      fragmentName="TagPreviewFragment"
      renderDocument={(tag: TagPreviewFragment) => <Link to={tagGetUrl(tag)}>{tag.name}</Link>}
      noSubscriptionsMessage="You are not subscribed to any tags."
    />
    
    {allowSubscribeToSequencePosts && <SubscriptionsList
      title="Subscribed to Sequences"
      collectionName="Sequences"
      subscriptionType="newSequencePosts"
      fragmentName="SequencesPageTitleFragment"
      renderDocument={(sequence: SequencesPageTitleFragment) => <Link to={sequenceGetPageUrl(sequence)}>{sequence.title}</Link>}
      noSubscriptionsMessage="You are not subscribed to any sequences."
    />}
    
  </SingleColumnSection>;
}

const ViewSubscriptionsPageComponent = registerComponent("ViewSubscriptionsPage", ViewSubscriptionsPage, {styles});
  
declare global {
  interface ComponentTypes {
    ViewSubscriptionsPage: typeof ViewSubscriptionsPageComponent,
  }
}

1	import React, {ReactNode} from 'react';	1✔
2	import { Components, registerComponent } from '../../lib/vulcan-lib';	1✔
3	import { useSingle } from '../../lib/crud/withSingle';	1✔
4	import { useMulti } from '../../lib/crud/withMulti';	1✔
5	import { useCurrentUser } from '../common/withUser';	1✔
6	import { Link } from '../../lib/reactRouterWrapper';	1✔
7	import { commentGetPageUrlFromIds } from '../../lib/collections/comments/helpers';	1✔
8	import { tagGetUrl } from '../../lib/collections/tags/helpers';	1✔
9	import { allowSubscribeToSequencePosts, allowSubscribeToUserComments, userHasSubscribeTabFeed } from '../../lib/betas';	1✔
10	import { sequenceGetPageUrl } from '../../lib/collections/sequences/helpers';	1✔
11	import { isLW } from '../../lib/instanceSettings';	1✔
12
13	const styles = (theme: ThemeType): JssStyles => ({	3✔
14	subscribedItem: {
15	display: "flex",
16	...theme.typography.commentStyle
17	},
18	subscribedItemDescription: {
19	flexGrow: 1,
20	},
21	});
22
23	const SubscriptionsList = ({collectionName, fragmentName, subscriptionType, noSubscriptionsMessage, renderDocument, title, classes}: {	1✔
24	collectionName: CollectionNameString,
25	fragmentName: keyof FragmentTypes,
26	subscriptionType: string,
27	noSubscriptionsMessage: string,
28	renderDocument: (document: any) => ReactNode,
29	title: React.ReactNode,
30	classes: ClassesType,
31	}) => {
UNCOV 32	const { SubscribedItem, SectionTitle, Loading, LoadMore } = Components;	×
UNCOV 33	const currentUser = useCurrentUser();	×
34
UNCOV 35	const { results, loading, loadMoreProps, showLoadMore } = useMulti({	×
36	terms: {
37	view: "subscriptionsOfType",
38	userId: currentUser?._id,	×
39	collectionName: collectionName,
40	subscriptionType: subscriptionType,
41	limit: 50
42	},
43	collectionName: "Subscriptions",
44	fragmentName: "SubscriptionState",
45	});
46
UNCOV 47	if (!currentUser)	×
UNCOV 48	return null;	×
UNCOV 49	if (loading)	×
UNCOV 50	return <Loading/>	×
UNCOV 51	if (!results)	×
UNCOV 52	return null;	×
53
UNCOV 54	return <div>	×
55	<SectionTitle title={title}/>
56	{results.map(result =>
UNCOV 57	<SubscribedItem	×
58	key={result._id}
59	collectionName={collectionName}
60	fragmentName={fragmentName}
61	subscription={result}
62	renderDocument={renderDocument}
63	/>
64	)}
65	{results.length===0 && <div className={classes.subscribedItem}>	×
66	{noSubscriptionsMessage}
67	</div>}
68	{showLoadMore && <LoadMore {...loadMoreProps} />}	×
69	</div>
70	}
71
72	const SubscriptionsListComponent = registerComponent("SubscriptionsList", SubscriptionsList, {styles});	1✔
73
74	declare global {
75	interface ComponentTypes {
76	SubscriptionsList: typeof SubscriptionsListComponent
77	}
78	}
79
80	const SubscribedItem = ({collectionName, fragmentName, subscription, renderDocument, classes}: {	1✔
81	collectionName: CollectionNameString,
82	fragmentName: keyof FragmentTypes,
83	subscription: SubscriptionState,
84	renderDocument: (document: any) => ReactNode,
85	classes: ClassesType,
86	}) => {
87	const { Loading, NotifyMeButton } = Components;	×
UNCOV 88	const { document, loading } = useSingle({	×
89	documentId: subscription.documentId,
90	collectionName, fragmentName,
91	});
92
UNCOV 93	if (!document && !loading) return null	×
UNCOV 94	if (loading) return <Loading/>	×
95
UNCOV 96	return <div className={classes.subscribedItem}>	×
97	<div className={classes.subscribedItemDescription}>
98	{renderDocument(document)}
99	</div>
100	<NotifyMeButton
101	document={document}
102	subscriptionType={subscription.type}
103	subscribeMessage="Resubscribe"
104	unsubscribeMessage="Unsubscribe"
105	/>
106	</div>
107
108	}
109
110	const SubscribedItemComponent = registerComponent("SubscribedItem", SubscribedItem, {styles});	1✔
111
112	declare global {
113	interface ComponentTypes {
114	SubscribedItem: typeof SubscribedItemComponent
115	}
116	}
117
118	const ViewSubscriptionsPage = ({classes}: {	1✔
119	classes: ClassesType,
120	}) => {
121	const { SingleColumnSection, SubscriptionsList, UsersNameDisplay } = Components;	×
UNCOV 122	const currentUser = useCurrentUser();	×
123
UNCOV 124	if (!currentUser) {	×
UNCOV 125	return <SingleColumnSection>	×
126	Log in to manage your subscriptions.
127	</SingleColumnSection>;
128	}
129
UNCOV 130	return <SingleColumnSection>	×
131	{userHasSubscribeTabFeed(currentUser) && <SubscriptionsList
132	title="Subscribed to Users for Subscribed Activity Feed"
133	collectionName="Users"
134	subscriptionType="newActivityForFeed"
135	fragmentName="UsersMinimumInfo"
UNCOV 136	renderDocument={(user: UsersMinimumInfo) => <UsersNameDisplay user={user}/>}	×
137	noSubscriptionsMessage="You are not subscribed to any users on your Subscribed Feed."
138	/>}
139	<SubscriptionsList
140	title="Subscribed to Posts By Users"
141	collectionName="Users"
142	subscriptionType="newPosts"
143	fragmentName="UsersMinimumInfo"
UNCOV 144	renderDocument={(user: UsersMinimumInfo) => <UsersNameDisplay user={user}/>}	×
145	noSubscriptionsMessage="You are not subscribed to any users' posts."
146	/>
147	{allowSubscribeToUserComments && <SubscriptionsList	×
148	title="Subscribed to All Comments By Users"
149	collectionName="Users"
150	subscriptionType="newUserComments"
151	fragmentName="UsersMinimumInfo"
152	renderDocument={(user: UsersMinimumInfo) => <UsersNameDisplay user={user}/>}	×
153	noSubscriptionsMessage="You are not subscribed to any users' comments."
154	/>}
155
156	<SubscriptionsList
157	title="Subscribed to Comments on Posts"
158	collectionName="Posts"
159	subscriptionType="newComments"
160	fragmentName="PostsList"
UNCOV 161	renderDocument={(post: PostsList) => post.title}	×
162	noSubscriptionsMessage="You are not subscribed to comments on any posts."
163	/>
164
165	<SubscriptionsList
166	title="Subscribed to Dialogues (as a reader)"
167	collectionName="Posts"
168	subscriptionType="newPublishedDialogueMessages"
169	fragmentName="PostsList"
UNCOV 170	renderDocument={(post: PostsList) => post.title}	×
171	noSubscriptionsMessage="You are not subscribed to any dialogues as a reader."
172	/>
173
174	<SubscriptionsList
175	title="Subscribed to Dialogues (as a participant)"
176	collectionName="Posts"
177	subscriptionType="newDialogueMessages"
178	fragmentName="PostsList"
UNCOV 179	renderDocument={(post: PostsList) => post.title}	×
180	noSubscriptionsMessage="You are not subscribed to any dialogues as a participant."
181	/>
182
183	{isLW && <SubscriptionsList	×
184	title="Subscribed to Old-Style Dialogues (as a reader)"
185	collectionName="Posts"
186	subscriptionType="newDebateComments"
187	fragmentName="PostsList"
UNCOV 188	renderDocument={(post: PostsList) => post.title}	×
189	noSubscriptionsMessage="You are not subscribed to any dialogues as a reader."
190	/>}
191
192	<SubscriptionsList
193	title="Subscribed to Old-Style dialogues (as a participant)"
194	collectionName="Posts"
195	subscriptionType="newDebateReplies"
196	fragmentName="PostsList"
UNCOV 197	renderDocument={(post: PostsList) => post.title}	×
198	noSubscriptionsMessage="You are not subscribed to any dialogues as a participant."
199	/>
200
201	<SubscriptionsList
202	title="Subscribed to Comment Replies"
203	collectionName="Comments"
204	subscriptionType="newReplies"
205	fragmentName="CommentsListWithParentMetadata"
UNCOV 206	renderDocument={(comment: CommentsListWithParentMetadata) => <Link to={commentGetPageUrlFromIds({postId: comment?.post?._id, postSlug: comment?.post?.slug, tagSlug: comment?.tag?.slug, tagCommentType: comment?.tagCommentType, commentId: comment?._id, permalink: true})}>	×
207	author: {comment?.user?.displayName} post: {comment?.post?.title}	×
208	</Link>}
209	noSubscriptionsMessage="You are not subscribed to any comment replies."
210	/>
211
212	<SubscriptionsList
213	title="Subscribed to Local Groups"
214	collectionName="Localgroups"
215	subscriptionType="newEvents"
216	fragmentName="localGroupsBase"
UNCOV 217	renderDocument={(group: localGroupsBase) => group.name}	×
218	noSubscriptionsMessage="You are not subscribed to any local groups."
219	/>
220
221	<SubscriptionsList
222	title="Subscribed to Tags"
223	collectionName="Tags"
224	subscriptionType="newTagPosts"
225	fragmentName="TagPreviewFragment"
UNCOV 226	renderDocument={(tag: TagPreviewFragment) => <Link to={tagGetUrl(tag)}>{tag.name}</Link>}	×
227	noSubscriptionsMessage="You are not subscribed to any tags."
228	/>
229
230	{allowSubscribeToSequencePosts && <SubscriptionsList	×
231	title="Subscribed to Sequences"
232	collectionName="Sequences"
233	subscriptionType="newSequencePosts"
234	fragmentName="SequencesPageTitleFragment"
UNCOV 235	renderDocument={(sequence: SequencesPageTitleFragment) => <Link to={sequenceGetPageUrl(sequence)}>{sequence.title}</Link>}	×
236	noSubscriptionsMessage="You are not subscribed to any sequences."
237	/>}
238
239	</SingleColumnSection>;
240	}
241
242	const ViewSubscriptionsPageComponent = registerComponent("ViewSubscriptionsPage", ViewSubscriptionsPage, {styles});	1✔
243
244	declare global {
245	interface ComponentTypes {
246	ViewSubscriptionsPage: typeof ViewSubscriptionsPageComponent,
247	}
248	}

ForumMagnum / ForumMagnum / 9472509084

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