10092633545

Committed 25 Jul 2024 10:38AM UTC coverage: 31.856% (-0.002%) from 31.858%

Build # 10092633545

Build Type

Pull #9549

github

Committed by

web-flow

Commit Message

Merge 5aae1062d into 54ee1e5da

Pull Request Pull Request #9549: [EA] Use post contents rather than customHighlight as the excerpt in recent discussion

Run Details

4932 of 40600 branches covered (12.15%)

Branch coverage included in aggregate %.

0 of 2 new or added lines in 1 file covered. (0.0%)

2 existing lines in 1 file now uncovered.

28886 of 65558 relevant lines covered (44.06%)

179.47 hits per line

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

12.0

/packages/lesswrong/components/common/excerpts/PostExcerpt.tsx

import React from "react";
import { Components, registerComponent } from "../../../lib/vulcan-lib";
import { postGetPageUrl } from "../../../lib/collections/posts/helpers";
import { usePostContents } from "../../hooks/useForeignCrosspost";
import { useForeignApolloClient } from "../../hooks/useForeignApolloClient";
import { useSingle } from "../../../lib/crud/withSingle";
import type { CommonExcerptProps } from "./ContentExcerpt";

const isSunshine = (post: PostsList | SunshinePostsList): post is SunshinePostsList =>
  "user" in post;

const PostExcerpt = ({
  post,
  preferCustomHighlight=true,
  hash,
  ...commonExcerptProps
}: CommonExcerptProps & {
  post: PostsList | SunshinePostsList,
  /** Whether to prefer showing `customHighlight` (can be set by admins) vs a snippet of the post body */
  preferCustomHighlight?: boolean,
  hash?: string | null,
}) => {
  // Get the post body, accounting for whether or not this is a crosspost
  const {postContents, loading, error} = usePostContents({
    post,
    fragmentName: isSunshine(post) ? "SunshinePostsList" : "PostsList",
    skip: !!hash,
  });

  // If a hash is supplied then we need to run a query to get the section
  // of the content starting at the hash, whether of not this is a crosspost
  const isForeign = post?.fmCrosspost?.isCrosspost &&
    !post.fmCrosspost.hostedHere &&
    !!post.fmCrosspost.foreignPostId;
  const foreignApolloClient = useForeignApolloClient();
  const {document: postHighlight, loading: loadingHighlight} = useSingle({
    collectionName: "Posts",
    fragmentName: "HighlightWithHash",
    documentId: post?.fmCrosspost?.foreignPostId ?? post?._id,
    skip: !hash && !!post.contents,
    fetchPolicy: "cache-first",
    extraVariables: {hash: "String"},
    extraVariablesValues: {hash},
    apolloClient: isForeign ? foreignApolloClient : undefined,
  });

  const {Loading, ContentExcerpt} = Components;
  if ((loading && !hash) || (loadingHighlight && hash)) {
    return (
      <Loading />
    );
  }

  if (error) {
    // eslint-disable-next-line
    console.error("Error loading excerpt body:", error);
  }

  const customHighlight = post.customHighlight?.html;
  const postDefaultHighlight: string | undefined = postContents?.htmlHighlight || (postContents as AnyBecauseHard)?.html;

  const contentHtml =
    postHighlight?.contents?.htmlHighlightStartingAtHash ||
    (preferCustomHighlight && customHighlight ? customHighlight : postDefaultHighlight);
  if (!contentHtml) {
    return null;
  }

  return (
    <ContentExcerpt
      contentHtml={contentHtml}
      moreLink={postGetPageUrl(post)}
      contentType="postHighlight"
      {...commonExcerptProps}
    />
  );
}

const PostExcerptComponent = registerComponent(
  "PostExcerpt",
  PostExcerpt,
);

declare global {
  interface ComponentTypes {
    PostExcerpt: typeof PostExcerptComponent,
  }
}

1	import React from "react";	1✔
2	import { Components, registerComponent } from "../../../lib/vulcan-lib";	1✔
3	import { postGetPageUrl } from "../../../lib/collections/posts/helpers";	1✔
4	import { usePostContents } from "../../hooks/useForeignCrosspost";	1✔
5	import { useForeignApolloClient } from "../../hooks/useForeignApolloClient";	1✔
6	import { useSingle } from "../../../lib/crud/withSingle";	1✔
7	import type { CommonExcerptProps } from "./ContentExcerpt";
8
9	const isSunshine = (post: PostsList \| SunshinePostsList): post is SunshinePostsList =>	1✔
10	"user" in post;	×
11
12	const PostExcerpt = ({	1✔
13	post,
14	preferCustomHighlight=true,	×
15	hash,
16	...commonExcerptProps
17	}: CommonExcerptProps & {
18	post: PostsList \| SunshinePostsList,
19	/** Whether to prefer showing `customHighlight` (can be set by admins) vs a snippet of the post body */
20	preferCustomHighlight?: boolean,
21	hash?: string \| null,
22	}) => {
23	// Get the post body, accounting for whether or not this is a crosspost
24	const {postContents, loading, error} = usePostContents({	×
25	post,
26	fragmentName: isSunshine(post) ? "SunshinePostsList" : "PostsList",	×
27	skip: !!hash,
28	});
29
30	// If a hash is supplied then we need to run a query to get the section
31	// of the content starting at the hash, whether of not this is a crosspost
32	const isForeign = post?.fmCrosspost?.isCrosspost &&	×
33	!post.fmCrosspost.hostedHere &&
34	!!post.fmCrosspost.foreignPostId;
35	const foreignApolloClient = useForeignApolloClient();	×
36	const {document: postHighlight, loading: loadingHighlight} = useSingle({	×
37	collectionName: "Posts",
38	fragmentName: "HighlightWithHash",
39	documentId: post?.fmCrosspost?.foreignPostId ?? post?._id,	×
40	skip: !hash && !!post.contents,	×
41	fetchPolicy: "cache-first",
42	extraVariables: {hash: "String"},
43	extraVariablesValues: {hash},
44	apolloClient: isForeign ? foreignApolloClient : undefined,	×
45	});
46
47	const {Loading, ContentExcerpt} = Components;	×
48	if ((loading && !hash) \|\| (loadingHighlight && hash)) {	×
49	return (	×
50	<Loading />
51	);
52	}
53
54	if (error) {	×
55	// eslint-disable-next-line
56	console.error("Error loading excerpt body:", error);	×
57	}
58
NEW 59	const customHighlight = post.customHighlight?.html;	×
NEW 60	const postDefaultHighlight: string \| undefined = postContents?.htmlHighlight \|\| (postContents as AnyBecauseHard)?.html;	×
61
UNCOV 62	const contentHtml =	×
63	postHighlight?.contents?.htmlHighlightStartingAtHash \|\|	×
64	(preferCustomHighlight && customHighlight ? customHighlight : postDefaultHighlight);	×
UNCOV 65	if (!contentHtml) {	×
66	return null;	×
67	}
68
69	return (	×
70	<ContentExcerpt
71	contentHtml={contentHtml}
72	moreLink={postGetPageUrl(post)}
73	contentType="postHighlight"
74	{...commonExcerptProps}
75	/>
76	);
77	}
78
79	const PostExcerptComponent = registerComponent(	1✔
80	"PostExcerpt",
81	PostExcerpt,
82	);
83
84	declare global {
85	interface ComponentTypes {
86	PostExcerpt: typeof PostExcerptComponent,
87	}
88	}

ForumMagnum / ForumMagnum / 10092633545

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