Merge pull request #619 from kbss-cvut/fix/560-cant-delete-manual-fai…

…lure-rate Fix cant delete manual failure rate
kbss-cvut · Oct 8, 2024 · d5d1257 · d5d1257
2 parents e434734 + cf7c8c5
commit d5d1257
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/src/components/editor/faultTree/canvas/EditorCanvas.tsx b/src/components/editor/faultTree/canvas/EditorCanvas.tsx
@@ -17,7 +17,7 @@ import { JOINTJS_NODE_MODEL } from "@components/editor/faultTree/shapes/constant
 import { FaultEventScenario } from "@models/faultEventScenario";
 import { findNodeByIri } from "@utils/treeUtils";
 import FaultEventScenariosTable from "../menu/FaultEventScenariosTable";
-import { Box, TextField, Typography, IconButton, useTheme } from "@mui/material";
+import { Box, TextField, Typography, IconButton, useTheme, Divider } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import RestartAltIcon from "@mui/icons-material/RestartAlt";
 import PlayArrow from "@mui/icons-material/PlayArrow";
@@ -370,6 +370,8 @@ const EditorCanvas = ({
             </IconButton>
           </Box>
         </CurrentFaultTreeTableProvider>
+        <Divider className={classes.divider} />
+
         {!showTable && (
           <FaultEventMenu
             selectedShapeToolData={sidebarSelectedEvent}

diff --git a/src/components/editor/faultTree/menu/faultEvent/FaultEventMenu.tsx b/src/components/editor/faultTree/menu/faultEvent/FaultEventMenu.tsx
@@ -131,7 +131,7 @@ const FaultEventMenu = ({
 
     if (selectedRadioButton === RadioButtonType.Manual) {
       await updateEvent({
-        probability: manualFailureRates[shapeToolData.eventType] || manualFailureRates.default,
+        probability: manualFailureRates[shapeToolData.eventType],
         selectedEstimate: undefined,
       });
     } else {
@@ -153,11 +153,12 @@ const FaultEventMenu = ({
     const inputValue = event.target.value;
     const regex = /^[0-9]*\.?[0-9]*$/;
     if (regex.test(inputValue)) {
+      const inputNumber = inputValue === "" ? undefined : inputValue;
       if (type === NodeTypeWithManualFailureRate.Sns) {
-        setBasicManuallyDefinedFailureRate(inputValue);
+        setBasicManuallyDefinedFailureRate(inputNumber);
       }
       if (type === NodeTypeWithManualFailureRate.External) {
-        setExternalManuallyDefinedFailureRate(inputValue);
+        setExternalManuallyDefinedFailureRate(inputNumber);
       }
       setIsModified(true);
     }
@@ -419,11 +420,6 @@ const FaultEventMenu = ({
       {/* ROOT NODE */}
       {shapeToolData && shapeToolData.iri === rootIri && (
         <>
-          {basedFailureRate && (
-            <Box className={classes.eventPropertyRow}>{fhaFailureRateComponent(basedFailureRate, null, null)}</Box>
-          )}
-          {getRequiredFailureRate() &&
-            requiredFailureRateComponent(getRequiredFailureRate(), requiredFailureRateStatusColor, violatesRequirement)}
           {shapeToolData?.probability && (
             <Box className={classes.eventPropertyRow}>
               {calculatedFailureRateComponent(
@@ -433,18 +429,18 @@ const FaultEventMenu = ({
               )}
             </Box>
           )}
+          {getRequiredFailureRate() &&
+            requiredFailureRateComponent(getRequiredFailureRate(), requiredFailureRateStatusColor, violatesRequirement)}
+          {basedFailureRate && (
+            <Box className={classes.eventPropertyRow}>{fhaFailureRateComponent(basedFailureRate, null, null)}</Box>
+          )}
           <Divider className={classes.divider} />
         </>
       )}
 
       {/* EXTERNAL NODE  */}
       {shapeToolData && shapeToolData.eventType === EventType.EXTERNAL && shapeToolData.isReference && (
         <>
-          {basedFailureRate && (
-            <Box className={classes.eventPropertyRow}>{fhaFailureRateComponent(basedFailureRate, null, null)}</Box>
-          )}
-          {getRequiredFailureRate() &&
-            requiredFailureRateComponent(getRequiredFailureRate(), requiredFailureRateStatusColor, violatesRequirement)}
           {shapeToolData?.probability && (
             <Box className={classes.eventPropertyRow}>
               {calculatedFailureRateComponent(
@@ -454,6 +450,11 @@ const FaultEventMenu = ({
               )}
             </Box>
           )}
+          {getRequiredFailureRate() &&
+            requiredFailureRateComponent(getRequiredFailureRate(), requiredFailureRateStatusColor, violatesRequirement)}
+          {basedFailureRate && (
+            <Box className={classes.eventPropertyRow}>{fhaFailureRateComponent(basedFailureRate, null, null)}</Box>
+          )}
           <Divider className={classes.divider} />
         </>
       )}
@@ -463,7 +464,7 @@ const FaultEventMenu = ({
         <>
           {shapeToolData?.probability && (
             <Box className={classes.eventPropertyRow}>
-              {failureRateComponent(shapeToolData.probability, theme.main.black, [])}
+              {failureRateComponent(shapeToolData.probability, "eventDescription.manuallyDefinedFailureRate", [])}
             </Box>
           )}
         </>