Hwgroup selection on the edit limits page (#184)

* Test limits were moved to a separate page. * Fixing links and button captions. * Massive reorg. of low level technicalities and helpers. * Limit form (and related stuff) modified to use hwGroup limits endpoint instead of simpleLimits endpoint. Simple limits are no more. * Cleanup - removing unused old components. * Remaining SimpleLimits components renamed to Limits only. * Fixing state-detection bug in multiple forms (spread by copy-and-paste). * Edit hardware group form added to Edit Limits page. * Adding metadata panel on Edit Limits page, so the limits constraints for selected hardware group are visible. * Final polishing and minor tune-ups.
ReCodEx · Feb 24, 2018 · 41f4a6f · 41f4a6f
1 parent 84e3725
commit 41f4a6f
Show file tree

Hide file tree

Showing 142 changed files with 2,155 additions and 2,026 deletions.
diff --git a/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js b/src/components/Assignments/AdminAssignmentsTable/AdminAssignmentsTableRow.js
@@ -7,7 +7,7 @@ import Button from '../../widgets/FlatButton';
 import { LinkContainer } from 'react-router-bootstrap';
 import DeleteAssignmentButtonContainer from '../../../containers/DeleteAssignmentButtonContainer';
 
-import withLinks from '../../../hoc/withLinks';
+import withLinks from '../../../helpers/withLinks';
 import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 import {
   EditIcon,

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 ResourceRenderer from '../../../helpers/ResourceRenderer';
-import withLinks from '../../../../hoc/withLinks';
+import withLinks from '../../../../helpers/withLinks';
 import { LocalizedExerciseName } from '../../../helpers/LocalizedNames';
 import { MaybeBonusAssignmentIcon } from '../../../icons';
 

diff --git a/src/components/Assignments/SubmissionsTable/SubmissionsTable.js b/src/components/Assignments/SubmissionsTable/SubmissionsTable.js
@@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
 import { OverlayTrigger, Tooltip, Table } from 'react-bootstrap';
 
 import Box from '../../widgets/Box';
-import withLinks from '../../../hoc/withLinks';
+import withLinks from '../../../helpers/withLinks';
 
 import ResourceRenderer from '../../helpers/ResourceRenderer';
 import LoadingSubmissionTableRow from './LoadingSubmissionTableRow';

diff --git a/src/components/Exercises/EditLimitsBox/EditLimitsBox.js b/src/components/Exercises/EditLimitsBox/EditLimitsBox.js
diff --git a/src/components/Exercises/EditLimitsBox/index.js b/src/components/Exercises/EditLimitsBox/index.js
diff --git a/src/components/Exercises/ExerciseButtons/ExerciseButtons.js b/src/components/Exercises/ExerciseButtons/ExerciseButtons.js
@@ -0,0 +1,69 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import { ButtonGroup } from 'react-bootstrap';
+import { LinkContainer } from 'react-router-bootstrap';
+
+import Button from '../../widgets/FlatButton';
+import { EditIcon } from '../../icons';
+// import Confirm from '../../components/forms/Confirm';
+// import ForkExerciseForm from '../../components/forms/ForkExerciseForm';
+
+import withLinks from '../../../helpers/withLinks';
+
+const ExerciseButtons = ({
+  exerciseId,
+  links: {
+    EXERCISE_EDIT_URI_FACTORY,
+    EXERCISE_EDIT_SIMPLE_CONFIG_URI_FACTORY,
+    EXERCISE_EDIT_LIMITS_URI_FACTORY
+  }
+}) =>
+  <div>
+    <ButtonGroup>
+      <LinkContainer to={EXERCISE_EDIT_URI_FACTORY(exerciseId)}>
+        <Button bsStyle="warning" bsSize="sm">
+          <EditIcon />
+          &nbsp;
+          <FormattedMessage
+            id="app.exercise.editSettings"
+            defaultMessage="Exercise Settings"
+          />
+        </Button>
+      </LinkContainer>
+      <LinkContainer to={EXERCISE_EDIT_SIMPLE_CONFIG_URI_FACTORY(exerciseId)}>
+        <Button bsStyle="warning" bsSize="sm">
+          <EditIcon />
+          &nbsp;
+          <FormattedMessage
+            id="app.exercise.editConfig"
+            defaultMessage="Tests Configuration"
+          />
+        </Button>
+      </LinkContainer>
+      <LinkContainer to={EXERCISE_EDIT_LIMITS_URI_FACTORY(exerciseId)}>
+        <Button bsStyle="warning" bsSize="sm">
+          <EditIcon />
+          &nbsp;
+          <FormattedMessage
+            id="app.exercise.editLimits"
+            defaultMessage="Tests Limits"
+          />
+        </Button>
+      </LinkContainer>
+      {/* <ForkExerciseForm
+  exerciseId={exercise.id}
+  groups={groups}
+  forkId={forkId}
+  onSubmit={formData => forkExercise(forkId, formData)}
+/> */}
+    </ButtonGroup>
+    <p />
+  </div>;
+
+ExerciseButtons.propTypes = {
+  exerciseId: PropTypes.string.isRequired,
+  links: PropTypes.object
+};
+
+export default withLinks(ExerciseButtons);
diff --git a/src/components/Exercises/ExerciseButtons/index.js b/src/components/Exercises/ExerciseButtons/index.js
@@ -0,0 +1 @@
+export default from './ExerciseButtons';
diff --git a/src/components/Exercises/ExerciseDetail/ExerciseDetail.js b/src/components/Exercises/ExerciseDetail/ExerciseDetail.js
@@ -12,7 +12,7 @@ import { Link } from 'react-router';
 import Box from '../../widgets/Box';
 import DifficultyIcon from '../DifficultyIcon';
 
-import withLinks from '../../../hoc/withLinks';
+import withLinks from '../../../helpers/withLinks';
 import UsersNameContainer from '../../../containers/UsersNameContainer';
 import GroupsNameContainer from '../../../containers/GroupsNameContainer';
 import styles from './ExerciseDetail.less';

diff --git a/src/components/Exercises/ExercisesListItem/ExercisesListItem.js b/src/components/Exercises/ExercisesListItem/ExercisesListItem.js
@@ -7,7 +7,7 @@ import UsersNameContainer from '../../../containers/UsersNameContainer';
 import GroupsNameContainer from '../../../containers/GroupsNameContainer';
 import { Link } from 'react-router';
 
-import withLinks from '../../../hoc/withLinks';
+import withLinks from '../../../helpers/withLinks';
 import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
 import { ExercisePrefixIcons } from '../../icons';
 
@@ -47,10 +47,10 @@ const ExercisesListItem = ({
               <GroupsNameContainer groupId={groupId} />
             </div>
           )
-        : <i>
+        : <i className="text-muted">
             <FormattedMessage
-              id="app.exercisesListItem.group.public"
-              defaultMessage="Public"
+              id="app.exercisesListItem.noGroups"
+              defaultMessage="no groups"
             />
           </i>}
     </td>

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

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

diff --git a/src/components/Exercises/FilesTable/AttachmentFilesTableRow.js b/src/components/Exercises/FilesTable/AttachmentFilesTableRow.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { prettyPrintBytes } from '../../helpers/stringFormatters';
 import { FormattedDate, FormattedTime, FormattedMessage } from 'react-intl';
-import withLinks from '../../../hoc/withLinks';
+import withLinks from '../../../helpers/withLinks';
 import { Button } from 'react-bootstrap';
 import Confirm from '../../../components/forms/Confirm';
 import { DeleteIcon } from '../../../components/icons';
@@ -47,10 +47,7 @@ const AttachmentFilesTableRow = ({
         >
           <Button bsSize="xs" className="btn-flat" bsStyle="danger">
             <DeleteIcon />{' '}
-            <FormattedMessage
-              id="app.attachmentFiles.deleteButton"
-              defaultMessage="Delete"
-            />
+            <FormattedMessage id="generic.delete" defaultMessage="Delete" />
           </Button>
         </Confirm>}
     </td>

diff --git a/src/components/Exercises/FilesTable/SupplementaryFilesTableRow.js b/src/components/Exercises/FilesTable/SupplementaryFilesTableRow.js
@@ -50,10 +50,7 @@ const SupplementaryFilesTableRow = ({
           >
             <Button bsSize="xs" className="btn-flat" bsStyle="danger">
               <DeleteIcon />{' '}
-              <FormattedMessage
-                id="app.supplementaryFiles.deleteButton"
-                defaultMessage="Delete"
-              />
+              <FormattedMessage id="generic.delete" defaultMessage="Delete" />
             </Button>
           </Confirm>}
       </td>}