Skip to content

Commit 6c1b8b6

Browse files
authored
fix: UX feedback suggestions from TNL-8730 (#205)
Fix styling of delete message to reduce gaps between paras Fix bold font on collapsed title of group Add no groups found error message when trying to enable teams without groups defined
1 parent daee1e1 commit 6c1b8b6

File tree

6 files changed

+187
-73
lines changed

6 files changed

+187
-73
lines changed

package-lock.json

Lines changed: 143 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
},
3737
"dependencies": {
3838
"@edx/brand": "npm:@edx/brand-openedx@1.1.0",
39-
"@edx/frontend-component-footer": "10.0.11",
39+
"@edx/frontend-component-footer": "10.1.6",
4040
"@edx/frontend-platform": "1.12.7",
41-
"@edx/paragon": "16.14.3",
41+
"@edx/paragon": "16.15.1",
4242
"@fortawesome/fontawesome-svg-core": "1.2.28",
4343
"@fortawesome/free-brands-svg-icons": "5.11.2",
4444
"@fortawesome/free-regular-svg-icons": "5.11.2",

src/pages-and-resources/app-settings-modal/AppSettingsModal.jsx

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
import React, {
2-
useContext, useEffect, useRef, useState,
3-
} from 'react';
4-
import PropTypes from 'prop-types';
5-
6-
import { Formik } from 'formik';
7-
import { useDispatch, useSelector } from 'react-redux';
8-
import * as Yup from 'yup';
9-
101
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
112
import {
123
ActionRow,
@@ -20,6 +11,14 @@ import {
2011
} from '@edx/paragon';
2112
import { Info } from '@edx/paragon/icons';
2213

14+
import { Formik } from 'formik';
15+
import PropTypes from 'prop-types';
16+
import React, {
17+
useContext, useEffect, useRef, useState,
18+
} from 'react';
19+
import { useDispatch, useSelector } from 'react-redux';
20+
import * as Yup from 'yup';
21+
2322
import { RequestStatus } from '../../data/constants';
2423
import ConnectionErrorAlert from '../../generic/ConnectionErrorAlert';
2524
import FormSwitchGroup from '../../generic/FormSwitchGroup';
@@ -215,9 +214,9 @@ function AppSettingsModal({
215214
{saveError && (
216215
<Alert variant="danger" icon={Info} ref={alertRef}>
217216
<Alert.Heading>
218-
{intl.formatMessage(messages.errorSavingTitle)}
217+
{formikProps.errors.enabled?.title ?? intl.formatMessage(messages.errorSavingTitle)}
219218
</Alert.Heading>
220-
{intl.formatMessage(messages.errorSavingMessage)}
219+
{formikProps.errors.enabled?.message ?? intl.formatMessage(messages.errorSavingMessage)}
221220
</Alert>
222221
)}
223222
<FormSwitchGroup
@@ -244,7 +243,7 @@ function AppSettingsModal({
244243
)}
245244
/>
246245
{(formikProps.values.enabled || configureBeforeEnable) && children
247-
&& <AppConfigFormDivider marginAdj={{ default: 0, sm: 0 }} />}
246+
&& <AppConfigFormDivider marginAdj={{ default: 0, sm: 0 }} />}
248247
<AppSettingsForm formikProps={formikProps} showForm={formikProps.values.enabled || configureBeforeEnable}>
249248
{children}
250249
</AppSettingsForm>

src/pages-and-resources/teams/GroupEditor.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ function GroupEditor({
4040
<TransitionReplace>
4141
{isDeleting
4242
? (
43-
<div className="d-flex flex-column card rounded mb-3 px-3 py-2 p-4" key="isDeleting">
44-
<h3>{intl.formatMessage(messages.groupDeleteHeading)}</h3>
43+
<div className="d-flex flex-column card rounded mb-3 px-4 py-2 p-4" key="isDeleting">
44+
<h4 className="mb-3">{intl.formatMessage(messages.groupDeleteHeading)}</h4>
4545
{intl.formatMessage(messages.groupDeleteBody).split('\n').map(text => <p>{text}</p>)}
4646
<div className="d-flex flex-row justify-content-end">
4747
<Button variant="muted" size="sm" onClick={cancelDeletion}>
@@ -72,7 +72,7 @@ function GroupEditor({
7272
) : (
7373
<div className="d-flex flex-column flex-shrink-1 small mw-100">
7474
<div className="small text-gray-500">{intl.formatMessage(TeamTypeNameMessage[group.type].label)}</div>
75-
<div className="h4 text-truncate my-1">{group.name}</div>
75+
<div className="h4 text-truncate my-1 font-weight-normal">{group.name}</div>
7676
<div className="small text-truncate text-muted text-gray-500">{group.description}</div>
7777
</div>
7878
)

0 commit comments

Comments
 (0)