@strapi/admin 4.0.0-beta.13 → 4.0.0-beta.17

package/scripts/create-dev-plugins-file.js

@@ -0,0 +1,69 @@
+'use strict';
+
+const { join, resolve, relative } = require('path');
+const { promisify } = require('util');
+// eslint-disable-next-line node/no-extraneous-require
+const glob = promisify(require('glob').glob);
+const fs = require('fs-extra');
+const { getCorePluginsPath, createPluginsFile } = require('./create-plugins-file');
+
+/**
+ * Retrieve all plugins that are inside the plugins folder
+ * @returns Object the plugins
+ */
+const getPluginsPackages = async () => {
+  const pathToPackages = resolve(__dirname, '..', '..', '..', 'plugins', '*');
+  const pluginsPackageDirs = await glob(pathToPackages);
+
+  return pluginsPackageDirs
+    .filter(pluginDir => {
+      return fs.existsSync(join(pluginDir, 'admin', 'src', 'index.js'));
+    })
+    .reduce((acc, current) => {
+      const depName = current
+        .replace(/\\/g, '/')
+        .split('/')
+        .slice(-1)[0];
+
+      const adminEntryPoint = join(__dirname, '..', 'admin', 'src');
+
+      const pathToPlugin = join(relative(adminEntryPoint, current), 'admin', 'src').replace(
+        /\\/g,
+        '/'
+      );
+
+      acc[depName] = pathToPlugin;
+
+      return acc;
+    }, {});
+};
+
+/**
+ * Write the plugins.js file or copy the plugins-dev.js file if it exists
+ */
+const createFile = async () => {
+  const customPluginFile = join(__dirname, '..', 'admin', 'src', 'plugins-dev.js');
+  const pluginFileDest = join(__dirname, '..', 'admin', 'src', 'plugins.js');
+
+  if (fs.existsSync(customPluginFile)) {
+    await fs.copy(customPluginFile, pluginFileDest);
+
+    return;
+  }
+
+  const corePlugins = getCorePluginsPath();
+  const plugins = await getPluginsPackages();
+  const allPlugins = { ...corePlugins, ...plugins };
+
+  return createPluginsFile(allPlugins);
+};
+
+createFile()
+  .then(() => {
+    console.log('plugins.js file created');
+    process.exit();
+  })
+  .catch(err => {
+    console.error(err);
+    process.exit(1);
+  });

package/scripts/create-plugins-file.js

@@ -0,0 +1,92 @@
+'use strict';
+
+const { join, resolve, relative } = require('path');
+const { camelCase } = require('lodash');
+const fs = require('fs-extra');
+
+const CORE_PLUGINS = ['content-type-builder', 'email', 'upload'];
+
+/**
+ * Retrieve the core plugins path
+ * @returns {Object}
+ */
+const getCorePluginsPath = () => {
+  const corePlugins = {};
+
+  for (const dep of CORE_PLUGINS) {
+    const packageAdminPath = join(__dirname, '..', '..', dep, 'admin', 'src');
+
+    const adminEntryPoint = resolve(join(__dirname, '..', 'admin', 'src'));
+    const pathToPlugin = join(relative(adminEntryPoint, packageAdminPath)).replace(/\\/g, '/');
+
+    corePlugins[dep] = pathToPlugin;
+  }
+
+  return corePlugins;
+};
+
+/**
+ * Retrieve the plugins real path
+ * @param {Object[]} pluginsToInstall array of plugins located in the plugins folder
+ * @returns Object of plugin's paths
+ */
+const getPluginToInstallPath = pluginsToInstall => {
+  const plugins = {};
+
+  for (const dep of pluginsToInstall) {
+    const packageAdminPath = join(__dirname, '..', '..', '..', 'plugins', dep, 'admin', 'src');
+
+    const adminEntryPoint = resolve(join(__dirname, '..', 'admin', 'src'));
+    const pathToPlugin = join(relative(adminEntryPoint, packageAdminPath)).replace(/\\/g, '/');
+
+    plugins[dep] = pathToPlugin;
+  }
+
+  return plugins;
+};
+
+/**
+ * Write the plugins.js file
+ * @param {Object} plugins
+ */
+const createPluginsFile = async plugins => {
+  const pluginFileDest = resolve(__dirname, '..', 'admin', 'src', 'plugins.js');
+
+  const allPluginsArray = Object.entries(plugins).map(([plugin, pluginPath]) => {
+    return {
+      shortName: camelCase(plugin),
+      name: plugin,
+      pluginPath,
+    };
+  });
+
+  const content = `
+// To override this file create a plugins-dev.js one and copy the content of the plugin.js one.
+// When starting the app the script will copy the plugins-dev.js into this one instead.
+${allPluginsArray
+  .map(({ shortName, pluginPath }) => {
+    const req = `'${pluginPath}'`;
+
+    return `import ${shortName} from ${req};`;
+  })
+  .join('\n')}
+
+const plugins = {
+${[...allPluginsArray]
+  .map(({ name, shortName }) => {
+    return `  '${name}': ${shortName},`;
+  })
+  .join('\n')}
+};
+  
+export default plugins;
+`;
+
+  return fs.writeFile(pluginFileDest, content);
+};
+
+module.exports = {
+  createPluginsFile,
+  getCorePluginsPath,
+  getPluginToInstallPath,
+};

package/server/controllers/admin.js

@@ -76,8 +76,14 @@ module.exports = {
   },
 
   async plugins(ctx) {
-    // TODO: use name from plugin package.json info
-    const plugins = _.mapValues(strapi.plugins, (_, key) => ({ name: key }));
+    const enabledPlugins = strapi.config.get('enabledPlugins');
+
+    const plugins = Object.entries(enabledPlugins).map(([key, plugin]) => ({
+      name: plugin.info.name || key,
+      displayName: plugin.info.displayName || plugin.info.name || key,
+      description: plugin.info.description || '',
+    }));
+
     ctx.send({ plugins });
   },
 

package/server/services/content-type.js

@@ -35,11 +35,11 @@ const getNestedFields = (
       if (nonAuthorizableFields.includes(key)) return fields;
 
       const fieldPath = prefix ? `${prefix}.${key}` : key;
-      const requiredOrNotNeeded = !requiredOnly || attr.required === true;
+      const shouldBeIncluded = !requiredOnly || attr.required === true;
       const insideExistingFields = existingFields && existingFields.some(startsWith(fieldPath));
 
       if (attr.type === 'component') {
-        if (requiredOrNotNeeded || insideExistingFields) {
+        if (shouldBeIncluded || insideExistingFields) {
           const compoFields = getNestedFields(components[attr.component], {
             nestingLevel: nestingLevel - 1,
             prefix: fieldPath,
@@ -48,7 +48,7 @@ const getNestedFields = (
             existingFields,
           });
 
-          if (requiredOnly && compoFields.length === 0 && attr.required) {
+          if (compoFields.length === 0 && shouldBeIncluded) {
             return fields.concat(fieldPath);
           }
 
@@ -57,7 +57,7 @@ const getNestedFields = (
         return fields;
       }
 
-      if (requiredOrNotNeeded) {
+      if (shouldBeIncluded) {
         return fields.concat(fieldPath);
       }
 

package/server/services/permission/permissions-manager/sanitize.js

@@ -13,6 +13,7 @@ const {
   prop,
   uniq,
   intersection,
+  pick,
 } = require('lodash/fp');
 
 const { contentTypes, traverseEntity, sanitize, pipeAsync } = require('@strapi/utils');
@@ -45,8 +46,8 @@ module.exports = ({ action, ability, model }) => {
     const permittedFields = fields.shouldIncludeAll ? null : getOutputFields(fields.permitted);
 
     return pipeAsync(
-      // Remove roles from createdBy & updateBy fields
-      omitCreatorRoles,
+      // Remove unallowed fields from admin::user relations
+      traverseEntity(pickAllowedAdminUserFields, { schema }),
       // Remove not allowed fields (RBAC)
       traverseEntity(allowedFields(permittedFields), { schema }),
       // Remove all fields of type 'password'
@@ -106,6 +107,12 @@ module.exports = ({ action, ability, model }) => {
 
   const omitCreatorRoles = omit([`${CREATED_BY_ATTRIBUTE}.roles`, `${UPDATED_BY_ATTRIBUTE}.roles`]);
 
+  const pickAllowedAdminUserFields = ({ attribute, key, value }, { set }) => {
+    if (attribute.type === 'relation' && attribute.target === 'admin::user') {
+      set(key, pick(['id', 'firstname', 'lastname', 'username'], value));
+    }
+  };
+
   const getInputFields = (fields = []) => {
     const nonVisibleAttributes = getNonVisibleAttributes(schema);
     const writableAttributes = getWritableAttributes(schema);

package/server/services/user.js

@@ -180,6 +180,19 @@ const findOne = async (id, populate = ['roles']) => {
   return strapi.entityService.findOne('admin::user', id, { populate });
 };
 
+/**
+ * Find one user by its email
+ * @param {string} id  email
+ * @param {string || string[] || object} populate
+ * @returns
+ */
+const findOneByEmail = async (email, populate = []) => {
+  return strapi.query('admin::user').findOne({
+    where: { email },
+    populate,
+  });
+};
+
 /** Find many users (paginated)
  * @param query
  * @returns {Promise<user>}
@@ -309,6 +322,7 @@ module.exports = {
   register,
   sanitizeUser,
   findOne,
+  findOneByEmail,
   findPage,
   deleteById,
   deleteByIds,

package/server/validation/authentication/register.js

@@ -11,7 +11,7 @@ const registrationSchema = yup
       .object()
       .shape({
         firstname: validators.firstname.required(),
-        lastname: validators.lastname.required(),
+        lastname: validators.lastname,
         password: validators.password.required(),
       })
       .required()
@@ -32,7 +32,7 @@ const adminRegistrationSchema = yup
   .shape({
     email: validators.email.required(),
     firstname: validators.firstname.required(),
-    lastname: validators.lastname.required(),
+    lastname: validators.lastname,
     password: validators.password.required(),
   })
   .required()

package/server/validation/common-validators.js

@@ -21,7 +21,7 @@ const email = yup
 
 const firstname = yup.string().min(1);
 
-const lastname = yup.string().min(1);
+const lastname = yup.string();
 
 const username = yup.string().min(1);
 

package/server/validation/user.js

@@ -9,7 +9,7 @@ const userCreationSchema = yup
   .shape({
     email: validators.email.required(),
     firstname: validators.firstname.required(),
-    lastname: validators.lastname.required(),
+    lastname: validators.lastname,
     roles: validators.roles.min(1),
     preferedLanguage: yup.string().nullable(),
   })
@@ -20,7 +20,7 @@ const profileUpdateSchema = yup
   .shape({
     email: validators.email.notNull(),
     firstname: validators.firstname.notNull(),
-    lastname: validators.lastname.notNull(),
+    lastname: validators.lastname.nullable(),
     username: validators.username.nullable(),
     password: validators.password.notNull(),
     currentPassword: yup
@@ -36,7 +36,7 @@ const userUpdateSchema = yup
   .shape({
     email: validators.email.notNull(),
     firstname: validators.firstname.notNull(),
-    lastname: validators.lastname.notNull(),
+    lastname: validators.lastname.nullable(),
     username: validators.username.nullable(),
     password: validators.password.notNull(),
     isActive: yup.bool().notNull(),

package/admin/src/content-manager/components/Inputs/ComingSoonInput.js

@@ -1,72 +0,0 @@
-/**
- *
- * CominSoonInput
- *
- */
-
-import React from 'react';
-import { useIntl } from 'react-intl';
-import { TextInput } from '@strapi/design-system/TextInput';
-import PropTypes from 'prop-types';
-
-const CominSoonInput = ({ description, intlLabel, labelAction, error, name, required }) => {
-  const { formatMessage } = useIntl();
-  const label = intlLabel.id
-    ? formatMessage(
-        { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage },
-        { ...intlLabel.values }
-      )
-    : name;
-
-  const hint = description?.id
-    ? formatMessage(
-        { id: description.id, defaultMessage: description.defaultMessage },
-        { ...description.values }
-      )
-    : '';
-
-  const errorMessage = error ? formatMessage({ id: error, defaultMessage: error }) : '';
-
-  return (
-    <TextInput
-      disabled
-      error={errorMessage}
-      label={label}
-      labelAction={labelAction}
-      id={name}
-      hint={hint}
-      name={name}
-      onChange={() => {}}
-      placeholder="Coming soon"
-      required={required}
-      type="text"
-      value=""
-    />
-  );
-};
-
-CominSoonInput.defaultProps = {
-  description: null,
-  error: '',
-  labelAction: undefined,
-  required: false,
-};
-
-CominSoonInput.propTypes = {
-  description: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }),
-  error: PropTypes.string,
-  intlLabel: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }).isRequired,
-  labelAction: PropTypes.element,
-  name: PropTypes.string.isRequired,
-  required: PropTypes.bool,
-};
-
-export default CominSoonInput;

package/admin/src/content-manager/pages/EditSettingsView/components/FieldButton.js

@@ -1,118 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-import PropTypes from 'prop-types';
-import { Box } from '@strapi/design-system/Box';
-import { Flex } from '@strapi/design-system/Flex';
-import { IconButton } from '@strapi/design-system/IconButton';
-import { Text } from '@strapi/design-system/Text';
-import Drag from '@strapi/icons/Drag';
-import Pencil from '@strapi/icons/Pencil';
-import Trash from '@strapi/icons/Trash';
-import { useIntl } from 'react-intl';
-import ComponentFieldList from './ComponentFieldList';
-import DynamicZoneList from './DynamicZoneList';
-import getTrad from '../../../utils/getTrad';
-
-const CustomIconButton = styled(IconButton)`
-  background-color: transparent;
-  path {
-    fill: ${({ theme }) => theme.colors.neutral600};
-  }
-`;
-const CustomDragIcon = styled(Drag)`
-  height: ${12 / 16}rem;
-  width: ${12 / 16}rem;
-  path {
-    fill: ${({ theme }) => theme.colors.neutral600};
-  }
-`;
-const CustomFlex = styled(Flex)`
-  border-right: 1px solid ${({ theme }) => theme.colors.neutral200};
-`;
-
-const FieldButton = ({ attribute, onEditField, onDeleteField, children }) => {
-  const { formatMessage } = useIntl();
-  const getHeight = () => {
-    const higherFields = ['json', 'text', 'file', 'media', 'component', 'richtext', 'dynamiczone'];
-
-    if (attribute && higherFields.includes(attribute.type)) {
-      return `${74 / 16}rem`;
-    }
-
-    return `${32 / 16}rem`;
-  };
-
-  return (
-    <Flex
-      width="100%"
-      borderColor="neutral150"
-      hasRadius
-      background="neutral100"
-      minHeight={getHeight()}
-      alignItems="stretch"
-    >
-      <CustomFlex alignItems="center" paddingLeft={3} paddingRight={3}>
-        <CustomDragIcon />
-      </CustomFlex>
-      <Box overflow="hidden" width="100%">
-        <Flex paddingLeft={3} alignItems="baseline" justifyContent="space-between">
-          <Box>
-            <Text textColor="neutral800" bold>
-              {children}
-            </Text>
-          </Box>
-          <Flex>
-            <CustomIconButton
-              label={formatMessage(
-                {
-                  id: getTrad('containers.ListSettingsView.modal-form.edit-label'),
-                  defaultMessage: `Edit {fieldName}`,
-                },
-                { fieldName: children }
-              )}
-              onClick={onEditField}
-              icon={<Pencil />}
-              noBorder
-            />
-            <CustomIconButton
-              label={formatMessage(
-                {
-                  id: getTrad('app.component.table.delete'),
-                  defaultMessage: `Delete {target}`,
-                },
-                {
-                  target: children,
-                }
-              )}
-              data-testid="delete-field"
-              onClick={onDeleteField}
-              icon={<Trash />}
-              noBorder
-            />
-          </Flex>
-        </Flex>
-        {attribute?.type === 'component' && (
-          <ComponentFieldList componentUid={attribute.component} />
-        )}
-        {attribute?.type === 'dynamiczone' && <DynamicZoneList components={attribute.components} />}
-      </Box>
-    </Flex>
-  );
-};
-
-FieldButton.defaultProps = {
-  attribute: undefined,
-};
-
-FieldButton.propTypes = {
-  attribute: PropTypes.shape({
-    components: PropTypes.array,
-    component: PropTypes.string,
-    type: PropTypes.string,
-  }),
-  onEditField: PropTypes.func.isRequired,
-  onDeleteField: PropTypes.func.isRequired,
-  children: PropTypes.string.isRequired,
-};
-
-export default FieldButton;