From 11d013b07ee8523f9829386ef2bd7002eb802989 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero@yahoo.com>
Date: Wed, 28 Feb 2024 21:18:37 +0300
Subject: [PATCH] Remove escapeHTML

Co-authored-by: Bill Thornton <thornbill@users.noreply.github.com>
---
 src/components/cardbuilder/Card/CardHoverMenu.tsx      | 3 +--
 src/components/cardbuilder/Card/CardOverlayButtons.tsx | 3 +--
 src/components/cardbuilder/Card/CardText.tsx           | 3 +--
 src/components/cardbuilder/Card/cardHelper.ts          | 2 +-
 src/components/common/DefaultName.tsx                  | 3 +--
 src/components/listview/List/ListWrapper.tsx           | 3 +--
 src/components/listview/List/Lists.tsx                 | 3 +--
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/components/cardbuilder/Card/CardHoverMenu.tsx b/src/components/cardbuilder/Card/CardHoverMenu.tsx
index b4f56f7188..c09e2bad83 100644
--- a/src/components/cardbuilder/Card/CardHoverMenu.tsx
+++ b/src/components/cardbuilder/Card/CardHoverMenu.tsx
@@ -2,7 +2,6 @@ import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
 import ButtonGroup from '@mui/material/ButtonGroup';
 import classNames from 'classnames';
-import escapeHTML from 'escape-html';
 import { appRouter } from 'components/router/appRouter';
 import itemHelper from 'components/itemHelper';
 import { playbackManager } from 'components/playback/playbackmanager';
@@ -42,7 +41,7 @@ const CardHoverMenu: FC<CardHoverMenuProps> = ({
         >
             <a
                 href={url}
-                aria-label={escapeHTML(item.Name)}
+                aria-label={item.Name || ''}
                 className='cardImageContainer'
             ></a>
 
diff --git a/src/components/cardbuilder/Card/CardOverlayButtons.tsx b/src/components/cardbuilder/Card/CardOverlayButtons.tsx
index 482a14a816..f3b1b34749 100644
--- a/src/components/cardbuilder/Card/CardOverlayButtons.tsx
+++ b/src/components/cardbuilder/Card/CardOverlayButtons.tsx
@@ -2,7 +2,6 @@ import React, { type FC } from 'react';
 import ButtonGroup from '@mui/material/ButtonGroup';
 import classNames from 'classnames';
 import { appRouter } from 'components/router/appRouter';
-import escapeHTML from 'escape-html';
 import PlayArrowIconButton from '../../common/PlayArrowIconButton';
 import MoreVertIconButton from '../../common/MoreVertIconButton';
 
@@ -61,7 +60,7 @@ const CardOverlayButtons: FC<CardOverlayButtonsProps> = ({
     return (
         <a
             href={url}
-            aria-label={escapeHTML(item.Name)}
+            aria-label={item.Name || ''}
             style={{
                 position: 'absolute',
                 top: 0,
diff --git a/src/components/cardbuilder/Card/CardText.tsx b/src/components/cardbuilder/Card/CardText.tsx
index dc64dc61ba..b95a6adb03 100644
--- a/src/components/cardbuilder/Card/CardText.tsx
+++ b/src/components/cardbuilder/Card/CardText.tsx
@@ -1,6 +1,5 @@
 import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
-import escapeHTML from 'escape-html';
 import type { TextLine } from './cardHelper';
 
 interface CardTextProps {
@@ -19,7 +18,7 @@ const CardText: FC<CardTextProps> = ({ className, textLine }) => {
                     title={titleAction.title}
                     {...titleAction.dataAttributes}
                 >
-                    {escapeHTML(titleAction.title)}
+                    {titleAction.title}
                 </a>
             );
         } else {
diff --git a/src/components/cardbuilder/Card/cardHelper.ts b/src/components/cardbuilder/Card/cardHelper.ts
index b07289dfc2..4ce3247379 100644
--- a/src/components/cardbuilder/Card/cardHelper.ts
+++ b/src/components/cardbuilder/Card/cardHelper.ts
@@ -216,7 +216,7 @@ function getParentTitle(
     serverId: NullableString,
     item: ItemDto
 ) {
-    if (isOuterFooter && item.AlbumArtists && item.AlbumArtists.length) {
+    if (isOuterFooter && item.AlbumArtists?.length) {
         (item.AlbumArtists[0] as BaseItemDto).Type = BaseItemKind.MusicArtist;
         (item.AlbumArtists[0] as BaseItemDto).IsFolder = true;
         return getTextActionButton(item.AlbumArtists[0], null, serverId);
diff --git a/src/components/common/DefaultName.tsx b/src/components/common/DefaultName.tsx
index 0ead8876a3..ba782e1162 100644
--- a/src/components/common/DefaultName.tsx
+++ b/src/components/common/DefaultName.tsx
@@ -1,6 +1,5 @@
 import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
-import escapeHTML from 'escape-html';
 import itemHelper from 'components/itemHelper';
 import { isUsingLiveTvNaming } from '../cardbuilder/cardBuilderUtils';
 import type { ItemDto } from 'types/itemDto';
@@ -15,7 +14,7 @@ const DefaultName: FC<DefaultNameProps> = ({ item }) => {
         itemHelper.getDisplayName(item);
     return (
         <Box className='cardText cardDefaultText'>
-            {escapeHTML(defaultName)}
+            {defaultName}
         </Box>
     );
 };
diff --git a/src/components/listview/List/ListWrapper.tsx b/src/components/listview/List/ListWrapper.tsx
index 76303a0f2b..fb03919191 100644
--- a/src/components/listview/List/ListWrapper.tsx
+++ b/src/components/listview/List/ListWrapper.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames';
-import escapeHTML from 'escape-html';
 import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
@@ -31,7 +30,7 @@ const ListWrapper: FC<ListWrapperProps> = ({
                     'itemAction listItem-button listItem-focusscale'
                 )}
                 data-action={action}
-                aria-label={escapeHTML(title)}
+                aria-label={title}
                 {...dataAttributes}
             >
                 {children}
diff --git a/src/components/listview/List/Lists.tsx b/src/components/listview/List/Lists.tsx
index 51f5612bba..1516140635 100644
--- a/src/components/listview/List/Lists.tsx
+++ b/src/components/listview/List/Lists.tsx
@@ -1,5 +1,4 @@
 import React, { type FC } from 'react';
-import escapeHTML from 'escape-html';
 import { groupBy } from 'lodash-es';
 import Box from '@mui/material/Box';
 import { getIndex } from './listHelper';
@@ -43,7 +42,7 @@ const Lists: FC<ListsProps> = ({ items = [], listOptions = {} }) => {
                     <Box key={index}>
                         {itemGroupTitle && (
                             <ListGroupHeaderWrapper index={index}>
-                                {escapeHTML(itemGroupTitle)}
+                                {itemGroupTitle}
                             </ListGroupHeaderWrapper>
                         )}
                         {getItems.map((item) => renderListItem(item, index))}