From 052059a4fb5f4cd573cad810587631c362ed848b Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@strapi.io>
Date: Mon, 22 Nov 2021 10:51:50 +0100
Subject: [PATCH 1/2] prevent relation to api token and locale

---
 .../core/content-type-builder/server/services/constants.js    | 4 ++++
 .../content-type-builder/server/services/content-types.js     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/content-type-builder/server/services/constants.js b/packages/core/content-type-builder/server/services/constants.js
index 1cf48f59c0..ba7f95d7d8 100644
--- a/packages/core/content-type-builder/server/services/constants.js
+++ b/packages/core/content-type-builder/server/services/constants.js
@@ -38,6 +38,8 @@ const FORBIDDEN_ATTRIBUTE_NAMES = ['__component', '__contentType'];
 const PREFIX = 'strapi::';
 const STRAPI_USER = 'admin::user';
 const UPLOAD_FILE = 'plugin::upload.file';
+const API_TOKEN = 'admin::api-token';
+const I18N = 'plugin::i18n.locale';
 
 module.exports = {
   DEFAULT_TYPES,
@@ -57,5 +59,7 @@ module.exports = {
   },
   pluginsUids: {
     UPLOAD_FILE,
+    API_TOKEN,
+    I18N,
   },
 };
diff --git a/packages/core/content-type-builder/server/services/content-types.js b/packages/core/content-type-builder/server/services/content-types.js
index c80c58ff74..d3091fafec 100644
--- a/packages/core/content-type-builder/server/services/content-types.js
+++ b/packages/core/content-type-builder/server/services/content-types.js
@@ -19,7 +19,7 @@ const getRestrictRelationsTo = (contentType = {}) => {
     return ['oneWay', 'manyWay'];
   }
 
-  if (uid.startsWith(coreUids.PREFIX) || uid === pluginsUids.UPLOAD_FILE) {
+  if (uid.startsWith(coreUids.PREFIX) || Object.values(pluginsUids).includes(uid)) {
     return [];
   }
 

From 0446793ee96decb5758959ad5b6a63072bc414d6 Mon Sep 17 00:00:00 2001
From: Dieter Stinglhamber <dieter.stinglhamber@strapi.io>
Date: Tue, 23 Nov 2021 10:37:08 +0100
Subject: [PATCH 2/2] use pluginOption visibility

---
 .../core/content-type-builder/server/services/constants.js  | 4 ----
 .../content-type-builder/server/services/content-types.js   | 6 +++++-
 .../server/content-types/permission/index.js                | 3 +++
 .../users-permissions/server/content-types/role/index.js    | 3 +++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/core/content-type-builder/server/services/constants.js b/packages/core/content-type-builder/server/services/constants.js
index ba7f95d7d8..1cf48f59c0 100644
--- a/packages/core/content-type-builder/server/services/constants.js
+++ b/packages/core/content-type-builder/server/services/constants.js
@@ -38,8 +38,6 @@ const FORBIDDEN_ATTRIBUTE_NAMES = ['__component', '__contentType'];
 const PREFIX = 'strapi::';
 const STRAPI_USER = 'admin::user';
 const UPLOAD_FILE = 'plugin::upload.file';
-const API_TOKEN = 'admin::api-token';
-const I18N = 'plugin::i18n.locale';
 
 module.exports = {
   DEFAULT_TYPES,
@@ -59,7 +57,5 @@ module.exports = {
   },
   pluginsUids: {
     UPLOAD_FILE,
-    API_TOKEN,
-    I18N,
   },
 };
diff --git a/packages/core/content-type-builder/server/services/content-types.js b/packages/core/content-type-builder/server/services/content-types.js
index d3091fafec..997d192b6b 100644
--- a/packages/core/content-type-builder/server/services/content-types.js
+++ b/packages/core/content-type-builder/server/services/content-types.js
@@ -19,7 +19,11 @@ const getRestrictRelationsTo = (contentType = {}) => {
     return ['oneWay', 'manyWay'];
   }
 
-  if (uid.startsWith(coreUids.PREFIX) || Object.values(pluginsUids).includes(uid)) {
+  if (
+    uid.startsWith(coreUids.PREFIX) ||
+    uid === pluginsUids.UPLOAD_FILE ||
+    !isContentTypeVisible(contentType)
+  ) {
     return [];
   }
 
diff --git a/packages/plugins/users-permissions/server/content-types/permission/index.js b/packages/plugins/users-permissions/server/content-types/permission/index.js
index fe6cf15d6c..70648c8b1c 100644
--- a/packages/plugins/users-permissions/server/content-types/permission/index.js
+++ b/packages/plugins/users-permissions/server/content-types/permission/index.js
@@ -13,6 +13,9 @@ module.exports = {
     'content-manager': {
       visible: false,
     },
+    'content-type-builder': {
+      visible: false,
+    },
   },
   attributes: {
     action: {
diff --git a/packages/plugins/users-permissions/server/content-types/role/index.js b/packages/plugins/users-permissions/server/content-types/role/index.js
index e6c2772679..ceb45c64e5 100644
--- a/packages/plugins/users-permissions/server/content-types/role/index.js
+++ b/packages/plugins/users-permissions/server/content-types/role/index.js
@@ -13,6 +13,9 @@ module.exports = {
     'content-manager': {
       visible: false,
     },
+    'content-type-builder': {
+      visible: false,
+    },
   },
   attributes: {
     name: {