From c335f946b802acdc187a6ae01d0ba1873242151f Mon Sep 17 00:00:00 2001 From: soupette Date: Fri, 3 Jan 2020 12:03:55 +0100 Subject: [PATCH 1/4] Remove ctb links from the ctm in non dev envs --- .../ContentManager/EditSettingViewButton.js | 6 +++++- .../src/InjectedComponents/ContentManager/EditViewLink.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditSettingViewButton.js b/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditSettingViewButton.js index 7d938074cd..52f1c5e588 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditSettingViewButton.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditSettingViewButton.js @@ -14,7 +14,7 @@ import getTrad from '../../utils/getTrad'; // Create link from content-type-builder to content-manager function EditViewButton(props) { - const { emitEvent, formatMessage } = useGlobalContext(); + const { currentEnvironment, emitEvent, formatMessage } = useGlobalContext(); // Retrieve URL from props const { modifiedData, componentSlug, type } = get( props, @@ -41,6 +41,10 @@ function EditViewButton(props) { props.push(`${baseUrl}/${suffixUrl}`); }; + if (currentEnvironment !== 'development') { + return null; + } + if (props.getModelName() === 'strapi::administrator') { return null; } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditViewLink.js b/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditViewLink.js index 19c4bfeadb..e92d9d3103 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditViewLink.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditViewLink.js @@ -10,10 +10,14 @@ import { LiLink, useGlobalContext } from 'strapi-helper-plugin'; // Create link from content-type-builder to content-manager function EditViewLink(props) { - const { emitEvent } = useGlobalContext(); + const { currentEnvironment, emitEvent } = useGlobalContext(); // Retrieve URL from props const url = `/plugins/content-type-builder/content-types/${props.getModelName()}`; + if (currentEnvironment !== 'development') { + return null; + } + if (props.getModelName() === 'strapi::administrator') { return null; } From b0b117554055bb0452c02955965627b00841ca94 Mon Sep 17 00:00:00 2001 From: soupette Date: Fri, 3 Jan 2020 12:16:29 +0100 Subject: [PATCH 2/4] Add map and series to RESERVED_NAMES --- .../FormModal/utils/reservedNames.js | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/reservedNames.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/reservedNames.js index 283767ecd5..60372f3a74 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/reservedNames.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/reservedNames.js @@ -1,14 +1,21 @@ const JS_BUILT_IN_OBJECTS = [ - 'object', - 'function', 'boolean', - 'symbol', - 'error', - 'infinity', - 'number', - 'math', 'date', + 'error', + 'function', + 'infinity', + 'map', + 'math', + 'number', + 'object', + 'symbol', +]; +const RESERVED_NAMES = [ + 'admin', + 'series', + 'file', + 'news', + ...JS_BUILT_IN_OBJECTS, ]; -const RESERVED_NAMES = ['admin', 'series', 'file', ...JS_BUILT_IN_OBJECTS]; export default RESERVED_NAMES; From 0663fbecc3b99e266d6112564075146a0d4c265e Mon Sep 17 00:00:00 2001 From: KULDIP PIPALIYA Date: Sat, 4 Jan 2020 17:50:16 +0530 Subject: [PATCH 3/4] Update README.md --- packages/strapi-provider-upload-cloudinary/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/strapi-provider-upload-cloudinary/README.md b/packages/strapi-provider-upload-cloudinary/README.md index f06285a902..bea9d59098 100644 --- a/packages/strapi-provider-upload-cloudinary/README.md +++ b/packages/strapi-provider-upload-cloudinary/README.md @@ -3,7 +3,6 @@ ## ⏳ Installation ```bash -cd plugins/upload npm i --save strapi-provider-upload-cloudinary ```` From fadaa64518157bc68d35bd53b6bc68a32a87389e Mon Sep 17 00:00:00 2001 From: Derrick Mehaffy Date: Sat, 4 Jan 2020 11:26:14 -0700 Subject: [PATCH 4/4] Update policies documentation to include link to GraphQL doc --- docs/3.0.0-beta.x/concepts/policies.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/3.0.0-beta.x/concepts/policies.md b/docs/3.0.0-beta.x/concepts/policies.md index ae811d53dd..cafef71232 100644 --- a/docs/3.0.0-beta.x/concepts/policies.md +++ b/docs/3.0.0-beta.x/concepts/policies.md @@ -56,6 +56,10 @@ You can access to any controllers, services or models thanks to the global varia To apply policies to a route, you need to associate an array of policies to it. There are two kinds of policies: global or scoped. +::: warning +To apply policies with GraphQL please see the [following guide](../plugins/graphql.md#execute-a-policy-before-a-resolver) +::: + ### Global policies The global policies can be associated to any routes in your project.