Skip to content

Commit

Permalink
Merge branch 'master' into rpenido/fal-3678-tag-sections-subsections-…
Browse files Browse the repository at this point in the history
…and-the-whole-course
  • Loading branch information
rpenido committed Mar 15, 2024
2 parents 1f14240 + d57ecc6 commit d57d5ad
Show file tree
Hide file tree
Showing 71 changed files with 2,405 additions and 838 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# The following users are the maintainers of all frontend-app-course-authoring files
* @openedx/teaching-and-learning
* @openedx/2u-tnl
197 changes: 195 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"react-responsive": "9.0.2",
"react-router": "6.16.0",
"react-router-dom": "6.16.0",
"react-select": "5.8.0",
"react-textarea-autosize": "^8.4.1",
"react-transition-group": "4.4.5",
"redux": "4.0.5",
Expand Down
7 changes: 6 additions & 1 deletion plugins/course-apps/teams/GroupEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ import { GroupTypes, TeamSizes } from 'CourseAuthoring/data/constants';
import CollapsableEditor from 'CourseAuthoring/generic/CollapsableEditor';
import FormikControl from 'CourseAuthoring/generic/FormikControl';
import messages from './messages';
import { isGroupTypeEnabled } from './utils';

// Maps a team type to its corresponding intl message
const TeamTypeNameMessage = {
[GroupTypes.OPEN]: {
label: messages.groupTypeOpen,
description: messages.groupTypeOpenDescription,
},
[GroupTypes.OPEN_MANAGED]: {
label: messages.groupTypeOpenManaged,
description: messages.groupTypeOpenManagedDescription,
},
[GroupTypes.PUBLIC_MANAGED]: {
label: messages.groupTypePublicManaged,
description: messages.groupTypePublicManagedDescription,
Expand Down Expand Up @@ -105,7 +110,7 @@ const GroupEditor = ({
onChange={onChange}
onBlur={onBlur}
>
{Object.values(GroupTypes).map(groupType => (
{Object.values(GroupTypes).map(groupType => isGroupTypeEnabled(groupType) && (
<Form.Radio
key={groupType}
value={groupType}
Expand Down
Loading

0 comments on commit d57d5ad

Please sign in to comment.