From 2a99a0eeb979bb5f38e642ce793aacfe749b8156 Mon Sep 17 00:00:00 2001
From: Mykola Zapeka <mz@socprime.com>
Date: Thu, 14 Dec 2023 10:40:46 +0200
Subject: [PATCH] Add UI improvements

---
 uncoder-os/.env.common                        |  2 +-
 .../DropdownIocSettingsMenu.tsx               | 10 ++++++++++
 .../src/components/TextEditor/TextEditor.sass |  3 +++
 .../DownloadInputTextButton.tsx               |  2 +-
 .../InputTextEditorMenu.tsx                   |  4 ++--
 .../ReplaceSettingsButton.tsx                 |  2 +-
 .../DownloadOutputTextButton.tsx              |  2 +-
 .../OutputTextEditorMenu.tsx                  |  4 ++--
 .../useDetectParserByText.ts                  | 19 ++++++++++++++-----
 9 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/uncoder-os/.env.common b/uncoder-os/.env.common
index c81b6bf1..73739ab8 100644
--- a/uncoder-os/.env.common
+++ b/uncoder-os/.env.common
@@ -1 +1 @@
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.2.0
diff --git a/uncoder-os/src/components/Dropdown/DropdownLayouts/DropdownIocSettingsMenu/DropdownIocSettingsMenu.tsx b/uncoder-os/src/components/Dropdown/DropdownLayouts/DropdownIocSettingsMenu/DropdownIocSettingsMenu.tsx
index 2cde4f1b..3f7ee3a1 100644
--- a/uncoder-os/src/components/Dropdown/DropdownLayouts/DropdownIocSettingsMenu/DropdownIocSettingsMenu.tsx
+++ b/uncoder-os/src/components/Dropdown/DropdownLayouts/DropdownIocSettingsMenu/DropdownIocSettingsMenu.tsx
@@ -10,12 +10,14 @@ export const DropdownIocSettingsMenu: FC = () => {
   const {
     iocTypesFields,
     exceptionsField,
+    includeSourceIpField,
     iocsPerQueryField,
     hashTypesFields,
     onChangeIocTypes,
     onChangeExceptions,
     onChangeIocsPerQuery,
     onChangeHashTypes,
+    onChangeIncludeSourceIp,
     iocTypeErrorMessage,
   } = useIocSettingsMenu();
 
@@ -73,5 +75,13 @@ export const DropdownIocSettingsMenu: FC = () => {
         value={exceptionsField}
       />
     </div>
+    <div className="ioc-settings-menu-list__checkbox">
+      <Checkbox
+        label="Add Source IP to Query with “OR” operator"
+        onChange={onChangeIncludeSourceIp}
+        name="addSourceIp"
+        checked={includeSourceIpField}
+      />
+    </div>
   </div>;
 };
diff --git a/uncoder-os/src/components/TextEditor/TextEditor.sass b/uncoder-os/src/components/TextEditor/TextEditor.sass
index c29ffd80..231c2714 100644
--- a/uncoder-os/src/components/TextEditor/TextEditor.sass
+++ b/uncoder-os/src/components/TextEditor/TextEditor.sass
@@ -48,3 +48,6 @@
       &.ace_scrollbar-v,
       &.ace_scrollbar-h
         +scrollbars
+
+.d-block
+  display: block
diff --git a/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/DownloadInputTextButton/DownloadInputTextButton.tsx b/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/DownloadInputTextButton/DownloadInputTextButton.tsx
index b245cc59..cba32419 100644
--- a/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/DownloadInputTextButton/DownloadInputTextButton.tsx
+++ b/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/DownloadInputTextButton/DownloadInputTextButton.tsx
@@ -18,7 +18,7 @@ export const DownloadInputTextButton: FC = () => {
   }
 
   return (
-    <Tooltip classes="m-r-6" content="Download">
+    <Tooltip classes="d-block m-r-6" content="Download">
       <Button
         classes="button--icon button--xs button--default"
         children={<DownloadIcon />}
diff --git a/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/InputTextEditorMenu.tsx b/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/InputTextEditorMenu.tsx
index d8b74a11..588a8056 100644
--- a/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/InputTextEditorMenu.tsx
+++ b/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/InputTextEditorMenu.tsx
@@ -15,7 +15,7 @@ export const InputTextEditorMenu: FC = () => {
 
   return (
     <div className="text-editor-menu-input">
-      <Tooltip classes="m-r-6" content="Copy">
+      <Tooltip classes="d-block m-r-6" content="Copy">
         <Button
           classes="button--icon button--xs button--default"
           children={<CopyIcon />}
@@ -26,7 +26,7 @@ export const InputTextEditorMenu: FC = () => {
       </Tooltip>
       <DownloadInputTextButton />
       <ReplaceSettingsButton />
-      <Tooltip content="Delete">
+      <Tooltip classes="d-block" content="Delete">
         <Button
           classes="button--icon button--xs button--default"
           children={<DeleteIcon />}
diff --git a/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/ReplaseSettingsButton/ReplaceSettingsButton.tsx b/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/ReplaseSettingsButton/ReplaceSettingsButton.tsx
index 1a1b7cb1..3cc3fde2 100644
--- a/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/ReplaseSettingsButton/ReplaceSettingsButton.tsx
+++ b/uncoder-os/src/components/TextEditor/TextEditorSubheader/InputTextEditorSubheader/InputTextEditorMenu/ReplaseSettingsButton/ReplaceSettingsButton.tsx
@@ -18,7 +18,7 @@ export const ReplaceSettingsButton: FC = () => {
   return (
     <Dropdown
       button={
-      <Tooltip classes="m-r-6" content="Filter">
+      <Tooltip classes="d-block m-r-6" content="Filter">
         <Button
           classes="button--icon button--xs button--default"
           children={<FilterIcon />}
diff --git a/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/DownloadOutputTextButton/DownloadOutputTextButton.tsx b/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/DownloadOutputTextButton/DownloadOutputTextButton.tsx
index 69c2d6eb..5b3af565 100644
--- a/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/DownloadOutputTextButton/DownloadOutputTextButton.tsx
+++ b/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/DownloadOutputTextButton/DownloadOutputTextButton.tsx
@@ -18,7 +18,7 @@ export const DownloadOutputTextButton: FC = () => {
   }
 
   return (
-    <Tooltip classes="m-r-6" content="Download">
+    <Tooltip classes="d-block m-r-6" content="Download">
       <Button
         classes="button--icon button--xs button--default"
         children={<DownloadIcon />}
diff --git a/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/OutputTextEditorMenu.tsx b/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/OutputTextEditorMenu.tsx
index 3ad53f22..750b19ba 100644
--- a/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/OutputTextEditorMenu.tsx
+++ b/uncoder-os/src/components/TextEditor/TextEditorSubheader/OutputTextEditorSubheader/OutputTextEditorMenu/OutputTextEditorMenu.tsx
@@ -14,7 +14,7 @@ export const OutputTextEditorMenu: FC = () => {
 
   return (
     <div className="text-editor-menu-output">
-      <Tooltip classes="m-r-6" content="Copy">
+      <Tooltip classes="d-block m-r-6" content="Copy">
         <Button
           classes="button--icon button--xs button--default"
           children={<CopyIcon />}
@@ -24,7 +24,7 @@ export const OutputTextEditorMenu: FC = () => {
         />
       </Tooltip>
       <DownloadOutputTextButton />
-      <Tooltip content="Delete">
+      <Tooltip classes="d-block" content="Delete">
         <Button
           classes="button--icon button--xs button--default"
           children={<DeleteIcon />}
diff --git a/uncoder-os/src/hooks/useDetectParserByText/useDetectParserByText.ts b/uncoder-os/src/hooks/useDetectParserByText/useDetectParserByText.ts
index 0a0de09b..a514b8c1 100644
--- a/uncoder-os/src/hooks/useDetectParserByText/useDetectParserByText.ts
+++ b/uncoder-os/src/hooks/useDetectParserByText/useDetectParserByText.ts
@@ -1,8 +1,9 @@
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { Dispatch } from '@reduxjs/toolkit';
 import { setPlatformCode } from '../../reduxData/inputEditor';
-import { setPlatformCode as setRenderer } from '../../reduxData/outputEditor';
+import { outputEditorPlatformCodeSelector, setPlatformCode as setRenderer } from '../../reduxData/outputEditor';
 import { EditorValueTypes } from '../../types/editorValueTypes';
+import { renderersSelector } from '../../reduxData/platforms';
 
 const isSigma = (text: string): boolean => {
   return text.includes('title:') && text.includes('logsource:') && text.includes('detection:');
@@ -13,6 +14,14 @@ const isRoota = (text: string): boolean => {
 };
 export const useDetectParserByText = () => {
   const dispatch = useDispatch<Dispatch<any>>();
+  const renderers = useSelector(renderersSelector);
+  const outputPlatform = useSelector(outputEditorPlatformCodeSelector);
+
+  const resolveRenderer = (): void => {
+    if (!renderers.filter((renderer) => renderer.id === outputPlatform).length) {
+      dispatch(setRenderer(EditorValueTypes.none));
+    }
+  };
 
   const detectParser = (
     text: string,
@@ -20,19 +29,19 @@ export const useDetectParserByText = () => {
   ) => {
     if (isRoota(text)) {
       dispatch(setPlatformCode(EditorValueTypes.roota));
-      dispatch(setRenderer(EditorValueTypes.none));
+      resolveRenderer();
       return;
     }
 
     if (isSigma(text)) {
       dispatch(setPlatformCode(EditorValueTypes.sigma));
-      dispatch(setRenderer(EditorValueTypes.none));
+      resolveRenderer();
       return;
     }
 
     if (defaultPlatform) {
       dispatch(setPlatformCode(defaultPlatform));
-      dispatch(setRenderer(EditorValueTypes.none));
+      resolveRenderer();
     }
   };
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/UncoderIO/Uncoder_IO/pull/29.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/UncoderIO/Uncoder_IO/pull/29.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/UncoderIO/Uncoder_IO/pull/29.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/UncoderIO/Uncoder_IO/pull/29.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>