{msg}
{id && } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/DynamicZoneList/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/DynamicZoneList/index.js index 6a98fae993..33600536fb 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/DynamicZoneList/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/DynamicZoneList/index.js @@ -4,6 +4,7 @@ * */ +/* eslint-disable import/no-cycle */ import React, { useState } from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; @@ -28,7 +29,9 @@ function DynamicZoneList({ const [activeTab, setActiveTab] = useState('0'); const toggle = tab => { - if (activeTab !== tab) setActiveTab(tab); + if (activeTab !== tab) { + setActiveTab(tab); + } }; const handleClickAdd = () => { @@ -74,8 +77,8 @@ function DynamicZoneList({ {components.map((component, index) => { const props = { - customRowComponent: customRowComponent, - component: component, + customRowComponent, + component, }; return ( diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderNavLink/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderNavLink/Wrapper.js index f2081c976e..0d41e46f32 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderNavLink/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderNavLink/Wrapper.js @@ -11,6 +11,8 @@ const Wrapper = styled.div` z-index: 99; `; } + + return ''; }} `; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js index 2f69aaf644..652519a9ed 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js @@ -4,6 +4,7 @@ * */ +/* eslint-disable import/no-cycle */ import React from 'react'; import PropTypes from 'prop-types'; import { get } from 'lodash'; @@ -18,6 +19,8 @@ import ComponentList from '../ComponentList'; import { ListButton } from '../ListButton'; import Wrapper from './List'; +/* eslint-disable jsx-a11y/no-static-element-interactions */ + function List({ className, customRowComponent, @@ -149,6 +152,7 @@ function List({ ); }; + /* eslint-disable indent */ const addButtonProps = { icon: !isSub ? : false, color: 'primary', @@ -161,6 +165,7 @@ function List({ : null, onClick: onClickAddField, }; + /* eslint-enable indent */ if (!targetUid) { return null; @@ -219,10 +224,8 @@ function List({ })} - {isMain && isInDevelopmentMode && ( - - )} - {!isMain && } + {isMain && isInDevelopmentMode && } + {!isMain && } {isSub && ( @@ -236,7 +239,6 @@ function List({ } List.defaultProps = { - addField: () => {}, addComponentToDZ: () => {}, className: null, customRowComponent: null, diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/index.js index a872be065e..2e0ad30cbb 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/index.js @@ -4,6 +4,7 @@ import { ListHeaderButton } from '../ListButton'; import Title from './Title'; import Wrapper from './Wrapper'; +/* eslint-disable react/jsx-one-expression-per-line */ function ListHeader({ actions, title }) { return ( diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js index 9cbc6f2687..5ca247418e 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js @@ -5,9 +5,10 @@ */ import styled from 'styled-components'; - import { colors } from 'strapi-helper-plugin'; +/* eslint-disable indent */ + const Wrapper = styled.tr` background-color: transparent; p { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/index.js index c0057d0fb3..c9ab80cf2a 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/index.js @@ -289,7 +289,6 @@ ListRow.defaultProps = { isNestedInDZComponent: false, nature: null, onClick: () => {}, - onClickDelete: () => {}, plugin: null, repeatable: false, secondLoopComponentName: null, diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/ComponentInfos.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/ComponentInfos.js index 6f6cf23877..dce8577417 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/ComponentInfos.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/ComponentInfos.js @@ -3,6 +3,8 @@ import PropTypes from 'prop-types'; import UpperFirst from '../UpperFirst'; import ComponentInfosWrapper from './ComponentInfosWrapper'; +/* eslint-disable react/jsx-one-expression-per-line */ + const ComponentInfos = ({ category, name }) => { return ( diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/DropdownInfos.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/DropdownInfos.js index e6af105937..6fefef4676 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/DropdownInfos.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/DropdownInfos.js @@ -7,6 +7,8 @@ import Menu from './Menu'; import Toggle from './Toggle'; import Wrapper from './Wrapper'; +/* eslint-disable react/no-array-index-key */ + const DropdownInfos = ({ headers, shouldDisplaySecondHeader }) => { const [dropdownOpen, setDropdownOpen] = useState(false); diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/index.js index 9c7ebd08b5..d34ff04624 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/index.js @@ -11,6 +11,8 @@ import Icon from './Icon'; import IconWrapper from './IconWrapper'; import DropdownInfos from './DropdownInfos'; +/* eslint-disable react/no-array-index-key */ + const ModalHeader = ({ headerId, headers }) => { const shouldDisplayDropDown = headers.length > 3; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationFormNaturePicker/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationFormNaturePicker/index.js index 5c8cfe0185..f2e74babfc 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationFormNaturePicker/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationFormNaturePicker/index.js @@ -30,17 +30,17 @@ const RelationFormNaturePicker = ({ target, }) => { const { contentTypes } = useDataManager(); + const ctRelations = [ + 'oneWay', + 'oneToOne', + 'oneToMany', + 'manyToOne', + 'manyToMany', + 'manyWay', + ]; + const componentRelations = ['oneWay', 'manyWay']; const relationsType = - naturePickerType === 'contentType' - ? [ - 'oneWay', - 'oneToOne', - 'oneToMany', - 'manyToOne', - 'manyToMany', - 'manyWay', - ] - : ['oneWay', 'manyWay']; + naturePickerType === 'contentType' ? ctRelations : componentRelations; const areDisplayedNamesInverted = nature === 'manyToOne'; const targetLabel = get(contentTypes, [target, 'schema', 'name'], 'unknown'); @@ -88,7 +88,8 @@ const RelationFormNaturePicker = ({ {truncate(leftDisplayedValue, { length: 24 })} - + + {truncate(rightDisplayedValue, { length: 24 })} diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/StyledRelationNaturePicker.js b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/StyledRelationNaturePicker.js deleted file mode 100644 index b0d431854e..0000000000 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/StyledRelationNaturePicker.js +++ /dev/null @@ -1,53 +0,0 @@ -import styled from 'styled-components'; - -import { colors } from 'strapi-helper-plugin'; - -const StyledRelationNaturePicker = styled.div` - position: relative; - width: 100%; - .nature-container { - position: absolute; - bottom: 0; - left: 0; - width: 100%; - height: fit-content; - &::before { - content: ''; - position: absolute; - top: 2.2rem; - height: 1px; - width: 100%; - background-color: ${colors.relations.border}; - z-index: 0; - } - .nature-buttons { - position: relative; - width: fit-content; - display: block; - margin: 0 auto; - z-index: 1; - } - .nature-txt { - padding: 0 1rem; - font-size: 1.3rem; - text-align: center; - margin-top: 6px; - margin-bottom: 2px; - span { - &:first-of-type, - &:nth-of-type(3) { - text-transform: capitalize; - } - &:nth-of-type(2) { - color: ${colors.relations.border}; - } - } - } - img { - margin: 0 1.5rem; - cursor: pointer; - } - } -`; - -export default StyledRelationNaturePicker; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/index.js deleted file mode 100644 index 1507e363f3..0000000000 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/index.js +++ /dev/null @@ -1,78 +0,0 @@ -import React, { memo } from 'react'; -import PropTypes from 'prop-types'; -import { truncate } from 'lodash'; -import { FormattedMessage } from 'react-intl'; -import pluralize from 'pluralize'; - -import pluginId from '../../pluginId'; - -import oneWay from '../../assets/images/one_way.svg'; -import oneWaySelected from '../../assets/images/one_way_selected.svg'; -import manyWay from '../../assets/images/many_way.svg'; -import manyWaySelected from '../../assets/images/many_way_selected.svg'; - -import StyledRelationNaturePicker from './StyledRelationNaturePicker'; - -const assets = { - oneWay: { - icon: oneWay, - iconSelected: oneWaySelected, - }, - manyWay: { - icon: manyWay, - iconSelected: manyWaySelected, - }, -}; - -const RelationNaturePicker = ({ featureName, onClick, nature, target }) => { - const { leftName, rightName } = { - leftName: featureName, - rightName: pluralize(target, ['manyWay'].includes(nature) ? 2 : 1), - }; - - return ( - - - - {Object.keys(assets).map(iconName => { - const src = - iconName === nature - ? assets[iconName].iconSelected - : assets[iconName].icon; - return ( - onClick(iconName, featureName)} - src={src} - alt={iconName} - /> - ); - })} - - - {truncate(leftName, { length: 24 })} - - - {truncate(rightName, { length: 24 })} - - - - ); -}; - -RelationNaturePicker.defaultProps = { - featureName: '', - nature: 'oneWay', - onClick: () => {}, - target: '', -}; - -RelationNaturePicker.propTypes = { - featureName: PropTypes.string, - nature: PropTypes.string, - onClick: PropTypes.func, - target: PropTypes.string, -}; - -export default memo(RelationNaturePicker); -export { RelationNaturePicker }; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/tests/index.test.js b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/tests/index.test.js deleted file mode 100644 index 1d2ecb039a..0000000000 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationNaturePicker/tests/index.test.js +++ /dev/null @@ -1,66 +0,0 @@ -import React from 'react'; - -import { shallow } from 'enzyme'; - -import { RelationNaturePicker } from '../index'; - -describe('', () => { - it('should not crash', () => { - shallow(); - }); - - it('should use the defaultProps', () => { - const { - defaultProps: { onClick }, - } = RelationNaturePicker; - - expect(onClick).toBeDefined(); - expect(onClick()).toBe(undefined); - }); - - it('should pass the correct data', () => { - const props = { - featureName: 'test', - onClick: jest.fn(), - }; - - const wrapper = shallow(); - const img = wrapper.find('img').at(0); - - img.simulate('click'); - - expect(props.onClick).toHaveBeenCalledWith('oneWay', 'test'); - }); - - it('should handle the hint correctly for the oneWay', () => { - const props = { - featureName: 'test', - nature: 'oneWay', - target: 'othertest', - }; - - const wrapper = shallow(); - - const span = wrapper.find('span').at(0); - const span1 = wrapper.find('span').at(1); - - expect(span.text()).toBe('test'); - expect(span1.text()).toBe('othertest'); - }); - - it('should handle the hint correctly for the ', () => { - const props = { - featureName: 'test', - nature: 'manyWay', - target: 'othertest', - }; - - const wrapper = shallow(); - - const span = wrapper.find('span').at(0); - const span1 = wrapper.find('span').at(1); - - expect(span.text()).toBe('test'); - expect(span1.text()).toBe('othertests'); - }); -}); diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js index 6f95335811..3e8d179cfd 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js @@ -1,4 +1,5 @@ import styled from 'styled-components'; +/* eslint-disable indent */ const Td = styled.td` &::before { @@ -9,6 +10,7 @@ const Td = styled.td` top: -7px; left: 45px; color: transparent; + ${({ isFromDynamicZone, isChildOfDynamicZone }) => { if (isChildOfDynamicZone) { return ` @@ -19,12 +21,12 @@ const Td = styled.td` if (isFromDynamicZone) { return ` - background-color: #AED4FB !important; + background-color: #AED4FB !important; `; } return ` - background-color: #f3f4f4 !important; + background-color: #f3f4f4 !important; `; }} diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js index 1e245126a4..87f63e2da7 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js @@ -112,7 +112,7 @@ const DataManagerProvider = ({ allIcons, children }) => { useEffect(() => { // We need to set the modifiedData after the data has been retrieved - //and also on pathname change + // and also on pathname change if (!isLoading) { setModifiedData(); } @@ -216,7 +216,7 @@ const DataManagerProvider = ({ allIcons, children }) => { const requestURL = `/${pluginId}/component-categories/${categoryUid}`; const userConfirm = window.confirm( formatMessage({ - id: getTrad(`popUpWarning.bodyMessage.category.delete`), + id: getTrad('popUpWarning.bodyMessage.category.delete'), }) ); // Close the modal diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js index 3daf815e4d..a32a2fdeaa 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js @@ -41,6 +41,9 @@ import init from './init'; import reducer, { initialState } from './reducer'; import CustomButton from './CustomButton'; +/* eslint-disable indent */ +/* eslint-disable react/no-array-index-key */ + const FormModal = () => { const [state, setState] = useState(INITIAL_STATE_DATA); const [reducerState, dispatch] = useReducer(reducer, initialState, init); @@ -403,6 +406,8 @@ const FormModal = () => { } else { // The user is either in the addComponentToDynamicZone modal or // in step 1 of the add component (modalType=attribute&attributeType=component) but not creating a component + + // eslint-disable-next-line no-lonely-if if (isInFirstComponentStep && isCreatingComponentFromAView) { schema = forms.component.schema( Object.keys(components), @@ -511,6 +516,7 @@ const FormModal = () => { name === 'createComponent' || name === 'repeatable') ) { + // eslint-disable-next-line no-unneeded-ternary val = value === 'false' ? false : true; // The boolean default accepts 3 different values @@ -713,7 +719,8 @@ const FormModal = () => { return; // Adding an existing component - } else { + } + // eslint-disable-next-line no-lonely-if if (isInFirstComponentStep) { // Navigate the user to step 2 const nextSearchObj = { @@ -748,7 +755,7 @@ const FormModal = () => { // Here we are in step 2 // The step 2 is also use to edit an attribute that is a component - } else { + } addAttribute( modifiedData, state.forTarget, @@ -776,8 +783,8 @@ const FormModal = () => { push({ search: makeSearch(nextSearch, shouldContinue) }); // We don't need to end the loop here we want the reducer to be reinitialised - } - } + + // Logic for creating a component without clicking on the link in // the left menu // We need to separate the logic otherwise the component would be created @@ -818,7 +825,7 @@ const FormModal = () => { return; // Step 2 of creating a component (which is setting the attribute name in the parent's schema) - } else { + } // We are destructuring because the modifiedData object doesn't have the appropriate format to create a field const { category, type, ...rest } = componentToCreate; // Create a the component temp UID @@ -870,7 +877,7 @@ const FormModal = () => { ), }); return; - } + // The modal is addComponentToDynamicZone } else { // The modal is addComponentToDynamicZone @@ -980,8 +987,6 @@ const FormModal = () => { if (state.forTarget === 'contentType') { emitEvent('didSelectContentTypeFieldSettings'); - - return; } }; @@ -1001,7 +1006,7 @@ const FormModal = () => { ((state.attributeType === 'component' || state.modalType === 'addComponentToDynamicZone') && get(modifiedData, ['createComponent'], null) === false) || - state.modalType == 'editCategory' + state.modalType === 'editCategory' ); }; @@ -1159,22 +1164,16 @@ const FormModal = () => { // The spacer type is used mainly to align the icon picker... if (input.type === 'spacer') { - return ( - - ); + return ; } // The spacer type is used mainly to align the icon picker... if (input.type === 'spacer-small') { - return ( - - ); + return ; } if (input.type === 'spacer-medium') { - return ( - - ); + return ; } // This type is used in the addComponentToDynamicZone modal when selecting the option add an existing component diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js index 95bd0cb814..cfcf3a2bf9 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js @@ -15,6 +15,9 @@ import { } from './attributesRegexes'; import RESERVED_NAMES from './reservedNames'; +/* eslint-disable indent */ +/* eslint-disable prefer-arrow-callback */ + yup.addMethod(yup.mixed, 'defined', function() { return this.test( 'defined', @@ -173,9 +176,8 @@ const forms = { .when('max', (max, schema) => { if (max) { return schema.max(max, getTrad('error.validation.minSupMax')); - } else { - return schema; } + return schema; }) .nullable(); }), @@ -194,9 +196,8 @@ const forms = { maxLength, getTrad('error.validation.minSupMax') ); - } else { - return schema; } + return schema; }) .nullable(), }; @@ -257,9 +258,8 @@ const forms = { getTrad('error.validation.minSupMax'), max ); - } else { - return schema; } + return schema; }), max: yup @@ -370,13 +370,12 @@ const forms = { return { items: componentForm.advanced('componentToCreate.'), }; - } else { + } const requiredItem = [[fields.required]]; return { items: data.repeatable ? [...dynamiczoneItems] : requiredItem, }; - } } const items = defaultItems.slice(); @@ -427,7 +426,7 @@ const forms = { options: [ {msg => {msg}} , @@ -575,17 +574,17 @@ const forms = { options: [ { headerId: getTrad( - `form.attribute.component.option.repeatable` + 'form.attribute.component.option.repeatable' ), descriptionId: getTrad( - `form.attribute.component.option.repeatable.description` + 'form.attribute.component.option.repeatable.description' ), value: true, }, { - headerId: getTrad(`form.attribute.component.option.single`), + headerId: getTrad('form.attribute.component.option.single'), descriptionId: getTrad( - `form.attribute.component.option.single.description` + 'form.attribute.component.option.single.description' ), value: false, }, diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/relations.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/relations.js index dd249ac176..a31dc74ffd 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/relations.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/relations.js @@ -1,3 +1,5 @@ +/* eslint-disable no-confusing-arrow */ + const shouldPluralizeName = nature => ['manyToMany', 'oneToMany', 'manyWay'].includes(nature) ? 2 : 1; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticFields.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticFields.js index d9cf928c2a..e6a9f18dad 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticFields.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/staticFields.js @@ -10,16 +10,16 @@ const fields = { size: 12, options: [ { - headerId: getTrad(`form.attribute.component.option.create`), + headerId: getTrad('form.attribute.component.option.create'), descriptionId: getTrad( - `form.attribute.component.option.create.description` + 'form.attribute.component.option.create.description' ), value: true, }, { - headerId: getTrad(`form.attribute.component.option.reuse-existing`), + headerId: getTrad('form.attribute.component.option.reuse-existing'), descriptionId: getTrad( - `form.attribute.component.option.reuse-existing.description` + 'form.attribute.component.option.reuse-existing.description' ), value: false, }, @@ -43,7 +43,7 @@ const fields = { name: 'max', type: 'customCheckboxWithChildren', label: { - id: getTrad(`form.attribute.item.maximum`), + id: getTrad('form.attribute.item.maximum'), }, validations: {}, }, @@ -52,7 +52,7 @@ const fields = { name: 'min', type: 'customCheckboxWithChildren', label: { - id: getTrad(`form.attribute.item.minimum`), + id: getTrad('form.attribute.item.minimum'), }, validations: {}, }, diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/LeftMenu/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/LeftMenu/index.js index 9a8bcc4016..3d236db5a4 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/LeftMenu/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/LeftMenu/index.js @@ -16,6 +16,8 @@ import useDataManager from '../../hooks/useDataManager'; import makeSearch from '../../utils/makeSearch'; import Wrapper from './Wrapper'; +/* eslint-disable indent */ + const displayNotificationCTNotSaved = () => { strapi.notification.info(`${pluginId}.notification.info.creating.notSaved`); }; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js index 1c6072d54d..fff8bc7ece 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js @@ -24,6 +24,8 @@ import ListHeader from '../../components/ListHeader'; import LeftMenu from '../LeftMenu'; import Wrapper from './Wrapper'; +/* eslint-disable indent */ + const ListView = () => { const { initialData, @@ -165,11 +167,12 @@ const ListView = () => { null ); - return description - ? description - : formatMessage({ - id: `${pluginId}.modelPage.contentHeader.emptyDescription.description`, - }); + return ( + description || + formatMessage({ + id: `${pluginId}.modelPage.contentHeader.emptyDescription.description`, + }) + ); }; const wait = async () => { @@ -191,7 +194,7 @@ const ListView = () => { id: `${pluginId}.form.button.cancel`, }), type: 'button', - disabled: isEqual(modifiedData, initialData) ? true : false, + disabled: isEqual(modifiedData, initialData), }, { className: 'button-submit', @@ -201,7 +204,7 @@ const ListView = () => { id: `${pluginId}.form.button.save`, }), type: 'submit', - disabled: isEqual(modifiedData, initialData) ? true : false, + disabled: isEqual(modifiedData, initialData), }, ] : [], @@ -335,7 +338,7 @@ const ListView = () => { mainTypeName={currentDataName} editTarget={forTarget} isMain - > + /> diff --git a/packages/strapi-plugin-content-type-builder/admin/src/icons/ManyToMany.js b/packages/strapi-plugin-content-type-builder/admin/src/icons/ManyToMany.js index aaa8c16326..054bca697e 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/icons/ManyToMany.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/icons/ManyToMany.js @@ -3,14 +3,16 @@ import PropTypes from 'prop-types'; const ManyToMany = ({ isSelected, ...rest }) => { const stroke = isSelected ? '#1C5DE7' : '#919BAE'; - const rectProps = isSelected - ? { - stroke: '#1C5DE7', - } - : { - strokeOpacity: '.1', - stroke: '#101622', - }; + let rectProps = { + strokeOpacity: '.1', + stroke: '#101622', + }; + + if (isSelected) { + rectProps = { + stroke: '#1C5DE7', + }; + } return ( { const stroke = isSelected ? '#1C5DE7' : '#919BAE'; - const rectProps = isSelected - ? { - stroke: '#1C5DE7', - } - : { - strokeOpacity: '.1', - stroke: '#101622', - }; + let rectProps = { + strokeOpacity: '.1', + stroke: '#101622', + }; + + if (isSelected) { + rectProps = { + stroke: '#1C5DE7', + }; + } return ( { const stroke = isSelected ? '#1C5DE7' : '#919BAE'; - const rectProps = isSelected - ? { - stroke: '#1C5DE7', - } - : { - strokeOpacity: '.1', - stroke: '#1C5DE7', - }; + let rectProps = { + strokeOpacity: '.1', + stroke: '#1C5DE7', + }; + + if (isSelected) { + rectProps = { + stroke: '#1C5DE7', + }; + } return ( { const stroke = isSelected ? '#1C5DE7' : '#919BAE'; - const rectProps = isSelected - ? { - stroke: '#1C5DE7', - } - : { - strokeOpacity: '.1', - stroke: '#101622', - }; + let rectProps = { + strokeOpacity: '.1', + stroke: '#101622', + }; + + if (isSelected) { + rectProps = { + stroke: '#1C5DE7', + }; + } return ( { const stroke = isSelected ? '#1C5DE7' : '#919BAE'; - const rectProps = isSelected - ? { - stroke: '#1C5DE7', - } - : { - strokeOpacity: '.1', - stroke: '#101622', - }; + let rectProps = { + strokeOpacity: '.1', + stroke: '#101622', + }; + + if (isSelected) { + rectProps = { + stroke: '#1C5DE7', + }; + } + return ( diff --git a/packages/strapi-plugin-documentation/admin/src/containers/HomePage/index.js b/packages/strapi-plugin-documentation/admin/src/containers/HomePage/index.js index 531454f1dc..3a7b389261 100755 --- a/packages/strapi-plugin-documentation/admin/src/containers/HomePage/index.js +++ b/packages/strapi-plugin-documentation/admin/src/containers/HomePage/index.js @@ -43,8 +43,6 @@ import reducer from './reducer'; import saga from './saga'; export class HomePage extends React.Component { - static contextType = GlobalContext; - componentDidMount() { this.props.getDocInfos(); } @@ -134,6 +132,8 @@ export class HomePage extends React.Component { ); }; + static contextType = GlobalContext; + render() { const { docVersions, diff --git a/packages/strapi-plugin-documentation/admin/src/containers/HomePage/saga.js b/packages/strapi-plugin-documentation/admin/src/containers/HomePage/saga.js index 4181cfd078..9d199802d4 100755 --- a/packages/strapi-plugin-documentation/admin/src/containers/HomePage/saga.js +++ b/packages/strapi-plugin-documentation/admin/src/containers/HomePage/saga.js @@ -14,6 +14,8 @@ import { makeSelectForm, } from './selectors'; +/* eslint-disable consistent-return */ + function* getData() { try { const response = yield call(request, '/documentation/getInfos', { diff --git a/packages/strapi-plugin-documentation/admin/src/utils/openWithNewTab.js b/packages/strapi-plugin-documentation/admin/src/utils/openWithNewTab.js index 7f49b6b102..dfc8433225 100755 --- a/packages/strapi-plugin-documentation/admin/src/utils/openWithNewTab.js +++ b/packages/strapi-plugin-documentation/admin/src/utils/openWithNewTab.js @@ -1,14 +1,13 @@ import { startsWith } from 'lodash'; -const openWithNewTab = (path) => { +const openWithNewTab = path => { const url = (() => { if (startsWith(path, '/')) { return `${strapi.backendURL}${path}`; - } else if (startsWith(path, 'https') || startsWith(path, 'http')) { + } if (startsWith(path, 'https') || startsWith(path, 'http')) { return path; - } else { - return `${strapi.backendURL}/${path}`; } + return `${strapi.backendURL}/${path}`; })(); window.open(url, '_blank'); @@ -16,4 +15,4 @@ const openWithNewTab = (path) => { return window.focus(); }; -export default openWithNewTab; \ No newline at end of file +export default openWithNewTab; diff --git a/packages/strapi-plugin-email/admin/src/containers/ConfigPage/index.js b/packages/strapi-plugin-email/admin/src/containers/ConfigPage/index.js index b060abc74c..0ce4330bad 100644 --- a/packages/strapi-plugin-email/admin/src/containers/ConfigPage/index.js +++ b/packages/strapi-plugin-email/admin/src/containers/ConfigPage/index.js @@ -28,7 +28,22 @@ import saga from './saga'; import selectConfigPage from './selectors'; class ConfigPage extends React.Component { - static contextType = GlobalContext; + pluginHeaderActions = [ + { + color: 'cancel', + label: this.context.formatMessage({ id: 'app.components.Button.cancel' }), + onClick: this.props.onCancel, + type: 'button', + key: 'button-cancel', + }, + { + color: 'success', + label: this.context.formatMessage({ id: 'app.components.Button.save' }), + onClick: this.handleSubmit, + type: 'submit', + key: 'button-submit', + }, + ]; componentDidMount() { this.getSettings(this.props); @@ -107,22 +122,7 @@ class ConfigPage extends React.Component { return this.props.submit(); }; - pluginHeaderActions = [ - { - color: 'cancel', - label: this.context.formatMessage({ id: 'app.components.Button.cancel' }), - onClick: this.props.onCancel, - type: 'button', - key: 'button-cancel', - }, - { - color: 'success', - label: this.context.formatMessage({ id: 'app.components.Button.save' }), - onClick: this.handleSubmit, - type: 'submit', - key: 'button-submit', - }, - ]; + static contextType = GlobalContext; render() { const { formatMessage } = this.context;