other: update getFieldURL

eea · May 26, 2023 · 0e6d945 · 0e6d945
1 parent 63eab51
commit 0e6d945
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Tags/Tags.jsx b/src/Tags/Tags.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import cx from 'classnames';
+import { Icon } from 'semantic-ui-react';
 import { UniversalLink } from '@plone/volto/components';
 import { getFieldURL } from '@eeacms/volto-tags-block/helpers';
-import { Icon } from 'semantic-ui-react';
 
 function TagList({ children, position }) {
   return <div className={cx('eea tags', position)}>{children}</div>;

diff --git a/src/TagsBlock/View.jsx b/src/TagsBlock/View.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import TagList from '@eeacms/volto-tags-block/Tags/Tags';
-import { getFieldURL } from '@eeacms/volto-tags-block/helpers';
 
 const View = ({ data, mode }) => {
   const { items = [], title, position, showTagIcon } = data;
@@ -16,7 +15,7 @@ const View = ({ data, mode }) => {
               <TagList.Tag
                 className={item.class}
                 color={item.color || 'teal'}
-                href={getFieldURL(item.href) || '#'}
+                href={item.href || '#'}
                 openLinkInNewTab={!!item.openLinkInNewTab}
                 showTagIcon={showTagIcon}
                 key={item.category}

diff --git a/src/helpers.js b/src/helpers.js
@@ -7,9 +7,9 @@ export const getFieldURL = (data) => {
   let url = data;
   const _isObject = data && isObject(data) && !isArray(data);
   if (_isObject && data['@type'] === 'URL') {
-    url = data['value'] || data['url'] || data['href'] || data;
+    url = data['value'] ?? data['url'] ?? data['href'] ?? data;
   } else if (_isObject) {
-    url = data['@id'] || data['url'] || data['href'] || data;
+    url = data['@id'] ?? data['url'] ?? data['href'] ?? data;
   }
   if (isArray(data)) {
     url = data.map((item) => getFieldURL(item));