Merge pull request #8057 from guardian/gl/move-discussion-rendering-i…

…nto-dcr Move discussion-rendering into DCR
guardian · Jul 3, 2023 · 1d9521c · 1d9521c
2 parents 117f53e + 78a5f83
commit 1d9521c
Show file tree

Hide file tree

Showing 69 changed files with 10,881 additions and 9,353 deletions.
diff --git a/dotcom-rendering/.eslintrc.js b/dotcom-rendering/.eslintrc.js
@@ -41,6 +41,10 @@ const rulesToReview = {
 	'@typescript-eslint/default-param-last': 'warn',
 	'@typescript-eslint/no-misused-promises': 'warn',
 
+	// We use prettier to format code. Some eslint rules conflict with prettier
+	'react/jsx-indent-props': 'off',
+	'react/jsx-indent': 'off',
+
 	// More rules
 	'eslint-comments/require-description': 'warn',
 	'eslint-comments/no-unused-disable': 'warn',
@@ -66,9 +70,10 @@ module.exports = {
 	extends: [
 		'eslint:recommended',
 		'@guardian/eslint-config-typescript',
-		'prettier',
 		'plugin:@guardian/source-react-components/recommended',
 		'plugin:jsx-a11y/recommended',
+		// prettier needs to go last so it can override other configuration. See https://github.com/prettier/eslint-config-prettier#installation
+		'prettier',
 	],
 	parser: '@typescript-eslint/parser',
 	parserOptions: {
@@ -90,8 +95,6 @@ module.exports = {
 		'react-hooks/exhaustive-deps': 'error',
 		'react-hooks/rules-of-hooks': 'error',
 		'react/jsx-boolean-value': [2, 'always'],
-		'react/jsx-indent-props': [2, 'tab'],
-		'react/jsx-indent': [2, 'tab'],
 		'react/jsx-key': 'error',
 		'react/jsx-no-target-blank': 'error',
 		'react/jsx-one-expression-per-line': 'off',

diff --git a/dotcom-rendering/fixtures/manual/comment.ts b/dotcom-rendering/fixtures/manual/comment.ts
@@ -0,0 +1,157 @@
+export const comment = {
+	id: 138809272,
+	body: '<p>Begone ye self-serving Tory isolationists.</p> <p>Never has there been a more significant time for Big Government and public health provision. Nature has spoken.</p>',
+	date: '09 March 2020 7:09pm',
+	isoDateTime: '2020-03-09T19:09:28Z',
+	status: 'visible',
+	webUrl: 'https://discussion.theguardian.com/comment-permalink/138809272',
+	apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809272',
+	numRecommends: 45,
+	isHighlighted: false,
+	userProfile: {
+		userId: '13239086',
+		displayName: 'blipvert',
+		webUrl: 'https://profile.theguardian.com/user/id/13239086',
+		apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13239086',
+		avatar: 'https://avatar.guim.co.uk/user/13239086',
+		secureAvatarUrl: 'https://avatar.guim.co.uk/user/13239086',
+		badge: [],
+	},
+	discussion: {
+		key: '/p/4k83z',
+		webUrl: 'https://www.theguardian.com/commentisfree/2020/mar/09/coronavirus-outbreak-nhs-staff-shortages',
+		apiUrl: 'https://discussion.guardianapis.com/discussion-api/discussion//p/4k83z',
+		title: 'Even a starved NHS is still our best defence against the coronavirus',
+		isClosedForComments: true,
+		isClosedForRecommendation: true,
+	},
+	responses: [
+		{
+			id: 138809396,
+			body: "This comment was removed by a moderator because it didn't abide by our <a href='http://www.theguardian.com/community-standards'>community standards</a>. Replies may also be deleted. For more detail see <a href='http://www.guardian.co.uk/community-faqs'>our FAQs</a>.",
+			date: '09 March 2020 7:19pm',
+			isoDateTime: '2020-03-09T19:19:03Z',
+			status: 'blocked',
+			webUrl: 'https://discussion.theguardian.com/comment-permalink/138809396',
+			apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809396',
+			numRecommends: 0,
+			isHighlighted: false,
+			responseTo: {
+				displayName: 'blipvert',
+				commentApiUrl:
+					'https://discussion.guardianapis.com/discussion-api/comment/138809272',
+				isoDateTime: '2020-03-09T19:09:28Z',
+				date: '09 March 2020 7:09pm',
+				commentId: '138809272',
+				commentWebUrl:
+					'https://discussion.theguardian.com/comment-permalink/138809272',
+			},
+			userProfile: {
+				userId: '13093174',
+				displayName: 'Cricketnut',
+				webUrl: 'https://profile.theguardian.com/user/id/13093174',
+				apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/13093174',
+				avatar: 'https://avatar.guim.co.uk/user/13093174',
+				secureAvatarUrl: 'https://avatar.guim.co.uk/user/13093174',
+				badge: [],
+			},
+		},
+		{
+			id: 138809487,
+			body: '<p>There are few Libertarians and small government advocates during pandemics.</p>',
+			date: '09 March 2020 7:24pm',
+			isoDateTime: '2020-03-09T19:24:46Z',
+			status: 'visible',
+			webUrl: 'https://discussion.theguardian.com/comment-permalink/138809487',
+			apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809487',
+			numRecommends: 30,
+			isHighlighted: false,
+			responseTo: {
+				displayName: 'blipvert',
+				commentApiUrl:
+					'https://discussion.guardianapis.com/discussion-api/comment/138809272',
+				isoDateTime: '2020-03-09T19:09:28Z',
+				date: '09 March 2020 7:09pm',
+				commentId: '138809272',
+				commentWebUrl:
+					'https://discussion.theguardian.com/comment-permalink/138809272',
+			},
+			userProfile: {
+				userId: '100102208',
+				displayName: 'AJVC1991',
+				webUrl: 'https://profile.theguardian.com/user/id/100102208',
+				apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/100102208',
+				avatar: 'https://avatar.guim.co.uk/user/100102208',
+				secureAvatarUrl: 'https://avatar.guim.co.uk/user/100102208',
+				badge: [],
+			},
+		},
+		{
+			id: 138809896,
+			body: '<p>What?</p>',
+			date: '09 March 2020 7:48pm',
+			isoDateTime: '2020-03-09T19:48:31Z',
+			status: 'visible',
+			webUrl: 'https://discussion.theguardian.com/comment-permalink/138809896',
+			apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138809896',
+			numRecommends: 9,
+			isHighlighted: false,
+			responseTo: {
+				displayName: 'blipvert',
+				commentApiUrl:
+					'https://discussion.guardianapis.com/discussion-api/comment/138809272',
+				isoDateTime: '2020-03-09T19:09:28Z',
+				date: '09 March 2020 7:09pm',
+				commentId: '138809272',
+				commentWebUrl:
+					'https://discussion.theguardian.com/comment-permalink/138809272',
+			},
+			userProfile: {
+				userId: '2611744',
+				displayName: 'Delius',
+				webUrl: 'https://profile.theguardian.com/user/id/2611744',
+				apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/2611744',
+				avatar: 'https://avatar.guim.co.uk/user/2611744',
+				secureAvatarUrl: 'https://avatar.guim.co.uk/user/2611744',
+				badge: [],
+			},
+		},
+		{
+			id: 138810191,
+			body: '<p>Or at least, they don\'t flaunt their allegiance to <i>Britannia Unchained</i> and Rand quite so obviously. What awaits if we continue to act as if "there are individual men and women and there are families" and no responsibility to a wider society?</p>',
+			date: '09 March 2020 8:05pm',
+			isoDateTime: '2020-03-09T20:05:54Z',
+			status: 'visible',
+			webUrl: 'https://discussion.theguardian.com/comment-permalink/138810191',
+			apiUrl: 'https://discussion.guardianapis.com/discussion-api/comment/138810191',
+			numRecommends: 20,
+			isHighlighted: false,
+			responseTo: {
+				displayName: 'AJVC1991',
+				commentApiUrl:
+					'https://discussion.guardianapis.com/discussion-api/comment/138809487',
+				isoDateTime: '2020-03-09T19:24:46Z',
+				date: '09 March 2020 7:24pm',
+				commentId: '138809487',
+				commentWebUrl:
+					'https://discussion.theguardian.com/comment-permalink/138809487',
+			},
+			userProfile: {
+				userId: '12298092',
+				displayName: '_jhfta_',
+				webUrl: 'https://profile.theguardian.com/user/id/12298092',
+				apiUrl: 'https://discussion.guardianapis.com/discussion-api/profile/12298092',
+				avatar: 'https://avatar.guim.co.uk/user/12298092',
+				secureAvatarUrl: 'https://avatar.guim.co.uk/user/12298092',
+				badge: [],
+			},
+		},
+	],
+	metaData: {
+		commentCount: 5,
+		staffCommenterCount: 0,
+		editorsPickCount: 0,
+		blockedCount: 1,
+		responseCount: 4,
+	},
+};