From 43357bf49b696583dbdfc67465f931bb75374fe4 Mon Sep 17 00:00:00 2001 From: XcrossD Date: Mon, 23 Apr 2018 11:20:14 +0800 Subject: [PATCH 1/4] Update LeftMenuFooter style --- .../admin/src/components/LeftMenuFooter/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss index 5f77a12720..b66674e62a 100755 --- a/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss +++ b/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss @@ -3,7 +3,7 @@ .leftMenuFooter { /* stylelint-disable */ position: absolute; - width: 100%; + width: calc(100% - 2 * 15px); bottom: 0; height: 3rem; padding-left: 15px; From 0db8f05e8be6806c0c3ce0d3a1c7824a9a1e2674 Mon Sep 17 00:00:00 2001 From: Herbert Lin Date: Tue, 24 Apr 2018 17:59:30 +0800 Subject: [PATCH 2/4] Temp fix for LeftMenuFooter style. --- .../admin/src/components/LeftMenuFooter/index.js | 6 ++++-- .../admin/src/components/LeftMenuFooter/styles.scss | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js b/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js index 7973f87d61..6e7ecf6961 100755 --- a/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js +++ b/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js @@ -17,8 +17,10 @@ defineMessages(messages); function LeftMenuFooter({ version }) { // eslint-disable-line react/prefer-stateless-function return (
- - v{version} +
+ + v{version} +
); diff --git a/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss index b66674e62a..f885e4e5a7 100755 --- a/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss +++ b/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss @@ -4,6 +4,8 @@ .leftMenuFooter { /* stylelint-disable */ position: absolute; width: calc(100% - 2 * 15px); + display: flex; + justify-content: space-between; bottom: 0; height: 3rem; padding-left: 15px; From 1618d3f8581fc110a6e6c0613e85af2fa2ed23d9 Mon Sep 17 00:00:00 2001 From: Aurelsicoko Date: Tue, 24 Apr 2018 16:19:02 +0200 Subject: [PATCH 3/4] Reorder model root attribute and remove multiple key --- .../controllers/ContentTypeBuilder.js | 6 +++--- .../services/ContentTypeBuilder.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js b/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js index 21af480463..3a8b30cf08 100755 --- a/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js +++ b/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js @@ -115,13 +115,13 @@ module.exports = { try { const modelJSON = _.cloneDeep(require(modelFilePath)); - modelJSON.attributes = formatedAttributes; + modelJSON.connection = connection; + modelJSON.collectionName = collectionName; modelJSON.info = { name, description }; - modelJSON.connection = connection; - modelJSON.collectionName = collectionName; + modelJSON.attributes = formatedAttributes; const clearRelationsErrors = Service.clearRelations(model, plugin); diff --git a/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js b/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js index 35321c9a69..0ad8a02d94 100755 --- a/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js +++ b/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js @@ -177,7 +177,7 @@ module.exports = { _.forEach(attributesConfigurable, attribute => { if (_.has(attribute, 'params.type')) { - attrs[attribute.name] = attribute.params; + attrs[attribute.name] = _.omit(attribute.params, 'multiple'); if (attribute.params.type === 'media') { const via = _.findKey(strapi.plugins.upload.models.file.attributes, {collection: '*'}); From 7a456da9743cd3db3dab44255bca821d1e2c8089 Mon Sep 17 00:00:00 2001 From: Aurelsicoko Date: Tue, 24 Apr 2018 16:38:19 +0200 Subject: [PATCH 4/4] Move authentication and ssl in database options --- .../environments/production/database.json | 7 ++++--- .../config/environments/staging/database.json | 7 ++++--- packages/strapi-generate-new/lib/before.js | 5 ++--- packages/strapi-mongoose/lib/index.js | 11 ++++++++--- .../strapi-mongoose/lib/utils/connectivity.js | 19 ++++++++++++++----- 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/packages/strapi-generate-new/files/config/environments/production/database.json b/packages/strapi-generate-new/files/config/environments/production/database.json index bd92020942..287a8121e0 100755 --- a/packages/strapi-generate-new/files/config/environments/production/database.json +++ b/packages/strapi-generate-new/files/config/environments/production/database.json @@ -10,11 +10,12 @@ "port": "${process.env.DATABASE_PORT || 27017}", "database": "${process.env.DATABASE_NAME || 'strapi-production'}", "username": "${process.env.DATABASE_USERNAME || ''}", - "password": "${process.env.DATABASE_PASSWORD || ''}", + "password": "${process.env.DATABASE_PASSWORD || ''}" + }, + "options": { "ssl": "${process.env.DATABASE_SSL || false}", "authenticationDatabase": "${process.env.DATABASE_AUTHENTICATION_DATABASE || ''}" - }, - "options": {} + } } } } diff --git a/packages/strapi-generate-new/files/config/environments/staging/database.json b/packages/strapi-generate-new/files/config/environments/staging/database.json index f0dff39eaf..ec7c26da4c 100755 --- a/packages/strapi-generate-new/files/config/environments/staging/database.json +++ b/packages/strapi-generate-new/files/config/environments/staging/database.json @@ -10,11 +10,12 @@ "port": "${process.env.DATABASE_PORT || 27017}", "database": "${process.env.DATABASE_NAME || 'strapi-staging'}", "username": "${process.env.DATABASE_USERNAME || ''}", - "password": "${process.env.DATABASE_PASSWORD || ''}", + "password": "${process.env.DATABASE_PASSWORD || ''}" + }, + "options": { "ssl": "${process.env.DATABASE_SSL || false}", "authenticationDatabase": "${process.env.DATABASE_AUTHENTICATION_DATABASE || ''}" - }, - "options": {} + } } } } diff --git a/packages/strapi-generate-new/lib/before.js b/packages/strapi-generate-new/lib/before.js index 7095f541bb..206e05eda2 100755 --- a/packages/strapi-generate-new/lib/before.js +++ b/packages/strapi-generate-new/lib/before.js @@ -212,7 +212,6 @@ module.exports = (scope, cb) => { } ]) .then(answers => { - if (hasDatabaseConfig) { answers = _.omit(scope.database.settings, ['client']) } @@ -222,8 +221,8 @@ module.exports = (scope, cb) => { scope.database.settings.database = answers.database; scope.database.settings.username = answers.username; scope.database.settings.password = answers.password; - scope.database.settings.authenticationDatabase = answers.authenticationDatabase; - scope.database.settings.ssl = answers.ssl; + scope.database.options.authenticationDatabase = answers.authenticationDatabase; + scope.database.options.ssl = _.toString(answers.ssl) === 'true'; logger.info('Testing database connection...'); diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js index 7dc2148af8..4574f4a2da 100755 --- a/packages/strapi-mongoose/lib/index.js +++ b/packages/strapi-mongoose/lib/index.js @@ -43,19 +43,24 @@ module.exports = function (strapi) { initialize: cb => { _.forEach(_.pickBy(strapi.config.connections, {connector: 'strapi-mongoose'}), (connection, connectionName) => { const instance = new Mongoose(); - const { uri, host, port, username, password, database, authenticationDatabase, ssl } = _.defaults(connection.settings, strapi.config.hook.settings.mongoose); + const { uri, host, port, username, password, database } = _.defaults(connection.settings, strapi.config.hook.settings.mongoose); + const { authenticationDatabase, ssl } = _.defaults(connection.options, strapi.config.hook.settings.mongoose); // Connect to mongo database const connectOptions = {} + if (!_.isEmpty(username)) { - connectOptions.user = username + connectOptions.user = username; + if (!_.isEmpty(password)) { - connectOptions.pass = password + connectOptions.pass = password; } } + if (!_.isEmpty(authenticationDatabase)) { connectOptions.authSource = authenticationDatabase; } + connectOptions.ssl = ssl === true || ssl === 'true'; instance.connect(uri || `mongodb://${host}:${port}/${database}`, connectOptions); diff --git a/packages/strapi-mongoose/lib/utils/connectivity.js b/packages/strapi-mongoose/lib/utils/connectivity.js index 76fe1c9261..ac1a7bb5a1 100644 --- a/packages/strapi-mongoose/lib/utils/connectivity.js +++ b/packages/strapi-mongoose/lib/utils/connectivity.js @@ -10,18 +10,27 @@ const logger = require('strapi-utils').logger; module.exports = (scope, success, error) => { const Mongoose = require(path.resolve(`${scope.tmpPath}/node_modules/mongoose`)); - const { username, password, authenticationDatabase, ssl } = scope.database.settings - const connectOptions = {} + const { username, password } = scope.database.settings; + const { authenticationDatabase, ssl } = scope.database.options; + + const connectOptions = {}; + if (username) { - connectOptions.user = username + connectOptions.user = username; + if (password) { - connectOptions.pass = password + connectOptions.pass = password; } } + if (authenticationDatabase) { connectOptions.authSource = authenticationDatabase; } - connectOptions.ssl = ssl ? true : false + + connectOptions.ssl = ssl ? true : false; + + console.log(connectOptions); + Mongoose.connect(`mongodb://${scope.database.settings.host}:${scope.database.settings.port}/${scope.database.settings.database}`, connectOptions, function (err) { if (err) { logger.warn('Database connection has failed! Make sure your database is running.');