@strapi/admin 4.0.0-beta.0 → 4.0.0-beta.4

package/server/routes/admin.js

@@ -28,7 +28,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::marketplace.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::marketplace.read'] } },
       ],
     },
   },
@@ -41,7 +41,7 @@ module.exports = [
         'admin::isAuthenticatedAdmin',
         {
           name: 'admin::hasPermissions',
-          options: { actions: ['admin::marketplace.plugins.install'] },
+          config: { actions: ['admin::marketplace.plugins.install'] },
         },
       ],
     },
@@ -55,7 +55,7 @@ module.exports = [
         'admin::isAuthenticatedAdmin',
         {
           name: 'admin::hasPermissions',
-          options: { actions: ['admin::marketplace.plugins.uninstall'] },
+          config: { actions: ['admin::marketplace.plugins.uninstall'] },
         },
       ],
     },

package/server/routes/api-tokens.js

@@ -8,7 +8,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.create'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::api-tokens.create'] } },
       ],
     },
   },
@@ -19,7 +19,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::api-tokens.read'] } },
       ],
     },
   },
@@ -30,7 +30,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.delete'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::api-tokens.delete'] } },
       ],
     },
   },
@@ -41,7 +41,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::api-tokens.read'] } },
       ],
     },
   },
@@ -52,7 +52,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::api-tokens.update'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::api-tokens.update'] } },
       ],
     },
   },

package/server/routes/roles.js

@@ -6,7 +6,7 @@ module.exports = [
     path: '/users/batch-delete',
     handler: 'user.deleteMany',
     config: {
-      policies: [{ name: 'admin::hasPermissions', options: { actions: ['admin::users.delete'] } }],
+      policies: [{ name: 'admin::hasPermissions', config: { actions: ['admin::users.delete'] } }],
     },
   },
   {
@@ -16,7 +16,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::roles.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::roles.read'] } },
       ],
     },
   },
@@ -27,7 +27,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::roles.update'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::roles.update'] } },
       ],
     },
   },
@@ -38,7 +38,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::roles.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::roles.read'] } },
       ],
     },
   },
@@ -49,7 +49,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::roles.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::roles.read'] } },
       ],
     },
   },
@@ -60,7 +60,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::roles.update'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::roles.update'] } },
       ],
     },
   },

package/server/routes/users.js

@@ -32,7 +32,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::users.create'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::users.create'] } },
       ],
     },
   },
@@ -43,7 +43,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::users.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::users.read'] } },
       ],
     },
   },
@@ -54,7 +54,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::users.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::users.read'] } },
       ],
     },
   },
@@ -65,7 +65,7 @@ module.exports = [
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::users.update'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::users.update'] } },
       ],
     },
   },
@@ -74,7 +74,7 @@ module.exports = [
     path: '/users/:id',
     handler: 'user.deleteOne',
     config: {
-      policies: [{ name: 'admin::hasPermissions', options: { actions: ['admin::users.delete'] } }],
+      policies: [{ name: 'admin::hasPermissions', config: { actions: ['admin::users.delete'] } }],
     },
   },
   {
@@ -82,7 +82,7 @@ module.exports = [
     path: '/users/batch-delete',
     handler: 'user.deleteMany',
     config: {
-      policies: [{ name: 'admin::hasPermissions', options: { actions: ['admin::users.delete'] } }],
+      policies: [{ name: 'admin::hasPermissions', config: { actions: ['admin::users.delete'] } }],
     },
   },
 ];

package/server/routes/webhooks.js

@@ -4,73 +4,73 @@ module.exports = [
   {
     method: 'GET',
     path: '/webhooks',
-    handler: 'Webhooks.listWebhooks',
+    handler: 'webhooks.listWebhooks',
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::webhooks.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::webhooks.read'] } },
       ],
     },
   },
   {
     method: 'POST',
     path: '/webhooks',
-    handler: 'Webhooks.createWebhook',
+    handler: 'webhooks.createWebhook',
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::webhooks.create'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::webhooks.create'] } },
       ],
     },
   },
   {
     method: 'GET',
     path: '/webhooks/:id',
-    handler: 'Webhooks.getWebhook',
+    handler: 'webhooks.getWebhook',
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::webhooks.read'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::webhooks.read'] } },
       ],
     },
   },
   {
     method: 'PUT',
     path: '/webhooks/:id',
-    handler: 'Webhooks.updateWebhook',
+    handler: 'webhooks.updateWebhook',
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::webhooks.update'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::webhooks.update'] } },
       ],
     },
   },
   {
     method: 'DELETE',
     path: '/webhooks/:id',
-    handler: 'Webhooks.deleteWebhook',
+    handler: 'webhooks.deleteWebhook',
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::webhooks.delete'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::webhooks.delete'] } },
       ],
     },
   },
   {
     method: 'POST',
     path: '/webhooks/batch-delete',
-    handler: 'Webhooks.deleteWebhooks',
+    handler: 'webhooks.deleteWebhooks',
     config: {
       policies: [
         'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', options: { actions: ['admin::webhooks.delete'] } },
+        { name: 'admin::hasPermissions', config: { actions: ['admin::webhooks.delete'] } },
       ],
     },
   },
   {
     method: 'POST',
     path: '/webhooks/:id/trigger',
-    handler: 'Webhooks.triggerWebhook',
+    handler: 'webhooks.triggerWebhook',
     config: {
       policies: [],
     },

package/server/strategies/api-token.js

@@ -3,6 +3,8 @@
 const constants = require('../services/constants');
 const { getService } = require('../utils');
 
+const isReadScope = scope => scope.endsWith('find') || scope.endsWith('findOne');
+
 /** @type {import('.').AuthenticateFunction} */
 const authenticate = async ctx => {
   const apiTokenService = getService('api-token');
@@ -47,7 +49,8 @@ const verify = (auth, config) => {
    * If you don't have `full-access` you can only access `find` and `findOne`
    * scopes. If the route has no scope, then you can't get access to it.
    */
-  if (config.scope && (config.scope.endsWith('find') || config.scope.endsWith('findOne'))) {
+
+  if (config.scope && config.scope.every(isReadScope)) {
     return;
   }
 

package/server/utils/index.js

@@ -1,9 +1,7 @@
 'use strict';
 
-const { prop } = require('lodash/fp');
-
 const getService = name => {
-  return prop(`admin.services.${name}`, strapi);
+  return strapi.service(`admin::${name}`);
 };
 
 module.exports = {

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

@@ -1,347 +0,0 @@
-/**
- *
- * GenericInput
- * This is a temp file move it to the helper plugin when ready
- */
-
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import cloneDeep from 'lodash/cloneDeep';
-import { formatISO } from 'date-fns';
-import { DatePicker } from '@strapi/parts/DatePicker';
-import { NumberInput } from '@strapi/parts/NumberInput';
-import { Select, Option } from '@strapi/parts/Select';
-import { Textarea } from '@strapi/parts/Textarea';
-import { TextInput } from '@strapi/parts/TextInput';
-import { TimePicker } from '@strapi/parts/TimePicker';
-import { ToggleInput } from '@strapi/parts/ToggleInput';
-import Hide from '@strapi/icons/Hide';
-import Show from '@strapi/icons/Show';
-
-const GenericInput = ({
-  autoComplete,
-  customInputs,
-  description,
-  disabled,
-  intlLabel,
-  labelAction,
-  error,
-  name,
-  onChange,
-  options,
-  placeholder,
-  step,
-  type,
-  value,
-  ...rest
-}) => {
-  const { formatMessage } = useIntl();
-  const [showPassword, setShowPassword] = useState(false);
-
-  const CustomInput = customInputs ? customInputs[type] : null;
-
-  if (CustomInput) {
-    return (
-      <CustomInput
-        {...rest}
-        description={description}
-        disabled={disabled}
-        intlLabel={intlLabel}
-        labelAction={labelAction}
-        error={error}
-        name={name}
-        onChange={onChange}
-        placeholder={placeholder}
-        type={type}
-        value={value}
-      />
-    );
-  }
-
-  const label = intlLabel.id
-    ? formatMessage(
-        { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage },
-        { ...intlLabel.values }
-      )
-    : name;
-
-  const hint = description
-    ? formatMessage(
-        { id: description.id, defaultMessage: description.defaultMessage },
-        { ...description.values }
-      )
-    : '';
-
-  const formattedPlaceholder = placeholder
-    ? formatMessage(
-        { id: placeholder.id, defaultMessage: placeholder.defaultMessage },
-        { ...placeholder.values }
-      )
-    : '';
-
-  const errorMessage = error ? formatMessage({ id: error, defaultMessage: error }) : '';
-
-  switch (type) {
-    case 'bool': {
-      return (
-        <ToggleInput
-          checked={value || false}
-          disabled={disabled}
-          hint={hint}
-          label={label}
-          labelAction={labelAction}
-          name={name}
-          offLabel={formatMessage({
-            id: 'app.components.ToggleCheckbox.off-label',
-            defaultMessage: 'Off',
-          })}
-          onLabel={formatMessage({
-            id: 'app.components.ToggleCheckbox.on-label',
-            defaultMessage: 'On',
-          })}
-          onChange={e => {
-            onChange({ target: { name, value: e.target.checked } });
-          }}
-        />
-      );
-    }
-    case 'date': {
-      return (
-        <DatePicker
-          clearLabel={formatMessage({ id: 'clearLabel', defaultMessage: 'Clear' })}
-          disabled={disabled}
-          error={errorMessage}
-          label={label}
-          labelAction={labelAction}
-          id={name}
-          hint={hint}
-          name={name}
-          onChange={date => {
-            const formattedDate = formatISO(cloneDeep(date), { representation: 'date' });
-
-            onChange({ target: { name, value: formattedDate, type } });
-          }}
-          onClear={() => onChange({ target: { name, value: '', type } })}
-          placeholder={formattedPlaceholder}
-          selectedDate={value ? new Date(value) : null}
-          selectedDateLabel={formattedDate => `Date picker, current is ${formattedDate}`}
-        />
-      );
-    }
-    case 'number': {
-      return (
-        <NumberInput
-          disabled={disabled}
-          error={errorMessage}
-          label={label}
-          labelAction={labelAction}
-          id={name}
-          hint={hint}
-          name={name}
-          onValueChange={value => {
-            onChange({ target: { name, value, type } });
-          }}
-          placeholder={formattedPlaceholder}
-          step={step}
-          value={value || undefined}
-        />
-      );
-    }
-    case 'email':
-    case 'text':
-    case 'string': {
-      return (
-        <TextInput
-          autoComplete={autoComplete}
-          disabled={disabled}
-          error={errorMessage}
-          label={label}
-          labelAction={labelAction}
-          id={name}
-          hint={hint}
-          name={name}
-          onChange={onChange}
-          placeholder={formattedPlaceholder}
-          type={type}
-          value={value || ''}
-        />
-      );
-    }
-    case 'password': {
-      return (
-        <TextInput
-          autoComplete={autoComplete}
-          disabled={disabled}
-          error={errorMessage}
-          endAction={
-            <button
-              aria-label={formatMessage({
-                id: 'Auth.form.password.show-password',
-                defaultMessage: 'Show password',
-              })}
-              onClick={() => {
-                setShowPassword(prev => !prev);
-              }}
-              style={{
-                border: 'none',
-                padding: 0,
-                background: 'transparent',
-              }}
-              type="button"
-            >
-              {showPassword ? <Show /> : <Hide />}
-            </button>
-          }
-          label={label}
-          labelAction={labelAction}
-          id={name}
-          hint={hint}
-          name={name}
-          onChange={onChange}
-          placeholder={formattedPlaceholder}
-          type={showPassword ? 'text' : 'password'}
-          value={value || ''}
-        />
-      );
-    }
-    case 'select': {
-      return (
-        <Select
-          disabled={disabled}
-          error={errorMessage}
-          label={label}
-          labelAction={labelAction}
-          id={name}
-          hint={hint}
-          name={name}
-          onChange={value => {
-            onChange({ target: { name, value: value === '' ? null : value, type: 'select' } });
-          }}
-          placeholder={formattedPlaceholder}
-          value={value || ''}
-        >
-          {options.map(({ metadatas: { intlLabel, disabled, hidden }, key, value }) => {
-            return (
-              <Option key={key} value={value} disabled={disabled} hidden={hidden}>
-                {formatMessage(intlLabel)}
-              </Option>
-            );
-          })}
-        </Select>
-      );
-    }
-    case 'textarea': {
-      return (
-        <Textarea
-          disabled={disabled}
-          error={errorMessage}
-          label={label}
-          labelAction={labelAction}
-          id={name}
-          hint={hint}
-          name={name}
-          onChange={onChange}
-          placeholder={formattedPlaceholder}
-          type={type}
-          value={value || ''}
-        >
-          {value}
-        </Textarea>
-      );
-    }
-    case 'time': {
-      let time = value;
-
-      // The backend send a value which has the following format: '00:45:00.000'
-      // or the time picker only supports hours & minutes so we need to mutate the value
-      if (value && value.split(':').length > 2) {
-        time = time.split(':');
-        time.pop();
-        time = time.join(':');
-      }
-
-      return (
-        <TimePicker
-          clearLabel={formatMessage({ id: 'clearLabel', defaultMessage: 'Clear' })}
-          disabled={disabled}
-          error={errorMessage}
-          label={label}
-          labelAction={labelAction}
-          id={name}
-          hint={hint}
-          name={name}
-          onChange={time => {
-            onChange({ target: { name, value: `${time}`, type } });
-          }}
-          onClear={() => {
-            onChange({ target: { name, value: null, type } });
-          }}
-          placeholder={formattedPlaceholder}
-          step={step}
-          value={time}
-        />
-      );
-    }
-    default: {
-      return <div>{type} is not supported</div>;
-    }
-  }
-};
-
-GenericInput.defaultProps = {
-  autoComplete: undefined,
-  customInputs: null,
-  description: null,
-  disabled: false,
-  error: '',
-  labelAction: undefined,
-  placeholder: null,
-  options: [],
-  step: 1,
-  value: '',
-};
-
-GenericInput.propTypes = {
-  autoComplete: PropTypes.string,
-  customInputs: PropTypes.object,
-  description: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }),
-  disabled: PropTypes.bool,
-  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,
-  onChange: PropTypes.func.isRequired,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      metadatas: PropTypes.shape({
-        intlLabel: PropTypes.shape({
-          id: PropTypes.string.isRequired,
-          defaultMessage: PropTypes.string.isRequired,
-        }).isRequired,
-        disabled: PropTypes.bool,
-        hidden: PropTypes.bool,
-      }).isRequired,
-      key: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-      value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-    }).isRequired
-  ),
-  placeholder: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    values: PropTypes.object,
-  }),
-  step: PropTypes.number,
-  type: PropTypes.string.isRequired,
-  value: PropTypes.any,
-};
-
-export default GenericInput;

package/admin/src/content-manager/utils/formatFiltersFromQuery.js

@@ -1,55 +0,0 @@
-// List of all the possible filters
-const VALID_REST_OPERATORS = [
-  'eq',
-  'ne',
-  'in',
-  'nin',
-  'contains',
-  'ncontains',
-  'containss',
-  'ncontainss',
-  'lt',
-  'lte',
-  'gt',
-  'gte',
-  'null',
-];
-
-// from strapi-utils/convert-rest-query-params
-const findAppliedFilter = whereClause => {
-  // Useful to remove the mainField of relation fields.
-  const formattedWhereClause = whereClause.split('.')[0];
-  const separatorIndex = whereClause.lastIndexOf('_');
-
-  if (separatorIndex === -1) {
-    return { operator: '=', field: formattedWhereClause };
-  }
-
-  const fieldName = formattedWhereClause.substring(0, separatorIndex);
-  const operator = whereClause.slice(separatorIndex + 1);
-
-  // the field as underscores
-  if (!VALID_REST_OPERATORS.includes(operator)) {
-    return { operator: '=', field: formattedWhereClause };
-  }
-
-  return { operator: `_${operator}`, field: fieldName };
-};
-
-const formatFiltersFromQuery = ({ _where }) => {
-  if (!_where) {
-    return [];
-  }
-
-  return _where.map(obj => {
-    const [key] = Object.keys(obj);
-    const { field, operator } = findAppliedFilter(key);
-
-    const value = obj[key];
-
-    return { name: field, filter: operator, value };
-  });
-};
-
-export default formatFiltersFromQuery;
-export { findAppliedFilter };