dockly 3.24.4 → 3.24.5

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "dockly",
-  "version": "3.24.4",
+  "version": "3.24.5",
   "description": "Immersive terminal interface for managing docker containers and services",
   "main": "index.js",
   "scripts": {
-    "test": "yarn run lint",
-    "lint": "standard && yarn run lint:lockfile",
+    "test": "npm run lint",
+    "lint": "standard && npm run lint:lockfile",
     "lint:fix": "standard --fix",
-    "lint:lockfile": "lockfile-lint --path yarn.lock --type yarn --validate-https --allowed-hosts npm yarn",
+    "lint:lockfile": "lockfile-lint --path package-lock.json --type npm --validate-https --allowed-hosts npm",
     "debug": "node --inspect=0.0.0.0:9222 ./index.js "
   },
   "files": [

package/src/grid.config.js

@@ -0,0 +1,43 @@
+const CONTAINERS_GRID_LAYOUT = {
+  'actionsMenu': [4, 4, 4, 4],
+  'help': [4, 4, 4, 4],
+  'containerInfo': [2, 2, 8, 8],
+  'containerSortList': [4, 5, 3, 2],
+  'containerList': [0, 0, 6, 10],
+  'actionStatus': [6, 0, 1.5, 10],
+  'containerStatus': [0, 10, 2, 2],
+  'containerUtilization': [2, 10, 3, 2],
+  'containerVsImages': [5, 10, 2, 2],
+  'containerLogs': [7.5, 0, 4, 12],
+  'toolbar': [11.5, 0, 1, 12],
+  'searchInput': [11, 0, 1, 12]
+}
+
+const SERVICES_GRID_LAYOUT = {
+  'actionsMenu': [4, 4, 4, 4],
+  'actionStatus': [6, 0, 1.5, 10],
+  'searchInput': [11, 0, 1, 12],
+  'help': [4, 4, 4, 4],
+  'servicesInfo': [2, 2, 8, 8],
+  'servicesList': [0, 0, 6, 10],
+  'servicesLogs': [7.5, 0, 4, 12],
+  'servicesStatus': [0, 10, 2, 2],
+  'servicesVsImages': [2, 10, 2, 2],
+  'toolbar': [11, 0, 1, 12]
+}
+
+const IMAGES_GRID_LAYOUT = {
+  'imageInfo': [2, 2, 8, 8],
+  'imageList': [0, 0, 6, 10],
+  'searchInput': [11, 0, 1, 12],
+  'actionStatus': [6, 0, 1.5, 10],
+  'help': [4, 4, 4, 4],
+  'toolbar': [11, 0, 1, 12],
+  'imageUtilization': [0, 10, 2, 2]
+}
+
+module.exports = {
+  CONTAINERS_GRID_LAYOUT,
+  SERVICES_GRID_LAYOUT,
+  IMAGES_GRID_LAYOUT
+}

package/src/screen.js

@@ -4,48 +4,11 @@ const path = require('path')
 const blessed = require('blessed')
 const contrib = require('blessed-contrib')
 const assetsLoader = require(path.join(__dirname, '/assetsLoader'))
-
+const { CONTAINERS_GRID_LAYOUT, SERVICES_GRID_LAYOUT, IMAGES_GRID_LAYOUT } = require('./grid.config')
 const MODES = require('../lib/modes')
 
 // @TODO should be moved outside and used as a config
 // from the user (index.js)
-const CONTAINERS_GRID_LAYOUT = {
-  'actionsMenu': [4, 4, 4, 4],
-  'help': [4, 4, 4, 4],
-  'containerInfo': [2, 2, 8, 8],
-  'containerSortList': [4, 5, 3, 2],
-  'containerList': [0, 0, 6, 10],
-  'actionStatus': [6, 0, 1, 10],
-  'containerStatus': [0, 10, 2, 2],
-  'containerUtilization': [2, 10, 3, 2],
-  'containerVsImages': [5, 10, 2, 2],
-  'containerLogs': [7, 0, 4, 12],
-  'toolbar': [11, 0, 1, 12],
-  'searchInput': [11, 0, 1, 12]
-}
-
-const SERVICES_GRID_LAYOUT = {
-  'actionsMenu': [4, 4, 4, 4],
-  'actionStatus': [6, 0, 1, 10],
-  'searchInput': [11, 0, 1, 12],
-  'help': [4, 4, 4, 4],
-  'servicesInfo': [2, 2, 8, 8],
-  'servicesList': [0, 0, 6, 10],
-  'servicesLogs': [7, 0, 4, 12],
-  'servicesStatus': [0, 10, 2, 2],
-  'servicesVsImages': [2, 10, 2, 2],
-  'toolbar': [11, 0, 1, 12]
-}
-
-const IMAGES_GRID_LAYOUT = {
-  'imageInfo': [2, 2, 8, 8],
-  'imageList': [0, 0, 6, 10],
-  'searchInput': [11, 0, 1, 12],
-  'actionStatus': [6, 0, 1, 10],
-  'help': [4, 4, 4, 4],
-  'toolbar': [11, 0, 1, 12],
-  'imageUtilization': [0, 10, 2, 2]
-}
 
 const GRID_LAYOUT = {}
 GRID_LAYOUT[MODES.container] = CONTAINERS_GRID_LAYOUT

package/src/widgetsTemplates/list.widget.template.js

@@ -34,7 +34,6 @@ class myWidget extends baseWidget(EventEmitter) {
         if (err) {
           return null
         }
-
         // clear log box of previous logs
         this.clearItemLogs()
 
@@ -75,6 +74,12 @@ class myWidget extends baseWidget(EventEmitter) {
       })
 
       searchInput.on('exitSearch', () => {
+        this.update(
+          this.containersListData ||
+       this.imagesListData ||
+        this.servicesListData ||
+         [])
+        this.screen.render()
         this.focus()
       })
     }

package/widgets/containers/containerList.widget.js

@@ -45,7 +45,7 @@ class myWidget extends ListWidget {
     let filteredContainersList = this.containersListData[0]
     let containersList = this.containersListData.slice(1)
     let filteredContainers = []
-
+    const headerRow = this.containersListData[0]
     if (data) {
       filteredContainers = containersList.filter((container, index, containerItems) => {
         const containerName = container[1]
@@ -56,12 +56,19 @@ class myWidget extends ListWidget {
         }
       })
     }
-
+    // Render filtered services if available; otherwise, it means either the user hasn't provided input or no matches were found.
     if (filteredContainers.length > 0) {
       filteredContainers.unshift(filteredContainersList)
       this.update(filteredContainers)
     } else {
-      this.update(this.containersListData)
+      if (data.length > 0) {
+        this.update([
+          headerRow,
+          ['', 'No containers found matching: ' + data, '', '', '', '', '']
+        ])
+      } else {
+        this.update(this.containersListData)
+      }
     }
   }
 

package/widgets/images/imageList.widget.js

@@ -20,6 +20,7 @@ class myWidget extends ListWidget {
     let imageTitleList = this.imagesListData[0]
     let imageList = this.imagesListData.slice(1)
     let filteredimages = []
+    const headerRow = this.imagesListData[0]
 
     if (data) {
       filteredimages = imageList.filter((container, index, containerItems) => {
@@ -31,12 +32,19 @@ class myWidget extends ListWidget {
         }
       })
     }
-
+    // Render filtered services if available; otherwise, it means either the user hasn't provided input or no matches were found.
     if (filteredimages.length > 0) {
       filteredimages.unshift(imageTitleList)
       this.update(filteredimages)
     } else {
-      this.update(this.imagesListData)
+      if (data.length > 0) {
+        this.update([
+          headerRow,
+          ['', 'No Images found matching: ' + data, '', '', '', '', '']
+        ])
+      } else {
+        this.update(this.imagesListData)
+      }
     }
   }
 

package/widgets/searchInput.widget.js

@@ -64,8 +64,13 @@ class myWidget extends baseWidget(EventEmitter) {
         this.inputValue = []
         this.widget.destroy()
         this.emit('exitSearch')
+        this.screen.remove(this.widget)
+        this.screen.render()
       } else {
-        this.emit('keypress', this.captureText(key))
+        const searchText = this.captureText(key)
+        this.widget.setValue(searchText)
+        this.emit('keypress', searchText)
+        this.screen.render()
       }
     })
 
@@ -86,12 +91,11 @@ class myWidget extends baseWidget(EventEmitter) {
     // by default, remove this widget from the screen
     this.screen.remove(this.widget)
   }
-
   getWidget () {
     return this.grid.gridObj.set(...this.grid.gridLayout, this.blessed.textbox, {
-      focused: false,
+      focused: true,
       border: 'line',
-      style: this.getWidgetStyle({ bg: 'yellow', fg: 'black' }),
+      style: this.getWidgetStyle(),
       align: 'left',
       inputOnFocus: true,
       vi: true,

package/widgets/services/servicesList.widget.js

@@ -32,23 +32,30 @@ class myWidget extends ListWidget {
     let filteredContainersList = this.servicesListData[0]
     let serviceList = this.servicesListData.slice(1)
     let filteredServices = []
+    const headerRow = this.servicesListData[0]
 
     if (data) {
       filteredServices = serviceList.filter((service) => {
         const serviceName = service[1]
         const serviceImageName = service[2]
-
         if ((serviceName.indexOf(data) !== -1) || (serviceImageName.indexOf(data) !== -1)) {
           return true
         }
       })
     }
-
+    // Render filtered services if available; otherwise, it means either the user hasn't provided input or no matches were found.
     if (filteredServices.length > 0) {
       filteredServices.unshift(filteredContainersList)
       this.update(filteredServices)
     } else {
-      this.update(this.servicesListData)
+      if (data.length > 0) {
+        this.update([
+          headerRow,
+          ['', 'No Services found matching: ' + data, '', '', '', '', '']
+        ])
+      } else {
+        this.update(this.servicesListData)
+      }
     }
   }