diff --git a/src/components/editor/faultTree/Editor.tsx b/src/components/editor/faultTree/Editor.tsx index 1c3776a1..e461ee46 100644 --- a/src/components/editor/faultTree/Editor.tsx +++ b/src/components/editor/faultTree/Editor.tsx @@ -18,7 +18,6 @@ import { FTABoundary } from "@components/editor/faultTree/shapes/shapesDefinitio import * as joint from "jointjs"; import { Rectangle } from "@models/utils/Rectangle"; import { JOINTJS_NODE_MODEL } from "@components/editor/faultTree/shapes/constants"; -import { calculateCutSets } from "@services/faultTreeService"; import { FaultEventScenario } from "@models/faultEventScenario"; import { useAppBar } from "../../../contexts/AppBarContext"; import { asArray } from "@utils/utils"; @@ -50,13 +49,8 @@ const Editor = () => { useEffect(() => { if (faultTree) { - const rootReqProb = faultTree.manifestingEvent.supertypes?.hasFailureRate?.requirement?.upperBound; - const updatedRootEvent = rootReqProb - ? { ...faultTree.manifestingEvent, probabilityRequirement: rootReqProb } - : faultTree.manifestingEvent; - setAppBarTitle(faultTree.name); - setRootEvent(updatedRootEvent); + setRootEvent(faultTree.manifestingEvent); if (faultTree.faultEventScenarios) { setFaultEventScenarios([getScenarioWithHighestProbability(asArray(faultTree.faultEventScenarios))]); diff --git a/src/components/editor/faultTree/menu/faultEvent/FaultEventMenu.tsx b/src/components/editor/faultTree/menu/faultEvent/FaultEventMenu.tsx index 799d7df6..eea87546 100644 --- a/src/components/editor/faultTree/menu/faultEvent/FaultEventMenu.tsx +++ b/src/components/editor/faultTree/menu/faultEvent/FaultEventMenu.tsx @@ -71,6 +71,8 @@ const FaultEventMenu = ({ selectedShapeToolData, onEventUpdated, refreshTree, ro const [resetMenu, setResetMenu] = useState(false); const [shapeToolData, setShapeToolData] = useState(undefined); + const getRequiredFailureRate = () => shapeToolData.supertypes?.hasFailureRate?.requirement?.upperBound; + useEffect(() => { if (isModified) { setShowUnsavedChangesDialog(true); @@ -284,7 +286,6 @@ const FaultEventMenu = ({ selectedShapeToolData, onEventUpdated, refreshTree, ro }, [isDirty]); const basedFailureRate = shapeToolData?.supertypes?.hasFailureRate?.estimate?.value; - const requiredFailureRate = shapeToolData?.supertypes?.hasFailureRate?.requirement?.upperBound; const { predictionIri, operationalIri } = getFailureRateIris(shapeToolData?.supertypes?.supertypes); const FailureRateBox = ({ value, label, rate, selected, outdated }) => ( @@ -338,11 +339,11 @@ const FaultEventMenu = ({ selectedShapeToolData, onEventUpdated, refreshTree, ro )} - {shapeToolData?.probabilityRequirement && ( + {getRequiredFailureRate() && ( {t("faultEventMenu.requiredFailureRate")}: - {shapeToolData?.probabilityRequirement.toExponential(2)} + {getRequiredFailureRate().toExponential(2)} )} @@ -370,11 +371,11 @@ const FaultEventMenu = ({ selectedShapeToolData, onEventUpdated, refreshTree, ro )} - {requiredFailureRate && ( + {getRequiredFailureRate() && ( {t("faultEventMenu.requiredFailureRate")}: - {shapeToolData?.supertypes?.hasFailureRate?.requirement?.upperBound.toExponential(2)} + {getRequiredFailureRate().toExponential(2)} )} diff --git a/src/components/editor/faultTree/shapes/RenderTree.tsx b/src/components/editor/faultTree/shapes/RenderTree.tsx index 796095f1..34c93aa7 100644 --- a/src/components/editor/faultTree/shapes/RenderTree.tsx +++ b/src/components/editor/faultTree/shapes/RenderTree.tsx @@ -4,7 +4,6 @@ import { sequenceListToArray } from "../../../../services/faultEventService"; import * as faultEventService from "../../../../services/faultEventService"; import { Link } from "./shapesDefinitions"; import { flatten } from "lodash"; -import { has } from "lodash"; import { ERROR_PATH_COLOR, JOINTJS_NODE_MODEL, @@ -12,7 +11,6 @@ import { LABEL_FONT_SIZE, } from "@components/editor/faultTree/shapes/constants"; import { getNodeWidthForText } from "@utils/treeUtils"; -import { Status } from "@utils/constants"; import { asArray } from "@utils/utils"; const referenceIcon = @@ -82,9 +80,7 @@ const renderTree = async (container, node, parentShape = null, pathsToHighlight, } } - const probReqValue = - (isReferencedNode(node) && node.supertypes?.hasFailureRate?.requirement?.upperBound?.toExponential(2)) || - (has(node, "probabilityRequirement") && node.probabilityRequirement.toExponential(2)); + const probReqValue = node?.supertypes?.hasFailureRate?.requirement?.upperBound?.toExponential(2); if (probReqValue) { nodeShape.attr(["probabilityRequirementLabel", "text"], probReqValue);