From 3b7dc6dde5fe9380c0405a3ff62f3d791f55edee Mon Sep 17 00:00:00 2001 From: Patai Adam Date: Fri, 10 Jan 2020 09:58:47 +0100 Subject: [PATCH 1/7] Update content-type-builder.js --- .../services/schema-builder/content-type-builder.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js index 692975529d..d8b9f13da7 100644 --- a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js +++ b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js @@ -172,9 +172,7 @@ module.exports = function createComponentBuilder() { this.unsetRelation(oldAttribute); } - if (Object.keys(oldAttribute).includes('autoPopulate')) { - newAttribute.autoPopulate = oldAttribute.autoPopulate; - } + newAttribute.autoPopulate = oldAttribute.autoPopulate === false ? false : undefined return this.setRelation({ key, From 3044a7495e083a9bdbb8cf8f637fa82851f3197c Mon Sep 17 00:00:00 2001 From: Adam Patai Date: Tue, 14 Jan 2020 10:20:27 +0100 Subject: [PATCH 2/7] Keep autoPopulate field if it was already set to true --- .../services/schema-builder/content-type-builder.js | 2 +- .../services/schema-builder/index.js | 2 +- packages/strapi-plugin-content-type-builder/utils/attributes.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js index d8b9f13da7..6fdc2e7892 100644 --- a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js +++ b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js @@ -172,7 +172,7 @@ module.exports = function createComponentBuilder() { this.unsetRelation(oldAttribute); } - newAttribute.autoPopulate = oldAttribute.autoPopulate === false ? false : undefined + newAttribute.autoPopulate = oldAttribute.autoPopulate; return this.setRelation({ key, diff --git a/packages/strapi-plugin-content-type-builder/services/schema-builder/index.js b/packages/strapi-plugin-content-type-builder/services/schema-builder/index.js index 871c51cea8..d04817708d 100644 --- a/packages/strapi-plugin-content-type-builder/services/schema-builder/index.js +++ b/packages/strapi-plugin-content-type-builder/services/schema-builder/index.js @@ -126,7 +126,7 @@ function createSchemaBuilder({ components, contentTypes }) { unique: unique === true ? true : undefined, columnName: columnName || undefined, configurable: configurable === false ? false : undefined, - autoPopulate: autoPopulate === false ? false : undefined, + autoPopulate, }; if (!this.contentTypes.has(target)) { diff --git a/packages/strapi-plugin-content-type-builder/utils/attributes.js b/packages/strapi-plugin-content-type-builder/utils/attributes.js index 1a093ef79b..d28a6a4a32 100644 --- a/packages/strapi-plugin-content-type-builder/utils/attributes.js +++ b/packages/strapi-plugin-content-type-builder/utils/attributes.js @@ -85,7 +85,7 @@ const formatAttribute = (key, attribute, { model }) => { undefined ), unique: attribute.unique ? true : false, - autoPopulate: attribute.autoPopulate === false ? false : undefined, + autoPopulate: attribute.autoPopulate, }; } }; From 1fafec7ab8bb85273ace02ad6236c72ce92f80b9 Mon Sep 17 00:00:00 2001 From: Adam Patai Date: Tue, 14 Jan 2020 12:44:55 +0100 Subject: [PATCH 3/7] Handle reverse relations --- .../schema-builder/content-type-builder.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js index 6fdc2e7892..5ee91566ca 100644 --- a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js +++ b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js @@ -11,13 +11,16 @@ const createSchemaHandler = require('./schema-handler'); module.exports = function createComponentBuilder() { return { setRelation({ key, modelName, plugin, attribute }) { - this.contentTypes.get(attribute.target).setAttribute( + const targetCT = this.contentTypes.get(attribute.target); + const targetAttribute = targetCT.getAttribute(attribute.targetAttribute); + targetCT.setAttribute( attribute.targetAttribute, generateRelation({ key, attribute, plugin, modelName, + targetAttribute, }) ); }, @@ -234,11 +237,18 @@ module.exports = function createComponentBuilder() { const createContentTypeUID = ({ name }) => `application::${nameToSlug(name)}.${nameToSlug(name)}`; -const generateRelation = ({ key, attribute, plugin, modelName }) => { +const generateRelation = ({ + key, + attribute, + plugin, + modelName, + targetAttribute = {}, +}) => { const opts = { via: key, plugin, columnName: attribute.targetColumnName || undefined, + autoPopulate: targetAttribute.autoPopulate, }; switch (attribute.nature) { From c290e374701c3dc7bbef0250cacee4359013824a Mon Sep 17 00:00:00 2001 From: Patai Adam Date: Fri, 17 Jan 2020 14:08:58 +0100 Subject: [PATCH 4/7] Update content-type-builder.js --- .../services/schema-builder/content-type-builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js index 1352af1040..d1df6e6d03 100644 --- a/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js +++ b/packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js @@ -177,7 +177,7 @@ module.exports = function createComponentBuilder() { this.unsetRelation(oldAttribute); } - newAttribute.autoPopulate = oldAttribute.autoPopulate; + newAttribute.autoPopulate = newAttribute.autoPopulate || oldAttribute.autoPopulate; return this.setRelation({ key, From 4ab268b134a95001e061826c857f773d98c29c07 Mon Sep 17 00:00:00 2001 From: nurikabe Date: Sat, 18 Jan 2020 16:39:27 -0500 Subject: [PATCH 5/7] RFC-822 doesn't require double quotes around the descriptive name in an email address --- packages/strapi-admin/controllers/Auth.js | 2 +- packages/strapi-plugin-users-permissions/controllers/Auth.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/strapi-admin/controllers/Auth.js b/packages/strapi-admin/controllers/Auth.js index 2680c1e615..af7523ab38 100644 --- a/packages/strapi-admin/controllers/Auth.js +++ b/packages/strapi-admin/controllers/Auth.js @@ -343,7 +343,7 @@ module.exports = { to: admin.email, from: settings.from.email || settings.from.name - ? `"${settings.from.name}" <${settings.from.email}>` + ? `${settings.from.name} <${settings.from.email}>` : undefined, replyTo: settings.response_email, subject: settings.object, diff --git a/packages/strapi-plugin-users-permissions/controllers/Auth.js b/packages/strapi-plugin-users-permissions/controllers/Auth.js index ef721f9275..944ef31985 100644 --- a/packages/strapi-plugin-users-permissions/controllers/Auth.js +++ b/packages/strapi-plugin-users-permissions/controllers/Auth.js @@ -362,7 +362,7 @@ module.exports = { to: user.email, from: settings.from.email || settings.from.name - ? `"${settings.from.name}" <${settings.from.email}>` + ? `${settings.from.name} <${settings.from.email}>` : undefined, replyTo: settings.response_email, subject: settings.object, @@ -560,7 +560,7 @@ module.exports = { to: (user.toJSON ? user.toJSON() : user).email, from: settings.from.email && settings.from.name - ? `"${settings.from.name}" <${settings.from.email}>` + ? `${settings.from.name} <${settings.from.email}>` : undefined, replyTo: settings.response_email, subject: settings.object, From 8027b135e121f40bcb3395bea29acc80647c5fdb Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Mon, 20 Jan 2020 17:00:20 +0100 Subject: [PATCH 6/7] fix: fix get role via graphql Find one role issue due to params sharing in the GraphQL schema. fix #5013 Signed-off-by: Jim LAURIE --- .../strapi-plugin-users-permissions/config/schema.graphql | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-users-permissions/config/schema.graphql b/packages/strapi-plugin-users-permissions/config/schema.graphql index f0c4e978df..d834b26ba4 100644 --- a/packages/strapi-plugin-users-permissions/config/schema.graphql +++ b/packages/strapi-plugin-users-permissions/config/schema.graphql @@ -66,6 +66,8 @@ module.exports = { plugin: 'users-permissions', resolverOf: 'UsersPermissions.getRole', resolver: async (obj, options, { context }) => { + context.params = {...context.params, ...options.input}; + await strapi.plugins[ 'users-permissions' ].controllers.userspermissions.getRole(context); @@ -78,6 +80,8 @@ module.exports = { plugin: 'users-permissions', resolverOf: 'UsersPermissions.getRoles', // Apply the `getRoles` permissions on the resolver. resolver: async (obj, options, { context }) => { + context.params = {...context.params, ...options.input}; + await strapi.plugins[ 'users-permissions' ].controllers.userspermissions.getRoles(context); @@ -195,10 +199,10 @@ module.exports = { resolverOf: 'Auth.register', resolver: async (obj, options, {context}) => { context.request.body = _.toPlainObject(options.input); - + await strapi.plugins['users-permissions'].controllers.auth.register(context); let output = context.body.toJSON ? context.body.toJSON() : context.body; - + checkBadRequest(output); return { user: output.user || output, jwt: output.jwt From 878b4f349551179b6b652468435282726190e45a Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Tue, 21 Jan 2020 11:13:17 +0100 Subject: [PATCH 7/7] Add codecov to disable comments on non master PRs Signed-off-by: Alexandre Bodin --- codecov.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000000..e88701a0a6 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,2 @@ +comment: + branch: master