Merge pull request #29 from UncoderIO/ui-fix-4

Add UI improvements

Author: Mzapeka

uncoder-os/.env.common

@@ -1 +1 @@
-MODULE_VERSION=1.1.0
+MODULE_VERSION=1.2.0

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>;
 };

uncoder-os/src/components/TextEditor/TextEditor.sass

@@ -48,3 +48,6 @@
       &.ace_scrollbar-v,
       &.ace_scrollbar-h
         +scrollbars
+
+.d-block
+  display: block

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 />}

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 />}

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 />}

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 />}

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 />}

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,26 +14,34 @@ 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,
     defaultPlatform: EditorValueTypes | undefined = undefined,
   ) => {
     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();
     }
   };