Merge branch 'master' of https://github.com/ReCodEx/web-app into fix-…

…create-sis-group Finalization of SIS groups bug fix.
ReCodEx · Nov 16, 2017 · 3105b00 · 3105b00
2 parents 02de08f + 49046f0
commit 3105b00
Show file tree

Hide file tree

Showing 53 changed files with 896 additions and 714 deletions.
diff --git a/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js b/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js
@@ -8,7 +8,7 @@ import { LinkContainer } from 'react-router-bootstrap';
 import DeleteAssignmentButtonContainer from '../../../containers/DeleteAssignmentButtonContainer';
 
 import withLinks from '../../../hoc/withLinks';
-import LocalizedExerciseName from '../../helpers/LocalizedExerciseName';
+import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 import {
   EditIcon,
   MaybePublicIcon,

diff --git a/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js b/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js
@@ -5,7 +5,7 @@ import AssignmentStatusIcon from '../AssignmentStatusIcon/AssignmentStatusIcon';
 import { FormattedDate, FormattedTime } from 'react-intl';
 
 import withLinks from '../../../../hoc/withLinks';
-import LocalizedExerciseName from '../../../helpers/LocalizedExerciseName';
+import { LocalizedExerciseName } from '../../../helpers/LocalizedNames';
 import { MaybeBonusAssignmentIcon } from '../../../icons';
 
 const AssignmentTableRow = ({

diff --git a/src/components/Exercises/ExerciseDetail/ExerciseDetail.js b/src/components/Exercises/ExerciseDetail/ExerciseDetail.js
@@ -18,7 +18,7 @@ import GroupsNameContainer from '../../../containers/GroupsNameContainer';
 import styles from './ExerciseDetail.less';
 import { MaybeSucceededIcon } from '../../icons';
 import { getLocalizedDescription } from '../../../helpers/getLocalizedData';
-import LocalizedExerciseName from '../../helpers/LocalizedExerciseName';
+import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 
 const ExerciseDetail = ({
   id,

diff --git a/src/components/Exercises/ExercisesListItem/ExercisesListItem.js b/src/components/Exercises/ExercisesListItem/ExercisesListItem.js
@@ -8,7 +8,7 @@ import GroupsNameContainer from '../../../containers/GroupsNameContainer';
 import { Link } from 'react-router';
 
 import withLinks from '../../../hoc/withLinks';
-import LocalizedExerciseName from '../../helpers/LocalizedExerciseName';
+import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 import { MaybeLockedExerciseIcon } from '../../icons';
 
 const ExercisesListItem = ({

diff --git a/src/components/Exercises/ExercisesName/ExercisesName.js b/src/components/Exercises/ExercisesName/ExercisesName.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router';
 
 import withLinks from '../../../hoc/withLinks';
-import LocalizedExerciseName from '../../helpers/LocalizedExerciseName';
+import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 
 import { MaybeLockedExerciseIcon } from '../../icons';
 

diff --git a/src/components/Exercises/ExercisesSimpleListItem/ExercisesSimpleListItem.js b/src/components/Exercises/ExercisesSimpleListItem/ExercisesSimpleListItem.js
@@ -5,7 +5,7 @@ import UsersNameContainer from '../../../containers/UsersNameContainer';
 import { Link } from 'react-router';
 
 import withLinks from '../../../hoc/withLinks';
-import LocalizedExerciseName from '../../helpers/LocalizedExerciseName';
+import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 import { MaybeLockedExerciseIcon } from '../../icons';
 
 const ExercisesSimpleListItem = ({

diff --git a/src/components/Groups/AdminsView/AdminsView.js b/src/components/Groups/AdminsView/AdminsView.js
@@ -1,21 +1,24 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Row, Col } from 'react-bootstrap';
+import { getFormValues } from 'redux-form';
+import { connect } from 'react-redux';
 
 import Box from '../../widgets/Box';
 import AddSupervisor from '../AddSupervisor';
-import CreateGroupForm from '../../forms/CreateGroupForm'; // @todo replace with it's' container
+import EditGroupForm from '../../forms/EditGroupForm';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 
-const AdminsView = ({ group, addSubgroup }) => (
+const AdminsView = ({ group, addSubgroup, formValues, intl: { locale } }) =>
   <div>
     <Row>
       <Col sm={12}>
         <h3>
           <FormattedMessage
             id="app.group.adminsView.title"
             defaultMessage="Administrator controls of {groupName}"
-            values={{ groupName: group.name }}
+            values={{ groupName: getLocalizedName(group, locale) }}
           />
         </h3>
       </Col>
@@ -34,26 +37,30 @@ const AdminsView = ({ group, addSubgroup }) => (
         </Box>
       </Col>
       <Col md={6}>
-        <CreateGroupForm
-          title={
-            <FormattedMessage
-              id="app.group.adminsView.addSubgroup"
-              defaultMessage="Add subgroup"
-            />
-          }
+        <EditGroupForm
           onSubmit={addSubgroup}
-          instanceId={group.instanceId}
           initialValues={{ publicStats: true }}
-          parentGroupId={group.id}
+          createNew
+          collapsable
+          isOpen={false}
+          formValues={formValues}
         />
       </Col>
     </Row>
-  </div>
-);
+  </div>;
 
 AdminsView.propTypes = {
   group: PropTypes.object.isRequired,
-  addSubgroup: PropTypes.func.isRequired
+  addSubgroup: PropTypes.func.isRequired,
+  formValues: PropTypes.object,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default AdminsView;
+export default connect(
+  state => {
+    return {
+      formValues: getFormValues('editGroup')(state)
+    };
+  },
+  dispatch => ({})
+)(injectIntl(AdminsView));
diff --git a/src/components/Groups/GroupDetail/GroupDetail.js b/src/components/Groups/GroupDetail/GroupDetail.js
@@ -1,20 +1,25 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage, FormattedNumber } from 'react-intl';
+import { FormattedMessage, FormattedNumber, injectIntl } from 'react-intl';
 import { Row, Col, Table } from 'react-bootstrap';
 import ReactMarkdown from 'react-remarkable';
 
 import Box from '../../widgets/Box';
 import SupervisorsList from '../../Users/SupervisorsList';
 import { MaybeSucceededIcon } from '../../icons';
 import GroupTree from '../GroupTree';
+import {
+  getLocalizedName,
+  getLocalizedDescription
+} from '../../../helpers/getLocalizedData';
 
 const GroupDetail = ({
   group: {
     id,
     externalId,
     name,
+    localizedTexts,
     description,
     threshold,
     parentGroupId,
@@ -26,7 +31,8 @@ const GroupDetail = ({
   groups,
   publicGroups,
   supervisors,
-  isAdmin
+  isAdmin,
+  intl: { locale }
 }) =>
   <div>
     <Row>
@@ -40,7 +46,14 @@ const GroupDetail = ({
                   defaultMessage="Group description"
                 />
               }
-              description={<ReactMarkdown source={description} />}
+              description={
+                <ReactMarkdown
+                  source={getLocalizedDescription(
+                    { description, localizedTexts },
+                    locale
+                  )}
+                />
+              }
               type="primary"
               collapsable
               noPadding
@@ -123,7 +136,9 @@ const GroupDetail = ({
             <FormattedMessage
               id="app.groupDetail.supervisors"
               defaultMessage="Supervisors of {groupName}"
-              values={{ groupName: name }}
+              values={{
+                groupName: getLocalizedName({ name, localizedTexts }, locale)
+              }}
             />
           }
         >
@@ -157,7 +172,8 @@ GroupDetail.propTypes = {
   groups: PropTypes.object.isRequired,
   publicGroups: ImmutablePropTypes.map.isRequired,
   supervisors: PropTypes.array.isRequired,
-  isAdmin: PropTypes.bool
+  isAdmin: PropTypes.bool,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default GroupDetail;
+export default injectIntl(GroupDetail);
diff --git a/src/components/Groups/GroupTree/GroupTree.js b/src/components/Groups/GroupTree/GroupTree.js
@@ -6,6 +6,7 @@ import Button from '../../widgets/FlatButton';
 import { LinkContainer } from 'react-router-bootstrap';
 import { TreeView, TreeViewItem } from '../../widgets/TreeView';
 import { isReady, getJsData } from '../../../redux/helpers/resourceManager';
+import GroupsName from '../GroupsName';
 
 import withLinks from '../../../hoc/withLinks';
 
@@ -59,6 +60,7 @@ class GroupTree extends Component {
 
     const {
       name,
+      localizedTexts,
       admins,
       childGroups: { all: allChildGroups, public: publicChildGroups },
       canView
@@ -68,7 +70,14 @@ class GroupTree extends Component {
       <TreeView>
         {level !== 0 &&
           <TreeViewItem
-            title={name}
+            title={
+              <GroupsName
+                id={id}
+                name={name}
+                localizedTexts={localizedTexts}
+                noLink
+              />
+            }
             level={level}
             admins={admins}
             isOpen={currentGroupId === id || isOpen}

diff --git a/src/components/Groups/GroupsList/GroupsList.js b/src/components/Groups/GroupsList/GroupsList.js
@@ -1,41 +1,43 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Link } from 'react-router';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Table } from 'react-bootstrap';
 import ResourceRenderer from '../../helpers/ResourceRenderer';
 import Icon from 'react-fontawesome';
 
+import GroupsName from '../GroupsName';
 import withLinks from '../../../hoc/withLinks';
 
 const GroupsList = ({
   groups = [],
   renderButtons = () => null,
   links: { GROUP_URI_FACTORY },
   ...props
-}) => (
+}) =>
   <ResourceRenderer resource={groups.toArray()}>
-    {(...groups) => (
+    {(...groups) =>
       <Table hover {...props}>
         <tbody>
-          {groups.map(({ id, name }) => (
+          {groups.map(({ id, name, localizedTexts }) =>
             <tr key={id}>
               <td className="text-center">
                 <Icon name="group" />
               </td>
               <td>
-                <Link to={GROUP_URI_FACTORY(id)}>{name}</Link>
+                <GroupsName
+                  id={id}
+                  name={name}
+                  localizedTexts={localizedTexts}
+                />
               </td>
               <td className="text-right">
                 {renderButtons(id)}
               </td>
             </tr>
-          ))}
+          )}
         </tbody>
-      </Table>
-    )}
-  </ResourceRenderer>
-);
+      </Table>}
+  </ResourceRenderer>;
 
 GroupsList.propTypes = {
   groups: ImmutablePropTypes.map.isRequired,

diff --git a/src/components/Groups/GroupsName/GroupsName.js b/src/components/Groups/GroupsName/GroupsName.js
@@ -2,20 +2,29 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router';
 import withLinks from '../../../hoc/withLinks';
+import { LocalizedGroupName } from '../../helpers/LocalizedNames';
 
-const GroupsName = ({ id, name, noLink, links: { GROUP_URI_FACTORY } }) => (
+const GroupsName = ({
+  id,
+  name,
+  localizedTexts,
+  noLink,
+  links: { GROUP_URI_FACTORY }
+}) =>
   <span>
-    {noLink ? (
-      <span>{name}</span>
-    ) : (
-      <Link to={GROUP_URI_FACTORY(id)}>{name}</Link>
-    )}
-  </span>
-);
+    {noLink
+      ? <span>
+          <LocalizedGroupName entity={{ name, localizedTexts }} />
+        </span>
+      : <Link to={GROUP_URI_FACTORY(id)}>
+          <LocalizedGroupName entity={{ name, localizedTexts }} />
+        </Link>}
+  </span>;
 
 GroupsName.propTypes = {
   id: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
+  localizedTexts: PropTypes.array.isRequired,
   noLink: PropTypes.bool,
   links: PropTypes.object
 };

diff --git a/src/components/Groups/ResultsTable/ResultsTable.js b/src/components/Groups/ResultsTable/ResultsTable.js
@@ -10,7 +10,7 @@ import LoadingResultsTableRow from './LoadingResultsTableRow';
 import NoResultsAvailableRow from './NoResultsAvailableRow';
 import withLinks from '../../../hoc/withLinks';
 import ResourceRenderer from '../../helpers/ResourceRenderer';
-import LocalizedExerciseName from '../../helpers/LocalizedExerciseName';
+import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 import styles from './ResultsTable.less';
 
 const ResultsTable = ({

diff --git a/src/components/Groups/StudentsView/StudentsView.js b/src/components/Groups/StudentsView/StudentsView.js
@@ -1,29 +1,30 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Row, Col } from 'react-bootstrap';
 
 import Box from '../../widgets/Box';
 import AssignmentsTable from '../../Assignments/Assignment/AssignmentsTable';
 import StudentsListContainer from '../../../containers/StudentsListContainer';
-import LeaveJoinGroupButtonContainer
-  from '../../../containers/LeaveJoinGroupButtonContainer';
+import LeaveJoinGroupButtonContainer from '../../../containers/LeaveJoinGroupButtonContainer';
+import { getLocalizedName } from '../../../helpers/getLocalizedData';
 
 const StudentsView = ({
   group,
   statuses = [],
   assignments,
-  isAdmin = false
-}) => (
+  isAdmin = false,
+  intl: { locale }
+}) =>
   <div>
     <Row>
       <Col sm={12}>
         <h3>
           <FormattedMessage
             id="app.group.studentsView.title"
             defaultMessage="Student's dashboard for {groupName}"
-            values={{ groupName: group.name }}
+            values={{ groupName: getLocalizedName(group, locale) }}
           />
         </h3>
       </Col>
@@ -75,14 +76,14 @@ const StudentsView = ({
         </Box>
       </Col>
     </Row>
-  </div>
-);
+  </div>;
 
 StudentsView.propTypes = {
   group: PropTypes.object.isRequired,
   assignments: ImmutablePropTypes.list.isRequired,
   statuses: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-  isAdmin: PropTypes.bool
+  isAdmin: PropTypes.bool,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default StudentsView;
+export default injectIntl(StudentsView);