#RI-2088 - codeql fe fixes

Author: Roman.Sergeenko

configs/webpack.config.main.prod.babel.js

@@ -1,7 +1,6 @@
 import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import TerserPlugin from 'terser-webpack-plugin';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import baseConfig from './webpack.config.base';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';

redisinsight/ui/src/components/ContentEditable.tsx

@@ -28,9 +28,9 @@ export const parseMultilineContentEditableChangeHtml = (text: string = '') =>
 export const parseContentEditableHtml = (text: string = '') =>
   text
     .replace(/ /gi, ' ')
-    .replace(/&/gi, '&')
     .replace(/&lt;/gi, '<')
     .replace(/&gt;/gi, '>')
+    .replace(/&amp;/gi, '&')
 
 const onPaste = (e: React.ClipboardEvent) => {
   e.preventDefault()

redisinsight/ui/src/components/query-card/QueryCardCliPlugin/QueryCardCliPlugin.tsx

@@ -45,8 +45,6 @@ const QueryCardCliPlugin = (props: Props) => {
   const generatedIframeNameRef = useRef<string>('')
   const { theme } = useContext(ThemeContext)
 
-  const dispatch = useDispatch()
-
   const executeCommand = () => {
     pluginIframeRef?.current?.contentWindow?.postMessage({
       event: 'executeCommand',
@@ -55,20 +53,20 @@ const QueryCardCliPlugin = (props: Props) => {
     }, '*')
   }
 
-  const sendRedisCommand = (command: string, requestId: string) => {
-    dispatch(
-      sendPluginCommandAction({
-        command,
-        onSuccessAction: (response) => {
-          pluginIframeRef?.current?.contentWindow?.postMessage({
-            event: 'executeRedisCommand',
-            requestId,
-            data: response
-          }, '*')
-        }
-      })
-    )
-  }
+  // const sendRedisCommand = (command: string, requestId: string) => {
+  //   dispatch(
+  //     sendPluginCommandAction({
+  //       command,
+  //       onSuccessAction: (response) => {
+  //         pluginIframeRef?.current?.contentWindow?.postMessage({
+  //           event: 'executeRedisCommand',
+  //           requestId,
+  //           data: response
+  //         }, '*')
+  //       }
+  //     })
+  //   )
+  // }
 
   useEffect(() => {
     if (currentView === null) return

redisinsight/ui/src/pages/browser/components/add-key/AddKeyCommonFields/AddKeyCommonFields.tsx

@@ -1,4 +1,4 @@
-import React, { ChangeEvent, Fragment } from 'react'
+import React, { ChangeEvent } from 'react'
 import { toNumber } from 'lodash'
 import { EuiFieldText, EuiFormRow } from '@elastic/eui'
 

redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx

@@ -255,13 +255,6 @@ const AddStandaloneForm = (props: Props) => {
       errs.newCaCert = fieldDisplayNames.newCaCert
     }
 
-    if (
-      values.tls
-      && values.tlsClientAuthRequired
-      && values.selectedTlsClientCertId === ''
-    ) {
-      errs.selectedTlsClientCertId = fieldDisplayNames.selectedTlsClientCertId
-    }
     if (
       values.tls
       && values.tlsClientAuthRequired

redisinsight/ui/src/plugins/pluginImport.ts

@@ -37,13 +37,28 @@ export const importPluginScript = () => (config) => {
 
   const listenEvents = () => {
     globalThis.onmessage = (e) => {
+      // eslint-disable-next-line sonarjs/no-collapsible-if
       if (e.data.event === events.EXECUTE_COMMAND) {
-        plugin[e.data.method] && plugin[e.data.method](e.data.data)
+        const { plugin } = globalThis
+        // eslint-disable-next-line no-prototype-builtins
+        if (plugin.hasOwnProperty(e.data.method)) {
+          const action = plugin[e.data.method]
+          if (typeof action === 'function') {
+            action(e.data.data)
+          }
+        }
       }
 
+      // eslint-disable-next-line sonarjs/no-collapsible-if
       if (e.data.event === events.EXECUTE_REDIS_COMMAND) {
-        callbacks[e.data.requestId] && callbacks[e.data.requestId](e.data.data)
-        delete callbacks[e.data.requestId]
+        // eslint-disable-next-line no-prototype-builtins
+        if (callbacks.hasOwnProperty(e.data.requestId)) {
+          const action = callbacks[e.data.requestId]
+          if (typeof action === 'function') {
+            action(e.data.data)
+          }
+          delete callbacks[e.data.requestId]
+        }
       }
     }
 
@@ -84,11 +99,11 @@ export const prepareIframeHtml = (config) => {
       <body class="${bodyClass}" style="height: fit-content">
         <div id="app"></div>
         <script>
-          let plugin = {}
+          globalThis.plugin = {}
           ;(${importPluginScriptInner})(\`${configString}\`);
           import(\`${scriptSrc}\`)
               .then((module) => {
-                  plugin = { ...module.default };
+                  globalThis.plugin = { ...module.default };
                   globalThis.top.postMessage({
                     event: 'loaded',
                     iframeId: \`${iframeId}\`