Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
},
"packageManager": "yarn@4.9.2",
"devDependencies": {
"electron": "41.0.2",
"eslint": "^9.39.2",
"eslint-plugin-unused-imports": "^4.4.1"
"@eslint/js": "^10.0.1",
"electron": "41.2.0",
"eslint": "^10.2.0",
"eslint-plugin-unused-imports": "^4.4.1",
"globals": "^17.4.0"
},
"dependencies": {
"axios": "^1.13.5",
"electron-context-menu": "^4.1.0",
"axios": "^1.15.0",
"electron-context-menu": "^4.1.2",
"electron-store": "^11.0.2"
}
}
2 changes: 1 addition & 1 deletion runtime/src/js/downloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function updateProgress(callerWindow) {
return;
}
setBadge(Object.keys(downloadQueue).length);
let progress = 0;
let progress;
if(Object.values(downloadQueue).some((item) => item.total === null)) {
// If any of the items in the queue does not have a total, we cannot calculate progress
// so we return 2 to indicate that the progress is indeterminate.
Expand Down
12 changes: 4 additions & 8 deletions runtime/src/js/misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,13 @@ const serverLogFile = path.join(getLocalAppDataPath(), 'pgadmin4.' + (new Date()

// This function is used to read the file and return the content
export const readServerLog = () => {
let data = null;

if (fs.existsSync(serverLogFile)) {
data = fs.readFileSync(serverLogFile, 'utf8');
} else {
let errMsg = 'Unable to read file ' + serverLogFile + '.';
console.warn(errMsg);
return errMsg;
return fs.readFileSync(serverLogFile, 'utf8');
}

return data;
let errMsg = 'Unable to read file ' + serverLogFile + '.';
console.warn(errMsg);
return errMsg;
};

// This function is used to write the data into the log file
Expand Down
Loading
Loading