From 5211dd8d918cfa63cdd47f559cbba549460a16bb Mon Sep 17 00:00:00 2001
From: Tommy Le <tommy_8786@hotmail.com>
Date: Fri, 26 Jan 2024 15:44:30 +0100
Subject: [PATCH] fix: fix decoding issues in StackOverflowSearchResultListItem

Signed-off-by: Tommy Le <tommy_8786@hotmail.com>
---
 plugins/stack-overflow/package.json              |  2 ++
 .../StackOverflowSearchResultListItem.tsx        | 16 ++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/plugins/stack-overflow/package.json b/plugins/stack-overflow/package.json
index de0aec1e61..5364ee59bb 100644
--- a/plugins/stack-overflow/package.json
+++ b/plugins/stack-overflow/package.json
@@ -54,6 +54,7 @@
     "@testing-library/jest-dom": "^6.0.0",
     "@types/react": "^16.13.1 || ^17.0.0",
     "cross-fetch": "^4.0.0",
+    "he": "^1.2.0",
     "lodash": "^4.17.21",
     "qs": "^6.9.4",
     "react-use": "^17.2.4"
@@ -69,6 +70,7 @@
     "@testing-library/dom": "^9.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.0.0",
+    "@types/he": "^1.2.3",
     "msw": "^1.0.0"
   },
   "files": [
diff --git a/plugins/stack-overflow/src/search/StackOverflowSearchResultListItem/StackOverflowSearchResultListItem.tsx b/plugins/stack-overflow/src/search/StackOverflowSearchResultListItem/StackOverflowSearchResultListItem.tsx
index 245666deeb..9e98d6612f 100644
--- a/plugins/stack-overflow/src/search/StackOverflowSearchResultListItem/StackOverflowSearchResultListItem.tsx
+++ b/plugins/stack-overflow/src/search/StackOverflowSearchResultListItem/StackOverflowSearchResultListItem.tsx
@@ -15,7 +15,6 @@
  */
 
 import React from 'react';
-import _unescape from 'lodash/unescape';
 import { Link } from '@backstage/core-components';
 import {
   Divider,
@@ -26,8 +25,9 @@ import {
   Chip,
 } from '@material-ui/core';
 import { useAnalytics } from '@backstage/core-plugin-api';
-import { ResultHighlight } from '@backstage/plugin-search-common';
+import type { ResultHighlight } from '@backstage/plugin-search-common';
 import { HighlightedSearchResultText } from '@backstage/plugin-search-react';
+import { decode } from 'he';
 
 /**
  * Props for {@link StackOverflowSearchResultListItem}
@@ -48,6 +48,10 @@ export const StackOverflowSearchResultListItem = (
   const analytics = useAnalytics();
 
   const handleClick = () => {
+    if (!result) {
+      return;
+    }
+
     analytics.captureEvent('discover', result.title, {
       attributes: { to: result.location },
       value: props.rank,
@@ -69,12 +73,12 @@ export const StackOverflowSearchResultListItem = (
               <Link to={result.location} noTrack onClick={handleClick}>
                 {highlight?.fields?.title ? (
                   <HighlightedSearchResultText
-                    text={highlight.fields.title}
+                    text={decode(highlight.fields.title)}
                     preTag={highlight.preTag}
                     postTag={highlight.postTag}
                   />
                 ) : (
-                  _unescape(result.title)
+                  decode(result.title)
                 )}
               </Link>
             }
@@ -83,13 +87,13 @@ export const StackOverflowSearchResultListItem = (
                 <>
                   Author:{' '}
                   <HighlightedSearchResultText
-                    text={highlight.fields.text}
+                    text={decode(highlight.fields.text)}
                     preTag={highlight.preTag}
                     postTag={highlight.postTag}
                   />
                 </>
               ) : (
-                `Author: ${result.text}`
+                `Author: ${decode(result.text)}`
               )
             }
           />