diff --git a/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js b/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js index 9deb7bb99b..50e0c51f8f 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js @@ -12,10 +12,12 @@ import isEmpty from 'lodash/isEmpty'; import { getTrad } from '../../utils'; const StyledBullet = styled.div` + flex-shrink: 0; width: ${pxToRem(6)}; height: ${pxToRem(6)}; margin-right: ${({ theme }) => theme.spaces[2]}; - background: ${({ theme, isDraft }) => theme.colors[isDraft ? 'secondary700' : 'success200']}; + background-color: ${({ theme, isDraft }) => + theme.colors[isDraft ? 'secondary600' : 'success600']}; border-radius: 50%; cursor: pointer; `; diff --git a/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js b/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js index 3772d1a9a7..1bb621a9f1 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js @@ -5,7 +5,7 @@ import { Stack } from '@strapi/design-system/Stack'; import { Typography } from '@strapi/design-system/Typography'; import get from 'lodash/get'; import isNull from 'lodash/isNull'; -import Select from 'react-select'; +import { ReactSelect as Select } from '@strapi/helper-plugin'; import SingleValue from './SingleValue'; function SelectOne({ @@ -21,7 +21,6 @@ function SelectOne({ onMenuScrollToBottom, options, placeholder, - styles, value, description, }) { @@ -48,7 +47,6 @@ function SelectOne({ placeholder={formatMessage( placeholder || { id: 'global.select', defaultMessage: 'Select...' } )} - styles={styles} value={isNull(value) ? null : { label: get(value, [mainField.name], ''), value }} /> @@ -89,7 +87,6 @@ SelectOne.propTypes = { id: PropTypes.string.isRequired, defaultMessage: PropTypes.string.isRequired, }), - styles: PropTypes.object.isRequired, value: PropTypes.object, description: PropTypes.string, }; diff --git a/packages/core/admin/admin/src/content-manager/components/SelectWrapper/Option.js b/packages/core/admin/admin/src/content-manager/components/SelectWrapper/Option.js index e8c049c165..ea175ed839 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectWrapper/Option.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectWrapper/Option.js @@ -10,10 +10,12 @@ import { pxToRem } from '@strapi/helper-plugin'; import { getTrad } from '../../utils'; const StyledBullet = styled.div` + flex-shrink: 0; width: ${pxToRem(6)}; height: ${pxToRem(6)}; margin-right: ${({ theme }) => theme.spaces[2]}; - background: ${({ theme, isDraft }) => theme.colors[isDraft ? 'secondary600' : 'success600']}; + background-color: ${({ theme, isDraft }) => + theme.colors[isDraft ? 'secondary600' : 'success600']}; border-radius: 50%; cursor: pointer; `; @@ -22,29 +24,27 @@ const Option = props => { const { formatMessage } = useIntl(); const Component = components.Option; const hasDraftAndPublish = has(get(props, 'data.value'), 'publishedAt'); - const isDraft = isEmpty(get(props, 'data.value.publishedAt')); if (hasDraftAndPublish) { - if (hasDraftAndPublish) { - const draftMessage = { - id: getTrad('components.Select.draft-info-title'), - defaultMessage: 'State: Draft', - }; - const publishedMessage = { - id: getTrad('components.Select.publish-info-title'), - defaultMessage: 'State: Published', - }; - const title = isDraft ? formatMessage(draftMessage) : formatMessage(publishedMessage); + const isDraft = isEmpty(get(props, 'data.value.publishedAt')); + const draftMessage = { + id: getTrad('components.Select.draft-info-title'), + defaultMessage: 'State: Draft', + }; + const publishedMessage = { + id: getTrad('components.Select.publish-info-title'), + defaultMessage: 'State: Published', + }; + const title = isDraft ? formatMessage(draftMessage) : formatMessage(publishedMessage); - return ( - - - - {props.label || '-'} - - - ); - } + return ( + + + + {props.label || '-'} + + + ); } return {props.label || '-'}; diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index c6ce0c42da..1035cd798a 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -119,7 +119,6 @@ "react-refresh": "0.11.0", "react-router": "5.2.0", "react-router-dom": "5.2.0", - "react-select": "^4.0.2", "react-window": "1.8.7", "redux": "^4.0.1", "redux-saga": "^0.16.0", diff --git a/packages/plugins/graphql/server/bootstrap.js b/packages/plugins/graphql/server/bootstrap.js index 77e46b03b4..09776c8882 100644 --- a/packages/plugins/graphql/server/bootstrap.js +++ b/packages/plugins/graphql/server/bootstrap.js @@ -110,6 +110,9 @@ module.exports = async ({ strapi }) => { }, }; + // allow graphql playground to load without authentication + if (ctx.request.method === 'GET') return next(); + return strapi.auth.authenticate(ctx, next); },