Merge pull request #1092 from culturecreates/develop

Develop
culturecreates · May 6, 2024 · d47c76b · d47c76b
2 parents 0f6066a + 714c7ff
commit d47c76b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/components/List/ListItem.jsx/ListItem.jsx b/src/components/List/ListItem.jsx/ListItem.jsx
@@ -31,12 +31,12 @@ function ListItem(props) {
     <List.Item
       data-cy="list-item-entity"
       className="event-list-item-wrapper"
+      onClick={listItemHandler}
       key={id}
       extra={actions}
       style={{ padding: '20px 0px', ...props?.styles?.style }}>
       <List.Item.Meta
         className="event-list-item-meta"
-        onClick={listItemHandler}
         data-cy="list-item-meta-entity"
         avatar={
           logo ? (
@@ -80,7 +80,10 @@ function ListItem(props) {
         title={
           artsDataLink && (
             <ArtsDataLink
-              onClick={() => window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}
+              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

diff --git a/src/pages/Dashboard/Organizations/Organizations.jsx b/src/pages/Dashboard/Organizations/Organizations.jsx
@@ -257,7 +257,10 @@ function Organizations() {
                             <DeleteOutlined
                               key={'delete-icon'}
                               style={{ color: '#222732', fontSize: '24px' }}
-                              onClick={() => deleteOrganizationHandler(item?.id)}
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                deleteOrganizationHandler(item?.id);
+                              }}
                               data-cy="delete-organization"
                             />
                           ),

diff --git a/src/pages/Dashboard/People/People.jsx b/src/pages/Dashboard/People/People.jsx
@@ -244,7 +244,10 @@ function People() {
                               data-cy="icon-delete-person"
                               key={'delete-icon'}
                               style={{ color: '#222732', fontSize: '24px' }}
-                              onClick={() => deletePersonHandler(item?.id)}
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                deletePersonHandler(item?.id);
+                              }}
                             />
                           ),
                         ]}

diff --git a/src/pages/Dashboard/Places/Places.jsx b/src/pages/Dashboard/Places/Places.jsx
@@ -248,7 +248,10 @@ function Places() {
                               data-cy="icon-delete-place"
                               key={'delete-icon'}
                               style={{ color: '#222732', fontSize: '24px' }}
-                              onClick={() => deletePlaceHandler(item?.id)}
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                deletePlaceHandler(item?.id);
+                              }}
                             />
                           ),
                         ]}