Merge pull request #27427 from guardian/remove-discussion-frontend

Remove discussion-frontend
guardian · Sep 5, 2024 · 19aaa61 · 19aaa61
2 parents 33f95ec + 8d02fa9
commit 19aaa61
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 108 deletions.
diff --git a/common/app/views/fragments/discussionFooter.scala.html b/common/app/views/fragments/discussionFooter.scala.html
@@ -4,11 +4,6 @@
 
 @(content: Content, isCommentable: Boolean, discussionClosed: Boolean, discussionId: String)(implicit request: RequestHeader)
 
-@sectionHeading = {
-
-    <div class="discussion__heading js-discussion-external-frontend"></div>
-}
-
 @toolbar = {
     <div class="discussion__toolbar js-discussion-toolbar u-cf">
 
@@ -104,7 +99,15 @@ <h2 class="container__meta__title">
                     </div>
 
                     <div class="modern-visible">
-                        @sectionHeading
+
+                        <div class="discussion__heading">
+                            <div class="container__meta">
+                                @if(discussionClosed) {
+                                    <p class="container__meta__item">
+                                    This discussion is closed for comments.
+                                </p>}
+                            </div>
+                        </div>
 
                         <div class="discussion__comment-box js-discussion-comment-box--top"></div>
 

diff --git a/common/app/views/support/JavaScriptPage.scala b/common/app/views/support/JavaScriptPage.scala
@@ -91,7 +91,6 @@ object JavaScriptPage {
       ("membershipAccess", JsString(membershipAccess)),
       ("idWebAppUrl", JsString(Configuration.id.oauthUrl)),
       ("cardStyle", JsString(cardStyle)),
-      ("discussionFrontendUrl", JsString(DiscussionAsset("discussion-frontend.preact.iife"))),
       ("brazeApiKey", JsString(Configuration.braze.apiKey)),
       ("ipsosTag", JsString(ipsos)),
       ("isAdFree", JsBoolean(isAdFree(request))),

diff --git a/static/src/javascripts/projects/common/modules/discussion/discussion-frontend.js b/static/src/javascripts/projects/common/modules/discussion/discussion-frontend.js
diff --git a/static/src/javascripts/projects/common/modules/discussion/loader.js b/static/src/javascripts/projects/common/modules/discussion/loader.js
@@ -15,7 +15,6 @@ import { Component } from 'common/modules/component';
 import { getUser } from 'common/modules/discussion/api';
 import { CommentBox } from 'common/modules/discussion/comment-box';
 import { Comments } from 'common/modules/discussion/comments';
-import { loadDiscussionFrontend } from 'common/modules/discussion/discussion-frontend';
 import {
 	handle as upvoteHandle,
 	closeTooltip as upvoteCloseTooltip,
@@ -127,7 +126,6 @@ class Loader extends Component {
 		this.initTopComments();
 		this.initMainComments();
 		this.initToolbar();
-		this.renderCommentCount();
 		this.initPagination();
 		this.initRecommend();
 
@@ -616,24 +614,6 @@ class Loader extends Component {
 			);
 		}
 	}
-
-	renderCommentCount() {
-		loadDiscussionFrontend(this, {
-			apiHost: config.get('page.discussionApiUrl'),
-			avatarImagesHost: config.get('page.avatarImagesUrl'),
-			closed: this.getDiscussionClosed(),
-			discussionId: this.getDiscussionId(),
-			element: document.getElementsByClassName(
-				'js-discussion-external-frontend',
-			)[0],
-			userFromCookie: !!getUserFromCookie(),
-			profileUrl: config.get('page.idUrl'),
-			profileClientId: config.get('switches.registerWithPhone')
-				? 'comments'
-				: '',
-			Promise,
-		});
-	}
 }
 
 export { Loader };