diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/Option.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Option.js similarity index 82% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/Option.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/Option.js index ac481fcca9..80f1b04519 100644 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/components/Option.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Option.js @@ -3,10 +3,12 @@ import styled from 'styled-components'; import { components } from 'react-select'; import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; + +import { pxToRem } from '@strapi/helper-plugin'; import { Flex } from '@strapi/design-system/Flex'; import { Typography } from '@strapi/design-system/Typography'; -import pxToRem from '../../../utils/pxToRem'; +import { getTrad } from '../../../utils'; const StyledBullet = styled.div` flex-shrink: 0; @@ -25,14 +27,12 @@ export const Option = (props) => { if (publicationState) { const isDraft = publicationState === 'draft'; - // To fix: use getTrad utils from CM once component is migrated into CM components const draftMessage = { - id: 'content-manager.components.Select.draft-info-title', + id: getTrad('components.Select.draft-info-title'), defaultMessage: 'State: Draft', }; - // To fix: use getTrad utils from CM once component is migrated into CM components const publishedMessage = { - id: 'content-manager.components.Select.publish-info-title', + id: getTrad('components.Select.publish-info-title'), defaultMessage: 'State: Published', }; const title = isDraft ? formatMessage(draftMessage) : formatMessage(publishedMessage); diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/Relation.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Relation.js similarity index 100% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/Relation.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/Relation.js diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/RelationItem.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js similarity index 100% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/RelationItem.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/RelationList.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationList.js similarity index 100% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/RelationList.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationList.js diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/Option.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/Option.test.js similarity index 91% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/Option.test.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/Option.test.js index 301c9437cd..ae08f8cc72 100644 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/Option.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/Option.test.js @@ -1,9 +1,10 @@ import React from 'react'; import { render, screen, fireEvent, act } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; + +import { ReactSelect } from '@strapi/helper-plugin'; import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import ReactSelect from '../../../ReactSelect'; import { Option } from '../Option'; const setup = (props) => @@ -15,7 +16,7 @@ const setup = (props) => ); -describe('RelationInput || Option', () => { +describe('Content-Manager || RelationInput || Option', () => { it('should render custom Option with published state title', () => { setup({ options: [{ mainField: 'relation 1', publicationState: 'published' }] }); diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/RelationItem.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationItem.test.js similarity index 91% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/RelationItem.test.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationItem.test.js index 06410f0d24..14cbd1d7a3 100644 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/RelationItem.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationItem.test.js @@ -11,7 +11,7 @@ const setup = ({ endAction }) => ); -describe('RelationItem', () => { +describe('Content-Manager || RelationInput || RelationItem', () => { it('should render and match snapshot', () => { const { container } = setup({}); diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/RelationList.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationList.test.js similarity index 89% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/RelationList.test.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationList.test.js index 98a917bbcd..3cc1030ea4 100644 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/RelationList.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationList.test.js @@ -14,7 +14,7 @@ const setup = ({ endAction }) => ); -describe('RelationList', () => { +describe('Content-Manager || RelationInput || RelationList', () => { it('should render and match snapshot', () => { const { container } = setup({}); diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap similarity index 93% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap index 0495ba52ca..6fc97a7b25 100644 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationItem.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RelationItem should render and match snapshot 1`] = ` +exports[`Content-Manager || RelationInput || RelationItem should render and match snapshot 1`] = ` .c3 { border: 0; -webkit-clip: rect(0 0 0 0); diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap similarity index 95% rename from packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap rename to packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap index dbc5293321..13c6d436f1 100644 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/__snapshots__/RelationList.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RelationList should render and match snapshot 1`] = ` +exports[`Content-Manager || RelationInput || RelationList should render and match snapshot 1`] = ` .c6 { border: 0; -webkit-clip: rect(0 0 0 0); diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/RelationInput.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/index.js similarity index 98% rename from packages/core/helper-plugin/lib/src/components/RelationInput/RelationInput.js rename to packages/core/admin/admin/src/content-manager/components/RelationInput/index.js index 7d8dc2f763..60b200aebf 100644 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/RelationInput.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/index.js @@ -2,6 +2,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import styled from 'styled-components'; +import { ReactSelect } from '@strapi/helper-plugin'; import { Badge } from '@strapi/design-system/Badge'; import { Box } from '@strapi/design-system/Box'; import { BaseLink } from '@strapi/design-system/BaseLink'; @@ -19,15 +20,13 @@ import { RelationItem } from './components/RelationItem'; import { RelationList } from './components/RelationList'; import { Option } from './components/Option'; -import ReactSelect from '../ReactSelect'; - const RelationItemCenterChildren = styled(RelationItem)` div { justify-content: center; } `; -export const RelationInput = ({ +const RelationInput = ({ description, disabled, error, @@ -212,3 +211,5 @@ RelationInput.propTypes = { searchResults: ReactQuerySearchResult, relations: ReactQueryRelationResult, }; + +export default RelationInput; diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/RelationInput.stories.mdx b/packages/core/helper-plugin/lib/src/components/RelationInput/RelationInput.stories.mdx deleted file mode 100644 index 5c01226292..0000000000 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/RelationInput.stories.mdx +++ /dev/null @@ -1,105 +0,0 @@ - - -import { Meta, ArgsTable, Canvas, Story } from '@storybook/addon-docs'; -import { BaseLink } from '@strapi/design-system/BaseLink'; -import { Badge } from '@strapi/design-system/Badge'; -import { Icon } from '@strapi/design-system/Icon'; -import { Box } from '@strapi/design-system/Box'; -import Cross from '@strapi/icons/Cross'; -import { RelationInput } from './RelationInput'; -import { relations } from './relationsDataMock'; - - - -# RelationInput - -WIP - -## Usage - - - - - - - - - -### Props - - diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/index.js b/packages/core/helper-plugin/lib/src/components/RelationInput/index.js deleted file mode 100644 index c97eb515a0..0000000000 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { RelationInput } from './RelationInput'; - -export default RelationInput; diff --git a/packages/core/helper-plugin/lib/src/components/RelationInput/relationsDataMock.js b/packages/core/helper-plugin/lib/src/components/RelationInput/relationsDataMock.js deleted file mode 100644 index ab5a5c6c9a..0000000000 --- a/packages/core/helper-plugin/lib/src/components/RelationInput/relationsDataMock.js +++ /dev/null @@ -1,42 +0,0 @@ -export const relations = [ - { - title: 'This is my first article relation', - status: 'published', - id: 1, - }, - { - title: 'This is my second article relation', - status: 'draft', - id: 2, - }, - { - title: 'This is my third article relation', - status: 'published', - id: 3, - }, - { - title: 'This is my fourth article relation', - status: 'published', - id: 4, - }, - { - title: 'This is my fifth article relation', - status: 'published', - id: 5, - }, - { - title: 'This is my sixth article relation', - status: 'draft', - id: 6, - }, - { - title: 'This is my seventh article relation', - status: 'published', - id: 7, - }, - { - title: 'This is my eighth article relation', - status: 'published', - id: 8, - }, -]; diff --git a/packages/core/helper-plugin/lib/src/index.js b/packages/core/helper-plugin/lib/src/index.js index 51eaebca94..875465e66d 100644 --- a/packages/core/helper-plugin/lib/src/index.js +++ b/packages/core/helper-plugin/lib/src/index.js @@ -68,7 +68,6 @@ export { default as ReactSelect } from './components/ReactSelect'; export { default as ReactSelectAsync } from './components/ReactSelect/Async'; export { default as Link } from './components/Link'; export { default as LinkButton } from './components/LinkButton'; -export { default as RelationInput } from './components/RelationInput'; // New icons export { default as SortIcon } from './icons/SortIcon';