@strapi/admin 4.10.0-beta.0 → 4.10.0-beta.1

package/ee/server/utils/persisted-tables.js

@@ -1,49 +1,141 @@
 'use strict';
 
+const { differenceWith, isEqual } = require('lodash/fp');
+
 /**
- * Finds all tables in the database that start with a prefix
- * @param {string} prefix
- * @returns {Array}
+ * Transform table name to the object format
+ * @param {Array<string|{ table: string; dependsOn?: Array<{ table: string;}> }>} table
+ * @returns Array<{ table: string; dependsOn?: Array<{ table: string;}> }>
  */
-const findTablesThatStartWithPrefix = async (prefix) => {
-  const tables = await strapi.db.dialect.schemaInspector.getTables();
-  return tables.filter((tableName) => tableName.startsWith(prefix));
+const transformTableName = (table) => {
+  if (typeof table === 'string') {
+    return { name: table };
+  }
+  return table;
 };
 
 /**
- * Get all reserved table names from the core store
- * @returns {Array}
+ * Finds all tables in the database matching the regular expression
+ * @param {Object} ctx
+ * @param {Strapi} ctx.strapi
+ * @param {RegExp} regex
+ * @returns {Promise<string[]>}
  */
-const getPersistedTables = async () =>
-  (await strapi.store.get({
+async function findTables({ strapi }, regex) {
+  const tables = await strapi.db.dialect.schemaInspector.getTables();
+  return tables.filter((tableName) => regex.test(tableName));
+}
+
+/**
+ * Add tables name to the reserved tables in core store
+ * @param {Object} ctx
+ * @param {Strapi} ctx.strapi
+ * @param {Array<string|{ table: string; dependsOn?: Array<{ table: string;}> }>} tableNames
+ * @return {Promise<void>}
+ */
+async function addPersistTables({ strapi }, tableNames) {
+  const persistedTables = await getPersistedTables({ strapi });
+  const tables = tableNames.map(transformTableName);
+
+  // Get new tables to be persisted, remove tables if they already were persisted
+  const notPersistedTableNames = differenceWith(isEqual, tables, persistedTables);
+  // Remove tables that are going to be changed
+  const tablesToPersist = differenceWith(
+    (t1, t2) => t1.name === t2.name,
+    persistedTables,
+    notPersistedTableNames
+  );
+
+  if (!notPersistedTableNames.length) {
+    return;
+  }
+
+  tablesToPersist.push(...notPersistedTableNames);
+  await strapi.store.set({
     type: 'core',
     key: 'persisted_tables',
-  })) ?? [];
+    value: tablesToPersist,
+  });
+}
 
 /**
- * Add all table names that start with a prefix to the reserved tables in
- * core store
- * @param {string} tableNamePrefix
+ * Remove tables name from the reserved tables in core store
+ * @param {Object} ctx
+ * @param {Strapi} ctx.strapi
+ * @param {Array<string>} tableNames
+ * @return {Promise<void>}
  */
+async function removePersistedTables({ strapi }, tableNames) {
+  const persistedTables = await getPersistedTables({ strapi });
 
-const persistTablesWithPrefix = async (tableNamePrefix) => {
-  const persistedTables = await getPersistedTables();
-  const tableNames = await findTablesThatStartWithPrefix(tableNamePrefix);
-  const notReservedTableNames = tableNames.filter((name) => !persistedTables.includes(name));
+  // Get new tables to be persisted, remove tables if they already were persisted
+  const newPersistedTables = differenceWith(
+    (t1, t2) => t1.name === t2,
+    persistedTables,
+    tableNames
+  );
 
-  if (!notReservedTableNames.length) {
+  if (newPersistedTables.length === persistedTables.length) {
     return;
   }
 
-  persistedTables.push(...notReservedTableNames);
   await strapi.store.set({
     type: 'core',
     key: 'persisted_tables',
-    value: persistedTables,
+    value: newPersistedTables,
   });
+}
+
+/**
+ * Get all reserved table names from the core store
+ * @param {Object} ctx
+ * @param {Strapi} ctx.strapi
+ * @returns {Promise<string[]>}
+ */
+
+async function getPersistedTables({ strapi }) {
+  const persistedTables = await strapi.store.get({
+    type: 'core',
+    key: 'persisted_tables',
+  });
+
+  return (persistedTables || []).map(transformTableName);
+}
+
+/**
+ * Add all table names that start with a prefix to the reserved tables in
+ * core store
+ * @param {string} tableNamePrefix
+ * @return {Promise<void>}
+ */
+
+const persistTablesWithPrefix = async (tableNamePrefix) => {
+  const tableNameRegex = new RegExp(`^${tableNamePrefix}.*`);
+  const tableNames = await findTables({ strapi }, tableNameRegex);
+
+  await addPersistTables({ strapi }, tableNames);
+};
+
+/**
+ * Remove all table names that end with a suffix from the reserved tables in core store
+ * @param {string} tableNameSuffix
+ * @return {Promise<void>}
+ */
+const removePersistedTablesWithSuffix = async (tableNameSuffix) => {
+  const tableNameRegex = new RegExp(`.*${tableNameSuffix}$`);
+  const tableNames = await findTables({ strapi }, tableNameRegex);
+  await removePersistedTables({ strapi }, tableNames);
+};
+
+const persistTable = async (tableName, dependsOn) => {
+  await addPersistTables({ strapi }, [
+    { name: tableName, dependsOn: dependsOn?.map((depTableName) => ({ name: depTableName })) },
+  ]);
 };
 
 module.exports = {
   persistTablesWithPrefix,
-  findTablesThatStartWithPrefix,
+  removePersistedTablesWithSuffix,
+  persistTable,
+  findTables,
 };

package/ee/server/utils/review-workflows.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { get, keys, pickBy, pipe } = require('lodash/fp');
 const { WORKFLOW_MODEL_UID } = require('../constants/workflows');
 
 /**
@@ -19,7 +20,15 @@ function hasReviewWorkflow({ strapi }, contentType) {
 const getDefaultWorkflow = async ({ strapi }) =>
   strapi.query(WORKFLOW_MODEL_UID).findOne({ populate: ['stages'] });
 
+const getContentTypeUIDsWithActivatedReviewWorkflows = pipe([
+  // Pick only content-types with reviewWorkflows options set to true
+  pickBy(get('options.reviewWorkflows')),
+  // Get UIDs
+  keys,
+]);
+
 module.exports = {
   hasReviewWorkflow,
   getDefaultWorkflow,
+  getContentTypeUIDsWithActivatedReviewWorkflows,
 };

package/jest.config.front.js

@@ -1,11 +1,6 @@
 'use strict';
 
-const baseConfig = require('../../../jest.base-config.front');
-const pkg = require('./package.json');
-
 module.exports = {
-  ...baseConfig,
-  displayName: (pkg.strapi && pkg.strapi.name) || pkg.name,
-  roots: [__dirname],
+  preset: '../../../jest-preset.front.js',
   collectCoverageFrom: ['<rootDir>/packages/core/admin/admin/**/*.js'],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.10.0-beta.0",
+  "version": "4.10.0-beta.1",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -28,14 +28,16 @@
     "develop:webpack": "cross-env NODE_ENV=development webpack serve --config webpack.config.dev.js --progress profile",
     "prepublishOnly": "yarn build",
     "build": "rimraf build && node ./scripts/build.js",
-    "build:mesure": "rimraf build && cross-env MESURE_BUILD_SPEED=true node ./scripts/build.js",
+    "build:measure": "rimraf build && cross-env MEASURE_BUILD_SPEED=true node ./scripts/build.js",
     "test": "echo \"no tests yet\"",
-    "test:unit": "jest --verbose",
-    "test:front": "cross-env IS_EE=true jest --config ./jest.config.front.js",
-    "test:front:watch": "cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
-    "test:front:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js",
-    "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
-    "test:front:ce:cov": "cross-env IS_EE=false jest --config ./jest.config.front.js --coverage"
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch",
+    "test:front": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js",
+    "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
+    "test:front:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js",
+    "test:front:watch:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
+    "test:front:ce:cov": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --coverage",
+    "lint": "run -T eslint ."
   },
   "dependencies": {
     "@babel/core": "^7.20.12",
@@ -46,19 +48,20 @@
     "@casl/ability": "^5.4.3",
     "@fingerprintjs/fingerprintjs": "3.3.6",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.10.0-beta.0",
-    "@strapi/data-transfer": "4.10.0-beta.0",
+    "@strapi/babel-plugin-switch-ee-ce": "4.10.0-beta.1",
+    "@strapi/data-transfer": "4.10.0-beta.1",
     "@strapi/design-system": "1.6.6",
-    "@strapi/helper-plugin": "4.10.0-beta.0",
+    "@strapi/helper-plugin": "4.10.0-beta.1",
     "@strapi/icons": "1.6.6",
-    "@strapi/permissions": "4.10.0-beta.0",
-    "@strapi/provider-audit-logs-local": "4.10.0-beta.0",
-    "@strapi/typescript-utils": "4.10.0-beta.0",
-    "@strapi/utils": "4.10.0-beta.0",
+    "@strapi/permissions": "4.10.0-beta.1",
+    "@strapi/provider-audit-logs-local": "4.10.0-beta.1",
+    "@strapi/typescript-utils": "4.10.0-beta.1",
+    "@strapi/utils": "4.10.0-beta.1",
     "axios": "1.3.4",
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.0.2",
     "bcryptjs": "2.4.3",
+    "browserslist": "^4.17.3",
     "browserslist-to-esbuild": "1.2.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.1",
@@ -99,18 +102,17 @@
     "markdown-it-mark": "^3.0.1",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "1.0.0",
-    "match-sorter": "^4.0.2",
     "mini-css-extract-plugin": "2.7.2",
     "node-schedule": "2.1.0",
     "p-map": "4.0.0",
     "passport-local": "1.0.0",
     "pluralize": "8.0.0",
     "prop-types": "^15.7.2",
-    "qs": "6.11.0",
+    "qs": "6.11.1",
     "react": "^17.0.2",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dnd": "15.1.2",
-    "react-dnd-html5-backend": "15.1.2",
+    "react-dnd-html5-backend": "15.1.3",
     "react-dom": "^17.0.2",
     "react-error-boundary": "3.1.4",
     "react-fast-compare": "^3.2.0",
@@ -122,13 +124,13 @@
     "react-refresh": "0.14.0",
     "react-router-dom": "5.3.4",
     "react-select": "5.7.0",
-    "react-window": "1.8.7",
+    "react-window": "1.8.8",
     "redux": "^4.2.1",
     "reselect": "^4.1.7",
     "rimraf": "3.0.2",
-    "sanitize-html": "2.7.3",
+    "sanitize-html": "2.10.0",
     "semver": "7.3.8",
-    "sift": "16.0.0",
+    "sift": "16.0.1",
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
     "typescript": "4.6.2",
@@ -166,5 +168,5 @@
       }
     }
   },
-  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
+  "gitHead": "95d581b31bee464af42e5d8db408fa578d8532c7"
 }

package/server/controllers/transfer/runner.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { createTransferHandler } = require('@strapi/data-transfer').strapi.remote.handlers;
+const { createPushController, createPullController } =
+  require('@strapi/data-transfer').strapi.remote.handlers;
 const {
   errors: { UnauthorizedError },
 } = require('@strapi/utils');
@@ -22,5 +23,6 @@ const verify = async (ctx, scope) => {
 };
 
 module.exports = {
-  connect: createTransferHandler({ verify }),
+  push: createPushController({ verify }),
+  pull: createPullController({ verify }),
 };

package/server/middlewares/data-transfer.js

@@ -13,7 +13,10 @@ module.exports = () => async (ctx, next) => {
 
   if (!hasValidTokenSalt()) {
     return ctx.notImplemented(
-      'The server configuration for data transfer is invalid. Please contact your server administrator.'
+      'The server configuration for data transfer is invalid. Please contact your server administrator.',
+      {
+        code: 'INVALID_TOKEN_SALT',
+      }
     );
   }
 

package/server/routes/transfer.js

@@ -3,17 +3,26 @@
 const dataTransferAuthStrategy = require('../strategies/data-transfer');
 
 module.exports = [
-  // Transfer route
+  // Transfer Push
   {
     method: 'GET',
-    path: '/transfer/runner/connect',
-    handler: 'transfer.runner-connect',
+    path: '/transfer/runner/push',
+    handler: 'transfer.runner-push',
     config: {
       middlewares: ['admin::data-transfer'],
-      // TODO: Allow not passing any scope <> Add a way to prevent assigning one by default
       auth: { strategies: [dataTransferAuthStrategy], scope: ['push'] },
     },
   },
+  // Transfer Pull
+  {
+    method: 'GET',
+    path: '/transfer/runner/pull',
+    handler: 'transfer.runner-pull',
+    config: {
+      middlewares: ['admin::data-transfer'],
+      auth: { strategies: [dataTransferAuthStrategy], scope: ['pull'] },
+    },
+  },
   // Transfer Tokens
   {
     method: 'POST',

package/server/services/constants.js

@@ -24,6 +24,10 @@ module.exports = {
     DAYS_30: 30 * DAY_IN_MS,
     DAYS_90: 90 * DAY_IN_MS,
   },
+  TRANSFER_TOKEN_TYPE: {
+    PUSH: 'push',
+    PULL: 'pull',
+  },
   TRANSFER_TOKEN_LIFESPANS: {
     UNLIMITED: null,
     DAYS_7: 7 * DAY_IN_MS,

package/server/services/transfer/permission.js

@@ -3,7 +3,7 @@
 const permissions = require('@strapi/permissions');
 const { providerFactory } = require('@strapi/utils');
 
-const DEFAULT_TRANSFER_ACTIONS = ['push'];
+const DEFAULT_TRANSFER_ACTIONS = ['push', 'pull'];
 
 const providers = {
   action: providerFactory(),

package/server/services/transfer/token.js

@@ -149,37 +149,39 @@ const update = async (id, attributes) => {
       },
     });
 
-    const currentPermissionsResult = await strapi.entityService.load(
-      TRANSFER_TOKEN_UID,
-      updatedToken,
-      'permissions'
-    );
-
-    const currentPermissions = map('action', currentPermissionsResult || []);
-    const newPermissions = uniq(attributes.permissions);
-
-    const actionsToDelete = difference(currentPermissions, newPermissions);
-    const actionsToAdd = difference(newPermissions, currentPermissions);
-
-    // TODO: improve efficiency here
-    // method using a loop -- works but very inefficient
-    await Promise.all(
-      actionsToDelete.map((action) =>
-        strapi.query(TRANSFER_TOKEN_PERMISSION_UID).delete({
-          where: { action, token: id },
-        })
-      )
-    );
-
-    // TODO: improve efficiency here
-    // using a loop -- works but very inefficient
-    await Promise.all(
-      actionsToAdd.map((action) =>
-        strapi.query(TRANSFER_TOKEN_PERMISSION_UID).create({
-          data: { action, token: id },
-        })
-      )
-    );
+    if (attributes.permissions) {
+      const currentPermissionsResult = await strapi.entityService.load(
+        TRANSFER_TOKEN_UID,
+        updatedToken,
+        'permissions'
+      );
+
+      const currentPermissions = map('action', currentPermissionsResult || []);
+      const newPermissions = uniq(attributes.permissions);
+
+      const actionsToDelete = difference(currentPermissions, newPermissions);
+      const actionsToAdd = difference(newPermissions, currentPermissions);
+
+      // TODO: improve efficiency here
+      // method using a loop -- works but very inefficient
+      await Promise.all(
+        actionsToDelete.map((action) =>
+          strapi.query(TRANSFER_TOKEN_PERMISSION_UID).delete({
+            where: { action, token: id },
+          })
+        )
+      );
+
+      // TODO: improve efficiency here
+      // using a loop -- works but very inefficient
+      await Promise.all(
+        actionsToAdd.map((action) =>
+          strapi.query(TRANSFER_TOKEN_PERMISSION_UID).create({
+            data: { action, token: id },
+          })
+        )
+      );
+    }
 
     // retrieve permissions
     const permissionsFromDb = await strapi.entityService.load(

package/server/validation/transfer/token.js

@@ -8,7 +8,11 @@ const transferTokenCreationSchema = yup
   .shape({
     name: yup.string().min(1).required(),
     description: yup.string().optional(),
-    permissions: yup.array().of(yup.string()).nullable(),
+    permissions: yup
+      .array()
+      .min(1)
+      .of(yup.string().oneOf(Object.values(constants.TRANSFER_TOKEN_TYPE)))
+      .required(),
     lifespan: yup
       .number()
       .min(1)
@@ -23,7 +27,11 @@ const transferTokenUpdateSchema = yup
   .shape({
     name: yup.string().min(1).notNull(),
     description: yup.string().nullable(),
-    permissions: yup.array().of(yup.string()).nullable(),
+    permissions: yup
+      .array()
+      .min(1)
+      .of(yup.string().oneOf(Object.values(constants.TRANSFER_TOKEN_TYPE)))
+      .nullable(),
   })
   .noUnknown()
   .strict();

package/webpack.config.js

@@ -9,6 +9,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const WebpackBar = require('webpackbar');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+const browserslist = require('browserslist');
 const browserslistToEsbuild = require('browserslist-to-esbuild');
 
 const alias = require('./webpack.alias');
@@ -52,7 +53,10 @@ module.exports = ({
 
   const excludeRegex = createPluginsExcludePath(pluginsPath);
 
-  const buildTarget = browserslistToEsbuild();
+  // Ensure we use the config in this directory, even if run with a different
+  // working directory
+  const browserslistConfig = browserslist.loadConfig({ path: __dirname });
+  const buildTarget = browserslistToEsbuild(browserslistConfig);
 
   return {
     mode: isProduction ? 'production' : 'development',
@@ -221,7 +225,7 @@ module.exports = ({
       alias,
       symlinks: false,
       extensions: ['.js', '.jsx', '.react.js', '.ts', '.tsx'],
-      mainFields: ['browser', 'jsnext:main', 'main'],
+      mainFields: ['browser', 'module', 'jsnext:main', 'main'],
       modules: ['node_modules', path.resolve(__dirname, 'node_modules')],
     },
     plugins: [

package/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/index.js

@@ -1 +0,0 @@
-export * from './ReviewWorkflowsStage';

package/admin/src/content-manager/pages/App/LeftMenu/utils/index.js

@@ -1 +0,0 @@
-export { default as matchByTitle } from './matchByTitle';

package/admin/src/content-manager/pages/App/LeftMenu/utils/matchByTitle.js

@@ -1,24 +0,0 @@
-import matchSorter from 'match-sorter';
-import camelCase from 'lodash/camelCase';
-
-/**
- * @type {(links: array, search? : string) => array }
- */
-const matchByTitle = (links, search) =>
-  search
-    ? matchSorter(links, search.toLowerCase(), { keys: [(item) => item.title.toLowerCase()] })
-    : links.sort((link, nextLink) => {
-        const title = camelCase(link.title);
-        const nextTitle = camelCase(nextLink.title);
-
-        if (title < nextTitle) {
-          return -1;
-        }
-        if (title > nextTitle) {
-          return 1;
-        }
-
-        return 0;
-      });
-
-export default matchByTitle;