mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #469 from chakflying/patch-1 

Fix: Fix importing tag if tag doesn't exist
This commit is contained in:
Louis Lam 2021-09-24 15:41:13 +08:00 committed by GitHub
parent 50b868e751 662c97dcde
commit c669e7eaba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
server/server.js
View File

@ -945,17 +945,17 @@ exports.entryPage = "dashboard";
socket.on("uploadBackup", async (uploadedJSON, importHandle, callback) => { socket.on("uploadBackup", async (uploadedJSON, importHandle, callback) => {
try { try {
checkLogin(socket) checkLogin(socket);
let backupData = JSON.parse(uploadedJSON); let backupData = JSON.parse(uploadedJSON);
console.log(`Importing Backup, User ID: ${socket.userID}, Version: ${backupData.version}`) console.log(`Importing Backup, User ID: ${socket.userID}, Version: ${backupData.version}`);
let notificationListData = backupData.notificationList; let notificationListData = backupData.notificationList;
let monitorListData = backupData.monitorList; let monitorListData = backupData.monitorList;
let version17x = compareVersions.compare(backupData.version, '1.7.0', '>=') let version17x = compareVersions.compare(backupData.version, "1.7.0", ">=");
// If the import option is "overwrite" it'll clear most of the tables, except "settings" and "user" // If the import option is "overwrite" it'll clear most of the tables, except "settings" and "user"
if (importHandle == "overwrite") { if (importHandle == "overwrite") {
// Stops every monitor first, so it doesn't execute any heartbeat while importing // Stops every monitor first, so it doesn't execute any heartbeat while importing
@ -1050,38 +1050,38 @@ exports.entryPage = "dashboard";
// Only for backup files with the version 1.7.0 or higher, since there was the tag feature implemented // Only for backup files with the version 1.7.0 or higher, since there was the tag feature implemented
if (version17x) { if (version17x) {
// Only import if the specific monitor has tags assigned // Only import if the specific monitor has tags assigned
if (monitorListData[i].tags.length >= 1) { for (const oldTag of monitorListData[i].tags) {
for (let o = 0; o < monitorListData[i].tags.length; o++) {
// Check if tag already exists and get data -> // Check if tag already exists and get data ->
let tag = await R.findOne("tag", " name = ?", [ let tag = await R.findOne("tag", " name = ?", [
monitorListData[i].tags[o].name, oldTag.name,
]) ]);
// Set tagId to vaule from database let tagId;
let tagId = tag.id if (! tag) {
// -> If it doesn't exist, create new tag from backup file
let beanTag = R.dispense("tag");
beanTag.name = oldTag.name;
beanTag.color = oldTag.color;
await R.store(beanTag);
// -> If it doesn't, create new tag from backup file tagId = beanTag.id;
if (! tag) { } else {
let beanTag = R.dispense("tag") // -> If it already exist, set tagId to value from database
beanTag.name = monitorListData[i].tags[o].name tagId = tag.id;
beanTag.color = monitorListData[i].tags[o].color
await R.store(beanTag)
tagId = beanTag.id
}
// Assign the new created tag to the monitor
await R.exec("INSERT INTO monitor_tag (tag_id, monitor_id, value) VALUES (?, ?, ?)", [
tagId,
bean.id,
monitorListData[i].tags[o].value,
])
} }
// Assign the new created tag to the monitor
await R.exec("INSERT INTO monitor_tag (tag_id, monitor_id, value) VALUES (?, ?, ?)", [
tagId,
bean.id,
oldTag.value,
]);
} }
} }
await updateMonitorNotification(bean.id, notificationIDList) await updateMonitorNotification(bean.id, notificationIDList);
// If monitor was active start it immediately, otherwise pause it // If monitor was active start it immediately, otherwise pause it
if (monitorListData[i].active == 1) { if (monitorListData[i].active == 1) {