test: Fix SonarQube duplicate lines

eea · Sep 22, 2023 · 94ce895 · 94ce895
1 parent d69bb97
commit 94ce895
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 24 deletions.
diff --git a/src/components/ToolbarAction.jsx b/src/components/ToolbarAction.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Icon } from 'semantic-ui-react';
+import { UniversalLink } from '@plone/volto/components';
+
+const ToolbarAction = (props) => {
+  const { item } = props;
+  const hasIcon = !item?.icon?.includes('no-icon');
+  const hasTitle = !item?.icon?.includes('no-title');
+  return (
+    <UniversalLink href={item.url} title={item.title}>
+      {hasIcon ? <Icon name={item.icon} alt={item.title} /> : ''}
+      {hasTitle ? <span>{item.title}</span> : ''}
+    </UniversalLink>
+  );
+};
+
+ToolbarAction.propTypes = {
+  item: PropTypes.shape({
+    url: PropTypes.string,
+    title: PropTypes.string,
+    icon: PropTypes.string,
+  }),
+};
+
+export default ToolbarAction;
diff --git a/src/components/ToolbarBottomActions.jsx b/src/components/ToolbarBottomActions.jsx
@@ -1,9 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
-import { Icon } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
 import { Plug } from '@plone/volto/components/manage/Pluggable';
+import { default as ToolbarAction } from './ToolbarAction';
 import './less/editor.less';
 
 const ToolbarBottomActions = (props) => {
@@ -21,16 +20,9 @@ const ToolbarBottomActions = (props) => {
         dependencies={actions}
       >
         <div className="toolbar-bottom-actions" id="toolbar-bottom-actions">
-          {actions.map((item) => {
-            const hasIcon = !item?.icon?.includes('no-icon');
-            const hasTitle = !item?.icon?.includes('no-title');
-            return (
-              <UniversalLink href={item.url} title={item.title}>
-                {hasIcon ? <Icon name={item.icon} alt={item.title} /> : ''}
-                {hasTitle ? <span>{item.title}</span> : ''}
-              </UniversalLink>
-            );
-          })}
+          {actions.map((item) => (
+            <ToolbarAction key={item.id} item={item} />
+          ))}
         </div>
       </Plug>
     </>

diff --git a/src/components/ToolbarTopActions.jsx b/src/components/ToolbarTopActions.jsx
@@ -1,9 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
-import { Icon } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
 import { Plug } from '@plone/volto/components/manage/Pluggable';
+import { default as ToolbarAction } from './ToolbarAction';
 import './less/editor.less';
 
 const ToolbarTopActions = (props) => {
@@ -21,16 +20,9 @@ const ToolbarTopActions = (props) => {
         dependencies={actions}
       >
         <div className="toolbar-top-actions" id="toolbar-top-actions">
-          {actions.map((item) => {
-            const hasIcon = !item?.icon?.includes('no-icon');
-            const hasTitle = !item?.icon?.includes('no-title');
-            return (
-              <UniversalLink href={item.url} title={item.title}>
-                {hasIcon ? <Icon name={item.icon} alt={item.title} /> : ''}
-                {hasTitle ? <span>{item.title}</span> : ''}
-              </UniversalLink>
-            );
-          })}
+          {actions.map((item) => (
+            <ToolbarAction key={item.id} item={item} />
+          ))}
         </div>
       </Plug>
     </>