From 816bd3455a5376c261a945f602a0548d831ba840 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Mon, 24 Oct 2022 18:06:23 +0200
Subject: [PATCH 01/17] lint typescript files

---
 .eslintrc.js | 13 +++++++++++--
 package.json |  8 ++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index f3b0af1942..642cdf6968 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,15 +7,24 @@ const frontPaths = [
   'test/config/front/**/*.js',
 ];
 
+const backendRules = require('./.eslintrc.back.js');
+
 module.exports = {
   parserOptions: {
     ecmaVersion: 2020,
   },
   overrides: [
     {
-      files: ['packages/**/*.js', 'test/**/*.js', 'scripts/**/*.js'],
+      files: [
+        'packages/**/*.js',
+        'test/**/*.js',
+        'scripts/**/*.js',
+        'packages/**/*.ts',
+        'test/**/*.ts',
+        'scripts/**/*.ts',
+      ],
       excludedFiles: frontPaths,
-      ...require('./.eslintrc.back.js'),
+      ...backendRules,
     },
     {
       files: frontPaths,
diff --git a/package.json b/package.json
index 689f7fbd9c..dd6835b154 100644
--- a/package.json
+++ b/package.json
@@ -35,13 +35,13 @@
     "generate": "plop --plopfile ./packages/generators/admin/plopfile.js",
     "lint": "npm-run-all -p lint:code lint:css",
     "lint:code": "eslint .",
-    "lint:css": "stylelint packages/**/admin/src/**/*.js",
+    "lint:css": "stylelint packages/**/admin/src/**/*.{js,ts}",
     "lint:fix": "eslint --fix .",
     "lint:other": "npm run prettier:other -- --check",
     "format": "npm-run-all -p format:*",
     "format:code": "npm run prettier:code -- --write",
     "format:other": "npm run prettier:other -- --write",
-    "prettier:code": "prettier \"**/*.js\"",
+    "prettier:code": "prettier \"**/*.{js,ts}\"",
     "prettier:other": "prettier \"**/*.{md,css,scss,yaml,yml}\"",
     "test:clean": "rimraf ./coverage",
     "test:front": "npm run test:clean && cross-env IS_EE=true jest --config ./jest.config.front.js",
@@ -56,10 +56,10 @@
     "doc:api": "node scripts/open-api/serve.js"
   },
   "lint-staged": {
-    "*.{js,md,css,scss,yaml,yml}": [
+    "*.{js,ts,md,css,scss,yaml,yml}": [
       "prettier --write"
     ],
-    "*.js": [
+    "*.{js,ts}": [
       "eslint --fix"
     ]
   },

From 54d5eb9df9fed420d758f478e6b2b5541b19c190 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Mon, 24 Oct 2022 18:14:18 +0200
Subject: [PATCH 02/17] don't support ts for front-end yet

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dd6835b154..d98fb23e6c 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "generate": "plop --plopfile ./packages/generators/admin/plopfile.js",
     "lint": "npm-run-all -p lint:code lint:css",
     "lint:code": "eslint .",
-    "lint:css": "stylelint packages/**/admin/src/**/*.{js,ts}",
+    "lint:css": "stylelint packages/**/admin/src/**/*.js",
     "lint:fix": "eslint --fix .",
     "lint:other": "npm run prettier:other -- --check",
     "format": "npm-run-all -p format:*",

From 972d8a9c929523bf5bd48986e3ea208c56550c01 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Mon, 7 Nov 2022 11:46:41 +0100
Subject: [PATCH 03/17] add archive option

---
 .../lib/providers/local-file-destination-provider.ts     | 5 +++++
 packages/core/strapi/bin/strapi.js                       | 9 +++++++--
 packages/core/strapi/lib/commands/transfer/export.js     | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/core/data-transfer/lib/providers/local-file-destination-provider.ts b/packages/core/data-transfer/lib/providers/local-file-destination-provider.ts
index f46a558575..482cda65fb 100644
--- a/packages/core/data-transfer/lib/providers/local-file-destination-provider.ts
+++ b/packages/core/data-transfer/lib/providers/local-file-destination-provider.ts
@@ -20,6 +20,11 @@ export interface ILocalFileDestinationProviderOptions {
     enabled: boolean;
   };
 
+  // Archive
+  archive: {
+    enabled: boolean;
+  };
+
   // File
   file: {
     path: string;
diff --git a/packages/core/strapi/bin/strapi.js b/packages/core/strapi/bin/strapi.js
index 93074ea542..c99bc358b8 100755
--- a/packages/core/strapi/bin/strapi.js
+++ b/packages/core/strapi/bin/strapi.js
@@ -277,7 +277,12 @@ program
       .argParser(parseInputBool)
   )
   .addOption(
-    new Option('--compress [boolean]', 'Compress output file using gz')
+    new Option('--compress [boolean]', 'Compress output file using gzip compression')
+      .default(true)
+      .argParser(parseInputBool)
+  )
+  .addOption(
+    new Option('--archive [boolean]', 'Archive output files using tar')
       .default(true)
       .argParser(parseInputBool)
   )
@@ -310,7 +315,7 @@ program
   .addOption(
     new Option(
       '--schemaComparison <schemaComparison>',
-      'exact requires every field to match, strict requires Strapi version and schemas to match, subset requires source schema to exist in destination, bypass skips checks',
+      'exact requires every field to match, strict requires Strapi version and content type schema fields do not break, subset requires source schema to exist in destination, bypass skips checks',
       parseInputList
     )
       .choices(['exact', 'strict', 'subset', 'bypass'])
diff --git a/packages/core/strapi/lib/commands/transfer/export.js b/packages/core/strapi/lib/commands/transfer/export.js
index ca854dd811..004ad03913 100644
--- a/packages/core/strapi/lib/commands/transfer/export.js
+++ b/packages/core/strapi/lib/commands/transfer/export.js
@@ -52,6 +52,9 @@ module.exports = async (filename, opts) => {
     compression: {
       enabled: opts.compress,
     },
+    archive: {
+      enabled: opts.archive,
+    },
   };
   const destination = createLocalFileDestinationProvider(destinationOptions);
 

From e0c969a0dd7fe7389ffe09763db4cd9276cd0b85 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Wed, 9 Nov 2022 09:56:05 +0100
Subject: [PATCH 04/17] use @typescript-eslint/parser for typescript

---
 .eslintrc.js | 22 ++++++++++++++--------
 package.json |  2 ++
 yarn.lock    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 642cdf6968..7e4cdbb07a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -15,17 +15,23 @@ module.exports = {
   },
   overrides: [
     {
-      files: [
-        'packages/**/*.js',
-        'test/**/*.js',
-        'scripts/**/*.js',
-        'packages/**/*.ts',
-        'test/**/*.ts',
-        'scripts/**/*.ts',
-      ],
+      // Backend javascript
+      files: ['packages/**/*.js', 'test/**/*.js', 'scripts/**/*.js'],
       excludedFiles: frontPaths,
       ...backendRules,
     },
+
+    // Backend typescript
+    {
+      parser: '@typescript-eslint/parser',
+      plugins: ['@typescript-eslint'],
+      extends: ['plugin:@typescript-eslint/recommended'],
+      files: ['packages/**/*.ts', 'test/**/*.ts', 'scripts/**/*.ts'],
+      excludedFiles: frontPaths,
+      //...backendRules, // TODO: write a typescript-friendly version of this
+    },
+
+    // Frontend
     {
       files: frontPaths,
       ...require('./.eslintrc.front.js'),
diff --git a/package.json b/package.json
index d98fb23e6c..71780985a9 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "@strapi/eslint-config": "0.1.2",
     "@swc/core": "1.2.224",
     "@swc/jest": "0.2.22",
+    "@typescript-eslint/parser": "5.42.1",
     "babel-eslint": "10.1.0",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
@@ -105,6 +106,7 @@
     "stylelint-processor-styled-components": "1.10.0",
     "supertest": "6.2.4",
     "ts-jest": "29.0.3",
+    "typescript": "4.8.4",
     "yargs": "13.3.2"
   },
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 02d504546c..adadfdc2e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6444,6 +6444,16 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/parser@5.42.1":
+  version "5.42.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.42.1.tgz#3e66156f2f74b11690b45950d8f5f28a62751d35"
+  integrity sha512-kAV+NiNBWVQDY9gDJDToTE/NO8BHi4f6b7zTsVAJoTkmB/zlfOpiEVBzHOKtlgTndCKe8vj9F/PuolemZSh50Q==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.42.1"
+    "@typescript-eslint/types" "5.42.1"
+    "@typescript-eslint/typescript-estree" "5.42.1"
+    debug "^4.3.4"
+
 "@typescript-eslint/parser@^5.14.0":
   version "5.32.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.32.0.tgz#1de243443bc6186fb153b9e395b842e46877ca5d"
@@ -6462,6 +6472,14 @@
     "@typescript-eslint/types" "5.32.0"
     "@typescript-eslint/visitor-keys" "5.32.0"
 
+"@typescript-eslint/scope-manager@5.42.1":
+  version "5.42.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.42.1.tgz#05e5e1351485637d466464237e5259b49f609b18"
+  integrity sha512-QAZY/CBP1Emx4rzxurgqj3rUinfsh/6mvuKbLNMfJMMKYLRBfweus8brgXF8f64ABkIZ3zdj2/rYYtF8eiuksQ==
+  dependencies:
+    "@typescript-eslint/types" "5.42.1"
+    "@typescript-eslint/visitor-keys" "5.42.1"
+
 "@typescript-eslint/type-utils@5.32.0":
   version "5.32.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.32.0.tgz#45a14506fe3fb908600b4cef2f70778f7b5cdc79"
@@ -6476,6 +6494,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.32.0.tgz#484273021eeeae87ddb288f39586ef5efeb6dcd8"
   integrity sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==
 
+"@typescript-eslint/types@5.42.1":
+  version "5.42.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.42.1.tgz#0d4283c30e9b70d2aa2391c36294413de9106df2"
+  integrity sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA==
+
 "@typescript-eslint/typescript-estree@5.32.0":
   version "5.32.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.32.0.tgz#282943f34babf07a4afa7b0ff347a8e7b6030d12"
@@ -6489,6 +6512,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.42.1":
+  version "5.42.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.1.tgz#f9a223ecb547a781d37e07a5ac6ba9ff681eaef0"
+  integrity sha512-qElc0bDOuO0B8wDhhW4mYVgi/LZL+igPwXtV87n69/kYC/7NG3MES0jHxJNCr4EP7kY1XVsRy8C/u3DYeTKQmw==
+  dependencies:
+    "@typescript-eslint/types" "5.42.1"
+    "@typescript-eslint/visitor-keys" "5.42.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.32.0":
   version "5.32.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.32.0.tgz#eccb6b672b94516f1afc6508d05173c45924840c"
@@ -6509,6 +6545,14 @@
     "@typescript-eslint/types" "5.32.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.42.1":
+  version "5.42.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.1.tgz#df10839adf6605e1cdb79174cf21e46df9be4872"
+  integrity sha512-LOQtSF4z+hejmpUvitPlc4hA7ERGoj2BVkesOcG91HCn8edLGUXbTrErmutmPbl8Bo9HjAvOO/zBKQHExXNA2A==
+  dependencies:
+    "@typescript-eslint/types" "5.42.1"
+    eslint-visitor-keys "^3.3.0"
+
 "@ucast/core@^1.0.0", "@ucast/core@^1.4.1", "@ucast/core@^1.6.1":
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/@ucast/core/-/core-1.10.1.tgz#03a77a7804bcb5002a5cad3681e86cd1897e2e1f"

From cdb0e0f456e09b24ca0c42f72a13358b9501f365 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Wed, 9 Nov 2022 11:02:35 +0100
Subject: [PATCH 05/17] update

---
 .eslintrc.back.typescript.js | 43 ++++++++++++++++++++++++++++++++++++
 .eslintrc.js                 | 13 ++++-------
 2 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 .eslintrc.back.typescript.js

diff --git a/.eslintrc.back.typescript.js b/.eslintrc.back.typescript.js
new file mode 100644
index 0000000000..e20ebdb5fe
--- /dev/null
+++ b/.eslintrc.back.typescript.js
@@ -0,0 +1,43 @@
+'use strict';
+
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
+  /**
+   * TODO: this should extend @strapi/eslint-config but doing so requires configuring parserOption.project, which requires tsconfig.json configuration
+   */
+  // extends: ['plugin:@typescript-eslint/recommended'],
+  globals: {
+    strapi: false,
+  },
+  rules: {
+    // 'import/no-dynamic-require': 'off',
+    // 'global-require': 'off',
+    // 'import/no-extraneous-dependencies': [
+    //   'error',
+    //   {
+    //     devDependencies: [
+    //       'packages/admin-test-utils/**/*.js',
+    //       'packages/generators/admin/**/*.js',
+    //       'scripts/**/*.js',
+    //       '**/test/**/*.js',
+    //       '**/tests/**/*.js',
+    //       '**/__tests__/**/*.js',
+    //       '**/__mocks__/**/*.js',
+    //     ],
+    //   },
+    // ],
+    // 'prefer-destructuring': ['error', { AssignmentExpression: { array: false } }],
+    // 'no-underscore-dangle': 'off',
+    // 'no-use-before-define': 'off',
+    // 'no-continue': 'warn',
+    // 'no-process-exit': 'off',
+    // 'no-loop-func': 'off',
+    // 'no-param-reassign': [
+    //   'error',
+    //   {
+    //     props: false,
+    //   },
+    // ],
+  },
+};
diff --git a/.eslintrc.js b/.eslintrc.js
index 7e4cdbb07a..501b0a7823 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,9 +7,7 @@ const frontPaths = [
   'test/config/front/**/*.js',
 ];
 
-const backendRules = require('./.eslintrc.back.js');
-
-module.exports = {
+const backendRules = (module.exports = {
   parserOptions: {
     ecmaVersion: 2020,
   },
@@ -18,17 +16,14 @@ module.exports = {
       // Backend javascript
       files: ['packages/**/*.js', 'test/**/*.js', 'scripts/**/*.js'],
       excludedFiles: frontPaths,
-      ...backendRules,
+      ...require('./.eslintrc.back.js'),
     },
 
     // Backend typescript
     {
-      parser: '@typescript-eslint/parser',
-      plugins: ['@typescript-eslint'],
-      extends: ['plugin:@typescript-eslint/recommended'],
       files: ['packages/**/*.ts', 'test/**/*.ts', 'scripts/**/*.ts'],
       excludedFiles: frontPaths,
-      //...backendRules, // TODO: write a typescript-friendly version of this
+      ...require('./.eslintrc.back.typescript.js'),
     },
 
     // Frontend
@@ -37,4 +32,4 @@ module.exports = {
       ...require('./.eslintrc.front.js'),
     },
   ],
-};
+});

From 5128e333c84713a2e28e8363bb579332d9705a07 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Wed, 9 Nov 2022 12:25:02 +0100
Subject: [PATCH 06/17] fix

---
 .eslintrc.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 501b0a7823..0945f68fbb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,7 +7,7 @@ const frontPaths = [
   'test/config/front/**/*.js',
 ];
 
-const backendRules = (module.exports = {
+module.exports = {
   parserOptions: {
     ecmaVersion: 2020,
   },
@@ -32,4 +32,4 @@ const backendRules = (module.exports = {
       ...require('./.eslintrc.front.js'),
     },
   ],
-});
+};

From b16d10249b3d549f920b3967c3fd45bd129a1e72 Mon Sep 17 00:00:00 2001
From: Mark Kaylor <mark.kaylor@strapi.io>
Date: Wed, 9 Nov 2022 16:22:43 +0100
Subject: [PATCH 07/17] Reduce use of getByRole to improve performance

---
 .../NpmPackagesFilters/FilterSelect.js        |  3 +-
 .../components/NpmPackagesFilters/index.js    |  1 +
 .../tests/__snapshots__/index.test.js.snap    |  1 +
 .../tests/__snapshots__/plugins.test.js.snap  |  1 +
 .../__snapshots__/providers.test.js.snap      |  1 +
 .../pages/MarketplacePage/tests/index.test.js |  1 -
 .../MarketplacePage/tests/plugins.test.js     | 68 +++++++++----------
 .../MarketplacePage/tests/providers.test.js   | 38 +++++------
 8 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js
index 7e846a738f..7cef3641da 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js
@@ -9,6 +9,7 @@ const FilterSelect = ({ message, value, onChange, possibleFilters, onClear, cust
 
   return (
     <Select
+      data-testid={`${message}-button`}
       aria-label={message}
       placeholder={message}
       size="M"
@@ -20,7 +21,7 @@ const FilterSelect = ({ message, value, onChange, possibleFilters, onClear, cust
     >
       {Object.entries(possibleFilters).map(([filterName, count]) => {
         return (
-          <Option key={filterName} value={filterName}>
+          <Option data-testid={`${filterName}-${count}`} key={filterName} value={filterName}>
             {computeFilterMessage(filterName, count)}
           </Option>
         );
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js
index 03d9dd5997..9136c3fb03 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js
@@ -51,6 +51,7 @@ const NpmPackagesFilters = ({
         <ButtonToggle
           variant="tertiary"
           ref={buttonRef}
+          data-testid="filters-button"
           startIcon={<Filter />}
           onClick={handleToggle}
           size="S"
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap
index 5d59d29d6b..f14caf39c4 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap
@@ -1378,6 +1378,7 @@ exports[`Marketplace page - layout renders the online layout 1`] = `
               <button
                 aria-disabled="false"
                 class="c52 c53 c54"
+                data-testid="filters-button"
                 type="button"
               >
                 <div
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap
index 044f713321..fd753f7a37 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap
@@ -1378,6 +1378,7 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps
               <button
                 aria-disabled="false"
                 class="c52 c53 c54"
+                data-testid="filters-button"
                 type="button"
               >
                 <div
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap
index 3366850271..2950fed161 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap
@@ -1373,6 +1373,7 @@ exports[`Marketplace page - providers tab renders and matches the providers tab
               <button
                 aria-disabled="false"
                 class="c52 c53 c54"
+                data-testid="filters-button"
                 type="button"
               >
                 <div
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
index 9fdc37287a..6642016d99 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
@@ -66,7 +66,6 @@ const App = (
 
 const waitForReload = async () => {
   await waitFor(() => {
-    expect(screen.queryByTestId('loader')).toBe(null);
     expect(screen.getByRole('heading', { name: /marketplace/i })).toBeInTheDocument();
   });
 };
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
index 1940ec3b9d..cb076b2175 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
@@ -20,8 +20,6 @@ import { createMemoryHistory } from 'history';
 import MarketPlacePage from '../index';
 import server from './server';
 
-// Increase the jest timeout to accommodate long running tests
-jest.setTimeout(50000);
 const toggleNotification = jest.fn();
 jest.mock('../../../hooks/useNavigatorOnLine', () => jest.fn(() => true));
 jest.mock('@strapi/helper-plugin', () => ({
@@ -51,16 +49,14 @@ const client = new QueryClient({
 });
 
 const waitForReload = async () => {
-  await waitFor(
-    () => {
-      expect(screen.queryByTestId('loader')).toBe(null);
-      expect(screen.getByRole('heading', { name: /marketplace/i })).toBeInTheDocument();
-    },
-    { timeout: 5000 }
-  );
+  await waitFor(() => {
+    expect(screen.queryByTestId('loader')).toBe(null);
+  });
 };
 
 describe('Marketplace page - plugins tab', () => {
+  // Increase the jest timeout to accommodate long running tests
+  jest.setTimeout(30000);
   let renderedContainer;
   let history;
 
@@ -151,21 +147,21 @@ describe('Marketplace page - plugins tab', () => {
   });
 
   it('shows plugins filters popover', () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
 
     userEvent.click(filtersButton);
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
-    const categoriesButton = screen.getByRole('button', { name: 'No categories selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
+    const categoriesButton = screen.getByTestId('Categories-button');
 
     expect(collectionsButton).toBeVisible();
     expect(categoriesButton).toBeVisible();
   });
 
   it('shows the collections filter options', () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
 
     userEvent.click(collectionsButton);
 
@@ -177,16 +173,16 @@ describe('Marketplace page - plugins tab', () => {
     };
 
     Object.entries(mockedServerCollections).forEach(([collectionName, count]) => {
-      const option = screen.getByRole('option', { name: `${collectionName} (${count})` });
+      const option = screen.getByTestId(`${collectionName}-${count}`);
       expect(option).toBeVisible();
     });
   });
 
   it('shows the categories filter options', () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const categoriesButton = screen.getByRole('button', { name: 'No categories selected' });
+    const categoriesButton = screen.getByTestId('Categories-button');
 
     userEvent.click(categoriesButton);
 
@@ -197,16 +193,16 @@ describe('Marketplace page - plugins tab', () => {
     };
 
     Object.entries(mockedServerCategories).forEach(([categoryName, count]) => {
-      const option = screen.getByRole('option', { name: `${categoryName} (${count})` });
+      const option = screen.getByTestId(`${categoryName}-${count}`);
       expect(option).toBeVisible();
     });
   });
 
   it('filters a collection option', async () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
     userEvent.click(collectionsButton);
 
     const option = screen.getByRole('option', { name: `Made by Strapi (13)` });
@@ -227,10 +223,10 @@ describe('Marketplace page - plugins tab', () => {
   });
 
   it('filters a category option', async () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const categoriesButton = screen.getByRole('button', { name: 'No categories selected' });
+    const categoriesButton = screen.getByTestId('Categories-button');
     userEvent.click(categoriesButton);
 
     const option = screen.getByRole('option', { name: `Custom fields (4)` });
@@ -252,9 +248,9 @@ describe('Marketplace page - plugins tab', () => {
 
   it('filters a category and a collection option', async () => {
     // When a user clicks the filters button
-    userEvent.click(screen.getByRole('button', { name: /filters/i }));
+    userEvent.click(screen.getByTestId('filters-button'));
     // They should see a select button for collections with no options selected
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
     // When they click the select button
     userEvent.click(collectionsButton);
     // They should see a Made by Strapi option
@@ -264,11 +260,11 @@ describe('Marketplace page - plugins tab', () => {
     // The page should reload
     await waitForReload();
     // When they click the filters button again
-    userEvent.click(screen.getByRole('button', { name: 'Filters' }));
+    userEvent.click(screen.getByTestId('filters-button'));
     // They should see the collections button indicating 1 option selected
     userEvent.click(screen.getByRole('button', { name: '1 collection selected Made by Strapi' }));
     // They should the categories button with no options selected
-    const categoriesButton = screen.getByRole('button', { name: 'No categories selected' });
+    const categoriesButton = screen.getByTestId('Categories-button');
     userEvent.click(categoriesButton);
     const categoryOption = screen.getByRole('option', { name: `Custom fields (4)` });
     userEvent.click(categoryOption);
@@ -295,13 +291,13 @@ describe('Marketplace page - plugins tab', () => {
   });
 
   it('filters multiple collection options', async () => {
-    userEvent.click(screen.getByRole('button', { name: /filters/i }));
-    userEvent.click(screen.getByRole('button', { name: 'No collections selected' }));
+    userEvent.click(screen.getByTestId('filters-button'));
+    userEvent.click(screen.getByTestId('Collections-button'));
     userEvent.click(screen.getByRole('option', { name: `Made by Strapi (13)` }));
 
     await waitForReload();
 
-    userEvent.click(screen.getByRole('button', { name: /filters/i }));
+    userEvent.click(screen.getByTestId('filters-button'));
     userEvent.click(screen.getByRole('button', { name: `1 collection selected Made by Strapi` }));
     userEvent.click(screen.getByRole('option', { name: `Verified (29)` }));
 
@@ -318,13 +314,13 @@ describe('Marketplace page - plugins tab', () => {
   });
 
   it('filters multiple category options', async () => {
-    userEvent.click(screen.getByRole('button', { name: /filters/i }));
-    userEvent.click(screen.getByRole('button', { name: 'No categories selected' }));
+    userEvent.click(screen.getByTestId('filters-button'));
+    userEvent.click(screen.getByTestId('Categories-button'));
     userEvent.click(screen.getByRole('option', { name: `Custom fields (4)` }));
 
     await waitForReload();
 
-    userEvent.click(screen.getByRole('button', { name: /filters/i }));
+    userEvent.click(screen.getByTestId('filters-button'));
     userEvent.click(screen.getByRole('button', { name: `1 category selected Custom fields` }));
     userEvent.click(screen.getByRole('option', { name: `Monitoring (1)` }));
 
@@ -341,10 +337,10 @@ describe('Marketplace page - plugins tab', () => {
   });
 
   it('removes a filter option tag', async () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
     userEvent.click(collectionsButton);
 
     const option = screen.getByRole('option', { name: `Made by Strapi (13)` });
@@ -362,10 +358,10 @@ describe('Marketplace page - plugins tab', () => {
   });
 
   it('only filters in the plugins tab', async () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
     userEvent.click(collectionsButton);
 
     const option = screen.getByRole('option', { name: `Made by Strapi (13)` });
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
index 9f893e6f82..76faf5cfd1 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
@@ -19,8 +19,6 @@ import { createMemoryHistory } from 'history';
 import MarketPlacePage from '../index';
 import server from './server';
 
-// Increase the jest timeout to accommodate long running tests
-jest.setTimeout(50000);
 const toggleNotification = jest.fn();
 jest.mock('../../../hooks/useNavigatorOnLine', () => jest.fn(() => true));
 jest.mock('@strapi/helper-plugin', () => ({
@@ -50,13 +48,9 @@ const client = new QueryClient({
 });
 
 const waitForReload = async () => {
-  await waitFor(
-    () => {
-      expect(screen.queryByTestId('loader')).toBe(null);
-      expect(screen.getByRole('heading', { name: /marketplace/i })).toBeInTheDocument();
-    },
-    { timeout: 5000 }
-  );
+  await waitFor(() => {
+    expect(screen.queryByTestId('loader')).toBe(null);
+  });
 };
 
 describe('Marketplace page - providers tab', () => {
@@ -158,7 +152,7 @@ describe('Marketplace page - providers tab', () => {
   });
 
   it('shows providers filters popover', () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
 
     // Only show collections filters on providers
     const providersTab = screen.getByRole('tab', { name: /providers/i });
@@ -168,10 +162,10 @@ describe('Marketplace page - providers tab', () => {
   });
 
   it('shows the collections filter options', () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
 
     userEvent.click(collectionsButton);
 
@@ -183,16 +177,16 @@ describe('Marketplace page - providers tab', () => {
     };
 
     Object.entries(mockedServerCollections).forEach(([collectionName, count]) => {
-      const option = screen.getByRole('option', { name: `${collectionName} (${count})` });
+      const option = screen.getByTestId(`${collectionName}-${count}`);
       expect(option).toBeVisible();
     });
   });
 
   it('filters a collection option', async () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
     userEvent.click(collectionsButton);
 
     const option = screen.getByRole('option', { name: `Made by Strapi (6)` });
@@ -213,13 +207,13 @@ describe('Marketplace page - providers tab', () => {
   });
 
   it('filters multiple collection options', async () => {
-    userEvent.click(screen.getByRole('button', { name: /filters/i }));
-    userEvent.click(screen.getByRole('button', { name: 'No collections selected' }));
+    userEvent.click(screen.getByTestId('filters-button'));
+    userEvent.click(screen.getByTestId('Collections-button'));
     userEvent.click(screen.getByRole('option', { name: `Made by Strapi (6)` }));
 
     await waitForReload();
 
-    userEvent.click(screen.getByRole('button', { name: /filters/i }));
+    userEvent.click(screen.getByTestId('filters-button'));
     userEvent.click(screen.getByRole('button', { name: `1 collection selected Made by Strapi` }));
     userEvent.click(screen.getByRole('option', { name: `Verified (6)` }));
 
@@ -236,10 +230,10 @@ describe('Marketplace page - providers tab', () => {
   });
 
   it('removes a filter option tag', async () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
     userEvent.click(collectionsButton);
 
     const option = screen.getByRole('option', { name: `Made by Strapi (6)` });
@@ -257,10 +251,10 @@ describe('Marketplace page - providers tab', () => {
   });
 
   it('only filters in the providers tab', async () => {
-    const filtersButton = screen.getByRole('button', { name: /filters/i });
+    const filtersButton = screen.getByTestId('filters-button');
     userEvent.click(filtersButton);
 
-    const collectionsButton = screen.getByRole('button', { name: 'No collections selected' });
+    const collectionsButton = screen.getByTestId('Collections-button');
     userEvent.click(collectionsButton);
 
     const option = screen.getByRole('option', { name: `Made by Strapi (6)` });

From b9850900d55be3f1382022f3684c737e4f1895db Mon Sep 17 00:00:00 2001
From: Mark Kaylor <mark.kaylor@strapi.io>
Date: Wed, 9 Nov 2022 17:06:38 +0100
Subject: [PATCH 08/17] Increase timeout for gh actions

---
 .../admin/src/pages/MarketplacePage/tests/providers.test.js     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
index 76faf5cfd1..5f638ba861 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
@@ -68,6 +68,8 @@ describe('Marketplace page - providers tab', () => {
   afterAll(() => server.close());
 
   beforeEach(async () => {
+    // Increase the jest timeout to accommodate long running tests
+    jest.setTimeout(30000);
     history = createMemoryHistory();
     // Make sure each test isolated
     const { container } = render(

From e06ee53c43b94a3b75451c09d507e9168a229db3 Mon Sep 17 00:00:00 2001
From: Mark Kaylor <mark.kaylor@strapi.io>
Date: Wed, 9 Nov 2022 17:54:52 +0100
Subject: [PATCH 09/17] Add back timeout for waitFor

---
 .../src/pages/MarketplacePage/tests/plugins.test.js      | 9 ++++++---
 .../src/pages/MarketplacePage/tests/providers.test.js    | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
index cb076b2175..3b331c963b 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
@@ -49,9 +49,12 @@ const client = new QueryClient({
 });
 
 const waitForReload = async () => {
-  await waitFor(() => {
-    expect(screen.queryByTestId('loader')).toBe(null);
-  });
+  await waitFor(
+    () => {
+      expect(screen.queryByTestId('loader')).toBe(null);
+    },
+    { timeout: 5000 }
+  );
 };
 
 describe('Marketplace page - plugins tab', () => {
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
index 5f638ba861..e76ba7e6e5 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
@@ -48,9 +48,12 @@ const client = new QueryClient({
 });
 
 const waitForReload = async () => {
-  await waitFor(() => {
-    expect(screen.queryByTestId('loader')).toBe(null);
-  });
+  await waitFor(
+    () => {
+      expect(screen.queryByTestId('loader')).toBe(null);
+    },
+    { timeout: 5000 }
+  );
 };
 
 describe('Marketplace page - providers tab', () => {

From c4150aa613e927cd8c3e7593e902960effcfcaac Mon Sep 17 00:00:00 2001
From: Mark Kaylor <mark.kaylor@strapi.io>
Date: Wed, 9 Nov 2022 18:20:58 +0100
Subject: [PATCH 10/17] Revert timeout to original

---
 .../admin/src/pages/MarketplacePage/tests/plugins.test.js     | 4 ++--
 .../admin/src/pages/MarketplacePage/tests/providers.test.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
index 3b331c963b..d8e14e01f7 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
@@ -20,6 +20,8 @@ import { createMemoryHistory } from 'history';
 import MarketPlacePage from '../index';
 import server from './server';
 
+// Increase the jest timeout to accommodate long running tests
+jest.setTimeout(50000);
 const toggleNotification = jest.fn();
 jest.mock('../../../hooks/useNavigatorOnLine', () => jest.fn(() => true));
 jest.mock('@strapi/helper-plugin', () => ({
@@ -58,8 +60,6 @@ const waitForReload = async () => {
 };
 
 describe('Marketplace page - plugins tab', () => {
-  // Increase the jest timeout to accommodate long running tests
-  jest.setTimeout(30000);
   let renderedContainer;
   let history;
 
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
index e76ba7e6e5..44655e47d3 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
@@ -19,6 +19,8 @@ import { createMemoryHistory } from 'history';
 import MarketPlacePage from '../index';
 import server from './server';
 
+// Increase the jest timeout to accommodate long running tests
+jest.setTimeout(50000);
 const toggleNotification = jest.fn();
 jest.mock('../../../hooks/useNavigatorOnLine', () => jest.fn(() => true));
 jest.mock('@strapi/helper-plugin', () => ({
@@ -71,8 +73,6 @@ describe('Marketplace page - providers tab', () => {
   afterAll(() => server.close());
 
   beforeEach(async () => {
-    // Increase the jest timeout to accommodate long running tests
-    jest.setTimeout(30000);
     history = createMemoryHistory();
     // Make sure each test isolated
     const { container } = render(

From 3ef2eabdadd86c9e968bfa0ee8f1508c084fb144 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Wed, 9 Nov 2022 19:10:41 +0100
Subject: [PATCH 11/17] Fix validation on user update

---
 .../server/controllers/validation/user.js           | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/users-permissions/server/controllers/validation/user.js b/packages/plugins/users-permissions/server/controllers/validation/user.js
index e0407f138f..d62f3f77bd 100644
--- a/packages/plugins/users-permissions/server/controllers/validation/user.js
+++ b/packages/plugins/users-permissions/server/controllers/validation/user.js
@@ -18,7 +18,7 @@ const createUserBodySchema = yup.object().shape({
             connect: yup
               .array()
               .of(yup.object().shape({ id: yup.strapiID().required() }))
-              .min(1)
+              .min(1, 'Users must have a role')
               .required(),
           })
           .required()
@@ -36,7 +36,16 @@ const updateUserBodySchema = yup.object().shape({
           connect: yup
             .array()
             .of(yup.object().shape({ id: yup.strapiID().required() }))
-            .min(1)
+            .required(),
+          disconnect: yup
+            .array()
+            .test('CheckDisconnect', 'Cannot remove role', function test(disconnectValue) {
+              if (value.connect.length === 0 && disconnectValue.length > 0) {
+                return false;
+              }
+
+              return true;
+            })
             .required(),
         })
       : yup.strapiID()

From 13cbc3149767e0072c137364acfca086663b7662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20No=C3=ABl?= <petersg83@gmail.com>
Date: Wed, 9 Nov 2022 19:35:56 +0100
Subject: [PATCH 12/17] remove tests relation-list.test.api.js &
 relations.test.api.js

---
 .../content-manager/relations.test.api.js     |  75 -------
 .../server/tests/relation-list.test.api.js    | 196 ------------------
 2 files changed, 271 deletions(-)
 delete mode 100644 packages/core/content-manager/server/tests/content-manager/relations.test.api.js
 delete mode 100644 packages/core/content-manager/server/tests/relation-list.test.api.js

diff --git a/packages/core/content-manager/server/tests/content-manager/relations.test.api.js b/packages/core/content-manager/server/tests/content-manager/relations.test.api.js
deleted file mode 100644
index cc7dbadcde..0000000000
--- a/packages/core/content-manager/server/tests/content-manager/relations.test.api.js
+++ /dev/null
@@ -1,75 +0,0 @@
-'use strict';
-
-// Helpers.
-const { createTestBuilder } = require('../../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../../test/helpers/strapi');
-const form = require('../../../../../../test/helpers/generators');
-const { createAuthRequest } = require('../../../../../../test/helpers/request');
-
-const builder = createTestBuilder();
-let strapi;
-let rq;
-
-const restart = async () => {
-  await strapi.destroy();
-  strapi = await createStrapiInstance();
-  rq = await createAuthRequest({ strapi });
-};
-
-describe('Content Manager - Hide relations', () => {
-  beforeAll(async () => {
-    await builder.addContentTypes([form.article]).build();
-
-    strapi = await createStrapiInstance();
-    rq = await createAuthRequest({ strapi });
-  });
-
-  afterAll(async () => {
-    await strapi.destroy();
-    await builder.cleanup();
-  });
-
-  test('Hide relations', async () => {
-    await rq({
-      url: '/content-manager/content-types/api::article.article/configuration',
-      method: 'PUT',
-      body: {
-        layouts: {
-          edit: [],
-          editRelations: [],
-          list: [],
-        },
-      },
-    });
-
-    const { body } = await rq({
-      url: '/content-manager/content-types/api::article.article/configuration',
-      method: 'GET',
-    });
-
-    expect(body.data.contentType.layouts.editRelations).toStrictEqual([]);
-  });
-
-  test('Hide relations after server restart', async () => {
-    await rq({
-      url: '/content-manager/content-types/api::article.article/configuration',
-      method: 'PUT',
-      body: {
-        layouts: {
-          edit: [],
-          editRelations: [],
-          list: [],
-        },
-      },
-    });
-
-    await restart();
-
-    const { body } = await rq({
-      url: '/content-manager/content-types/api::article.article/configuration',
-      method: 'GET',
-    });
-
-    expect(body.data.contentType.layouts.editRelations).toStrictEqual([]);
-  });
-});
diff --git a/packages/core/content-manager/server/tests/relation-list.test.api.js b/packages/core/content-manager/server/tests/relation-list.test.api.js
deleted file mode 100644
index ef0e7c65af..0000000000
--- a/packages/core/content-manager/server/tests/relation-list.test.api.js
+++ /dev/null
@@ -1,196 +0,0 @@
-'use strict';
-
-// Test a simple default API with no relations
-
-const { omit, pick } = require('lodash/fp');
-
-const { createTestBuilder } = require('../../../../../test/helpers/builder');
-const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
-const { createAuthRequest } = require('../../../../../test/helpers/request');
-
-let strapi;
-let rq;
-const data = {
-  products: [],
-  shops: [],
-};
-
-const productModel = {
-  attributes: {
-    name: {
-      type: 'string',
-    },
-  },
-  displayName: 'Product',
-  singularName: 'product',
-  pluralName: 'products',
-  description: '',
-  collectionName: '',
-};
-
-const productWithDPModel = {
-  attributes: {
-    name: {
-      type: 'string',
-    },
-  },
-  displayName: 'Product',
-  singularName: 'product',
-  pluralName: 'products',
-  draftAndPublish: true,
-  description: '',
-  collectionName: '',
-};
-
-const shopModel = {
-  attributes: {
-    name: {
-      type: 'string',
-    },
-    products: {
-      type: 'relation',
-      relation: 'manyToMany',
-      target: 'api::product.product',
-      targetAttribute: 'shops',
-    },
-  },
-  displayName: 'Shop',
-  singularName: 'shop',
-  pluralName: 'shops',
-};
-
-const shops = [
-  {
-    name: 'market',
-  },
-];
-
-const products =
-  ({ withPublished = false }) =>
-  ({ shop }) => {
-    const shops = [shop[0].id];
-
-    const entries = [
-      {
-        name: 'tomato',
-        shops,
-        publishedAt: new Date(),
-      },
-      {
-        name: 'apple',
-        shops,
-        publishedAt: null,
-      },
-    ];
-
-    if (withPublished) {
-      return entries;
-    }
-
-    return entries.map(omit('publishedAt'));
-  };
-
-describe('Relation-list route', () => {
-  describe('without draftAndPublish', () => {
-    const builder = createTestBuilder();
-
-    beforeAll(async () => {
-      await builder
-        .addContentTypes([productModel, shopModel])
-        .addFixtures(shopModel.singularName, shops)
-        .addFixtures(productModel.singularName, products({ withPublished: false }))
-        .build();
-
-      strapi = await createStrapiInstance();
-      rq = await createAuthRequest({ strapi });
-
-      data.shops = await builder.sanitizedFixturesFor(shopModel.singularName, strapi);
-      data.products = await builder.sanitizedFixturesFor(productModel.singularName, strapi);
-    });
-
-    afterAll(async () => {
-      await strapi.destroy();
-      await builder.cleanup();
-    });
-
-    test('Can get relation-list for products of a shop', async () => {
-      const res = await rq({
-        method: 'POST',
-        url: '/content-manager/relations/api::shop.shop/products',
-      });
-
-      expect(res.body).toHaveLength(data.products.length);
-      data.products.forEach((product, index) => {
-        expect(res.body[index]).toStrictEqual(pick(['_id', 'id', 'name'], product));
-      });
-    });
-
-    test('Can get relation-list for products of a shop and omit some results', async () => {
-      const res = await rq({
-        method: 'POST',
-        url: '/content-manager/relations/api::shop.shop/products',
-        body: {
-          idsToOmit: [data.products[0].id],
-        },
-      });
-
-      expect(res.body).toHaveLength(1);
-      expect(res.body[0]).toStrictEqual(pick(['_id', 'id', 'name'], data.products[1]));
-    });
-  });
-
-  describe('with draftAndPublish', () => {
-    const builder = createTestBuilder();
-
-    beforeAll(async () => {
-      await builder
-        .addContentTypes([productWithDPModel, shopModel])
-        .addFixtures(shopModel.singularName, shops)
-        .addFixtures(productWithDPModel.singularName, products({ withPublished: true }))
-        .build();
-
-      strapi = await createStrapiInstance();
-      rq = await createAuthRequest({ strapi });
-
-      data.shops = await builder.sanitizedFixturesFor(shopModel.singularName, strapi);
-      data.products = await builder.sanitizedFixturesFor(productWithDPModel.singularName, strapi);
-    });
-
-    afterAll(async () => {
-      await strapi.destroy();
-      await builder.cleanup();
-    });
-
-    test('Can get relation-list for products of a shop', async () => {
-      const res = await rq({
-        method: 'POST',
-        url: '/content-manager/relations/api::shop.shop/products',
-      });
-
-      expect(res.body).toHaveLength(data.products.length);
-
-      const tomatoProductRes = res.body.find((p) => p.name === 'tomato');
-      const appleProductRes = res.body.find((p) => p.name === 'apple');
-
-      expect(tomatoProductRes).toMatchObject(pick(['_id', 'id', 'name'], data.products[0]));
-      expect(tomatoProductRes.publishedAt).toBeISODate();
-      expect(appleProductRes).toStrictEqual({
-        ...pick(['_id', 'id', 'name'], data.products[1]),
-        publishedAt: null,
-      });
-    });
-
-    test('Can get relation-list for products of a shop and omit some results', async () => {
-      const res = await rq({
-        method: 'POST',
-        url: '/content-manager/relations/api::shop.shop/products',
-        body: {
-          idsToOmit: [data.products[1].id],
-        },
-      });
-
-      expect(res.body).toHaveLength(1);
-      expect(res.body[0]).toMatchObject(pick(['_id', 'id', 'name'], data.products[0]));
-    });
-  });
-});

From 2d31e80598c85bde8f97a24fe01b0e210cac409b Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Mon, 14 Nov 2022 17:27:23 +0100
Subject: [PATCH 13/17] update help text

---
 packages/core/strapi/bin/strapi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/strapi/bin/strapi.js b/packages/core/strapi/bin/strapi.js
index c99bc358b8..ab526732a9 100755
--- a/packages/core/strapi/bin/strapi.js
+++ b/packages/core/strapi/bin/strapi.js
@@ -282,7 +282,7 @@ program
       .argParser(parseInputBool)
   )
   .addOption(
-    new Option('--archive [boolean]', 'Archive output files using tar')
+    new Option('--archive [boolean]', 'Archive output file as a tar')
       .default(true)
       .argParser(parseInputBool)
   )

From 8c9d3a0ff60615149e629c9bd0aada6fabd049f8 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Tue, 15 Nov 2022 08:41:33 +0100
Subject: [PATCH 14/17] add missing rules

---
 .eslintrc.back.typescript.js                  | 34 ++-----------------
 packages/core/data-transfer/package.json      |  2 ++
 .../lib/types/core/attributes/relation.d.ts   | 21 +++++-------
 packages/core/strapi/lib/types/factories.d.ts |  4 +--
 4 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/.eslintrc.back.typescript.js b/.eslintrc.back.typescript.js
index e20ebdb5fe..33936fc8bf 100644
--- a/.eslintrc.back.typescript.js
+++ b/.eslintrc.back.typescript.js
@@ -4,40 +4,12 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   plugins: ['@typescript-eslint'],
   /**
-   * TODO: this should extend @strapi/eslint-config but doing so requires configuring parserOption.project, which requires tsconfig.json configuration
+   * TODO: this should extend @strapi/eslint-config/typescript but doing so requires configuring parserOption.project, which requires tsconfig.json configuration
    */
   // extends: ['plugin:@typescript-eslint/recommended'],
   globals: {
     strapi: false,
   },
-  rules: {
-    // 'import/no-dynamic-require': 'off',
-    // 'global-require': 'off',
-    // 'import/no-extraneous-dependencies': [
-    //   'error',
-    //   {
-    //     devDependencies: [
-    //       'packages/admin-test-utils/**/*.js',
-    //       'packages/generators/admin/**/*.js',
-    //       'scripts/**/*.js',
-    //       '**/test/**/*.js',
-    //       '**/tests/**/*.js',
-    //       '**/__tests__/**/*.js',
-    //       '**/__mocks__/**/*.js',
-    //     ],
-    //   },
-    // ],
-    // 'prefer-destructuring': ['error', { AssignmentExpression: { array: false } }],
-    // 'no-underscore-dangle': 'off',
-    // 'no-use-before-define': 'off',
-    // 'no-continue': 'warn',
-    // 'no-process-exit': 'off',
-    // 'no-loop-func': 'off',
-    // 'no-param-reassign': [
-    //   'error',
-    //   {
-    //     props: false,
-    //   },
-    // ],
-  },
+  // Instead of extending (which includes values that interfere with this configuration), only take the rules field
+  rules: require('./.eslintrc.back.js').rules,
 };
diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json
index 2db5fe74cc..1b3755f84b 100644
--- a/packages/core/data-transfer/package.json
+++ b/packages/core/data-transfer/package.json
@@ -38,7 +38,9 @@
   },
   "dependencies": {
     "@strapi/logger": "4.5.0",
+    "@strapi/strapi": "4.5.0",
     "chalk": "4.1.2",
+    "lodash": "4.17.21",
     "prettier": "2.7.1",
     "stream-chain": "2.2.5",
     "stream-json": "1.7.4",
diff --git a/packages/core/strapi/lib/types/core/attributes/relation.d.ts b/packages/core/strapi/lib/types/core/attributes/relation.d.ts
index 0003825a3f..7b29901227 100644
--- a/packages/core/strapi/lib/types/core/attributes/relation.d.ts
+++ b/packages/core/strapi/lib/types/core/attributes/relation.d.ts
@@ -3,7 +3,7 @@ import { Attribute, ConfigurableOption, PrivateOption } from './base';
 import { GetAttributesByType, GetAttributesValues } from './utils';
 
 export type BasicRelationsType = 'oneToOne' | 'oneToMany' | 'manyToOne' | 'manyToMany';
-export type PolymorphicRelationsType =  'morphToOne' | 'morphToMany' | 'morphOne' | 'morphMany';
+export type PolymorphicRelationsType = 'morphToOne' | 'morphToMany' | 'morphOne' | 'morphMany';
 export type RelationsType = BasicRelationsType | PolymorphicRelationsType;
 
 export interface BasicRelationAttributeProperties<
@@ -17,16 +17,14 @@ export interface BasicRelationAttributeProperties<
   mappedBy?: RelationsKeysFromTo<T, S>;
 }
 
-export interface PolymorphicRelationAttributeProperties<
-  R extends RelationsType,
-> {
+export interface PolymorphicRelationAttributeProperties<R extends RelationsType> {
   relation: R;
 }
 
 export type RelationAttribute<
   S extends SchemaUID,
   R extends RelationsType,
-  T extends R extends PolymorphicRelationsType ? never: SchemaUID = never
+  T extends R extends PolymorphicRelationsType ? never : SchemaUID = never
 > = Attribute<'relation'> &
   // Properties
   (R extends BasicRelationsType
@@ -34,22 +32,21 @@ export type RelationAttribute<
     : PolymorphicRelationAttributeProperties<R>) &
   // Options
   ConfigurableOption &
-  PrivateOption
+  PrivateOption;
 
 export type RelationsKeysFromTo<
   TTarget extends SchemaUID,
   TSource extends SchemaUID
 > = keyof PickRelationsFromTo<TTarget, TSource>;
 
-export type PickRelationsFromTo<TTarget extends SchemaUID, TSource extends SchemaUID> = GetAttributesByType<
-  TTarget,
-  'relation',
-  { target: TSource }
->;
+export type PickRelationsFromTo<
+  TTarget extends SchemaUID,
+  TSource extends SchemaUID
+> = GetAttributesByType<TTarget, 'relation', { target: TSource }>;
 
 export type RelationPluralityModifier<
   TRelation extends RelationsType,
-  TValue extends Object
+  TValue extends Record<string, unknown>
 > = TRelation extends `${string}Many` ? TValue[] : TValue;
 
 export type RelationValue<
diff --git a/packages/core/strapi/lib/types/factories.d.ts b/packages/core/strapi/lib/types/factories.d.ts
index a7cc3669ba..9da8ed9598 100644
--- a/packages/core/strapi/lib/types/factories.d.ts
+++ b/packages/core/strapi/lib/types/factories.d.ts
@@ -1,8 +1,8 @@
-import { Service,GenericService } from '../core-api/service';
+import { Service, GenericService } from '../core-api/service';
 import { Controller, GenericController } from '../core-api/controller';
 import { Middleware } from '../middlewares';
 import { Policy } from '../core/registries/policies';
-import { Strapi } from '@strapi/strapi';
+import { Strapi } from './core/strapi';
 
 type ControllerConfig<T extends Controller = Controller> = T;
 

From bd0f0b68d9c47c0230a5e8bf9a50fb84e4525725 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Tue, 15 Nov 2022 08:43:58 +0100
Subject: [PATCH 15/17] synchronize typescript package versions

---
 package.json                             | 2 +-
 packages/core/data-transfer/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e7cfcc412f..58ea6a8814 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "stylelint-processor-styled-components": "1.10.0",
     "supertest": "6.2.4",
     "ts-jest": "29.0.3",
-    "typescript": "4.8.4",
+    "typescript": "4.6.2",
     "yargs": "17.6.0"
   },
   "engines": {
diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json
index 1b3755f84b..0780c523a9 100644
--- a/packages/core/data-transfer/package.json
+++ b/packages/core/data-transfer/package.json
@@ -53,7 +53,7 @@
     "@types/stream-json": "1.7.2",
     "@types/tar": "6.1.3",
     "rimraf": "3.0.2",
-    "typescript": "4.8.4"
+    "typescript": "4.6.2"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",

From 8f957a363e03728eeab86392559c762fa4534587 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Tue, 15 Nov 2022 09:49:32 +0100
Subject: [PATCH 16/17] make text more clear

---
 packages/core/strapi/bin/strapi.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/core/strapi/bin/strapi.js b/packages/core/strapi/bin/strapi.js
index ab526732a9..98d3162de6 100755
--- a/packages/core/strapi/bin/strapi.js
+++ b/packages/core/strapi/bin/strapi.js
@@ -282,7 +282,10 @@ program
       .argParser(parseInputBool)
   )
   .addOption(
-    new Option('--archive [boolean]', 'Archive output file as a tar')
+    new Option(
+      '--archive [boolean]',
+      'Export all backup files into a tar archive instead of a folder'
+    )
       .default(true)
       .argParser(parseInputBool)
   )

From cfe7e7c77a861a2b9ad4773d7b5dff04eaab61fd Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Tue, 15 Nov 2022 09:49:56 +0100
Subject: [PATCH 17/17] update text

---
 packages/core/strapi/bin/strapi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/strapi/bin/strapi.js b/packages/core/strapi/bin/strapi.js
index 98d3162de6..cf7953802c 100755
--- a/packages/core/strapi/bin/strapi.js
+++ b/packages/core/strapi/bin/strapi.js
@@ -284,7 +284,7 @@ program
   .addOption(
     new Option(
       '--archive [boolean]',
-      'Export all backup files into a tar archive instead of a folder'
+      'Export all backup files into a single tar archive instead of a folder'
     )
       .default(true)
       .argParser(parseInputBool)