Merge pull request #110 from ReCodEx/string-sorting-locales

String sorting comparators fixed to use selected locale.
ReCodEx · Oct 23, 2017 · 170fcab · 170fcab
2 parents 1195074 + d69966d
commit 170fcab
Show file tree

Hide file tree

Showing 14 changed files with 126 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ npm-debug.log
 prod/
 package-lock.json
 
+/run_server.bat
diff --git a/src/components/Exercises/AttachedFilesTable/AttachedFilesTable.js b/src/components/Exercises/AttachedFilesTable/AttachedFilesTable.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 
 import Icon from 'react-fontawesome';
 import { Table } from 'react-bootstrap';
@@ -28,7 +28,8 @@ const AttachedFilesTable = ({
   downloadFile,
   uploadId,
   HeaderComponent,
-  RowComponent
+  RowComponent,
+  intl
 }) =>
   <Box title={title} collapsable isOpen>
     <div>
@@ -62,7 +63,7 @@ const AttachedFilesTable = ({
                 </thead>
                 <tbody>
                   {attachments
-                    .sort((a, b) => a.name.localeCompare(b.name))
+                    .sort((a, b) => a.name.localeCompare(b.name, intl.locale))
                     .map((data, i) =>
                       <RowComponent
                         {...data}
@@ -105,7 +106,8 @@ AttachedFilesTable.propTypes = {
   removeFile: PropTypes.func,
   downloadFile: PropTypes.func,
   HeaderComponent: PropTypes.func.isRequired,
-  RowComponent: PropTypes.func.isRequired
+  RowComponent: PropTypes.func.isRequired,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default AttachedFilesTable;
+export default injectIntl(AttachedFilesTable);
diff --git a/src/components/Exercises/ExercisesList/ExercisesList.js b/src/components/Exercises/ExercisesList/ExercisesList.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Table } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 
 import ExercisesListItem from '../ExercisesListItem';
 
-const ExercisesList = ({ exercises = [], createActions, ...rest }) => (
+const ExercisesList = ({ exercises = [], createActions, intl, ...rest }) =>
   <Table hover>
     <thead>
       <tr>
@@ -44,35 +44,33 @@ const ExercisesList = ({ exercises = [], createActions, ...rest }) => (
         .filter(e => e !== null)
         .sort(
           (a, b) =>
-            a.name < b.name
-              ? -1
-              : b.name < a.name ? 1 : b.createdAt - a.createdAt
+            a.name.localeCompare(b.name, intl.locale) ||
+            b.createdAt - a.createdAt
         )
-        .map(exercise => (
+        .map(exercise =>
           <ExercisesListItem
             {...exercise}
             createActions={createActions}
             key={exercise.id}
           />
-        ))}
+        )}
 
-      {exercises.length === 0 && (
+      {exercises.length === 0 &&
         <tr>
           <td className="text-center" colSpan={6}>
             <FormattedMessage
               id="app.exercisesList.empty"
               defaultMessage="There are no exercises in this list."
             />
           </td>
-        </tr>
-      )}
+        </tr>}
     </tbody>
-  </Table>
-);
+  </Table>;
 
 ExercisesList.propTypes = {
   exercises: PropTypes.array,
-  createActions: PropTypes.func
+  createActions: PropTypes.func,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default ExercisesList;
+export default injectIntl(ExercisesList);
diff --git a/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js b/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { Table } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 
 import GroupExercisesListItem from '../ExercisesSimpleListItem';
 
-const ExercisesSimpleList = ({ exercises, createActions, ...rest }) => (
+const ExercisesSimpleList = ({ exercises, createActions, intl, ...rest }) =>
   <Table>
     <thead>
       <tr>
@@ -33,38 +33,37 @@ const ExercisesSimpleList = ({ exercises, createActions, ...rest }) => (
     <tbody>
       {exercises
         .sort((a, b) => {
-          var tmp = a.name.localeCompare(b.name);
+          var tmp = a.name.localeCompare(b.name, intl.locale);
           if (tmp === 0) {
             return b.createdAt - a.createdAt;
           } else {
             return tmp;
           }
         })
-        .map(exercise => (
+        .map(exercise =>
           <GroupExercisesListItem
             {...exercise}
             createActions={createActions}
             key={exercise.id}
           />
-        ))}
+        )}
 
-      {exercises.length === 0 && (
+      {exercises.length === 0 &&
         <tr>
           <td className="text-center" colSpan={4}>
             <FormattedMessage
               id="app.exercisesSimpleList.empty"
               defaultMessage="There are no exercises in this list."
             />
           </td>
-        </tr>
-      )}
+        </tr>}
     </tbody>
-  </Table>
-);
+  </Table>;
 
 ExercisesSimpleList.propTypes = {
   exercises: PropTypes.array.isRequired,
-  createActions: PropTypes.func
+  createActions: PropTypes.func,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default ExercisesSimpleList;
+export default injectIntl(ExercisesSimpleList);
diff --git a/src/components/Instances/InstancesTable/InstancesTable.js b/src/components/Instances/InstancesTable/InstancesTable.js
@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 import { Table } from 'react-bootstrap';
 import { Link } from 'react-router';
 import { MaybeSucceededIcon } from '../../icons';
 import UsersNameContainer from '../../../containers/UsersNameContainer';
 
 import withLinks from '../../../hoc/withLinks';
 
-const InstancesTable = ({ instances, links: { INSTANCE_URI_FACTORY } }) => (
+const InstancesTable = ({ instances, links: { INSTANCE_URI_FACTORY }, intl }) =>
   <Table hover>
     <thead>
       <tr>
@@ -34,11 +34,13 @@ const InstancesTable = ({ instances, links: { INSTANCE_URI_FACTORY } }) => (
     </thead>
     <tbody>
       {instances
-        .sort((a, b) => (a.name < b.name ? -1 : 1))
-        .map(({ id, name, admin, hasValidLicence }) => (
+        .sort((a, b) => a.name.localeCompare(b.name, intl.locale))
+        .map(({ id, name, admin, hasValidLicence }) =>
           <tr key={id}>
             <td>
-              <Link to={INSTANCE_URI_FACTORY(id)}>{name}</Link>
+              <Link to={INSTANCE_URI_FACTORY(id)}>
+                {name}
+              </Link>
             </td>
             <td>
               <UsersNameContainer userId={admin} />
@@ -47,14 +49,14 @@ const InstancesTable = ({ instances, links: { INSTANCE_URI_FACTORY } }) => (
               <MaybeSucceededIcon success={hasValidLicence} />
             </td>
           </tr>
-        ))}
+        )}
     </tbody>
-  </Table>
-);
+  </Table>;
 
 InstancesTable.propTypes = {
   instances: PropTypes.array.isRequired,
-  links: PropTypes.object
+  links: PropTypes.object,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default withLinks(InstancesTable);
+export default injectIntl(withLinks(InstancesTable));
diff --git a/src/components/Pipelines/PipelinesList/PipelinesList.js b/src/components/Pipelines/PipelinesList/PipelinesList.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Table } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 
 import PipelinesListItem from '../PipelinesListItem';
 
-const PipelinesList = ({ pipelines = [], createActions }) =>
+const PipelinesList = ({ pipelines = [], createActions, intl }) =>
   <Table hover>
     <thead>
       <tr>
@@ -36,7 +36,7 @@ const PipelinesList = ({ pipelines = [], createActions }) =>
     <tbody>
       {pipelines
         .filter(a => a !== null)
-        .sort((a, b) => a.name.localeCompare(b.name))
+        .sort((a, b) => a.name.localeCompare(b.name, intl.locale))
         .map(pipeline =>
           <PipelinesListItem
             {...pipeline}
@@ -59,7 +59,8 @@ const PipelinesList = ({ pipelines = [], createActions }) =>
 
 PipelinesList.propTypes = {
   pipelines: PropTypes.array,
-  createActions: PropTypes.func
+  createActions: PropTypes.func,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default PipelinesList;
+export default injectIntl(PipelinesList);
diff --git a/src/components/Pipelines/PipelinesSimpleList/PipelinesSimpleList.js b/src/components/Pipelines/PipelinesSimpleList/PipelinesSimpleList.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { Table } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 
 import ExercisePipelinesListItem from '../PipelinesSimpleListItem';
 
-const PipelinesSimpleList = ({ pipelines, createActions, ...rest }) =>
+const PipelinesSimpleList = ({ pipelines, createActions, intl, ...rest }) =>
   <Table>
     <thead>
       <tr>
@@ -32,14 +32,11 @@ const PipelinesSimpleList = ({ pipelines, createActions, ...rest }) =>
     </thead>
     <tbody>
       {pipelines
-        .sort((a, b) => {
-          var tmp = a.name.localeCompare(b.name);
-          if (tmp === 0) {
-            return b.createdAt - a.createdAt;
-          } else {
-            return tmp;
-          }
-        })
+        .sort(
+          (a, b) =>
+            a.name.localeCompare(b.name, intl.locale) ||
+            b.createdAt - a.createdAt
+        )
         .map((pipeline, i) =>
           <ExercisePipelinesListItem
             {...pipeline}
@@ -62,7 +59,8 @@ const PipelinesSimpleList = ({ pipelines, createActions, ...rest }) =>
 
 PipelinesSimpleList.propTypes = {
   pipelines: PropTypes.array.isRequired,
-  createActions: PropTypes.func
+  createActions: PropTypes.func,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default PipelinesSimpleList;
+export default injectIntl(PipelinesSimpleList);
diff --git a/src/components/Users/UsersList/UsersList.js b/src/components/Users/UsersList/UsersList.js
@@ -1,17 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Table } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 import UsersListItem from '../UsersListItem';
 
-const UsersList = ({ users = [], createActions, ...rest }) =>
+const UsersList = ({ users = [], createActions, intl, ...rest }) =>
   <Table hover>
     <tbody>
       {users
         .sort((a, b) => {
           const aName = a.name.lastName + ' ' + a.name.firstName;
           const bName = b.name.lastName + ' ' + b.name.firstName;
-          return aName.localeCompare(bName);
+          return aName.localeCompare(bName, intl.locale);
         })
         .map(user =>
           <UsersListItem
@@ -35,7 +35,8 @@ const UsersList = ({ users = [], createActions, ...rest }) =>
 
 UsersList.propTypes = {
   users: PropTypes.array,
-  createActions: PropTypes.func
+  createActions: PropTypes.func,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default UsersList;
+export default injectIntl(UsersList);
diff --git a/src/components/forms/EditExerciseConfigForm/EditExerciseConfigTest.js b/src/components/forms/EditExerciseConfigForm/EditExerciseConfigTest.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { injectIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Field } from 'redux-form';
@@ -12,7 +13,8 @@ const EditExerciseConfigTest = ({
   supplementaryFiles,
   pipelines,
   runtimeEnvironmentIndex,
-  fetchVariables
+  fetchVariables,
+  intl
 }) =>
   <tbody>
     {tests.map((test, index) => [
@@ -30,7 +32,7 @@ const EditExerciseConfigTest = ({
                 component={SelectField}
                 options={[{ key: '', name: '...' }].concat(
                   pipelines
-                    .sort((a, b) => a.name.localeCompare(b.name))
+                    .sort((a, b) => a.name.localeCompare(b.name, intl.locale))
                     .map(data => {
                       const obj = {};
                       obj['key'] = data.id;
@@ -67,7 +69,7 @@ const EditExerciseConfigTest = ({
                 component={SelectField}
                 options={[{ key: '', name: '...' }].concat(
                   pipelines
-                    .sort((a, b) => a.name.localeCompare(b.name))
+                    .sort((a, b) => a.name.localeCompare(b.name, intl.locale))
                     .map(data => {
                       const obj = {};
                       obj['key'] = data.id;
@@ -104,7 +106,8 @@ EditExerciseConfigTest.propTypes = {
   supplementaryFiles: ImmutablePropTypes.map,
   pipelines: ImmutablePropTypes.map,
   runtimeEnvironmentIndex: PropTypes.number.isRequired,
-  fetchVariables: PropTypes.func
+  fetchVariables: PropTypes.func,
+  intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired
 };
 
-export default EditExerciseConfigTest;
+export default injectIntl(EditExerciseConfigTest);