@strapi/admin 4.6.0 → 4.6.2

package/server/controllers/admin.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const path = require('path');
-const execa = require('execa');
+
+const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
 const _ = require('lodash');
 const { exists } = require('fs-extra');
 const { env } = require('@strapi/utils');
-const { ValidationError } = require('@strapi/utils').errors;
 const { isUsingTypeScript } = require('@strapi/typescript-utils');
 // eslint-disable-next-line node/no-extraneous-require
 const ee = require('@strapi/strapi/lib/utils/ee');
@@ -17,15 +17,6 @@ const {
 } = require('../validation/project-settings');
 const { getService } = require('../utils');
 
-const PLUGIN_NAME_REGEX = /^[A-Za-z][A-Za-z0-9-_]+$/;
-
-/**
- * Validates a plugin name format
- */
-const isValidPluginName = (plugin) => {
-  return _.isString(plugin) && !_.isEmpty(plugin) && PLUGIN_NAME_REGEX.test(plugin);
-};
-
 /**
  * A set of functions called "actions" for `Admin`
  */
@@ -97,11 +88,25 @@ module.exports = {
     );
     const isHostedOnStrapiCloud = env('STRAPI_HOSTING', null) === 'strapi.cloud';
 
+    const numberOfAllContentTypes = _.size(strapi.contentTypes);
+    const numberOfComponents = _.size(strapi.components);
+
+    const getNumberOfDynamicZones = () => {
+      return pipe(
+        map('attributes'),
+        flatMap(values),
+        sumBy(propEq('type', 'dynamiczone'))
+      )(strapi.contentTypes);
+    };
+
     return {
       data: {
         useTypescriptOnServer,
         useTypescriptOnAdmin,
         isHostedOnStrapiCloud,
+        numberOfAllContentTypes, // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
+        numberOfComponents,
+        numberOfDynamicZones: getNumberOfDynamicZones(),
       },
     };
   },
@@ -130,28 +135,6 @@ module.exports = {
     };
   },
 
-  async installPlugin(ctx) {
-    try {
-      const { plugin } = ctx.request.body;
-
-      if (!isValidPluginName(plugin)) {
-        throw new ValidationError('Invalid plugin name');
-      }
-
-      strapi.reload.isWatching = false;
-
-      strapi.log.info(`Installing ${plugin}...`);
-      await execa('npm', ['run', 'strapi', '--', 'install', plugin]);
-
-      ctx.send({ ok: true });
-
-      strapi.reload();
-    } catch (err) {
-      strapi.reload.isWatching = true;
-      throw err;
-    }
-  },
-
   async plugins(ctx) {
     const enabledPlugins = strapi.config.get('enabledPlugins');
 
@@ -164,26 +147,4 @@ module.exports = {
 
     ctx.send({ plugins });
   },
-
-  async uninstallPlugin(ctx) {
-    try {
-      const { plugin } = ctx.params;
-
-      if (!isValidPluginName(plugin)) {
-        throw new ValidationError('Invalid plugin name');
-      }
-
-      strapi.reload.isWatching = false;
-
-      strapi.log.info(`Uninstalling ${plugin}...`);
-      await execa('npm', ['run', 'strapi', '--', 'uninstall', plugin, '-d']);
-
-      ctx.send({ ok: true });
-
-      strapi.reload();
-    } catch (err) {
-      strapi.reload.isWatching = true;
-      throw err;
-    }
-  },
 };

package/server/routes/admin.js

@@ -68,32 +68,4 @@ module.exports = [
       ],
     },
   },
-  {
-    method: 'POST',
-    path: '/plugins/install',
-    handler: 'admin.installPlugin',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: { actions: ['admin::marketplace.plugins.install'] },
-        },
-      ],
-    },
-  },
-  {
-    method: 'DELETE',
-    path: '/plugins/uninstall/:plugin',
-    handler: 'admin.uninstallPlugin',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: { actions: ['admin::marketplace.plugins.uninstall'] },
-        },
-      ],
-    },
-  },
 ];

package/webpack.alias.js

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

package/webpack.config.js

@@ -8,7 +8,6 @@ const ForkTsCheckerPlugin = require('fork-ts-checker-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const WebpackBar = require('webpackbar');
-const NodePolyfillPlugin = require('node-polyfill-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const browserslistToEsbuild = require('browserslist-to-esbuild');
 
@@ -232,8 +231,6 @@ module.exports = ({
       }),
       new webpack.DefinePlugin(envVariables),
 
-      new NodePolyfillPlugin(),
-
       new ForkTsCheckerPlugin({
         typescript: {
           configFile: tsConfigFilePath,

package/admin/src/content-manager/components/InputJSON/FieldWrapper.js

@@ -1,40 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { Field } from '@strapi/design-system/Field';
-
-const FieldWrapper = ({ name, hint, error, children, required }) => {
-  const { formatMessage } = useIntl();
-  const errorMessage = error ? formatMessage({ id: error, defaultMessage: error }) : '';
-
-  return (
-    <Field
-      name={name}
-      hint={hint && formatMessage(hint)}
-      error={errorMessage}
-      id={name}
-      required={required}
-    >
-      {children}
-    </Field>
-  );
-};
-
-FieldWrapper.defaultProps = {
-  hint: undefined,
-  error: '',
-  required: false,
-};
-
-FieldWrapper.propTypes = {
-  name: PropTypes.string.isRequired,
-  hint: PropTypes.shape({
-    id: PropTypes.string,
-    defaultMessage: PropTypes.string,
-  }),
-  error: PropTypes.string,
-  children: PropTypes.node.isRequired,
-  required: PropTypes.bool,
-};
-
-export default FieldWrapper;

package/admin/src/content-manager/components/InputJSON/Label.js

@@ -1,35 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { FieldLabel } from '@strapi/design-system/Field';
-
-const Label = ({ intlLabel, labelAction, name }) => {
-  const { formatMessage } = useIntl();
-  const label = intlLabel?.id
-    ? formatMessage(
-        { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage },
-        { ...intlLabel.values }
-      )
-    : name;
-
-  return <FieldLabel action={labelAction}>{label}</FieldLabel>;
-};
-
-Label.defaultProps = {
-  id: undefined,
-  intlLabel: undefined,
-  labelAction: undefined,
-};
-
-Label.propTypes = {
-  id: PropTypes.string,
-  intlLabel: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }),
-  labelAction: PropTypes.element,
-  name: PropTypes.string.isRequired,
-};
-
-export default Label;

package/admin/src/content-manager/components/InputJSON/components.js

@@ -1,36 +0,0 @@
-import styled from 'styled-components';
-import { Box } from '@strapi/design-system/Box';
-
-/* eslint-disable */
-/* stylelint-disable */
-const EditorWrapper = styled.div`
-  cursor: ${({ disabled }) => (disabled ? 'not-allowed !important' : 'auto')};
-  /* BASICS */
-
-  .colored {
-    background-color: yellow;
-    color: black !important;
-  }
-
-  > div {
-    border-radius: 3px;
-    > div:last-of-type {
-      min-height: 253px;
-      max-height: 506px;
-    }
-  }
-
-  .CodeMirror {
-    /* Set height, width, borders, and global font properties here */
-    font-size: ${14 / 16}rem;
-    direction: ltr;
-    z-index: 0;
-  }
-`;
-
-const StyledBox = styled(Box)`
-  border-radius: ${({ theme }) => theme.borderRadius};
-  border: 1px solid ${({ theme, error }) => (error ? theme.colors.danger600 : 'transparent')};
-`;
-
-export { EditorWrapper, StyledBox };

package/admin/src/content-manager/components/InputJSON/index.js

@@ -1,223 +0,0 @@
-/**
- *
- * InputJSON
- *
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import cm from 'codemirror';
-import trimStart from 'lodash/trimStart';
-import { Stack } from '@strapi/design-system/Stack';
-import { FieldHint, FieldError } from '@strapi/design-system/Field';
-import jsonlint from './jsonlint';
-import { EditorWrapper, StyledBox } from './components';
-import Label from './Label';
-import FieldWrapper from './FieldWrapper';
-
-const WAIT = 600;
-const DEFAULT_THEME = 'blackboard';
-
-const loadCss = async () => {
-  await import(
-    /* webpackChunkName: "codemirror-javacript" */ 'codemirror/mode/javascript/javascript'
-  );
-  await import(/* webpackChunkName: "codemirror-addon-lint" */ 'codemirror/addon/lint/lint');
-  await import(
-    /* webpackChunkName: "codemirror-addon-lint-js" */ 'codemirror/addon/lint/javascript-lint'
-  );
-  await import(
-    /* webpackChunkName: "codemirror-addon-closebrackets" */ 'codemirror/addon/edit/closebrackets'
-  );
-  await import(
-    /* webpackChunkName: "codemirror-addon-mark-selection" */ 'codemirror/addon/selection/mark-selection'
-  );
-  await import(/* webpackChunkName: "codemirror-css" */ 'codemirror/lib/codemirror.css');
-  await import(/* webpackChunkName: "codemirror-theme" */ 'codemirror/theme/blackboard.css');
-};
-
-loadCss();
-
-class InputJSON extends React.Component {
-  timer = null;
-
-  constructor(props) {
-    super(props);
-    this.editor = React.createRef();
-    this.state = { error: false, markedText: null };
-  }
-
-  componentDidMount() {
-    // Init codemirror component
-    this.codeMirror = cm.fromTextArea(this.editor.current, {
-      autoCloseBrackets: true,
-      lineNumbers: true,
-      matchBrackets: true,
-      mode: 'application/json',
-      readOnly: this.props.disabled,
-      smartIndent: true,
-      styleSelectedText: true,
-      tabSize: 2,
-      theme: DEFAULT_THEME,
-      fontSize: '13px',
-    });
-    this.codeMirror.on('change', this.handleChange);
-
-    this.setSize();
-    this.setInitValue();
-  }
-
-  componentDidUpdate(prevProps) {
-    if (prevProps.value !== this.props.value && !this.codeMirror.state.focused) {
-      this.setInitValue();
-    }
-  }
-
-  setInitValue = () => {
-    const { value } = this.props;
-
-    try {
-      if (value === null) return this.codeMirror.setValue('');
-
-      if (value === 0) return this.codeMirror.setValue('0');
-
-      return this.codeMirror.setValue(value);
-    } catch (err) {
-      return this.setState({ error: true });
-    }
-  };
-
-  setSize = () => this.codeMirror.setSize('100%', 'auto');
-
-  getContentAtLine = (line) => this.codeMirror.getLine(line);
-
-  // getEditorOption = (opt) => this.codeMirror.getOption(opt);
-  // getValue = () => this.codeMirror.getValue();
-
-  markSelection = ({ message }) => {
-    let line = parseInt(message.split(':')[0].split('line ')[1], 10) - 1;
-    let content = this.getContentAtLine(line);
-
-    if (content === '{') {
-      line += 1;
-      content = this.getContentAtLine(line);
-    }
-    const chEnd = content.length;
-    const chStart = chEnd - trimStart(content, ' ').length;
-    const markedText = this.codeMirror.markText(
-      { line, ch: chStart },
-      { line, ch: chEnd },
-      { className: 'colored' }
-    );
-    this.setState({ markedText });
-  };
-
-  handleChange = (doc, change) => {
-    if (change.origin === 'setValue') {
-      return;
-    }
-
-    const { name, onChange } = this.props;
-    let value = doc.getValue();
-
-    if (value === '') {
-      value = null;
-    }
-
-    // Update the parent
-    onChange({
-      target: {
-        name,
-        value,
-        type: 'json',
-      },
-    });
-
-    // Remove higlight error
-    if (this.state.markedText) {
-      this.state.markedText.clear();
-      this.setState({ markedText: null, error: null });
-    }
-
-    clearTimeout(this.timer);
-    this.timer = setTimeout(() => this.testJSON(doc.getValue()), WAIT);
-  };
-
-  testJSON = (value) => {
-    try {
-      jsonlint.parse(value);
-    } catch (err) {
-      this.markSelection(err);
-    }
-  };
-
-  render() {
-    if (this.state.error) {
-      return <div>error json</div>;
-    }
-
-    return (
-      <FieldWrapper
-        name={this.props.name}
-        hint={this.props.description}
-        error={this.props.error}
-        required={this.props.required}
-      >
-        <Stack spacing={1}>
-          <Label
-            intlLabel={this.props.intlLabel}
-            name={this.props.name}
-            labelAction={this.props.labelAction}
-          />
-          <StyledBox error={this.props.error}>
-            <EditorWrapper disabled={this.props.disabled}>
-              <textarea
-                ref={this.editor}
-                autoComplete="off"
-                id={this.props.id || this.props.name}
-                defaultValue=""
-              />
-            </EditorWrapper>
-          </StyledBox>
-          <FieldHint />
-          <FieldError />
-        </Stack>
-      </FieldWrapper>
-    );
-  }
-}
-
-InputJSON.defaultProps = {
-  description: null,
-  disabled: false,
-  id: undefined,
-  error: undefined,
-  intlLabel: undefined,
-  labelAction: undefined,
-  onChange() {},
-  value: null,
-  required: false,
-};
-
-InputJSON.propTypes = {
-  description: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }),
-  disabled: PropTypes.bool,
-  error: PropTypes.string,
-  id: PropTypes.string,
-  intlLabel: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }),
-  labelAction: PropTypes.element,
-  name: PropTypes.string.isRequired,
-  onChange: PropTypes.func,
-  value: PropTypes.any,
-  required: PropTypes.bool,
-};
-
-export default InputJSON;