fix: #250 dockly crashes on attempt to display non-existent widget (#254

)
lirantal · Jul 29, 2023 · 70b15de · 70b15de
1 parent a09177d
commit 70b15de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/widgetsTemplates/list.widget.template.js b/src/widgetsTemplates/list.widget.template.js
@@ -45,9 +45,9 @@ class myWidget extends baseWidget(EventEmitter) {
             this.toggleWidgetListColor = !this.toggleWidgetListColor
 
             if (this.toggleWidgetListColor) {
-              str = chalk.cyan(chunk.toString('utf-8').trim())
+              str = chalk.cyan(chunk.toString('utf8').trim())
             } else {
-              str = chalk.green(chunk.toString('utf-8').trim())
+              str = chalk.green(chunk.toString('utf8').trim())
             }
 
             this.updateItemLogs(str)

diff --git a/widgets/containers/containerList.widget.js b/widgets/containers/containerList.widget.js
@@ -20,15 +20,21 @@ class myWidget extends ListWidget {
   }
 
   getItemLogs (containerId, cb) {
-    return this.utilsRepo.get('docker').getContainerLogs(containerId, cb)
+    if (this.widgetsRepo.has('containerLogs')) {
+      return this.utilsRepo.get('docker').getContainerLogs(containerId, cb)
+    }
   }
 
   updateItemLogs (str) {
-    return this.widgetsRepo.get('containerLogs').update(str)
+    if (this.widgetsRepo.has('containerLogs')) {
+      return this.widgetsRepo.get('containerLogs').update(str)
+    }
   }
 
   clearItemLogs () {
-    return this.widgetsRepo.get('containerLogs').clear()
+    if (this.widgetsRepo.has('containerLogs')) {
+      return this.widgetsRepo.get('containerLogs').clear()
+    }
   }
 
   getListItems (cb) {