Fix PR feedback

packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/ComponentInfos.js

@@ -6,7 +6,7 @@ import ComponentInfosWrapper from './ComponentInfosWrapper';
 const ComponentInfos = ({ category, name }) => {
   return (
     <ComponentInfosWrapper>
-      &nbsp; (<UpperFirst content={category} />) &nbsp;—&nbsp;
+      &nbsp; (<UpperFirst content={category} /> &nbsp;—&nbsp;
       <UpperFirst content={name} />)
     </ComponentInfosWrapper>
   );

packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/DropdownInfos.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { AttributeIcon } from '@buffetjs/core';
 import UpperFirst from '../UpperFirst';
+import Icon from './Icon';
 import Item from './Item';
 import Menu from './Menu';
 import Toggle from './Toggle';
@@ -12,11 +12,7 @@ const DropdownInfos = ({ headers, shouldDisplaySecondHeader }) => {
 
   const toggle = () => setDropdownOpen(prevState => !prevState);
   return (
-    <Wrapper
+    <Wrapper isOpen={dropdownOpen} toggle={toggle} style={{ margin: 'auto 0' }}>
-      isOpen={dropdownOpen}
-      toggle={toggle}
-      style={{ margin: 'auto 0px auto 0' }}
-    >
       <Toggle>...</Toggle>
       <Menu style={{ top: '8px' }}>
         {headers.map((header, index) => {
@@ -26,10 +22,7 @@ const DropdownInfos = ({ headers, shouldDisplaySecondHeader }) => {
 
           return (
             <Item key={index}>
-              <AttributeIcon
+              <Icon type={header.icon.name} />
-                type={header.icon.name}
-                style={{ margin: 'auto 20px auto 0' }}
-              />
               <span>
                 <UpperFirst content={header.label} />
               </span>

packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/Icon.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import { AttributeIcon } from '@buffetjs/core';
+import PropTypes from 'prop-types';
+
+const Icon = ({ type }) => (
+  <AttributeIcon type={type} style={{ margin: 'auto 20px auto 0' }} />
+);
+
+Icon.propTypes = {
+  type: PropTypes.string.isRequired,
+};
+
+export default Icon;

packages/strapi-plugin-content-type-builder/admin/src/components/ModalHeader/index.js

@@ -2,27 +2,24 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { HeaderModalTitle } from 'strapi-helper-plugin';
 import { get } from 'lodash';
-import { AttributeIcon } from '@buffetjs/core';
 import { FormattedMessage } from 'react-intl';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import ComponentIcon from './ComponentIcon';
 import ComponentInfos from './ComponentInfos';
+import Icon from './Icon';
 import IconWrapper from './IconWrapper';
 import UpperFirst from '../UpperFirst';
 import DropdownInfos from './DropdownInfos';
 
 const ModalHeader = ({ headerId, headers }) => {
-  const shouldDisplayDrodDrown = headers.length > 3;
+  const shouldDisplayDrodDown = headers.length > 3;
 
   return (
     <section>
       <HeaderModalTitle style={{ textTransform: 'none' }}>
         {headerId && (
           <>
-            <AttributeIcon
+            <Icon type={get(headers, [0, 'icon', 'name'], '')} />
-              type={get(headers, [0, 'icon', 'name'], '')}
-              style={{ margin: 'auto 20px auto 0' }}
-            />
             <FormattedMessage
               id={headerId}
               values={{ name: get(headers, [0, 'label'], '') }}
@@ -38,13 +35,10 @@ const ModalHeader = ({ headerId, headers }) => {
                 <FontAwesomeIcon icon={iconType} />
               </ComponentIcon>
             ) : (
-              <AttributeIcon
+              <Icon type={iconType} />
-                type={iconType}
-                style={{ margin: 'auto 20px auto 0' }}
-              />
             );
 
-            if (shouldDisplayDrodDrown && index === 1) {
+            if (shouldDisplayDrodDown && index === 1) {
               return (
                 <Fragment key={index}>
                   <IconWrapper>
@@ -58,7 +52,7 @@ const ModalHeader = ({ headerId, headers }) => {
               );
             }
 
-            if (shouldDisplayDrodDrown && index === 2 && headers.length > 4) {
+            if (shouldDisplayDrodDown && index === 2 && headers.length > 4) {
               return null;
             }
 

packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/reducer.js

@@ -175,9 +175,7 @@ const reducer = (state, action) => {
         )
         .updateIn(['modifiedData', 'components'], old => {
           const componentsSchema = newComponents.reduce((acc, current) => {
-            let newAcc = addComponentsToState(state, current, acc);
+            return addComponentsToState(state, current, acc);
-
-            return newAcc;
           }, old);
 
           return componentsSchema;

packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/tests/createHeadersArray.test.js

@@ -34,7 +34,7 @@ describe('FormModal | utils | createHeadersArray', () => {
     expect(createHeadersArray(data)).toEqual([]);
   });
 
-  it('should return an array containing an header object', () => {
+  it('should return an array containing a header object', () => {
     const data = {
       actionType: 'something',
       attributeName: null,

packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/tests/createHeadersObjectFromArray.test.js

@@ -1,7 +1,7 @@
 import createHeadersObjectFromArray from '../createHeadersObjectFromArray';
 
 describe('FormModal | utils | createHeadersArray', () => {
-  it('should return an headers object', () => {
+  it('should return a header object', () => {
     const data = [
       {
         label: 'test',