From 4b2b599eaf4d6ef4098f692239bfdef89df62218 Mon Sep 17 00:00:00 2001
From: Awais Ansari <79941147+awais-ansari@users.noreply.github.com>
Date: Wed, 23 Feb 2022 11:25:56 +0500
Subject: [PATCH] fix: display same message for everyone during discussions
 provider configuration (#257)

---
 .../apps/lti/LtiConfigForm.jsx                | 32 +++++++++----------
 .../app-config-form/apps/lti/messages.js      |  4 ---
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/pages-and-resources/discussions/app-config-form/apps/lti/LtiConfigForm.jsx b/src/pages-and-resources/discussions/app-config-form/apps/lti/LtiConfigForm.jsx
index a5f700505..35ca6038e 100644
--- a/src/pages-and-resources/discussions/app-config-form/apps/lti/LtiConfigForm.jsx
+++ b/src/pages-and-resources/discussions/app-config-form/apps/lti/LtiConfigForm.jsx
@@ -62,9 +62,22 @@ function LtiConfigForm({ onSubmit, intl, formRef }) {
     <Card className="mb-5 p-5" data-testid="ltiConfigForm">
       <Form ref={formRef} onSubmit={handleSubmit}>
         <h3 className="mb-3">{providerName}</h3>
-        {showLTIConfig ? (
+        <p>
+          <FormattedMessage
+            {...messages.stuffOnlyConfig}
+            values={{
+              providerName,
+              platformName: getConfig().SITE_NAME,
+              supportEmail: supportEmail ? (
+                <MailtoLink to={supportEmail}>{supportEmail}</MailtoLink>
+              ) : (
+                'support'
+              ),
+            }}
+          />
+        </p>
+        {showLTIConfig && (
           <>
-            <p>{intl.formatMessage(messages.adminOnlyConfig, { providerName })}</p>
             <p>{intl.formatMessage(messages.formInstructions)}</p>
             <Form.Group
               controlId="consumerKey"
@@ -115,21 +128,6 @@ function LtiConfigForm({ onSubmit, intl, formRef }) {
               )}
             </Form.Group>
           </>
-        ) : (
-          <p>
-            <FormattedMessage
-              {...messages.stuffOnlyConfig}
-              values={{
-                providerName,
-                platformName: getConfig().SITE_NAME,
-                supportEmail: supportEmail ? (
-                  <MailtoLink to={supportEmail}>{supportEmail}</MailtoLink>
-                ) : (
-                  'support'
-                ),
-              }}
-            />
-          </p>
         )}
         {(enablePIISharing) && (
           <div data-testid="piiSharingFields">
diff --git a/src/pages-and-resources/discussions/app-config-form/apps/lti/messages.js b/src/pages-and-resources/discussions/app-config-form/apps/lti/messages.js
index 2a8fea4aa..b052d7dd4 100644
--- a/src/pages-and-resources/discussions/app-config-form/apps/lti/messages.js
+++ b/src/pages-and-resources/discussions/app-config-form/apps/lti/messages.js
@@ -43,10 +43,6 @@ const messages = defineMessages({
     id: 'authoring.discussions.stuffConfig',
     defaultMessage: '{providerName} can only be configured by {platformName} administrators. Please contact {supportEmail} to enable this feature. This will require sharing usernames and emails of learners and the course team with {providerName}',
   },
-  adminOnlyConfig: {
-    id: 'authoring.discussions.adminOnlyConfig',
-    defaultMessage: 'This configuration will require sharing usernames and emails of learners and the course team with {providerName}',
-  },
   piiSharing: {
     id: 'authoring.discussions.piiSharing',
     defaultMessage: 'Optionally share a user\'s username and/or email with the LTI provider:',