Merge branch 'develop' of github.com:culturecreates/footlight-app int…

…o enhancement/issue-1471
culturecreates · Dec 10, 2024 · fadc3f6 · fadc3f6
2 parents c77dafa + 8096a89
commit fadc3f6
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 53 deletions.
diff --git a/src/components/ArtsDataInfo/ArtsDataInfo.jsx b/src/components/ArtsDataInfo/ArtsDataInfo.jsx
@@ -2,20 +2,20 @@ import React from 'react';
 import './artsDataInfo.css';
 import { Badge, Col, Row } from 'antd';
 import { LinkOutlined } from '@ant-design/icons';
+import Link from 'antd/lib/typography/Link';
 
 function ArtsDataInfo(props) {
   const { artsDataLink, name, disambiguatingDescription } = props;
   return (
     <Row className="arts-data-info" align={'middle'} justify={'space-between'}>
       <Col span={20}>
         <Row gutter={[8, 0]} align={'middle'}>
-          <Col
-            className="arts-data-title"
-            onClick={() => window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}
-            data-cy="col-artsdata-link">
-            <span style={{ textDecoration: 'underline' }} data-cy="span-artsdata-text">
-              Artsdata
-            </span>
+          <Col className="arts-data-title" data-cy="col-artsdata-link">
+            <Link href={artsDataLink} target="_blank" rel="noopener noreferrer" onClick={(e) => e.stopPropagation()}>
+              <span style={{ textDecoration: 'underline', color: '#0f0e98' }} data-cy="span-artsdata-text">
+                Artsdata
+              </span>
+            </Link>
           </Col>
           <Col className="arts-data-name">
             <span data-cy="span-artsdata-name">{name}</span>
@@ -34,12 +34,12 @@ function ArtsDataInfo(props) {
           )}
         </Row>
       </Col>
-      <Col
-        onClick={() => window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}
-        data-cy="artsdata-link-outlined-icon">
-        <span>
-          <LinkOutlined />
-        </span>
+      <Col data-cy="artsdata-link-outlined-icon">
+        <Link href={artsDataLink} target="_blank" rel="noopener noreferrer" onClick={(e) => e.stopPropagation()}>
+          <span>
+            <LinkOutlined style={{ color: '#0f0e98' }} />
+          </span>
+        </Link>
       </Col>
     </Row>
   );

diff --git a/src/components/Card/Common/EntityCard.jsx b/src/components/Card/Common/EntityCard.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import './entityCard.css';
 import ArtsDataLink from '../../Tags/ArtsDataLink/ArtsDataLink';
 import { LinkOutlined } from '@ant-design/icons';
+import Link from 'antd/lib/typography/Link';
 
 const EntityCard = (props) => {
   const { title, description, artsDataLink, Logo, linkText, onClick } = props;
@@ -20,16 +21,15 @@ const EntityCard = (props) => {
       </div>
       <div className="link-container">
         {artsDataLink && (
-          <ArtsDataLink
-            onClick={(e) => {
-              e.stopPropagation();
-              window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer');
-            }}
-            data-cy="tag-entity-artsdata">
-            <span style={{ textDecoration: 'underline' }} data-cy="span-artsdata-link">
-              {linkText}
-            </span>
-            <LinkOutlined />
+          <ArtsDataLink data-cy="tag-entity-artsdata">
+            <Link href={artsDataLink} target="_blank" rel="noopener noreferrer" onClick={(e) => e.stopPropagation()}>
+              <div style={{ display: 'flex', gap: '7px' }}>
+                <span style={{ textDecoration: 'underline', color: '#0f0e98' }} data-cy="span-artsdata-link">
+                  {linkText}
+                </span>
+                <LinkOutlined style={{ display: 'grid', placeContent: 'center', color: '#0f0e98' }} />
+              </div>
+            </Link>
           </ArtsDataLink>
         )}
       </div>

diff --git a/src/components/List/Events/List.jsx b/src/components/List/Events/List.jsx
@@ -21,6 +21,7 @@ import moment from 'moment-timezone';
 import { LinkOutlined, StarFilled } from '@ant-design/icons';
 import { sameAsTypes } from '../../../constants/sameAsTypes';
 import { getWidthFromAspectRatio } from '../../../utils/getWidthFromAspectRatio';
+import Link from 'antd/lib/typography/Link';
 
 const { useBreakpoint } = Grid;
 
@@ -292,16 +293,14 @@ function Lists(props) {
                 <div className="event-status-list-item-title-container">
                   <EventStatus label={eventItem?.publishState} />
                   {artsDataLinkChecker(eventItem)?.length > 0 && (
-                    <div
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        window.open(`${artsDataLinkChecker(eventItem)[0]?.uri}`, '_blank', 'noopener,noreferrer');
-                      }}
-                      className="artsdata-link-outlined-icon"
-                      data-cy="artsdata-link-outlined-icon">
-                      <span>
+                    <div className="artsdata-link-outlined-icon" data-cy="artsdata-link-outlined-icon">
+                      <Link
+                        href={artsDataLinkChecker(eventItem)[0]?.uri}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        onClick={(e) => e.stopPropagation()}>
                         <LinkOutlined style={{ fontSize: '14px' }} />
-                      </span>
+                      </Link>
                     </div>
                   )}
                 </div>

diff --git a/src/components/List/Events/list.css b/src/components/List/Events/list.css
@@ -92,9 +92,10 @@
   place-content: center;
 }
 
-.event-list-wrapper .event-status-list-item-title-container .artsdata-link-outlined-icon > span {
+.event-list-wrapper .event-status-list-item-title-container .artsdata-link-outlined-icon span {
   display: grid;
   place-content: center;
+  color: #0f0e98;
 }
 
 .event-list-wrapper .event-list-item-meta .image-featured-badge {

diff --git a/src/components/List/ListItem.jsx/ListItem.jsx b/src/components/List/ListItem.jsx/ListItem.jsx
@@ -7,6 +7,7 @@ import moment from 'moment-timezone';
 import i18n from 'i18next';
 import Username from '../../Username/Username';
 import ArtsDataLink from '../../Tags/ArtsDataLink/ArtsDataLink';
+import Link from 'antd/lib/typography/Link';
 
 function ListItem(props) {
   const {
@@ -79,16 +80,15 @@ function ListItem(props) {
         className="event-status-list-item"
         title={
           artsDataLink && (
-            <ArtsDataLink
-              onClick={(e) => {
-                e.stopPropagation();
-                window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer');
-              }}
-              data-cy="tag-entity-artsdata">
-              <span style={{ textDecoration: 'underline' }} data-cy="span-entity-artsdata">
-                Artsdata
-              </span>
-              <LinkOutlined />
+            <ArtsDataLink data-cy="tag-entity-artsdata">
+              <Link href={artsDataLink} target="_blank" rel="noopener noreferrer" onClick={(e) => e.stopPropagation()}>
+                <div style={{ display: 'flex', gap: '7px' }}>
+                  <span style={{ textDecoration: 'underline', color: '#0f0e98' }} data-cy="span-entity-artsdata">
+                    Artsdata
+                  </span>
+                  <LinkOutlined style={{ display: 'grid', placeContent: 'center', color: '#0f0e98' }} />
+                </div>
+              </Link>
             </ArtsDataLink>
           )
         }

diff --git a/src/components/List/SelectionItem/SelectionItem.jsx b/src/components/List/SelectionItem/SelectionItem.jsx
@@ -15,6 +15,7 @@ import { isDataValid } from '../../../utils/MultiLingualFormItemSupportFunctions
 import { taxonomyClass } from '../../../constants/taxonomyClass.js';
 import { PathName } from '../../../constants/pathName.js';
 import { useNavigate, useParams } from 'react-router-dom';
+import Link from 'antd/lib/typography/Link.js';
 function SelectionItem(props) {
   const {
     icon,
@@ -92,14 +93,13 @@ function SelectionItem(props) {
         data-cy="list-item"
         actions={[
           showExternalSourceLink && artsDataLink && (
-            <ArtsDataLink
-              onClick={(e) => {
-                e.stopPropagation();
-                window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer');
-              }}
-              data-cy="artsdata-link-tag">
-              <span style={{ textDecoration: 'underline' }}>Artsdata</span>
-              <LinkOutlined />
+            <ArtsDataLink data-cy="artsdata-link-tag">
+              <Link href={artsDataLink} target="_blank" rel="noopener noreferrer" onClick={(e) => e.stopPropagation()}>
+                <div style={{ display: 'flex', gap: '7px', color: '#0f0e98' }}>
+                  <span style={{ textDecoration: 'underline' }}>Artsdata</span>
+                  <LinkOutlined style={{ display: 'grid', placeContent: 'center', color: '#0f0e98' }} />
+                </div>
+              </Link>
             </ArtsDataLink>
           ),
           edit && (

diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json
@@ -1174,7 +1174,7 @@
           "editBtn": "Save",
           "conceptName": "Name",
           "placeHolder": "Enter {{language}} name",
-          "deleteConceptMessage": "Are you sure you want to permanently delete this concept? This action will also delete it everywhere it was used, including in events.",
+          "deleteConceptMessage": "Are you sure that you want to permanently delete this concept? This action will also delete subconcepts and everywhere the concepts are used, including in events.",
           "deleteConceptHeading": "Delete concept",
           "delete": "Delete"
         }

diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
@@ -1174,7 +1174,7 @@
           "conceptName": "Nom",
           "placeHolder": "Indiquer un nom en {{language}}",
           "deleteConceptHeading": "Supprimer le concept",
-          "deleteConceptMessage": "Êtes-vous sûr de vouloir supprimer définitivement ce concept ? Cette action le supprimera également partout où il a été utilisé, y compris dans les événements.",
+          "deleteConceptMessage": "Êtes-vous sûr de vouloir supprimer définitivement ce concept ? Cette action supprimera aussi ses sous-concepts et partout où ils ont été utilisé, y compris dans les événements.",
           "delete": "Supprimer"
         }
       }