@strapi/admin 5.0.0-alpha.5 → 5.0.0-alpha.8

package/dist/package.json.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
   "name": "@strapi/admin",
-  "version": "5.0.0-alpha.4",
+  "version": "5.0.0-beta.0",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -73,11 +73,11 @@ declare const _default: {
     "@reduxjs/toolkit": "1.9.7",
     "@strapi/design-system": "1.16.0",
     "@strapi/icons": "1.16.0",
-    "@strapi/permissions": "5.0.0-alpha.4",
-    "@strapi/provider-audit-logs-local": "5.0.0-alpha.4",
-    "@strapi/types": "5.0.0-alpha.4",
-    "@strapi/typescript-utils": "5.0.0-alpha.4",
-    "@strapi/utils": "5.0.0-alpha.4",
+    "@strapi/permissions": "5.0.0-beta.0",
+    "@strapi/provider-audit-logs-local": "5.0.0-beta.0",
+    "@strapi/types": "5.0.0-beta.0",
+    "@strapi/typescript-utils": "5.0.0-beta.0",
+    "@strapi/utils": "5.0.0-beta.0",
     "@testing-library/dom": "9.2.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
@@ -147,10 +147,10 @@ declare const _default: {
     "yup": "0.32.9"
   },
   "devDependencies": {
-    "@strapi/admin-test-utils": "5.0.0-alpha.4",
-    "@strapi/data-transfer": "5.0.0-alpha.4",
-    "@strapi/pack-up": "5.0.0-alpha.4",
-    "@strapi/plugin-content-manager": "5.0.0-alpha.4",
+    "@strapi/admin-test-utils": "5.0.0-beta.0",
+    "@strapi/data-transfer": "5.0.0-beta.0",
+    "@strapi/pack-up": "5.0.0-beta.0",
+    "@strapi/plugin-content-manager": "5.0.0-beta.0",
     "@types/codemirror5": "npm:@types/codemirror@^5.60.15",
     "@types/invariant": "2.2.36",
     "@types/js-cookie": "3.0.6",
@@ -176,7 +176,7 @@ declare const _default: {
     "vite-plugin-dts": "3.7.3"
   },
   "peerDependencies": {
-    "@strapi/data-transfer": "^4.16.0",
+    "@strapi/data-transfer": "^5.0.0 ||  ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
     "react-router-dom": "^6.0.0",

package/dist/server/index.js

@@ -1725,10 +1725,7 @@ const findOneByEmail = async (email2, populate = []) => {
   });
 };
 const findPage = async (params = {}) => {
-  const query = utils$1.convertQueryParams.transformParamsToQuery(
-    "admin::user",
-    fp.defaults({ populate: ["roles"] }, params)
-  );
+  const query = strapi.get("query-params").transform("admin::user", fp.defaults({ populate: ["roles"] }, params));
   return strapi.db.query("admin::user").findPage(query);
 };
 const deleteById = async (id) => {
@@ -1988,7 +1985,7 @@ const find = (params = {}, populate) => {
   return strapi.db.query("admin::role").findMany({ where: params, populate });
 };
 const findAllWithUsersCount = async (params) => {
-  const roles2 = await strapi.db.query("admin::role").findMany(utils$1.convertQueryParams.transformParamsToQuery("admin::role", params));
+  const roles2 = await strapi.db.query("admin::role").findMany(strapi.get("query-params").transform("admin::role", params));
   for (const role2 of roles2) {
     role2.usersCount = await getUsersCount(role2.id);
   }
@@ -2462,48 +2459,46 @@ const STATIC_FIELDS$1 = [ID_ATTRIBUTE$1, DOC_ID_ATTRIBUTE$1];
 const createSanitizeHelpers = ({ action: action2, ability: ability$1, model }) => {
   const schema = strapi.getModel(model);
   const { removeDisallowedFields } = utils$1.sanitize.visitors;
+  const ctx = {
+    schema,
+    getModel: strapi.getModel.bind(strapi)
+  };
   const createSanitizeQuery = (options = {}) => {
     const { fields } = options;
     const permittedFields = fields.shouldIncludeAll ? null : getQueryFields(fields.permitted);
     const sanitizeFilters = utils$1.async.pipe(
-      utils$1.traverse.traverseQueryFilters(removeDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQueryFilters(omitDisallowedAdminUserFields, { schema }),
-      utils$1.traverse.traverseQueryFilters(omitHiddenFields, { schema }),
-      utils$1.traverse.traverseQueryFilters(removePassword, { schema }),
-      utils$1.traverse.traverseQueryFilters(
-        ({ key, value }, { remove }) => {
-          if (fp.isObject(value) && fp.isEmpty(value)) {
-            remove(key);
-          }
-        },
-        { schema }
-      )
+      utils$1.traverse.traverseQueryFilters(removeDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQueryFilters(omitDisallowedAdminUserFields, ctx),
+      utils$1.traverse.traverseQueryFilters(omitHiddenFields, ctx),
+      utils$1.traverse.traverseQueryFilters(removePassword, ctx),
+      utils$1.traverse.traverseQueryFilters(({ key, value }, { remove }) => {
+        if (fp.isObject(value) && fp.isEmpty(value)) {
+          remove(key);
+        }
+      }, ctx)
     );
     const sanitizeSort = utils$1.async.pipe(
-      utils$1.traverse.traverseQuerySort(removeDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQuerySort(omitDisallowedAdminUserFields, { schema }),
-      utils$1.traverse.traverseQuerySort(omitHiddenFields, { schema }),
-      utils$1.traverse.traverseQuerySort(removePassword, { schema }),
-      utils$1.traverse.traverseQuerySort(
-        ({ key, attribute, value }, { remove }) => {
-          if (!isScalarAttribute$1(attribute) && fp.isEmpty(value)) {
-            remove(key);
-          }
-        },
-        { schema }
-      )
+      utils$1.traverse.traverseQuerySort(removeDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQuerySort(omitDisallowedAdminUserFields, ctx),
+      utils$1.traverse.traverseQuerySort(omitHiddenFields, ctx),
+      utils$1.traverse.traverseQuerySort(removePassword, ctx),
+      utils$1.traverse.traverseQuerySort(({ key, attribute, value }, { remove }) => {
+        if (!isScalarAttribute$1(attribute) && fp.isEmpty(value)) {
+          remove(key);
+        }
+      }, ctx)
     );
     const sanitizePopulate = utils$1.async.pipe(
-      utils$1.traverse.traverseQueryPopulate(expandWildcardPopulate, { schema }),
-      utils$1.traverse.traverseQueryPopulate(removeDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQueryPopulate(omitDisallowedAdminUserFields, { schema }),
-      utils$1.traverse.traverseQueryPopulate(omitHiddenFields, { schema }),
-      utils$1.traverse.traverseQueryPopulate(removePassword, { schema })
+      utils$1.traverse.traverseQueryPopulate(expandWildcardPopulate, ctx),
+      utils$1.traverse.traverseQueryPopulate(removeDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQueryPopulate(omitDisallowedAdminUserFields, ctx),
+      utils$1.traverse.traverseQueryPopulate(omitHiddenFields, ctx),
+      utils$1.traverse.traverseQueryPopulate(removePassword, ctx)
     );
     const sanitizeFields = utils$1.async.pipe(
-      utils$1.traverse.traverseQueryFields(removeDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQueryFields(omitHiddenFields, { schema }),
-      utils$1.traverse.traverseQueryFields(removePassword, { schema })
+      utils$1.traverse.traverseQueryFields(removeDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQueryFields(omitHiddenFields, ctx),
+      utils$1.traverse.traverseQueryFields(removePassword, ctx)
     );
     return async (query) => {
       const sanitizedQuery = fp.cloneDeep(query);
@@ -2527,13 +2522,18 @@ const createSanitizeHelpers = ({ action: action2, ability: ability$1, model }) =
     const permittedFields = fields.shouldIncludeAll ? null : getOutputFields(fields.permitted);
     return utils$1.async.pipe(
       // Remove fields hidden from the admin
-      utils$1.traverseEntity(omitHiddenFields, { schema }),
+      utils$1.traverseEntity(omitHiddenFields, ctx),
       // Remove unallowed fields from admin::user relations
-      utils$1.traverseEntity(pickAllowedAdminUserFields, { schema }),
+      utils$1.traverseEntity(pickAllowedAdminUserFields, ctx),
       // Remove not allowed fields (RBAC)
-      utils$1.traverseEntity(removeDisallowedFields(permittedFields), { schema }),
+      utils$1.traverseEntity(removeDisallowedFields(permittedFields), ctx),
       // Remove all fields of type 'password'
-      utils$1.sanitize.sanitizers.sanitizePasswords(schema)
+      utils$1.sanitize.sanitizers.sanitizePasswords({
+        schema,
+        getModel(uid) {
+          return strapi.getModel(uid);
+        }
+      })
     );
   };
   const createSanitizeInput = (options = {}) => {
@@ -2541,9 +2541,9 @@ const createSanitizeHelpers = ({ action: action2, ability: ability$1, model }) =
     const permittedFields = fields.shouldIncludeAll ? null : getInputFields(fields.permitted);
     return utils$1.async.pipe(
       // Remove fields hidden from the admin
-      utils$1.traverseEntity(omitHiddenFields, { schema }),
+      utils$1.traverseEntity(omitHiddenFields, ctx),
       // Remove not allowed fields (RBAC)
-      utils$1.traverseEntity(removeDisallowedFields(permittedFields), { schema }),
+      utils$1.traverseEntity(removeDisallowedFields(permittedFields), ctx),
       // Remove roles from createdBy & updateBy fields
       omitCreatorRoles
     );
@@ -2661,44 +2661,42 @@ const throwInvalidParam = ({ key, path: path2 }) => {
 };
 const createValidateHelpers = ({ action: action2, ability: ability$1, model }) => {
   const schema = strapi.getModel(model);
+  const ctx = {
+    schema,
+    getModel: strapi.getModel.bind(strapi)
+  };
   const createValidateQuery = (options = {}) => {
     const { fields } = options;
     const permittedFields = fields.shouldIncludeAll ? null : getQueryFields(fields.permitted);
     const validateFilters = utils$1.async.pipe(
-      utils$1.traverse.traverseQueryFilters(throwDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQueryFilters(throwDisallowedAdminUserFields, { schema }),
-      utils$1.traverse.traverseQueryFilters(throwPassword, { schema }),
-      utils$1.traverse.traverseQueryFilters(
-        ({ key, value, path: path2 }) => {
-          if (fp.isObject(value) && fp.isEmpty(value)) {
-            throwInvalidParam({ key, path: path2.attribute });
-          }
-        },
-        { schema }
-      )
+      utils$1.traverse.traverseQueryFilters(throwDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQueryFilters(throwDisallowedAdminUserFields, ctx),
+      utils$1.traverse.traverseQueryFilters(throwPassword, ctx),
+      utils$1.traverse.traverseQueryFilters(({ key, value, path: path2 }) => {
+        if (fp.isObject(value) && fp.isEmpty(value)) {
+          throwInvalidParam({ key, path: path2.attribute });
+        }
+      }, ctx)
     );
     const validateSort = utils$1.async.pipe(
-      utils$1.traverse.traverseQuerySort(throwDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQuerySort(throwDisallowedAdminUserFields, { schema }),
-      utils$1.traverse.traverseQuerySort(throwPassword, { schema }),
-      utils$1.traverse.traverseQuerySort(
-        ({ key, attribute, value, path: path2 }) => {
-          if (!isScalarAttribute(attribute) && fp.isEmpty(value)) {
-            throwInvalidParam({ key, path: path2.attribute });
-          }
-        },
-        { schema }
-      )
+      utils$1.traverse.traverseQuerySort(throwDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQuerySort(throwDisallowedAdminUserFields, ctx),
+      utils$1.traverse.traverseQuerySort(throwPassword, ctx),
+      utils$1.traverse.traverseQuerySort(({ key, attribute, value, path: path2 }) => {
+        if (!isScalarAttribute(attribute) && fp.isEmpty(value)) {
+          throwInvalidParam({ key, path: path2.attribute });
+        }
+      }, ctx)
     );
     const validateFields = utils$1.async.pipe(
-      utils$1.traverse.traverseQueryFields(throwDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQueryFields(throwPassword, { schema })
+      utils$1.traverse.traverseQueryFields(throwDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQueryFields(throwPassword, ctx)
     );
     const validatePopulate = utils$1.async.pipe(
-      utils$1.traverse.traverseQueryPopulate(throwDisallowedFields(permittedFields), { schema }),
-      utils$1.traverse.traverseQueryPopulate(throwDisallowedAdminUserFields, { schema }),
-      utils$1.traverse.traverseQueryPopulate(throwHiddenFields, { schema }),
-      utils$1.traverse.traverseQueryPopulate(throwPassword, { schema })
+      utils$1.traverse.traverseQueryPopulate(throwDisallowedFields(permittedFields), ctx),
+      utils$1.traverse.traverseQueryPopulate(throwDisallowedAdminUserFields, ctx),
+      utils$1.traverse.traverseQueryPopulate(throwHiddenFields, ctx),
+      utils$1.traverse.traverseQueryPopulate(throwPassword, ctx)
     );
     return async (query) => {
       if (query.filters) {
@@ -2721,9 +2719,9 @@ const createValidateHelpers = ({ action: action2, ability: ability$1, model }) =
     const permittedFields = fields.shouldIncludeAll ? null : getInputFields(fields.permitted);
     return utils$1.async.pipe(
       // Remove fields hidden from the admin
-      utils$1.traverseEntity(throwHiddenFields, { schema }),
+      utils$1.traverseEntity(throwHiddenFields, ctx),
       // Remove not allowed fields (RBAC)
-      utils$1.traverseEntity(throwDisallowedFields(permittedFields), { schema }),
+      utils$1.traverseEntity(throwDisallowedFields(permittedFields), ctx),
       // Remove roles from createdBy & updatedBy fields
       omitCreatorRoles
     );
@@ -3024,7 +3022,9 @@ const createSectionBuilder = () => {
   };
 };
 const isOfKind = (kind) => fp.matchesProperty("kind", kind);
-const resolveContentType = (uid) => strapi.contentTypes[uid];
+const resolveContentType = (uid) => {
+  return strapi.contentTypes[uid];
+};
 const isNotInSubjects = (subjects) => (uid) => !subjects.find((subject2) => subject2.uid === uid);
 const hasProperty = fp.curry((property, subject2) => {
   return !!subject2.properties.find((prop) => prop.value === property);
@@ -3071,7 +3071,7 @@ const contentTypesBase = ({
   });
 };
 const subjectsHandlerFor = (kind) => ({ action: action2, section: contentTypesSection }) => {
-  const { subjects } = action2;
+  const subjects = action2.subjects;
   if (!subjects?.length) {
     return;
   }
@@ -5045,7 +5045,11 @@ const webhooks = {
   async triggerWebhook(ctx) {
     const { id } = ctx.params;
     const webhook = await strapi.webhookStore.findWebhook(id);
-    const response = await strapi.webhookRunner.run(webhook, "trigger-test", {});
+    const response = await strapi.webhookRunner.run(
+      webhook,
+      "trigger-test",
+      {}
+    );
     ctx.body = { data: response };
   }
 };