From 0f5d4cd7b71fb40c48d1ecfce607dc6da2a014e5 Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Thu, 10 Mar 2022 19:02:11 +0530
Subject: [PATCH] Fixed an issue where pgAdmin 4 took ~75 seconds to display
 the 'Starting pgAdmin' text on the splash screen. Fixes #7230

---
 Make.bat                         | 13 +++++++++----
 docs/en_US/release_notes_6_7.rst |  4 ++--
 pkg/linux/build-functions.sh     |  5 ++++-
 pkg/mac/build-functions.sh       |  5 ++++-
 runtime/package.json             |  2 +-
 runtime/yarn.lock                |  8 ++++----
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/Make.bat b/Make.bat
index 967a1696a..62cd924eb 100644
--- a/Make.bat
+++ b/Make.bat
@@ -273,10 +273,15 @@ REM Main build sequence Ends
     REM YARN END
 
     REM WGET
-    FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
-    :GET_NW
-        wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
-        IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
+    REM Comment out the below for loop as the latest version (0.62.0) having
+    REM some problem, so for the time being hardcoded the version to 0.61.0
+    REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
+    REM :GET_NW
+    REM    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
+    REM    IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
+
+    SET "NW_VERSION=0.61.0"
+    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
 
     tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1
     REM WGET END
diff --git a/docs/en_US/release_notes_6_7.rst b/docs/en_US/release_notes_6_7.rst
index cd0220d8d..68dd11dc2 100644
--- a/docs/en_US/release_notes_6_7.rst
+++ b/docs/en_US/release_notes_6_7.rst
@@ -2,7 +2,7 @@
 Version 6.7
 ************
 
-Release date: 2022-04-07
+Release date: 2022-03-11
 
 This release contains a number of bug fixes and new features since the release of pgAdmin4 6.6.
 
@@ -10,7 +10,6 @@ New features
 ************
 
 
-
 Housekeeping
 ************
 
@@ -20,3 +19,4 @@ Bug fixes
 
 | `Issue #7220 <https://redmine.postgresql.org/issues/7220>`_ -  Fixed a schema diff issue where difference SQL isn't generated when foreign key values for a table differ.
 | `Issue #7228 <https://redmine.postgresql.org/issues/7228>`_ -  Fixed a schema diff issue where string separator '_$PGADMIN$_' is visible for identical user mappings.
+| `Issue #7230 <https://redmine.postgresql.org/issues/7230>`_ -  Fixed an issue where pgAdmin 4 took ~75 seconds to display the 'Starting pgAdmin' text on the splash screen.
diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh
index 96bb04007..b389e8774 100644
--- a/pkg/linux/build-functions.sh
+++ b/pkg/linux/build-functions.sh
@@ -128,7 +128,10 @@ _build_runtime() {
     # YARN END
 
     # WGET:
-    NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    # Comment out the below line as the latest version (0.62.0) having some
+    # problem, so for the time being hardcoded the version to 0.61.0
+    # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    NW_VERSION="0.61.0"
 
     pushd "${BUILDROOT}" > /dev/null
         while true;do
diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh
index 01e84fb49..8dacc6ab4 100644
--- a/pkg/mac/build-functions.sh
+++ b/pkg/mac/build-functions.sh
@@ -33,7 +33,10 @@ _build_runtime() {
     # YARN END
 
     # WGET:
-    NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    # Comment out the below line as the latest version (0.62.0) having some
+    # problem, so for the time being hardcoded the version to 0.61.0
+    # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    NW_VERSION="0.61.0"
 
     pushd "${BUILD_ROOT}" > /dev/null
         while true;do
diff --git a/runtime/package.json b/runtime/package.json
index 73014ea99..de49baf12 100644
--- a/runtime/package.json
+++ b/runtime/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "eslint": "^6.3.0",
-    "nw": "^0.59.0"
+    "nw": "0.61.0"
   },
   "scripts": {
     "linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js ."
diff --git a/runtime/yarn.lock b/runtime/yarn.lock
index fcb496657..3449ef79b 100644
--- a/runtime/yarn.lock
+++ b/runtime/yarn.lock
@@ -1008,10 +1008,10 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nw@^0.59.0:
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/nw/-/nw-0.59.0.tgz#c7eff1622c917834b2b31581ba5c386816d98db1"
-  integrity sha512-cLGZgP+u+nDfgT956Z7timXuyQN8OOi5Ele6OF3yVEkk6CNiMC6m2rblb5aB8y4QNwLf6O+tkt64XxSUPxvutQ==
+nw@0.61.0:
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/nw/-/nw-0.61.0.tgz#c35e80be4ad7a5570659796d66bdc16d11e0e890"
+  integrity sha512-SazcPW9+kplf7/K2KuTaamOFGtKnnH4Gs/cHHRMf9luTkCGe2cFsnb6/fEP5xvu9tpoW9Z/oUKzj9lZ6kylFWQ==
   dependencies:
     chalk "~1.1.3"
     decompress "^4.2.0"