#RI-2088 - codeql fe fixes

Author: Roman.Sergeenko

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main, latest, release/* ]
+    branches: [ main, latest, release/*, feature/codeql-fe-fixes ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]

redisinsight/main.dev.ts

@@ -179,11 +179,10 @@ export const createWindow = async (splash: BrowserWindow | null) => {
     webPreferences: {
       nodeIntegration: true,
       nodeIntegrationInWorker: true,
-      webSecurity: false,
+      webSecurity: true,
       contextIsolation: false,
       spellcheck: true,
-      allowRunningInsecureContent: true,
-      enableRemoteModule: true,
+      allowRunningInsecureContent: false,
       scrollBounce: true,
     },
   });

redisinsight/ui/src/pages/browser/components/rejson-details/JSONArray/JSONArray.tsx

@@ -228,8 +228,9 @@ class JSONArrayComponent extends Component<Props, State> {
   }
 
   onClickSetKVPair = () => {
+    const { addNewKeyValuePair } = this.state
     this.setState({
-      addNewKeyValuePair: !this.state.addNewKeyValuePair,
+      addNewKeyValuePair: !addNewKeyValuePair,
       newValue: '',
       error: ''
     })
@@ -299,11 +300,12 @@ class JSONArrayComponent extends Component<Props, State> {
       const {
         shouldRejsonDataBeDownloaded,
         handleFetchVisualisationResults,
+        value
       } = this.props
 
       if (!shouldRejsonDataBeDownloaded) {
         this.setState({
-          value: this.props.value,
+          value,
           openIndex: true,
         })
         return

redisinsight/ui/src/pages/browser/components/rejson-details/JSONObject/JSONObject.tsx

@@ -179,8 +179,9 @@ class JSONObject extends React.Component<Props, State> {
   }
 
   onClickSetKVPair = () => {
+    const { addNewKeyValuePair } = this.state
     this.setState({
-      addNewKeyValuePair: !this.state.addNewKeyValuePair,
+      addNewKeyValuePair: !addNewKeyValuePair,
       newKey: '',
       newValue: '',
     })
@@ -286,11 +287,11 @@ class JSONObject extends React.Component<Props, State> {
     onJSONKeyExpandAndCollapse(!openIndex, path)
 
     if (!openIndex) {
-      const { shouldRejsonDataBeDownloaded } = this.props
+      const { shouldRejsonDataBeDownloaded, value } = this.props
 
       if (!shouldRejsonDataBeDownloaded) {
         this.setState({
-          value: this.props.value,
+          value,
           openIndex: true,
         })
         return

redisinsight/ui/src/pages/browser/components/rejson-details/RejsonDetails/RejsonDetails.tsx

@@ -62,11 +62,6 @@ export interface Props {
 
 interface State {
   path: string | undefined;
-  data: JSONArrayValue | IJSONDocument | IJSONDocument[];
-  openIndex: number;
-  prevPath: string;
-  currentPath: string;
-  dataContainer: object;
   addRootKVPair: boolean;
   newRootKey: string | undefined;
   newRootValue: JSONScalarValue | JSONArrayValue | IJSONObject;
@@ -78,11 +73,6 @@ class RejsonDetails extends React.Component<Props, State> {
     super(props)
     this.state = {
       path: '',
-      data: this.props.data,
-      openIndex: -1,
-      prevPath: '',
-      currentPath: '',
-      dataContainer: {},
       addRootKVPair: false,
       newRootKey: '',
       newRootValue: '',
@@ -132,8 +122,9 @@ class RejsonDetails extends React.Component<Props, State> {
   }
 
   onClickSetRootKVPair = () => {
+    const { addRootKVPair } = this.state
     this.setState({
-      addRootKVPair: !this.state.addRootKVPair,
+      addRootKVPair: !addRootKVPair,
     })
   }
 
@@ -213,7 +204,7 @@ class RejsonDetails extends React.Component<Props, State> {
     const error: string = this.validateRootKVPair()
 
     if (error === '') {
-      let updatedPath = '.'
+      let updatedPath
 
       body.operation = 'update'
       body.value = newRootValue as string
@@ -603,7 +594,7 @@ class RejsonDetails extends React.Component<Props, State> {
             )
           )}
           <>
-            {data && data !== null ? (
+            {data ? (
               this.renderResultArray(data as string)
             ) : (
               <JSONScalar

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

@@ -260,8 +260,7 @@ const AddStandaloneForm = (props: Props) => {
       && values.tlsClientAuthRequired
       && values.selectedTlsClientCertId === ''
     ) {
-      errs.selectedTlsClientCertId
-        === fieldDisplayNames.selectedTlsClientCertId
+      errs.selectedTlsClientCertId = fieldDisplayNames.selectedTlsClientCertId
     }
     if (
       values.tls

redisinsight/ui/src/telemetry/segment.ts

@@ -31,7 +31,7 @@ export class SegmentTelemetryService implements ITelemetryService {
     return pageObject
   }
 
-  constructor(private _sourceWriteKey: string) {
+  constructor(private readonly _sourceWriteKey: string) {
     this._sourceWriteKey = _sourceWriteKey
   }