@strapi/admin 4.9.0-alpha.0 → 4.9.0-beta.2

package/server/strategies/index.js

@@ -21,5 +21,6 @@
  */
 module.exports = {
   admin: require('./admin'),
+  'data-transfer': require('./data-transfer'),
   'api-token': require('./api-token'),
 };

package/server/utils/index.d.ts

@@ -7,6 +7,7 @@ import * as token from '../services/token';
 import * as auth from '../services/auth';
 import * as apiToken from '../services/api-token';
 import * as projectSettings from '../services/project-settings';
+import * as transfer from '../services/transfer';
 
 type S = {
   role: typeof role;
@@ -18,6 +19,7 @@ type S = {
   metrics: typeof metrics;
   'api-token': typeof apiToken;
   'project-settings': typeof projectSettings;
+  transfer: typeof transfer;
 };
 
 export function getService<T extends keyof S>(name: T): S[T];

package/server/validation/api-tokens.js

@@ -10,12 +10,7 @@ const apiTokenCreationSchema = yup
     description: yup.string().optional(),
     type: yup.string().oneOf(Object.values(constants.API_TOKEN_TYPE)).required(),
     permissions: yup.array().of(yup.string()).nullable(),
-    lifespan: yup
-      .number()
-      .integer()
-      .min(1)
-      .oneOf(Object.values(constants.API_TOKEN_LIFESPANS))
-      .nullable(),
+    lifespan: yup.number().min(1).oneOf(Object.values(constants.API_TOKEN_LIFESPANS)).nullable(),
   })
   .noUnknown()
   .strict();

package/server/validation/permission.js

@@ -1,83 +1,9 @@
 'use strict';
 
-const _ = require('lodash');
 const { yup, validateYupSchema } = require('@strapi/utils');
 const { getService } = require('../utils');
-const { AUTHOR_CODE, PUBLISH_ACTION } = require('../services/constants');
-const {
-  BOUND_ACTIONS_FOR_FIELDS,
-  BOUND_ACTIONS,
-  getBoundActionsBySubject,
-} = require('../domain/role');
 const validators = require('./common-validators');
 
-// validatedUpdatePermissionsInput
-
-const actionFieldsAreEqual = (a, b) => {
-  const aFields = a.properties.fields || [];
-  const bFields = b.properties.fields || [];
-
-  return _.isEqual(aFields.sort(), bFields.sort());
-};
-
-const haveSameFieldsAsOtherActions = (a, i, allActions) =>
-  allActions.slice(i + 1).every((b) => actionFieldsAreEqual(a, b));
-
-const checkPermissionsAreBound = (role) =>
-  function (permissions) {
-    const permsBySubject = _.groupBy(
-      permissions.filter((perm) => BOUND_ACTIONS.includes(perm.action)),
-      'subject'
-    );
-
-    for (const [subject, perms] of Object.entries(permsBySubject)) {
-      const boundActions = getBoundActionsBySubject(role, subject);
-      const missingActions =
-        _.xor(
-          perms.map((p) => p.action),
-          boundActions
-        ).length !== 0;
-      if (missingActions) return false;
-
-      const permsBoundByFields = perms.filter((p) => BOUND_ACTIONS_FOR_FIELDS.includes(p.action));
-      const everyActionsHaveSameFields = _.every(permsBoundByFields, haveSameFieldsAsOtherActions);
-      if (!everyActionsHaveSameFields) return false;
-    }
-
-    return true;
-  };
-
-const noPublishPermissionForAuthorRole = (role) =>
-  function (permissions) {
-    const isAuthor = role.code === AUTHOR_CODE;
-    const hasPublishPermission = permissions.some((perm) => perm.action === PUBLISH_ACTION);
-
-    return !(isAuthor && hasPublishPermission);
-  };
-
-const getUpdatePermissionsSchemas = (role) => [
-  validators.updatePermissions,
-  yup.object().shape({ permissions: actionsExistSchema.clone() }),
-  yup.object().shape({
-    permissions: yup
-      .array()
-      .test(
-        'author-no-publish',
-        'The author role cannot have the publish permission.',
-        noPublishPermissionForAuthorRole(role)
-      ),
-  }),
-  yup.object().shape({
-    permissions: yup
-      .array()
-      .test(
-        'are-bond',
-        'Permissions have to be defined all together for a subject field or not at all',
-        checkPermissionsAreBound(role)
-      ),
-  }),
-];
-
 const checkPermissionsSchema = yup.object().shape({
   permissions: yup.array().of(
     yup
@@ -91,13 +17,6 @@ const checkPermissionsSchema = yup.object().shape({
   ),
 });
 
-const validatedUpdatePermissionsInput = async (permissions, role) => {
-  const schemas = getUpdatePermissionsSchemas(role);
-  for (const schema of schemas) {
-    await validateYupSchema(schema)(permissions);
-  }
-};
-
 // validatePermissionsExist
 
 const checkPermissionsExist = function (permissions) {
@@ -131,7 +50,7 @@ const actionsExistSchema = yup
 // exports
 
 module.exports = {
-  validatedUpdatePermissionsInput,
+  validatedUpdatePermissionsInput: validateYupSchema(validators.updatePermissions),
   validatePermissionsExist: validateYupSchema(actionsExistSchema),
   validateCheckPermissionsInput: validateYupSchema(checkPermissionsSchema),
 };

package/server/validation/role.js

@@ -2,6 +2,47 @@
 
 const { yup, validateYupSchema } = require('@strapi/utils');
 
+const roleCreateSchema = yup
+  .object()
+  .shape({
+    name: yup.string().min(1).required(),
+    description: yup.string().nullable(),
+  })
+  .noUnknown();
+
+const rolesDeleteSchema = yup
+  .object()
+  .shape({
+    ids: yup
+      .array()
+      .of(yup.strapiID())
+      .min(1)
+      .required()
+      .test('roles-deletion-checks', 'Roles deletion checks have failed', async function (ids) {
+        try {
+          await strapi.admin.services.role.checkRolesIdForDeletion(ids);
+        } catch (e) {
+          return this.createError({ path: 'ids', message: e.message });
+        }
+
+        return true;
+      }),
+  })
+  .noUnknown();
+
+const roleDeleteSchema = yup
+  .strapiID()
+  .required()
+  .test('no-admin-single-delete', 'Role deletion checks have failed', async function (id) {
+    try {
+      await strapi.admin.services.role.checkRolesIdForDeletion([id]);
+    } catch (e) {
+      return this.createError({ path: 'id', message: e.message });
+    }
+
+    return true;
+  });
+
 const roleUpdateSchema = yup
   .object()
   .shape({
@@ -12,4 +53,7 @@ const roleUpdateSchema = yup
 
 module.exports = {
   validateRoleUpdateInput: validateYupSchema(roleUpdateSchema),
+  validateRoleCreateInput: validateYupSchema(roleCreateSchema),
+  validateRolesDeleteInput: validateYupSchema(rolesDeleteSchema),
+  validateRoleDeleteInput: validateYupSchema(roleDeleteSchema),
 };

package/server/validation/transfer/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  token: require('./token'),
+};

package/server/validation/transfer/token.js

@@ -0,0 +1,42 @@
+'use strict';
+
+const { yup, validateYupSchema } = require('@strapi/utils');
+const constants = require('../../services/constants');
+
+const transferTokenCreationSchema = yup
+  .object()
+  .shape({
+    name: yup.string().min(1).required(),
+    description: yup.string().optional(),
+    permissions: yup
+      .array()
+      .min(1)
+      .of(yup.string().oneOf(Object.values(constants.TRANSFER_TOKEN_TYPE)))
+      .required(),
+    lifespan: yup
+      .number()
+      .min(1)
+      .oneOf(Object.values(constants.TRANSFER_TOKEN_LIFESPANS))
+      .nullable(),
+  })
+  .noUnknown()
+  .strict();
+
+const transferTokenUpdateSchema = yup
+  .object()
+  .shape({
+    name: yup.string().min(1).notNull(),
+    description: yup.string().nullable(),
+    permissions: yup
+      .array()
+      .min(1)
+      .of(yup.string().oneOf(Object.values(constants.TRANSFER_TOKEN_TYPE)))
+      .nullable(),
+  })
+  .noUnknown()
+  .strict();
+
+module.exports = {
+  validateTransferTokenCreationInput: validateYupSchema(transferTokenCreationSchema),
+  validateTransferTokenUpdateInput: validateYupSchema(transferTokenUpdateSchema),
+};

package/webpack.alias.js

@@ -32,7 +32,6 @@ const aliasExactMatch = [
   'redux',
   'reselect',
   'styled-components',
-  'whatwg-fetch',
   'yup',
 ];
 

package/admin/src/components/UpgradePlanModal/index.js

@@ -1,131 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import styled from 'styled-components';
-import { useIntl } from 'react-intl';
-import { Portal } from '@strapi/design-system/Portal';
-import { FocusTrap } from '@strapi/design-system/FocusTrap';
-import { IconButton } from '@strapi/design-system/IconButton';
-import { LinkButton } from '@strapi/design-system/v2/LinkButton';
-import { Box } from '@strapi/design-system/Box';
-import { Flex } from '@strapi/design-system/Flex';
-import { Typography } from '@strapi/design-system/Typography';
-import { Stack } from '@strapi/design-system/Stack';
-import ExternalLink from '@strapi/icons/ExternalLink';
-import Cross from '@strapi/icons/Cross';
-import { setHexOpacity, useLockScroll } from '@strapi/helper-plugin';
-import AirBalloon from '../../assets/images/hot-air-balloon.png';
-import BigArrow from '../../assets/images/upgrade-details.png';
-
-const UpgradeWrapper = styled.div`
-  position: absolute;
-  z-index: 3;
-  inset: 0;
-  background: ${({ theme }) => setHexOpacity(theme.colors.neutral800, 0.2)};
-  padding: 0 ${({ theme }) => theme.spaces[8]};
-`;
-
-const UpgradeContainer = styled(Flex)`
-  position: relative;
-  max-width: ${830 / 16}rem;
-  height: ${415 / 16}rem;
-  margin: 0 auto;
-  overflow: hidden;
-  margin-top: 10%;
-  padding-left: ${64 / 16}rem;
-
-  img:first-of-type {
-    position: absolute;
-    right: 0;
-    top: 0;
-    max-width: ${360 / 16}rem;
-  }
-
-  img:not(:first-of-type) {
-    width: ${130 / 16}rem;
-    margin-left: 12%;
-    margin-right: ${20 / 16}rem;
-    z-index: 0;
-  }
-`;
-
-const StackFlexStart = styled(Stack)`
-  align-items: flex-start;
-  max-width: ${400 / 16}rem;
-  z-index: 0;
-`;
-
-const CloseButtonContainer = styled(Box)`
-  position: absolute;
-  right: ${({ theme }) => theme.spaces[4]};
-  top: ${({ theme }) => theme.spaces[4]};
-`;
-
-const UpgradePlanModal = ({ onClose, isOpen }) => {
-  useLockScroll(isOpen);
-  const { formatMessage } = useIntl();
-
-  if (!isOpen) {
-    return null;
-  }
-
-  return (
-    <Portal>
-      <UpgradeWrapper onClick={onClose}>
-        <FocusTrap onEscape={onClose}>
-          <UpgradeContainer
-            onClick={(e) => e.stopPropagation()}
-            aria-labelledby="upgrade-plan"
-            background="neutral0"
-            hasRadius
-          >
-            <img src={AirBalloon} alt="air-balloon" />
-            <CloseButtonContainer>
-              <IconButton onClick={onClose} aria-label="Close" icon={<Cross />} />
-            </CloseButtonContainer>
-            <StackFlexStart spacing={6}>
-              <Typography fontWeight="bold" textColor="primary600">
-                {formatMessage({
-                  id: 'app.components.UpgradePlanModal.text-ce',
-                  defaultMessage: 'COMMUNITY EDITION',
-                })}
-              </Typography>
-              <Stack spacing={2}>
-                <Typography variant="alpha" as="h2" id="upgrade-plan">
-                  {formatMessage({
-                    id: 'app.components.UpgradePlanModal.limit-reached',
-                    defaultMessage: 'You have reached the limit',
-                  })}
-                </Typography>
-                <Typography>
-                  {formatMessage({
-                    id: 'app.components.UpgradePlanModal.text-power',
-                    defaultMessage:
-                      'Unlock the full power of Strapi by upgrading your plan to the Enterprise Edition',
-                  })}
-                </Typography>
-              </Stack>
-              <LinkButton
-                href="https://strapi.io/pricing-self-hosted"
-                isExternal
-                endIcon={<ExternalLink />}
-              >
-                {formatMessage({
-                  id: 'app.components.UpgradePlanModal.button',
-                  defaultMessage: 'Learn more',
-                })}
-              </LinkButton>
-            </StackFlexStart>
-            <img src={BigArrow} alt="upgrade-arrow" />
-          </UpgradeContainer>
-        </FocusTrap>
-      </UpgradeWrapper>
-    </Portal>
-  );
-};
-
-UpgradePlanModal.propTypes = {
-  onClose: PropTypes.func.isRequired,
-  isOpen: PropTypes.bool.isRequired,
-};
-
-export default UpgradePlanModal;

package/admin/src/content-manager/components/EditViewDataManagerProvider/utils/findLeafByPathAndReplace.js

@@ -1,51 +0,0 @@
-import set from 'lodash/set';
-
-/**
- * @param {string} endpath – the final path that you're looking to replace
- * @returns {function} findLeafReducer – a function that will be used in the reduce
- */
-export const findLeafByPathAndReplace = (endpath, replaceWith) => {
-  /**
-   * @param {object} acc – the data tree
-   * @param {*} curr – string, this _could_ be used to index the accumulator
-   * @param {*} ind - your current index of the array you're reducing
-   * @returns {object} – the new object with the replaced values
-   */
-  const findLeafAndReplace = (acc, curr, ind, currentArr) => {
-    /**
-     * Because we're returning the `accumulator[current]` at the bottom
-     * and some components may not exist at this point, we check if `accumulator`
-     * exists before trying to access & replace properties.
-     */
-    if (!acc) return acc;
-
-    /**
-     * If this is the last item in the array of paths
-     * then we assume it's a leaf and we can replace it.
-     */
-    if (ind === currentArr.length - 1 && endpath === curr) {
-      set(acc, curr, replaceWith);
-
-      return acc;
-    }
-
-    /**
-     * If the value of the accumulator[current] is an array
-     * then we need to loop over it and call the reducer again
-     * this time with each array item being the accumulator.
-     */
-    if (Array.isArray(acc[curr])) {
-      acc[curr].forEach((item) => {
-        currentArr.slice(ind + 1).reduce(findLeafAndReplace, item);
-      });
-    }
-
-    /**
-     * accumulator[current]return accumulator[current] instead of the main accumulator,
-     * this will stop the same keys overwrite the wrong objects
-     */
-    return acc[curr];
-  };
-
-  return findLeafAndReplace;
-};

package/admin/src/content-manager/components/EditViewDataManagerProvider/utils/recursivelyFindPathsBasedOnCondition.js

@@ -1,79 +0,0 @@
-/**
- * @typedef Attribute
- * @type { { type: string }}
- *
- * @typedef Attributes
- * @type {{ [key: string]: Attribute }}
- */
-
-/**
- * This function will recursively find all the paths in the `currentContentTypeLayout.attributes`
- * based on the boolean return of the condition e.g. `type === 'relation'`.
- *
- * It's original use was for the preperation of action items for the INIT_FORM action. It requires
- * knowledge of the `components` in the entity, however `components` doesn't change nor does the predicate
- * function so we don't need to pass it everytime hence why it's curried.
- *
- *
- * @param {{[key: string]: { attributes: Attributes }}} components
- * @param {(value: Attribute) => boolean} predicate
- * @returns {(attributes: Attributes) => string[]}
- */
-const recursivelyFindPathsBasedOnConditionSetup = (components, predicate = () => false) => {
-  /**
-   *
-   * @param {Attributes} attributes
-   * @returns {string[]}
-   */
-  const recursivelyFindPathsBasedOnCondition = (attributes) => {
-    return Object.entries(attributes).reduce((acc, [key, value]) => {
-      if (predicate(value)) {
-        acc = [...acc, key];
-      }
-
-      if (value.type === 'component') {
-        const componentAttributes = components[value.component].attributes;
-
-        const attributesInComponent = recursivelyFindPathsBasedOnCondition(componentAttributes);
-
-        const attributesInComponentPaths = attributesInComponent.map((path) => `${key}.${path}`);
-
-        acc = [...acc, attributesInComponentPaths];
-      } else if (value.type === 'dynamiczone') {
-        const dynamicComponents = value.components;
-
-        const attributesInDynamicComponents = dynamicComponents
-          .flatMap((componentName) => {
-            return recursivelyFindPathsBasedOnCondition({
-              [componentName]: { type: 'component', component: componentName },
-              /**
-               * DynamicZones are an array of components, therefore the componentName shouldn't
-               * be part of the path because it's not a property of the component.
-               *
-               * e.g. { dynamic_zone: [{ __component: 'basic.simple', id: 36, my_name: null, categories: { count: 1, } }] }
-               * where the path to `id` is `dynamic_zone.id` and not `dynamic_zone.basic.simple.id`
-               *
-               * NOTE: we don't need to know the path to the `array` because it's about data shape not about the actual data
-               */
-            }).map((path) => {
-              return path.split(`${componentName}.`)[1];
-            });
-          })
-          /**
-           * We filter because this will give you `dynamiczone.undefined` because the dynamic_zone component
-           * is not required to be returned in this circumstance.
-           */
-          .filter((path) => Boolean(path))
-          .map((path) => `${key}.${path}`);
-
-        acc = [...acc, attributesInDynamicComponents];
-      }
-
-      return acc.flat();
-    }, []);
-  };
-
-  return recursivelyFindPathsBasedOnCondition;
-};
-
-export { recursivelyFindPathsBasedOnConditionSetup as recursivelyFindPathsBasedOnCondition };

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormBody/index.js

@@ -1,78 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ContentLayout } from '@strapi/design-system/Layout';
-import { Stack } from '@strapi/design-system/Stack';
-import HeaderContentBox from '../ContentBox';
-import FormApiTokenContainer from '../FormApiTokenContainer';
-import Permissions from '../Permissions';
-
-const FormBody = ({
-  apiToken,
-  errors,
-  onChange,
-  canEditInputs,
-  isCreating,
-  values,
-  onDispatch,
-  setHasChangedPermissions,
-}) => {
-  return (
-    <ContentLayout>
-      <Stack spacing={6}>
-        {Boolean(apiToken?.name) && <HeaderContentBox apiToken={apiToken?.accessKey} />}
-        <FormApiTokenContainer
-          errors={errors}
-          onChange={onChange}
-          canEditInputs={canEditInputs}
-          isCreating={isCreating}
-          values={values}
-          apiToken={apiToken}
-          onDispatch={onDispatch}
-          setHasChangedPermissions={setHasChangedPermissions}
-        />
-        <Permissions
-          disabled={
-            !canEditInputs || values?.type === 'read-only' || values?.type === 'full-access'
-          }
-        />
-      </Stack>
-    </ContentLayout>
-  );
-};
-
-FormBody.propTypes = {
-  errors: PropTypes.shape({
-    name: PropTypes.string,
-    description: PropTypes.string,
-    lifespan: PropTypes.string,
-    type: PropTypes.string,
-  }),
-  apiToken: PropTypes.shape({
-    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-    type: PropTypes.string,
-    lifespan: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-    name: PropTypes.string,
-    accessKey: PropTypes.string,
-    permissions: PropTypes.array,
-    description: PropTypes.string,
-    createdAt: PropTypes.string,
-  }),
-  onChange: PropTypes.func.isRequired,
-  canEditInputs: PropTypes.bool.isRequired,
-  isCreating: PropTypes.bool.isRequired,
-  values: PropTypes.shape({
-    name: PropTypes.string,
-    description: PropTypes.string,
-    lifespan: PropTypes.string,
-    type: PropTypes.string,
-  }).isRequired,
-  onDispatch: PropTypes.func.isRequired,
-  setHasChangedPermissions: PropTypes.func.isRequired,
-};
-
-FormBody.defaultProps = {
-  errors: {},
-  apiToken: {},
-};
-
-export default FormBody;

package/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js

@@ -1,40 +0,0 @@
-import React from 'react';
-import Trash from '@strapi/icons/Trash';
-import { IconButton } from '@strapi/design-system/IconButton';
-import { Box } from '@strapi/design-system/Box';
-import { stopPropagation, useTracking } from '@strapi/helper-plugin';
-import { useIntl } from 'react-intl';
-import PropTypes from 'prop-types';
-
-const DeleteButton = ({ tokenName, onClickDelete }) => {
-  const { formatMessage } = useIntl();
-  const { trackUsage } = useTracking();
-
-  return (
-    <Box paddingLeft={1} {...stopPropagation}>
-      <IconButton
-        onClick={() => {
-          trackUsage('willDeleteToken');
-          onClickDelete();
-        }}
-        label={formatMessage(
-          {
-            id: 'global.delete-target',
-            defaultMessage: 'Delete {target}',
-          },
-          { target: `${tokenName}` }
-        )}
-        name="delete"
-        noBorder
-        icon={<Trash />}
-      />
-    </Box>
-  );
-};
-
-DeleteButton.propTypes = {
-  tokenName: PropTypes.string.isRequired,
-  onClickDelete: PropTypes.func.isRequired,
-};
-
-export default DeleteButton;