diff --git a/.gitignore b/.gitignore index 347bd834cc..87457b804a 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,9 @@ packages/strapi-generate-new/files/public/ ############################ # *.cache + +############################ +# Visual Studio Code +############################ + +front-workspace.code-workspace diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index 3c9fc114a4..088c457229 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -21,7 +21,6 @@ "strapi-middleware-views": "3.0.0-beta.5", "strapi-plugin-content-manager": "3.0.0-beta.5", "strapi-plugin-content-type-builder": "3.0.0-beta.5", - "strapi-plugin-documentation": "3.0.0-beta.5", "strapi-plugin-email": "3.0.0-beta.5", "strapi-plugin-graphql": "3.0.0-beta.5", "strapi-plugin-settings-manager": "3.0.0-beta.5", diff --git a/packages/strapi-plugin-settings-manager/services/SettingsManager.js b/packages/strapi-plugin-settings-manager/services/SettingsManager.js index e13cb71dd3..7a4e49ab96 100644 --- a/packages/strapi-plugin-settings-manager/services/SettingsManager.js +++ b/packages/strapi-plugin-settings-manager/services/SettingsManager.js @@ -201,9 +201,7 @@ module.exports = { `environments.${env}.request.router.prefix`, null ), - validations: { - required: true, - }, + validations: {}, }, ], }, diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js index e8e118b8f3..6f8f02a6b5 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/index.js @@ -1,64 +1,95 @@ /** -* -* Controller -* -*/ + * + * Controller + * + */ import React from 'react'; import PropTypes from 'prop-types'; import { get, map, some } from 'lodash'; import cn from 'classnames'; import { FormattedMessage } from 'react-intl'; +import pluginId from '../../pluginId'; import InputCheckbox from '../InputCheckboxPlugin'; import styles from './styles.scss'; class Controller extends React.Component { - state = { inputSelected: '', checked: false }; + state = { inputSelected: '' }; - setNewInputSelected = (name) => { - this.setState({ inputSelected: name, checked: false }); - } + setNewInputSelected = name => { + this.setState({ inputSelected: name }); + }; handleChange = () => { - this.setState({ checked: !this.state.checked }); - this.context.selectAllActions(`${this.props.inputNamePath}.controllers.${this.props.name}`, !this.isAllActionsSelected()); - } + this.context.selectAllActions( + `${this.props.inputNamePath}.controllers.${this.props.name}`, + !this.areAllActionsSelected() + ); + }; - isAllActionsSelected = () => !some(this.props.actions, ['enabled', false]); + hasSomeActionsSelected = () => { + const { actions } = this.props; + + return Object.keys(actions).some( + action => actions[action].enabled === true + ); + }; + + areAllActionsSelected = () => { + const { actions } = this.props; + + return Object.keys(actions).every( + action => actions[action].enabled === true + ); + }; render() { + const labelId = this.areAllActionsSelected() ? 'unselectAll' : 'selectAll'; + return (
{this.props.name}
-
+
-
- {map(Object.keys(this.props.actions).sort(), (actionKey) => ( + {map(Object.keys(this.props.actions).sort(), actionKey => ( diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/styles.scss b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/styles.scss index 7fb325fc28..bab8e9a959 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/styles.scss +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/styles.scss @@ -11,6 +11,17 @@ } } +.someChecked { + &:after { + content: '\f068'; + position: absolute; + top: 0px; left: 3px; + font-size: 10px; + font-family: 'FontAwesome'; + font-weight: 100; + color: #1C5DE7; + } +} .controller { padding: 1px 43px 0 28px; @@ -67,3 +78,4 @@ margin-left: 15px; background-color: #F6F6F6; } + diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js index b7a524923f..cd9e0dd832 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/index.js @@ -1,8 +1,8 @@ /** -* -* Plugins -* -*/ + * + * Plugins + * + */ import React from 'react'; import { FormattedMessage } from 'react-intl'; @@ -17,7 +17,7 @@ import styles from './styles.scss'; class Plugins extends React.Component { state = { pluginSelected: '' }; - changePluginSelected = (name) => this.setState({ pluginSelected: name }); + changePluginSelected = name => this.setState({ pluginSelected: name }); render() { return ( @@ -31,8 +31,13 @@ class Plugins extends React.Component {
-
- {map(Object.keys(this.props.plugins).sort(), (plugin) => ( +
+ {map(Object.keys(this.props.plugins).sort(), plugin => (