fix conditioning for machine status

Sienci-Labs · Sep 5, 2024 · 18e90fe · 18e90fe
1 parent 094dfd5
commit 18e90fe
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/app/src/features/MachineStatus/MachineStatus.tsx b/src/app/src/features/MachineStatus/MachineStatus.tsx
@@ -97,21 +97,21 @@ const MachineStatus: React.FC<MachineStatusProps> = ({ activeState, alarmCode, i
                         isConnected && activeState ? (
                             <>
                                 {
-                                    // activeState === GRBL_ACTIVE_STATE_ALARM ? (
-                                    <div className="flex w-full flex-row justify-center align-middle items-center font-light text-3xl mb-1">
-                                        <div className="flex justify-center">{activeState}</div>
-                                        <div className="absolute right-3 flex float-right"><AlarmDescriptionIcon code={alarmCode} /></div>
-                                    </div>
-                                    // ) : (
-                                    //     <span className="flex w-full font-light text-3xl mb-1 justify-center">{message[activeState]}</span>
-                                    // )
+                                    activeState === GRBL_ACTIVE_STATE_ALARM ? (
+                                        <div className="flex w-full flex-row justify-center align-middle items-center font-light text-3xl mb-1">
+                                            <div className="flex justify-center">{activeState}</div>
+                                            <div className="absolute right-3 flex float-right"><AlarmDescriptionIcon code={alarmCode} /></div>
+                                        </div>
+                                    ) : (
+                                        <span className="flex w-full font-light text-3xl mb-1 justify-center">{message[activeState]}</span>
+                                    )
                                 }
                             </>
                         ) : <h1 className="flex w-full font-light text-3xl mb-1 justify-center">Disconnected</h1>
                     }
                 </div>
                 <div className="mt-4">
-                    <UnlockButton onClick={unlock} alarmCode={alarmCode} activeState={activeState} />
+                    { (activeState === GRBL_ACTIVE_STATE_ALARM || activeState === GRBL_ACTIVE_STATE_HOLD) && <UnlockButton onClick={unlock} alarmCode={alarmCode} activeState={activeState} />}
                 </div>
             </div>
         )