fix(server): unable to detach spools from printer

Server wasn't running the detach command when no printer id was supplied Closes: #1232
OctoFarm · Oct 1, 2022 · 20c3489 · 20c3489
1 parent 1ed2977
commit 20c3489
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/client/js/pages/filament-manager/filament-manager.actions.js b/client/js/pages/filament-manager/filament-manager.actions.js
@@ -10,6 +10,7 @@ export async function selectFilament(spools, id) {
   let printerIds = [];
   for (const spool of spools) {
     const meta = spool.split("-");
+
     printerIds.push({
       printer: meta[0],
       tool: meta[1],

diff --git a/server/routes/filament-manager.routes.js b/server/routes/filament-manager.routes.js
@@ -49,7 +49,6 @@ router.get('/get/dropDownList', ensureAuthenticated, async (_req, res) => {
 router.post('/assign', ensureAuthenticated, async (req, res) => {
   logger.info('Request to change selected spool:', req.body.printers);
   const multiSelectEnabled = SettingsClean.isMultipleSelectEnabled();
-
   await getPrinterStoreCache().assignSpoolToPrinters(
     req.body.printers,
     req.bodyString('spoolId'),

diff --git a/server/services/printers/create-octoprint.service.js b/server/services/printers/create-octoprint.service.js
@@ -1457,7 +1457,7 @@ class OctoPrintPrinter {
 
   updatePrinterData(data) {
     logger.silly('Updating printer database: ', data);
-    this.#db.update(data);
+    this?.#db?.update(data);
   }
 
   resetApiTimeout() {

diff --git a/server/store/printers.store.js b/server/store/printers.store.js
@@ -1343,13 +1343,15 @@ class PrinterStore {
     for (let id of printerIDs) {
       // No tool is de-attach request
       if (!id?.tool) {
+        this.deattachSpoolFromAllPrinters(spoolID);
         break;
       }
       const tool = id.tool;
       const printerID = id.printer;
       const printerIndex = findIndex(farmPrinters, function (o) {
         return o._id === printerID;
       });
+
       if (spoolID !== '0') {
         const spool = await Filament.findById(spoolID);
         farmPrinters[printerIndex].selectedFilament[tool] = JSON.parse(JSON.stringify(spool));