- {leftMenu}
+ {this.showLeftMenu() && (
+
+ )}
{ auth.getToken() && this.props.hasUserPlugin && this.isUrlProtected(this.props) ? (
) : ''}
diff --git a/packages/strapi-admin/admin/src/containers/AdminPage/reducer.js b/packages/strapi-admin/admin/src/containers/AdminPage/reducer.js
index 97cdd505e1..0c000ffdca 100644
--- a/packages/strapi-admin/admin/src/containers/AdminPage/reducer.js
+++ b/packages/strapi-admin/admin/src/containers/AdminPage/reducer.js
@@ -6,11 +6,16 @@
import { fromJS, Map } from 'immutable';
-import { GET_GA_STATUS_SUCCEEDED, GET_LAYOUT_SUCCEEDED } from './constants';
+import {
+ GET_GA_STATUS_SUCCEEDED,
+ GET_LAYOUT_SUCCEEDED,
+ GET_STRAPI_VERSION_SUCCEEDED,
+} from './constants';
const initialState = fromJS({
allowGa: true,
layout: Map({}),
+ strapiVersion: '3',
});
function adminPageReducer(state = initialState, action) {
@@ -19,6 +24,8 @@ function adminPageReducer(state = initialState, action) {
return state.update('allowGa', () => action.allowGa);
case GET_LAYOUT_SUCCEEDED:
return state.update('layout', () => Map(action.layout));
+ case GET_STRAPI_VERSION_SUCCEEDED:
+ return state.update('strapiVersion', () => action.strapiVersion);
default:
return state;
}
diff --git a/packages/strapi-admin/admin/src/containers/AdminPage/saga.js b/packages/strapi-admin/admin/src/containers/AdminPage/saga.js
index b9a85a761b..f0f30085b8 100644
--- a/packages/strapi-admin/admin/src/containers/AdminPage/saga.js
+++ b/packages/strapi-admin/admin/src/containers/AdminPage/saga.js
@@ -1,13 +1,23 @@
+import { take } from 'lodash';
import { fork, call, put, takeLatest } from 'redux-saga/effects';
import request from 'utils/request';
-import { getGaStatusSucceeded, getLayoutSucceeded } from './actions';
+import {
+ getGaStatusSucceeded,
+ getLayoutSucceeded,
+ getStrapiVersionSucceeded,
+} from './actions';
import { GET_GA_STATUS, GET_LAYOUT } from './constants';
function* getGaStatus() {
try {
- const response = yield call(request, '/admin/gaConfig', { method: 'GET' });
- yield put(getGaStatusSucceeded(response.allowGa));
+ const [allowGa, strapiVersion] = yield [
+ call(request, '/admin/gaConfig', { method: 'GET' }),
+ call(request, '/admin/strapiVersion', { method: 'GET' }),
+ ];
+ yield put(getGaStatusSucceeded(allowGa));
+ const version = take(`${strapiVersion.strapiVersion.split('.')[0]}${strapiVersion.strapiVersion.split('alpha')[1]}`, 4).join('');
+ yield put(getStrapiVersionSucceeded(version));
} catch(err) {
strapi.notification.error('notification.error');
}
diff --git a/packages/strapi-admin/admin/src/containers/LeftMenu/index.js b/packages/strapi-admin/admin/src/containers/LeftMenu/index.js
index 202412b49b..ba940f7f3d 100755
--- a/packages/strapi-admin/admin/src/containers/LeftMenu/index.js
+++ b/packages/strapi-admin/admin/src/containers/LeftMenu/index.js
@@ -18,16 +18,21 @@ export class LeftMenu extends React.Component { // eslint-disable-line react/pre
render() {
return (
-
);
}
}
+LeftMenu.defaultProps = {
+ version: '3',
+};
+
LeftMenu.propTypes = {
plugins: PropTypes.object.isRequired,
+ version: PropTypes.string,
};
function mapDispatchToProps(dispatch) {
diff --git a/packages/strapi-admin/config/routes.json b/packages/strapi-admin/config/routes.json
index 043c8b36a7..c05b8b5ce8 100755
--- a/packages/strapi-admin/config/routes.json
+++ b/packages/strapi-admin/config/routes.json
@@ -20,6 +20,12 @@
"handler": "Admin.getGaConfig",
"policies": []
},
+ {
+ "method": "GET",
+ "path": "/strapiVersion",
+ "handler": "Admin.getStrapiVersion",
+ "policies": []
+ },
{
"method": "GET",
"path": "/layout",
diff --git a/packages/strapi-admin/controllers/Admin.js b/packages/strapi-admin/controllers/Admin.js
index 6742aff51a..18fbfc9c37 100755
--- a/packages/strapi-admin/controllers/Admin.js
+++ b/packages/strapi-admin/controllers/Admin.js
@@ -17,6 +17,15 @@ module.exports = {
}
},
+ getStrapiVersion: async ctx => {
+ try {
+ const strapiVersion = _.get(strapi.config, 'info.strapi', null);
+ return ctx.send({ strapiVersion });
+ } catch(err) {
+ return ctx.badRequest(null, [{ messages: [{ id: 'The version is not available' }] }]);
+ }
+ },
+
getGaConfig: async ctx => {
try {
const allowGa = _.get(strapi.config, 'info.customs.allowGa', true);
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index fcefa77963..196d018a62 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -48,4 +48,4 @@
"npm": ">= 3.0.0"
},
"license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js
index f90ddf056d..8d5b437cef 100755
--- a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js
+++ b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js
@@ -132,6 +132,9 @@ module.exports = (options) => ({
require.resolve('babel-plugin-transform-react-remove-prop-types'),
require.resolve('babel-plugin-transform-react-constant-elements'),
require.resolve('babel-plugin-transform-react-inline-elements'),
+ require.resolve('babel-plugin-transform-es2015-destructuring'),
+ require.resolve('babel-plugin-transform-es2015-parameters'),
+ require.resolve('babel-plugin-transform-object-rest-spread'),
],
},
test: {
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index b4192b21f2..20480e3dd6 100755
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -34,6 +34,9 @@
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.1",
"babel-plugin-istanbul": "^4.1.5",
+ "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+ "babel-plugin-transform-es2015-parameters": "^6.24.1",
+ "babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-constant-elements": "^6.23.0",
"babel-plugin-transform-react-inline-elements": "^6.22.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.8",
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/EditRelations/index.js b/packages/strapi-plugin-content-manager/admin/src/components/EditRelations/index.js
index 7ea8f45bef..ff36b31e28 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/EditRelations/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/EditRelations/index.js
@@ -30,8 +30,9 @@ function EditRelations(props) {
{(message) =>
{message} }
{map(filterRelationsUpload(props.schema.relations), (relation, key) => {
+ if (relation.nature.toLowerCase().includes('morph') && relation[key]) return '';
- const Select = ['oneWay', 'oneToOne', 'manyToOne'].includes(relation.nature) && relation.dominant ? SelectOne : SelectMany;
+ const Select = ['oneWay', 'oneToOne', 'manyToOne', 'oneToManyMorph', 'oneToOneMorph'].includes(relation.nature) && relation.dominant ? SelectOne : SelectMany;
return (
(
Object.keys(get(this.getSchema(), 'relations', {})).filter(relation => (
- get(this.getSchema(), ['relations', relation, 'plugin']) !== 'upload'
+ get(this.getSchema(), ['relations', relation, 'plugin']) !== 'upload' &&
+ (!get(this.getSchema(), ['relations', relation, 'nature'], '').toLowerCase().includes('morph') || !get(this.getSchema(), ['relations', relation, relation]))
)).length === 0
)
diff --git a/packages/strapi-plugin-content-manager/config/queries/mongoose.js b/packages/strapi-plugin-content-manager/config/queries/mongoose.js
index 733a4b3338..8e8c6b67ec 100755
--- a/packages/strapi-plugin-content-manager/config/queries/mongoose.js
+++ b/packages/strapi-plugin-content-manager/config/queries/mongoose.js
@@ -14,13 +14,14 @@ module.exports = {
.count());
},
- findOne: async function (params, populate) {
- return this
+ findOne: async function (params, populate, raw = true) {
+ const query = this
.findOne({
[this.primaryKey]: params[this.primaryKey] || params.id
})
- .populate(populate || this.associations.map(x => x.alias).join(' '))
- .lean();
+ .populate(populate || this.associations.map(x => x.alias).join(' '));
+
+ return raw ? query.lean() : query;
},
create: async function (params) {
@@ -300,18 +301,18 @@ module.exports = {
However the upload doesn't need this method. It only uses the `removeRelationMorph`.
*/
- const entry = await module.exports.findOne.call(this, params, []);
- const value = entry[params.alias] || [];
+ const entry = (await module.exports.findOne.call(this, params, [], false)).toJSON();
+ const value = [];
// Retrieve association.
- const association = this.associations.find(association => association.via === params.alias)[0];
+ const association = this.associations.find(association => association.alias === params.alias);
if (!association) {
throw Error(`Impossible to create relationship with ${params.ref} (${params.refId})`);
}
// Resolve if the association is already existing.
- const isExisting = entry[params.alias].find(obj => {
+ const isExisting = value.find(obj => {
if (obj.kind === params.ref && obj.ref.toString() === params.refId.toString() && obj.field === params.field) {
return true;
}
@@ -326,9 +327,10 @@ module.exports = {
// Push new relation to the association array.
value.push({
- ref: params.refId,
+ ref: params.ref,
+ refId: params.refId,
kind: params.ref,
- field: association.filter
+ field: params.field
});
entry[params.alias] = value;
diff --git a/packages/strapi-plugin-content-manager/services/ContentManager.js b/packages/strapi-plugin-content-manager/services/ContentManager.js
index 91b410b1c5..557d5f8148 100644
--- a/packages/strapi-plugin-content-manager/services/ContentManager.js
+++ b/packages/strapi-plugin-content-manager/services/ContentManager.js
@@ -59,7 +59,7 @@ module.exports = {
});
// Then, request plugin upload.
- if (strapi.plugins.upload) {
+ if (strapi.plugins.upload && !_.isEmpty(values.files)) {
// Upload new files and attach them to this entity.
await strapi.plugins.upload.services.upload.uploadToEntity({
id: entry.id || entry._id,
diff --git a/packages/strapi-plugin-users-permissions/models/User.settings.json b/packages/strapi-plugin-users-permissions/models/User.settings.json
index 99479b1cba..da72db76e3 100644
--- a/packages/strapi-plugin-users-permissions/models/User.settings.json
+++ b/packages/strapi-plugin-users-permissions/models/User.settings.json
@@ -40,4 +40,4 @@
"configurable": false
}
}
-}
+}
\ No newline at end of file