Merge branch 'dev' into CU-86bzht0qz_M-and-U-value-update-on-edit

Author: MatthewErispe

JeMPI_Apps/JeMPI_UI/src/pages/settings/deterministic/DeterministicContent.tsx

@@ -10,10 +10,11 @@ import {
   IconButton
 } from '@mui/material'
 import AddIcon from '@mui/icons-material/Add'
-import { Field, Rule } from 'types/Configuration'
+import { Configuration, Field, Rule } from 'types/Configuration'
 import { transformFieldName } from 'utils/helpers'
 import SourceView, { RowData } from './SourceView'
 import { useConfiguration } from 'hooks/useUIConfiguration'
+import { DeleteOutline } from '@mui/icons-material'
 
 interface DeterministicContentProps {
   demographicData: Field[]
@@ -225,6 +226,39 @@ const DeterministicContent = ({
     return updatedConfiguration
   }
 
+  const handleDeleteRow = (index: number) => {
+    const updateArray = (arr: any[], idx: number) => {
+      const newArr = [...arr];
+      newArr.splice(idx, 1);
+      return newArr;
+    };
+  
+    setComparators(updateArray(comparators, index));
+    setFields(updateArray(fields, index));
+    if (index > 0) {
+      setOperators(updateArray(operators, index - 1));
+    }
+  
+    const updatedConfiguration = { ...configuration };
+    const ruleType =
+      currentTab === 'link'
+        ? 'link'
+        : currentTab === 'validate'
+        ? 'validate'
+        : 'matchNotification';
+  
+    if (fields.length === 0) {
+      const newRules = updateArray(rules, index);
+      setRules(newRules);
+  
+      if (updatedConfiguration.rules?.[ruleType]) {
+        updatedConfiguration.rules[ruleType].deterministic.splice(index, 1);
+      }
+  
+      setConfiguration(updatedConfiguration as Configuration);
+      localStorage.setItem('configuration', JSON.stringify(updatedConfiguration));
+    }
+  };
   return (
     <Box>
       <Box
@@ -318,6 +352,9 @@ const DeterministicContent = ({
                   label="Select Field"
                   onChange={event => handleFieldChange(index, event)}
                 >
+                  <MenuItem value="" disabled>
+                    Select a field
+                  </MenuItem>
                   {Array.isArray(demographicData) &&
                     demographicData.map(demographicField => (
                       <MenuItem
@@ -353,6 +390,15 @@ const DeterministicContent = ({
                   ))}
                 </Select>
               </FormControl>
+              <IconButton
+                aria-label="delete"
+                color="secondary"
+                id="delete-button"
+                onClick={() => handleDeleteRow(index)}
+                sx={{ alignSelf: 'center' }}
+              >
+                <DeleteOutline />
+              </IconButton>
             </Box>
           ))}
           <Box