diff --git a/src/pages-and-resources/PagesAndResources.jsx b/src/pages-and-resources/PagesAndResources.jsx index 07719a54e..3147741cc 100644 --- a/src/pages-and-resources/PagesAndResources.jsx +++ b/src/pages-and-resources/PagesAndResources.jsx @@ -47,7 +47,7 @@ const PagesAndResources = ({ courseId, intl }) => { const xpertSettings = useModel('XpertSettings', 'xpert-unit-summary'); const permissonPages = [{ ...XpertAppInfo, - enabled: xpertSettings?.enabled, + enabled: xpertSettings?.enabled !== undefined, }]; if (loadingStatus === RequestStatus.IN_PROGRESS) { diff --git a/src/pages-and-resources/xpert-unit-summary/XpertUnitSummarySettings.jsx b/src/pages-and-resources/xpert-unit-summary/XpertUnitSummarySettings.jsx index c90d3a22b..34bb30f40 100644 --- a/src/pages-and-resources/xpert-unit-summary/XpertUnitSummarySettings.jsx +++ b/src/pages-and-resources/xpert-unit-summary/XpertUnitSummarySettings.jsx @@ -1,6 +1,5 @@ import React, { useCallback, useContext, useEffect } from 'react'; import { history } from '@edx/frontend-platform'; -import { Hyperlink } from '@edx/paragon'; import { useDispatch } from 'react-redux'; import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; @@ -27,21 +26,8 @@ const XpertUnitSummarySettings = ({ intl }) => { - {intl.formatMessage(messages.enableXpertUnitSummaryHelp)} - {' '} - - {intl.formatMessage(messages.enableXpertUnitSummaryHelpPrivacyLink)} - - - ) - } + enableAppHelp={intl.formatMessage(messages.enableXpertUnitSummaryHelp)} + helpPrivacyText={intl.formatMessage(messages.enableXpertUnitSummaryHelpPrivacyLink)} enableAppLabel={intl.formatMessage(messages.enableXpertUnitSummaryLabel)} learnMoreText={intl.formatMessage(messages.enableXpertUnitSummaryLink)} allUnitsEnabledText={intl.formatMessage(messages.allUnitsEnabledByDefault)} diff --git a/src/pages-and-resources/xpert-unit-summary/settings-modal/ResetIcon.jsx b/src/pages-and-resources/xpert-unit-summary/settings-modal/ResetIcon.jsx new file mode 100644 index 000000000..ad5805976 --- /dev/null +++ b/src/pages-and-resources/xpert-unit-summary/settings-modal/ResetIcon.jsx @@ -0,0 +1,21 @@ +const ResetIcon = (props) => ( + +); + +export default ResetIcon; diff --git a/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.jsx b/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.jsx index 733c09308..5cf183dd1 100644 --- a/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.jsx +++ b/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.jsx @@ -13,7 +13,7 @@ import { Hyperlink, } from '@edx/paragon'; import { - Info, CheckCircleOutline, RotateLeft, SpinnerSimple, + Info, CheckCircleOutline, SpinnerSimple, } from '@edx/paragon/icons'; import { Formik } from 'formik'; @@ -38,6 +38,7 @@ import AppConfigFormDivider from '../../discussions/app-config-form/apps/shared/ import { PagesAndResourcesContext } from '../../PagesAndResourcesProvider'; import messages from './messages'; import appInfo from '../appInfo'; +import ResetIcon from './ResetIcon'; const AppSettingsForm = ({ formikProps, children, showForm, @@ -150,7 +151,10 @@ const ResetUnitsButton = ({ + {intl.formatMessage(messages[messageKey])} )} @@ -163,7 +167,7 @@ const ResetUnitsButton = ({ finish: intl.formatMessage(messages.reset), }} icons={{ - default: , + default: , pending: , finish: , }} @@ -201,6 +205,7 @@ const SettingsModal = ({ enableAppLabel, enableAppHelp, learnMoreText, + helpPrivacyText, enableReinitialize, allUnitsEnabledText, noUnitsEnabledText, @@ -251,14 +256,29 @@ const SettingsModal = ({ }; const learnMoreLink = appInfo.documentationLinks?.learnMoreConfiguration && ( - - {learnMoreText} - +
+ + {learnMoreText} + +
+ ); + + const helpPrivacyLink = ( +
+ + {helpPrivacyText} + +
); if (loadingStatus === RequestStatus.SUCCESSFUL) { @@ -330,7 +350,8 @@ const SettingsModal = ({ helpText={(

{enableAppHelp}

- {learnMoreLink} + {helpPrivacyLink} + {learnMoreLink}
)} /> @@ -410,6 +431,7 @@ SettingsModal.propTypes = { enableAppLabel: PropTypes.string.isRequired, enableAppHelp: PropTypes.string.isRequired, learnMoreText: PropTypes.string.isRequired, + helpPrivacyText: PropTypes.string.isRequired, allUnitsEnabledText: PropTypes.string.isRequired, noUnitsEnabledText: PropTypes.string.isRequired, configureBeforeEnable: PropTypes.bool, diff --git a/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.scss b/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.scss index c37d257db..82942e210 100644 --- a/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.scss +++ b/src/pages-and-resources/xpert-unit-summary/settings-modal/SettingsModal.scss @@ -16,7 +16,9 @@ flex: 1; > label { - height: 80px; + min-height: 80px; + flex-wrap: wrap; + justify-content: space-between; } } } @@ -27,5 +29,14 @@ border-color: $border-color; border-radius: $border-radius; border-style: solid; - margin-left: auto; +} + +.reset-tooltip { + .arrow::before { + border-right-color: #00262B; + } + + .tooltip-inner { + background-color: #00262B; + } }