turn off configurations for phase 2 (#177)

* turn off configurations for phase 2 * use boolean instead of phase * merge conflict
ScottLogic · Aug 22, 2023 · f8392a3 · f8392a3
1 parent 0e2a3b2
commit f8392a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -130,11 +130,13 @@ function App() {
   return (
     <span id="main-area">
       <div className="side-bar">
+        {/* hide defence box on phases 0 and 1. only allow configuration in sandbox */}
         {/* hide defence box on phases 0 and 1 */}
         {(currentPhase === PHASE_NAMES.PHASE_2 ||
           currentPhase === PHASE_NAMES.SANDBOX) && (
           <DefenceBox
             defences={defencesToShow}
+            showConfigurations={currentPhase > 2 ? true : false}
             triggeredDefences={triggeredDefences}
             defenceActivated={defenceActivated}
             defenceDeactivated={defenceDeactivated}

diff --git a/frontend/src/components/DefenceBox/DefenceBox.tsx b/frontend/src/components/DefenceBox/DefenceBox.tsx
@@ -12,11 +12,13 @@ import { DefenceConfig, DefenceInfo } from "../../models/defence";
 function DefenceBox({
   defences,
   triggeredDefences,
+  showConfigurations,
   defenceActivated,
   defenceDeactivated,
 }: {
   defences: DefenceInfo[];
   triggeredDefences: string[];
+  showConfigurations: boolean;
   defenceActivated: (defenceInfo: DefenceInfo) => void;
   defenceDeactivated: (defenceInfo: DefenceInfo) => void;
 }) {
@@ -127,6 +129,7 @@ function DefenceBox({
           <DefenceMechanism
             key={index}
             defenceDetail={defenceDetail}
+            showConfigurations={showConfigurations}
             setDefenceActive={setDefenceActive}
             setDefenceInactive={setDefenceInactive}
             setDefenceConfiguration={setDefenceConfiguration}

diff --git a/frontend/src/components/DefenceBox/DefenceMechanism.tsx b/frontend/src/components/DefenceBox/DefenceMechanism.tsx
@@ -7,11 +7,13 @@ import { TiTick, TiTimes } from "react-icons/ti";
 
 function DefenceMechanism({
   defenceDetail,
+  showConfigurations,
   setDefenceActive,
   setDefenceInactive,
   setDefenceConfiguration,
 }: {
   defenceDetail: DefenceInfo;
+  showConfigurations: boolean;
   setDefenceActive: (defenceId: string) => void;
   setDefenceInactive: (defenceId: string) => void;
   setDefenceConfiguration: (
@@ -92,7 +94,8 @@ function DefenceMechanism({
         {isInfoBoxVisible ? (
           <div className="strategy-mechanism-info-box">
             <div>{defenceDetail.info}</div>
-            {defenceDetail.config ? (
+
+            {defenceDetail.config && showConfigurations ? (
               <div className="defence-mechanism-config">
                 {defenceDetail.config.map((config) => {
                   return (
@@ -105,6 +108,7 @@ function DefenceMechanism({
                 })}
               </div>
             ) : null}
+
             {isConfigured ? (
               <div className="defence-mechanism-config-validated">
                 {configValidated ? (