From b622a7ded774e9e7832a4f6f4773a470463993c7 Mon Sep 17 00:00:00 2001 From: "Vyacheslav.Sviridov" Date: Sat, 24 Feb 2024 19:45:28 +0600 Subject: [PATCH] FIX: minor fixs --- lib/applications/BulkImport/jobs.js | 10 +++++----- lib/applications/BulkImport/operations.js | 3 +++ lib/components/webSocketSession.js | 9 +++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/applications/BulkImport/jobs.js b/lib/applications/BulkImport/jobs.js index a0fdcba..65beebe 100755 --- a/lib/applications/BulkImport/jobs.js +++ b/lib/applications/BulkImport/jobs.js @@ -154,11 +154,11 @@ async function getJobs() { nameValue.push(chalk.dim.italic(status)) if (summary) { const { executed, executionErrors, invalid, parsed, valid } = summary.total - nameValue.push(chalk.dim(`🍳${parsed}`)) - nameValue.push(chalk.dim(`☑${valid}`)) - nameValue.push(chalk.dim(`⚠${invalid}`)) - nameValue.push(chalk.dim(`✅${executed}`)) - nameValue.push(chalk.dim(`❌${executionErrors}`)) + nameValue.push(chalk.dim(`🍳 ${parsed}`)) + nameValue.push(chalk.dim(`☑ ${valid}`)) + nameValue.push(chalk.dim(`⚠ ${invalid}`)) + nameValue.push(chalk.dim(`✅ ${executed}`)) + nameValue.push(chalk.dim(`❌ ${executionErrors}`)) } else { for (let index = 0; index < 5; index++) { nameValue.push(chalk.dim('⏳')) diff --git a/lib/applications/BulkImport/operations.js b/lib/applications/BulkImport/operations.js index 087e3a8..a4badf0 100755 --- a/lib/applications/BulkImport/operations.js +++ b/lib/applications/BulkImport/operations.js @@ -26,6 +26,9 @@ function operationStatus(type, status) { async function getOperations(failures = false, errors = false) { + if (this.failures !== failures || this.errors !== errors) { + this.operationsOffset = 0 + } this.failures = failures this.errors = errors const params = new URLSearchParams() diff --git a/lib/components/webSocketSession.js b/lib/components/webSocketSession.js index 19c5c8a..f2a30fe 100755 --- a/lib/components/webSocketSession.js +++ b/lib/components/webSocketSession.js @@ -32,8 +32,8 @@ function socketOnClose(event, resolve, reject) { function socketOnError(error, reject) { - process.stdin.setRawMode(false) - process.stdin.pause() + process.stdin.setRawMode(false) + process.stdin.pause() reject(error) } @@ -55,8 +55,9 @@ async function webSocketSession(headers, socketUrl) { .resume() .setEncoding('utf8') .on('data', (key) => { - if (key === '\u0003') { - socket.send('exit') + if (key === '\u0004') { + socket.close() + socket.send('\u0003') resolve() } socket.send(key)