10063771873

Committed 23 Jul 2024 05:46PM UTC coverage: 31.896% (+0.02%) from 31.879%

Build # 10063771873

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #9536 from ForumMagnum/master

[EA] Deploy fix for 'Comment not found' appearing when navigating to heading

Run Details

4932 of 40527 branches covered (12.17%)

Branch coverage included in aggregate %.

2 of 5 new or added lines in 2 files covered. (40.0%)

1 existing line in 1 file now uncovered.

28852 of 65392 relevant lines covered (44.12%)

179.91 hits per line

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

15.71

/packages/lesswrong/components/comments/CommentPermalink.tsx

import React from 'react';
import { commentIsHidden } from '../../lib/collections/comments/helpers';
import { postGetPageUrl } from '../../lib/collections/posts/helpers';
import { useSingle } from '../../lib/crud/withSingle';
import { isLWorAF } from '../../lib/instanceSettings';
import { Components, registerComponent } from '../../lib/vulcan-lib';
import { isNotRandomId } from '@/lib/random';

const styles = (theme: ThemeType): JssStyles => ({
  root: {
    ...theme.typography.body2,
    ...theme.typography.commentStyle,
  },
  dividerMargins: {
    marginTop: 150,
    marginBottom: 150,
  },
  permalinkLabel: {
    color: theme.palette.grey[600],
    marginBottom: theme.spacing.unit*2,
    marginLeft: 10,
    [theme.breakpoints.down('md')]: {
      marginTop: theme.spacing.unit*2
    }
  },
  seeInContext: {
    textAlign: "right",
    color: theme.palette.lwTertiary.main,
    marginRight: 10
  },
})

const getCommentDescription = (comment: CommentWithRepliesFragment) => {
  if (comment.deleted) return '[Comment deleted]'

  return `Comment ${comment.user ? 
    `by ${comment.user.displayName} ` : 
    ''
  }- ${comment.contents?.plaintextMainText}`
}

const CommentPermalink = ({
  documentId,
  post,
  silentLoading=false,
  classes
}: {
  documentId: string,
  post?: PostsDetails,
  silentLoading?: boolean,
  classes: ClassesType,
}) => {
  const { document: comment, data, loading, error } = useSingle({
    documentId,
    collectionName: "Comments",
    fragmentName: 'CommentWithRepliesFragment',
    skip: isNotRandomId(documentId)
  });
  const refetch = data?.refetch;
  const { Loading, Divider, CommentOnPostWithReplies, HeadTags, CommentWithReplies } = Components;

  if (silentLoading && !comment) return null;

  if (error || (!comment && !loading)) return <div>Comment not found</div>
  
  if (loading) return <Loading />

  if (!comment || !documentId) return null
  
  // if the site is currently hiding comments by unreviewed authors, check if we need to hide this comment
  if (commentIsHidden(comment) && !comment.rejected) return <div className={classes.root}>
    <div className={classes.permalinkLabel}>
      Comment Permalink 
      <p>Error: Sorry, this comment is hidden</p>
    </div>
    {isLWorAF && <div className={classes.dividerMargins}>
      <Divider />
    </div>}
  </div>

  const ogUrl = post ? postGetPageUrl(post, true) : undefined // open graph
  const canonicalUrl = post ? post.canonicalSource || ogUrl : undefined
  // For imageless posts this will be an empty string
  const socialPreviewImageUrl = post ? post.socialPreviewData?.imageUrl : undefined

  const commentNodeProps = {
    treeOptions: {
      refetch,
      showPostTitle: false,
    },
    forceUnTruncated: true,
    forceUnCollapsed: true,
    noAutoScroll: true
  };

  // NB: classes.root is not in the above styles, but is used by eaTheme
  return (
    <div className={classes.root}>
      <div className={classes.permalinkLabel}>Comment Permalink</div>
      <div>
        <HeadTags
          ogUrl={ogUrl}
          canonicalUrl={canonicalUrl}
          image={socialPreviewImageUrl}
          description={getCommentDescription(comment)}
          noIndex={true}
        />
        {post ? (
          <CommentOnPostWithReplies
            key={comment._id}
            post={post}
            comment={comment}
            commentNodeProps={commentNodeProps}
          />
        ) : (
          <CommentWithReplies
            key={comment._id}
            comment={comment}
            commentNodeProps={commentNodeProps}
            initialMaxChildren={5}
          />
        )}
        <div className={classes.seeInContext}>
          <a href={`#${documentId}`}>See in context</a>
        </div>
      </div>
      {isLWorAF && <div className={classes.dividerMargins}>
        <Divider />
      </div>}
    </div>
  );
}

const CommentPermalinkComponent = registerComponent("CommentPermalink", CommentPermalink, { styles });


declare global {
  interface ComponentTypes {
    CommentPermalink: typeof CommentPermalinkComponent,
  }
}

1	import React from 'react';	1✔
2	import { commentIsHidden } from '../../lib/collections/comments/helpers';	1✔
3	import { postGetPageUrl } from '../../lib/collections/posts/helpers';	1✔
4	import { useSingle } from '../../lib/crud/withSingle';	1✔
5	import { isLWorAF } from '../../lib/instanceSettings';	1✔
6	import { Components, registerComponent } from '../../lib/vulcan-lib';	1✔
7	import { isNotRandomId } from '@/lib/random';	1✔
8
9	const styles = (theme: ThemeType): JssStyles => ({	1✔
10	root: {
11	...theme.typography.body2,
12	...theme.typography.commentStyle,
13	},
14	dividerMargins: {
15	marginTop: 150,
16	marginBottom: 150,
17	},
18	permalinkLabel: {
19	color: theme.palette.grey[600],
20	marginBottom: theme.spacing.unit*2,
21	marginLeft: 10,
22	[theme.breakpoints.down('md')]: {
23	marginTop: theme.spacing.unit*2
24	}
25	},
26	seeInContext: {
27	textAlign: "right",
28	color: theme.palette.lwTertiary.main,
29	marginRight: 10
30	},
31	})
32
33	const getCommentDescription = (comment: CommentWithRepliesFragment) => {	1✔
34	if (comment.deleted) return '[Comment deleted]'	×
35
36	return `Comment ${comment.user ?	×
37	`by ${comment.user.displayName} ` :	×
38	''
39	}- ${comment.contents?.plaintextMainText}`	×
40	}
41
42	const CommentPermalink = ({	1✔
43	documentId,
44	post,
45	silentLoading=false,	×
46	classes
47	}: {
48	documentId: string,
49	post?: PostsDetails,
50	silentLoading?: boolean,
51	classes: ClassesType,
52	}) => {
53	const { document: comment, data, loading, error } = useSingle({	×
54	documentId,
55	collectionName: "Comments",
56	fragmentName: 'CommentWithRepliesFragment',
57	skip: isNotRandomId(documentId)
58	});
59	const refetch = data?.refetch;	×
60	const { Loading, Divider, CommentOnPostWithReplies, HeadTags, CommentWithReplies } = Components;	×
61
NEW 62	if (silentLoading && !comment) return null;	×
63
UNCOV 64	if (error \|\| (!comment && !loading)) return <div>Comment not found</div>	×
65
66	if (loading) return <Loading />	×
67
NEW 68	if (!comment \|\| !documentId) return null	×
69
70	// if the site is currently hiding comments by unreviewed authors, check if we need to hide this comment
71	if (commentIsHidden(comment) && !comment.rejected) return <div className={classes.root}>	×
72	<div className={classes.permalinkLabel}>
73	Comment Permalink
74	<p>Error: Sorry, this comment is hidden</p>
75	</div>
76	{isLWorAF && <div className={classes.dividerMargins}>	×
77	<Divider />
78	</div>}
79	</div>
80
81	const ogUrl = post ? postGetPageUrl(post, true) : undefined // open graph	×
82	const canonicalUrl = post ? post.canonicalSource \|\| ogUrl : undefined	×
83	// For imageless posts this will be an empty string
84	const socialPreviewImageUrl = post ? post.socialPreviewData?.imageUrl : undefined	×
85
86	const commentNodeProps = {	×
87	treeOptions: {
88	refetch,
89	showPostTitle: false,
90	},
91	forceUnTruncated: true,
92	forceUnCollapsed: true,
93	noAutoScroll: true
94	};
95
96	// NB: classes.root is not in the above styles, but is used by eaTheme
97	return (	×
98	<div className={classes.root}>
99	<div className={classes.permalinkLabel}>Comment Permalink</div>
100	<div>
101	<HeadTags
102	ogUrl={ogUrl}
103	canonicalUrl={canonicalUrl}
104	image={socialPreviewImageUrl}
105	description={getCommentDescription(comment)}
106	noIndex={true}
107	/>
108	{post ? (
109	<CommentOnPostWithReplies	×
110	key={comment._id}
111	post={post}
112	comment={comment}
113	commentNodeProps={commentNodeProps}
114	/>
115	) : (
116	<CommentWithReplies
117	key={comment._id}
118	comment={comment}
119	commentNodeProps={commentNodeProps}
120	initialMaxChildren={5}
121	/>
122	)}
123	<div className={classes.seeInContext}>
124	<a href={`#${documentId}`}>See in context</a>
125	</div>
126	</div>
127	{isLWorAF && <div className={classes.dividerMargins}>	×
128	<Divider />
129	</div>}
130	</div>
131	);
132	}
133
134	const CommentPermalinkComponent = registerComponent("CommentPermalink", CommentPermalink, { styles });	1✔
135
136
137	declare global {
138	interface ComponentTypes {
139	CommentPermalink: typeof CommentPermalinkComponent,
140	}
141	}

ForumMagnum / ForumMagnum / 10063771873

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