From d3c740ee8ecd38bca57e850332824445d82dbf05 Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Thu, 16 Jun 2022 14:02:55 +0200 Subject: [PATCH 1/5] Fix Google App Engine guide (socketPath/PostgreSQL) (#944) * Customize last-updated plugin output * Fix host/socketPath issue (MySQL vs. PostgreSQL) on Google App Engine guide --- .../deployment/hosting-guides/google-app-engine.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/google-app-engine.md b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/google-app-engine.md index 5a111f8656..e1607b2426 100644 --- a/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/google-app-engine.md +++ b/docs/developer-docs/latest/setup-deployment-guides/deployment/hosting-guides/google-app-engine.md @@ -171,7 +171,7 @@ yarn add pg [Google App Engine requires](https://cloud.google.com/sql/docs/postgres/connect-app-engine) to connect to the database using the unix socket path, not an IP and port. -Edit `database.js`, and use the socket path as `socketPath`. +Edit `database.js`, and use the socket path as `socketPath` for a MySQL database or as `host` for a PostgreSQL database. `Path: ./config/env/production/database.js`. @@ -183,7 +183,8 @@ module.exports = ({ env }) => ({ connector: 'bookshelf', settings: { client: 'postgres', - socketPath: `/cloudsql/${env('INSTANCE_CONNECTION_NAME')}`, + host: `/cloudsql/${env('INSTANCE_CONNECTION_NAME')}`, // for a MySQL database + // ⚠️ For a PostgreSQL database, use socketPath: `/cloudsql/${env('INSTANCE_CONNECTION_NAME')}` instead database: env('DATABASE_NAME'), username: env('DATABASE_USERNAME'), password: env('DATABASE_PASSWORD'), From 5c349739821d0806857e9a8055d2eb755d466836 Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Thu, 16 Jun 2022 16:23:24 +0200 Subject: [PATCH 2/5] Fix watch admin flag usage (#946) --- .../latest/development/admin-customization.md | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/docs/developer-docs/latest/development/admin-customization.md b/docs/developer-docs/latest/development/admin-customization.md index 3f36f78546..7f86048e19 100644 --- a/docs/developer-docs/latest/development/admin-customization.md +++ b/docs/developer-docs/latest/development/admin-customization.md @@ -13,7 +13,6 @@ To extend this package you will have to create an `admin` folder at the root of In this folder you will be able to override admin files and functions. - ## Customization options The administration panel can be customized according to your needs, so you can make it reflect your identity. @@ -44,11 +43,28 @@ The panel will be available through [http://localhost:1337/dashboard](http://loc To enable the front-end development mode you need to start your application using the `--watch-admin` flag. + + + + +```bash +cd my-app +yarn develop -- --watch-admin +``` + + + + + ```bash cd my-app -strapi develop --watch-admin +npm run develop -- --watch-admin ``` + + + + With this option you can do the following: #### Customize the `strapi-admin` package @@ -181,8 +197,8 @@ module.exports = ({ env }) => ({ host: env('HOST', '0.0.0.0'), port: env.int('PORT', 1337), admin: { - host: 'my-host', // only used along with `strapi develop --watch-admin` command - port: 3000, // only used along with `strapi develop --watch-admin` command + host: 'my-host', // only used along with the `npm run/yarn develop -- --watch-admin` commands + port: 3000, // only used along with `npm run/yarn develop -- --watch-admin` commands }, }); ``` @@ -191,7 +207,6 @@ module.exports = ({ env }) => ({ To build the administration, run the following command from the root directory of your project. - From de3a1ab24e886e2b63df7d964a4071eb22f63e15 Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Thu, 16 Jun 2022 17:01:45 +0200 Subject: [PATCH 3/5] Fix broken links to codebase (tag 3.6.10) (#947) --- docs/developer-docs/latest/guides/custom-admin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer-docs/latest/guides/custom-admin.md b/docs/developer-docs/latest/guides/custom-admin.md index a1bbf04d88..43fb7d995c 100644 --- a/docs/developer-docs/latest/guides/custom-admin.md +++ b/docs/developer-docs/latest/guides/custom-admin.md @@ -102,7 +102,7 @@ To be able to see the update, you will need to have a Content Type that has a `d Then you will have to investigate into the [`strapi-plugin-content-manager`](https://github.com/strapi/strapi/tree/master/packages/strapi-plugin-content-manager) package to find the file that is used to format the date for the list view. -Here is the [Row component](https://github.com/strapi/strapi/blob/master/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js) which requires a [dedicated file](https://github.com/strapi/strapi/blob/master/packages/strapi-plugin-content-manager/admin/src/utils/dateFormats.js) to modify the date display. +Here is the [Row component](https://github.com/strapi/strapi/blob/v3.6.10/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row/index.js) which requires a [dedicated file](https://github.com/strapi/strapi/blob/v3.6.10/packages/strapi-plugin-content-manager/admin/src/utils/dateFormats.js) to modify the date display. ### Eject the file From 712be2e6b5cbc5f5a08269a4502b4bba0940efae Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Thu, 16 Jun 2022 17:24:45 +0200 Subject: [PATCH 4/5] Add caution callout about dynamic zones (#950) --- .../content-types-builder/configuring-fields-content-type.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/user-docs/latest/content-types-builder/configuring-fields-content-type.md b/docs/user-docs/latest/content-types-builder/configuring-fields-content-type.md index a6b797746e..08c41ae924 100644 --- a/docs/user-docs/latest/content-types-builder/configuring-fields-content-type.md +++ b/docs/user-docs/latest/content-types-builder/configuring-fields-content-type.md @@ -451,3 +451,7 @@ Dynamic zones are a combination of components that can be added to content-types :::: After configuring the settings of the dynamic zone, its components must be configured as well. It is possible to either choose an existing component or create a new one. + +::: caution +When using dynamic zones, different components cannot have the same field name with different types (or with enumeration fields, different values). +::: From 4af543a1767bdf5a1ecef7c7e74f7fdc649be79f Mon Sep 17 00:00:00 2001 From: Pierre Wizla Date: Thu, 16 Jun 2022 17:32:46 +0200 Subject: [PATCH 5/5] Fix code snippet to disable SSL (#951) --- .../latest/setup-deployment-guides/configurations.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/developer-docs/latest/setup-deployment-guides/configurations.md b/docs/developer-docs/latest/setup-deployment-guides/configurations.md index e68289630b..17e33483d9 100644 --- a/docs/developer-docs/latest/setup-deployment-guides/configurations.md +++ b/docs/developer-docs/latest/setup-deployment-guides/configurations.md @@ -114,9 +114,7 @@ module.exports = ({ env }) => ({ username: env('DATABASE_USERNAME', 'strapi'), password: env('DATABASE_PASSWORD', 'strapi'), schema: env('DATABASE_SCHEMA', 'public'), // Not Required - ssl: { - rejectUnauthorized: env.bool('DATABASE_SSL_SELF', false), // For self-signed certificates - }, + ssl: false, }, options: {}, },