From f35de465197cd3aaaf4ec5551bb18d16d7407f94 Mon Sep 17 00:00:00 2001 From: Tomislav Biscan Date: Tue, 5 May 2020 18:16:01 +0100 Subject: [PATCH 1/4] Changes the App Engine HOST variable to '0.0.0.0' (#6040) Setting the `HOST` variable to one that has `*.appspot.com` domain seems to be causing connectivity issues for multiple people - https://github.com/strapi/strapi/issues/3433#issuecomment-621764964 The solution is simply setting `0.0.0.0`. --- docs/3.0.0-beta.x/deployment/google-app-engine.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/3.0.0-beta.x/deployment/google-app-engine.md b/docs/3.0.0-beta.x/deployment/google-app-engine.md index b4b5de3fdd..ebd82d1b21 100644 --- a/docs/3.0.0-beta.x/deployment/google-app-engine.md +++ b/docs/3.0.0-beta.x/deployment/google-app-engine.md @@ -111,7 +111,7 @@ runtime: nodejs10 instance_class: F2 env_variables: - HOST: '.appspot.com' + HOST: '0.0.0.0' NODE_ENV: 'production' DATABASE_NAME: 'strapi' DATABASE_USERNAME: 'postgres' @@ -132,7 +132,7 @@ runtime: nodejs10 env: flex env_variables: - HOST: '.appspot.com' + HOST: '0.0.0.0' NODE_ENV: 'production' DATABASE_NAME: 'strapi' DATABASE_USERNAME: 'postgres' From d5f3ab79c327b63d0b39237c21ac191525f7ab60 Mon Sep 17 00:00:00 2001 From: Robert Piosik Date: Tue, 5 May 2020 19:16:43 +0200 Subject: [PATCH 2/4] docs: remove duplication in menu; (#6039) Guides/Count with GraphQL Signed-off-by: Robert Piosik --- docs/.vuepress/config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 7ef7ea0e03..217f3774bb 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -214,7 +214,6 @@ module.exports = { '/3.0.0-beta.x/guides/secure-your-app', '/3.0.0-beta.x/guides/send-email', '/3.0.0-beta.x/guides/registering-a-field-in-admin', - '/3.0.0-beta.x/guides/count-graphql', '/3.0.0-beta.x/guides/client', '/3.0.0-beta.x/guides/update-version', ], From a96d41eecaf0c5c9114bd973f85f37f4dab2e388 Mon Sep 17 00:00:00 2001 From: Thiago Augusto Date: Tue, 5 May 2020 14:34:32 -0300 Subject: [PATCH 3/4] Preventing parse-type Date test failure due to Time Zone differences (#6044) Signed-off-by: Thiago Augusto --- packages/strapi-utils/lib/__tests__/parse-type.test.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/strapi-utils/lib/__tests__/parse-type.test.js b/packages/strapi-utils/lib/__tests__/parse-type.test.js index 6d90e8579c..29e7b417b8 100644 --- a/packages/strapi-utils/lib/__tests__/parse-type.test.js +++ b/packages/strapi-utils/lib/__tests__/parse-type.test.js @@ -1,4 +1,5 @@ const parseType = require('../parse-type'); +const format = require('date-fns/format'); describe('parseType', () => { describe('boolean', () => { @@ -50,7 +51,10 @@ describe('parseType', () => { expect(parseType({ type: 'date', value: '2018-11-02' })).toBe('2018-11-02'); - expect(parseType({ type: 'date', value: '2019-04-21T00:00:00.000Z' })).toBe('2019-04-21'); + const isoDateFormat = new Date().toISOString(); + const expectedDateFormat = format(new Date(isoDateFormat), 'yyyy-MM-dd'); + + expect(parseType({ type: 'date', value: isoDateFormat })).toBe(expectedDateFormat); }); it('Throws on invalid formator dates', () => { From c9925f3fa88d3b191cb22ac76c9405d671604d01 Mon Sep 17 00:00:00 2001 From: Alex Yackovlev Date: Tue, 5 May 2020 20:38:41 +0300 Subject: [PATCH 4/4] Prevent fall through in the model search method when a plugin is specified (#6004) Signed-off-by: Aleksandr Yackovlev --- packages/strapi-database/lib/database-manager.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/strapi-database/lib/database-manager.js b/packages/strapi-database/lib/database-manager.js index c1d99e0ca6..531d9c26ee 100644 --- a/packages/strapi-database/lib/database-manager.js +++ b/packages/strapi-database/lib/database-manager.js @@ -108,11 +108,11 @@ class DatabaseManager { return _.get(strapi.admin, ['models', key]); } - return ( - _.get(strapi.plugins, [plugin, 'models', key]) || - _.get(strapi, ['models', key]) || - _.get(strapi, ['components', key]) - ); + if (plugin) { + return _.get(strapi.plugins, [plugin, 'models', key]); + } + + return _.get(strapi, ['models', key]) || _.get(strapi, ['components', key]); } getModelByCollectionName(collectionName) {