From 89084d799c2afd290f0b5b70d20401711c383e76 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Thu, 28 May 2020 16:25:13 +0800 Subject: [PATCH 1/6] api url changed --- lib/desktop_updater.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index cc361d719..36f8e2fd4 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -501,7 +501,8 @@ if (process.env.currentVersion) { getAppVesrion(); },10*60*1000) function getAppVesrion(type='update-check'){ - fetch('https://desktop.staging.nynja.net/appversion', { + // fetch('https://desktop.staging.nynja.net/appversion', { + fetch('https://'+window.location.host+'/appversion', { cache: 'no-store', method: 'GET', headers: { -- GitLab From 63dcd115495e3c2065e6fb2f467f0e71c91d2085 Mon Sep 17 00:00:00 2001 From: akashtl Date: Thu, 28 May 2020 16:27:57 +0800 Subject: [PATCH 2/6] build number issue fixed --- lib/desktop_updater.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 36f8e2fd4..d0e965911 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -66,7 +66,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { 'Unable to update, please try again later.')); //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (Build: ' + msgJSON.currentBuild+')'; + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ (msgJSON.currentBuild===0?'':' (Build: ' + msgJSON.currentBuild+')'); document.getElementById('update_version_electron').innerHTML = (msgJSON.electron === undefined ? process.versions.electron : msgJSON.electron); document.getElementById('update_version_chromium').innerHTML = (msgJSON.chromium === undefined ? process.versions.chrome : msgJSON.chromium); @@ -97,7 +97,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Unable to update, please try again later.')); - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (Build: ' + msgJSON.currentBuild+')'; + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+(msgJSON.currentBuild===0?'': ' (Build: ' + msgJSON.currentBuild+')'); //document.getElementById('update_version_electron').innerHTML = msgJSON.electron; //document.getElementById('update_version_chromium').innerHTML = msgJSON.chromium; //document.getElementById('update_version_nodejs').innerHTML = msgJSON.nodejs; -- GitLab From e7a34e63388dae47bee811fdbf3f25b9eecc03ed Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:02:17 +0800 Subject: [PATCH 3/6] added build number in release notes popup --- lib/desktop_updater.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index d0e965911..68a04b510 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -173,12 +173,12 @@ function showReleaseNotes(type, msgJSON) { // //msgJSON.version // return; // } - + Object.keys(releaseNotes[releaseNote]).map(function(buildNumber, bn){ 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; + SPAN_NODE.innerText = "Version: " + releaseNote+ (buildNumber==="content"?"":" (Build: "+buildNumber+")"); document.getElementById('releases_info').appendChild(SPAN_NODE); @@ -186,7 +186,7 @@ function showReleaseNotes(type, msgJSON) { 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) { + releaseNotes[releaseNote][buildNumber].map(function (note, j) { var LI_NODE = document.createElement("LI"); LI_NODE.innerText = note; @@ -202,6 +202,23 @@ function showReleaseNotes(type, msgJSON) { } } }); + }); +/*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() { -- GitLab From 12041b909a1b1930bfaac0cdb5dba25692b2eb8f Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:10:39 +0800 Subject: [PATCH 4/6] build Number added in release notes json file --- lib/releaseNotes/releaseNotesDesktop.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/releaseNotes/releaseNotesDesktop.json b/lib/releaseNotes/releaseNotesDesktop.json index b924862f0..f90059a8f 100644 --- a/lib/releaseNotes/releaseNotesDesktop.json +++ b/lib/releaseNotes/releaseNotesDesktop.json @@ -1,11 +1,11 @@ { "0.4.1": { - "content": [ + "1589451878": [ "Stability improvements" ] }, "0.4.0": { - "content": [ + "1589451878": [ "Electron Framework updated to latest version 8.0.1", "Fixed select all keyboard shortcut (command + A) issue in Mac OS", "Handled mic and camera permission issue on Mac OS", @@ -19,7 +19,7 @@ ] }, "0.3.8": { - "content": [ + "1589451878": [ "Updated login page design.", "Added download guideline in app update process.", "Added release notes in update popup.", @@ -62,4 +62,4 @@ "Added \"Invite by email\" (through add contact)." ] } -} \ No newline at end of file +} -- GitLab From d0a6ba5e8930c027bcd940abbbf15d667758e777 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:28:49 +0800 Subject: [PATCH 5/6] added check for v0.4.0 fetch appversion --- lib/desktop_updater.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 68a04b510..eadd2bc76 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -28,8 +28,14 @@ ipcRendererUpdateWeb.on('update', function (event, message) { startDownloading() } } else if(msgJSON.key==='update-check-menu') { - getAppVesrion('update-check-menu'); + + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + getAppVesrion('update-check-menu'); // ipcRendererOnUpdateEvent(msgJSON); + } else{ + ipcRendererOnUpdateEvent(msgJSON); + } } else { ipcRendererOnUpdateEvent(msgJSON); @@ -512,11 +518,14 @@ if (process.env.currentVersion) { * Call api to get version(major), build(minor) * and latest notes for release */ + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ getAppVesrion(); setInterval(function(){ console.log('[DTU] CHECK APP VERSION AFTER 10 MINS') getAppVesrion(); - },10*60*1000) + },10*60*1000); + } function getAppVesrion(type='update-check'){ // fetch('https://desktop.staging.nynja.net/appversion', { fetch('https://'+window.location.host+'/appversion', { -- GitLab From a617b13472bc9e9f89d288a13fbaf78f93255c56 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Thu, 28 May 2020 09:46:58 +0800 Subject: [PATCH 6/6] issue fixed for build number --- lib/desktop_updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index eadd2bc76..b815b7af2 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -199,7 +199,7 @@ function showReleaseNotes(type, msgJSON) { 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) { + if ((j + 1) === releaseNotes[releaseNote][buildNumber].length) { // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, UL_NODE) document.getElementById('releases_info').appendChild(UL_NODE) -- GitLab