10628893569

Committed 30 Aug 2024 07:48AM UTC coverage: 31.851% (-0.02%) from 31.867%

Build # 10628893569

Build Type

Pull #9680

github

Committed by

Raemon

Commit Message

delete/draft buttons for spotlights

Pull Request Pull Request #9680: Auto-spotlight improvements: better jailbreak + spotlight UI improvements

Run Details

5023 of 41176 branches covered (12.2%)

Branch coverage included in aggregate %.

5 of 46 new or added lines in 3 files covered. (10.87%)

7 existing lines in 1 file now uncovered.

29345 of 66727 relevant lines covered (43.98%)

187.83 hits per line

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

18.75

/packages/lesswrong/components/spotlights/SpotlightsPage.tsx

import React, { useMemo } from 'react';
import { useMulti } from '../../lib/crud/withMulti';
import { Components, getFragment, registerComponent } from '../../lib/vulcan-lib';
import { userCanDo } from '../../lib/vulcan-users';
import { useCurrentUser } from '../common/withUser';
import { useLocation } from '../../lib/routeUtil';

const styles = (theme: ThemeType): JssStyles => ({
  form: {
    padding: 16,
    background: theme.palette.background.pageActiveAreaBackground,
    boxShadow: theme.palette.boxShadow.featuredResourcesCard,
    marginBottom: 16
  }
});

export const SpotlightsPage = ({classes}: {
  classes: ClassesType,
}) => {
  const { Loading, SectionTitle, SingleColumnSection, SpotlightItem, WrappedSmartForm, ErrorAccessDenied, SpotlightEditorStyles, ToCColumn, TableOfContents } = Components;

  const currentUser = useCurrentUser();

  const { query } = useLocation();
  const onlyDrafts = query.drafts === 'true';

  const { results: spotlights = [], loading, refetch } = useMulti({
    collectionName: 'Spotlights',
    fragmentName: 'SpotlightDisplay',
    terms: {
      view: onlyDrafts ? "spotlightsPageDraft" : "spotlightsPage",
      limit: 100
    },
    fetchPolicy: 'network-only',
    nextFetchPolicy: 'network-only'
  });

  const spotlightsInDisplayOrder = useMemo(() => {
    if (!spotlights.length) return spotlights;
    const [currentSpotlight] = spotlights;
    const upcomingSpotlights = spotlights.filter(spotlight => spotlight.position > currentSpotlight.position);
    const recycledSpotlights = spotlights.filter(spotlight => spotlight.position < currentSpotlight.position);
    return [currentSpotlight, ...upcomingSpotlights, ...recycledSpotlights];
  }, [spotlights]);

  const upcomingSpotlights = spotlightsInDisplayOrder.filter(spotlight => !spotlight.draft)
  const draftSpotlights = spotlightsInDisplayOrder.filter(spotlight => spotlight.draft).sort((a, b) => {
    if (a.documentId < b.documentId) return -1;
    if (a.documentId > b.documentId) return 1;
    return 0;
  })

  if (!userCanDo(currentUser, 'spotlights.edit.all')) {
    return <SingleColumnSection>
      <ErrorAccessDenied/>
    </SingleColumnSection>;
  }

  const totalUpcomingDuration = upcomingSpotlights.reduce((total, spotlight) => total + spotlight.duration, 0);

  const totalDraftDuration = draftSpotlights.reduce((total, spotlight) => total + spotlight.duration, 0);

  const sectionData = {
    html: "",
    sections: [
      {
        title: "Upcoming Spotlights",
        anchor: "upcoming-spotlights",
        level: 1
      },
      ...upcomingSpotlights.map(spotlight => ({
        title: spotlight.document.title,
        anchor: spotlight._id,
        level: 2
      })),
      {
        title: "Draft Spotlights",
        anchor: "draft-spotlights",
        level: 1
      },
      ...draftSpotlights.map(spotlight => ({
        title: spotlight.document.title,
        anchor: spotlight._id,
        level: 2
      })),
    ],
  }

  return <ToCColumn tableOfContents={<TableOfContents
    sectionData={sectionData}
    title={"Spotlights"}
  />}>
    <SingleColumnSection>
      <SectionTitle title={'New Spotlight'} />
      <div className={classes.form}>
        <SpotlightEditorStyles>
          <WrappedSmartForm
            collectionName="Spotlights"
            mutationFragment={getFragment('SpotlightEditQueryFragment')}
          />
        </SpotlightEditorStyles>
      </div>
      {loading && <Loading/>}
      <SectionTitle title="Upcoming Spotlights">
        <div>Total: {totalUpcomingDuration} days</div>
      </SectionTitle>
      {upcomingSpotlights.map(spotlight => <SpotlightItem key={`spotlightpage${spotlight._id}`} spotlight={spotlight} refetchAllSpotlights={refetch} showAdminInfo/>)}
      <SectionTitle title="Draft Spotlights">
        <div>Total: {totalDraftDuration} days</div>
      </SectionTitle>
      {draftSpotlights.map(spotlight => <SpotlightItem key={`spotlightpage${spotlight._id}`} spotlight={spotlight} refetchAllSpotlights={refetch} showAdminInfo/>)}
    </SingleColumnSection>
  </ToCColumn>
}

const SpotlightsPageComponent = registerComponent('SpotlightsPage', SpotlightsPage, {styles});

declare global {
  interface ComponentTypes {
    SpotlightsPage: typeof SpotlightsPageComponent
  }
}


1	import React, { useMemo } from 'react';	3✔
2	import { useMulti } from '../../lib/crud/withMulti';	1✔
3	import { Components, getFragment, registerComponent } from '../../lib/vulcan-lib';	1✔
4	import { userCanDo } from '../../lib/vulcan-users';	1✔
5	import { useCurrentUser } from '../common/withUser';	1✔
6	import { useLocation } from '../../lib/routeUtil';	1✔
7
8	const styles = (theme: ThemeType): JssStyles => ({	1✔
9	form: {
10	padding: 16,
11	background: theme.palette.background.pageActiveAreaBackground,
12	boxShadow: theme.palette.boxShadow.featuredResourcesCard,
13	marginBottom: 16
14	}
15	});
16
17	export const SpotlightsPage = ({classes}: {	1✔
18	classes: ClassesType,
19	}) => {
20	const { Loading, SectionTitle, SingleColumnSection, SpotlightItem, WrappedSmartForm, ErrorAccessDenied, SpotlightEditorStyles, ToCColumn, TableOfContents } = Components;	×
21
22	const currentUser = useCurrentUser();	×
23
24	const { query } = useLocation();	×
25	const onlyDrafts = query.drafts === 'true';	×
26
27	const { results: spotlights = [], loading, refetch } = useMulti({	×
28	collectionName: 'Spotlights',
29	fragmentName: 'SpotlightDisplay',
30	terms: {
31	view: onlyDrafts ? "spotlightsPageDraft" : "spotlightsPage",	×
32	limit: 100
33	},
34	fetchPolicy: 'network-only',
35	nextFetchPolicy: 'network-only'
36	});
37
38	const spotlightsInDisplayOrder = useMemo(() => {	×
39	if (!spotlights.length) return spotlights;	×
40	const [currentSpotlight] = spotlights;	×
41	const upcomingSpotlights = spotlights.filter(spotlight => spotlight.position > currentSpotlight.position);	×
42	const recycledSpotlights = spotlights.filter(spotlight => spotlight.position < currentSpotlight.position);	×
43	return [currentSpotlight, ...upcomingSpotlights, ...recycledSpotlights];	×
44	}, [spotlights]);
45
46	const upcomingSpotlights = spotlightsInDisplayOrder.filter(spotlight => !spotlight.draft)	×
NEW 47	const draftSpotlights = spotlightsInDisplayOrder.filter(spotlight => spotlight.draft).sort((a, b) => {	×
NEW 48	if (a.documentId < b.documentId) return -1;	×
NEW 49	if (a.documentId > b.documentId) return 1;	×
NEW 50	return 0;	×
51	})
52
53	if (!userCanDo(currentUser, 'spotlights.edit.all')) {	×
54	return <SingleColumnSection>	×
55	<ErrorAccessDenied/>
56	</SingleColumnSection>;
57	}
58
59	const totalUpcomingDuration = upcomingSpotlights.reduce((total, spotlight) => total + spotlight.duration, 0);	×
60
61	const totalDraftDuration = draftSpotlights.reduce((total, spotlight) => total + spotlight.duration, 0);	×
62
63	const sectionData = {	×
64	html: "",
65	sections: [
66	{
67	title: "Upcoming Spotlights",
68	anchor: "upcoming-spotlights",
69	level: 1
70	},
71	...upcomingSpotlights.map(spotlight => ({	×
72	title: spotlight.document.title,
73	anchor: spotlight._id,
74	level: 2
75	})),
76	{
77	title: "Draft Spotlights",
78	anchor: "draft-spotlights",
79	level: 1
80	},
81	...draftSpotlights.map(spotlight => ({	×
82	title: spotlight.document.title,
83	anchor: spotlight._id,
84	level: 2
85	})),
86	],
87	}
88
89	return <ToCColumn tableOfContents={<TableOfContents	×
90	sectionData={sectionData}
91	title={"Spotlights"}
92	/>}>
93	<SingleColumnSection>
94	<SectionTitle title={'New Spotlight'} />
95	<div className={classes.form}>
96	<SpotlightEditorStyles>
97	<WrappedSmartForm
98	collectionName="Spotlights"
99	mutationFragment={getFragment('SpotlightEditQueryFragment')}
100	/>
101	</SpotlightEditorStyles>
102	</div>
103	{loading && <Loading/>}	×
104	<SectionTitle title="Upcoming Spotlights">
105	<div>Total: {totalUpcomingDuration} days</div>
106	</SectionTitle>
107	{upcomingSpotlights.map(spotlight => <SpotlightItem key={`spotlightpage${spotlight._id}`} spotlight={spotlight} refetchAllSpotlights={refetch} showAdminInfo/>)}	×
108	<SectionTitle title="Draft Spotlights">
109	<div>Total: {totalDraftDuration} days</div>
110	</SectionTitle>
111	{draftSpotlights.map(spotlight => <SpotlightItem key={`spotlightpage${spotlight._id}`} spotlight={spotlight} refetchAllSpotlights={refetch} showAdminInfo/>)}	×
112	</SingleColumnSection>
113	</ToCColumn>
114	}
115
116	const SpotlightsPageComponent = registerComponent('SpotlightsPage', SpotlightsPage, {styles});	1✔
117
118	declare global {
119	interface ComponentTypes {
120	SpotlightsPage: typeof SpotlightsPageComponent
121	}
122	}
123

ForumMagnum / ForumMagnum / 10628893569

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