Merge pull request #247 from Inist-CNRS/fixes

[RFR] Fixes

src/api/controller/front/index.js

@@ -11,19 +11,19 @@ const middleware = process.env.NODE_ENV === 'development' ? dev() : prod();
 app.use(async (ctx, next) => {
     const uri = ctx.path;
 
-    if (!uri.startsWith('/api')
-        && uri !== '/admin'
-        && uri.indexOf('.js') === -1
-        && uri.indexOf('__webpack_hmr') === -1) {
-        if (uri.startsWith('/admin')) {
-            ctx.path = '/admin';
-            await next();
-            return;
-        }
+    if (uri.startsWith('/uid:/')
+        || uri.startsWith('/ark:/')
+        || uri.startsWith('/login')
+        || uri.startsWith('/home')) {
         // Override the path so that webpack serves the application correctly
         ctx.path = '/';
     }
 
+    if (uri.startsWith('/admin/')) {
+        // Override the path so that webpack serves the application correctly
+        ctx.path = '/admin';
+    }
+
     await next();
 });
 

src/app/js/i18n/translations/fr.js

@@ -149,7 +149,7 @@ export default {
     position: 'Position',
     field_wizard_step_value: 'How the value is generated',
     field_wizard_step_tranforms: 'Transformations applied on the value',
-    field_wizard_step_identity: 'Général informations',
+    field_wizard_step_identity: 'General informations',
     field_wizard_step_display: 'How and where it is displayed',
     field_wizard_step_search: 'Search related',
     field_wizard_step_semantic: 'Semantics',

src/app/js/public/characteristic/DatasetCharacteristics.js

@@ -1,16 +1,12 @@
 import React, { PropTypes } from 'react';
 import compose from 'recompose/compose';
 import { connect } from 'react-redux';
-import translate from 'redux-polyglot/translate';
-import { CardHeader, CardText } from 'material-ui/Card';
+import { CardText } from 'material-ui/Card';
 import memoize from 'lodash.memoize';
 
 import Card from '../../lib/Card';
 
-import {
-    field as fieldProptypes,
-    polyglot as polyglotPropTypes,
-} from '../../propTypes';
+import { field as fieldProptypes } from '../../propTypes';
 
 import {
     fromCharacteristic,
@@ -33,14 +29,8 @@ const styles = {
     })),
 };
 
-const DatasetCharacteristicsView = ({
-    characteristics,
-    p: polyglot,
-}) => (
+const DatasetCharacteristicsView = ({ characteristics }) => (
     <Card className="dataset-characteristics">
-        <CardHeader
-            title={polyglot.t('dataset_characteristics')}
-        />
         <CardText style={styles.container}>
             {characteristics
                 .map((characteristicField, index) => (
@@ -55,7 +45,6 @@ const DatasetCharacteristicsView = ({
 
 DatasetCharacteristicsView.propTypes = {
     characteristics: PropTypes.arrayOf(fieldProptypes).isRequired,
-    p: polyglotPropTypes.isRequired,
 };
 
 DatasetCharacteristicsView.defaultProps = {
@@ -74,5 +63,4 @@ const mapStateToProps = (state) => {
 
 export default compose(
     connect(mapStateToProps),
-    translate,
 )(DatasetCharacteristicsView);