Moduled Firegex, Merging pt2 (to finish and test)

frontend/src/components/NFRegex/AddNewRegex.tsx

@@ -1,123 +0,0 @@
-import { Button, Group, Space, TextInput, Notification, Switch, NativeSelect, Modal } from '@mantine/core';
-import { useForm } from '@mantine/hooks';
-import React, { useState } from 'react';
-import { RegexAddForm } from '../../js/models';
-import { b64decode, b64encode, nfregex, okNotify } from '../../js/utils';
-import { ImCross } from "react-icons/im"
-import FilterTypeSelector from '../FilterTypeSelector';
-
-
-type RegexAddInfo = {
-    regex:string,
-    type:string,
-    mode:string,
-    is_case_insensitive:boolean,
-    deactive:boolean
-}
-
-function AddNewRegex({ opened, onClose, service }:{ opened:boolean, onClose:()=>void, service:string }) { 
-
-    const form = useForm({
-        initialValues: {
-            regex:"",
-            type:"blacklist",
-            mode:"C -> S",
-            is_case_insensitive:false,
-            deactive:false
-        },
-        validationRules:{
-            regex: (value) => value !== "",
-            type: (value) => ["blacklist","whitelist"].includes(value),
-            mode: (value) => ['C -> S', 'S -> C', 'C <-> S'].includes(value)
-        }
-    })
-
-    const close = () =>{
-        onClose()
-        form.reset()
-        setError(null)
-    }
-
-    const [submitLoading, setSubmitLoading] = useState(false)
-    const [error, setError] = useState<string|null>(null)
-
-    const submitRequest = (values:RegexAddInfo) => {
-        setSubmitLoading(true)
-        const filter_mode = ({'C -> S':'C', 'S -> C':'S', 'C <-> S':'B'}[values.mode])
-
-        const request:RegexAddForm = {
-            is_blacklist:values.type !== "whitelist",
-            is_case_sensitive: !values.is_case_insensitive,
-            service_id: service,
-            mode: filter_mode?filter_mode:"B",
-            regex: b64encode(values.regex),
-            active: !values.deactive
-        }
-        setSubmitLoading(false)
-        nfregex.regexesadd(request).then( res => {
-            if (!res){
-                setSubmitLoading(false)
-                close();
-                okNotify(`Regex ${b64decode(request.regex)} has been added`, `Successfully added  ${request.is_case_sensitive?"case sensitive":"case insensitive"} ${request.is_blacklist?"blacklist":"whitelist"} regex to ${request.service_id} service`)
-            }else if (res.toLowerCase() === "invalid regex"){
-                setSubmitLoading(false)
-                form.setFieldError("regex", "Invalid Regex")
-            }else{
-                setSubmitLoading(false)
-                setError("Error: [ "+res+" ]")
-            }
-        }).catch( err => {
-            setSubmitLoading(false)
-            setError("Request Failed! [ "+err+" ]")
-        })
-        
-    }    
-
-
-  return <Modal size="xl" title="Add a new regex filter" opened={opened} onClose={close} closeOnClickOutside={false} centered>
-    <form onSubmit={form.onSubmit(submitRequest)}>
-            <TextInput
-                label="Regex"
-                placeholder="[A-Z0-9]{31}="
-                {...form.getInputProps('regex')}
-            />
-            <Space h="md" />
-            <Switch
-                label="Case insensitive"
-                {...form.getInputProps('is_case_insensitive', { type: 'checkbox' })}
-            />
-            <Space h="md" />
-            <Switch
-                label="Deactivate"
-                {...form.getInputProps('deactive', { type: 'checkbox' })}
-            />
-            <Space h="md" />
-            <NativeSelect
-                data={['C -> S', 'S -> C', 'C <-> S']}
-                label="Choose the source of the packets to filter"
-                variant="filled"
-                {...form.getInputProps('mode')}
-            />
-            <Space h="md" />
-            <FilterTypeSelector
-                size="md"
-                color="gray"
-                {...form.getInputProps('type')}
-            />
-            <Group position="right" mt="md">
-                <Button loading={submitLoading} type="submit">Add Filter</Button>
-            </Group>
-
-            <Space h="md" />
-            
-            {error?<>
-            <Notification icon={<ImCross size={14} />} color="red" onClose={()=>{setError(null)}}>
-                Error: {error}
-            </Notification><Space h="md" /></>:null}
-            
-        </form>
-    </Modal>
-
-}
-
-export default AddNewRegex;

frontend/src/components/NFRegex/AddNewService.tsx

@@ -1,8 +1,9 @@
 import { Button, Group, NumberInput, Space, TextInput, Notification, Modal, Switch, SegmentedControl, Autocomplete, AutocompleteItem } from '@mantine/core';
 import { useForm } from '@mantine/hooks';
 import React, { useEffect, useState } from 'react';
-import { okNotify, regex_ipv4, regex_ipv6, getipinterfaces, nfregex } from '../../js/utils';
+import { okNotify, regex_ipv4, regex_ipv6, getipinterfaces } from '../../js/utils';
 import { ImCross } from "react-icons/im"
+import { nfregex } from './utils';
 
 type ServiceAddForm = {
     name:string,

frontend/src/components/NFRegex/RegexView/index.module.scss

@@ -1,14 +0,0 @@
-
-@use "../../../vars" as *;
-
-.box{
-    padding:30px;
-    margin:5px;
-}
-
-.regex_text{
-    padding: 6px;
-    background-color: $third_color;
-    border-radius: 8px;
-    margin: 6px;
-}

frontend/src/components/NFRegex/RegexView/index.tsx

@@ -1,110 +0,0 @@
-import { Grid, Text, Title, Badge, Space, ActionIcon, Tooltip } from '@mantine/core';
-import React, { useState } from 'react';
-import { RegexFilter } from '../../../js/models';
-import { b64decode, errorNotify, nfregex, okNotify } from '../../../js/utils';
-import style from "./index.module.scss";
-import { BsTrashFill } from "react-icons/bs"
-import YesNoModal from '../../YesNoModal';
-import FilterTypeSelector from '../../FilterTypeSelector';
-import { FaPause, FaPlay } from 'react-icons/fa';
-
-
-function RegexView({ regexInfo }:{ regexInfo:RegexFilter }) {
-
-  const mode_string = regexInfo.mode === "C"? "C -> S":
-                      regexInfo.mode === "S"? "S -> C":
-                      regexInfo.mode === "B"? "S <-> C": "🤔"
-
-  let regex_expr = b64decode(regexInfo.regex);
-
-  const [deleteModal, setDeleteModal] = useState(false);
-  const [deleteTooltipOpened, setDeleteTooltipOpened] = useState(false);
-  const [statusTooltipOpened, setStatusTooltipOpened] = useState(false);
-
-  const deleteRegex = () => {
-    nfregex.regexdelete(regexInfo.id).then(res => {
-      if(!res){
-        okNotify(`Regex ${regex_expr} deleted successfully!`,`Regex '${regex_expr}' ID:${regexInfo.id} has been deleted!`)
-      }else{
-        errorNotify(`Regex ${regex_expr} deleation failed!`,`Error: ${res}`)
-      }
-    }).catch( err => errorNotify(`Regex ${regex_expr} deleation failed!`,`Error: ${err}`))
-  }
-
-  const changeRegexStatus = () => {
-    
-    (regexInfo.active?nfregex.regexdisable:nfregex.regexenable)(regexInfo.id).then(res => {
-      if(!res){
-        okNotify(`Regex ${regex_expr} ${regexInfo.active?"deactivated":"activated"} successfully!`,`Regex '${regex_expr}' ID:${regexInfo.id} has been ${regexInfo.active?"deactivated":"activated"}!`)
-      }else{
-        errorNotify(`Regex ${regex_expr} ${regexInfo.active?"deactivation":"activation"} failed!`,`Error: ${res}`)
-      }
-    }).catch( err => errorNotify(`Regex ${regex_expr} ${regexInfo.active?"deactivation":"activation"} failed!`,`Error: ${err}`))
-    
-  }
-
-  return <div className={style.box}>
-        <Grid>
-          <Grid.Col span={2} className="center-flex">
-            <Title order={4}>Regex:</Title> 
-          </Grid.Col>
-          <Grid.Col span={8}>
-            <Text className={style.regex_text}> {regex_expr}</Text>
-          </Grid.Col>
-          <Grid.Col span={2} className='center-flex'>
-            <Space w="xs" />
-            <Tooltip label={regexInfo.active?"Deactivate":"Activate"} zIndex={0} transition="pop" transitionDuration={200} /*openDelay={500}*/ transitionTimingFunction="ease" color={regexInfo.active?"orange":"teal"} opened={statusTooltipOpened}>
-              <ActionIcon color={regexInfo.active?"orange":"teal"} onClick={changeRegexStatus} size="xl" radius="md" variant="filled"
-               onFocus={() => setStatusTooltipOpened(false)} onBlur={() => setStatusTooltipOpened(false)}
-               onMouseEnter={() => setStatusTooltipOpened(true)} onMouseLeave={() => setStatusTooltipOpened(false)}
-              >{regexInfo.active?<FaPause size="20px" />:<FaPlay size="20px" />}</ActionIcon>
-            </Tooltip>
-            <Space w="xs" />
-            <Tooltip label="Delete regex" zIndex={0} transition="pop" transitionDuration={200} /*openDelay={500}*/ transitionTimingFunction="ease" color="red" opened={deleteTooltipOpened} >
-              <ActionIcon color="red" onClick={()=>setDeleteModal(true)} size="xl" radius="md" variant="filled"
-               onFocus={() => setDeleteTooltipOpened(false)} onBlur={() => setDeleteTooltipOpened(false)}
-               onMouseEnter={() => setDeleteTooltipOpened(true)} onMouseLeave={() => setDeleteTooltipOpened(false)}
-              ><BsTrashFill size={22} /></ActionIcon>
-            </Tooltip>
-
-            </Grid.Col>
-          <Grid.Col className='center-flex' span={12}>
-            <div className='center-flex-row'>
-              <FilterTypeSelector 
-                  size="md"
-                  color="gray"
-                  disabled
-                  value={regexInfo.is_blacklist?"blacklist":"whitelist"}
-              />
-              <Space h="md" />
-              <div className='center-flex'>
-                <Badge size="md" color="cyan" variant="filled">Service: {regexInfo.service_id}</Badge>
-                <Space w="xs" />
-                <Badge size="md" color={regexInfo.active?"lime":"red"} variant="filled">{regexInfo.active?"ACTIVE":"DISABLED"}</Badge>
-                <Space w="xs" />
-                <Badge size="md" color="gray" variant="filled">ID: {regexInfo.id}</Badge>
-                
-              </div>
-            </div>
-            <div className='flex-spacer' />
-            <div className='center-flex-row'>
-              <Badge size="md" color={regexInfo.is_case_sensitive?"grape":"pink"} variant="filled">Case: {regexInfo.is_case_sensitive?"SENSIIVE":"INSENSITIVE"}</Badge>
-              <Space h="xs" />
-              <Badge size="md" color="yellow" variant="filled">Packets filtered: {regexInfo.n_packets}</Badge>
-              <Space h="xs" />
-              <Badge size="md" color="blue" variant="filled">Mode: {mode_string}</Badge>
-            </div>
-          </Grid.Col>
-        </Grid>
-        <YesNoModal
-            title='Are you sure to delete this regex?'
-            description={`You are going to delete the regex '${regex_expr}'.`}
-            onClose={()=>setDeleteModal(false)}
-            action={deleteRegex}
-            opened={deleteModal}
-        />
-        
-  </div>
-}
-
-export default RegexView;

frontend/src/components/NFRegex/ServiceRow/RenameForm.tsx

@@ -1,9 +1,9 @@
 import { Button, Group, Space, TextInput, Notification, Modal } from '@mantine/core';
 import { useForm } from '@mantine/hooks';
 import React, { useEffect, useState } from 'react';
-import { nfregex, okNotify } from '../../../js/utils';
+import { okNotify } from '../../../js/utils';
 import { ImCross } from "react-icons/im"
-import { Service } from '../../../js/models';
+import { nfregex, Service } from '../utils';
 
 function RenameForm({ opened, onClose, service }:{ opened:boolean, onClose:()=>void, service:Service }) { 
 

frontend/src/components/NFRegex/ServiceRow/index.tsx

@@ -1,11 +1,11 @@
 import { ActionIcon, Badge, Divider, Grid, MediaQuery, Menu, Space, Title, Tooltip } from '@mantine/core';
 import React, { useState } from 'react';
 import { FaPlay, FaStop } from 'react-icons/fa';
-import { Service } from '../../../js/models';
+import { nfregex, Service } from '../utils';
 import { MdOutlineArrowForwardIos } from "react-icons/md"
 import style from "./index.module.scss";
 import YesNoModal from '../../YesNoModal';
-import { errorNotify, nfregex, okNotify, regex_ipv4 } from '../../../js/utils';
+import { errorNotify, okNotify, regex_ipv4 } from '../../../js/utils';
 import { BsTrashFill } from 'react-icons/bs';
 import { BiRename } from 'react-icons/bi'
 import RenameForm from './RenameForm';

frontend/src/components/NFRegex/utils.ts

@@ -1,5 +1,6 @@
-import { ServerResponse } from "../../js/models"
+import { RegexFilter, ServerResponse } from "../../js/models"
 import { getapi, postapi } from "../../js/utils"
+import { RegexAddForm } from "../../js/models"
 
 export type GeneralStats = {
     services:number,
@@ -30,25 +31,7 @@ export type ServiceAddResponse = {
     service_id?: string,
 }
 
-export type RegexFilter = {
-    id:number,
-    service_id:string,
-    regex:string
-    is_blacklist:boolean,
-    is_case_sensitive:boolean,
-    mode:string //C S B => C->S S->C BOTH
-    n_packets:number,
-    active:boolean
-}
 
-export type RegexAddForm = {
-    service_id:string,
-    regex:string,
-    is_case_sensitive:boolean,
-    is_blacklist:boolean,
-    mode:string, // C->S S->C BOTH,
-    active: boolean
-}
 
 export const nfregex = {
     stats: async () => {