Fixed UI bugs on printer manager

Fixed OctoFarm#19

Author: JamesVexica

CHANGELOG.md

@@ -14,8 +14,7 @@ All notable changes to this project will be documented in this file.
 
 - Offline Polling is now back. System -> Server Settings to change and click save to update.
 - Updated the note on the settings screen to better reflect this and it's affect. Yes I like potato's.
-- Changed the whole websocket implementation to help with issue #15. NOTE: If you add your printer to the farm offline, you may still need to re-sync it to get it detected by the farm. I'm working on why this is happening still. Printers added Online then going Offline do not encounter this. This is also the case for restarting the server with offline printers. 
-
+- Changed the whole websocket implementation to help with issue #15. NOTE: If you add your printer to the farm offline, you may still need to re-sync (dashboard re-sync button) it to get it detected by the farm. I'm working on why this is happening still. Printers added Online then going Offline do not encounter this. This is also the case for restarting the server with offline printers. 
 
 ### Removed
 
@@ -25,7 +24,8 @@ All notable changes to this project will be documented in this file.
 
 - Fixed the errant " displayed on all views
 - Fixed the errant . when loading offline printers.
-- Fixed issue with printer's not collecting correct data #15 ie _default bug... Should no longer exist.
+- Fixed issue with printer's not collecting correct data issue #15 ie _default bug... Should no longer exist.
+- Fixed issue with retract button not working issue #18
 
 ### Security
 

docker/entrypoint.sh

@@ -41,4 +41,4 @@ EOF
 
 fi
 
-node app.js > /app/logs/production.log 2> /app/logs/productionError.log
+node app.js

runners/state.js

@@ -78,11 +78,12 @@ WebSocketClient.prototype.reconnect = function(e){
 }
 WebSocketClient.prototype.onopen = async function(e){
   //console.log("WebSocketClient: open",arguments);
+  await Runner.getProfile(this.index);
   await Runner.getState(this.index);
   await Runner.getFiles(this.index, "files?recursive=true");
   await Runner.getSystem(this.index);
   await Runner.getSettings(this.index);
-  await Runner.getProfile(this.index);
+
   let Polling = await ServerSettings.check();
   var data = {};
   data["auth"] = farmPrinters[this.index].currentUser + ":" + farmPrinters[this.index].apikey;
@@ -281,11 +282,12 @@ static async init() {
         index +
         " socket is either Closing/Connecting please await that to finish before attempting a reconnect...";
     }else{
+      await Runner.getProfile(index);
       await Runner.getState(index);
       await Runner.getFiles(index, "files?recursive=true");
       await Runner.getSystem(index);
       await Runner.getSettings(index);
-      await Runner.getProfile(index);
+
       result.status = "success";
       result.msg =
           "Printer: " +

views/js/lib/modules/printerManager.js

@@ -487,7 +487,7 @@ export default class PrinterManager {
           </div>
       </div>
       <div class="row">
-          <div class="col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5">
+          <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-4">
               <div class="row">
                   <div class="col-12">
                       <center>
@@ -515,7 +515,7 @@ export default class PrinterManager {
                   </div>
               </div>
           </div>
-          <div class="col-12 col-sm-12 col-md-12 col-lg-3 col-xl-3">
+          <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-4">
               <div class="row">
                   <div class="col-12">
                       <center>
@@ -992,6 +992,7 @@ export default class PrinterManager {
         if (select) {
           let value = elements.printerControls.extruder.value;
           let opt = {
+
             command: "extrude",
             amount: parseInt(value)
           };
@@ -1024,13 +1025,15 @@ export default class PrinterManager {
         let select = OctoPrintClient.selectTool(printer, "tool0");
         if (select) {
           let value = elements.printerControls.extruder.value;
+          value = "-"+value;
           let opt = {
             command: "extrude",
             amount: parseInt(value)
           };
+          console.log(opt)
           let post = await OctoPrintClient.post(
             printer,
-            "printer/command",
+            "printer/tool",
             opt
           );
           if (post.status === 204) {