Better flow of error display and hide controls if needed

Build all packages
luc-github · Apr 9, 2024 · 33f06c5 · 33f06c5
1 parent fccdb44
commit 33f06c5
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 23 deletions.
diff --git a/dist/CNC/GRBL/index.html.gz b/dist/CNC/GRBL/index.html.gz
diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz
diff --git a/dist/Plotter/HP-GL/index.html.gz b/dist/Plotter/HP-GL/index.html.gz
diff --git a/dist/Printer3D/Marlin-embedded/index.html.gz b/dist/Printer3D/Marlin-embedded/index.html.gz
diff --git a/dist/Printer3D/Marlin/index.html.gz b/dist/Printer3D/Marlin/index.html.gz
diff --git a/dist/Printer3D/Repetier/index.html.gz b/dist/Printer3D/Repetier/index.html.gz
diff --git a/dist/Printer3D/Smoothieware/index.html.gz b/dist/Printer3D/Smoothieware/index.html.gz
diff --git a/dist/SandTable/GRBL/index.html.gz b/dist/SandTable/GRBL/index.html.gz
diff --git a/src/components/Panels/Status.js b/src/components/Panels/Status.js
@@ -71,10 +71,10 @@ const TimeControl = ({ label, time }) => {
 const StatusControls = () => {
     const { streamStatus, status } = useTargetContext()
     if (!useUiContextFn.getValue('showstatuspanel')) return null
-    console.log("streamStatus")   
+    console.log('streamStatus')
     console.log(streamStatus)
-    console.log( "status")
-    console.log( status)
+    console.log('status')
+    console.log(status)
     return (
         <Fragment>
             {streamStatus &&
@@ -140,22 +140,24 @@ const StatusControls = () => {
                                 {status.filename}
                             </div>
                         )}
-                        {status.printState.printing && (
-                            <Fragment>
-                                <div class="extra-control-value">
-                                    {status.printState.progress}%
-                                </div>
+                        {status.printState.printing &&
+                            status.printState.progress !=
+                                'NaN'(
+                                    <Fragment>
+                                        <div class="extra-control-value">
+                                            {status.printState.progress}%
+                                        </div>
 
-                                <TimeControl
-                                    label="P105"
-                                    time={status.printTime}
-                                />
-                                <TimeControl
-                                    label="P112"
-                                    time={status.printLeftTime}
-                                />
-                            </Fragment>
-                        )}
+                                        <TimeControl
+                                            label="P105"
+                                            time={status.printTime}
+                                        />
+                                        <TimeControl
+                                            label="P112"
+                                            time={status.printLeftTime}
+                                        />
+                                    </Fragment>
+                                )}
                     </div>
                 </div>
             )}
@@ -166,6 +168,7 @@ const StatusControls = () => {
 const StatusPanel = () => {
     const { toasts, panels } = useUiContext()
     const { status, streamStatus } = useTargetContext()
+    console.log(status, streamStatus);
     const { createNewRequest } = useHttpFn
     const id = 'statusPanel'
     const hidePanel = () => {
@@ -317,7 +320,7 @@ const StatusPanel = () => {
                 {((status.printState && status.printState.printing) ||
                     (streamStatus &&
                         streamStatus.status &&
-                        streamStatus.status != 'no stream')) &&
+                        streamStatus.status != 'no stream') && streamStatus.name !="") &&
                     deviceList.map((device) => {
                         if (
                             !device.depend.every((d) =>

diff --git a/src/targets/Printer3D/Marlin/TargetContext.js b/src/targets/Printer3D/Marlin/TargetContext.js
@@ -253,7 +253,7 @@ const TargetContextProvider = ({ children }) => {
             if (data[0] === '{') {
                 console.log('response', data)
                 if (isStreamingStatus(data)) {
-                    setStatus({ printState: null })
+
                     const preStatus = getStreamingStatus(data)
                     const name = preStatus.name
                     const status = preStatus.status
@@ -294,6 +294,10 @@ const TargetContextProvider = ({ children }) => {
                         printLeftTime,
                     }
                     setStreamStatus(fullstatus)
+                    if (status!="no stream"){ 
+                        setStatus({ printState: null })
+
+                    }    
                 }
             }
         }

diff --git a/src/targets/Printer3D/Marlin/filters.js b/src/targets/Printer3D/Marlin/filters.js
@@ -360,7 +360,7 @@ const getSensor = (str) => {
 //
 // Streaming status
 const isStreamingStatus = (str) => {
-    console.log('isStreamingStatus', str)
+    //console.log('isStreamingStatus', str)
     try {
         const res = JSON.parse(str)
         if (res.cmd == '701' && typeof res.data != 'undefined') {
@@ -376,9 +376,9 @@ const isStreamingStatus = (str) => {
 }
 
 const getStreamingStatus = (str) => {
-    console.log('getStreamingStatus', str)
+    //console.log('getStreamingStatus', str)
     const res = JSON.parse(str)
-    console.log('getStreamingStatus', res)
+    //console.log('getStreamingStatus', res)
     if (res.data.status) return res.data
     return { status: res.data }
 }