Merge branch 'master' into update-browserslist-db

openedx · Feb 1, 2023 · ed0e575 · ed0e575
2 parents b178c3f + bf69560
commit ed0e575
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/components/ReportingConfig/ReportingConfigForm.jsx b/src/components/ReportingConfig/ReportingConfigForm.jsx
@@ -242,6 +242,8 @@ class ReportingConfigForm extends React.Component {
             <ValidationFormGroup
               for="deliveryMethod"
               helpText="The method in which the data should be sent"
+              invalid={!!APIErrors.deliveryMethod}
+              invalidMessage={APIErrors.deliveryMethod}
             >
               <label htmlFor="deliveryMethod">Delivery Method</label>
               <Input
@@ -251,6 +253,13 @@ class ReportingConfigForm extends React.Component {
                 defaultValue={config ? config.deliveryMethod : reportingConfigTypes.deliveryMethod[0][0]}
                 options={reportingConfigTypes.deliveryMethod.map(item => ({ label: item[1], value: item[0] }))}
                 onChange={e => this.setState({ deliveryMethod: e.target.value })}
+                disabled={config}
+              />
+              <input
+                type="hidden"
+                name="deliveryMethod"
+                value={config ? config.deliveryMethod : reportingConfigTypes.deliveryMethod[0][0]}
+                disabled={!config}
               />
             </ValidationFormGroup>
             <ValidationFormGroup

diff --git a/src/components/settings/SettingsLMSTab/ErrorReporting/utils.jsx b/src/components/settings/SettingsLMSTab/ErrorReporting/utils.jsx
@@ -46,7 +46,7 @@ export function getSyncStatus(status, statusMessage) {
               </Popover.Content>
             </Popover>
       )}
-        ><Hyperlink className="ml-3"><u>Read</u></Hyperlink>
+        ><Hyperlink className="ml-3" style={{ cursor: 'pointer' }}><u>Read</u></Hyperlink>
         </OverlayTrigger>
       </>
       )}

diff --git a/src/components/settings/SettingsLMSTab/index.jsx b/src/components/settings/SettingsLMSTab/index.jsx
@@ -154,7 +154,7 @@ const SettingsLMSTab = ({
       </h2>
       {displayNeedsSSOAlert && !hasSSOConfig && (
         <Alert
-          className="mr-6 sso-alert-modal-margin"
+          className="mw-lg sso-alert-modal-margin"
           variant="danger"
           icon={Info}
           actions={[

diff --git a/src/components/settings/settings.scss b/src/components/settings/settings.scss
@@ -51,6 +51,7 @@
 
 .side-button {
   float: right;
+  margin-left: 1rem;
   margin-right: 1rem;
   right: 0;
   width: 300px;