From 6cedecc4e73ee5e797427c89a17f4b975130e70f Mon Sep 17 00:00:00 2001
From: Jason Wesson <jwesson@2u.com>
Date: Fri, 13 Oct 2023 05:21:21 +0000
Subject: [PATCH] revert: remove update to react-intl and keep lint error fix

---
 plugins/Plugin.jsx                |  1 +
 plugins/PluginContainer.jsx       |  1 +
 plugins/PluginContainerIframe.jsx |  1 +
 plugins/PluginErrorBoundary.jsx   |  1 +
 plugins/PluginSlot.jsx            | 29 +++++++++++++++--------------
 src/index.jsx                     |  4 ++--
 src/profile/ProfilePluginPage.jsx | 13 +++++++------
 7 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/plugins/Plugin.jsx b/plugins/Plugin.jsx
index 624ed46f3..f68f109c4 100644
--- a/plugins/Plugin.jsx
+++ b/plugins/Plugin.jsx
@@ -22,6 +22,7 @@ function errorFallbackDefault() {
   );
 }
 
+// eslint-disable-next-line react/function-component-definition
 export default function Plugin({
   children, className, style, ready, errorFallbackProp,
 }) {
diff --git a/plugins/PluginContainer.jsx b/plugins/PluginContainer.jsx
index 4d889d7ec..98f237212 100644
--- a/plugins/PluginContainer.jsx
+++ b/plugins/PluginContainer.jsx
@@ -10,6 +10,7 @@ import {
 } from './data/constants';
 import { pluginConfigShape } from './data/shapes';
 
+// eslint-disable-next-line react/function-component-definition
 export default function PluginContainer({ config, ...props }) {
   if (config === null) {
     return null;
diff --git a/plugins/PluginContainerIframe.jsx b/plugins/PluginContainerIframe.jsx
index 6ebfcadec..c53ad18e0 100644
--- a/plugins/PluginContainerIframe.jsx
+++ b/plugins/PluginContainerIframe.jsx
@@ -30,6 +30,7 @@ export const IFRAME_FEATURE_POLICY = (
   'fullscreen; microphone *; camera *; midi *; geolocation *; encrypted-media *'
 );
 
+// eslint-disable-next-line react/function-component-definition
 export default function PluginContainerIframe({
   config, fallback, className, ...props
 }) {
diff --git a/plugins/PluginErrorBoundary.jsx b/plugins/PluginErrorBoundary.jsx
index f1aaf5074..3a244a009 100644
--- a/plugins/PluginErrorBoundary.jsx
+++ b/plugins/PluginErrorBoundary.jsx
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { FormattedMessage } from 'react-intl';
 
 import { logError } from '@edx/frontend-platform/logging';
diff --git a/plugins/PluginSlot.jsx b/plugins/PluginSlot.jsx
index 464fcd9ee..b860bcd5f 100644
--- a/plugins/PluginSlot.jsx
+++ b/plugins/PluginSlot.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 import React, { forwardRef } from 'react';
 
 import classNames from 'classnames';
@@ -30,21 +31,21 @@ const PluginSlot = forwardRef(({
 
   let finalChildren = [];
   // if (plugins.length > 0) {
-    // if (keepDefault) {
-    //   finalChildren.push(children);
-    // }
-    // plugins.forEach((pluginConfig) => {
-    //   finalChildren.push(
-    //     <PluginContainer
-    //       key={pluginConfig.url}
-    //       config={pluginConfig}
-    //       fallback={finalFallback}
-    //       {...pluginProps}
-    //     />,
-    //   );
-    // });
+  // if (keepDefault) {
+  //   finalChildren.push(children);
+  // }
+  // plugins.forEach((pluginConfig) => {
+  //   finalChildren.push(
+  //     <PluginContainer
+  //       key={pluginConfig.url}
+  //       config={pluginConfig}
+  //       fallback={finalFallback}
+  //       {...pluginProps}
+  //     />,
+  //   );
+  // });
   // } else {
-    finalChildren = children;
+  finalChildren = children;
   // }
 
   return React.createElement(
diff --git a/src/index.jsx b/src/index.jsx
index 6912ebf80..faed34ee2 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -30,8 +30,8 @@ import AppRoutes from './routes/AppRoutes';
 
 const RealFooter = () => {
   const location = useLocation();
-  return ['/u/edx/plugin'].includes(location.pathname) ? <></> : <Footer />;
-}
+  return ['/u/edx/plugin'].includes(location.pathname) ? null : <Footer />;
+};
 
 subscribe(APP_READY, () => {
   ReactDOM.render(
diff --git a/src/profile/ProfilePluginPage.jsx b/src/profile/ProfilePluginPage.jsx
index d676a6c2b..b1b1baad8 100644
--- a/src/profile/ProfilePluginPage.jsx
+++ b/src/profile/ProfilePluginPage.jsx
@@ -38,6 +38,7 @@ import withParams from '../utils/hoc';
 
 ensureConfig(['CREDENTIALS_BASE_URL', 'LMS_BASE_URL'], 'ProfilePage');
 
+// eslint-disable-next-line react/function-component-definition
 function Fallback() {
   return (
     <div>this is broken as all get</div>
@@ -135,7 +136,7 @@ class ProfilePluginPage extends React.Component {
                   className="mb-md-3"
                   src={profileImage.src}
                   isDefault={profileImage.isDefault}
-                  />
+                />
               </div>
             </div>
             <div className="col pl-0">
@@ -151,25 +152,25 @@ class ProfilePluginPage extends React.Component {
                 visibilityName={visibilityName}
                 formId="name"
                 {...commonFormProps}
-                />
+              />
               <Country
                 country={country}
                 visibilityCountry={visibilityCountry}
                 formId="country"
                 {...commonFormProps}
-                />
+              />
               <Education
                 levelOfEducation={levelOfEducation}
                 visibilityLevelOfEducation={visibilityLevelOfEducation}
                 formId="levelOfEducation"
                 {...commonFormProps}
-                />
+              />
               <SocialLinks
                 socialLinks={socialLinks}
                 visibilitySocialLinks={visibilitySocialLinks}
                 formId="socialLinks"
                 {...commonFormProps}
-                />
+              />
             </div>
             <div className="pt-md-3 col-md-8 col-lg-7 offset-lg-1">
               <Bio
@@ -177,7 +178,7 @@ class ProfilePluginPage extends React.Component {
                 visibilityBio={visibilityBio}
                 formId="bio"
                 {...commonFormProps}
-                />
+              />
             </div>
           </div>
         </div>