Show whitespace and links in violation details

ti-broish · Oct 25, 2024 · cfb7832 · cfb7832
1 parent d4e0c86
commit cfb7832
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/components/modules/violations/ViolationDetails.js b/src/components/modules/violations/ViolationDetails.js
@@ -23,7 +23,11 @@ import { TableStyle } from '../Profile'
 import styled from 'styled-components'
 import CommentSection from './CommentSection'
 
-import { formatDateShort, formatTime } from '../../utils/Util'
+import {
+  formatDateShort,
+  formatTime,
+  formatTextWithLinks,
+} from '../../utils/Util'
 import PublishModal from './PublishModal'
 
 const UpdatesTable = styled(TableStyle)`
@@ -378,7 +382,12 @@ export default (props) => {
           </FancyButtonRed>
           <hr />
           <h2>Описание</h2>
-          <p>{data.description}</p>
+          <p
+            style={{ whiteSpace: 'pre-wrap' }}
+            dangerouslySetInnerHTML={{
+              __html: formatTextWithLinks(data.description),
+            }}
+          />
           <hr />
           {!data.publishedText ? null : (
             <>

diff --git a/src/components/utils/Util.js b/src/components/utils/Util.js
@@ -135,6 +135,15 @@ const checkPaths = (path1, path2) => {
   return path1 === path2
 }
 
+const formatTextWithLinks = (text) => {
+  const urlRegex = /(https?:\/\/[^\s]+)/g
+  return text.replace(
+    urlRegex,
+    (url) =>
+      `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`
+  )
+}
+
 module.exports = {
   formatLv,
   formatPop,
@@ -146,4 +155,5 @@ module.exports = {
   format,
   checkPaths,
   mapRoleLocalization,
+  formatTextWithLinks,
 }