diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 9829c18415b772a1fb9b0aeebe371f89f40e9e19..66cc981deb0b4719d4434a0d69e805c024fcb09f 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -2,6 +2,7 @@ const ipcRendererUpdateWeb = require('electron').ipcRenderer; console.log(process.versions) var isrequestedCheckForUpdate037 = false; +var releaseNotes = {}; ipcRendererUpdateWeb.on('update', function (event, message) { var msgJSON = JSON.parse(message); console.log('[DTU] update event ',message); // // message = {key:'',text:''}; @@ -99,39 +100,69 @@ function ipcRendererOnUpdateEvent(msgJSON) { .then(function (data) { console.log('[DTU]', data); - var releaseNotes = data; + releaseNotes = data; document.getElementById('releases_info').innerHTML = ''; + showReleaseNotes(msgJSON.key,msgJSON) + - Object.keys(releaseNotes).map(function (releaseNote, i) { - var SPAN_NODE = document.createElement("SPAN"); - SPAN_NODE.style = "font-size: 16px;font-weight: bold;"; - SPAN_NODE.innerText = "Version: " + releaseNote; - - document.getElementById('releases_info').appendChild(SPAN_NODE); - - var UL_NODE = document.createElement("UL"); - UL_NODE.style = "margin: 5px 0 5px 15px;list-style:none;list-style-type: disc;list-style-position: outside;"; - - releaseNotes[releaseNote].content.map(function (note, j) { - - var LI_NODE = document.createElement("LI"); - LI_NODE.innerText = note; - LI_NODE.style = "margin-left: 20px;"; - UL_NODE.appendChild(LI_NODE); + }) + .catch(err => console.log('[DTU]', err)); - if ((j + 1) === releaseNotes[releaseNote].content.length) { +} +function showReleaseNotes(type, msgJSON) { - document.getElementById('releases_info').appendChild(UL_NODE) - if ((i + 1) === Object.keys(releaseNotes).length) { - } - } - }); - }) + document.getElementById('releases_info').innerHTML = ''; + var releaseNotesVersionsRev = Object.keys(releaseNotes).reverse(); + /** + * When upgrade is available only show latest version from notes + */ + var releaseNotesVersions = Object.keys(releaseNotes); + console.log('[DTU]', 'releaseNotesVersions : ',releaseNotesVersions) + if(msgJSON.upgrade){ + releaseNotesVersions = [msgJSON.version]; + console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade,releaseNotesVersions) + }else{ + releaseNotesVersions = releaseNotesVersions.slice(releaseNotesVersions.indexOf(msgJSON.currentVersion)); + console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade, releaseNotesVersions) + + } + // Object.keys(releaseNotes).map(function (releaseNote, i) { + releaseNotesVersions.map(function (releaseNote, i) { + // if(releaseNote){ + // //msgJSON.version + // return; + // } + + console.log('[DTU]', 'releaseNotesVersions > releaseNote : ',releaseNote) + + var SPAN_NODE = document.createElement("SPAN"); + SPAN_NODE.style = "font-size: 16px;font-weight: bold;"; + SPAN_NODE.innerText = "Version: " + releaseNote; - }) - .catch(err => console.log('[DTU]', err)); + document.getElementById('releases_info').appendChild(SPAN_NODE); + + var UL_NODE = document.createElement("UL"); + UL_NODE.style = "margin: 5px 0 5px 15px;list-style: none;list-style-type: disc;list-style-position: outside;"; + console.log('[DTU]', 'releaseNotesVersions > releaseNotes[releaseNote] : ',releaseNotes[releaseNote]) + releaseNotes[releaseNote].content.map(function (note, j) { + + var LI_NODE = document.createElement("LI"); + LI_NODE.innerText = note; + LI_NODE.style = "margin-left: 20px;"; + UL_NODE.appendChild(LI_NODE); + // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, LI_NODE, UL_NODE) + if ((j + 1) === releaseNotes[releaseNote].content.length) { + + // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, UL_NODE) + document.getElementById('releases_info').appendChild(UL_NODE) + console.log('[DTU]', (j + 1) , document.getElementById('releases_info').innerHTML) + if ((i + 1) === Object.keys(releaseNotes).length) { + } + } + }); + }) } function updateVersionNotesClick() { document.getElementById('update-desc-release-notes').style = 'z-index: 1001;';